Merge pull request #1156 from topcoder-platform/PM-1381_copilot-past-projects

PM-1381 - past projects for copilot applicant

Author: vas3a

src/apps/copilots/src/pages/copilot-opportunity-details/tabs/copilot-applications/CopilotApplications.tsx

@@ -35,6 +35,11 @@ const tableColumns: TableColumn<CopilotApplication>[] = [
         propertyName: 'activeProjects',
         type: 'text',
     },
+    {
+        label: 'Past Projects',
+        propertyName: 'pastProjects',
+        type: 'text',
+    },
     {
         label: 'Status',
         propertyName: 'status',
@@ -81,6 +86,7 @@ const CopilotApplications: FC<{
             fulfilment: member?.copilotFulfillment || 0,
             handle: member?.handle,
             opportunityStatus: props.opportunity.status,
+            pastProjects: member?.pastProjects || 0,
         }
     })
         .sort((a, b) => (b.fulfilment || 0) - (a.fulfilment || 0)) : [])

src/apps/copilots/src/services/members.ts

@@ -12,13 +12,15 @@ interface Member {
         COPILOT: {
             activeProjects: number,
             fulfillment: number,
+            projects: number,
         }
     }[]
 }
 
 export interface FormattedMembers extends Member {
     copilotFulfillment: number,
     activeProjects: number,
+    pastProjects: number;
 }
 
 export type MembersResponse = SWRResponse<FormattedMembers[], FormattedMembers[]>
@@ -40,11 +42,16 @@ export const getMembersByUserIds = async (
     )
 }
 
-const membersFactory = (members: Member[]): FormattedMembers[] => members.map(member => ({
-    ...member,
-    activeProjects: member.stats?.find(item => item.COPILOT?.activeProjects)?.COPILOT?.activeProjects || 0,
-    copilotFulfillment: member.stats?.find(item => item.COPILOT?.fulfillment)?.COPILOT?.fulfillment || 0,
-}))
+const membersFactory = (members: Member[]): FormattedMembers[] => members.map(member => {
+    const copilotStats = member.stats?.find(item => item.COPILOT)?.COPILOT ?? {} as Member['stats'][0]['COPILOT']
+
+    return {
+        ...member,
+        activeProjects: copilotStats.activeProjects || 0,
+        copilotFulfillment: copilotStats.fulfillment || 0,
+        pastProjects: copilotStats.projects || 0,
+    }
+})
 
 /**
  * Custom hook to fetch members by list of user ids