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.

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

(#125) notifications service implementation -- external events arrangement. #140

Merged
merged 121 commits into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
d7b6a60
(#125) core proejct update
SaintAngeLs May 12, 2024
4d9d53f
(#125) Notification service application layuer update
SaintAngeLs May 12, 2024
c4d3de3
(#125) infrastructure event mapper update
SaintAngeLs May 12, 2024
143a2d8
(#125) mongo respository infrastructure udpate
SaintAngeLs May 12, 2024
760cf24
(#125) notifications api implementaiton
SaintAngeLs May 12, 2024
d4c9e08
(#125) adding the udpated docuemntation and dev scripts
SaintAngeLs May 12, 2024
9215306
(#125) api notifications service implementation
SaintAngeLs May 12, 2024
90b2a0e
(#125) api notifications update
SaintAngeLs May 12, 2024
fce6837
(#125) notifications udpate the status update
SaintAngeLs May 12, 2024
4afb0df
(#140) apsettings update
SaintAngeLs May 12, 2024
b6b6350
(#125) friend client service
SaintAngeLs May 15, 2024
06bcf5d
(#125) friend repository update
SaintAngeLs May 15, 2024
49e5dc1
(#125) add friend handler
SaintAngeLs May 15, 2024
6db6a13
Merge remote-tracking branch 'remotes/origin/dev' into notifications_…
SaintAngeLs May 15, 2024
c4ffff7
(#125) adding the infrastucture clined for the friends service
SaintAngeLs May 15, 2024
5e0db56
(#125) adding the document for the notification from the frined service
SaintAngeLs May 15, 2024
82109d4
(#125) frined events dto for notifications
SaintAngeLs May 15, 2024
5ed7d2b
(#125) repositorie modifications
SaintAngeLs May 16, 2024
6d8a263
(#125) update the core notification infrastrucutre
SaintAngeLs May 16, 2024
1195d28
(#125) event mapper update in the frined service
SaintAngeLs May 16, 2024
a9f3df2
(#125) ntrada update
SaintAngeLs May 16, 2024
cf3aadc
(#125) message to logger template update
SaintAngeLs May 16, 2024
43c573d
(#125) remove the unnecessary event handler
SaintAngeLs May 17, 2024
090d71f
(#125) frineds commands update
SaintAngeLs May 17, 2024
daba825
(#125)frineds service event publishing update
SaintAngeLs May 17, 2024
745b2fc
(#125) frined serice external event udpate
SaintAngeLs May 17, 2024
e462874
(#125) events serialisations for the friends request sent
SaintAngeLs May 17, 2024
6dd6d01
(#125) new student mode udpate in the notification service
SaintAngeLs May 17, 2024
5186684
(#125) friends service mongo docuemnt for the notification student ud…
SaintAngeLs May 17, 2024
8194620
(#125) studnet-notifications class implementaiton in the core
SaintAngeLs May 17, 2024
f4a313f
(#125) adding the application student-notification dto
SaintAngeLs May 17, 2024
b84ff76
(#125) feature to store the student regarding events
SaintAngeLs May 17, 2024
c992f4d
(#125) udpate the udpate asung method
SaintAngeLs May 17, 2024
ed09c63
(#125) temporary unsubsribe from frined request created event
SaintAngeLs May 17, 2024
7c1af0d
(#125) sign in for styles udpate
SaintAngeLs May 17, 2024
868ba34
(#125) margins update
SaintAngeLs May 17, 2024
eb82581
(#125) sign up styles udpate
SaintAngeLs May 17, 2024
7783c9d
(#125) sing-in up styles udpate
SaintAngeLs May 17, 2024
2a89c96
(#125) notificaiton servicr registration in the ui
SaintAngeLs May 17, 2024
c680e69
(#125) layout update
SaintAngeLs May 18, 2024
6340e0e
(#125) blazor applciation layout update, reloading the page after sig…
SaintAngeLs May 18, 2024
25b43f3
(#125) adding te testing bredcramps
SaintAngeLs May 18, 2024
9a4de65
(#125) frineds views udpate
SaintAngeLs May 18, 2024
6f6bcbf
(#125) deployment scripts udpate
SaintAngeLs May 18, 2024
e90847e
(#125) addingt the Student Friend request docuemtn
SaintAngeLs May 18, 2024
7bf2303
(#125) friends core udpate
SaintAngeLs May 19, 2024
0ac8f28
(#125) interface for the studentFrineds repository
SaintAngeLs May 19, 2024
7668c41
(#125) studnet-requests, student-friend repository pattern implementa…
SaintAngeLs May 19, 2024
1851ce6
(#125) InviteFriend handler udpated
SaintAngeLs May 19, 2024
3a71b6a
(#125) conflicts resolve
SaintAngeLs May 19, 2024
ffbb26a
(#125) conflicts resolve
SaintAngeLs May 19, 2024
148bd15
(#125) frineds service udpate, adding the .gitignore to the mediafiles
SaintAngeLs May 19, 2024
00901fd
(#125) add the updated feature to load sent frined requests
SaintAngeLs May 19, 2024
e469fbd
(#125) frined request withdraw implementation
SaintAngeLs May 19, 2024
f842a88
(#125) frineds get requests update for the new repository structure
SaintAngeLs May 19, 2024
571d075
(#125) blazor frined service udpate
SaintAngeLs May 19, 2024
5832a3f
(#125) friend request accept udpate
SaintAngeLs May 20, 2024
4096553
Merge remote-tracking branch 'remotes/origin/dev' into notifications_…
SaintAngeLs May 22, 2024
2df1a88
(#125) add studnet frineds dto
SaintAngeLs May 22, 2024
d038169
(#125) udpate getting the student frineds query handler
SaintAngeLs May 22, 2024
056816c
(#125) frineds list udpate in the frineds razor component
SaintAngeLs May 22, 2024
e7e6882
(#125) jhandling the adding students to the student-frined repository
SaintAngeLs May 22, 2024
b806845
(#125) update the friendship withdrawing handling
SaintAngeLs May 22, 2024
1b18a49
(#125) students service store feature update
SaintAngeLs May 23, 2024
29d4e59
(#125) pagination and filtering for the notifications
SaintAngeLs May 23, 2024
7db9682
(#125) adding the pagination to the news notificaiton objec
SaintAngeLs May 23, 2024
8c1cf10
(#125) adding the hosted service for the notifications
SaintAngeLs May 23, 2024
02d8aba
(#125) implementing notifications pagincation in Blazor application
SaintAngeLs May 23, 2024
2c169b7
(#125) cheching up the frined serivce and the notifications service i…
SaintAngeLs May 23, 2024
fec7917
(#125) dfrined request accepted event handler
SaintAngeLs May 23, 2024
b9beb3f
(#125) resolving doubling in frined accepted event publishing
SaintAngeLs May 23, 2024
cff7601
(#125) udpatge the notification events handlers
SaintAngeLs May 23, 2024
a7cdfd2
(#125) adding the index images compressed
SaintAngeLs May 23, 2024
d48bdb5
(#125) notification razor component update
SaintAngeLs May 23, 2024
1d5b3a8
(#125) remove frined handler udpate for the student-requests regardin…
SaintAngeLs May 23, 2024
56cdf77
(#125) adding the gradient to layout
SaintAngeLs May 23, 2024
be6bb48
(#125) some layout improvements
SaintAngeLs May 23, 2024
9c384ae
(#125) update the notifications api, adding endpoint to get notificat…
SaintAngeLs May 24, 2024
3142433
(#125) get notification by user id implementation
SaintAngeLs May 24, 2024
6238dd6
(#149) (#31) ntradat udpate for the notifications serivce
SaintAngeLs May 24, 2024
efe41d1
(#125) blazor notification service update, endpoint to get the notifi…
SaintAngeLs May 24, 2024
6d85057
(#125) adding the notification page
SaintAngeLs May 24, 2024
bb7a927
(#125) feature to udpate the status of the notification
SaintAngeLs May 24, 2024
8d10d83
(#125) cleaning up some event handlers
SaintAngeLs May 24, 2024
f04c3c4
(#125) (#31) notifications ntrada update
SaintAngeLs May 24, 2024
dcb340e
(#125) notifications list balzoor component update
SaintAngeLs May 24, 2024
b0f6ffa
(#125) notification status udpate handle in razor component, firned s…
SaintAngeLs May 24, 2024
164eec4
(#125) friends search styled udpate
SaintAngeLs May 24, 2024
648c767
(#125) promisification the filter for geting studnet notifications co…
SaintAngeLs May 24, 2024
cd6892a
(#125) rwd for the frineds search, frineds list and internal notifica…
SaintAngeLs May 24, 2024
5c8f54a
(#125) main layut udpate
SaintAngeLs May 24, 2024
40f04d4
(#125) css udpate with the page main layout
SaintAngeLs May 24, 2024
1f764aa
(#125) RadzenSidebarToggle styles update
SaintAngeLs May 24, 2024
dd04544
(#125) new razor page for new notifications
SaintAngeLs May 24, 2024
c7991b0
(#125) notifications history razor page
SaintAngeLs May 24, 2024
0076d4a
(#125) notificaitons service delet method functionality udpate
SaintAngeLs May 24, 2024
5b99568
(#149) delete studnet notification -- udpate studnet notifcaiton int…
SaintAngeLs May 24, 2024
47e8e72
(#149) delet notification handler udpate, publishing NotificationDel…
SaintAngeLs May 24, 2024
239f9ca
(#149) delete command handler clean-up
SaintAngeLs May 24, 2024
04cc3bc
(#125) feature to remove notification from the student notification r…
SaintAngeLs May 24, 2024
1e48bd9
(#125) notification service redundant cleaning up
SaintAngeLs May 24, 2024
e1c6e74
(#125) notification razor component update, handling the links for th…
SaintAngeLs May 24, 2024
3db8029
(#125) notification component styles udpate
SaintAngeLs May 24, 2024
393945e
(#125) notifications razor components -- update the notifications his…
SaintAngeLs May 24, 2024
1c82d0b
(#125) breadcramps update for notifications
SaintAngeLs May 24, 2024
b3c595d
(#125) (#173) notificatgion entity modification
SaintAngeLs May 24, 2024
1c5ccd0
(#125) notification entity update to add the notification type
SaintAngeLs May 24, 2024
6614f16
(#125) event handlers udpate
SaintAngeLs May 24, 2024
4d75d86
(#125) notifications components udpate
SaintAngeLs May 24, 2024
3bec0a3
(#125) update the pagincation for notifications, notification dto udpate
SaintAngeLs May 24, 2024
59b486b
(#125) handling the entity id in the razor component of notification
SaintAngeLs May 24, 2024
e64513c
(#125) feature to preload the images for the search friends for pagin…
SaintAngeLs May 24, 2024
7770de9
(#125) adding the external events for the events service in notificat…
SaintAngeLs May 24, 2024
6dfb19d
(#125) events service notifications messages contracts added
SaintAngeLs May 24, 2024
3f7b4ca
(#125) notifications service adding the contracts to the external events
SaintAngeLs May 24, 2024
499cdc9
(#125) adding evnet created handler
SaintAngeLs May 24, 2024
a100a9f
(#125) apsettings udpate
SaintAngeLs May 24, 2024
61cced9
(#125) deployment script update
SaintAngeLs May 25, 2024
389875d
(#125) maing to dev in the test deployment udpate
SaintAngeLs May 25, 2024
75a83f1
(#125) update deployment scripts
SaintAngeLs May 25, 2024
bd3428e
(#125) reverting the deployment from main
SaintAngeLs May 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/cloud_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Deploy to Cloud
on:
push:
branches:
- dev # dev for the test purposes here
- main
pull_request:
branches:
- dev
- main

jobs:
deploy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,42 @@ modules:
method: POST
use: downstream
downstream: notifications-service/notifications
auth: true
auth: true

- upstream: /{userId}
method: GET
use: downstream
downstream: notifications-service/notifications/{userId}
auth: true

- upstream: /notification/{notificationId}
method: GET
use: downstream
downstream: notifications-service/notifications/notification/{notificationId}
auth: true

- upstream: /notification/{userId}/{notificationId}
method: DELETE
use: downstream
downstream: notifications-service/notifications/notification/{userId}/{notificationId}
auth: true
bind:
- userId:{userId}
- notificationId:{notificationId}

- upstream: /{userId}/{notificationId}
method: GET
use: downstream
downstream: notifications-service/notifications/{userId}/{notificationId}
auth: true
description: Retrieves a specific notification for a user by notification ID.

- upstream: /{userId}/{notificationId}/status
method: PUT
use: downstream
downstream: notifications-service/notifications/{userId}/{notificationId}/status
auth: true
description: Updates the status of a specific notification.

services:
notifications-service:
Expand Down Expand Up @@ -513,6 +542,12 @@ modules:
bind:
- userId: {userId}
auth: true
afterDispatch:
- use: publish
event: FriendInviteSent
target: notifications-service/events
routingKey: friend_request_created


- upstream: /{requesterId}/{friendId}/remove
method: DELETE
Expand Down Expand Up @@ -565,10 +600,13 @@ modules:
downstream: friends-service/friends/requests/sent/{userId}
auth: true

services:
friends-service:
localUrl: localhost:5012
url: friends-service
- upstream: /requests/{userId}/withdraw
method: PUT
use: downstream
downstream: friends-service/friends/requests/{userId}/withdraw
bind:
- userId: {userId}
auth: true



Expand Down
17 changes: 13 additions & 4 deletions MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada-async.yml
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,12 @@ modules:
bind:
- userId: {userId}
auth: true
afterDispatch:
- use: publish
event: FriendInviteSent
target: notifications-service/events
routingKey: friend_request_created


- upstream: /{requesterId}/{friendId}/remove
method: DELETE
Expand Down Expand Up @@ -565,10 +571,13 @@ modules:
downstream: friends-service/friends/requests/sent/{userId}
auth: true

services:
friends-service:
localUrl: localhost:5012
url: friends-service
- upstream: /requests/{userId}/withdraw
method: PUT
use: downstream
downstream: friends-service/friends/requests/{userId}/withdraw
bind:
- userId: {userId}
auth: true



Expand Down
48 changes: 43 additions & 5 deletions MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,42 @@ modules:
method: POST
use: downstream
downstream: notifications-service/notifications
auth: true
auth: true

- upstream: /{userId}
method: GET
use: downstream
downstream: notifications-service/notifications/{userId}
auth: true

- upstream: /notification/{notificationId}
method: GET
use: downstream
downstream: notifications-service/notifications/notification/{notificationId}
auth: true

- upstream: /notification/{userId}/{notificationId}
method: DELETE
use: downstream
downstream: notifications-service/notifications/notification/{userId}/{notificationId}
auth: true
bind:
- userId:{userId}
- notificationId:{notificationId}

- upstream: /{userId}/{notificationId}
method: GET
use: downstream
downstream: notifications-service/notifications/{userId}/{notificationId}
auth: true
description: Retrieves a specific notification for a user by notification ID.

- upstream: /{userId}/{notificationId}/status
method: PUT
use: downstream
downstream: notifications-service/notifications/{userId}/{notificationId}/status
auth: true
description: Updates the status of a specific notification.

services:
notifications-service:
Expand Down Expand Up @@ -490,6 +519,12 @@ modules:
bind:
- userId: {userId}
auth: true
afterDispatch:
- use: publish
event: FriendInviteSent
target: notifications-service/events
routingKey: friend_request_created


- upstream: /{requesterId}/{friendId}/remove
method: DELETE
Expand Down Expand Up @@ -542,10 +577,13 @@ modules:
downstream: friends-service/friends/requests/sent/{userId}
auth: true

services:
friends-service:
localUrl: localhost:5012
url: friends-service
- upstream: /requests/{userId}/withdraw
method: PUT
use: downstream
downstream: friends-service/friends/requests/{userId}/withdraw
bind:
- userId: {userId}
auth: true



Expand Down
53 changes: 50 additions & 3 deletions MiniSpace.APIGateway/src/MiniSpace.APIGateway/ntrada.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,52 @@ modules:
method: POST
use: downstream
downstream: notifications-service/notifications
auth: true
auth: true

- upstream: /{userId}
method: GET
use: downstream
downstream: notifications-service/notifications/{userId}
auth: true

- upstream: /notification/{notificationId}
method: GET
use: downstream
downstream: notifications-service/notifications/notification/{notificationId}
auth: true

- upstream: /notification/{userId}/{notificationId}
method: DELETE
use: downstream
downstream: notifications-service/notifications/notification/{userId}/{notificationId}
auth: true
bind:
- userId:{userId}
- notificationId:{notificationId}

- upstream: /{userId}/{notificationId}
method: GET
use: downstream
downstream: notifications-service/notifications/{userId}/{notificationId}
auth: true
description: Retrieves a specific notification for a user by notification ID.

- upstream: /{userId}/{notificationId}/status
method: PUT
use: downstream
downstream: notifications-service/notifications/{userId}/{notificationId}/status
auth: true
description: Updates the status of a specific notification.

services:
notifications-service:
localUrl: localhost:5006
url: notifications-service








Expand Down Expand Up @@ -492,6 +526,12 @@ modules:
bind:
- userId: {userId}
auth: true
afterDispatch:
- use: publish
event: FriendInviteSent
target: notifications-service/events
routingKey: friend_request_created


- upstream: /{requesterId}/{friendId}/remove
method: DELETE
Expand Down Expand Up @@ -544,6 +584,14 @@ modules:
downstream: friends-service/friends/requests/sent/{userId}
auth: true

- upstream: /requests/{userId}/withdraw
method: PUT
use: downstream
downstream: friends-service/friends/requests/{userId}/withdraw
bind:
- userId: {userId}
auth: true

services:
friends-service:
localUrl: localhost:5012
Expand Down Expand Up @@ -700,5 +748,4 @@ modules:
organizations-service:
localUrl: localhost:5015
url: organizations-service



Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniSpace.Services.Events.Api", "MiniSpace.Services.Events.Api.csproj", "{075CA7F0-8B43-4F73-8A1B-31C246206002}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{075CA7F0-8B43-4F73-8A1B-31C246206002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{075CA7F0-8B43-4F73-8A1B-31C246206002}.Debug|Any CPU.Build.0 = Debug|Any CPU
{075CA7F0-8B43-4F73-8A1B-31C246206002}.Release|Any CPU.ActiveCfg = Release|Any CPU
{075CA7F0-8B43-4F73-8A1B-31C246206002}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {65FCD660-A2AF-4F11-AFD6-C07F118AC0D7}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using Convey.CQRS.Events;
using Convey.MessageBrokers;

namespace MiniSpace.Services.Events.Application.Events
{
[Message("notifications")]
public class EventCreated(Guid eventId, Guid organizerId, IEnumerable<Guid> mediaFilesIds) : IEvent
{
public Guid EventId { get; set; } = eventId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using Convey.CQRS.Events;
using Convey.MessageBrokers;

namespace MiniSpace.Services.Events.Application.Events
{
[Message("notifications")]
public class EventParticipantAdded: IEvent
{
public Guid EventId { get; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using Convey.CQRS.Events;
using Convey.MessageBrokers;

namespace MiniSpace.Services.Events.Application.Events
{
[Message("notifications")]
public class EventParticipantRemoved: IEvent
{
public Guid EventId { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
using System.Collections;
using System.Collections.Generic;
using Convey.CQRS.Events;
using Convey.MessageBrokers;

namespace MiniSpace.Services.Events.Application.Events
{
[Message("notifications")]
public class EventUpdated(Guid eventId, DateTime updatedAt, Guid updatedBy, IEnumerable<Guid> mediaFilesIds) : IEvent
{
public Guid EventId { get; set; } = eventId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using Convey.CQRS.Events;
using Convey.MessageBrokers;

namespace MiniSpace.Services.Events.Application.Events
{
[Message("notifications")]
public class StudentCancelledInterestInEvent: IEvent
{
public Guid EventId { get; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using Convey.CQRS.Events;
using Convey.MessageBrokers;

namespace MiniSpace.Services.Events.Application.Events
{
[Message("notifications")]
public class StudentCancelledSignUpToEvent: IEvent
{
public Guid EventId { get; }
Expand Down
Loading
Loading