Merge pull request #208 from mju-likelion/feature/booth-get-is-event-#207

Feature/#207 부스 전체/상세 조회 시 이벤트 부스 여부 반환하도록 변경

Author: cookie-meringue

src/main/java/org/mju_likelion/festival/booth/domain/BoothDetail.java

@@ -17,6 +17,7 @@ public class BoothDetail {
   private final String department;
   private final String location;
   private final String locationImageUrl;
+  private final Boolean isEventBooth;
   private final LocalDateTime createdAt;
 
   public BoothDetail(
@@ -27,6 +28,7 @@ public BoothDetail(
       final String location,
       final String imageUrl,
       final String locationImageUrl,
+      final Boolean isEventBooth,
       final LocalDateTime createdAt) {
 
     this.id = id;
@@ -36,6 +38,7 @@ public BoothDetail(
     this.department = department;
     this.location = location;
     this.locationImageUrl = locationImageUrl;
+    this.isEventBooth = isEventBooth;
     this.createdAt = createdAt;
   }
 
@@ -49,6 +52,7 @@ public String toString() {
         ", location='" + location + '\'' +
         ", imageUrl='" + imageUrl + '\'' +
         ", locationImageUrl='" + locationImageUrl + '\'' +
+        ", isEventBooth=" + isEventBooth + '\'' +
         ", createdAt=" + createdAt +
         '}';
   }

src/main/java/org/mju_likelion/festival/booth/domain/SimpleBooth.java

@@ -15,6 +15,7 @@ public class SimpleBooth {
   private final String departmentName;
   private final String name;
   private final String imageUrl;
+  private final Boolean isEventBooth;
 
   @Override
   public String toString() {
@@ -23,6 +24,7 @@ public String toString() {
         ", departmentName='" + departmentName + '\'' +
         ", name='" + name + '\'' +
         ", imageUrl='" + imageUrl + '\'' +
+        ", isEventBooth=" + isEventBooth +
         '}';
   }
 }

src/main/java/org/mju_likelion/festival/booth/domain/repository/BoothQueryRepository.java

@@ -36,7 +36,8 @@ private RowMapper<SimpleBooth> simpleBoothRowMapper() {
           uuid,
           rs.getString("departmentName"),
           rs.getString("boothName"),
-          rs.getString("imageUrl")
+          rs.getString("imageUrl"),
+          rs.getBoolean("isEventBooth")
       );
     };
   }
@@ -53,6 +54,7 @@ private RowMapper<BoothDetail> boothDetailRowMapper() {
           rs.getString("boothLocation"),
           rs.getString("imageUrl"),
           rs.getString("locationImageUrl"),
+          rs.getBoolean("isEventBooth"),
           rs.getTimestamp("createdAt").toLocalDateTime()
       );
     };
@@ -72,7 +74,7 @@ public List<SimpleBooth> findAllSimpleBoothByAffiliationId(final UUID affiliatio
 
     String sql =
         "SELECT HEX(b.id) AS boothId, bd.name AS departmentName, b.name AS boothName, "
-            + "i.url AS imageUrl "
+            + "i.url AS imageUrl, b.is_event_booth AS isEventBooth "
             + "FROM booth b "
             + "INNER JOIN image i ON b.image_id = i.id "
             + "INNER JOIN booth_department bd ON b.department_id = bd.id "
@@ -106,25 +108,6 @@ public boolean isBoothOwner(final UUID boothId, final UUID adminId) {
     return jdbcTemplate.queryForObject(sql, params, Integer.class) > 0;
   }
 
-  /**
-   * 이벤트 부스인지 확인.
-   *
-   * @param boothId 부스 ID
-   * @return 이벤트 부스 여부
-   */
-  public boolean isEventBooth(final UUID boothId) {
-    String sql =
-        "SELECT EXISTS("
-            + "SELECT 1 FROM booth b "
-            + "WHERE b.id = UNHEX(:boothId) AND b.is_event_booth = TRUE"
-            + ") AS isEventBooth";
-
-    MapSqlParameterSource params = new MapSqlParameterSource()
-        .addValue("boothId", uuidToHex(boothId));
-
-    return jdbcTemplate.queryForObject(sql, params, Integer.class) > 0;
-  }
-
   /**
    * 부스 상세 정보 조회.
    *
@@ -135,7 +118,7 @@ public Optional<BoothDetail> findBoothById(final UUID id) {
     String sql =
         "SELECT HEX(b.id) AS boothId, b.name AS boothName, b.description AS boothDescription, "
             + "bd.name AS department, b.location AS boothLocation, i.url AS imageUrl, li.url AS locationImageUrl, "
-            + "b.created_at AS createdAt "
+            + "b.is_event_booth AS isEventBooth, b.created_at AS createdAt "
             + "FROM booth b "
             + "INNER JOIN image i ON b.image_id = i.id "
             + "INNER JOIN image li ON b.location_image_id = li.id "

src/main/java/org/mju_likelion/festival/booth/dto/response/BoothDetailResponse.java

@@ -28,6 +28,7 @@ public class BoothDetailResponse {
   private String location;
   private String imageUrl;
   private String locationImageUrl;
+  private Boolean isEventBooth;
   @JsonSerialize(using = LocalDateTimeSerializer.class)
   @JsonDeserialize(using = LocalDateTimeDeserializer.class)
   @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
@@ -36,7 +37,8 @@ public class BoothDetailResponse {
   public static BoothDetailResponse from(final BoothDetail boothDetail) {
     return new BoothDetailResponse(boothDetail.getId(), boothDetail.getName(),
         boothDetail.getDescription(), boothDetail.getDepartment(), boothDetail.getLocation(),
-        boothDetail.getImageUrl(), boothDetail.getLocationImageUrl(), boothDetail.getCreatedAt());
+        boothDetail.getImageUrl(), boothDetail.getLocationImageUrl(),
+        boothDetail.getIsEventBooth(), boothDetail.getCreatedAt());
   }
 
   @Override
@@ -49,6 +51,7 @@ public String toString() {
         ", location='" + location + '\'' +
         ", imageUrl='" + imageUrl + '\'' +
         ", locationImageUrl='" + locationImageUrl + '\'' +
+        ", isEventBooth=" + isEventBooth + '\'' +
         ", createdAt=" + createdAt +
         '}';
   }

src/main/java/org/mju_likelion/festival/booth/dto/response/BoothManagingDetailResponse.java

@@ -14,17 +14,15 @@
 public class BoothManagingDetailResponse {
 
   private Boolean isOwner;
-  private Boolean isEventBooth;
 
-  public static BoothManagingDetailResponse of(final boolean isOwner, final boolean isEventBooth) {
-    return new BoothManagingDetailResponse(isOwner, isEventBooth);
+  public static BoothManagingDetailResponse of(final boolean isOwner) {
+    return new BoothManagingDetailResponse(isOwner);
   }
 
   @Override
   public String toString() {
     return "BoothOwnershipResponse{" +
         "isOwner=" + isOwner +
-        ", isEventBooth=" + isEventBooth +
         '}';
   }
 }

src/main/java/org/mju_likelion/festival/booth/dto/response/SimpleBoothResponse.java

@@ -19,14 +19,16 @@ public class SimpleBoothResponse {
   private String departmentName;
   private String name;
   private String imageUrl;
+  private Boolean isEventBooth;
 
   public static SimpleBoothResponse from(final SimpleBooth simpleBooths) {
 
     return new SimpleBoothResponse(
         simpleBooths.getId(),
         simpleBooths.getDepartmentName(),
         simpleBooths.getName(),
-        simpleBooths.getImageUrl()
+        simpleBooths.getImageUrl(),
+        simpleBooths.getIsEventBooth()
     );
   }
 
@@ -37,6 +39,7 @@ public String toString() {
         ", departmentName='" + departmentName + '\'' +
         ", name='" + name + '\'' +
         ", imageUrl='" + imageUrl + '\'' +
+        ", isEventBooth=" + isEventBooth +
         '}';
   }
 }

src/main/java/org/mju_likelion/festival/booth/service/BoothQueryService.java

@@ -73,9 +73,8 @@ public BoothManagingDetailResponse getBoothManagingDetail(final UUID boothId,
     validateBoothExistence(boothId);
     adminQueryService.validateAdminExistence(boothAdminId);
     boolean isBoothOwner = boothQueryRepository.isBoothOwner(boothId, boothAdminId);
-    boolean isEventBooth = boothQueryRepository.isEventBooth(boothId);
 
-    return BoothManagingDetailResponse.of(isBoothOwner, isEventBooth);
+    return BoothManagingDetailResponse.of(isBoothOwner);
   }
 
   public BoothQrResponse getBoothQr(final UUID boothId, final UUID boothAdminId) {

src/test/java/org/mju_likelion/festival/booth/service/BoothQueryServiceTest.java

@@ -100,38 +100,6 @@ public void testIsNotBoothOwner() {
     assertThat(isOwner).isFalse();
   }
 
-  @DisplayName("이벤트 부스 여부를 확인한다 - 이벤트 부스")
-  @Test
-  public void testIsEventBooth() {
-    // given
-    Booth booth = boothJpaRepository.findAllByIsEventBooth(true).get(0);
-    Admin admin = booth.getOwner();
-
-    // when
-    boolean isEventBooth = boothQueryService.getBoothManagingDetail(booth.getId(),
-            admin.getId())
-        .getIsEventBooth();
-
-    // then
-    assertThat(isEventBooth).isTrue();
-  }
-
-  @DisplayName("이벤트 부스 여부를 확인한다 - 일반 부스")
-  @Test
-  public void testIsNotEventBooth() {
-    // given
-    Booth booth = boothJpaRepository.findAllByIsEventBooth(false).get(0);
-    Admin admin = booth.getOwner();
-
-    // when
-    boolean isEventBooth = boothQueryService.getBoothManagingDetail(booth.getId(),
-            admin.getId())
-        .getIsEventBooth();
-
-    // then
-    assertThat(isEventBooth).isFalse();
-  }
-
   @DisplayName("RedisBoothQrManager 를 사용하여 부스 QR 코드를 생성한다.")
   @Test
   public void testCreateBoothQrRedisBoothQrManager() {