Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public Store toEntity() {
.name(name)
.location(location)
.description(description)
.notice("")
.noticeTitle("제목을 입력해주세요.")
.noticeContent("내용을 입력해주세요.")
.openTime("00002359")
.isActive(false)
.deleted(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ public class StoreCreateResponse {
private String name;
private String location;
private String description;
private String notice;
private String noticeTitle;
private String noticeContent;
private String openTime;
private Boolean isActive;
private Boolean deleted;
Expand All @@ -32,7 +33,8 @@ public static StoreCreateResponse fromEntity(Store store) {
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.noticeTitle(store.getNoticeTitle())
.noticeContent(store.getNoticeContent())
.openTime(store.getOpenTime())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public class StoreReadDto {
private String name;
private String location;
private String description;
private String notice;
private String noticeTitle;
private String noticeContent;
private String openTime;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
Expand All @@ -45,7 +46,8 @@ public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.noticeTitle(store.getNoticeTitle())
.noticeContent(store.getNoticeContent())
.openTime(store.getOpenTime())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class StoreUpdateRequest {
private String name;
private String location;
private String description;
private String notice;
private String noticeTitle;
private String noticeContent;
private String openTime;
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ public StoreReadDto updateStore(Long storeId, StoreUpdateRequest request, Member
request.getName(),
request.getLocation(),
request.getDescription(),
request.getNotice(),
request.getNoticeTitle(),
request.getNoticeContent(),
request.getOpenTime()
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public class StoreDetailReadResponse {
private String name;
private String location;
private String description;
private String notice;
private String noticeTitle;
private String noticeContent;
private String openTime;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
Expand Down Expand Up @@ -54,7 +55,8 @@ public static StoreDetailReadResponse fromEntity(
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.noticeTitle(store.getNoticeTitle())
.noticeContent(store.getNoticeContent())
.openTime(store.getOpenTime())
.profileImage(profile)
.bannerImages(banners)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public class StorePageReadResponse {
private String name;
private String location;
private String description;
private String notice;
private String noticeTitle;
private String noticeContent;
private String openTime;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
Expand Down Expand Up @@ -50,7 +51,8 @@ public static StorePageReadResponse fromEntity(Store store, List<StoreImageUploa
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.noticeTitle(store.getNoticeTitle())
.noticeContent(store.getNoticeContent())
.openTime(store.getOpenTime())
.profileImage(profile)
.bannerImages(banners)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ public class Store extends BaseTimeEntity {
private String description;

@Column(nullable = true, length = 200)
private String notice;
private String noticeTitle;

@Column(nullable = true, length = 200)
private String noticeContent;

@Column(nullable = true, length = 200)
private String openTime;
Expand All @@ -53,25 +56,33 @@ public class Store extends BaseTimeEntity {
private Boolean deleted;

public Store(LocalDateTime createdAt, Long storeId, Long departmentId, String name, String location,
String description,String notice,String openTime, Boolean isActive, Boolean deleted) {
String description, String noticeTitle, String noticeContent, String openTime, Boolean isActive, Boolean deleted) {
super(createdAt);
this.storeId = storeId;
this.departmentId = departmentId;
this.name = name;
this.location = location;
this.description = description;
this.notice = notice;
this.noticeTitle = noticeTitle;
this.noticeContent = noticeContent;
this.openTime = openTime;
this.isActive = isActive;
this.deleted = deleted;
}

public void updateInfo(String name, String location, String description, String notice, String openTime) {
if (name != null) this.name = name;
if (location != null) this.location = location;
if (description != null) this.description = description;
if (notice != null) this.notice = notice;
if (openTime != null) this.openTime = openTime;
public void updateInfo(String name, String location, String description, String noticeTitle, String notice, String openTime) {
if (name != null)
this.name = name;
if (location != null)
this.location = location;
if (description != null)
this.description = description;
if (noticeTitle != null)
this.noticeTitle = noticeTitle;
if (notice != null)
this.noticeContent = notice;
if (openTime != null)
this.openTime = openTime;
}

public void markAsDeleted() {
Expand Down