@openneuro/server 4.34.0-alpha.0 → 4.34.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.34.0-alpha.0",
+  "version": "4.34.1",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,7 +21,7 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^2.7.0",
-    "@openneuro/search": "^4.34.0-alpha.0",
+    "@openneuro/search": "^4.34.1",
     "@sentry/node": "^8.25.0",
     "@sentry/profiling-node": "^8.25.0",
     "base64url": "^3.0.0",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7711b48292c2e7f40bb45759617def2bbd07c88b"
+  "gitHead": "af9d77970641f2dcfd67921a8c39b9719743676c"
 }

package/src/datalad/dataset.ts

@@ -178,7 +178,7 @@ export const datasetsFilter = (options) => (match) => {
         },
         {
           $match: {
-            "summaries.0.modalities": options.modality,
+            "summaries.0.modalities": new RegExp(`^${options.modality}$`, "i"),
           },
         },
       ],

package/src/graphql/resolvers/snapshots.ts

@@ -17,6 +17,7 @@ import { normalizeDOI } from "../../libs/doi/normalize"
 import { getDraftHead } from "../../datalad/dataset"
 import { downloadFiles } from "../../datalad/snapshots"
 import { snapshotValidation } from "./validation"
+import { advancedDatasetSearchConnection } from "./dataset-search"
 
 export const snapshots = (obj) => {
   return datalad.getSnapshots(obj.id)
@@ -135,13 +136,28 @@ export const undoDeprecateSnapshot = async (
   }
 }
 
+/** Query used to run a search for NIH datasets */
+const brainInitiativeQuery = {
+  "bool": {
+    "filter": [
+      {
+        "match": {
+          "brainInitiative": {
+            "query": "true",
+          },
+        },
+      },
+    ],
+  },
+}
+
 export const participantCount = (obj, { modality }) => {
-  const cacheKey = modality === "NIH" ? "NIH" : modality || "all"
+  const cacheKey = modality || "all"
   const cache = new CacheItem(
     redis,
     CacheType.participantCount,
     [cacheKey],
-    3600,
+    86400,
   )
 
   return cache.get(async () => {
@@ -151,23 +167,37 @@ export const participantCount = (obj, { modality }) => {
 
     let matchQuery: Record<string, unknown> = queryHasSubjects
 
-    if (modality && modality !== "NIH") {
-      matchQuery = {
-        $and: [
-          queryHasSubjects,
-          {
-            "summary.modalities": modality,
-          },
-        ],
+    if (modality === "nih") {
+      // For "nih" portal, we need to search for any relevant datasets first
+      const nihDatasets = []
+      while (true) {
+        let after = ""
+        const results = await advancedDatasetSearchConnection(null, {
+          query: brainInitiativeQuery,
+          datasetType: "All Public",
+          datasetStatus: "",
+          sortBy: "",
+          after,
+          first: 100,
+        }, { user: null, userInfo: {} })
+        nihDatasets.push(...results.edges.map((edge) => edge.id))
+        if (!results.pageInfo.hasNextPage) {
+          break
+        } else {
+          after = results.pageInfo.endCursor
+        }
       }
-    } 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 = {
+        $expr: { $in: ["$id", nihDatasets] },
+      }
+    } else {
       matchQuery = {
         $and: [
           queryHasSubjects,
           {
-            "summary.modalities": { $exists: true },
+            "summary.modalities": new RegExp(`^${modality}$`, "i"),
           },
         ],
       }