From 9613140f87c832b9ba658aba8e54b9643fad6204 Mon Sep 17 00:00:00 2001
From: Son Daehyeon <sondaehyeon01@gmail.com>
Date: Wed, 18 Sep 2024 23:36:58 +0900
Subject: [PATCH] merge: Develop to Master (#84)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 나도 뭐 한지 몰라용... 이것저것들 수정했어요 (#82)

* fix(db): mongodb의 username 외 2개의 필드를 optional로 수정

* refactor: 몰라요... 이것저것

* feat: 검색 추가

* fix: 테스트 코드 버그 수정

* fix: DB에 멤버 업데이트 안되는 미친 버그 수정

* fix: DB에 멤버 업데이트 안되는 미친 버그 수정
---
 .github/workflows/deploy.yaml                             | 8 ++++----
 .../common/util/scheduler/purge-unused-image.job.ts       | 6 ++++++
 src/domain/member/service/member.service.ts               | 4 +---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 9c4cf92..d4a641a 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -45,8 +45,8 @@ jobs:
           platforms: linux/amd64
           provenance: false
           tags: ${{ env.IMAGE_NAME }}-amd64
-          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}-amd64-cache
-          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}-amd64-cache
+#          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}-amd64-cache
+#          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}-amd64-cache
 
   build-arm64:
     runs-on: ubuntu-latest
@@ -70,8 +70,8 @@ jobs:
           platforms: linux/arm64
           tags: ${{ env.IMAGE_NAME }}-arm64
           provenance: false
-          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}-arm64-cache
-          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}-arm64-cache
+#          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}-arm64-cache
+#          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}-arm64-cache
 
   merge-image:
     runs-on: ubuntu-latest
diff --git a/src/domain/activity/common/util/scheduler/purge-unused-image.job.ts b/src/domain/activity/common/util/scheduler/purge-unused-image.job.ts
index 607f267..9a6eee7 100644
--- a/src/domain/activity/common/util/scheduler/purge-unused-image.job.ts
+++ b/src/domain/activity/common/util/scheduler/purge-unused-image.job.ts
@@ -36,13 +36,19 @@ export class PurgeUnusedImageJob {
       ...(await this.projectRepository.findAll())
         .map((project) => project.content)
         .flatMap((content) => this.toImagesFromHtml(content))
+
+        .filter((key) => !key.startsWith('data:image'))
         .map((image) => this.activityService.extractKeyFromUrl(image)),
       ...(await this.projectRepository.findAll())
         .map((project) => project.image)
+
+        .filter((key) => !key.startsWith('data:image'))
         .map((image) => this.activityService.extractKeyFromUrl(image)),
       ...(await this.socialRepository.findAll())
         .flatMap((social) => social.contents)
         .map((content) => content.image)
+
+        .filter((key) => !key.startsWith('data:image'))
         .map((image) => this.activityService.extractKeyFromUrl(image)),
     ];
 
diff --git a/src/domain/member/service/member.service.ts b/src/domain/member/service/member.service.ts
index 0df321b..a1599af 100644
--- a/src/domain/member/service/member.service.ts
+++ b/src/domain/member/service/member.service.ts
@@ -48,9 +48,7 @@ export class MemberService {
     { description, github, instagram, blog }: UpdateMyInfoRequestDto,
   ): Promise<void> {
     member.description = description;
-    member.link.github = github;
-    member.link.instagram = instagram;
-    member.link.blog = blog;
+    member.link = { github, instagram, blog };
 
     await this.memberRepository.save(member);