@openneuro/server 4.18.1 → 4.19.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.18.1",
+  "version": "4.19.0-alpha.1",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@apollo/client": "3.7.2",
     "@elastic/elasticsearch": "7.15.0",
-    "@openneuro/search": "^4.18.1",
+    "@openneuro/search": "^4.19.0-alpha.1",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.4",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fbd8afe9033abf11e39e17968b3e9f60261a9c01"
+  "gitHead": "42250552695e01915a37f3d00fe6c3476d1661c0"
 }

package/src/graphql/resolvers/metadata.js

@@ -1,12 +1,48 @@
+import Snapshot from '../../models/snapshot'
 import MetadataModel from '../../models/metadata'
+import { latestSnapshot } from './snapshots'
+import { permissions } from './permissions'
 
 /**
  * Summary resolver
+ *
+ * User modified fields are queried from the Metadata model and dynamic metadata is updated from the latest snapshot
  */
-export const metadata = dataset => {
-  return MetadataModel.findOne({
+export const metadata = async (dataset, _, context) => {
+  const record = await MetadataModel.findOne({
     datasetId: dataset.id,
+  }).lean()
+  // Replace dynamic fields with latest available
+  const snapshot = await latestSnapshot(dataset, null, context)
+  const description = await snapshot.description()
+  const summary = await snapshot.summary()
+  // Find the users with admin access
+  // TODO - This could be a user object that is resolved with the full type instead of just email
+  // Email matches the existing records however and the user object would require other changes
+  const adminUsers = []
+  const { userPermissions } = await permissions(dataset)
+  for (const user of userPermissions) {
+    adminUsers.push((await user.user).email)
+  }
+  const firstSnapshot = await Snapshot.find({ datasetId: dataset.id }).sort({
+    created: 1,
   })
+  const firstSnapshotCreatedAt = firstSnapshot.length
+    ? firstSnapshot[0].created
+    : null
+  return {
+    ...record,
+    datasetId: dataset.id,
+    datasetName: description.Name,
+    tasksCompleted: summary.tasks,
+    seniorAuthor: description.Authors[0],
+    adminUsers,
+    firstSnapshotCreatedAt,
+    latestSnapshotCreatedAt: snapshot.created,
+    subjectAges: summary.subjectMetadata.map(s => s.age),
+    modalities: summary.modalities,
+    dataProcessed: summary.dataProcessed,
+  }
 }
 
 /**

package/src/graphql/schema.js

@@ -415,6 +415,25 @@ export const typeDefs = `
     message: String
     # Associated commit references (tags or branches)
     references: String
+    # File changes in this commit
+    files: [DiffFiles]
+    # Files changed
+    filesChanged: Int
+    # Total number of insertions
+    insertions: Int
+    # Total number of deletions
+    deletions: Int
+  }
+
+  type DiffFiles {
+    # Status string (A = added, M = modified, D = deleted)
+    status: String
+    mode: Int
+    # Previous path
+    old: String
+    # New path
+    new: String
+    binary: Boolean
   }
 
   # Ephemeral draft or working tree for a dataset

package/src/models/metadata.ts

@@ -3,6 +3,7 @@ import mongoose, { Document } from 'mongoose'
 const { Schema, model } = mongoose
 
 export interface MetadataDocument extends Document {
+  datasetId: string
   datasetName: string
   datasetUrl: string
   dataProcessed: boolean
@@ -10,7 +11,6 @@ export interface MetadataDocument extends Document {
   latestSnapshotCreatedAt: Date
   ages: number[]
   modalities: string[]
-  datasetId: string
   adminUsers: string[]
   dxStatus: string
   tasksCompleted: string[]
@@ -29,6 +29,7 @@ export interface MetadataDocument extends Document {
 }
 
 const metadataSchema = new Schema({
+  datasetId: { type: String, default: uuid.v4 }, // OpenNeuro id
   datasetName: String,
   datasetUrl: String, // @id type
   dataProcessed: Boolean, // 'true' | 'false' | 'user input string'
@@ -36,7 +37,6 @@ const metadataSchema = new Schema({
   latestSnapshotCreatedAt: Date,
   ages: [Number],
   modalities: [String],
-  datasetId: { type: String, default: uuid.v4 }, // OpenNeuro id
   adminUsers: [String], // email type (@id type?)
   dxStatus: String,
   tasksCompleted: [String],