Merge pull request #268 from SaintAngeLs/dev

(#266) hot fix notification service update
SaintAngeLs · Jun 2, 2024 · 049eaa0 · 049eaa0
2 parents 37e6be1 + 253d6dc
commit 049eaa0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/...ace.Services.Notifications.Infrastructure/Mongo/Documents/StudentNotificationsDocument.cs b/...ace.Services.Notifications.Infrastructure/Mongo/Documents/StudentNotificationsDocument.cs
@@ -9,10 +9,8 @@ namespace MiniSpace.Services.Notifications.Infrastructure.Mongo.Documents
     public class StudentNotificationsDocument : IIdentifiable<Guid>
     {
         [BsonId]
-        [BsonRepresentation(BsonType.String)]  
-        public Guid Id { get; set; }
-
         [BsonRepresentation(BsonType.String)]
+        public Guid Id { get; set; }
         public Guid StudentId { get; set; }
         public List<NotificationDocument> Notifications { get; set; }
     }

diff --git a/...es.Notifications.Infrastructure/Mongo/Repositories/StudentNotificationsMongoRepository.cs b/...es.Notifications.Infrastructure/Mongo/Repositories/StudentNotificationsMongoRepository.cs
@@ -65,9 +65,9 @@ public async Task AddOrUpdateAsync(StudentNotifications studentNotifications)
             var document = studentNotifications.AsDocument();
             var filter = Builders<StudentNotificationsDocument>.Filter.Eq(doc => doc.StudentId, studentNotifications.StudentId);
 
-            // Ensure the document is initialized with an empty list if not present
             var initializationUpdate = Builders<StudentNotificationsDocument>.Update
-                .SetOnInsert(doc => doc.Notifications, new List<NotificationDocument>());
+                .SetOnInsert(doc => doc.Notifications, new List<NotificationDocument>())
+                .SetOnInsert(doc => doc.Id, document.Id); 
 
             var addToSetUpdates = new List<UpdateDefinition<StudentNotificationsDocument>>();
             foreach (var notification in studentNotifications.Notifications)
@@ -86,10 +86,9 @@ public async Task AddOrUpdateAsync(StudentNotifications studentNotifications)
             }
 
             var options = new UpdateOptions { IsUpsert = true };
-            // Initialize document if it doesn't exist
+
             await _repository.Collection.UpdateOneAsync(filter, initializationUpdate, options);
 
-            // Apply each AddToSet operation
             foreach (var update in addToSetUpdates)
             {
                 await _repository.Collection.UpdateOneAsync(filter, update, options);
@@ -98,6 +97,7 @@ public async Task AddOrUpdateAsync(StudentNotifications studentNotifications)
 
 
 
+
        public async Task<List<StudentNotifications>> FindAsync(FilterDefinition<StudentNotificationsDocument> filter, FindOptions options)
         {
             var documents = await _repository.Collection.Find(filter, options).ToListAsync();

diff --git a/MiniSpace.Web/src/MiniSpace.Web/DTO/Notifications/NotificationLinkFactory.cs b/MiniSpace.Web/src/MiniSpace.Web/DTO/Notifications/NotificationLinkFactory.cs
@@ -37,7 +37,7 @@ public static string GetNotificationLink(NotificationDto notification)
                 case NotificationEventType.ReportRejected:
                 case NotificationEventType.ReportResolved:
                 case NotificationEventType.ReportReviewStarted:
-                    return $"/reports/{notification.RelatedEntityId}";
+                    // return $"/reports/{notification.RelatedEntityId}";
 
                 default:
                     return $"/student-details/{notification.RelatedEntityId}";