Merge pull request #49 from DevKor-github/develop

fix(aws): do not make exception when someone fails to delete obj from s3
DevKor-github · Jul 30, 2024 · 29f1df5 · 29f1df5
2 parents 7c14584 + 6ace5ac
commit 29f1df5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/APIs/articles/services/articles-delete.service.ts b/src/APIs/articles/services/articles-delete.service.ts
@@ -6,6 +6,7 @@ import { IArticlesServiceArticleUserIdPair } from '../interfaces/articles.servic
 import { ArticlesReadRepository } from '../repositories/articles-read.repository';
 import { ImagesService } from 'src/modules/images/images.service';
 import { MergeExceptionMetadata } from '@/common/decorators/merge-exception-metadata.decorator';
+import { IsUrl, isURL } from 'class-validator';
 
 @Injectable()
 export class ArticlesDeleteService {
@@ -45,11 +46,14 @@ export class ArticlesDeleteService {
     const data = await this.repo_articlesRead.findOne({
       where: { userId, id: articleId },
     });
-    if (data) {
+    if (isURL(data.imageUrl)) {
       await this.svc_images.deleteImage({ url: data.imageUrl });
+    }
+    if (isURL(data.mainImageUrl)) {
       await this.svc_images.deleteImage({ url: data.mainImageUrl });
-      await this.svc_stickerBlocks.deleteStickerBlocks({ userId, articleId });
     }
+    await this.svc_stickerBlocks.deleteStickerBlocks({ userId, articleId });
+
     return await this.repo_articlesDelete.delete({
       user: { id: userId },
       id: articleId,

diff --git a/src/modules/aws/aws.service.ts b/src/modules/aws/aws.service.ts
@@ -59,7 +59,7 @@ export class AwsService {
       return await this.s3Client.send(command);
     } catch (error) {
       this.logger.error('Error deleting object from S3', error.stack);
-      throw new BlccuException('IMAGE_DELETE_FROM_S3_ERROR');
+      // throw new BlccuException('IMAGE_DELETE_FROM_S3_ERROR');
     }
   }