more changes from pr comments and merged main

gchq · Nov 18, 2024 · 71d82a2 · 71d82a2
2 parents c1fa402 + 8773602
commit 71d82a2
Show file tree

Hide file tree

Showing 34 changed files with 2,325 additions and 1,748 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -23,7 +23,7 @@
     "@aws-sdk/client-kms": "3.666.0",
     "@aws-sdk/client-s3": "3.666.0",
     "@aws-sdk/lib-storage": "3.666.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.50.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.52.0",
     "@opentelemetry/exporter-logs-otlp-proto": "^0.53.0",
     "@opentelemetry/exporter-metrics-otlp-proto": "^0.53.0",
     "@opentelemetry/host-metrics": "^0.35.3",
@@ -53,7 +53,7 @@
     "lodash-es": "^4.17.21",
     "mjml": "^4.15.3",
     "mongodb": "^6.9.0",
-    "mongoose": "^6.11.3",
+    "mongoose": "^6.13.3",
     "mongoose-delete": "^1.0.2",
     "morgan": "^1.10.0",
     "nanoid": "^5.0.8",
@@ -95,7 +95,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "@vitest/coverage-v8": "^2.1.1",
+    "@vitest/coverage-v8": "^2.1.4",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",

diff --git a/backend/src/migrations/009_update_avscan_type.ts b/backend/src/migrations/009_update_avscan_type.ts
@@ -0,0 +1,14 @@
+import FileModel from '../models/File.js'
+
+export async function up() {
+  const results = await FileModel.find({ avScan: { $type: 'object' } }, null, { strict: false, lean: true })
+  results.forEach(async (result) => {
+    if (!Array.isArray(result.avScan)) {
+      await FileModel.findOneAndUpdate({ _id: result._id }, { $set: { avScan: [result.avScan] } })
+    }
+  })
+}
+
+export async function down() {
+  /* NOOP */
+}
diff --git a/backend/src/migrations/010_remove_teamId_from_entries.ts b/backend/src/migrations/010_remove_teamId_from_entries.ts
@@ -0,0 +1,9 @@
+import ModelModel from '../models/Model.js'
+
+export async function up() {
+  await ModelModel.updateMany({}, { $unset: { teamId: '' } }, { strict: false })
+}
+
+export async function down() {
+  /* NOOP */
+}
diff --git a/backend/src/models/Model.ts b/backend/src/models/Model.ts
@@ -52,7 +52,6 @@ export interface ModelInterface {
 
   name: string
   kind: EntryKindKeys
-  teamId?: string
   description: string
   card?: ModelCardInterface
 
@@ -74,7 +73,6 @@ export type ModelDoc = ModelInterface & Document<any, any, ModelInterface>
 const ModelSchema = new Schema<ModelInterface>(
   {
     id: { type: String, required: true, unique: true, index: true },
-    teamId: { type: String, required: true, index: true, default: 'Uncategorised' },
 
     name: { type: String, required: true },
     kind: { type: String, enum: Object.values(EntryKind) },

diff --git a/backend/src/models/Team.ts b/backend/src/models/Team.ts
diff --git a/backend/src/routes.ts b/backend/src/routes.ts
@@ -66,10 +66,6 @@ import { getSchemas } from './routes/v2/schema/getSchemas.js'
 import { patchSchema } from './routes/v2/schema/patchSchema.js'
 import { postSchema } from './routes/v2/schema/postSchema.js'
 import { getSpecification } from './routes/v2/specification.js'
-import { patchTeam } from './routes/v2/team/getMyTeams.js'
-import { getTeam } from './routes/v2/team/getTeam.js'
-import { getTeams } from './routes/v2/team/getTeams.js'
-import { postTeam } from './routes/v2/team/postTeam.js'
 import { getUiConfig } from './routes/v2/uiConfig/getUiConfig.js'
 import { deleteUserToken } from './routes/v2/user/deleteUserToken.js'
 import { getUserTokenList } from './routes/v2/user/getUserTokenList.js'
@@ -181,20 +177,6 @@ server.get('/api/v2/model/:modelId/roles', ...getModelRoles)
 server.get('/api/v2/model/:modelId/roles/mine', ...getModelCurrentUserRoles)
 server.get('/api/v2/model/:modelId/permissions/mine', ...getModelCurrentUserPermissions)
 
-server.post('/api/v2/teams', ...postTeam)
-server.get('/api/v2/teams', ...getTeams)
-server.get('/api/v2/teams/mine', ...getTeams)
-
-server.get('/api/v2/team/:teamId', ...getTeam)
-server.patch('/api/v2/team/:teamId', ...patchTeam)
-
-// server.post('/api/v2/teams/:teamId/members', ...postTeamMember)
-// server.get('/api/v2/teams/:teamId/members', ...getTeamMembers)
-// server.delete('/api/v2/teams/:teamId/members/:memberId', ...deleteTeamMember)
-// server.patch('/api/v2/teams/:teamId/members/:memberId', ...patchTeamMember)
-
-// server.get('/api/v2/teams/:teamId/roles/:memberId', ...getTeamMemberRoles)
-
 server.get('/api/v2/entities', ...getEntities)
 server.get('/api/v2/entities/me', ...getCurrentUser)
 server.get('/api/v2/entity/:dn/lookup', ...getEntityLookup)

diff --git a/backend/src/routes/v2/model/postModel.ts b/backend/src/routes/v2/model/postModel.ts
@@ -11,10 +11,9 @@ import { parse } from '../../../utils/validate.js'
 
 export const postModelSchema = z.object({
   body: z.object({
-    name: z.string().min(1, 'You must provide a model name'),
-    kind: z.nativeEnum(EntryKind),
-    teamId: z.string(),
-    description: z.string().min(1, 'You must provide a model description'),
+    name: z.string().min(1, 'You must provide a model name').openapi({ example: 'Yolo v4' }),
+    kind: z.nativeEnum(EntryKind).openapi({ example: 'model' }),
+    description: z.string().min(1, 'You must provide a model description').openapi({ example: 'You only look once' }),
     visibility: z.nativeEnum(EntryVisibility).optional().default(EntryVisibility.Public),
     collaborators: z
       .array(

diff --git a/backend/src/routes/v2/team/getMyTeams.ts b/backend/src/routes/v2/team/getMyTeams.ts
diff --git a/backend/src/routes/v2/team/getTeam.ts b/backend/src/routes/v2/team/getTeam.ts
diff --git a/backend/src/routes/v2/team/getTeams.ts b/backend/src/routes/v2/team/getTeams.ts
diff --git a/backend/src/routes/v2/team/patchTeam.ts b/backend/src/routes/v2/team/patchTeam.ts
diff --git a/backend/src/routes/v2/team/postTeam.ts b/backend/src/routes/v2/team/postTeam.ts
diff --git a/backend/src/seeds/data/models.ts b/backend/src/seeds/data/models.ts
@@ -6,7 +6,6 @@ export const model: ModelInterface = {
   // Basic model example
   id: 'basic-model-abcdef',
   kind: EntryKind.Model,
-  teamId: undefined,
 
   name: 'Basic Model',
   description: