#3873 changes from review

Author: staysgt

src/backend/src/controllers/organizations.controllers.ts

@@ -125,15 +125,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async getPlatformLogoImage(req: Request, res: Response, next: NextFunction) {
-    try {
-      const platformLogoImageId = await OrganizationsService.getPlatformLogoImage(req.organization.organizationId);
-      res.status(200).json(platformLogoImageId);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async setNewMemberImage(req: Request, res: Response, next: NextFunction) {
     try {
       if (!req.file) {

src/backend/src/routes/organizations.routes.ts

@@ -49,7 +49,6 @@ organizationRouter.post(
   upload.single('platformLogo'),
   OrganizationsController.setPlatformLogoImage
 );
-organizationRouter.get('/platform-logo', OrganizationsController.getPlatformLogoImage);
 
 organizationRouter.post(
   '/new-member-image/update',
@@ -65,7 +64,7 @@ organizationRouter.post(
 );
 organizationRouter.post(
   '/platform-description/set',
-  body('platformDescription').isString(),
+  nonEmptyString(body('platformDescription')),
   validateInputs,
   OrganizationsController.setPlatformDescription
 );

src/backend/src/services/organizations.services.ts

@@ -569,43 +569,24 @@ export default class OrganizationsService {
    * @param organizationId the organization which the images will be set up
    * @param images the images which are being set
    */
-  static async setPlatformLogoImage(
-    platformLogoImageId: Express.Multer.File | null,
-    submitter: User,
-    organization: Organization
-  ) {
+  static async setPlatformLogoImage(platformLogoImage: Express.Multer.File, submitter: User, organization: Organization) {
     if (!(await userHasPermission(submitter.userId, organization.organizationId, isAdmin))) {
       throw new AccessDeniedAdminOnlyException('update platform logo');
     }
 
-    const platformLogoImageData = platformLogoImageId ? await uploadFile(platformLogoImageId) : null;
+    const platformLogoImageData = await uploadFile(platformLogoImage);
 
-    const updateData = {
-      ...(platformLogoImageData && { platformLogoImageId: platformLogoImageData.id })
-    };
+    if (!platformLogoImageData?.id || !platformLogoImageData?.name) {
+      throw new HttpException(500, 'Platform logo upload failed');
+    }
 
     const newImages = await prisma.organization.update({
       where: { organizationId: organization.organizationId },
-      data: updateData
+      data: {
+        platformLogoImageId: platformLogoImageData.id
+      }
     });
 
     return newImages;
   }
-
-  /**
-   * Gets platform logo image for the given organization
-   * @param organizationId organization Id of the milestone
-   * @returns all the milestones from the given organization
-   */
-  static async getPlatformLogoImage(organizationId: string) {
-    const organization = await prisma.organization.findUnique({
-      where: { organizationId }
-    });
-
-    if (!organization) {
-      throw new NotFoundException('Organization', organizationId);
-    }
-
-    return organization.platformLogoImageId;
-  }
 }

src/backend/src/transformers/organizationTransformer.ts

@@ -6,7 +6,7 @@ export const organizationTransformer = (organization: Organization): Organizatio
     ...organization,
     applicationLink: organization.applicationLink ?? undefined,
     newMemberImageId: organization.newMemberImageId ?? undefined,
-    platformDescription: organization.platformDescription ?? '',
+    platformDescription: organization.platformDescription,
     platformLogoImageId: organization.platformLogoImageId ?? undefined
   };
 };

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

@@ -334,25 +334,4 @@ describe('Organization Tests', () => {
       expect(updatedOrganization?.platformLogoImageId).toBe('uploaded-image3.png');
     });
   });
-
-  describe('Get Organization Platform Logo', () => {
-    it('Fails if an organization does not exist', async () => {
-      await expect(async () => await OrganizationsService.getPlatformLogoImage('1')).rejects.toThrow(
-        new NotFoundException('Organization', '1')
-      );
-    });
-
-    it('Succeeds and gets the image', async () => {
-      const testBatman = await createTestUser(batmanAppAdmin, orgId);
-      await OrganizationsService.setPlatformLogoImage(
-        { originalname: 'image1.png' } as Express.Multer.File,
-        testBatman,
-        organization
-      );
-      const image = await OrganizationsService.getPlatformLogoImage(orgId);
-
-      expect(image).not.toBeNull();
-      expect(image).toBe('uploaded-image1.png');
-    });
-  });
 });

src/frontend/src/apis/organizations.api.ts

@@ -78,12 +78,6 @@ export const setOrganizationPlatformLogoImage = async (file: File) => {
   return axios.post<Organization>(apiUrls.organizationsSetPlatformLogoImage(), formData);
 };
 
-export const getOrganizationPlatformLogoImage = async () => {
-  return axios.get<string>(apiUrls.organizationsPlatformLogoImage(), {
-    transformResponse: (data) => JSON.parse(data)
-  });
-};
-
 export const setOrganizationFeaturedProjects = async (featuredProjectIds: string[]) => {
   return axios.post<Organization>(apiUrls.organizationsSetFeaturedProjects(), {
     projectIds: featuredProjectIds

src/frontend/src/hooks/organizations.hooks.ts

@@ -21,8 +21,7 @@ import {
   setFinanceDelegates,
   setOrganizationNewMemberImage,
   getOrganizationNewMemberImage,
-  setOrganizationPlatformLogoImage,
-  getOrganizationPlatformLogoImage
+  setOrganizationPlatformLogoImage
 } from '../apis/organizations.api';
 import { downloadGoogleImage } from '../apis/organizations.api';
 
@@ -246,16 +245,6 @@ export const useSetOrganizationPlatformLogoImage = () => {
   });
 };
 
-export const useOrganizationPlatformLogoImage = () => {
-  return useQuery<Blob | undefined, Error>(['organizations', 'platform-logo'], async () => {
-    const { data: fileId } = await getOrganizationPlatformLogoImage();
-    if (!fileId) {
-      return;
-    }
-    return await downloadGoogleImage(fileId);
-  });
-};
-
 /*
  * Custom React Hook to fetch confluence guide for current
  * organization in backend

src/frontend/src/pages/HomePage/HomePage.tsx

@@ -32,7 +32,7 @@ const HomePage = () => {
         <AdminHomePage user={user} />
       ) : (
         <GuestHomePage user={user} />
-      )}
+      )}o
     </>
   );
 };