Merge pull request #2146 from CAFECA-IO/fix/fido_unittest

fix:fido_signin and unittest
CAFECA-IO · Aug 21, 2024 · acfafd3 · acfafd3
2 parents 06c5dca + 8794e8c
commit acfafd3
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iSunFA",
-  "version": "0.8.0+20",
+  "version": "0.8.0+21",
   "private": false,
   "scripts": {
     "dev": "next dev",

diff --git a/prisma/seed_json/employee_project.json b/prisma/seed_json/employee_project.json
@@ -13,7 +13,7 @@
         "employeeId": 1001,
         "projectId": 1000,
         "startDate": 1635724800,
-        "endDate": 1635811200,
+        "endDate": null,
         "createdAt": 1635724800,
         "updatedAt": 1635724800
     }

diff --git a/prisma/seed_json/milestone.json b/prisma/seed_json/milestone.json
@@ -1,6 +1,6 @@
 [
   {
-    "id":1015,
+    "id": 1015,
     "projectId": 1001,
     "startDate": 1709578219,
     "endDate": 1712256619,
@@ -81,7 +81,7 @@
     "updatedAt": 1717637165
   },
   {
-    "id":1014,
+    "id": 1014,
     "projectId": 1007,
     "startDate": 1717637165,
     "endDate": 1718179676,
@@ -142,5 +142,59 @@
     "status": "Archived",
     "createdAt": 1709578219,
     "updatedAt": 1709578219
+  },
+  {
+    "id": 1016,
+    "projectId": 1009,
+    "startDate": 0,
+    "endDate": 0,
+    "status": "Designing",
+    "createdAt": 1709578219,
+    "updatedAt": 1709578219
+  },
+  {
+    "id": 1017,
+    "projectId": 1009,
+    "startDate": 0,
+    "endDate": 0,
+    "status": "Beta Testing",
+    "createdAt": 1709578219,
+    "updatedAt": 1709578219
+  },
+  {
+    "id": 1018,
+    "projectId": 1009,
+    "startDate": 0,
+    "endDate": 0,
+    "status": "Develop",
+    "createdAt": 1709578219,
+    "updatedAt": 1709578219
+  },
+  {
+    "id": 1019,
+    "projectId": 1009,
+    "startDate": 0,
+    "endDate": 0,
+    "status": "Selling",
+    "createdAt": 1709578219,
+    "updatedAt": 1709578219
+  },
+  {
+    "id": 1020,
+    "projectId": 1009,
+    "startDate": 0,
+    "endDate": 0,
+    "status": "Sold",
+    "createdAt": 1709578219,
+    "updatedAt": 1709578219
+  },
+  {
+    "id": 1021,
+    "projectId": 1009,
+    "startDate": 0,
+    "endDate": 0,
+    "status": "Archived",
+    "createdAt": 1709578219,
+    "updatedAt": 1709578219
   }
-]
+]
diff --git a/prisma/seed_json/project.json b/prisma/seed_json/project.json
@@ -97,5 +97,16 @@
     "createdAt": 1651368365,
     "updatedAt": 1651368365,
     "deletedAt": null
+  },
+  {
+    "id": 1009,
+    "companyId": 1000,
+    "name": "Test update Project",
+    "completedPercent": 83,
+    "stage": "Beta Testing",
+    "imageId": "TP",
+    "createdAt": 1651368365,
+    "updatedAt": 1651368365,
+    "deletedAt": null
   }
 ]
diff --git a/src/lib/utils/repo/authentication.repo.ts b/src/lib/utils/repo/authentication.repo.ts
@@ -4,16 +4,20 @@ import { timestampInSeconds } from '@/lib/utils/common';
 
 export async function getUserByCredential(
   credentialId: string
-): Promise<(Authentication & { user: User }) | null> {
-  let user: (Authentication & { user: User }) | null = null;
+): Promise<(Authentication & { user: User & { userAgreements: UserAgreement[] } }) | null> {
+  let user: (Authentication & { user: User & { userAgreements: UserAgreement[] } }) | null = null;
   if (credentialId.trim() !== '') {
     user = await prisma.authentication.findUnique({
       where: {
         credentialId,
         OR: [{ deletedAt: 0 }, { deletedAt: null }],
       },
       include: {
-        user: true,
+        user: {
+          include: {
+            userAgreements: true,
+          },
+        },
       },
     });
   }

diff --git a/src/lib/utils/repo/employee.repo.ts b/src/lib/utils/repo/employee.repo.ts
@@ -238,13 +238,11 @@ export async function getProjectsByEmployeeId(employeeIdNumber: number) {
       employeeId: employeeIdNumber,
       endDate: null,
     },
-    select: {
-      project: {
-        select: {
-          id: true,
-          name: true,
-        },
-      },
+    include: {
+      project: true,
+    },
+    orderBy: {
+      startDate: 'asc',
     },
   });
   return projects;

