[deploy] merge to main

.github/workflows/prod-CI.yml

@@ -3,8 +3,6 @@ name: prod-CI
 on:
   pull_request:
     branches: [ "main" ]
-  push:
-    branches: [ "main" ]
 
 jobs:
   prod-ci:

Jenkinsfile

@@ -84,6 +84,7 @@ pipeline {
                         // 새로운 컨테이너 실행
                         sshCommand remote: remote, command: (
                             'docker run -d --name springboot' +
+                            ' --network beat-network' +
                             ' -p 8080:' + INTERNAL_PORT +
                             ' -e "SPRING_PROFILES_ACTIVE=' + OPERATION_ENV + '"' +
                             ' ' + DOCKER_IMAGE_NAME + ':latest'

README.md

@@ -12,7 +12,7 @@
 |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| :---: | 
 |                                    <img width="200" alt="branch" src="https://github.com/TEAM-BEAT/BEAT-SERVER/assets/144998449/43e18ca0-5eca-46bf-a108-db662cb3ce9b">                                    |<img width="200" alt="branch" src="https://github.com/TEAM-BEAT/BEAT-SERVER/assets/144998449/e678429a-6a1b-4a0b-8457-7eb4b6f9de29"> | 
 |                                                                                [hoonyworld](https://github.com/hoonyworld)                                                                                | [hyerinhwang-sailin](https://github.com/hyerinhwang-sailin) |
-| prod 서버용 EC2. RDS 구축 <br> dev, prod 서버 github action CI 구축(dockerhub push까지) <br> Jenkins multibranch pipeline으로 dev 서버에서 dev, prod CD 및 <br> prod 서버에서 nginx 무중단 배포 구축<br> ERD 및 DB 설계 <br> Entity 초기 세팅 | AWS dev 서버 구축 <br> ERD 및 DB 설계 <br> 인증 / 인가 구현 (Redis) <br> 웹 발신 <br> Entity 초기 세팅 <br> 카카오 소셜 로그인 <br> Swagger 세팅 | 
+| prod 서버용 EC2, RDS 구축 <br> dev, prod github action <br> CI 구축(~dockerhub push) <br>Jenkins multibranch pipeline<br> dev 서버에서 dev, prod CD <br> prod 서버 nginx 무중단배포<br> ERD 및 DB 설계 <br> Entity 초기 세팅 | dev 서버용 EC2, RDS 구축 <br> ERD 및 DB 설계 <br> 인증 / 인가 구현 (Redis) <br> 웹 발신 <br> Entity 초기 세팅 <br> 카카오 소셜 로그인 <br> Swagger 세팅 | 
 
 ### 🏡 Git Convention
 [Git Convention](https://www.notion.so/jiwoothejay/git-convention-9bee60c3bb0a45f1913616b3e72b87b7)

src/main/java/com/beat/domain/booking/application/GuestBookingRetrieveService.java

@@ -81,6 +81,7 @@ private GuestBookingRetrieveResponse toBookingResponse(Booking booking) {
                 performance.getPerformanceContact(),
                 performance.getBankName(),
                 performance.getAccountNumber(),
+                performance.getAccountHolder(),
                 calculateDueDate(schedule.getPerformanceDate()),
                 booking.isPaymentCompleted(),
                 booking.getCreatedAt(),

src/main/java/com/beat/domain/booking/application/MemberBookingRetrieveService.java

@@ -62,6 +62,7 @@ private MemberBookingRetrieveResponse toMemberBookingResponse(Booking booking) {
                 performance.getPerformanceContact(),
                 performance.getBankName(),
                 performance.getAccountNumber(),
+                performance.getAccountHolder(),
                 calculateDueDate(schedule.getPerformanceDate()),
                 booking.isPaymentCompleted(),
                 booking.getCreatedAt(),

src/main/java/com/beat/domain/booking/application/dto/GuestBookingRetrieveResponse.java

@@ -18,6 +18,7 @@ public record GuestBookingRetrieveResponse(
         String performanceContact,
         BankName bankName,
         String accountNumber,
+        String accountHolder,
         int dueDate,
         boolean isPaymentCompleted,
         LocalDateTime createdAt,
@@ -37,6 +38,7 @@ public static GuestBookingRetrieveResponse of(
             String performanceContact,
             BankName bankName,
             String accountNumber,
+            String accountHolder,
             int dueDate,
             boolean isPaymentCompleted,
             LocalDateTime createdAt,
@@ -56,6 +58,7 @@ public static GuestBookingRetrieveResponse of(
                 performanceContact,
                 bankName,
                 accountNumber,
+                accountHolder,
                 dueDate,
                 isPaymentCompleted,
                 createdAt,

src/main/java/com/beat/domain/booking/application/dto/MemberBookingRetrieveResponse.java

@@ -19,6 +19,7 @@ public record MemberBookingRetrieveResponse(
         String performanceContact,
         BankName bankName,
         String accountNumber,
+        String accountHolder,
         int dueDate,
         boolean isPaymentCompleted,
         LocalDateTime createdAt,
@@ -39,6 +40,7 @@ public static MemberBookingRetrieveResponse of(
             String performanceContact,
             BankName bankName,
             String accountNumber,
+            String accountHolder,
             int dueDate,
             boolean isPaymentCompleted,
             LocalDateTime createdAt,
@@ -59,6 +61,7 @@ public static MemberBookingRetrieveResponse of(
                 performanceContact,
                 bankName,
                 accountNumber,
+                accountHolder,
                 dueDate,
                 isPaymentCompleted,
                 createdAt,

src/main/java/com/beat/global/external/s3/controller/FileController.java

@@ -23,9 +23,14 @@ public class FileController {
     @GetMapping("/presigned-url")
     public ResponseEntity<Map<String, Map<String, String>>> getPresignedUrls(
             @RequestParam String posterImage,
-            @RequestParam List<String> castImages,
-            @RequestParam List<String> staffImages) {
-
+            @RequestParam(required = false) List<String> castImages,
+            @RequestParam(required = false) List<String> staffImages) {
+        if (castImages == null) {
+            castImages = List.of();
+        }
+        if (staffImages == null) {
+            staffImages = List.of();
+        }
         Map<String, Map<String, String>> response = fileService.getPresignedUrls(posterImage, castImages, staffImages);
         return ResponseEntity.ok(response);
     }

src/main/resources/application-prod.yml

@@ -19,7 +19,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: create
     show-sql: true
     properties:
       hibernate: