Changeset 1b20b22 for iknow-api/Repository

Timestamp:

09/15/26 21:15:53 (8 days ago)

Author:

Stefan-Saveski <stefansaveski19@…>

Branches:

master

Children:

002cf5f, 20df1a3, b8093a0, bcacc91

Parents:

93c368a

Message:

• ready for presentation

Location:

iknow-api/Repository

Files:

• Implementations/ProfRepository.cs (added)
• Implementations/RefreshTokenRepository.cs (modified) (1 diff)
• Implementations/UserRepository.cs (modified) (3 diffs)
• Interface/IProfRepository.cs (added)
• Interface/IUserRepository.cs (modified) (2 diffs)

iknow-api/Repository/Implementations/RefreshTokenRepository.cs

@@ -41 +41 @@
                     rt.Token == refreshTokenDto.token &&
                     rt.IsValid &&
-                    rt.ExpiresAt > DateTime.UtcNow);
+                    rt.ExpiresAt > DateTime.SpecifyKind(DateTime.UtcNow, DateTimeKind.Unspecified));
 
             return token != null;

iknow-api/Repository/Implementations/UserRepository.cs

@@ -28 +28 @@
             return await _context.User
                 .Include(u => u.ContactInfo)
-                .Include(u => u.EnrollmentInfo)
                 .Include(u => u.HighSchool)
+                // The study programme is reached through the enrolment, since
+                // Major hangs off EnrolledSemesters rather than off Users.
+                .Include(u => u.Enrolments!)
+                    .ThenInclude(es => es.Major)
+                .Include(u => u.Enrolments!)
+                    .ThenInclude(es => es.Semester)
+                .AsSplitQuery()
                 .FirstOrDefaultAsync(u => u.Id == id);
         }
@@ -48 +54 @@
             await _context.SaveChangesAsync();
         }
-        public async Task AddEnrollmentAsync(EnrollmentInfo enrollment)
-        {
-            _context.EnrollmentInfo.Add(enrollment);
-            await _context.SaveChangesAsync();
-        }   
         public async Task AddHighSchoolAsync(HighSchool highSchool)
         {
@@ -89 +90 @@
                 .Include(ps => ps.SemesterSubject)
                     .ThenInclude(ss => ss.Professor)
-                .Where(ps => ps.SemesterSubject.UserId == id)
+                // The ER model reaches the student through the enrolment,
+                // not through a user_id on semesters_subjects.
+                .Where(ps => ps.SemesterSubject.EnrolledSemester.UserId == id)
                 .ToListAsync();
         }

iknow-api/Repository/Interface/IUserRepository.cs

@@ -1 @@
-using iknow_api.Models;
+using iknow_api.Models;
 namespace iknow_api.Repositories
 {
@@ -8 +8 @@
         Task AddUserAsync(User user);
         Task AddContactAsync(ContactInfo contactInfo);
-        Task AddEnrollmentAsync(EnrollmentInfo enrollment);
         Task AddHighSchoolAsync(HighSchool highSchool);
         Task<int> GetUsersCountAsync();