(#418) users: udpate infrastructure

SaintAngeLs · SaintAngeLs · commit 49813ed8e678 · 2024-09-20T18:55:23.000+02:00
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Documents/Extensions.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Documents/Extensions.cs
@@ -124,15 +124,15 @@ public static StudentDto AsDto(this StudentDocument document)
 
         public static UserNotifications AsEntity(this UserNotificationsDocument document)
             => new UserNotifications(
-                document.StudentId,
+                document.UserId,
                 document.NotificationPreferences
             );
 
         public static UserNotificationsDocument AsDocument(this UserNotifications entity)
             => new UserNotificationsDocument
             {
                 Id = Guid.NewGuid(), // Ensure a unique identifier is set
-                StudentId = entity.StudentId,
+                UserId = entity.UserId,
                 NotificationPreferences = entity.NotificationPreferences
             };
 
@@ -153,7 +153,7 @@ public static UserNotificationsDocument AsDocument(this NotificationPreferencesD
             => new UserNotificationsDocument
             {
                 Id = Guid.NewGuid(),
-                StudentId = dto.StudentId,
+                UserId = dto.StudentId,
                 NotificationPreferences = new NotificationPreferences(
                     dto.AccountChanges,
                     dto.SystemLogin,
@@ -189,7 +189,7 @@ public static UserGalleryDto AsDto(this UserGalleryDocument document)
 
         public static UserSettings AsEntity(this UserSettingsDocument document)
             => new UserSettings(
-                document.StudentId,
+                document.UserId,
                 new UserAvailableSettings(
                     document.AvailableSettings.CreatedAtVisibility,
                     document.AvailableSettings.DateOfBirthVisibility,
@@ -212,8 +212,8 @@ public static UserSettings AsEntity(this UserSettingsDocument document)
        public static UserSettingsDocument AsDocument(this UserSettings entity)
             => new UserSettingsDocument
             {
-                Id = Guid.NewGuid(), // Ensure a unique identifier is set
-                StudentId = entity.StudentId,
+                Id = Guid.NewGuid(), 
+                UserId = entity.UserId,
                 AvailableSettings = new UserAvailableSettingsDocument
                 {
                     CreatedAtVisibility = entity.AvailableSettings.CreatedAtVisibility,
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Documents/UserNotificationsDocument.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Documents/UserNotificationsDocument.cs
@@ -9,7 +9,7 @@ namespace MiniSpace.Services.Students.Infrastructure.Mongo.Documents
     public class UserNotificationsDocument : IIdentifiable<Guid>
     {
         public Guid Id { get; set; }
-        public Guid StudentId { get; set; }
+        public Guid UserId { get; set; }
         public NotificationPreferences NotificationPreferences { get; set; }
     }
 }
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Documents/UserSettingsDocument.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Documents/UserSettingsDocument.cs
@@ -9,7 +9,7 @@ namespace MiniSpace.Services.Students.Infrastructure.Mongo.Documents
     public class UserSettingsDocument : IIdentifiable<Guid>
     {
         public Guid Id { get; set; }
-        public Guid StudentId { get; set; }
+        public Guid UserId { get; set; }
         public UserAvailableSettingsDocument AvailableSettings { get; set; }
     }
 }
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetStudentHandler.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetStudentHandler.cs
@@ -46,7 +46,7 @@ public async Task<StudentDto> HandleAsync(GetStudent query, CancellationToken ca
                 // Map user settings to UserSettingsDto and include them in the StudentDto
                 studentDto.UserSettings = new UserSettingsDto
                 {
-                    StudentId = userSettings.StudentId,
+                    UserId = userSettings.UserId,
                     CreatedAtVisibility = userSettings.AvailableSettings.CreatedAtVisibility.ToString(),
                     DateOfBirthVisibility = userSettings.AvailableSettings.DateOfBirthVisibility.ToString(),
                     InterestedInEventsVisibility = userSettings.AvailableSettings.InterestedInEventsVisibility.ToString(),
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetStudentWithVisibilitySettingsHandler.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetStudentWithVisibilitySettingsHandler.cs
@@ -28,7 +28,7 @@ public async Task<StudentWithVisibilitySettingsDto> HandleAsync(GetStudentWithVi
                 return null;
             }
 
-            var settingsDocument = await _settingsRepository.GetAsync(s => s.StudentId == query.StudentId);
+            var settingsDocument = await _settingsRepository.GetAsync(s => s.UserId == query.StudentId);
             if (settingsDocument == null)
             {
                 return null;
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetStudentsHandler.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetStudentsHandler.cs
@@ -87,7 +87,7 @@ public GetStudentsHandler(
                     {
                         studentDto.UserSettings = new UserSettingsDto
                         {
-                            StudentId = userSettings.StudentId,
+                            UserId = userSettings.UserId,
                             CreatedAtVisibility = userSettings.AvailableSettings.CreatedAtVisibility.ToString(),
                             DateOfBirthVisibility = userSettings.AvailableSettings.DateOfBirthVisibility.ToString(),
                             InterestedInEventsVisibility = userSettings.AvailableSettings.InterestedInEventsVisibility.ToString(),
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetUserNotificationPreferencesHandler.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetUserNotificationPreferencesHandler.cs
@@ -21,7 +21,7 @@ public GetUserNotificationPreferencesHandler(IMongoRepository<UserNotificationsD
 
         public async Task<NotificationPreferencesDto> HandleAsync(GetUserNotificationPreferences query, CancellationToken cancellationToken)
         {
-            var userNotificationsDocument = await _repository.GetAsync(x => x.StudentId == query.StudentId);
+            var userNotificationsDocument = await _repository.GetAsync(x => x.UserId == query.StudentId);
             return userNotificationsDocument?.NotificationPreferences.AsDto();
         }
     }
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetUserSettingsHandler.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Queries/Handlers/GetUserSettingsHandler.cs
@@ -28,7 +28,7 @@ public async Task<UserSettingsDto> HandleAsync(GetUserSettings query, Cancellati
 
             return new UserSettingsDto
             {
-                StudentId = userSettings.StudentId,
+                UserId = userSettings.UserId,
                 CreatedAtVisibility = userSettings.AvailableSettings.CreatedAtVisibility.ToString(),
                 DateOfBirthVisibility = userSettings.AvailableSettings.DateOfBirthVisibility.ToString(),
                 InterestedInEventsVisibility = userSettings.AvailableSettings.InterestedInEventsVisibility.ToString(),
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Repositories/UserNotificationPreferencesRepository.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Repositories/UserNotificationPreferencesRepository.cs
@@ -21,20 +21,20 @@ public UserNotificationPreferencesRepository(IMongoRepository<UserNotificationsD
 
         public async Task<NotificationPreferences> GetNotificationPreferencesAsync(Guid studentId)
         {
-            var userNotificationsDocument = await _repository.GetAsync(x => x.StudentId == studentId);
+            var userNotificationsDocument = await _repository.GetAsync(x => x.UserId == studentId);
             return userNotificationsDocument?.NotificationPreferences;
         }
 
         public async Task UpdateNotificationPreferencesAsync(Guid studentId, NotificationPreferences notificationPreferences)
         {
-            var userNotificationsDocument = await _repository.GetAsync(x => x.StudentId == studentId);
+            var userNotificationsDocument = await _repository.GetAsync(x => x.UserId == studentId);
 
             if (userNotificationsDocument == null)
             {
                 userNotificationsDocument = new UserNotificationsDocument
                 {
                     Id = Guid.NewGuid(),
-                    StudentId = studentId,
+                    UserId = studentId,
                     NotificationPreferences = notificationPreferences
                 };
 
diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Repositories/UserSettingsRepository.cs b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Infrastructure/Mongo/Repositories/UserSettingsRepository.cs
@@ -20,7 +20,7 @@ public UserSettingsRepository(IMongoRepository<UserSettingsDocument, Guid> repos
 
         public async Task<UserSettings> GetUserSettingsAsync(Guid studentId)
         {
-            var userSettingsDocument = await _repository.GetAsync(x => x.StudentId == studentId);
+            var userSettingsDocument = await _repository.GetAsync(x => x.UserId == studentId);
             return userSettingsDocument?.AsEntity();
         }
 
@@ -32,7 +32,7 @@ public async Task AddUserSettingsAsync(UserSettings userSettings)
 
         public async Task UpdateUserSettingsAsync(UserSettings userSettings)
         {
-            var userSettingsDocument = await _repository.GetAsync(x => x.StudentId == userSettings.StudentId);
+            var userSettingsDocument = await _repository.GetAsync(x => x.UserId == userSettings.UserId);
 
             if (userSettingsDocument == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace MiniSpace.Services.Students.Infrastructure.Mongo.Documents`
`9`	`9`	`public class UserNotificationsDocument : IIdentifiable<Guid>`
`10`	`10`	`{`
`11`	`11`	`public Guid Id { get; set; }`
`12`		`- public Guid StudentId { get; set; }`
	`12`	`+ public Guid UserId { get; set; }`
`13`	`13`	`public NotificationPreferences NotificationPreferences { get; set; }`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace MiniSpace.Services.Students.Infrastructure.Mongo.Documents`
`9`	`9`	`public class UserSettingsDocument : IIdentifiable<Guid>`
`10`	`10`	`{`
`11`	`11`	`public Guid Id { get; set; }`
`12`		`- public Guid StudentId { get; set; }`
	`12`	`+ public Guid UserId { get; set; }`
`13`	`13`	`public UserAvailableSettingsDocument AvailableSettings { get; set; }`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public async Task<StudentDto> HandleAsync(GetStudent query, CancellationToken ca`
`46`	`46`	`// Map user settings to UserSettingsDto and include them in the StudentDto`
`47`	`47`	`studentDto.UserSettings = new UserSettingsDto`
`48`	`48`	`{`
`49`		`- StudentId = userSettings.StudentId,`
	`49`	`+ UserId = userSettings.UserId,`
`50`	`50`	`CreatedAtVisibility = userSettings.AvailableSettings.CreatedAtVisibility.ToString(),`
`51`	`51`	`DateOfBirthVisibility = userSettings.AvailableSettings.DateOfBirthVisibility.ToString(),`
`52`	`52`	`InterestedInEventsVisibility = userSettings.AvailableSettings.InterestedInEventsVisibility.ToString(),`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task<StudentWithVisibilitySettingsDto> HandleAsync(GetStudentWithVi`
`28`	`28`	`return null;`
`29`	`29`	`}`
`30`	`30`
`31`		`- var settingsDocument = await _settingsRepository.GetAsync(s => s.StudentId == query.StudentId);`
	`31`	`+ var settingsDocument = await _settingsRepository.GetAsync(s => s.UserId == query.StudentId);`
`32`	`32`	`if (settingsDocument == null)`
`33`	`33`	`{`
`34`	`34`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public GetStudentsHandler(`
`87`	`87`	`{`
`88`	`88`	`studentDto.UserSettings = new UserSettingsDto`
`89`	`89`	`{`
`90`		`- StudentId = userSettings.StudentId,`
	`90`	`+ UserId = userSettings.UserId,`
`91`	`91`	`CreatedAtVisibility = userSettings.AvailableSettings.CreatedAtVisibility.ToString(),`
`92`	`92`	`DateOfBirthVisibility = userSettings.AvailableSettings.DateOfBirthVisibility.ToString(),`
`93`	`93`	`InterestedInEventsVisibility = userSettings.AvailableSettings.InterestedInEventsVisibility.ToString(),`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public GetUserNotificationPreferencesHandler(IMongoRepository<UserNotificationsD`
`21`	`21`
`22`	`22`	`public async Task<NotificationPreferencesDto> HandleAsync(GetUserNotificationPreferences query, CancellationToken cancellationToken)`
`23`	`23`	`{`
`24`		`- var userNotificationsDocument = await _repository.GetAsync(x => x.StudentId == query.StudentId);`
	`24`	`+ var userNotificationsDocument = await _repository.GetAsync(x => x.UserId == query.StudentId);`
`25`	`25`	`return userNotificationsDocument?.NotificationPreferences.AsDto();`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task<UserSettingsDto> HandleAsync(GetUserSettings query, Cancellati`
`28`	`28`
`29`	`29`	`return new UserSettingsDto`
`30`	`30`	`{`
`31`		`- StudentId = userSettings.StudentId,`
	`31`	`+ UserId = userSettings.UserId,`
`32`	`32`	`CreatedAtVisibility = userSettings.AvailableSettings.CreatedAtVisibility.ToString(),`
`33`	`33`	`DateOfBirthVisibility = userSettings.AvailableSettings.DateOfBirthVisibility.ToString(),`
`34`	`34`	`InterestedInEventsVisibility = userSettings.AvailableSettings.InterestedInEventsVisibility.ToString(),`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,20 @@ public UserNotificationPreferencesRepository(IMongoRepository<UserNotificationsD`
`21`	`21`
`22`	`22`	`public async Task<NotificationPreferences> GetNotificationPreferencesAsync(Guid studentId)`
`23`	`23`	`{`
`24`		`- var userNotificationsDocument = await _repository.GetAsync(x => x.StudentId == studentId);`
	`24`	`+ var userNotificationsDocument = await _repository.GetAsync(x => x.UserId == studentId);`
`25`	`25`	`return userNotificationsDocument?.NotificationPreferences;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public async Task UpdateNotificationPreferencesAsync(Guid studentId, NotificationPreferences notificationPreferences)`
`29`	`29`	`{`
`30`		`- var userNotificationsDocument = await _repository.GetAsync(x => x.StudentId == studentId);`
	`30`	`+ var userNotificationsDocument = await _repository.GetAsync(x => x.UserId == studentId);`
`31`	`31`
`32`	`32`	`if (userNotificationsDocument == null)`
`33`	`33`	`{`
`34`	`34`	`userNotificationsDocument = new UserNotificationsDocument`
`35`	`35`	`{`
`36`	`36`	`Id = Guid.NewGuid(),`
`37`		`- StudentId = studentId,`
	`37`	`+ UserId = studentId,`
`38`	`38`	`NotificationPreferences = notificationPreferences`
`39`	`39`	`};`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public UserSettingsRepository(IMongoRepository<UserSettingsDocument, Guid> repos`
`20`	`20`
`21`	`21`	`public async Task<UserSettings> GetUserSettingsAsync(Guid studentId)`
`22`	`22`	`{`
`23`		`- var userSettingsDocument = await _repository.GetAsync(x => x.StudentId == studentId);`
	`23`	`+ var userSettingsDocument = await _repository.GetAsync(x => x.UserId == studentId);`
`24`	`24`	`return userSettingsDocument?.AsEntity();`
`25`	`25`	`}`
`26`	`26`
`@@ -32,7 +32,7 @@ public async Task AddUserSettingsAsync(UserSettings userSettings)`
`32`	`32`
`33`	`33`	`public async Task UpdateUserSettingsAsync(UserSettings userSettings)`
`34`	`34`	`{`
`35`		`- var userSettingsDocument = await _repository.GetAsync(x => x.StudentId == userSettings.StudentId);`
	`35`	`+ var userSettingsDocument = await _repository.GetAsync(x => x.UserId == userSettings.UserId);`
`36`	`36`
`37`	`37`	`if (userSettingsDocument == null)`
`38`	`38`	`{`