[4주차] Rate Limit 구현 및 테스트 코드 작성

build.gradle

@@ -1,45 +1,103 @@
 plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.4.3'
-	id 'io.spring.dependency-management' version '1.1.7'
+    id 'java'
+    id 'org.springframework.boot' version '3.4.3'
+    id 'io.spring.dependency-management' version '1.1.7'
+    id 'jacoco'
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
-bootJar{
-	enabled=false
+bootJar {
+    enabled = false
 }
 
 subprojects {
-	group = 'project.redis'
-	version = '0.0.1-SNAPSHOT'
-
-	java {
-		toolchain {
-			languageVersion = JavaLanguageVersion.of(21)
-		}
-	}
-
-	apply plugin: 'java'
-	apply plugin: 'java-library'
-	apply plugin: 'org.springframework.boot'
-	apply plugin: 'io.spring.dependency-management'
-
-	configurations {
-		compileOnly {
-			extendsFrom annotationProcessor
-		}
-	}
-
-	dependencies {
-		compileOnly 'org.projectlombok:lombok'
-		annotationProcessor 'org.projectlombok:lombok'
-	}
-
-	tasks.named('test') {
-		useJUnitPlatform()
-	}
+    group = 'project.redis'
+    version = '0.0.1-SNAPSHOT'
+
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
+    }
+
+    apply plugin: 'java'
+    apply plugin: 'java-library'
+    apply plugin: 'org.springframework.boot'
+    apply plugin: 'io.spring.dependency-management'
+    apply plugin: 'jacoco'
+
+    configurations {
+        compileOnly {
+            extendsFrom annotationProcessor
+        }
+    }
+
+    dependencies {
+        compileOnly 'org.projectlombok:lombok'
+        annotationProcessor 'org.projectlombok:lombok'
+    }
+
+    test {
+        useJUnitPlatform()
+        finalizedBy 'jacocoTestReport'
+    }
+
+    jacoco {
+        toolVersion = "0.8.11"
+    }
+
+    jacocoTestReport {
+        dependsOn test
+
+        reports {
+            html.required = true
+        }
+    }
 }
 
+task jacocoRootReport(type: JacocoReport) {
+    group = "verification"
+    description = "Generates an aggregate JaCoCo coverage report."
+
+    dependsOn subprojects.test // 모든 모듈 테스트 먼저 수행
+
+    def execFiles = files()
+    def classDirs = files()
+    def sourceDirs = files()
+
+    subprojects.each { subproject ->
+        def buildDir = subproject.buildDir
+
+        // exec 파일
+        def execFile = file("${buildDir}/jacoco/test.exec")
+        if (execFile.exists()) {
+            execFiles += execFile
+        }
+
+        // 클래스 디렉토리
+        def classDir = file("${buildDir}/classes/java/main")
+        if (classDir.exists()) {
+            classDirs += classDir
+        }
+
+        // 소스 디렉토리
+        def srcDir = file("${subproject.projectDir}/src/main/java")
+        if (srcDir.exists()) {
+            sourceDirs += srcDir
+        }
+    }
+
+    executionData.setFrom(execFiles)
+    classDirectories.setFrom(classDirs)
+    sourceDirectories.setFrom(sourceDirs)
+
+    reports {
+        html.required.set(true)
+        html.outputLocation = layout.buildDirectory.dir("jacocoRootReport/html")
+        xml.required.set(true)
+        csv.required.set(false)
+    }
+}

init/ddl.sql