diff --git a/src/lib/utils/repo/profit_comparison.repo.ts b/src/lib/utils/repo/profit_comparison.repo.ts
@@ -9,6 +9,9 @@ export async function getProjectLists(companyId: number) {
     where: {
       companyId,
     },
+    orderBy: {
+      name: 'asc',
+    },
   });
 }
 

diff --git a/src/lib/utils/repo_test/employee.repo.test.ts b/src/lib/utils/repo_test/employee.repo.test.ts
@@ -74,13 +74,11 @@ describe('Employee Repository Tests', () => {
     });
   });
   describe('getProjectsByEmployeeId', () => {
-    // TODO (20240820 - Jacky): Fix this test
-    xit('should get projects by employee id', async () => {
-      const employeeId = 1000;
+    it('should get projects by employee id', async () => {
+      const employeeId = 1001;
       const projectsFromDb = await getProjectsByEmployeeId(employeeId);
       expect(projectsFromDb).toBeDefined();
       expect(Array.isArray(projectsFromDb)).toBe(true);
-      expect(projectsFromDb.length).toBeGreaterThan(0);
       expect(projectsFromDb[0].project.id).toEqual(employeeProjects[0].projectId);
     });
   });

diff --git a/src/lib/utils/repo_test/trasaction_test/project_members.tx.test.ts b/src/lib/utils/repo_test/trasaction_test/project_members.tx.test.ts
@@ -45,6 +45,18 @@ describe('ProjectMembers Transaction Tests', () => {
       });
       expect(existingMembers.length).toBe(2);
       await updateProjectMembers(testProjectId, memberIdList); // Reset the members
+      await prisma.employeeProject.deleteMany({
+        where: {
+          projectId: testProjectId,
+          employeeId: {
+            in: [1000, 1001, 1002],
+          },
+          endDate: { not: null },
+          id: {
+            gte: 10000000,
+          },
+        },
+      });
     }, 10000);
   });
 });
diff --git a/src/lib/utils/repo_test/trasaction_test/project_milestone.tx.test.ts b/src/lib/utils/repo_test/trasaction_test/project_milestone.tx.test.ts
@@ -10,16 +10,16 @@ import { formatMilestoneList } from '@/lib/utils/formatter/milestone.formatter';
 import { IMilestone } from '@/interfaces/project';
 
 let milestoneList: IMilestone[] = [];
-const testProjectId = 1000;
+const testProjectId = 1009;
 
 beforeAll(async () => {
   const listedMilestone = await listProjectMilestone(testProjectId);
   milestoneList = formatMilestoneList(listedMilestone);
 });
 
 describe('Project Milestone Tests', () => {
-  const defaultStage = 'Beta Testing';
-  const updateStage = 'Sold';
+  const defaultStage = 'Develop';
+  const updateStage = 'Selling';
   const now = Date.now();
   const nowTimestamp = timestampInSeconds(now);
 

diff --git a/src/pages/api/v1/sign_in.ts b/src/pages/api/v1/sign_in.ts
@@ -9,6 +9,7 @@ import { getSession, setSession } from '@/lib/utils/session';
 import { useInvitation } from '@/lib/utils/invitation';
 import { verifyChallengeTimestamp } from '@/lib/utils/authorization';
 import { getUserByCredential } from '@/lib/utils/repo/authentication.repo';
+import { formatUser } from '@/lib/utils/formatter/user.formatter';
 
 async function authenticateUser(
   authentication: AuthenticationEncoded,
@@ -38,6 +39,7 @@ async function authenticateUser(
       };
       try {
         await server.verifyAuthentication(authentication, registeredCredential, expected);
+        user = formatUser(getUser.user);
       } catch (error) {
         isValid = false;
         user = null;