@openneuro/server 4.38.0-alpha.1 → 4.38.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.38.0-alpha.1",
+  "version": "4.38.0-alpha.2",
   "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.38.0-alpha.1",
+    "@openneuro/search": "^4.38.0-alpha.2",
     "@sentry/node": "^8.25.0",
     "@sentry/profiling-node": "^8.25.0",
     "base64url": "^3.0.0",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c7a1350704df419d17999699e056030b9aa0bd66"
+  "gitHead": "a2a301d754891d76a04c1ae91fde268419f0b5ca"
 }

package/src/graphql/resolvers/draft.ts

@@ -8,6 +8,7 @@ import { checkDatasetWrite } from "../permissions.js"
 import { getFiles } from "../../datalad/files"
 import { filterRemovedAnnexObjects } from "../utils/file.js"
 import { validation } from "./validation"
+import FileCheck from "../../models/fileCheck"
 
 // A draft must have a dataset parent
 export const draftFiles = async (dataset, args, { userInfo }) => {
@@ -31,6 +32,20 @@ export const revalidate = async (obj, { datasetId }, { user, userInfo }) => {
   await checkDatasetWrite(datasetId, user, userInfo)
 }
 
+/**
+ * Resolve any issues with files recorded for the current commit
+ */
+export const fileCheck = async (dataset) => {
+  const hexsha = await getDraftRevision(dataset.id)
+  // For drafts, obtain the local check results
+  const checks = await FileCheck.findOne({
+    datasetId: dataset.id,
+    hexsha,
+    remote: "local",
+  }).exec()
+  return checks
+}
+
 const draft = {
   id: (obj) => obj.id,
   files: draftFiles,
@@ -43,6 +58,7 @@ const draft = {
   description,
   readme,
   head: (obj) => obj.revision,
+  fileCheck,
 }
 
 export default draft

package/src/graphql/schema.ts

@@ -546,6 +546,8 @@ export const typeDefs = `
     head: String
     # Total size in bytes of this draft
     size: BigInt
+    # File issues
+    fileCheck: FileCheck
   }
 
   # Tagged snapshot of a draft
@@ -933,6 +935,10 @@ export const typeDefs = `
     key: String
     note: String
     success: Boolean
+    dead: [String]
+    missing: [String]
+    untrusted: [String]
+    input: [String]
   }
 
 `

package/src/models/fileCheck.ts

@@ -9,7 +9,7 @@ export interface FileCheckDocument extends Document {
   remote: string
   annexFsck: {
     command: string
-    "error-messages": string[]
+    errorMessages: string[]
     file: string
     key: string
     note: string
@@ -24,7 +24,7 @@ const fileCheckSchema = new Schema({
   remote: { type: String, default: "local", required: true },
   annexFsck: [{
     command: String,
-    "error-messages": [String],
+    errorMessages: [String],
     file: String,
     key: String,
     note: String,