Skip to content

Commit ae25797

Browse files
committed
[RELEASE] v2.1.9 축제 제휴 추가
2 parents 65ba50a + 27e66f8 commit ae25797

5 files changed

Lines changed: 23 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import lombok.Getter;
55
import ssu.eatssu.domain.partnership.entity.Partnership;
66
import ssu.eatssu.domain.partnership.entity.PartnershipRestaurant;
7+
import ssu.eatssu.domain.partnership.entity.PeriodType;
78

89
import java.time.LocalDate;
910

@@ -18,6 +19,7 @@ public class PartnershipInfo {
1819
private String description;
1920
private LocalDate startDate;
2021
private LocalDate endDate;
22+
private PeriodType periodType;
2123

2224
public static PartnershipInfo fromEntity(Partnership partnership,
2325
PartnershipRestaurant restaurant,
@@ -27,6 +29,7 @@ public static PartnershipInfo fromEntity(Partnership partnership,
2729
.description(partnership.getDescription())
2830
.startDate(partnership.getStartDate())
2931
.endDate(partnership.getEndDate())
32+
.periodType(partnership.getPeriodType())
3033
.collegeName(partnership.getPartnershipCollege() == null && partnership.getPartnershipDepartment() == null
3134
? "총학생회"
3235
: (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@ public static PartnershipResponse fromEntity(PartnershipRestaurant restaurant, L
3838
.build();
3939
}
4040
}
41-

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;
5+
import jakarta.persistence.EnumType;
6+
import jakarta.persistence.Enumerated;
57
import jakarta.persistence.FetchType;
68
import jakarta.persistence.GeneratedValue;
79
import jakarta.persistence.GenerationType;
@@ -39,6 +41,12 @@ public class Partnership {
3941

4042
@Column(name = "end_date", nullable = false)
4143
private LocalDate endDate;
44+
45+
@Builder.Default
46+
@Enumerated(EnumType.STRING)
47+
@Column(name = "period_type", nullable = false)
48+
private PeriodType periodType = PeriodType.NORMAL;
49+
4250
@ManyToOne(fetch = FetchType.LAZY)
4351
@JoinColumn(name = "partnership_college_id")
4452
private College partnershipCollege;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package ssu.eatssu.domain.partnership.entity;
2+
3+
public enum PeriodType {
4+
NORMAL,
5+
FESTIVAL
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-- =========================
2+
-- V5: partnership 기간 타입 추가
3+
-- =========================
4+
5+
ALTER TABLE partnership
6+
ADD COLUMN period_type ENUM ('NORMAL', 'FESTIVAL') NOT NULL DEFAULT 'NORMAL';

0 commit comments

Comments
 (0)