Activity detail

thientm27 · Aug 22, 2023 · e4162c6 · e4162c6
1 parent 0d7c1e3
commit e4162c6
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/Clup-MemberShip/ClubMemberShip.Present/Pages/PageUser/ClubActivityInformation.cshtml.cs b/Clup-MemberShip/ClubMemberShip.Present/Pages/PageUser/ClubActivityInformation.cshtml.cs
@@ -33,11 +33,11 @@ public IActionResult OnGetAsync(int? id)
             {
                 return NotFound();
             }
-            else
-            {
-                ClubActivity = clubActivity;
-            }
 
+            ClubActivity = clubActivity;
+
+            var participants = _clubActivityService.GetListStudentInActivity((int)id);
+            Student = participants ?? new List<Student>();
             return Page();
         }
     }

diff --git a/Clup-MemberShip/ClubMemberShip.Present/Pages/PageUser/ClubDetail.cshtml b/Clup-MemberShip/ClubMemberShip.Present/Pages/PageUser/ClubDetail.cshtml
@@ -131,7 +131,7 @@
             </td>
             <td>
                 @* <a asp-page="./Edit" asp-route-id="@item.Id">Edit</a> | *@
-                <a asp-page="./ClubActivityInformationModel" asp-route-id="@item.Id">Details</a> |
+                <a asp-page="./ClubActivityInformation" asp-route-id="@item.Id">Details</a> |
             </td>
         </tr>
     }

diff --git a/Clup-MemberShip/ClubMemberShip.Service/IClubActivityService.cs b/Clup-MemberShip/ClubMemberShip.Service/IClubActivityService.cs
@@ -4,5 +4,5 @@ namespace ClubMemberShip.Service;
 
 public interface IClubActivityService : IGenericService<ClubActivity>
 {
-
+    public List<Student>? GetListStudentInActivity(int id);
 }
diff --git a/Clup-MemberShip/ClubMemberShip.Service/IParticipantService.cs b/Clup-MemberShip/ClubMemberShip.Service/IParticipantService.cs
@@ -4,5 +4,5 @@ namespace ClubMemberShip.Service;
 
 public interface IParticipantService  : IGenericService<Participant>
 {
-
+    public List<Participant>? GetByCluActivityId(int clubActivityId);
 }
diff --git a/Clup-MemberShip/ClubMemberShip.Service/Service/ClubActivityService.cs b/Clup-MemberShip/ClubMemberShip.Service/Service/ClubActivityService.cs
@@ -42,13 +42,24 @@ public override Result Delete(object idToDelete)
 
     public override Result Add(ClubActivity newEntity)
     {
-
         var maxId = (Get() ?? new List<ClubActivity>()).Max(o => o.Id);
         newEntity.Id = maxId + 1;
         newEntity.Status = Status.Active;
-        
+
         UnitOfWork.ClubActivityRepo.Create(newEntity);
         UnitOfWork.SaveChange();
         return Result.Ok;
     }
+
+    public List<Student>? GetListStudentInActivity(int id)
+    {
+        var listJoin = UnitOfWork.ParticipantRepo.Get(filter: o => o.ClubActivityId == id);
+
+        var listMemberShipId = listJoin.Select(o => o.MembershipId);
+        var listMemberShip = UnitOfWork.MemberShipRepo.Get(filter: o => listMemberShipId.Contains(o.Id));
+
+        var listStudentId = listMemberShip.Select(o => o.StudentId);
+
+        return UnitOfWork.StudentRepo.Get(filter: o => listStudentId.Contains(o.Id));
+    }
 }
diff --git a/Clup-MemberShip/ClubMemberShip.Service/Service/ParticipantService.cs b/Clup-MemberShip/ClubMemberShip.Service/Service/ParticipantService.cs
@@ -53,4 +53,9 @@ public override Result Add(Participant newEntity)
         UnitOfWork.SaveChange();
         return Result.Ok;
     }
+
+    public List<Participant>? GetByCluActivityId(int clubActivityId)
+    {
+        return UnitOfWork.ParticipantRepo.Get(filter: o => o.ClubActivityId == clubActivityId);
+    }
 }