refactor: 멤버 패키지 리팩토링

- domain -> entity로 패키지명 변경 - mapping 메서드 mapper클래스에서 수행하도록 변경
codesquad-masters2024-team02 · May 20, 2024 · 0696eda · 0696eda
1 parent a3fb446
commit 0696eda
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 35 deletions.
diff --git a/be/issue-tracker/.gitignore b/be/issue-tracker/.gitignore
@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
+src/main/resources/application.properties
 
diff --git a/be/issue-tracker/src/main/java/com/issuetracker/member/controller/MemberController.java b/be/issue-tracker/src/main/java/com/issuetracker/member/controller/MemberController.java
@@ -2,7 +2,7 @@
 
 import com.issuetracker.member.dto.MemberCreateDto;
 import com.issuetracker.member.dto.SimpleMemberDto;
-import com.issuetracker.member.model.Member;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.service.MemberService;
 import jakarta.validation.Valid;
 import java.net.URI;

diff --git a/...com/issuetracker/member/model/Member.java → ...om/issuetracker/member/entity/Member.java b/...com/issuetracker/member/model/Member.java → ...om/issuetracker/member/entity/Member.java
@@ -1,4 +1,4 @@
-package com.issuetracker.member.model;
+package com.issuetracker.member.entity;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -17,7 +17,7 @@ public class Member {
     private final String nickname;
     private final String email;
     private final Long fileId;
-    
+
     public boolean hasSamePassword(String password) {
         return this.password.equals(password);
     }

diff --git a/be/issue-tracker/src/main/java/com/issuetracker/member/repository/MemberRepository.java b/be/issue-tracker/src/main/java/com/issuetracker/member/repository/MemberRepository.java
@@ -1,7 +1,7 @@
 package com.issuetracker.member.repository;
 
 import com.issuetracker.global.repository.WithInsert;
-import com.issuetracker.member.model.Member;
+import com.issuetracker.member.entity.Member;
 import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.repository.CrudRepository;
 

diff --git a/be/issue-tracker/src/main/java/com/issuetracker/member/service/LoginService.java b/be/issue-tracker/src/main/java/com/issuetracker/member/service/LoginService.java
@@ -2,8 +2,8 @@
 
 import com.issuetracker.member.dto.LoginMemberDto;
 import com.issuetracker.member.dto.LoginTryDto;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.exception.LoginFailException;
-import com.issuetracker.member.model.Member;
 import com.issuetracker.member.repository.MemberRepository;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;

diff --git a/be/issue-tracker/src/main/java/com/issuetracker/member/service/MemberService.java b/be/issue-tracker/src/main/java/com/issuetracker/member/service/MemberService.java
@@ -4,9 +4,10 @@
 import com.issuetracker.file.service.FileService;
 import com.issuetracker.member.dto.MemberCreateDto;
 import com.issuetracker.member.dto.SimpleMemberDto;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.exception.MemberNotFoundException;
-import com.issuetracker.member.model.Member;
 import com.issuetracker.member.repository.MemberRepository;
+import com.issuetracker.member.util.MemberMapper;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -28,7 +29,7 @@ public class MemberService {
      */
     @Transactional
     public Member create(MemberCreateDto memberCreateDto) {
-        Member member = toMember(memberCreateDto);
+        Member member = MemberMapper.toMember(memberCreateDto);
         Member created = memberRepository.insert(member);
 
         log.info("새로운 유저가 생성되었습니다. {}", created);
@@ -52,7 +53,7 @@ public List<SimpleMemberDto> getMembers() {
     public SimpleMemberDto getSimpleMemberById(String id) {
         Member member = getMemberOrThrow(id);
         String imgUrl = getImgUrl(member);
-        return new SimpleMemberDto(id, imgUrl);
+        return MemberMapper.toSimpleMemberDto(member, imgUrl);
     }
 
     /**
@@ -62,7 +63,7 @@ public SimpleMemberDto getSimpleMemberById(String id) {
     public List<SimpleMemberDto> findSimpleMembersById(List<String> issueAssigneeIds) {
         List<Member> members = (List<Member>) memberRepository.findAllById(issueAssigneeIds);
         return members.stream()
-                .map(member -> new SimpleMemberDto(member.getId(), fileService.getImgUrlById(member.getFileId())))
+                .map(member -> MemberMapper.toSimpleMemberDto(member, fileService.getImgUrlById(member.getFileId())))
                 .toList();
     }
 
@@ -81,16 +82,11 @@ private Member getMemberOrThrow(String id) {
         return memberRepository.findById(id).orElseThrow(MemberNotFoundException::new);
     }
 
-    private Member toMember(MemberCreateDto memberCreateDto) {
-        return new Member(memberCreateDto.getId(), memberCreateDto.getPassword(),
-                memberCreateDto.getNickname(), memberCreateDto.getEmail(), null);
-    }
-
     private List<SimpleMemberDto> toSimpleMemberDtos(List<Member> members) {
         List<SimpleMemberDto> simpleMemberDtos = new ArrayList<>();
         for (Member member : members) {
             String imgUrl = getImgUrl(member);
-            simpleMemberDtos.add(new SimpleMemberDto(member.getId(), imgUrl));
+            simpleMemberDtos.add(MemberMapper.toSimpleMemberDto(member, imgUrl));
         }
         return simpleMemberDtos;
     }

diff --git a/be/issue-tracker/src/main/java/com/issuetracker/member/util/MemberMapper.java b/be/issue-tracker/src/main/java/com/issuetracker/member/util/MemberMapper.java
@@ -0,0 +1,17 @@
+package com.issuetracker.member.util;
+
+import com.issuetracker.member.dto.MemberCreateDto;
+import com.issuetracker.member.dto.SimpleMemberDto;
+import com.issuetracker.member.entity.Member;
+
+public class MemberMapper {
+
+    public static Member toMember(MemberCreateDto memberCreateDto) {
+        return new Member(memberCreateDto.getId(), memberCreateDto.getPassword(),
+                memberCreateDto.getNickname(), memberCreateDto.getEmail(), null);
+    }
+
+    public static SimpleMemberDto toSimpleMemberDto(Member member, String imgUrl) {
+        return new SimpleMemberDto(member.getId(), imgUrl);
+    }
+}
diff --git a/be/issue-tracker/src/main/resources/application.properties b/be/issue-tracker/src/main/resources/application.properties
diff --git a/be/issue-tracker/src/test/java/com/issuetracker/member/controller/LoginControllerTest.java b/be/issue-tracker/src/test/java/com/issuetracker/member/controller/LoginControllerTest.java
@@ -9,8 +9,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.issuetracker.member.dto.LoginMemberDto;
 import com.issuetracker.member.dto.LoginTryDto;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.exception.LoginFailException;
-import com.issuetracker.member.model.Member;
 import com.issuetracker.member.service.LoginService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

diff --git a/be/issue-tracker/src/test/java/com/issuetracker/member/controller/MemberControllerTest.java b/be/issue-tracker/src/test/java/com/issuetracker/member/controller/MemberControllerTest.java
@@ -9,7 +9,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.issuetracker.member.dto.MemberCreateDto;
-import com.issuetracker.member.model.Member;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.service.MemberService;
 import java.net.URI;
 import org.junit.jupiter.api.Test;

diff --git a/be/issue-tracker/src/test/java/com/issuetracker/member/repository/MemberRepositoryTest.java b/be/issue-tracker/src/test/java/com/issuetracker/member/repository/MemberRepositoryTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.issuetracker.member.model.Member;
+import com.issuetracker.member.entity.Member;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/be/issue-tracker/src/test/java/com/issuetracker/member/service/LoginServiceTest.java b/be/issue-tracker/src/test/java/com/issuetracker/member/service/LoginServiceTest.java
@@ -6,8 +6,8 @@
 
 import com.issuetracker.member.dto.LoginMemberDto;
 import com.issuetracker.member.dto.LoginTryDto;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.exception.LoginFailException;
-import com.issuetracker.member.model.Member;
 import com.issuetracker.member.repository.MemberRepository;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/be/issue-tracker/src/test/java/com/issuetracker/member/service/MemberServiceTest.java b/be/issue-tracker/src/test/java/com/issuetracker/member/service/MemberServiceTest.java
@@ -6,7 +6,7 @@
 import static org.mockito.Mockito.when;
 
 import com.issuetracker.member.dto.MemberCreateDto;
-import com.issuetracker.member.model.Member;
+import com.issuetracker.member.entity.Member;
 import com.issuetracker.member.repository.MemberRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,5 @@ out/
		### VS Code ###
		.vscode/

		src/main/resources/application.properties