Developer

docker-compose.stage.yml

@@ -17,7 +17,8 @@ services:
         condition: service_healthy
     extra_hosts:
       - "host.docker.internal:host-gateway"
-    volumes: []
+    volumes:
+      - ${FIREBASE_PATH}
     env_file:
       - .env
 

src/main/java/org/atdev/artrip/domain/admin/exhibit/converter/AdminExhibitConverter.java

@@ -0,0 +1,72 @@
+package org.atdev.artrip.domain.admin.exhibit.converter;
+
+import org.atdev.artrip.domain.admin.exhibit.dto.response.AdminExhibitResponse;
+import org.atdev.artrip.domain.admin.exhibit.dto.response.AdminExhibitListResponse;
+import org.atdev.artrip.domain.exhibit.data.Exhibit;
+import org.atdev.artrip.domain.exhibitHall.data.ExhibitHall;
+import org.atdev.artrip.domain.keyword.data.Keyword;
+import org.springframework.stereotype.Component;
+
+import java.util.stream.Collectors;
+
+@Component
+public class AdminExhibitConverter {
+
+    public AdminExhibitListResponse toListResponse(Exhibit exhibit) {
+        return AdminExhibitListResponse.builder()
+                .exhibitId(exhibit.getExhibitId())
+                .title(exhibit.getTitle())
+                .posterUrl(exhibit.getPosterUrl())
+                .status(exhibit.getStatus())
+                .startDate(exhibit.getStartDate())
+                .endDate(exhibit.getEndDate())
+                .exhibitHallName(exhibit.getExhibitHall() != null ? exhibit.getExhibitHall().getName() : null)
+                .country(exhibit.getExhibitHall() != null ? exhibit.getExhibitHall().getCountry() : null)
+                .keywordCount(exhibit.getKeywords().size())
+                .createdAt(exhibit.getCreatedAt())
+                .updatedAt(exhibit.getUpdatedAt())
+                .build();
+    }
+
+    public AdminExhibitResponse toAdminResponse(Exhibit exhibit) {
+        return AdminExhibitResponse.builder()
+                .exhibitId(exhibit.getExhibitId())
+                .title(exhibit.getTitle())
+                .description(exhibit.getDescription())
+                .startDate(exhibit.getStartDate())
+                .endDate(exhibit.getEndDate())
+                .exhibitHall(toExhibitHallInfo(exhibit.getExhibitHall()))
+                .openingHours(exhibit.getExhibitHall() != null ? exhibit.getExhibitHall().getOpeningHours() : null)
+                .status(exhibit.getStatus())
+                .posterUrl(exhibit.getPosterUrl())
+                .ticketUrl(exhibit.getTicketUrl())
+                .keywords(exhibit.getKeywords().stream()
+                        .map(this::toKeywordInfo)
+                        .collect(Collectors.toList()))
+                .createdAt(exhibit.getCreatedAt())
+                .updatedAt(exhibit.getUpdatedAt())
+                .build();
+    }
+
+    private AdminExhibitResponse.ExhibitHallInfo toExhibitHallInfo(ExhibitHall hall) {
+        if (hall == null) return null;
+
+        return AdminExhibitResponse.ExhibitHallInfo.builder()
+                .exhibitHallId(hall.getExhibitHallId())
+                .name(hall.getName())
+                .address(hall.getAddress())
+                .country(hall.getCountry())
+                .region(hall.getRegion())
+                .phone(hall.getPhone())
+                .homepageUrl(hall.getHomepageUrl())
+                .build();
+    }
+
+    private AdminExhibitResponse.KeywordInfo toKeywordInfo(Keyword keyword) {
+        return AdminExhibitResponse.KeywordInfo.builder()
+                .keywordId(keyword.getKeywordId())
+                .name(keyword.getName())
+                .type(keyword.getType().name())
+                .build();
+    }
+}

src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/CreateExhibitRequest.java → src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/request/CreateExhibitRequest.java

@@ -1,10 +1,9 @@
-package org.atdev.artrip.domain.admin.exhibit.dto;
+package org.atdev.artrip.domain.admin.exhibit.dto.request;
 
 import lombok.Data;
 import org.atdev.artrip.domain.Enum.Status;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -16,8 +15,8 @@ public class CreateExhibitRequest {
     private String ticketUrl;
     private String posterUrl;
 
-    private LocalDateTime startDate;
-    private LocalDateTime endDate;
+    private LocalDate startDate;
+    private LocalDate endDate;
 
     private Status status;
 

src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/UpdateExhibitRequest.java → src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/request/UpdateExhibitRequest.java

@@ -1,10 +1,9 @@
-package org.atdev.artrip.domain.admin.exhibit.dto;
+package org.atdev.artrip.domain.admin.exhibit.dto.request;
 
 import lombok.Data;
 import org.atdev.artrip.domain.Enum.Status;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -20,8 +19,8 @@ public class UpdateExhibitRequest {
     private String region;
     private String phone;
 
-    private LocalDateTime startDate;
-    private LocalDateTime endDate;
+    private LocalDate startDate;
+    private LocalDate endDate;
     private String openingHours;
 
     private Status status;

src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/ExhibitListResponse.java → src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/response/AdminExhibitListResponse.java

@@ -1,26 +1,27 @@
-package org.atdev.artrip.domain.admin.exhibit.dto;
+package org.atdev.artrip.domain.admin.exhibit.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.atdev.artrip.domain.Enum.Status;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ExhibitListResponse {
+public class AdminExhibitListResponse {
 
     private Long exhibitId;
     private String title;
     private String posterUrl; // 이미지 URL
     private Status status;
 
-    private LocalDateTime startDate;
-    private LocalDateTime endDate;
+    private LocalDate startDate;
+    private LocalDate endDate;
 
     private String exhibitHallName;
     private String country;

src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/ExhibitAdminResponse.java → src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/response/AdminExhibitResponse.java

@@ -1,41 +1,40 @@
-package org.atdev.artrip.domain.admin.exhibit.dto;
+package org.atdev.artrip.domain.admin.exhibit.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.atdev.artrip.domain.Enum.Status;
 
-import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @Builder
 @AllArgsConstructor
-public class ExhibitAdminResponse {
+public class AdminExhibitResponse {
 
     private Long exhibitId;
     private String title;
     private String description;
 
     private ExhibitHallInfo exhibitHall;
 
-    private LocalDateTime startDate;
-    private LocalDateTime endDate;
+    private LocalDate startDate;
+    private LocalDate endDate;
     private String openingHours;
 
     private Status status;
 
     private String posterUrl;
     private String ticketUrl;
 
-    private List<keywordInfo> keywords;
+    private List<KeywordInfo> keywords;
 
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
 
-    // 내부 클래스: 전시장 정보
     @Data
     @Builder
     @NoArgsConstructor
@@ -50,12 +49,11 @@ public static class ExhibitHallInfo {
         private String homepageUrl;
     }
 
-    // 내부 클래스: 키워드 정보
     @Data
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class keywordInfo {
+    public static class KeywordInfo {
         private Long keywordId;
         private String name;
         private String type;  // GENRE, STYLE