fix: 🐛 fix page bug

yeukfei02 · Jan 2, 2023 · 77b6a41 · 77b6a41
1 parent 9b4cbd7
commit 77b6a41
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/apps/api/src/incident/incident.controller.ts b/apps/api/src/incident/incident.controller.ts
@@ -70,7 +70,12 @@ export class IncidentController {
       page,
       perPage
     );
-    const allIncidents = await this.incidentService.getAllIncidents();
+    const allIncidents =
+      await this.incidentService.getAllIncidentsByUserRoleAndUserId(
+        userRole,
+        userId
+      );
+    console.log('allIncidents.length = ', allIncidents.length);
 
     const pageInt = page ? parseInt(page, 10) : 1;
     const perPageInt = perPage ? parseInt(perPage, 10) : 10;
@@ -82,9 +87,10 @@ export class IncidentController {
         total: incidents.length,
         page: pageInt,
         perPage: perPageInt,
-        totalPageCount: allIncidents
-          ? Math.floor(allIncidents.length / perPageInt)
-          : 0,
+        totalPageCount:
+          allIncidents && allIncidents.length > 0
+            ? Math.floor(allIncidents.length / perPageInt) || 1
+            : 1,
       };
     }
 

diff --git a/apps/api/src/incident/incident.repository.ts b/apps/api/src/incident/incident.repository.ts
@@ -96,8 +96,20 @@ export class IncidentRepository {
     return incidents;
   }
 
-  async findAllIncidents() {
-    const allIncidents = await this.prisma.incident.findMany({});
+  async findAllIncidentsByUserRoleAndUserId(
+    userRole: UserRole,
+    userId: string
+  ) {
+    const allIncidents = await this.prisma.incident.findMany({
+      where: {
+        ...(userRole === UserRole.ADMIN && {
+          creator_id: userId,
+        }),
+        ...(userRole === UserRole.NORMAL_USER && {
+          assignee_id: userId,
+        }),
+      },
+    });
     return allIncidents;
   }
 

diff --git a/apps/api/src/incident/incident.service.ts b/apps/api/src/incident/incident.service.ts
@@ -40,8 +40,12 @@ export class IncidentService {
     return incidents;
   }
 
-  async getAllIncidents() {
-    const allIncidents = await this.incidentRepository.findAllIncidents();
+  async getAllIncidentsByUserRoleAndUserId(userRole: UserRole, userId: string) {
+    const allIncidents =
+      await this.incidentRepository.findAllIncidentsByUserRoleAndUserId(
+        userRole,
+        userId
+      );
     return allIncidents;
   }
 

diff --git a/apps/web/src/components/dashboard/dashboard.tsx b/apps/web/src/components/dashboard/dashboard.tsx
@@ -142,7 +142,7 @@ function Dashboard() {
     }
   };
 
-  const handlePageChange = (e: React.ChangeEvent<unknown>, page: number) => { 
+  const handlePageChange = (e: React.ChangeEvent<unknown>, page: number) => {
     setPage(page);
   };