(#411) events: refactor events core

SaintAngeLs · SaintAngeLs · commit 7a7655c9386f · 2024-09-16T16:58:00.000+02:00
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Entities/Event.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Entities/Event.cs
@@ -116,9 +116,9 @@ public void SignUpParticipant(Participant participant)
 
         public void AddParticipant(Participant participant)
         {
-            if (SignedUpParticipants.Any(p => p.StudentId == participant.StudentId))
+            if (SignedUpParticipants.Any(p => p.UserId == participant.UserId))
             {
-                throw new StudentAlreadySignedUpException(participant.StudentId, Id);
+                throw new StudentAlreadySignedUpException(participant.UserId, Id);
             }
 
             if (SignedUpParticipants.Count() >= Capacity)
@@ -147,7 +147,7 @@ public void CancelSignUp(Guid studentId)
 
         public void RemoveParticipant(Guid studentId)
         {
-            var participant = _signedUpParticipants.SingleOrDefault(p => p.StudentId == studentId);
+            var participant = _signedUpParticipants.SingleOrDefault(p => p.UserId == studentId);
             if (participant is null)
             {
                 throw new StudentNotSignedUpException(studentId, Id);
@@ -180,17 +180,17 @@ public void AddGalleryImage(string newImageUrl)
 
         public void ShowParticipantInterest(Participant participant)
         {
-            if (InterestedParticipants.Any(p => p.StudentId == participant.StudentId))
+            if (InterestedParticipants.Any(p => p.UserId == participant.UserId))
             {
-                throw new StudentAlreadyInterestedInEventException(participant.StudentId, Id);
+                throw new StudentAlreadyInterestedInEventException(participant.UserId, Id);
             }
 
             _interestedParticipants.Add(participant);
         }
 
         public void CancelInterest(Guid studentId)
         {
-            var participant = _interestedParticipants.SingleOrDefault(p => p.StudentId == studentId);
+            var participant = _interestedParticipants.SingleOrDefault(p => p.UserId == studentId);
             if (participant is null)
             {
                 throw new StudentNotInterestedInEventException(studentId, Id);
@@ -206,7 +206,7 @@ public void Rate(Guid studentId, int rating)
                 throw new InvalidEventState(Id, State.Archived, State);
             }
 
-            if (_signedUpParticipants.All(p => p.StudentId != studentId))
+            if (_signedUpParticipants.All(p => p.UserId != studentId))
             {
                 throw new StudentNotSignedUpForEventException(Id, studentId);
             }
@@ -216,7 +216,7 @@ public void Rate(Guid studentId, int rating)
                 throw new InvalidRatingValueException(rating);
             }
 
-            if (_ratings.Any(r => r.StudentId == studentId))
+            if (_ratings.Any(r => r.UserId == studentId))
             {
                 throw new StudentAlreadyRatedException(studentId, Id);
             }
@@ -226,7 +226,7 @@ public void Rate(Guid studentId, int rating)
 
         public void CancelRate(Guid studentId)
         {
-            var rating = _ratings.SingleOrDefault(r => r.StudentId == studentId);
+            var rating = _ratings.SingleOrDefault(r => r.UserId == studentId);
             if (rating is null)
             {
                 throw new StudentNotRatedEventException(studentId, Id);
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Entities/Participant.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Entities/Participant.cs
@@ -2,8 +2,8 @@
 
 namespace MiniSpace.Services.Events.Core.Entities
 {
-    public class Participant(Guid studentId)
+    public class Participant(Guid userId)
     {
-        public Guid StudentId { get; set; } = studentId;
+        public Guid UserId { get; set; } = userId;
     }
 }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Entities/Rating.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Entities/Rating.cs
@@ -2,9 +2,9 @@
 
 namespace MiniSpace.Services.Events.Core.Entities
 {
-    public class Rating(Guid studentId, int value)
+    public class Rating(Guid userId, int value)
     {
-        public Guid StudentId { get; set; } = studentId;
+        public Guid UserId { get; set; } = userId;
         public int Value { get; set; } = value;
     }
 }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentAlreadyInterestedInEventException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentAlreadyInterestedInEventException.cs
@@ -6,12 +6,12 @@ public class StudentAlreadyInterestedInEventException : DomainException
     {
         public override string Code { get; } = "student_already_interested_in_event";
         public Guid EventId { get; }
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
 
-        public StudentAlreadyInterestedInEventException(Guid studentId, Guid eventId) 
-            : base($"Student with ID: {studentId} is already interested in event with ID: {eventId}.")
+        public StudentAlreadyInterestedInEventException(Guid userId, Guid eventId) 
+            : base($"Student with ID: {userId} is already interested in event with ID: {eventId}.")
         {
-            StudentId = studentId;
+            UserId = userId;
             EventId = eventId;
         }
     }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentAlreadyRatedException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentAlreadyRatedException.cs
@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions
     public class StudentAlreadyRatedException : DomainException
     {
         public override string Code { get; } = "student_already_rated";
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
         public Guid EventId { get; }
 
-        public StudentAlreadyRatedException(Guid studentId, Guid eventId) : base(
-            $"Student with ID: {studentId} has already rated event with ID: {eventId}.")
+        public StudentAlreadyRatedException(Guid userId, Guid eventId) : base(
+            $"Student with ID: {userId} has already rated event with ID: {eventId}.")
         {
-            StudentId = studentId;
+            UserId = userId;
             EventId = eventId;
         }
     }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentAlreadySignedUpException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentAlreadySignedUpException.cs
@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions
     public class StudentAlreadySignedUpException : DomainException
     {
         public override string Code { get; } = "student_already_signed_up";
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
         public Guid EventId { get; }
 
-        public StudentAlreadySignedUpException(Guid studentId, Guid eventId) : base(
-            $"Student with ID: {studentId} already signed up to event with ID: {eventId}.")
+        public StudentAlreadySignedUpException(Guid userId, Guid eventId) : base(
+            $"Student with ID: {userId} already signed up to event with ID: {eventId}.")
         {
-            StudentId = studentId;
+            UserId = userId;
             EventId = eventId;
         }
     }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotInterestedInEventException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotInterestedInEventException.cs
@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions
     public class StudentNotInterestedInEventException : DomainException
     {
         public override string Code { get; } = "student_is_not_interested_in_event";
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
         public Guid EventId { get; }
 
-        public StudentNotInterestedInEventException(Guid studentId, Guid eventId) 
-            : base($"Student with ID: '{studentId}' is not interested in event with ID: '{eventId}'.")
+        public StudentNotInterestedInEventException(Guid userId, Guid eventId) 
+            : base($"Student with ID: '{userId}' is not interested in event with ID: '{eventId}'.")
         {
-            StudentId = studentId;
+            UserId = userId;
             EventId = eventId;
         }
     }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotRatedEventException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotRatedEventException.cs
@@ -6,13 +6,13 @@ public class StudentNotRatedEventException : DomainException
     {
         public override string Code { get; } = "student_not_rated_event";
         public Guid EventId { get; }
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
 
-        public StudentNotRatedEventException(Guid eventId, Guid studentId) 
-            : base($"Student with ID: '{studentId}' has not rated event with ID: '{eventId}'.")
+        public StudentNotRatedEventException(Guid eventId, Guid userId) 
+            : base($"Student with ID: '{userId}' has not rated event with ID: '{eventId}'.")
         {
             EventId = eventId;
-            StudentId = studentId;
+            UserId = userId;
         }
     }
 }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotSignedUpException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotSignedUpException.cs
@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions
     public class StudentNotSignedUpException : DomainException
     {
         public override string Code { get; } = "student_not_signed_up";
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
         public Guid EventId { get; }
 
-        public StudentNotSignedUpException(Guid studentId, Guid eventId) 
-            : base($"Student with ID: '{studentId}' has not signed up to event with ID: '{eventId}'.")
+        public StudentNotSignedUpException(Guid userId, Guid eventId) 
+            : base($"Student with ID: '{userId}' has not signed up to event with ID: '{eventId}'.")
         {
-            StudentId = studentId;
+            UserId = userId;
             EventId = eventId;
         }
     }
diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotSignedUpForEventException.cs b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Core/Exceptions/StudentNotSignedUpForEventException.cs
@@ -6,13 +6,13 @@ public class StudentNotSignedUpForEventException : DomainException
     {
         public override string Code { get; } = "student_not_signed_for_event";
         public Guid EventId { get; }
-        public Guid StudentId { get; }
+        public Guid UserId { get; }
 
-        public StudentNotSignedUpForEventException(Guid eventId, Guid studentId) 
-            : base($"Student with ID: '{studentId}' is not signed for event with ID: '{eventId}'.")
+        public StudentNotSignedUpForEventException(Guid eventId, Guid userId) 
+            : base($"Student with ID: '{userId}' is not signed for event with ID: '{eventId}'.")
         {
             EventId = eventId;
-            StudentId = studentId;
+            UserId = userId;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ public void SignUpParticipant(Participant participant)`
`116`	`116`
`117`	`117`	`public void AddParticipant(Participant participant)`
`118`	`118`	`{`
`119`		`- if (SignedUpParticipants.Any(p => p.StudentId == participant.StudentId))`
	`119`	`+ if (SignedUpParticipants.Any(p => p.UserId == participant.UserId))`
`120`	`120`	`{`
`121`		`- throw new StudentAlreadySignedUpException(participant.StudentId, Id);`
	`121`	`+ throw new StudentAlreadySignedUpException(participant.UserId, Id);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`if (SignedUpParticipants.Count() >= Capacity)`
`@@ -147,7 +147,7 @@ public void CancelSignUp(Guid studentId)`
`147`	`147`
`148`	`148`	`public void RemoveParticipant(Guid studentId)`
`149`	`149`	`{`
`150`		`- var participant = _signedUpParticipants.SingleOrDefault(p => p.StudentId == studentId);`
	`150`	`+ var participant = _signedUpParticipants.SingleOrDefault(p => p.UserId == studentId);`
`151`	`151`	`if (participant is null)`
`152`	`152`	`{`
`153`	`153`	`throw new StudentNotSignedUpException(studentId, Id);`
`@@ -180,17 +180,17 @@ public void AddGalleryImage(string newImageUrl)`
`180`	`180`
`181`	`181`	`public void ShowParticipantInterest(Participant participant)`
`182`	`182`	`{`
`183`		`- if (InterestedParticipants.Any(p => p.StudentId == participant.StudentId))`
	`183`	`+ if (InterestedParticipants.Any(p => p.UserId == participant.UserId))`
`184`	`184`	`{`
`185`		`- throw new StudentAlreadyInterestedInEventException(participant.StudentId, Id);`
	`185`	`+ throw new StudentAlreadyInterestedInEventException(participant.UserId, Id);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`_interestedParticipants.Add(participant);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public void CancelInterest(Guid studentId)`
`192`	`192`	`{`
`193`		`- var participant = _interestedParticipants.SingleOrDefault(p => p.StudentId == studentId);`
	`193`	`+ var participant = _interestedParticipants.SingleOrDefault(p => p.UserId == studentId);`
`194`	`194`	`if (participant is null)`
`195`	`195`	`{`
`196`	`196`	`throw new StudentNotInterestedInEventException(studentId, Id);`
`@@ -206,7 +206,7 @@ public void Rate(Guid studentId, int rating)`
`206`	`206`	`throw new InvalidEventState(Id, State.Archived, State);`
`207`	`207`	`}`
`208`	`208`
`209`		`- if (_signedUpParticipants.All(p => p.StudentId != studentId))`
	`209`	`+ if (_signedUpParticipants.All(p => p.UserId != studentId))`
`210`	`210`	`{`
`211`	`211`	`throw new StudentNotSignedUpForEventException(Id, studentId);`
`212`	`212`	`}`
`@@ -216,7 +216,7 @@ public void Rate(Guid studentId, int rating)`
`216`	`216`	`throw new InvalidRatingValueException(rating);`
`217`	`217`	`}`
`218`	`218`
`219`		`- if (_ratings.Any(r => r.StudentId == studentId))`
	`219`	`+ if (_ratings.Any(r => r.UserId == studentId))`
`220`	`220`	`{`
`221`	`221`	`throw new StudentAlreadyRatedException(studentId, Id);`
`222`	`222`	`}`
`@@ -226,7 +226,7 @@ public void Rate(Guid studentId, int rating)`
`226`	`226`
`227`	`227`	`public void CancelRate(Guid studentId)`
`228`	`228`	`{`
`229`		`- var rating = _ratings.SingleOrDefault(r => r.StudentId == studentId);`
	`229`	`+ var rating = _ratings.SingleOrDefault(r => r.UserId == studentId);`
`230`	`230`	`if (rating is null)`
`231`	`231`	`{`
`232`	`232`	`throw new StudentNotRatedEventException(studentId, Id);`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace MiniSpace.Services.Events.Core.Entities`
`4`	`4`	`{`
`5`		`- public class Participant(Guid studentId)`
	`5`	`+ public class Participant(Guid userId)`
`6`	`6`	`{`
`7`		`- public Guid StudentId { get; set; } = studentId;`
	`7`	`+ public Guid UserId { get; set; } = userId;`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace MiniSpace.Services.Events.Core.Entities`
`4`	`4`	`{`
`5`		`- public class Rating(Guid studentId, int value)`
	`5`	`+ public class Rating(Guid userId, int value)`
`6`	`6`	`{`
`7`		`- public Guid StudentId { get; set; } = studentId;`
	`7`	`+ public Guid UserId { get; set; } = userId;`
`8`	`8`	`public int Value { get; set; } = value;`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@ public class StudentAlreadyInterestedInEventException : DomainException`
`6`	`6`	`{`
`7`	`7`	`public override string Code { get; } = "student_already_interested_in_event";`
`8`	`8`	`public Guid EventId { get; }`
`9`		`- public Guid StudentId { get; }`
	`9`	`+ public Guid UserId { get; }`
`10`	`10`
`11`		`- public StudentAlreadyInterestedInEventException(Guid studentId, Guid eventId)`
`12`		`- : base($"Student with ID: {studentId} is already interested in event with ID: {eventId}.")`
	`11`	`+ public StudentAlreadyInterestedInEventException(Guid userId, Guid eventId)`
	`12`	`+ : base($"Student with ID: {userId} is already interested in event with ID: {eventId}.")`
`13`	`13`	`{`
`14`		`- StudentId = studentId;`
	`14`	`+ UserId = userId;`
`15`	`15`	`EventId = eventId;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions`
`5`	`5`	`public class StudentAlreadyRatedException : DomainException`
`6`	`6`	`{`
`7`	`7`	`public override string Code { get; } = "student_already_rated";`
`8`		`- public Guid StudentId { get; }`
	`8`	`+ public Guid UserId { get; }`
`9`	`9`	`public Guid EventId { get; }`
`10`	`10`
`11`		`- public StudentAlreadyRatedException(Guid studentId, Guid eventId) : base(`
`12`		`- $"Student with ID: {studentId} has already rated event with ID: {eventId}.")`
	`11`	`+ public StudentAlreadyRatedException(Guid userId, Guid eventId) : base(`
	`12`	`+ $"Student with ID: {userId} has already rated event with ID: {eventId}.")`
`13`	`13`	`{`
`14`		`- StudentId = studentId;`
	`14`	`+ UserId = userId;`
`15`	`15`	`EventId = eventId;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions`
`5`	`5`	`public class StudentAlreadySignedUpException : DomainException`
`6`	`6`	`{`
`7`	`7`	`public override string Code { get; } = "student_already_signed_up";`
`8`		`- public Guid StudentId { get; }`
	`8`	`+ public Guid UserId { get; }`
`9`	`9`	`public Guid EventId { get; }`
`10`	`10`
`11`		`- public StudentAlreadySignedUpException(Guid studentId, Guid eventId) : base(`
`12`		`- $"Student with ID: {studentId} already signed up to event with ID: {eventId}.")`
	`11`	`+ public StudentAlreadySignedUpException(Guid userId, Guid eventId) : base(`
	`12`	`+ $"Student with ID: {userId} already signed up to event with ID: {eventId}.")`
`13`	`13`	`{`
`14`		`- StudentId = studentId;`
	`14`	`+ UserId = userId;`
`15`	`15`	`EventId = eventId;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions`
`5`	`5`	`public class StudentNotInterestedInEventException : DomainException`
`6`	`6`	`{`
`7`	`7`	`public override string Code { get; } = "student_is_not_interested_in_event";`
`8`		`- public Guid StudentId { get; }`
	`8`	`+ public Guid UserId { get; }`
`9`	`9`	`public Guid EventId { get; }`
`10`	`10`
`11`		`- public StudentNotInterestedInEventException(Guid studentId, Guid eventId)`
`12`		`- : base($"Student with ID: '{studentId}' is not interested in event with ID: '{eventId}'.")`
	`11`	`+ public StudentNotInterestedInEventException(Guid userId, Guid eventId)`
	`12`	`+ : base($"Student with ID: '{userId}' is not interested in event with ID: '{eventId}'.")`
`13`	`13`	`{`
`14`		`- StudentId = studentId;`
	`14`	`+ UserId = userId;`
`15`	`15`	`EventId = eventId;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ public class StudentNotRatedEventException : DomainException`
`6`	`6`	`{`
`7`	`7`	`public override string Code { get; } = "student_not_rated_event";`
`8`	`8`	`public Guid EventId { get; }`
`9`		`- public Guid StudentId { get; }`
	`9`	`+ public Guid UserId { get; }`
`10`	`10`
`11`		`- public StudentNotRatedEventException(Guid eventId, Guid studentId)`
`12`		`- : base($"Student with ID: '{studentId}' has not rated event with ID: '{eventId}'.")`
	`11`	`+ public StudentNotRatedEventException(Guid eventId, Guid userId)`
	`12`	`+ : base($"Student with ID: '{userId}' has not rated event with ID: '{eventId}'.")`
`13`	`13`	`{`
`14`	`14`	`EventId = eventId;`
`15`		`- StudentId = studentId;`
	`15`	`+ UserId = userId;`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ namespace MiniSpace.Services.Events.Core.Exceptions`
`5`	`5`	`public class StudentNotSignedUpException : DomainException`
`6`	`6`	`{`
`7`	`7`	`public override string Code { get; } = "student_not_signed_up";`
`8`		`- public Guid StudentId { get; }`
	`8`	`+ public Guid UserId { get; }`
`9`	`9`	`public Guid EventId { get; }`
`10`	`10`
`11`		`- public StudentNotSignedUpException(Guid studentId, Guid eventId)`
`12`		`- : base($"Student with ID: '{studentId}' has not signed up to event with ID: '{eventId}'.")`
	`11`	`+ public StudentNotSignedUpException(Guid userId, Guid eventId)`
	`12`	`+ : base($"Student with ID: '{userId}' has not signed up to event with ID: '{eventId}'.")`
`13`	`13`	`{`
`14`		`- StudentId = studentId;`
	`14`	`+ UserId = userId;`
`15`	`15`	`EventId = eventId;`
`16`	`16`	`}`
`17`	`17`	`}`