Changeset f735dac for iknow-api

Timestamp:

12/10/25 13:45:42 (10 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

39f76a9

Parents:

ab652ff (diff), 615f18d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Stefan Saveski <76560180+stefansaveski@…> (12/10/25 13:45:42)

git-committer:

GitHub <noreply@…> (12/10/25 13:45:42)

Message:

Merge pull request #7 from stefansaveski/feature/get-semesters

Add getSemesters endpoint and related data access

Location:

iknow-api

Files:

• Controllers/UserController.cs (modified) (1 diff)
• Data/AppDbContext.cs (modified) (1 diff)
• Repository/Implementations/UserRepository.cs (modified) (1 diff)
• Repository/Interface/IUserRepository.cs (modified) (1 diff)
• Services/Implementations/UserService.cs (modified) (1 diff)
• Services/Interfaces/IUserService.cs (modified) (1 diff)

iknow-api/Controllers/UserController.cs

@@ -29 +29 @@
             }
             return null;
-            
+
         }
+        //"semesters": [
+        //    {
+        //      "id": 1,
+        //      "semester": "Зимски(2025/2026)",
+        //      "direction": "PIT23(2023)",
+        //      "quota": "Не плаќа-Редовен(2023)",
+        //      "note": "",
+        //      "studentCom": "Ги имам си...",
+        //      "sum": "0,30",
+        //      "paid": "0,00",
+        //      "ukim": "",
+        //      "createdOn": "22.09.2025",
+        //      "dateChanged": "22.09.2025",
+        //      "credits": "0,01",
+        //      "type": "Ред.",
+        //      "doc": "Не",
+        //      "doc1": "Не",
+        //      "verified": "Не",
+        //      "taxes": "0,00",
+        //      "signatures": "0/5",
+        //      "status": "валиден",
+        //      "completed": "Не"
+        //    },
+        //    ]
+        //}
+        [Authorize]
+        [HttpGet("getSemesters")]
+        public async Task<IActionResult> getSemesters()
+        {
+            var authHeader = Request.Headers["Authorization"].ToString();
+            if (authHeader.StartsWith("Bearer "))
+            {
+                var token = authHeader.Substring("Bearer ".Length).Trim();
+                // token = your JWT
+                var userData = await _userService.GetUserSemesters(token);
+                var results = new List<object>();
+                
+                for(int i=0; i<userData.Count; i++)
+                {
+                    var newResult = new
+                    {
+                        id = userData[i].Id,
+                        semester = (userData[i].Type == 0 ? "Зимски" : "Летен") + $"({userData[i].Year}/{userData[i].Year + 1})",
+                        direction = userData[i].Major?.Name ?? "",
+                        quota = userData[i].QuotaType.ToString(),
+                        note = "",
+                        studentCom = "",
+                        sum = "0,00",
+                        paid = "0,00",
+                        ukim = "",
+                        createdOn = DateTime.Now.ToString("dd.MM.yyyy"),
+                        dateChanged = DateTime.Now.ToString("dd.MM.yyyy"),
+                        credits = "0,00",
+                        type = "Ред.",
+                        doc = "Не",
+                        doc1 = "Не",
+                        verified = "Не",
+                        taxes = "0,00",
+                        signatures = "0/5",
+                        status = "валиден",
+                        completed = "Не"
+                    };
+                    results.Add(newResult);
+                }
+                if (userData == null) return Ok(new { info = "can't get info" });
+                return Ok(new { semesters = results });
+            }
+            return null;
+
+        }
+                //        {
+                //    "user": [
+                //        {
+                //            "id": 2,
+                //            "userId": 1,
+                //            "user": null,
+                //            "year": 2025,
+                //            "type": 1,
+                //            "quotaType": "privatna",
+                //            "majorId": 1,
+                //            "major": {
+                //                "id": 1,
+                //                "name": "PIT(2023)",
+                //                "subjects": null
+                //            },
+                //            "users": null,
+                //            "semesterSubjects": null
+                //        },
+                //        {
+                //    "id": 1,
+                //            "userId": 1,
+                //            "user": null,
+                //            "year": 2025,
+                //            "type": 0,
+                //            "quotaType": "privatna",
+                //            "majorId": 1,
+                //            "major": {
+                //        "id": 1,
+                //                "name": "PIT(2023)",
+                //                "subjects": null
+                //            },
+                //            "users": null,
+                //            "semesterSubjects": null
+                //        }
+                //    ]
+                //}
     }
 }

iknow-api/Data/AppDbContext.cs

@@ -19 +19 @@
         public DbSet<Major> Majors { get; set; }
         public DbSet<PassedSubject> PassedSubjects { get; set; }
+        public DbSet<EnrolledSemesters> EnrolledSemesters { get; set; }
 
 

iknow-api/Repository/Implementations/UserRepository.cs

@@ -63 +63 @@
             return await _context.User.CountAsync();
         }
+        public async Task<List<EnrolledSemesters>> GetUserSemestersAsync(int id)
+        {
+            return await _context.EnrolledSemesters
+                .Include(es => es.Major)
+                .Where(es => es.UserId == id)
+                .ToListAsync();
+        }
 
     }

iknow-api/Repository/Interface/IUserRepository.cs

@@ -12 +12 @@
         Task<int> GetUsersCountAsync();
         Task<User?> GetUserByIdAsync(int id);
+        Task<List<EnrolledSemesters>?> GetUserSemestersAsync(int id);
         Task<User?> GetOnlyUserByIdAsync(int id);
 

iknow-api/Services/Implementations/UserService.cs

@@ -33 +33 @@
             else
                 return user;
+        }
+        public async Task<List<EnrolledSemesters>> GetUserSemesters(string JWT)
+        {
+            var userId = ExtractUserIdFromJwt(JWT);
+            if (userId == null)
+                return null;
+
+            // Now you can use userId to fetch user data
+            var semesters = await _userRepository.GetUserSemestersAsync(userId.Value);
+            if (semesters == null)
+                return null;
+            else
+                return semesters;
         }
 

iknow-api/Services/Interfaces/IUserService.cs

@@ -6 +6 @@
     {
         Task<User> GetUserData(string userId);
+        Task<List<EnrolledSemesters>> GetUserSemesters(string userId);
     }
 }