ASAP-607 - filter out outputs that are not asap funded (#4361)

* filter out outputs not asap funded * update tests * update collaboration tests
yldio · Aug 30, 2024 · 4547c7b · 4547c7b
1 parent 183d0a0
commit 4547c7b
Show file tree

Hide file tree

Showing 10 changed files with 485 additions and 207 deletions.
diff --git a/apps/crn-server/src/data-providers/contentful/analytics.data-provider.ts b/apps/crn-server/src/data-providers/contentful/analytics.data-provider.ts
@@ -48,6 +48,7 @@ import {
   getFilterOutputByDocumentCategory,
   getFilterOutputByRange,
   getFilterOutputBySharingStatus,
+  isAsapFundedResearchOutput,
   isTeamOutputDocumentType,
 } from '../../utils/analytics/common';
 import { getEngagementItems } from '../../utils/analytics/engagement';
@@ -272,6 +273,7 @@ const getUserProductivityItems = (
         ) || [];
 
     const userOutputsCount = user.linkedFrom?.researchOutputsCollection?.items
+      .filter(isAsapFundedResearchOutput)
       .filter(getFilterOutputByRange(filter?.timeRange))
       .filter(getFilterOutputByDocumentCategory(filter?.documentCategory))
       .reduce(
@@ -343,6 +345,7 @@ const getTeamProductivityItems = (
 
     const documentTypesCount =
       teamItem.linkedFrom?.researchOutputsCollection?.items
+        .filter(isAsapFundedResearchOutput)
         .filter(getFilterOutputByRange(rangeKey))
         .filter(getFilterOutputBySharingStatus(outputType))
         .reduce((count, researchOutput) => {

diff --git a/apps/crn-server/src/utils/analytics/collaboration.ts b/apps/crn-server/src/utils/analytics/collaboration.ts
@@ -20,6 +20,7 @@ import {
   getFilterOutputByDocumentCategory,
   getFilterOutputByRange,
   getFilterOutputBySharingStatus,
+  isAsapFundedResearchOutput,
   isTeamOutputDocumentType,
 } from './common';
 
@@ -119,6 +120,7 @@ export const getUserCollaborationItems = (
         const outputsCoAuthoredWithinTeamSet = new Set();
 
         item.linkedFrom?.researchOutputsCollection?.items
+          .filter(isAsapFundedResearchOutput)
           .filter(getFilterOutputByRange(rangeKey))
           .filter(getFilterOutputByDocumentCategory(documentCategory))
           .forEach((output) => {
@@ -260,6 +262,7 @@ export const getTeamCollaborationItems = (
 ): TeamCollaborationDataObject[] =>
   cleanArray(teamCollection?.items).map((team) => {
     const outputsData = team.linkedFrom?.researchOutputsCollection?.items
+      .filter(isAsapFundedResearchOutput)
       .filter(getFilterOutputByRange(rangeKey))
       .filter(getFilterOutputBySharingStatus(outputType))
       .filter(

diff --git a/apps/crn-server/src/utils/analytics/common.ts b/apps/crn-server/src/utils/analytics/common.ts
@@ -10,7 +10,11 @@ import {
 type AnalyticOutput = Maybe<
   Pick<
     ResearchOutputs,
-    'documentType' | 'sharingStatus' | 'addedDate' | 'createdDate'
+    | 'documentType'
+    | 'sharingStatus'
+    | 'addedDate'
+    | 'createdDate'
+    | 'asapFunded'
   > & {
     authorsCollection?: Maybe<{
       items: Array<
@@ -79,6 +83,10 @@ export const isTeamOutputDocumentType = (
 ): documentType is TeamOutputDocumentType =>
   teamOutputDocumentTypes.includes(documentType as TeamOutputDocumentType);
 
+export const isAsapFundedResearchOutput = (
+  researchOutput: AnalyticOutput,
+): boolean => researchOutput?.asapFunded === 'Yes';
+
 // remove string from one array that are present in another array and return a new array of strings
 export const removeDuplicates = (arr1: string[], arr2: string[]): string[] => [
   ...arr1.filter((elem) => !arr2.includes(elem)),