Question Fetching respect player

My project/Assets/App/Models/UserModel.cs

@@ -98,8 +98,8 @@ public static class EducationManager
     // 3. Curriculum Mapping (Egyptian Arabic vs Languages)
     private static readonly Dictionary<int, string> CurriculumMap = new Dictionary<int, string>
         {
-            { 1, "مصري عربي" },
-            { 2, "مصري لغات" }
+            { 2, "مصري عربي" },
+            { 1, "مصري لغات" }
         };
 
     // --- Generic Getters ---

My project/Assets/ScienceStreet/CS/Scripts/CsGameManager.cs

@@ -81,10 +81,11 @@ namespace com.al_arcade.cs
             if (uiManager != null && uiManager.isMusicOn)
                 SSAudioManager.EnsureInstance().PlayMusic();
 
+            var user = UserService.Instance.CurrentUser;
             var filter = new QuestionFilter()
-                .CurriculumId(0)
-                .SubjectId(0)
-                .GradeId(session.gradeId)
+                .CurriculumId(user.Curriculum)
+                .TermId(user.Term)
+                .GradeId(user.Grade)
                 .Count(session.questionCount)
                 .Shuffle(true);
 

My project/Assets/ScienceStreet/MCQ/Scripts/McqGameManager.cs

@@ -85,10 +85,11 @@ namespace com.al_arcade.mcq
             var session = SSGameSession.EnsureInstance();
             var api = SSApiManager.EnsureInstance();
 
+            var user = UserService.Instance.CurrentUser;
             var filter = new QuestionFilter()
-                .CurriculumId(0)
-                .SubjectId(0)
-                .GradeId(0)
+                .CurriculumId(user.Curriculum)
+                .TermId(user.Term)
+                .GradeId(user.Grade)
                 .Count(session.questionCount)
                 .Shuffle(true);
 

My project/Assets/ScienceStreet/TF/Scripts/TfGameManager.cs

@@ -55,11 +55,13 @@ namespace com.al_arcade.tf
             var session = SSGameSession.EnsureInstance();
             var api = SSApiManager.EnsureInstance();
 
+            var user = UserService.Instance.CurrentUser;
             var filter = new QuestionFilter()
-                            .CurriculumId(0)
-                            .SubjectId(0)
-                            .GradeId(session.gradeId)
-                            .Count(session.questionCount);
+                .CurriculumId(user.Curriculum)
+                .TermId(user.Term)
+                .GradeId(user.Grade)
+                .Count(session.questionCount)
+                .Shuffle(true);
 
             yield return api.FetchTf(
                 filter,

My project/Packages/packages-lock.json

@@ -66,14 +66,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collections": {
-      "version": "2.6.2",
+      "version": "2.6.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.burst": "1.8.23",
+        "com.unity.burst": "1.8.27",
         "com.unity.mathematics": "1.3.2",
         "com.unity.test-framework": "1.4.6",
-        "com.unity.nuget.mono-cecil": "1.11.5",
+        "com.unity.nuget.mono-cecil": "1.11.6",
         "com.unity.test-framework.performance": "3.0.3"
       },
       "url": "https://packages.unity.com"
@@ -217,7 +217,7 @@
       }
     },
     "com.unity.splines": {
-      "version": "2.8.2",
+      "version": "2.8.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {