link fix

acmucsd · Oct 11, 2023 · 8336686 · 8336686
1 parent 89132a7
commit 8336686
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/api/controllers/MerchStoreController.ts b/api/controllers/MerchStoreController.ts
@@ -170,8 +170,12 @@ export class MerchStoreController {
 
     // generate a random string for the uploaded photo url
     const uniqueFileName = uuid();
-    const uploadedPhoto = await this.storageService.uploadToFolder(file, MediaType.MERCH_PHOTO, uniqueFileName, params.uuid);
-    const merchPhoto = await this.merchStoreService.createItemPhoto(params.uuid, { uploadedPhoto, position: createItemPhotoRequest.position });
+    const uploadedPhoto = await this.storageService.uploadToFolder(
+      file, MediaType.MERCH_PHOTO, uniqueFileName, params.uuid,
+    );
+    const merchPhoto = await this.merchStoreService.createItemPhoto(
+      params.uuid, { uploadedPhoto, position: createItemPhotoRequest.position },
+    );
 
     return { error: null, merchPhoto };
   }

diff --git a/migrations/0037-add-merch-item-image-table.ts b/migrations/0037-add-merch-item-image-table.ts
@@ -1,4 +1,4 @@
-import { MigrationInterface, QueryRunner, Table, TableColumn, TableIndex } from 'typeorm';
+import { MigrationInterface, QueryRunner, Table, TableColumn } from 'typeorm';
 
 const TABLE_NAME = 'MerchandiseItemPhotos';
 const MERCH_TABLE_NAME = 'MerchandiseItems';
@@ -39,7 +39,7 @@ export class AddMerchItemImageTable1681777109787 implements MigrationInterface {
         {
           name: 'images_by_item_index',
           columnNames: ['merchItem'],
-        }
+        },
       ],
       // cascade delete
       foreignKeys: [
@@ -49,7 +49,7 @@ export class AddMerchItemImageTable1681777109787 implements MigrationInterface {
           referencedColumnNames: ['uuid'],
           onDelete: 'CASCADE',
         },
-      ]
+      ],
     }));
 
     // add images from each item of the merchandise table to the photo table

diff --git a/models/MerchandiseItemPhotoModel.ts b/models/MerchandiseItemPhotoModel.ts
@@ -7,7 +7,9 @@ export class MerchandiseItemPhotoModel extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   uuid: Uuid;
 
-  @ManyToOne((type) => MerchandiseItemModel, (merchItem) => merchItem.merchPhotos, { nullable: false, onDelete: 'CASCADE' })
+  @ManyToOne((type) => MerchandiseItemModel,
+    (merchItem) => merchItem.merchPhotos,
+    { nullable: false, onDelete: 'CASCADE' })
   @JoinColumn({ name: 'merchItem' })
   @Index('images_by_item_index')
   merchItem: MerchandiseItemModel;

diff --git a/services/MerchStoreService.ts b/services/MerchStoreService.ts
@@ -5,7 +5,6 @@ import { EntityManager } from 'typeorm';
 import { difference, flatten, intersection } from 'underscore';
 import * as moment from 'moment-timezone';
 import { MerchItemWithQuantity, OrderItemPriceAndQuantity } from 'types/internal';
-import { Config } from '../config';
 import { MerchandiseItemOptionModel } from '../models/MerchandiseItemOptionModel';
 import {
   Uuid,
@@ -220,7 +219,9 @@ export default class MerchStoreService {
         // error on duplicate photo uuids
         const dupSet = new Set();
         merchPhotos.forEach((merchPhoto) => {
-          if (dupSet.has(merchPhoto.uuid)) { throw new UserError(`Multiple edits is made to photo: ${merchPhoto.uuid}`); }
+          if (dupSet.has(merchPhoto.uuid)) {
+            throw new UserError(`Multiple edits is made to photo: ${merchPhoto.uuid}`);
+          }
           dupSet.add(merchPhoto.uuid);
         });
 
@@ -346,7 +347,7 @@ export default class MerchStoreService {
    * @returns the photo object removed from database
    */
   public async deleteItemPhoto(uuid: Uuid): Promise<MerchItemPhoto> {
-    return await this.transactions.readWrite(async (txn) => {
+    return this.transactions.readWrite(async (txn) => {
       const merchStoreItemPhotoRepository = Repositories.merchStoreItemPhoto(txn);
       const merchPhoto = await merchStoreItemPhotoRepository.findByUuid(uuid);
       if (!merchPhoto) throw new NotFoundError('Merch item photo not found');

diff --git a/tests/data/MerchFactory.ts b/tests/data/MerchFactory.ts
@@ -150,7 +150,7 @@ export class MerchFactory {
   private static createPhotos(n: number): MerchandiseItemPhotoModel[] {
     return FactoryUtils
       .create(n, () => MerchFactory.fakePhoto())
-      .map((merchPhoto, i) => MerchandiseItemPhotoModel.merge(merchPhoto, { position: i }));;
+      .map((merchPhoto, i) => MerchandiseItemPhotoModel.merge(merchPhoto, { position: i }));
   }
 
   private static randomPrice(): number {

diff --git a/tests/merchStore.test.ts b/tests/merchStore.test.ts
@@ -888,14 +888,13 @@ describe('merch item photos', () => {
     const merchStoreController = ControllerFactory.merchStore(
       conn,
       undefined,
-      instance(storageService)
+      instance(storageService),
     );
     const params = { uuid: item.uuid };
 
     // verify before deleting, the photos all exist
-    const itemInDatabase = (await merchStoreController.getOneMerchItem(params, admin)).item
+    const itemInDatabase = (await merchStoreController.getOneMerchItem(params, admin)).item;
     expect(itemInDatabase.merchPhotos).toEqual(merchPhotos);
-    console.log(itemInDatabase);
 
     const deleteMerchItemPhotoParam1 = { uuid: photo1.uuid };
     const deleteMerchItemPhotoParam2 = { uuid: photo2.uuid };
@@ -911,7 +910,6 @@ describe('merch item photos', () => {
     expect(newPhotos[0].uuid).toEqual(photo2.uuid);
     expect(newPhotos[0].position).toEqual(1);
 
-
     // verify visible item photo limitation
     expect(merchStoreController.deleteMerchItemPhoto(deleteMerchItemPhotoParam2, admin))
       .rejects.toThrow('Cannot delete the only photo for a visible merch item');