👔 회원 정보 변경(Adapter & Service)(#14)

jun108059 · Jul 25, 2022 · bcdbe3a · bcdbe3a
1 parent 5e1237e
commit bcdbe3a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/api/src/main/java/hexagonal/api/member/adapter/in/web/request/UpdateMemberReq.java b/api/src/main/java/hexagonal/api/member/adapter/in/web/request/UpdateMemberReq.java
@@ -4,9 +4,6 @@
 
 @Getter
 public class UpdateMemberReq {
-
-    Long id;
     String name;
-    String email;
     String type;
 }
diff --git a/api/src/main/java/hexagonal/api/member/adapter/out/persistence/MemberPersistenceAdapter.java b/api/src/main/java/hexagonal/api/member/adapter/out/persistence/MemberPersistenceAdapter.java
@@ -42,7 +42,7 @@ public Long saveMember(MemberJpaEntity memberJpaEntity) {
 
     @Override
     public Long updateMember(MemberJpaEntity memberJpaEntity) {
-        memberRepository.save(memberJpaEntity);
-        return null;
+        MemberJpaEntity saveEntity = memberRepository.save(memberJpaEntity);
+        return saveEntity.getId();
     }
 }
diff --git a/api/src/main/java/hexagonal/api/member/application/service/UpdateMemberService.java b/api/src/main/java/hexagonal/api/member/application/service/UpdateMemberService.java
@@ -19,23 +19,22 @@ public class UpdateMemberService implements UpdateMemberUseCase {
 
     @Override
     public Long updateMember(UpdateMemberCommand command) {
-        // ID 존재 여부 검사
-        if (checkMemberExistsById(command.getId())) {
-            MemberJpaEntity memberJpaEntity = command.toJpaEntity();
-            return updateMemberPort.updateMember(memberJpaEntity);
+        MemberJpaEntity jpaEntity = checkMemberExistsById(command.getId());
+        if (jpaEntity != null) {
+            jpaEntity.setName(command.getName());
+            jpaEntity.setType(command.getMemberType());
+            return updateMemberPort.updateMember(jpaEntity);
         } else {
             // FixMe Custom Exception 처리하기
-            return null;
+            return 0L;
         }
     }
 
-    private boolean checkMemberExistsById(Long id) {
+    private MemberJpaEntity checkMemberExistsById(Long id) {
         try {
-            findMemberPort.findMemberById(id);
+            return findMemberPort.findMemberById(id);
         } catch (EntityNotFoundException e) {
-            return false;
+            return null;
         }
-
-        return true;
     }
 }