[BE] refactor: 코드 리팩토링(#12)

backend/src/main/java/corea/domain/JoinInfo.java

@@ -25,6 +25,6 @@ public class JoinInfo {
     private long roomId;
 
     public JoinInfo(final long memberId, final long roomId) {
-        this(null,memberId,roomId);
+        this(null, memberId, roomId);
     }
 }

backend/src/main/java/corea/dto/JoinInfoResponse.java

@@ -6,8 +6,9 @@ public record JoinInfoResponse(
         long id,
         long memberId,
         long roomId
-){
-    public static JoinInfoResponse from(final JoinInfo joinInfo){
+) {
+
+    public static JoinInfoResponse from(final JoinInfo joinInfo) {
         return new JoinInfoResponse(
                 joinInfo.getId(),
                 joinInfo.getMemberId(),

backend/src/main/java/corea/dto/RoomCreateRequest.java

@@ -24,6 +24,7 @@ public Room toEntity() {
                 matchingSize,
                 keyword,
                 submissionDeadline,
-                reviewDeadline);
+                reviewDeadline
+        );
     }
 }

backend/src/main/java/corea/dto/RoomResponse.java

@@ -14,10 +14,9 @@ public record RoomResponse(
         String keyword,
         LocalDateTime submissionDeadline,
         LocalDateTime reviewDeadline
-
 ) {
 
-    public static RoomResponse from(final Room room,final String memberEmail) {
+    public static RoomResponse of(final Room room, final String memberEmail) {
         return new RoomResponse(
                 room.getId(),
                 room.getTitle(),

backend/src/main/java/corea/member/domain/Matching.java

@@ -9,8 +9,8 @@
 
 import static lombok.AccessLevel.PROTECTED;
 
-@NoArgsConstructor(access = PROTECTED)
 @Component
+@NoArgsConstructor(access = PROTECTED)
 public class Matching {
 
     public Map<Long, List<Long>> matchGroup(final List<Member> members, final int matchingSize) {

backend/src/main/java/corea/member/service/MatchingService.java

@@ -1,8 +1,8 @@
 package corea.member.service;
 
+import corea.domain.Member;
 import corea.member.domain.Matching;
 import corea.member.entity.MatchedGroup;
-import corea.domain.Member;
 import corea.member.repository.MatchedGroupRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;

backend/src/main/java/corea/service/RoomService.java

@@ -30,35 +30,27 @@ public class RoomService {
 
     public RoomResponse create(final RoomCreateRequest request) {
         final Room room = roomRepository.save(request.toEntity());
-        final long memberId = request.memberId();
-        final Member member = getMember(memberId);
-        return RoomResponse.from(room, member.getEmail());
+        return toRoomResponse(room);
     }
 
     public RoomResponse findOne(final long id) {
-        final Room room = roomRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException(String.format("%d에 해당하는 방이 없습니다.", id)));
-        final Member member = getMember(room.getMemberId());
-
-        return RoomResponse.from(room, member.getEmail());
-    }
-
-    private Member getMember(final long memberId) {
-        return memberRepository.findById(memberId)
-                .orElseThrow(() -> new IllegalArgumentException(String.format("%d에 해당하는 멤버가 없습니다.", memberId)));
+        final Room room = getRoom(id);
+        return toRoomResponse(room);
     }
 
     public RoomResponses findAll() {
         final List<Room> rooms = roomRepository.findAll();
+
         return rooms.stream()
-                .map(room -> {
-                    final long memberId = room.getMemberId();
-                    final Member member = getMember(memberId);
-                    return RoomResponse.from(room, member.getEmail());
-                })
+                .map(this::toRoomResponse)
                 .collect(collectingAndThen(toList(), RoomResponses::new));
     }
 
+    private RoomResponse toRoomResponse(final Room room) {
+        final Member member = getMember(room.getMemberId());
+        return RoomResponse.of(room, member.getEmail());
+    }
+
     public JoinInfoResponse join(final long roomId, final long memberId) {
         final Room room = getRoom(roomId);
         final Member member = getMember(memberId);
@@ -67,8 +59,13 @@ public JoinInfoResponse join(final long roomId, final long memberId) {
         return JoinInfoResponse.from(joinInfoRepository.save(joinInfo));
     }
 
+    private Member getMember(final long memberId) {
+        return memberRepository.findById(memberId)
+                .orElseThrow(() -> new IllegalArgumentException(String.format("해당 Id의 멤버가 없습니다. 입력된 Id=%d", memberId)));
+    }
+
     public Room getRoom(final long roomId) {
         return roomRepository.findById(roomId)
-                .orElseThrow(() -> new IllegalArgumentException(String.format("%d에 해당하는 방이 없습니다.", roomId)));
+                .orElseThrow(() -> new IllegalArgumentException(String.format("해당 Id의 방이 없습니다. 입력된 Id=%d", roomId)));
     }
 }

backend/src/test/java/corea/fixture/MemberFixture.java

@@ -0,0 +1,10 @@
+package corea.fixture;
+
+import corea.domain.Member;
+
+public class MemberFixture {
+
+    public static Member MEMBER_PORORO() {
+        return new Member("[email protected]");
+    }
+}

backend/src/test/java/corea/fixture/RoomFixture.java

@@ -6,7 +6,8 @@
 import java.time.LocalDateTime;
 
 public class RoomFixture {
-    public static RoomCreateRequest CREATE_REQUEST(final long memberId){
+
+    public static RoomCreateRequest ROOM_CREATE_REQUEST(final long memberId){
         return new RoomCreateRequest(
                 "레이싱 카와 함께하는 TDD",
                 memberId,
@@ -18,7 +19,8 @@ public static RoomCreateRequest CREATE_REQUEST(final long memberId){
                 LocalDateTime.now().plusDays(14)
         );
     }
-    public static Room GET_DOMAIN(final long memberId){
+
+    public static Room ROOM_RACING_CAR(final long memberId){
         return new Room(
                 "레이싱 카와 함께하는 TDD",
                 memberId,

backend/src/test/java/corea/member/domain/MatchingTest.java

@@ -15,13 +15,13 @@ class MatchingTest {
 
     @Test
     @DisplayName("멤버 리스트를 받아서 매칭 결과를 반환한다.")
-    void matchGroup(){
+    void matchGroup() {
         List<Member> members = List.of(
                 new Member(1L, "[email protected]"),
                 new Member(2L, "[email protected]"),
                 new Member(3L, "[email protected]"),
                 new Member(4L, "[email protected]")
-                );
+        );
         int matchingSize = 2;
 
         Map<Long, List<Long>> results = matching.matchGroup(members, matchingSize);

backend/src/test/java/corea/member/service/MatchingServiceTest.java

@@ -1,27 +1,24 @@
 package corea.member.service;
 
+import config.ServiceTest;
 import corea.domain.Member;
 import corea.member.repository.MatchedGroupRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest
+@ServiceTest
 class MatchingServiceTest {
 
-    private final MatchingService matchingService;
-    private final MatchedGroupRepository matchedGroupRepository;
+    @Autowired
+    MatchingService matchingService;
 
     @Autowired
-    public MatchingServiceTest(MatchingService matchingService, MatchedGroupRepository matchedGroupRepository) {
-        this.matchingService = matchingService;
-        this.matchedGroupRepository = matchedGroupRepository;
-    }
+    MatchedGroupRepository matchedGroupRepository;
 
     @Test
     @DisplayName("멤버 리스트를 받아 매칭 결과를 반환한다.")
@@ -38,5 +35,4 @@ void matchMaking() {
 
         assertThat(matchedGroupRepository.findAll()).hasSize(4);
     }
-
 }