Merge pull request #436 from kzi-nastava/feat/reportB

[Update] Course and EnrollmentRequest services
kzi-nastava · May 27, 2024 · 13de063 · 13de063
2 parents 96ff622 + 531f6ec
commit 13de063
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/LangLang/BusinessLogic/UseCases/CourseService.cs b/LangLang/BusinessLogic/UseCases/CourseService.cs
@@ -59,7 +59,7 @@ public void DeleteByTutor(Tutor tutor)
                     else
                     {
                         EnrollmentRequestService enrollmentRequestService = new();
-                        enrollmentRequestService.
+                        enrollmentRequestService.Delete(course);
                         Delete(course.Id);
                     }
                 }

diff --git a/LangLang/BusinessLogic/UseCases/EnrollmentRequestService.cs b/LangLang/BusinessLogic/UseCases/EnrollmentRequestService.cs
@@ -69,6 +69,14 @@ public List<EnrollmentRequest> GetByCourse(Course course)
            return _enrollmentRequests.GetByCourse(course);
         }
 
+        public void Delete(Course course)
+        {
+            foreach (EnrollmentRequest enrollmentRequest in GetByCourse(course))
+            {
+                Delete(enrollmentRequest.Id);
+            }
+        }
+
         public void CancelRequest(int id, Course course)
         {
             if (course.DaysUntilStart() < Constants.COURSE_CANCELLATION_PERIOD)

diff --git a/LangLang/Data/courses.csv b/LangLang/Data/courses.csv
@@ -1,5 +1,5 @@
-0|0|English|B1|4|Monday Wednesday|True|1|20|2025-01-01|False|False|False
-1|1|Spanish|A1|10|Thursday|True|0|5|2024-05-01|False|False|False
-2|0|Serbian|C2|7|Wednesday|True|2|3|2024-01-02|False|False|False
-3|0|Italian|A1|5|Thursday Friday|True|0|30|2024-10-12|False|True|False
-4|0|Korean|B2|6|Monday Thursday|True|2|0|2024-05-05|False|False|False
+0|0|English|B1|4|Monday Wednesday|True|1|20|1/1/2025 12:00:00 PM|False|False|False
+1|1|Spanish|A1|10|Thursday|True|0|5|5/1/2024 2:00:00 PM|False|False|False
+2|0|Serbian|C2|7|Wednesday|True|2|3|1/2/2024 4:00:00 PM|False|False|False
+3|0|Italian|A1|5|Thursday Friday|True|0|30|10/12/2024 6:00:00 PM|False|True|False
+4|0|Korean|B2|6|Monday Thursday|True|2|0|5/5/2024 10:00:00 AM|False|False|False
diff --git a/LangLang/Domain/Models/Course.cs b/LangLang/Domain/Models/Course.cs
@@ -123,7 +123,7 @@ public override string ToString()
             {
                 sbDays.Remove(sbDays.Length - 1, 1);
             }
-            return string.Join("|", new object[] { Id, TutorId, Language, Level.ToString(), NumberOfWeeks, sbDays.ToString(), Online, NumberOfStudents, MaxStudents, StartDateTime.ToString(Constants.DATE_FORMAT), CreatedByDirector, Modifiable, GratitudeEmailSent });
+            return string.Join("|", new object[] { Id, TutorId, Language, Level.ToString(), NumberOfWeeks, sbDays.ToString(), Online, NumberOfStudents, MaxStudents, StartDateTime.ToString(), CreatedByDirector, Modifiable, GratitudeEmailSent });
         }
     }
 }