(#117) Organizations service - endpoints fix

MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Application/Commands/Handlers/AddOrganizerToOrganizationHandler.cs

@@ -36,14 +36,14 @@ public async Task HandleAsync(AddOrganizerToOrganization command, CancellationTo
             {
                 throw new OrganizationNotFoundException(command.OrganizationId);
             }
-
+    
             var organizer = await _organizerRepository.GetAsync(command.OrganizerId);
             if (organizer is null)
             {
                 throw new OrganizerNotFoundException(command.OrganizerId);
             }
 
-            organization.AddOrganizer(organizer);
+            organization.AddOrganizer(command.OrganizerId);
             await _organizationRepository.UpdateAsync(organization);
             await _messageBroker.PublishAsync(new OrganizerAddedToOrganization(organization.Id, organizer.Id));
         }

MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Application/Commands/Handlers/RemoveOrganizerFromOrganizationHandler.cs

@@ -41,7 +41,7 @@ public async Task HandleAsync(RemoveOrganizerFromOrganization command, Cancellat
                 throw new OrganizerNotFoundException(command.OrganizerId);
             }
 
-            organization.RemoveOrganizer(organizer);
+            organization.RemoveOrganizer(organizer.Id);
             await _organizationRepository.UpdateAsync(organization);
         }
     }

MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Application/Events/External/Handlers/OrganizerRightsRevokedHandler.cs

@@ -26,7 +26,7 @@ public async Task HandleAsync(OrganizerRightsRevoked @event, CancellationToken c
             var organizerOrganizations = await _organizationRepository.GetOrganizerOrganizationsAsync(@event.UserId);
             foreach (var organization in organizerOrganizations)
             {
-                organization.RemoveOrganizer(organizer);
+                organization.RemoveOrganizer(organizer.Id);
                 await _organizationRepository.UpdateAsync(organization);
             }
 

MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Core/Entities/Organization.cs

@@ -24,26 +24,23 @@ public Organization(Guid id, string name, Guid parentId, bool isLeaf = true, IEn
             Organizers = organizers ?? Enumerable.Empty<Organizer>();
         }
 
-        public void RemoveOrganizer(Organizer organizer)
-            => _organizers.Remove(organizer);
-
         public void RemoveOrganizer(Guid organizerId)
         {
             var organizer = _organizers.SingleOrDefault(x => x.Id == organizerId);
             if(organizer is null)
             {
                 throw new OrganizerIsNotInOrganization(organizerId, Id);
             }
-            RemoveOrganizer(organizer);
+            _organizers.Remove(organizer);
         }
 
-        public void AddOrganizer(Organizer organizer)
+        public void AddOrganizer(Guid organizerId)
         {
-            if(Organizers.Contains(organizer))
+            if(Organizers.Any(x => x.Id == organizerId))
             {
-                throw new OrganizerAlreadyAddedToOrganizationException(organizer.Id, Id);
+                throw new OrganizerAlreadyAddedToOrganizationException(organizerId, Id);
             }
-            _organizers.Add(organizer);
+            _organizers.Add(new Organizer(organizerId));
         }