[Release] v2.0.4 릴리즈

[Release] v2.0.4 릴리즈

Author: yongjun0511

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)

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(),

src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java

@@ -4,15 +4,13 @@
 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;
 
 @Builder
 @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())

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;
 

src/main/java/ssu/eatssu/domain/partnership/entity/PartnershipType.java

@@ -2,7 +2,8 @@
 
 public enum RestaurantType {
     RESTAURANT("음식점"),
-    CAFE("카페");
+    CAFE("카페"),
+    BEER("주점");
 
     private final String type;