refactor: 뱃지보여주기/숨기기 기능도 member도메인의 save기능을 사용하도록 함

- 그에 따른 컨버팅 수정
JNU-econovation · Jan 17, 2025 · ba48463 · ba48463
1 parent ed83349
commit ba48463
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/modules/domain/src/main/java/com/whoz_in/domain/member/model/Member.java b/modules/domain/src/main/java/com/whoz_in/domain/member/model/Member.java
@@ -10,6 +10,7 @@
 import com.whoz_in.domain.member.service.PasswordEncoder;
 import com.whoz_in.domain.shared.AggregateRoot;
 import com.whoz_in.domain.shared.Nullable;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -108,4 +109,8 @@ public void addBadge(BadgeId badgeId) {
             this.register(new MemberBadgeAdded(this.getId(), this.badges));
         }
     }
+
+    public Map<BadgeId, IsBadgeShown> getBadges() {
+        return Collections.unmodifiableMap(this.badges);
+    }
 }
diff --git a/...frastructure/domain-jpa/src/main/java/com/whoz_in/domain_jpa/badge/BadgeMemberEntity.java b/...frastructure/domain-jpa/src/main/java/com/whoz_in/domain_jpa/badge/BadgeMemberEntity.java
@@ -30,11 +30,6 @@ public class BadgeMemberEntity extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private IsBadgeShown isBadgeShown = IsBadgeShown.Y;
 
-    public BadgeMemberEntity(UUID memberId, UUID badgeId) {
-        this.memberId = memberId;
-        this.badgeId = badgeId;
-    }
-
     public BadgeMemberEntity(UUID memberId, UUID badgeId, IsBadgeShown isBadgeShown) {
         this.memberId = memberId;
         this.badgeId = badgeId;

diff --git a/...nfrastructure/domain-jpa/src/main/java/com/whoz_in/domain_jpa/member/MemberConverter.java b/...nfrastructure/domain-jpa/src/main/java/com/whoz_in/domain_jpa/member/MemberConverter.java
@@ -6,8 +6,10 @@
 import com.whoz_in.domain.member.model.Member;
 import com.whoz_in.domain.member.model.MemberId;
 import com.whoz_in.domain.member.model.OAuthCredentials;
+import com.whoz_in.domain_jpa.badge.BadgeMemberEntity;
 import com.whoz_in.domain_jpa.shared.BaseConverter;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.springframework.stereotype.Component;
 
@@ -18,6 +20,13 @@ public class MemberConverter extends BaseConverter<MemberEntity, Member> {
     public MemberEntity from(Member member) {
         AuthCredentials auth = member.getAuthCredentials().orElse(null);
         OAuthCredentials oAuth = member.getOAuthCredentials().orElse(null);
+        Set<BadgeMemberEntity> badgeMembers = member.getBadges().entrySet().stream()
+                .map(entry -> new BadgeMemberEntity(
+                        member.getId().id(),
+                        entry.getKey().id(),
+                        entry.getValue()
+                ))
+                .collect(Collectors.toSet());
         return new MemberEntity(
                 member.getId().id(),
                 member.getName(),
@@ -27,7 +36,8 @@ public MemberEntity from(Member member) {
                 auth != null ? auth.getLoginId() : null,
                 auth != null ? auth.getEncodedPassword() : null,
                 oAuth != null ? oAuth.getSocialProvider() : null,
-                oAuth != null ? oAuth.getSocialId() : null
+                oAuth != null ? oAuth.getSocialId() : null,
+                badgeMembers
         );
     }
 

diff --git a/...s/infrastructure/domain-jpa/src/main/java/com/whoz_in/domain_jpa/member/MemberEntity.java b/...s/infrastructure/domain-jpa/src/main/java/com/whoz_in/domain_jpa/member/MemberEntity.java
@@ -58,8 +58,8 @@ public class MemberEntity extends BaseEntity {
   private Set<BadgeMemberEntity> badgeMembers;
 
   public MemberEntity(UUID id, String name, int generation, Position position, String statusMessage,
-          String loginId, String password,
-          SocialProvider socialProvider, String socialId) {
+                      String loginId, String password,
+                      SocialProvider socialProvider, String socialId, Set<BadgeMemberEntity> badgeMembers) {
     this.id = id;
     this.name = name;
     this.generation = generation;
@@ -69,5 +69,6 @@ public MemberEntity(UUID id, String name, int generation, Position position, Str
     this.password = password;
     this.socialProvider = socialProvider;
     this.socialId = socialId;
+    this.badgeMembers = badgeMembers;
   }
 }
diff --git a/...ain/java/com/whoz_in/main_api/command/badge/application/SwitchBadgeVisibilityHandler.java b/...ain/java/com/whoz_in/main_api/command/badge/application/SwitchBadgeVisibilityHandler.java
@@ -20,7 +20,8 @@ public class SwitchBadgeVisibilityHandler implements CommandHandler<SwitchBadgeV
     @Override
     public Void handle(SwitchBadgeVisibility req) {
         Member member = repository.findByMemberId(new MemberId(req.memberId())).orElseThrow();
-        repository.changeBadgeShowOrHide(new MemberId(req.memberId()),new BadgeId(req.badgeId()));
+        member.changeBadgeShowOrHide(new BadgeId(req.badgeId()));
+        repository.save(member);
         eventBus.publish(member.pullDomainEvents());
         return null;
     }