feat(api): add createdOn field to WorkspaceMember model and update re…

…lated services

apps/api/src/prisma/migrations/20241211205448_add_created_on_in_workspace_member/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "WorkspaceMember" ADD COLUMN     "createdOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

apps/api/src/prisma/schema.prisma

@@ -339,6 +339,7 @@ model WorkspaceMember {
   workspaceId        String
   invitationAccepted Boolean                          @default(false)
   roles              WorkspaceMemberRoleAssociation[]
+  createdOn          DateTime                         @default(now())
 
   @@unique([workspaceId, userId])
 }

apps/api/src/workspace-membership/service/workspace-membership.service.ts

@@ -879,11 +879,14 @@ export class WorkspaceMembershipService {
         roleSet.add(role)
       }
 
+      const invitedOn = new Date()
+
       // Create the workspace membership
       const createMembership = this.prisma.workspaceMember.create({
         data: {
           workspaceId: workspace.id,
           userId,
+          createdOn: invitedOn,
           roles: {
             create: Array.from(roleSet).map((role) => ({
               role: {
@@ -904,7 +907,7 @@ export class WorkspaceMembershipService {
           workspace.name,
           `${process.env.WORKSPACE_FRONTEND_URL}/workspace/${workspace.slug}/join`,
           currentUser.name,
-          new Date().toISOString(),
+          invitedOn.toISOString(),
           true
         )
 

apps/api/src/workspace-membership/workspace-membership.e2e.spec.ts

@@ -425,7 +425,8 @@ describe('Workspace Membership Controller Tests', () => {
         id: expect.any(String),
         userId: user2.id,
         workspaceId: workspace1.id,
-        invitationAccepted: false
+        invitationAccepted: false,
+        createdOn: expect.any(Date)
       })
     })
 
@@ -909,7 +910,8 @@ describe('Workspace Membership Controller Tests', () => {
         id: expect.any(String),
         userId: user2.id,
         workspaceId: workspace1.id,
-        invitationAccepted: true
+        invitationAccepted: true,
+        createdOn: expect.any(Date)
       })
     })
 

apps/api/src/workspace/service/workspace.service.ts

@@ -446,7 +446,8 @@ export class WorkspaceService {
               }
             }
           }
-        }
+        },
+        createdOn: true
       }
     })
 
@@ -479,7 +480,14 @@ export class WorkspaceService {
       search
     })
 
-    return { items, metadata }
+    return {
+      items: items.map((item) => ({
+        ...item,
+        invitedOn: item.createdOn,
+        createdOn: undefined
+      })),
+      metadata
+    }
   }
 
   /**

apps/api/src/workspace/workspace.e2e.spec.ts

@@ -311,7 +311,8 @@ describe('Workspace Controller Tests', () => {
         id: expect.any(String),
         userId: user1.id,
         workspaceId: workspace1.id,
-        invitationAccepted: true
+        invitationAccepted: true,
+        createdOn: expect.any(Date)
       })
     })
   })
@@ -503,8 +504,24 @@ describe('Workspace Controller Tests', () => {
       const body = response.json()
 
       expect(body.items).toHaveLength(1)
-      expect(body.items[0].workspace.id).toBe(workspace1.id)
       expect(body.items[0].workspace.slug).not.toBe(workspace2.slug)
+      expect(body.items[0]).toEqual({
+        invitedOn: expect.any(Date.toString()),
+        workspace: {
+          icon: workspace1.icon,
+          id: workspace1.id,
+          name: workspace1.name,
+          slug: workspace1.slug
+        },
+        roles: [
+          {
+            role: {
+              name: memberRole.name,
+              colorCode: memberRole.colorCode
+            }
+          }
+        ]
+      })
       expect(body.metadata.totalCount).toBe(1)
       expect(body.metadata.links.self).toEqual(
         `/workspace/invitations?page=0&limit=10&sort=name&order=asc&search=`
@@ -567,7 +584,6 @@ describe('Workspace Controller Tests', () => {
       })
 
       const body = response.json()
-      console.log(body)
       expect(body.items).toHaveLength(0)
       expect(body.metadata).toEqual({})
     })