Merge pull request #102 from for-men/release/mvp3

Release/mvp3 개발 완료

Author: joo-chang

.github/workflows/gradle.yml

@@ -5,15 +5,15 @@ on:
     branches:
       - main
 env:
-  ECR_NAMESPACE : forticketing
+  ECR_NAMESPACE: forticketing
 
 jobs:
   build:
     name: Build Services
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: [eureka, concert-service, order-service, user-service, gateway-service]
+        service: [ eureka, concert-service, order-service, user-service, gateway-service ]
 
     steps:
       - name: Checkout Code
@@ -26,7 +26,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Restore application-credentials.yml
-        run: | 
+        run: |
           touch application/gateway-service/src/main/resources/application-credentials.yml
           touch application/user-service/src/main/resources/application-credentials.yml
           echo "${{ secrets.APPLICATION_CREDENTIAL_YML }}" | base64 --decode > application/gateway-service/src/main/resources/application-credentials.yml

application/concert-service/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 
     implementation project(":component:jpa")
     implementation project(":component:security")
+
     // postgresql
     runtimeOnly 'org.postgresql:postgresql'
 

application/concert-service/docker-compose.yml

@@ -10,21 +10,3 @@ services:
       - '54323:5432'
     volumes:
       - ../db/concert-service:/var/lib/postgresql/data
-
-#
-#  concert-service:
-#    container_name: concert-service
-#    build:
-#      context: ../application/concert-service
-#      dockerfile: Dockerfile
-#    environment:
-#      SPRING_PROFILES_ACTIVE: local
-#    ports:
-#      - '11000:11000'
-#    restart: always
-#    depends_on:
-#      - postgres-conert
-#    volumes:
-#      - ../logs/concertservice:/logs/concertservice
-#    networks:
-#      - service-network

application/concert-service/src/main/java/com/fortickets/concertservice/application/client/BookingClient.java

@@ -10,8 +10,9 @@
 @FeignClient(name = "order-service")
 @Component
 public interface BookingClient {
-  // status가 PENDING , CONFIRMED 상태인 좌석
-  @GetMapping("/bookings/seats/{scheduleId}")
-  CommonResponse<List<String>> getSeatsWithBooking(@PathVariable("scheduleId") Long scheduleId);
+
+    // status가 PENDING , CONFIRMED 상태인 좌석
+    @GetMapping("/bookings/seats/{scheduleId}")
+    CommonResponse<List<String>> getSeatsWithBooking(@PathVariable("scheduleId") Long scheduleId);
 
 }

application/concert-service/src/main/java/com/fortickets/concertservice/application/dto/request/CreateConcertReq.java

@@ -5,11 +5,13 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDate;
 
 
-public record CreateConcertReq (
-    @NotBlank(message = "콘서트 이름은 비어 있을 수 없습니다.")
+public record CreateConcertReq(
+    @NotBlank(message = "공연 이름은 비어 있을 수 없습니다.")
+    @Size(min = 1, max = 200, message = "공연 이름이 너무 깁니다.")
     String concertName,
 
     @Positive(message = "런타임은 양수여야 합니다.")
@@ -31,10 +33,10 @@ public record CreateConcertReq (
     @Pattern(regexp = "^(http(s?):)([/|.|\\w|\\s|-])*\\.(?:jpg|png)$|^$",
         message = "이미지는 유효한 URL이어야 하며, jpg, png 형식의 파일이어야 합니다.")
     String concertImage
-){
+) {
 
-  public Concert toEntity(Long userId) {
-    return Concert.of(userId,concertName,runTime,startDate,endDate,price,concertImage);
-  }
+    public Concert toEntity(Long userId) {
+        return Concert.of(userId, concertName, runTime, startDate, endDate, price, concertImage);
+    }
 
 }

application/concert-service/src/main/java/com/fortickets/concertservice/application/dto/request/CreateScheduleReq.java

@@ -3,9 +3,7 @@
 import com.fortickets.concertservice.domain.entity.Concert;
 import com.fortickets.concertservice.domain.entity.Schedule;
 import com.fortickets.concertservice.domain.entity.Stage;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import java.time.LocalDate;
 import java.time.LocalTime;
 
@@ -23,8 +21,8 @@ public record CreateScheduleReq(
     LocalTime concertTime
 ) {
 
-  public Schedule toEntity(Concert concert, Stage stage) {
-    return Schedule.of(concert,stage,concertDate,concertTime);
-  }
+    public Schedule toEntity(Concert concert, Stage stage) {
+        return Schedule.of(concert, stage, concertDate, concertTime);
+    }
 
 }

application/concert-service/src/main/java/com/fortickets/concertservice/application/dto/request/CreateStageReq.java

@@ -4,23 +4,28 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
 
 public record CreateStageReq(
     @NotBlank(message = "공연장 이름은 비어 있을 수 없습니다.")
+    @Size(min = 1, max = 100, message = "공연장 이름은 1자 이상 100자 이하이어야 합니다.")
     String name,
 
     @NotBlank(message = "위치는 비어 있을 수 없습니다.")
+    @Size(min = 1, max = 255, message = "위치는 1자 이상 255자 이하이어야 합니다.")
     String location,
 
     @Positive(message = "행 수는 양수여야 합니다.")
+    @NotNull(message = "행 수는 비어 있을 수 없습니다.")
     Integer row,
 
     @Positive(message = "열 수는 양수여야 합니다.")
+    @NotNull(message = "열 수는 비어 있을 수 없습니다.")
     Integer col
 ) {
 
-  public Stage toEntity() {
-    return Stage.of(name,location,row,col);
-  }
+    public Stage toEntity() {
+        return Stage.of(name, location, row, col);
+    }
 
 }

application/concert-service/src/main/java/com/fortickets/concertservice/application/dto/request/UpdateConcertReq.java

@@ -1,14 +1,13 @@
 package com.fortickets.concertservice.application.dto.request;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDate;
 
 public record UpdateConcertReq(
 
+    @Size(min = 1, max = 100, message = "공연장 이름은 1자 이상 100자 이하이어야 합니다.")
     String concertName,
 
     @Pattern(regexp = "^(http(s?):)([/|.|\\w|\\s|-])*\\.(?:jpg|png)$|^$",

application/concert-service/src/main/java/com/fortickets/concertservice/application/dto/request/UpdateScheduleReq.java

@@ -1,7 +1,5 @@
 package com.fortickets.concertservice.application.dto.request;
 
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import java.time.LocalDate;
 import java.time.LocalTime;
 

application/concert-service/src/main/java/com/fortickets/concertservice/application/dto/request/UpdateStageReq.java

@@ -1,13 +1,14 @@
 package com.fortickets.concertservice.application.dto.request;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
 
 public record UpdateStageReq(
 
+    @Size(min = 1, max = 100, message = "공연장 이름은 1자 이상 100자 이하이어야 합니다.")
     String name,
 
+    @Size(min = 1, max = 255, message = "공연장 장소가 너무 깁니다.")
     String location,
 
     @Positive(message = "가격은 양수여야 합니다.")