#4148: fixed organization parameter

Author: jasperpinkus

src/backend/src/controllers/recruitment.controllers.ts

@@ -118,10 +118,7 @@ export default class RecruitmentController {
 
   static async getGuestDefinition(req: Request, res: Response, next: NextFunction) {
     try {
-      const definition = await RecruitmentServices.getGuestDefinition(
-        req.organization.organizationId,
-        req.params.definitionId as string
-      );
+      const definition = await RecruitmentServices.getGuestDefinition(req.organization, req.params.definitionId as string);
       res.status(200).json(definition);
     } catch (error: unknown) {
       next(error);

src/backend/src/services/recruitment.services.ts

@@ -346,9 +346,9 @@ export default class RecruitmentServices {
    * @returns a definition
    * @throws if the definition is not found in the db
    */
-  static async getGuestDefinition(organizationId: string, definitionId: string) {
+  static async getGuestDefinition(organization: Organization, definitionId: string) {
     const guest = await prisma.guest_Definition.findUnique({
-      where: { organizationId, definitionId }
+      where: { organization, definitionId }
     });
 
     if (!guest) {

src/backend/src/transformers/faq.transformer.ts

@@ -0,0 +1,13 @@
+import { Prisma } from '@prisma/client';
+import { FrequentlyAskedQuestion } from 'shared';
+import { FaqQueryArgs } from '../prisma-query-args/faq.query-args.js';
+import { userTransformer } from './user.transformer.js';
+
+export const faqTransformer = (faq: Prisma.FrequentlyAskedQuestionGetPayload<FaqQueryArgs>): FrequentlyAskedQuestion => ({
+  faqId: faq.faqId,
+  question: faq.question,
+  answer: faq.answer,
+  userCreated: userTransformer(faq.userCreated),
+  dateCreated: faq.dateCreated,
+  dateDeleted: faq.dateDeleted ?? undefined
+});

src/backend/tests/unit/recruitment.test.ts

@@ -392,15 +392,15 @@ describe('Recruitment Tests', () => {
         'buttonTxt',
         'buttonLink'
       );
-      const result = await RecruitmentServices.getGuestDefinition(orgId, guestDefinition.definitionId);
+      const result = await RecruitmentServices.getGuestDefinition(organization, guestDefinition.definitionId);
       expect(result).toStrictEqual(guestDefinition);
     });
 
     it('Get a single guest definition fails', async () => {
       const nonExistingDefinitionId = 'nonExistingDefinition';
-      await expect(async () => RecruitmentServices.getGuestDefinition(orgId, nonExistingDefinitionId)).rejects.toThrow(
-        new NotFoundException('Guest Definition', nonExistingDefinitionId)
-      );
+      await expect(async () =>
+        RecruitmentServices.getGuestDefinition(organization, nonExistingDefinitionId)
+      ).rejects.toThrow(new NotFoundException('Guest Definition', nonExistingDefinitionId));
     });
   });
   describe('Edit Guest Definition', () => {

src/shared/src/types/frequently-asked-questions-types.ts

@@ -0,0 +1,16 @@
+/*
+ * 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 { User } from './user-types.js';
+
+export interface FrequentlyAskedQuestion {
+  faqId: string;
+  question: string;
+  answer: string;
+  userCreated: User;
+  userDeleted?: User;
+  dateCreated: Date;
+  dateDeleted?: Date;
+}