@@ -1,6 +1,6 @@
 -- Cinema 테이블 생성
 CREATE TABLE IF NOT EXISTS cinema (
-    cinema_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 영화관 ID
+    cinema_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 영화관 ID
     cinema_name VARCHAR(255) NOT NULL  -- 영화관 이름
     created_by BIGINT NULL,            -- BaseEntity 필드
     created_at DATETIME NULL,          -- BaseEntity 필드
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS cinema (
 
 -- Movie 테이블 생성
 CREATE TABLE IF NOT EXISTS movie (
-    movie_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 영화 ID
+    movie_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 영화 ID
     title VARCHAR(255) NOT NULL,  -- 영화 제목
     rating VARCHAR(50) NOT NULL,  -- 영화 등급 (Enum 값으로 저장, 예: 'G', 'PG', 'R' 등)
     released_at DATE NOT NULL,  -- 개봉일
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS movie (
 
 -- Screening 테이블 생성
 CREATE TABLE IF NOT EXISTS screening (
-    screening_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 상영 ID
+    screening_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 상영 ID
     started_at DATETIME NOT NULL,  -- 상영 시작 시간
     ended_at DATETIME NOT NULL,  -- 상영 종료 시간
     movie_id BIGINT NOT NULL,  -- 영화 ID (Foreign Key)
@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS screening (
 
 -- Seat 테이블 생성
 CREATE TABLE IF NOT EXISTS seat (
-    seat_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 좌석 ID
+    seat_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 좌석 ID
     seat_row VARCHAR(10) NOT NULL,  -- 좌석 행 (예: A, B, C 등)
     seat_column INT NOT NULL,  -- 좌석 열 (예: 1, 2, 3 등)
     created_by BIGINT NULL,            -- BaseEntity 필드
@@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS seat (
 
 -- Theater 테이블 생성
 CREATE TABLE IF NOT EXISTS theater (
-    theater_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 극장 ID
+    theater_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 극장 ID
     theater_name VARCHAR(255) NOT NULL,  -- 극장 이름
     cinema_id BIGINT NOT NULL,  -- 영화관 ID (Foreign Key)
     created_by BIGINT NULL,            -- BaseEntity 필드
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS theater (
 
 -- User 테이블 생성
 CREATE TABLE IF NOT EXISTS user (
-    user_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 사용자 ID
+    user_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 사용자 ID
     username VARCHAR(255) NOT NULL,  -- 사용자 이름
     created_by BIGINT NULL,  -- BaseEntity 필드
     created_at DATETIME NULL,  -- BaseEntity 필드
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS user (
 
 -- Reservation 테이블 생성
 CREATE TABLE IF NOT EXISTS reservation (
-    reservation_id BIGINT AUTO_INCREMENT PRIMARY KEY,  -- 예약 ID
+    reservation_id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  -- 예약 ID
     screening_id BIGINT NOT NULL,  -- 상영 ID (Foreign Key)
     seat_id BIGINT NOT NULL,  -- 좌석 ID (Foreign Key)
     user_id BIGINT NOT NULL,  -- 사용자 ID (Foreign Key)
@@ -87,6 +87,6 @@ CREATE TABLE IF NOT EXISTS reservation (
 );
 
 
-CREATE INDEX idx_movie_released_title_genre ON movie(released_at, title, genre);
+CREATE INDEX idx_movie_released_title_genre ON movie(title, genre, released_at);
 CREATE INDEX idx_screening_started_at ON screening(started_at);
 

module_application/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     implementation project(':module_domain')
     implementation project(':module_infrastructure')
     implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
 
     // Caffeine cache
     implementation 'org.springframework.boot:spring-boot-starter-cache'

module_application/src/main/java/project/redis/movie/service/MovieQueryService.java

@@ -6,10 +6,10 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import project.redis.movie.MovieGenre;
 import project.redis.movie.dto.NowPlayMovieDto;
+import project.redis.ratelimiter.fetchratelimiter.LimitRequestPerTime;
 import project.redis.screening.dto.ScreeningResponseDto;
 import project.redis.screening.dto.ScreeningTimeDto;
 import project.redis.screening.repository.ScreeningRepositoryCustom;
@@ -21,8 +21,9 @@ public class MovieQueryService {
     private final ScreeningRepositoryCustom screeningRepository;
 
     // @Cacheable(cacheNames = "movieCache")
-    @Cacheable(cacheNames = "redisCache")
-    public List<NowPlayMovieDto> getNowPlayingMovies(String movieTitle, String movieGenre) {
+    // @Cacheable(cacheNames = "redisCache")
+    @LimitRequestPerTime(key = "#clientIp")
+    public List<NowPlayMovieDto> getNowPlayingMovies(String movieTitle, String movieGenre, String clientIp) {
         MovieGenre movieGenreEnum = getMovieGenre(movieGenre);
 
         List<ScreeningResponseDto> nowPlayingMovies

module_application/src/main/java/project/redis/movie/service/MovieService.java

@@ -42,7 +42,7 @@ private List<Movie> findNowPlayingMovies(List<Movie> movies) {
     private List<NowPlayMovieDto> makeNowPlayingMoviesInfo(List<Movie> movies) {
         List<NowPlayMovieDto> nowPlayMovieDtos = new ArrayList<>();
         for (Movie movie : movies) {
-            List<Screening> movieAllScreening = screeningAdapter.findScreeningsByMovie(movie);
+            List<Screening> movieAllScreening = screeningAdapter.findScreenings(movie);
 
             Map<String, List<Screening>> cinemaNameScreening = mapByCinemaName(movieAllScreening);
 

module_application/src/main/java/project/redis/reservation/service/ReservationService.java

@@ -8,10 +8,12 @@
 import org.springframework.transaction.annotation.Transactional;
 import project.redis.lock.DistributedLock;
 import project.redis.message.MessageService;
+import project.redis.ratelimiter.reserveratelimiter.LimitReservationPerTime;
 import project.redis.reservation.Reservation;
 import project.redis.reservation.adapter.ReservationAdapter;
 import project.redis.reservation.dto.ReservationSeatsRequestDto;
 import project.redis.reservation.dto.ReservationSeatsResponseDto;
+import project.redis.reservation.validator.ReservationValidator;
 import project.redis.screening.Screening;
 import project.redis.screening.adapter.ScreeningAdapter;
 import project.redis.seat.Seat;
@@ -32,11 +34,13 @@ public class ReservationService {
     private final ReservationAdapter reservationAdapter;
     private final SeatAdapter seatAdapter;
     private final MessageService messageService;
+    private final ReservationValidator reservationValidator;
 
     @Transactional
     @DistributedLock(key = "seat-lock:#reservationSeatsRequestDto.userId")
-    public ReservationSeatsResponseDto reservationSeats(ReservationSeatsRequestDto reservationSeatsRequestDto) {
-        validReservationSeatsRequestDto(reservationSeatsRequestDto);
+    @LimitReservationPerTime(userId = "#reservationSeatsRequestDto.userId", screeningId = "#reservationSeatsRequestDto.screeningId")
+    public ReservationSeatsResponseDto reserveSeats(ReservationSeatsRequestDto reservationSeatsRequestDto) {
+        reservationValidator.valid(reservationSeatsRequestDto);
 
         User user = findUserByUserId(reservationSeatsRequestDto);
         Screening screening = findScreeningByScreeningId(reservationSeatsRequestDto);
@@ -51,45 +55,16 @@ public ReservationSeatsResponseDto reservationSeats(ReservationSeatsRequestDto r
         return ReservationSeatsResponseDto.of(user.getUserId(), reservationsId);
     }
 
-    private void validReservationSeatsRequestDto(ReservationSeatsRequestDto requestDto) {
-        List<String> seatRows = requestDto.getSeatRows();
-        List<Integer> seatColumns = requestDto.getSeatColumns();
-
-        if (seatRows.isEmpty() || seatColumns.isEmpty()) {
-            throw new IllegalArgumentException("seatRows 또는 seatColumns가 비어 있습니다.");
-        }
-
-        if (seatRows.size() != seatColumns.size()) {
-            throw new IllegalArgumentException("seatRows와 seatColumns의 개수가 같지 않습니다.");
-        }
-
-        long seatRowCount = seatRows.stream().distinct().count();
-        if (seatRowCount > 1) {
-            throw new IllegalArgumentException("예약하려는 좌석들의 행이 이어 붙어 있는 형태가 아닙니다.");
-        }
-
-        long seatColumnCount = seatColumns.stream().distinct().count();
-        if (seatColumnCount != seatColumns.size()) {
-            throw new IllegalArgumentException("예약하려는 좌석의 열이 중복됩니다.");
-        }
-
-        for (int index = 1; index < seatColumns.size(); index++) {
-            if (seatColumns.get(index) != seatColumns.get(index - 1) + 1) {
-                throw new IllegalArgumentException("예약하려는 좌석의 열이 연속되는 형태가 아닙니다.");
-            }
-        }
-    }
-
     private User findUserByUserId(ReservationSeatsRequestDto reservationSeatsRequestDto) {
-        User user = userAdapter.findUserById(reservationSeatsRequestDto.getUserId());
+        User user = userAdapter.find(reservationSeatsRequestDto.getUserId());
         if (user == null) {
             throw new IllegalArgumentException("존재하지 않는 유저 id 입니다.");
         }
         return user;
     }
 
     private Screening findScreeningByScreeningId(ReservationSeatsRequestDto reservationSeatsRequestDto) {
-        Screening screening = screeningAdapter.findScreeningById(reservationSeatsRequestDto.getScreeningId());
+        Screening screening = screeningAdapter.findScreening(reservationSeatsRequestDto.getScreeningId());
         if (screening == null) {
             throw new IllegalArgumentException("존재하지 않는 상영 id 입니다.");
         }
@@ -115,7 +90,7 @@ private List<Long> createReservations(ReservationSeatsRequestDto reservationSeat
             String seatRow = reservationSeatsRequestDto.getSeatRows().get(index);
             Integer seatColumn = reservationSeatsRequestDto.getSeatColumns().get(index);
 
-            checkReservedSeat(reservations, seatRow, seatColumn);
+            containsSameSeat(reservations, seatRow, seatColumn);
 
             Long savedReservationId = createReservation(seatRow, seatColumn, screening, user);
             reservationsId.add(savedReservationId);
@@ -127,18 +102,18 @@ private int getReservationsSize(ReservationSeatsRequestDto reservationSeatsReque
         return reservationSeatsRequestDto.getSeatRows().size();
     }
 
-    private void checkReservedSeat(List<Reservation> reservations, String seatRow, Integer seatColumn) {
-        boolean isAlreadyReserved = reservations.stream()
-                .anyMatch(reservation -> reservation.isSeatReserved(seatRow, seatColumn));
+    private void containsSameSeat(List<Reservation> reservations, String seatRow, Integer seatColumn) {
+        boolean hasSameSeat = reservations.stream()
+                .anyMatch(reservation -> reservation.checkSameSeat(seatRow, seatColumn));
 
-        if (isAlreadyReserved) {
+        if (hasSameSeat) {
             throw new IllegalArgumentException("현재 예약된 좌석은 예약할 수 없습니다.");
         }
     }
 
     private Long createReservation(String seatRow, Integer seatColumn, Screening screening, User user) {
         Seat reservedSeat = Seat.of(seatRow, seatColumn);
-        SeatEntity seatEntity = seatAdapter.saveSeat(reservedSeat);
+        SeatEntity seatEntity = seatAdapter.save(reservedSeat);
 
         Reservation reservation = Reservation.create(reservedSeat, screening, user);
         Long savedReservationId = reservationAdapter.saveReservation(reservation, seatEntity);

module_application/src/main/java/project/redis/reservation/validator/ReservationValidator.java

@@ -0,0 +1,38 @@
+package project.redis.reservation.validator;
+
+import java.util.List;
+import org.springframework.stereotype.Component;
+import project.redis.reservation.dto.ReservationSeatsRequestDto;
+
+@Component
+public class ReservationValidator {
+
+    public void valid(ReservationSeatsRequestDto requestDto) {
+        List<String> seatRows = requestDto.getSeatRows();
+        List<Integer> seatColumns = requestDto.getSeatColumns();
+
+        if (seatRows.isEmpty() || seatColumns.isEmpty()) {
+            throw new IllegalArgumentException("seatRows 또는 seatColumns가 비어 있습니다.");
+        }
+
+        if (seatRows.size() != seatColumns.size()) {
+            throw new IllegalArgumentException("seatRows와 seatColumns의 개수가 같지 않습니다.");
+        }
+
+        long seatRowCount = seatRows.stream().distinct().count();
+        if (seatRowCount > 1) {
+            throw new IllegalArgumentException("예약하려는 좌석들의 행이 이어 붙어 있는 형태가 아닙니다.");
+        }
+
+        long seatColumnCount = seatColumns.stream().distinct().count();
+        if (seatColumnCount != seatColumns.size()) {
+            throw new IllegalArgumentException("예약하려는 좌석의 열이 중복됩니다.");
+        }
+
+        for (int index = 1; index < seatColumns.size(); index++) {
+            if (seatColumns.get(index) != seatColumns.get(index - 1) + 1) {
+                throw new IllegalArgumentException("예약하려는 좌석의 열이 연속되는 형태가 아닙니다.");
+            }
+        }
+    }
+}