#1519: pr comments

Author: ryanhowe28

src/backend/src/controllers/projects.controllers.ts

@@ -141,7 +141,8 @@ export default class ProjectsController {
 
   static async getAllManufacturers(req: Request, res: Response, next: NextFunction) {
     try {
-      const manufacturers: Manufacturer[] = await ProjectsService.getAllManufacturers();
+      const user = await getCurrentUser(res);
+      const manufacturers: Manufacturer[] = await ProjectsService.getAllManufacturers(user);
       return res.status(200).json(manufacturers);
     } catch (error: unknown) {
       next(error);

src/backend/src/prisma-query-args/manufacturers.query-args.ts

@@ -1,3 +1,8 @@
+/*
+ * This file is part of NER's FinishLine and licensed under GNU AGPLv3.
+ * See the LICENSE file in the repository root folder for details.
+ */
+
 import { Prisma } from '@prisma/client';
 
 const manufacturerQueryArgs = Prisma.validator<Prisma.ManufacturerArgs>()({
@@ -6,4 +11,4 @@ const manufacturerQueryArgs = Prisma.validator<Prisma.ManufacturerArgs>()({
   }
 });
 
-export default manufacturerQueryArgs;
+export default manufacturerQueryArgs;

src/backend/src/services/projects.services.ts

@@ -1,4 +1,4 @@
-import { Manufacturer, User } from '@prisma/client';
+import { Manufacturer, Role, User } from '@prisma/client';
 import { isAdmin, isGuest, isProject, LinkCreateArgs, LinkType, Project, WbsNumber, wbsPipe } from 'shared';
 import projectQueryArgs from '../prisma-query-args/projects.query-args';
 import prisma from '../prisma/prisma';
@@ -634,12 +634,15 @@ export default class ProjectsService {
    * Get all the manufacturers in the database.
    * @returns all the manufacturers
    */
-  static async getAllManufacturers(): Promise<Manufacturer[]> {
+  static async getAllManufacturers(submitter: User): Promise<Manufacturer[]> {
+    if (submitter.role === Role.GUEST) {
+      throw new AccessDeniedGuestException('Guests cannot get the manufacturers');
+    }
+
     return (
       await prisma.manufacturer.findMany({
         ...manufacturerQueryArgs
       })
     ).map(manufacturerTransformer);
   }
-
 }

src/backend/src/transformers/manufacturer.transformer.ts

@@ -1,10 +1,17 @@
+/*
+ * This file is part of NER's FinishLine and licensed under GNU AGPLv3.
+ * See the LICENSE file in the repository root folder for details.
+ */
+
 import { Manufacturer, Prisma } from '@prisma/client';
 import manufacturerQueryArgs from '../prisma-query-args/manufacturers.query-args';
 
-export const manufacturerTransformer = (manufacturer: Prisma.ManufacturerGetPayload<typeof manufacturerQueryArgs>): Manufacturer => {
-   return {
+export const manufacturerTransformer = (
+  manufacturer: Prisma.ManufacturerGetPayload<typeof manufacturerQueryArgs>
+): Manufacturer => {
+  return {
     name: manufacturer.name,
     dateCreated: manufacturer.dateCreated,
     creatorId: manufacturer.creatorId
-   }
-};
+  };
+};

src/backend/tests/projects.test.ts

@@ -1,7 +1,7 @@
 import prisma from '../src/prisma/prisma';
 import { getHighestProjectNumber } from '../src/utils/projects.utils';
 import * as changeRequestUtils from '../src/utils/change-requests.utils';
-import { aquaman, batman, wonderwoman } from './test-data/users.test-data';
+import { aquaman, batman, theVisitor, wonderwoman } from './test-data/users.test-data';
 import { prismaManufacturer1, prismaProject1, sharedProject1 } from './test-data/projects.test-data';
 import { prismaChangeRequest1 } from './test-data/change-requests.test-data';
 import { prismaTeam1 } from './test-data/teams.test-data';
@@ -284,10 +284,18 @@ describe('Projects', () => {
     test('Get all Manufacturer works', async () => {
       vi.spyOn(prisma.manufacturer, 'findMany').mockResolvedValue([]);
 
-      const res = await ProjectsService.getAllManufacturers();
+      const res = await ProjectsService.getAllManufacturers(batman);
 
       expect(prisma.manufacturer.findMany).toHaveBeenCalledTimes(1);
       expect(res).toStrictEqual([]);
     });
+
+    test('Get all Manufacturer fails from guest', async () => {
+      vi.spyOn(prisma.manufacturer, 'findMany').mockResolvedValue([]);
+
+      await expect(ProjectsService.getAllManufacturers(theVisitor)).rejects.toThrow(
+        new AccessDeniedGuestException('Guests cannot get the manufacturers')
+      );
+    });
   });
 });