Feature/78 refactoring

src/main/java/com/nextcloudlab/kickytime/match/dto/MatchCreateRequestDto.java

@@ -2,18 +2,5 @@
 
 import java.time.LocalDateTime;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class MatchCreateRequestDto {
-    private Long createdBy;
-    private LocalDateTime matchDateTime;
-    private String location;
-    private Integer maxPlayers;
-}
+public record MatchCreateRequestDto(
+        Long createdBy, LocalDateTime matchDateTime, String location, Integer maxPlayers) {}

src/main/java/com/nextcloudlab/kickytime/match/dto/MatchResponseDto.java

@@ -6,45 +6,28 @@
 import com.nextcloudlab.kickytime.match.entity.MatchStatus;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
 @Schema(description = "경기 개설 요청 데이터")
-public class MatchResponseDto {
-
-    @Schema(description = "경기 ID", example = "1", required = true)
-    private Long id;
-
-    @Schema(
-            description = "경기 상태",
-            example = "OPEN, FULL, CLOSED, CANCELED",
-            required = false,
-            defaultValue = "OPEN")
-    private MatchStatus matchStatus;
-
-    @Schema(description = "경기 일시", example = "2025-08-14T19:00:00", required = true)
-    private LocalDateTime matchDateTime;
-
-    @Schema(description = "경기 장소", example = "서울특별시 축구장", required = true)
-    private String location;
-
-    @Schema(description = "최대 참가자 수", example = "10", required = true)
-    private Integer maxPlayers;
-
-    private Integer currentParticipants;
-
-    public MatchResponseDto(Match match) {
-        this.id = match.getId();
-        this.matchStatus = match.getMatchStatus();
-        this.matchDateTime = match.getMatchDateTime();
-        this.location = match.getLocation();
-        this.maxPlayers = match.getMaxPlayers();
-        this.currentParticipants = match.getCurrentParticipantCount();
+public record MatchResponseDto(
+        @Schema(description = "경기 ID", example = "1", required = true) Long id,
+        @Schema(
+                        description = "경기 상태",
+                        example = "OPEN, FULL, CLOSED, CANCELED",
+                        required = false,
+                        defaultValue = "OPEN")
+                MatchStatus matchStatus,
+        @Schema(description = "경기 일시", example = "2025-08-14T19:00:00", required = true)
+                LocalDateTime matchDateTime,
+        @Schema(description = "경기 장소", example = "서울특별시 축구장", required = true) String location,
+        @Schema(description = "최대 참가자 수", example = "10", required = true) Integer maxPlayers,
+        Integer currentParticipants) {
+    public static MatchResponseDto from(Match match) {
+        return new MatchResponseDto(
+                match.getId(),
+                match.getMatchStatus(),
+                match.getMatchDateTime(),
+                match.getLocation(),
+                match.getMaxPlayers(),
+                match.getCurrentParticipantCount());
     }
 }

src/main/java/com/nextcloudlab/kickytime/match/entity/Match.java

@@ -4,8 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
 import com.nextcloudlab.kickytime.common.entity.BaseEntity;
 import com.nextcloudlab.kickytime.user.entity.User;
 
@@ -21,7 +19,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "matches")
 public class Match extends BaseEntity {
     @Id
@@ -32,7 +29,6 @@ public class Match extends BaseEntity {
     @Column(nullable = false)
     private MatchStatus matchStatus;
 
-    //    @Future(message = "경기 일시는 현재보다 미래여야 합니다.")
     @Column(nullable = false)
     private LocalDateTime matchDateTime;
 

src/main/java/com/nextcloudlab/kickytime/match/entity/MatchStatus.java

@@ -4,5 +4,5 @@ public enum MatchStatus {
     OPEN, // 모집 중 (정원 미달)
     FULL, // 모집 마감 (정원 충족)
     CLOSED, // 경기 종료
-    CANCELLED // 경기 취소
+    CANCELED // 경기 취소
 }

src/main/java/com/nextcloudlab/kickytime/match/service/MatchParticipantService.java

@@ -47,6 +47,6 @@ private boolean isUpcoming(MyMatchesResponse.MatchInfo match) {
 
     private boolean isCompleted(MyMatchesResponse.MatchInfo match) {
         return match.matchStatus() == MatchStatus.CLOSED
-                || match.matchStatus() == MatchStatus.CANCELLED;
+                || match.matchStatus() == MatchStatus.CANCELED;
     }
 }

src/main/java/com/nextcloudlab/kickytime/match/service/MatchService.java

@@ -42,14 +42,14 @@ public MatchService(
     public List<MatchResponseDto> getAllMatches() {
         List<Match> matches = matchRepository.findAllByOrderByMatchDateTimeDesc();
 
-        return matches.stream().map(MatchResponseDto::new).collect(Collectors.toList());
+        return matches.stream().map(MatchResponseDto::from).collect(Collectors.toList());
     }
 
     // 경기 개설
     public void createMatch(MatchCreateRequestDto requestDto) {
         User user =
                 userRepository
-                        .findById(requestDto.getCreatedBy())
+                        .findById(requestDto.createdBy())
                         .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
 
         if (user.getRole() != RoleEnum.ADMIN) {
@@ -58,9 +58,9 @@ public void createMatch(MatchCreateRequestDto requestDto) {
 
         Match match = new Match();
         match.setMatchStatus(MatchStatus.OPEN);
-        match.setMatchDateTime(requestDto.getMatchDateTime());
-        match.setLocation(requestDto.getLocation());
-        match.setMaxPlayers(requestDto.getMaxPlayers());
+        match.setMatchDateTime(requestDto.matchDateTime());
+        match.setLocation(requestDto.location());
+        match.setMaxPlayers(requestDto.maxPlayers());
         match.setCreatedBy(user);
 
         matchRepository.save(match);

src/test/java/com/nextcloudlab/kickytime/match/service/MatchParticipantServiceTest.java

@@ -42,7 +42,7 @@ void setUp() {
                         createMatchInfo(1L, MatchStatus.OPEN),
                         createMatchInfo(2L, MatchStatus.FULL),
                         createMatchInfo(3L, MatchStatus.CLOSED),
-                        createMatchInfo(4L, MatchStatus.CANCELLED),
+                        createMatchInfo(4L, MatchStatus.CANCELED),
                         createMatchInfo(5L, MatchStatus.OPEN),
                         createMatchInfo(6L, MatchStatus.CLOSED));
 
@@ -51,7 +51,7 @@ void setUp() {
                 Arrays.asList(
                         createMatchInfoWithDetails(3L, MatchStatus.OPEN, "서울 OO풋살장 A코트", 10),
                         createMatchInfoWithDetails(4L, MatchStatus.CLOSED, "부산 XX풋살파크 B코트", 8),
-                        createMatchInfoWithDetails(5L, MatchStatus.CANCELLED, "인천 YY스타디움 C코트", 12));
+                        createMatchInfoWithDetails(5L, MatchStatus.CANCELED, "인천 YY스타디움 C코트", 12));
     }
 
     @Test
@@ -71,7 +71,7 @@ void getMyParticipantWithAllStatusesShouldReturnCorrectCounts() {
         MyMatchesResponse.Summary summary = result.summary();
         assertThat(summary.totalCount()).isEqualTo(6L);
         assertThat(summary.upcomingCount()).isEqualTo(3L); // OPEN(2) + FULL(1)
-        assertThat(summary.completedCount()).isEqualTo(3L); // CLOSED(2) + CANCELLED(1)
+        assertThat(summary.completedCount()).isEqualTo(3L); // CLOSED(2) + CANCELED(1)
     }
 
     @Test
@@ -135,15 +135,15 @@ void getMyParticipantWithOnlyClosedMatchesShouldReturnCorrectCounts() {
     }
 
     @Test
-    @DisplayName("CANCELLED 상태만 있는 경우")
-    void getMyParticipantWithOnlyCancelledMatchesShouldReturnCorrectCounts() {
+    @DisplayName("CANCELED 상태만 있는 경우")
+    void getMyParticipantWithOnlyCanceledMatchesShouldReturnCorrectCounts() {
         // given
-        List<MyMatchesResponse.MatchInfo> cancelledMatches =
+        List<MyMatchesResponse.MatchInfo> canceledMatches =
                 Arrays.asList(
-                        createMatchInfo(1L, MatchStatus.CANCELLED),
-                        createMatchInfo(2L, MatchStatus.CANCELLED));
+                        createMatchInfo(1L, MatchStatus.CANCELED),
+                        createMatchInfo(2L, MatchStatus.CANCELED));
         when(matchParticipantRepository.findMatchParticipantByUserId(testCognitoSub))
-                .thenReturn(cancelledMatches);
+                .thenReturn(canceledMatches);
 
         // when
         MyMatchesResponse result = matchParticipantService.getMyParticipant(testCognitoSub);
@@ -208,7 +208,7 @@ void getMyParticipantShouldReturnExactMatchList() {
     @Test
     @DisplayName("실제 데이터 시나리오 - SQL 기반 매치 참가자 조회")
     void getMyParticipantRealWorldScenarioShouldReturnCorrectCounts() {
-        // given - user_id 3이 참가한 매치들 (OPEN, CLOSED, CANCELLED)
+        // given - user_id 3이 참가한 매치들 (OPEN, CLOSED, CANCELED)
         when(matchParticipantRepository.findMatchParticipantByUserId(testCognitoSub))
                 .thenReturn(realWorldMatches);
 
@@ -222,7 +222,7 @@ void getMyParticipantRealWorldScenarioShouldReturnCorrectCounts() {
         MyMatchesResponse.Summary summary = result.summary();
         assertThat(summary.totalCount()).isEqualTo(3L);
         assertThat(summary.upcomingCount()).isEqualTo(1L); // OPEN(1)
-        assertThat(summary.completedCount()).isEqualTo(2L); // CLOSED(1) + CANCELLED(1)
+        assertThat(summary.completedCount()).isEqualTo(2L); // CLOSED(1) + CANCELED(1)
 
         // 매치 상세 정보 검증
         List<MyMatchesResponse.MatchInfo> matches = result.matches();
@@ -240,7 +240,7 @@ void getMyParticipantLocationBasedMatchesShouldHandleCorrectly() {
                         createMatchInfoWithDetails(1L, MatchStatus.OPEN, "서울 OO풋살장 A코트", 10),
                         createMatchInfoWithDetails(2L, MatchStatus.FULL, "서울 OO풋살장 B코트", 8),
                         createMatchInfoWithDetails(3L, MatchStatus.CLOSED, "부산 XX풋살파크 A코트", 12),
-                        createMatchInfoWithDetails(4L, MatchStatus.CANCELLED, "인천 YY스타디움 C코트", 16));
+                        createMatchInfoWithDetails(4L, MatchStatus.CANCELED, "인천 YY스타디움 C코트", 16));
 
         when(matchParticipantRepository.findMatchParticipantByUserId(testCognitoSub))
                 .thenReturn(locationMatches);
@@ -251,7 +251,7 @@ void getMyParticipantLocationBasedMatchesShouldHandleCorrectly() {
         // then
         assertThat(result.summary().totalCount()).isEqualTo(4L);
         assertThat(result.summary().upcomingCount()).isEqualTo(2L); // OPEN + FULL
-        assertThat(result.summary().completedCount()).isEqualTo(2L); // CLOSED + CANCELLED
+        assertThat(result.summary().completedCount()).isEqualTo(2L); // CLOSED + CANCELED
 
         // 서울 지역 매치가 2개인지 확인
         long seoulMatches =
@@ -286,13 +286,13 @@ void getMyParticipantMixedMaxPlayersMatchesShouldCalculateCorrectly() {
     @Test
     @DisplayName("시간 기반 매치 상태 검증 - 과거/미래 매치")
     void getMyParticipantTimeBasedMatchesShouldProcessCorrectly() {
-        // given - 시간 관련 특성을 가진 매치들 (과거 날짜는 CLOSED/CANCELLED, 미래 날짜는 OPEN/FULL)
+        // given - 시간 관련 특성을 가진 매치들 (과거 날짜는 CLOSED/CANCELED, 미래 날짜는 OPEN/FULL)
         List<MyMatchesResponse.MatchInfo> timeBasedMatches =
                 Arrays.asList(
                         createMatchInfoWithDetails(
                                 1L, MatchStatus.CLOSED, "과거 매치 1", 10), // 과거 - 종료됨
                         createMatchInfoWithDetails(
-                                2L, MatchStatus.CANCELLED, "취소된 매치", 8), // 과거 - 취소됨
+                                2L, MatchStatus.CANCELED, "취소된 매치", 8), // 과거 - 취소됨
                         createMatchInfoWithDetails(3L, MatchStatus.OPEN, "미래 매치 1", 12), // 미래 - 모집중
                         createMatchInfoWithDetails(
                                 4L, MatchStatus.FULL, "미래 매치 2", 10), // 미래 - 모집완료
@@ -308,7 +308,7 @@ void getMyParticipantTimeBasedMatchesShouldProcessCorrectly() {
         // then
         assertThat(result.summary().totalCount()).isEqualTo(5L);
         assertThat(result.summary().upcomingCount()).isEqualTo(3L); // OPEN(2) + FULL(1)
-        assertThat(result.summary().completedCount()).isEqualTo(2L); // CLOSED(1) + CANCELLED(1)
+        assertThat(result.summary().completedCount()).isEqualTo(2L); // CLOSED(1) + CANCELED(1)
     }
 
     // 테스트 헬퍼 메서드
@@ -332,7 +332,7 @@ private MyMatchesResponse.MatchInfo createMatchInfoWithDetails(
         LocalDateTime matchTime =
                 switch (status) {
                     case OPEN, FULL -> baseTime.plusDays(2); // 미래 매치
-                    case CLOSED, CANCELLED -> baseTime.minusDays(1); // 과거 매치
+                    case CLOSED, CANCELED -> baseTime.minusDays(1); // 과거 매치
                 };
 
         return new MyMatchesResponse.MatchInfo(

src/test/java/com/nextcloudlab/kickytime/match/service/MatchServiceTest.java

@@ -70,11 +70,8 @@ void setUp() {
         testMatch.setCreatedBy(adminUser);
 
         // 경기 생성 요청 DTO
-        createRequestDto = new MatchCreateRequestDto();
-        createRequestDto.setCreatedBy(1L);
-        createRequestDto.setMatchDateTime(LocalDateTime.now().plusDays(1));
-        createRequestDto.setLocation("서울 강남구");
-        createRequestDto.setMaxPlayers(10);
+        createRequestDto =
+                new MatchCreateRequestDto(1L, LocalDateTime.now().plusDays(1), "서울 강남구", 10);
     }
 
     @Test
@@ -89,8 +86,8 @@ void getAllMatchesSuccess() {
 
         // then
         assertThat(result).hasSize(1);
-        assertThat(result.get(0).getId()).isEqualTo(testMatch.getId());
-        assertThat(result.get(0).getLocation()).isEqualTo(testMatch.getLocation());
+        assertThat(result.get(0).id()).isEqualTo(testMatch.getId());
+        assertThat(result.get(0).location()).isEqualTo(testMatch.getLocation());
         verify(matchRepository).findAllByOrderByMatchDateTimeDesc();
     }
 
@@ -124,11 +121,15 @@ void createMatchUserNotFound() {
     @Test
     @DisplayName("경기 개설 - 관리자 권한 없음 예외")
     void createMatchNotAdminUser() {
-        // given
-        createRequestDto.setCreatedBy(2L);
+        // createRequestDto는 setter가 없으므로 새로운 인스턴스 생성
+        createRequestDto =
+                new MatchCreateRequestDto(
+                        2L,
+                        createRequestDto.matchDateTime(),
+                        createRequestDto.location(),
+                        createRequestDto.maxPlayers());
         given(userRepository.findById(2L)).willReturn(Optional.of(regularUser));
 
-        // when & then
         assertThatThrownBy(() -> matchService.createMatch(createRequestDto))
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessage("관리자 권한이 있는 사용자만 경기를 개설할 수 있습니다.");