From 354560f10a2d1fbcd8fa70acfc2049074b00bf6b Mon Sep 17 00:00:00 2001 From: JjungminLee Date: Thu, 4 Sep 2025 21:30:55 +0900 Subject: [PATCH] =?UTF-8?q?hotfix:=20=EC=A0=9C=ED=9C=B4=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=95=88=EC=93=B0=EB=8A=94=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CreatePartnershipRequest.java | 4 ---- .../dto/PartnershipDetailResponse.java | 3 --- .../domain/partnership/dto/PartnershipInfo.java | 3 --- .../domain/partnership/entity/Partnership.java | 6 +----- .../partnership/entity/PartnershipType.java | 17 ----------------- .../partnership/entity/RestaurantType.java | 3 ++- 6 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 src/main/java/ssu/eatssu/domain/partnership/entity/PartnershipType.java diff --git a/src/main/java/ssu/eatssu/domain/partnership/dto/CreatePartnershipRequest.java b/src/main/java/ssu/eatssu/domain/partnership/dto/CreatePartnershipRequest.java index b5c061b9..dda225ea 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/dto/CreatePartnershipRequest.java +++ b/src/main/java/ssu/eatssu/domain/partnership/dto/CreatePartnershipRequest.java @@ -5,7 +5,6 @@ import lombok.Getter; import ssu.eatssu.domain.partnership.entity.Partnership; import ssu.eatssu.domain.partnership.entity.PartnershipRestaurant; -import ssu.eatssu.domain.partnership.entity.PartnershipType; import java.time.LocalDate; @@ -15,8 +14,6 @@ public class CreatePartnershipRequest { @Schema(description = "제휴 가게 식별자", example = "1") private Long storeId; - @Schema(description = "제휴 종류(DRINK, DISCOUNT, SIDE, OTHER)", example = "DISCOUNT") - private PartnershipType partnershipType; @Schema(description = "단과대", example = "IT대") private String college; @Schema(description = "학과", example = "컴퓨터학부") @@ -31,7 +28,6 @@ public class CreatePartnershipRequest { public Partnership toPartnershipEntity(PartnershipRestaurant partnershipRestaurant) { return Partnership.builder() .partnershipRestaurant(partnershipRestaurant) - .partnershipType(partnershipType) .description(description) .startDate(startDate) .endDate(endDate) diff --git a/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipDetailResponse.java b/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipDetailResponse.java index 4febcf51..54067ec4 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipDetailResponse.java +++ b/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipDetailResponse.java @@ -4,7 +4,6 @@ import lombok.Getter; import ssu.eatssu.domain.partnership.entity.Partnership; import ssu.eatssu.domain.partnership.entity.PartnershipRestaurant; -import ssu.eatssu.domain.partnership.entity.PartnershipType; import ssu.eatssu.domain.partnership.entity.RestaurantType; import java.time.LocalDate; @@ -13,7 +12,6 @@ @AllArgsConstructor public class PartnershipDetailResponse { private Long id; - private PartnershipType partnershipType; private String storeName; private String description; private LocalDate startDate; @@ -32,7 +30,6 @@ public static PartnershipDetailResponse fromEntity(PartnershipRestaurant partner return new PartnershipDetailResponse( partnership.getId(), - partnership.getPartnershipType(), partnershipRestaurant.getStoreName(), partnership.getDescription(), partnership.getStartDate(), diff --git a/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java b/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java index 282140ef..efec513b 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java +++ b/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java @@ -4,7 +4,6 @@ import lombok.Getter; import ssu.eatssu.domain.partnership.entity.Partnership; import ssu.eatssu.domain.partnership.entity.PartnershipRestaurant; -import ssu.eatssu.domain.partnership.entity.PartnershipType; import java.time.LocalDate; @@ -12,7 +11,6 @@ @Getter public class PartnershipInfo { private Long id; - private PartnershipType partnershipType; private String collegeName; private String departmentName; private Integer likeCount; @@ -26,7 +24,6 @@ public static PartnershipInfo fromEntity(Partnership partnership, boolean isLiked) { return PartnershipInfo.builder() .id(partnership.getId()) - .partnershipType(partnership.getPartnershipType()) .description(partnership.getDescription()) .startDate(partnership.getStartDate()) .endDate(partnership.getEndDate()) diff --git a/src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java b/src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java index 43d94e2b..d4bc4701 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java +++ b/src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java @@ -32,11 +32,7 @@ public class Partnership { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "partnership_id") private Long id; - - @Enumerated(EnumType.STRING) - @Column(name = "partnership_type", nullable = false) - private PartnershipType partnershipType; - + @Column(name = "description", nullable = false) private String description; diff --git a/src/main/java/ssu/eatssu/domain/partnership/entity/PartnershipType.java b/src/main/java/ssu/eatssu/domain/partnership/entity/PartnershipType.java deleted file mode 100644 index 9d91ab0e..00000000 --- a/src/main/java/ssu/eatssu/domain/partnership/entity/PartnershipType.java +++ /dev/null @@ -1,17 +0,0 @@ -package ssu.eatssu.domain.partnership.entity; - -import lombok.Getter; - -@Getter -public enum PartnershipType { - DRINK("음료"), - DISCOUNT("할인"), - SIDE("사이드"), - OTHER("기타"); - - private final String type; - - PartnershipType(String type) { - this.type = type; - } -} diff --git a/src/main/java/ssu/eatssu/domain/partnership/entity/RestaurantType.java b/src/main/java/ssu/eatssu/domain/partnership/entity/RestaurantType.java index d849580c..549b857c 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/entity/RestaurantType.java +++ b/src/main/java/ssu/eatssu/domain/partnership/entity/RestaurantType.java @@ -2,7 +2,8 @@ public enum RestaurantType { RESTAURANT("음식점"), - CAFE("카페"); + CAFE("카페"), + BEER("주점"); private final String type;