Merge pull request #597 from desci-labs/comment-enhancement

required uuid in schema and annotation backfill script

desci-server/package.json

@@ -25,6 +25,7 @@
     "script:seed-social-data": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/seed-social-data.ts",
     "script:DESTRUCTIVE-clear-social-data": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/DESTRUCTIVE-clear-social-data.ts",
     "script:seed-community-member": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/seed-community-members.ts",
+    "script:backfill-annotations": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/backfill-annotations.ts",
     "build": "rimraf dist && tsc && yarn copy-files; if [ \"$SENTRY_AUTH_TOKEN\" ]; then yarn sentry:sourcemaps; else echo 'SENTRY_AUTH_TOKEN not set, sourcemaps will not upload'; fi",
     "copy-files": "copyfiles -u 1 src/**/*.cjs dist/",
     "generate": "npx prisma generate",
@@ -176,4 +177,4 @@
   "prisma": {
     "seed": "node --no-warnings=ExperimentalWarning --loader ts-node/esm prisma/seed.ts"
   }
-}
+}

desci-server/src/routes/v1/attestations/schema.ts

@@ -134,7 +134,7 @@ const commentSchema = z
       .refine((links) => links.every((link) => dpidPathRegex.test(link)))
       .optional(),
     highlights: z.array(highlightBlockSchema).optional(),
-    uuid: z.string().optional(),
+    uuid: z.string(),
     visible: z.boolean().default(true),
   })
   .refine((comment) => comment.body?.length > 0 || !!comment?.highlights?.length, {

desci-server/src/scripts/backfill-annotations.ts

@@ -0,0 +1,31 @@
+import { prisma } from '../client.js';
+
+const main = async () => {
+  const annotations = await prisma.annotation.findMany({
+    where: { uuid: null },
+    include: { attestation: { select: { nodeUuid: true } } },
+  });
+  const fields = await prisma.$transaction(
+    annotations.map(({ id, ...annotation }) =>
+      prisma.annotation.upsert({
+        where: { id },
+        create: {
+          authorId: annotation.authorId,
+          body: annotation.body,
+          type: annotation.type,
+          nodeAttestationId: annotation.nodeAttestationId,
+          links: annotation.links,
+          visible: annotation.visible,
+          highlights: annotation.highlights,
+          uuid: annotation.uuid || annotation.attestation?.nodeUuid,
+        },
+        update: { uuid: annotation.attestation?.nodeUuid },
+      }),
+    ),
+  );
+  console.log('Annotations fields updated', fields);
+};
+
+main()
+  .then((result) => console.log('Annotations backfilled', result))
+  .catch((err) => console.log('Error running script ', err));

desci-server/test/integration/Attestation.test.ts

@@ -2253,6 +2253,7 @@ describe('Attestations Service', async () => {
         authorId: members[0].userId,
         claimId: openCodeClaim.id,
         body: 'review 1',
+        uuid: openCodeClaim.nodeUuid,
       };
       let res = await request(app)
         .post(`/v1/attestations/comments`)
@@ -2264,6 +2265,7 @@ describe('Attestations Service', async () => {
         authorId: members[1].userId,
         claimId: openCodeClaim.id,
         body: 'review 2',
+        uuid: openCodeClaim.nodeUuid,
       };
       res = await request(app).post(`/v1/attestations/comments`).set('authorization', memberAuthHeaderVal2).send(body);
       expect(res.statusCode).to.equal(200);
@@ -2282,6 +2284,7 @@ describe('Attestations Service', async () => {
           authorId: users[1].id,
           claimId: openCodeClaim.id,
           body: 'review 1',
+          uuid: openCodeClaim.nodeUuid,
         });
       expect(apiResponse.statusCode).to.equal(401);