Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#126) update the method students notifications are added to repository #251

Merged
merged 8 commits into from
Jun 2, 2024
Merged

(#126) update the method students notifications are added to repository #251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2bbb568
(#126) udpate the db udpate to use AddOrUpdateAsyn instead of AddAsyn…
SaintAngeLs Jun 2, 2024
ec6a650
(#126) display time througn system.globalisation cultureinfo
SaintAngeLs Jun 2, 2024
e1fd537
(#126) update breadcranps for notifications
SaintAngeLs Jun 2, 2024
8cccf08
(#126) update breadcramps icons for notifications
SaintAngeLs Jun 2, 2024
90c2349
(#126) breadcramps for friends
SaintAngeLs Jun 2, 2024
8194a1b
(#126) breadcramps for accound and mudblazor injection
SaintAngeLs Jun 2, 2024
47505ea
(#126) add the breadcrams to everywhere, add body box shadow
SaintAngeLs Jun 2, 2024
569b0aa
(#126) add the condition for the body style
SaintAngeLs Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...pace.Services.Notifications.Application/Events/External/Handlers/CommentCreatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public async Task HandleAsync(CommentCreated eventArgs, CancellationToken cancel
);

studentNotifications.AddNotification(userNotification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var userNotificationDetailsHtml = $"<p>Your comment on the event '{eventDetails.Name}' has been posted successfully.</p>";

Expand Down Expand Up @@ -119,7 +119,7 @@ public async Task HandleAsync(CommentCreated eventArgs, CancellationToken cancel
);

organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var organizerNotificationDetailsHtml = $"<p>{commentDetails.StudentName} commented on your event '{eventDetails.Name}': {commentDetails.CommentContext}</p>";

Expand Down
4 changes: 2 additions & 2 deletions ...pace.Services.Notifications.Application/Events/External/Handlers/CommentUpdatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public async Task HandleAsync(CommentUpdated eventArgs, CancellationToken cancel
);

studentNotifications.AddNotification(userNotification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var userNotificationDetailsHtml = $"<p>Your updated comment on the event '{eventDetails.Name}' is now visible.</p>";

Expand Down Expand Up @@ -118,7 +118,7 @@ public async Task HandleAsync(CommentUpdated eventArgs, CancellationToken cancel
);

organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var organizerNotificationDetailsHtml = $"<p>{commentDetails.StudentName} updated their comment on your event '{eventDetails.Name}': {commentDetails.CommentContext}</p>";

Expand Down
7 changes: 4 additions & 3 deletions ...iSpace.Services.Notifications.Application/Events/External/Handlers/EventCreatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ public async Task HandleAsync(EventCreated eventCreated, CancellationToken cance
studentNotifications = new StudentNotifications(user.Id);
}


studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
userId: user.Id,
Expand All @@ -96,9 +100,6 @@ public async Task HandleAsync(EventCreated eventCreated, CancellationToken cance
);

await _messageBroker.PublishAsync(notificationCreatedEvent);

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...iSpace.Services.Notifications.Application/Events/External/Handlers/EventDeletedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public async Task HandleAsync(EventDeleted eventDeleted, CancellationToken cance


studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
4 changes: 2 additions & 2 deletions ...rvices.Notifications.Application/Events/External/Handlers/EventParticipantAddedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public async Task HandleAsync(EventParticipantAdded eventArgs, CancellationToken


participantNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(participantNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(participantNotifications);



Expand Down Expand Up @@ -99,7 +99,7 @@ public async Task HandleAsync(EventParticipantAdded eventArgs, CancellationToken


organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var organizerNotificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
2 changes: 1 addition & 1 deletion ...ices.Notifications.Application/Events/External/Handlers/EventParticipantRemovedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public async Task HandleAsync(EventParticipantRemoved eventArgs, CancellationTok
);

participantNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(participantNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(participantNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
2 changes: 1 addition & 1 deletion ...Space.Services.Notifications.Application/Events/External/Handlers/FriendInvitedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public async Task HandleAsync(FriendInvited @event, CancellationToken cancellati

var studentNotifications = await _studentNotificationsRepository.GetByStudentIdAsync(@event.InviteeId) ?? new StudentNotifications(@event.InviteeId);
studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId,
Expand Down
2 changes: 1 addition & 1 deletion ...e.Services.Notifications.Application/Events/External/Handlers/FriendRequestSentHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public async Task HandleAsync(FriendRequestSent @event, CancellationToken cancel

var studentNotifications = await _studentNotificationsRepository.GetByStudentIdAsync(@event.InviteeId) ?? new StudentNotifications(@event.InviteeId);
studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notification.NotificationId,
Expand Down
6 changes: 3 additions & 3 deletions ....Notifications.Application/Events/External/Handlers/PasswordResetTokenGeneratedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public PasswordResetTokenGeneratedHandler(
public async Task HandleAsync(PasswordResetTokenGenerated @event, CancellationToken cancellationToken)
{
var student = await _studentsServiceClient.GetAsync(@event.UserId);
var encodedToken = System.Net.WebUtility.UrlEncode(@event.ResetToken); // Encode the token
var resetLink = $"https://minispace.itsharppro.com/reset-password/{encodedToken}/page"; // Use the encoded token
var encodedToken = System.Net.WebUtility.UrlEncode(@event.ResetToken);
var resetLink = $"https://minispace.itsharppro.com/reset-password/{encodedToken}/page";
var notificationMessage = $"You have requested to reset your password. Please use the following link to proceed: {resetLink}";
var detailsHtml = $"<p>Click the following link to reset your password: <a href=\"{resetLink}\">Reset Password</a></p>";

Expand All @@ -48,7 +48,7 @@ public async Task HandleAsync(PasswordResetTokenGenerated @event, CancellationTo

var studentNotifications = await _studentNotificationsRepository.GetByStudentIdAsync(@event.UserId) ?? new StudentNotifications(@event.UserId);
studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notification.NotificationId,
Expand Down
4 changes: 2 additions & 2 deletions ...niSpace.Services.Notifications.Application/Events/External/Handlers/PostCreatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private async Task NotifyStudent(StudentDto student, EventDto eventDetails, Post
}

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down Expand Up @@ -146,7 +146,7 @@ private async Task NotifyOrganizer(OrganizerDto organizer, EventDto eventDetails
}

organizerNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
4 changes: 2 additions & 2 deletions ...niSpace.Services.Notifications.Application/Events/External/Handlers/PostUpdatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private async Task NotifyStudent(StudentDto student, EventDto eventDetails, Post
}

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: notification.NotificationId,
Expand Down Expand Up @@ -146,7 +146,7 @@ private async Task NotifyOrganizer(OrganizerDto organizer, EventDto eventDetails
}

organizerNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
4 changes: 2 additions & 2 deletions ...ace.Services.Notifications.Application/Events/External/Handlers/ReactionCreatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public async Task HandleAsync(ReactionCreated eventArgs, CancellationToken cance
);

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationDetailsHtml = $@"
<p>Thank you for your reaction! Your interaction helps us to better understand what content resonates with our community.</p>";
Expand Down Expand Up @@ -111,7 +111,7 @@ public async Task HandleAsync(ReactionCreated eventArgs, CancellationToken cance
);

organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

await _messageBroker.PublishAsync(new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
2 changes: 1 addition & 1 deletion ...ace.Services.Notifications.Application/Events/External/Handlers/ReportCancelledHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private async Task<Notification> CreateNotificationForUser(Guid userId, ReportCa
eventType: NotificationEventType.ReportCancelled
);
notifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(notifications);
await _studentNotificationsRepository.AddOrUpdateAsync(notifications);
return notification;
}

Expand Down
2 changes: 1 addition & 1 deletion ...Space.Services.Notifications.Application/Events/External/Handlers/ReportCreatedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private async Task<Notification> CreateNotificationForUser(Guid userId, ReportCr
eventType: NotificationEventType.ReportCreated
);
notifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(notifications);
await _studentNotificationsRepository.AddOrUpdateAsync(notifications);
return notification;
}

Expand Down
2 changes: 1 addition & 1 deletion ...Space.Services.Notifications.Application/Events/External/Handlers/ReportDeletedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private async Task<Notification> CreateNotificationForUser(Guid userId, ReportDe
eventType: NotificationEventType.ReportDeleted
);
notifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(notifications);
await _studentNotificationsRepository.AddOrUpdateAsync(notifications);
return notification;
}

Expand Down
2 changes: 1 addition & 1 deletion ...pace.Services.Notifications.Application/Events/External/Handlers/ReportRejectedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private async Task<Notification> CreateNotificationForUser(Guid userId, ReportRe
eventType: NotificationEventType.ReportRejected
);
notifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(notifications);
await _studentNotificationsRepository.AddOrUpdateAsync(notifications);
return notification;
}

Expand Down
2 changes: 1 addition & 1 deletion ...pace.Services.Notifications.Application/Events/External/Handlers/ReportResolvedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private async Task<Notification> CreateNotificationForUser(Guid userId, ReportRe
eventType: NotificationEventType.ReportResolved
);
notifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(notifications);
await _studentNotificationsRepository.AddOrUpdateAsync(notifications);
return notification;
}

Expand Down
2 changes: 1 addition & 1 deletion ...Services.Notifications.Application/Events/External/Handlers/ReportReviewStartedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private async Task<Notification> CreateNotificationForUser(Guid userId, ReportRe
eventType: NotificationEventType.ReportReviewStarted
);
notifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(notifications);
await _studentNotificationsRepository.AddOrUpdateAsync(notifications);
return notification;
}

Expand Down
2 changes: 1 addition & 1 deletion .../MiniSpace.Services.Notifications.Application/Events/External/Handlers/SignedUpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public async Task HandleAsync(SignedUp @event, CancellationToken cancellationTok
);

userNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(userNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(userNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
2 changes: 1 addition & 1 deletion ...ifications.Application/Events/External/Handlers/StudentCancelledInterestInEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public async Task HandleAsync(StudentCancelledInterestInEvent eventArgs, Cancell


studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
4 changes: 2 additions & 2 deletions ...otifications.Application/Events/External/Handlers/StudentCancelledSignUpToEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public async Task HandleAsync(StudentCancelledSignUpToEvent eventArgs, Cancellat
);

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down Expand Up @@ -96,7 +96,7 @@ public async Task HandleAsync(StudentCancelledSignUpToEvent eventArgs, Cancellat


organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var organizerNotificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
4 changes: 2 additions & 2 deletions ...Notifications.Application/Events/External/Handlers/StudentShowedInterestInEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public async Task HandleAsync(StudentShowedInterestInEvent eventArgs, Cancellati
);

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down Expand Up @@ -95,7 +95,7 @@ public async Task HandleAsync(StudentShowedInterestInEvent eventArgs, Cancellati
}

organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var organizerNotificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
4 changes: 2 additions & 2 deletions ...vices.Notifications.Application/Events/External/Handlers/StudentSignedUpToEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public async Task HandleAsync(StudentSignedUpToEvent eventArgs, CancellationToke
);

studentNotifications.AddNotification(notification);
await _studentNotificationsRepository.UpdateAsync(studentNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(studentNotifications);

var notificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down Expand Up @@ -94,7 +94,7 @@ public async Task HandleAsync(StudentSignedUpToEvent eventArgs, CancellationToke
}

organizerNotifications.AddNotification(organizerNotification);
await _studentNotificationsRepository.UpdateAsync(organizerNotifications);
await _studentNotificationsRepository.AddOrUpdateAsync(organizerNotifications);

var organizerNotificationCreatedEvent = new NotificationCreated(
notificationId: Guid.NewGuid(),
Expand Down
Loading