fixed tests

JiscSD · Oct 13, 2023 · 7ca7cc0 · 7ca7cc0
1 parent 0d2b86e
commit 7ca7cc0
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 358 deletions.
diff --git a/api/prisma/convertResearchTopics.ts b/api/prisma/convertResearchTopics.ts
diff --git a/api/prisma/removeResearchTopicProblems.ts b/api/prisma/removeResearchTopicProblems.ts
diff --git a/api/serverless.yml b/api/serverless.yml
@@ -184,13 +184,6 @@ functions:
                   path: ${self:custom.versions.v1}/publications/{id}/pdf
                   method: GET
                   cors: true
-    getResearchTopics:
-        handler: src/components/publication/routes.getResearchTopics
-        events:
-            - http:
-                  path: ${self:custom.versions.v1}/publications/research-topics
-                  method: GET
-                  cors: true
     getPublicationTopics:
         handler: src/components/publication/routes.getPublicationTopics
         events:

diff --git a/api/src/components/coauthor/__tests__/createCoAuthor.test.ts b/api/src/components/coauthor/__tests__/createCoAuthor.test.ts
@@ -129,12 +129,12 @@ describe('create coauthor', () => {
 
     test('Co-author email is converted to lower case on save', async () => {
         await testUtils.agent
-            .put('/publications/publication-data-draft/coauthors')
+            .put('/publication-versions/publication-data-draft-v1/coauthors')
             .query({ apiKey: '123456789' })
             .send([
                 {
                     id: createId(),
-                    publicationId: 'publication-problem-draft',
+                    publicationVersionId: 'publication-problem-draft-v1',
                     email: 'MULTIcaseAddress@emailtest.COM',
                     linkedUser: null,
                     approvalRequested: false,
@@ -143,7 +143,7 @@ describe('create coauthor', () => {
             ]);
 
         const coAuthors = await testUtils.agent
-            .get('/publications/publication-data-draft/coauthors')
+            .get('/publication-versions/publication-data-draft-v1/coauthors')
             .query({ apiKey: '123456789' });
 
         expect(coAuthors.body.length).toEqual(2); // corresponding author and this new one

diff --git a/api/src/components/publication/__tests__/getResearchTopics.test.ts b/api/src/components/publication/__tests__/getResearchTopics.test.ts
diff --git a/api/src/components/publication/controller.ts b/api/src/components/publication/controller.ts
@@ -202,16 +202,6 @@ export const getPDF = async (
         : response.json(200, { pdfUrl });
 };
 
-export const getResearchTopics = async (): Promise<I.JSONResponse> => {
-    try {
-        const researchTopics = await publicationService.getResearchTopics();
-
-        return response.json(200, researchTopics);
-    } catch (error) {
-        return response.json(500, { message: 'Unknown server error.' });
-    }
-};
-
 export const updateTopics = async (
     event: I.AuthenticatedAPIRequest<
         I.UpdatePublicationTopicsRequestBody,

diff --git a/api/src/components/publication/routes.ts b/api/src/components/publication/routes.ts
@@ -29,10 +29,6 @@ export const getPDF = middy(publicationController.getPDF)
     .use(middleware.httpJsonBodyParser())
     .use(middleware.validator(publicationSchema.getPDF, 'pathParameters'));
 
-export const getResearchTopics = middy(publicationController.getResearchTopics).use(
-    middleware.doNotWaitForEmptyEventLoop({ runOnError: true, runOnBefore: true, runOnAfter: true })
-);
-
 export const updateTopics = middy(publicationController.updateTopics)
     .use(middleware.doNotWaitForEmptyEventLoop({ runOnError: true, runOnBefore: true, runOnAfter: true }))
     .use(middleware.httpJsonBodyParser())

diff --git a/api/src/components/publication/service.ts b/api/src/components/publication/service.ts
@@ -6,6 +6,7 @@ import * as referenceService from 'reference/service';
 import * as Helpers from 'lib/helpers';
 import { Browser, launch } from 'puppeteer-core';
 import { PutObjectCommand } from '@aws-sdk/client-s3';
+import { Prisma } from '@prisma/client';
 
 export const isIdInUse = async (id: string) => {
     const publication = await client.prisma.publication.count({
@@ -922,129 +923,6 @@ export const generatePDF = async (publicationVersion: I.PublicationVersion): Pro
     }
 };
 
-export const getResearchTopics = async () => {
-    const publications = await client.prisma.publication.findMany({
-        where: {
-            type: 'PROBLEM',
-            OR: [
-                {
-                    id: {
-                        equals: 'why' // god problem will be converted to a god topic
-                    }
-                },
-                {
-                    versions: {
-                        some: {
-                            isLatestVersion: true,
-                            content: {
-                                contains: 'This is an automatically-generated topic'
-                            }
-                        }
-                    }
-                }
-            ],
-            References: {
-                none: {}
-            },
-            ...additionalFilters,
-            versions: {
-                some: {
-                    createdBy: 'octopus',
-                    isLatestVersion: true,
-                    References: {
-                        none: {}
-                    }
-                }
-            }
-        },
-        include: {
-            versions: {
-                where: {
-                    isLatestVersion: true
-                },
-                include: {
-                    user: {
-                        select: {
-                            id: true,
-                            firstName: true,
-                            lastName: true,
-                            orcid: true
-                        }
-                    }
-                }
-            },
-            linkedTo: {
-                select: {
-                    id: true,
-                    publicationToRef: {
-                        select: {
-                            id: true,
-                            type: true,
-                            doi: true,
-                            versions: {
-                                select: {
-                                    user: {
-                                        select: {
-                                            id: true,
-                                            firstName: true,
-                                            lastName: true,
-                                            orcid: true
-                                        }
-                                    },
-                                    title: true,
-                                    publishedDate: true,
-                                    currentStatus: true,
-                                    description: true,
-                                    keywords: true
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            linkedFrom: {
-                select: {
-                    id: true,
-                    publicationFromRef: {
-                        select: {
-                            id: true,
-                            type: true,
-                            doi: true,
-                            versions: {
-                                select: {
-                                    user: {
-                                        select: {
-                                            id: true,
-                                            firstName: true,
-                                            lastName: true,
-                                            orcid: true
-                                        }
-                                    },
-                                    title: true,
-                                    publishedDate: true,
-                                    currentStatus: true,
-                                    description: true,
-                                    keywords: true
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            PublicationBookmarks: true
-        }
-    });
-
-    // Merge versioned data into the publication records
-    const mergedPublications = publications.map((publication) => {
-        const currentVersion = publication.versions[0];
-
-        return { ...currentVersion, ...publication };
-    });
-
-    return mergedPublications;
-};
-
 // Overwrite existing topics with those whose IDs were passed.
 export const updateTopics = async (id: string, topics: string[]) => {
     // Format topics in a way that prisma can understand.