Merge pull request #3302 from OpenNeuroOrg/mongoose-8

deps(server): Update to Mongoose 8

Author: nellh

.pnp.cjs

@@ -37,7 +37,6 @@
     "jsdom": "24.0.0",
     "lerna": "3.20.2",
     "lint-staged": "^10.5.4",
-    "mongoose": "6.13.5",
     "pinst": "^2.1.6",
     "prettier": "^2.2.1",
     "react": "18.2.0",

package.json

@@ -43,7 +43,7 @@
     "keyv": "^4.5.3",
     "mime-types": "^2.1.19",
     "mongodb-memory-server": "^9.2.0",
-    "mongoose": "6.13.5",
+    "mongoose": "^8.9.5",
     "morgan": "^1.6.1",
     "node-mailjet": "^3.3.5",
     "object-hash": "2.1.1",

packages/openneuro-server/package.json

@@ -1,5 +1,5 @@
 import Snapshot from "../../models/snapshot"
-import type { LeanDocument } from "mongoose"
+import type { FlattenMaps } from "mongoose"
 import DatasetModel from "../../models/dataset"
 import MetadataModel from "../../models/metadata"
 import type { MetadataDocument } from "../../models/metadata"
@@ -15,7 +15,7 @@ export const metadata = async (
   dataset,
   _,
   context,
-): Promise<LeanDocument<MetadataDocument>> => {
+): Promise<FlattenMaps<MetadataDocument>> => {
   const record = await MetadataModel.findOne({
     datasetId: dataset.id,
   }).lean()
@@ -73,11 +73,11 @@ export const addMetadata = async (obj, { datasetId, metadata }) => {
  */
 export async function publicMetadata(
   _obj,
-): Promise<LeanDocument<MetadataDocument>[]> {
+): Promise<FlattenMaps<MetadataDocument>[]> {
   const datasets = await DatasetModel.find({
     public: true,
   }).lean()
-  const dsMetadata: LeanDocument<MetadataDocument>[] = []
+  const dsMetadata: FlattenMaps<MetadataDocument>[] = []
   for (const ds of datasets) {
     dsMetadata.push(await metadata(ds, null, {}))
   }

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

@@ -18,7 +18,7 @@ export async function permissions(ds): Promise<DatasetPermission> {
       (userPermission) => ({
         ...userPermission.toJSON(),
         user: user(ds, { id: userPermission.userId }),
-      } as PermissionDocument & { user: Promise<UserDocument> }),
+      } as unknown as PermissionDocument & { user: Promise<UserDocument> }),
     ),
   }
 }

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

@@ -29,7 +29,7 @@ export const users = (obj, args, { userInfo }) => {
 
 export const removeUser = (obj, { id }, { userInfo }) => {
   if (userInfo.admin) {
-    return User.findByIdAndRemove(id).exec()
+    return User.findByIdAndDelete(id).exec()
   } else {
     return Promise.reject(new Error("You must be a site admin to remove users"))
   }

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

@@ -3,6 +3,7 @@ import type { Document } from "mongoose"
 const { Schema, model } = mongoose
 
 export interface SubscriptionDocument extends Document {
+  _id: string
   datasetId: string
   userId: string
 }

packages/openneuro-server/src/models/subscription.ts

@@ -4,6 +4,7 @@ import type { Document } from "mongoose"
 const { Schema, model } = mongoose
 
 export interface UserDocument extends Document {
+  _id: string
   id: string
   email: string
   name: string