Fix image upload await

Rikthepixel · Jan 19, 2024 · 79eaa05 · 79eaa05
1 parent 2a29bca
commit 79eaa05
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 11 deletions.
diff --git a/apps/accounts/src/index.ts b/apps/accounts/src/index.ts
@@ -1,5 +1,10 @@
 import { config as loadEnv } from 'dotenv';
+
 loadEnv();
+loadEnv({ path: '.env.local', override: true });
+if (process.env.NODE_ENV === 'production') {
+  loadEnv({ path: '.env.production', override: true });
+}
 
 import Koa from 'koa';
 

diff --git a/apps/advertisements/src/index.ts b/apps/advertisements/src/index.ts
@@ -1,5 +1,10 @@
 import { config as loadEnv } from 'dotenv';
+
 loadEnv();
+loadEnv({ path: '.env.local', override: true });
+if (process.env.NODE_ENV === 'production') {
+  loadEnv({ path: '.env.production', override: true });
+}
 
 import Koa from 'koa';
 

diff --git a/apps/advertisements/src/repositories/advertisement/KnexAdvertisementRepository.ts b/apps/advertisements/src/repositories/advertisement/KnexAdvertisementRepository.ts
@@ -90,14 +90,14 @@ export default class KnexAdvertisementRepository
 
       if (!ad) return null;
 
-      const images = await trx
-        .table('images as imgs')
-        .where('imgs.advertisement_id', ad.id)
-        .select<UidsToBuffers<Pick<Image, 'uid'>>[]>('imgs.uid')
+      const imagesTask = trx
+        .table('images')
+        .where('advertisement_id', ad.id)
+        .select<UidsToBuffers<Pick<Image, 'uid'>>[]>('uid')
         .orderBy('id', 'desc')
         .then((imgs) => imgs.map((img) => trx.fn.binToUuid(img.uid)));
 
-      const propertyValues = await trx
+      const propertyValuesTask = trx
         .table('category_property_option_values as vals')
         .where('vals.advertisement_id', ad.id)
         .join(
@@ -131,6 +131,8 @@ export default class KnexAdvertisementRepository
           })),
         );
 
+      const [images, propertyValues] = await Promise.all([imagesTask, propertyValuesTask])
+
       return {
         ...ad,
         images,

diff --git a/apps/advertisements/src/repositories/images/AzureImageRepository.ts b/apps/advertisements/src/repositories/images/AzureImageRepository.ts
@@ -15,7 +15,8 @@ export default class AzureImageRepository implements ImageRepository {
     advertisementId: number,
     images: UploadableImage[],
   ): Promise<void> {
-    this.db.transaction(async (trx) => {
+    await this.db.transaction(async (trx) => {
+
       await Promise.all([
         trx.table('images').insert(
           images.map((img) => ({

diff --git a/apps/advertisements/src/services/AdvertisementService.ts b/apps/advertisements/src/services/AdvertisementService.ts
@@ -78,6 +78,7 @@ export default class AdvertisementService {
 
     const images = files.map((img) => ({ ...img, uid: randomUUID() }));
     await this.imageRepository.upload(advertisementId, images);
+    console.log(await this.imageRepository.getByAdvertisement(advertisementId));
     return images.map((img) => img.uid);
   }
 
@@ -128,6 +129,11 @@ export default class AdvertisementService {
         })
       : null;
 
+    console.log({
+      adImages: advertisement.images,
+      changedImages: changes.images,
+    });
+
     const allRemainingImagesValid = changes.images.every((img) =>
       advertisement.images.includes(img),
     );

diff --git a/apps/frontend/src/apis/ads/manage.ts b/apps/frontend/src/apis/ads/manage.ts
@@ -47,7 +47,7 @@ export async function putAdvertisement(
   });
 }
 
-export async function uploadAdvertisementImage(uid: string, images: File[]) {
+export async function uploadAdvertisementImages(uid: string, images: File[]) {
   const request = new FormData();
   for (const image of images) {
     request.append('image', image);

diff --git a/apps/frontend/src/stores/useAdvertisementEditor.ts b/apps/frontend/src/stores/useAdvertisementEditor.ts
@@ -2,7 +2,7 @@ import {
   createAdvertisement,
   getAdvertisement,
   putAdvertisement,
-  uploadAdvertisementImage,
+  uploadAdvertisementImages,
 } from '@/apis/ads/manage';
 import Resource from '@/helpers/Resource';
 import { FileWithPath } from '@mantine/dropzone';
@@ -121,12 +121,14 @@ const useAdvertisementEditor = create<AdvertisementEditorState>((set, get) => ({
     const { imagesToUpload, images, ...edited } = state.edited;
     const uploadedImages =
       imagesToUpload.length > 0
-        ? await uploadAdvertisementImage(ad.uid, imagesToUpload).catch((e) => {
+        ? await uploadAdvertisementImages(ad.uid, imagesToUpload).catch((e) => {
             set({ isSaving: false });
             throw e;
           })
         : [];
 
+    console.log(uploadedImages)
+
     await putAdvertisement(ad.uid, {
       ...edited,
       images: [...uploadedImages, ...images],

diff --git a/apps/messages/src/index.ts b/apps/messages/src/index.ts
@@ -1,5 +1,10 @@
 import { config as loadEnv } from 'dotenv';
+
 loadEnv();
+loadEnv({ path: '.env.local', override: true });
+if (process.env.NODE_ENV === 'production') {
+  loadEnv({ path: '.env.production', override: true });
+}
 
 import Koa from 'koa';
 
@@ -41,8 +46,7 @@ const server = app
     console.log(
       `Server "${process.env.SERVER_NAME}" started on localhost:${PORT}`,
     ),
-  )
-;
+  );
 server.requestTimeout = 0;
 server.headersTimeout = 0;