@openneuro/server 4.44.6 → 4.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.44.6",
+  "version": "4.45.0",
   "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": "^4.5.0",
-    "@openneuro/search": "^4.44.6",
+    "@openneuro/search": "^4.45.0",
     "@sentry/node": "^10.37.0",
     "@sentry/profiling-node": "^10.37.0",
     "base64url": "^3.0.0",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c266a5a49f11d604ea83725661c7896df40eca1"
+  "gitHead": "6a61f1a6aabd06e403acbc58dd00a1b0cf696143"
 }

package/src/datalad/analytics.ts

@@ -17,9 +17,6 @@ export const trackAnalytics = async (datasetId, tag, type) => {
           views: 1,
         },
       },
-      {
-        upsert: true,
-      },
     ).exec()
   } else if (type === "downloads") {
     return Dataset.updateOne(
@@ -31,9 +28,6 @@ export const trackAnalytics = async (datasetId, tag, type) => {
           downloads: 1,
         },
       },
-      {
-        upsert: true,
-      },
     ).exec()
   }
 }

package/src/datalad/dataset.ts

@@ -503,7 +503,6 @@ export async function updatePublic(datasetId, publicFlag, user) {
   await Dataset.updateOne(
     { id: datasetId },
     { public: publicFlag, publishDate: new Date() },
-    { upsert: true },
   ).exec()
   await updateEvent(event)
 }

package/src/datalad/snapshots.ts

@@ -103,13 +103,16 @@ const postSnapshot = async (
 export const getSnapshots = async (datasetId): Promise<SnapshotDocument[]> => {
   const dataset = await Dataset.findOne({ id: datasetId })
   if (!dataset) return null
-  const url = `${getDatasetWorker(datasetId)}/datasets/${datasetId}/snapshots`
-  return request
-    .get(url)
-    .set("Accept", "application/json")
-    .then(({ body: { snapshots } }) => {
-      return snapshots.sort(snapshotCreationComparison)
-    })
+  const cache = new CacheItem(redis, CacheType.snapshot, [datasetId], 432000)
+  return cache.get(() => {
+    const url = `${getDatasetWorker(datasetId)}/datasets/${datasetId}/snapshots`
+    return request
+      .get(url)
+      .set("Accept", "application/json")
+      .then(({ body: { snapshots } }) => {
+        return snapshots.sort(snapshotCreationComparison)
+      })
+  })
 }
 
 const announceNewSnapshot = async (snapshot, datasetId, user) => {
@@ -175,6 +178,11 @@ export const createSnapshot = async (
       updateDatasetName(datasetId),
     ])
 
+    const snapshotListCache = new CacheItem(redis, CacheType.snapshot, [
+      datasetId,
+    ])
+    await snapshotListCache.drop()
+
     // Version is created here and event is updated
     await updateEvent(event)
 
@@ -205,6 +213,10 @@ export const deleteSnapshot = (datasetId, tag) => {
       tag,
     ])
     await snapshotCache.drop()
+    const snapshotListCache = new CacheItem(redis, CacheType.snapshot, [
+      datasetId,
+    ])
+    await snapshotListCache.drop()
     return body
   })
 }

package/src/graphql/resolvers/brainInitiative.ts

@@ -42,7 +42,13 @@ export const brainInitiative = async (
           }
         }
         // Check for grant ids too - filter to only alphanumeric to improve matching across format differences
-        const identifier = metadata.grantIdentifier.replace(/[^a-zA-Z0-9]/g, "")
+        const identifier = metadata?.grantIdentifier?.replace(
+          /[^a-zA-Z0-9]/g,
+          "",
+        )
+        if (!identifier) {
+          return false
+        }
         for (const grant of brainInitiativeGrants) {
           if (
             identifier.includes(grant)

package/src/graphql/resolvers/datasetType.ts

@@ -5,8 +5,10 @@ import { description } from "./description.js"
  * Return "schema" or "legacy" depending on the validator preferred for a dataset
  */
 export async function datasetType(dsOrSnapshot): Promise<"schema" | "legacy"> {
-  const ds = new Dataset({ id: dsOrSnapshot.datasetId })
-  if (ds.schemaValidator) {
+  const ds = await Dataset.findOne({
+    id: dsOrSnapshot.datasetId || dsOrSnapshot.id,
+  }).lean()
+  if (ds && ds.schemaValidator) {
     return "schema"
   } else {
     const dsDescription = await description(dsOrSnapshot)