Skip to content

[Release] v2.0.4 릴리즈 #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yongjun0511 merged 1 commit into from
Sep 4, 2025
Merged

[Release] v2.0.4 릴리즈 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/main/java/ssu/eatssu/domain/partnership/dto/CreatePartnershipRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 = "컴퓨터학부")
Expand All @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -13,7 +12,6 @@
@AllArgsConstructor
public class PartnershipDetailResponse {
private Long id;
private PartnershipType partnershipType;
private String storeName;
private String description;
private LocalDate startDate;
Expand All @@ -32,7 +30,6 @@ public static PartnershipDetailResponse fromEntity(PartnershipRestaurant partner

return new PartnershipDetailResponse(
partnership.getId(),
partnership.getPartnershipType(),
partnershipRestaurant.getStoreName(),
partnership.getDescription(),
partnership.getStartDate(),
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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())
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Copy link

@gemini-code-assist gemini-code-assist bot Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

필드를 제거하면서 불필요한 공백 라인이 추가되었습니다. 코드 가독성을 위해 이 라인을 제거하는 것이 좋겠습니다.

@Column(name = "description", nullable = false)
private String description;

Expand Down
17 changes: 0 additions & 17 deletions src/main/java/ssu/eatssu/domain/partnership/entity/PartnershipType.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/main/java/ssu/eatssu/domain/partnership/entity/RestaurantType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

public enum RestaurantType {
RESTAURANT("음식점"),
CAFE("카페");
CAFE("카페"),
BEER("주점");

private final String type;

Expand Down