Merge pull request #3370 from OpenNeuroOrg/update/nihbi-participant-count

adding participant count for brain initiative

Author: nellh

packages/openneuro-app/src/scripts/pages/front-page/aggregate-queries/aggregate-counts-container.tsx

@@ -29,12 +29,11 @@ const AggregateCountsContainer: React.FC<AggregateCountsContainerProps> = ({
   else {
     return (
       <>
-        {participantData.participantCount > 0 && (
-          <AggregateCount
-            type="participants"
-            count={participantData.participantCount}
-          />
-        )}
+        <AggregateCount
+          type="participants"
+          count={participantData.participantCount}
+        />
+
         <AggregateCount
           type="publicDataset"
           count={publicDatasetsData.datasets?.pageInfo?.count ||

packages/openneuro-server/src/graphql/resolvers/snapshots.ts

@@ -136,28 +136,43 @@ export const undoDeprecateSnapshot = async (
 }
 
 export const participantCount = (obj, { modality }) => {
+  const cacheKey = modality === "NIH" ? "NIH" : modality || "all"
   const cache = new CacheItem(
     redis,
     CacheType.participantCount,
-    [modality || "all"],
+    [cacheKey],
     3600,
   )
+
   return cache.get(async () => {
     const queryHasSubjects = {
-      "summary.subjects": {
-        $exists: true,
-      },
+      "summary.subjects": { $exists: true },
     }
-    const matchQuery = modality
-      ? {
+
+    let matchQuery: Record<string, unknown> = queryHasSubjects
+
+    if (modality && modality !== "NIH") {
+      matchQuery = {
         $and: [
           queryHasSubjects,
           {
             "summary.modalities": modality,
           },
         ],
       }
-      : queryHasSubjects
+    } else if (modality === "NIH") {
+      // When modality is 'NIH', we don't filter by a specific modality.
+      // Instead, we query for datasets that have any modality within the NIH portal
+      matchQuery = {
+        $and: [
+          queryHasSubjects,
+          {
+            "summary.modalities": { $exists: true },
+          },
+        ],
+      }
+    }
+
     const aggregateResult = await DatasetModel.aggregate([
       {
         $match: {
@@ -198,8 +213,12 @@ export const participantCount = (obj, { modality }) => {
         },
       },
     ]).exec()
-    if (aggregateResult.length) return aggregateResult[0].participantCount
-    else return 0
+
+    if (aggregateResult.length) {
+      return aggregateResult[0].participantCount
+    } else {
+      return 0
+    }
   })
 }