Skip to content
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

refactor: DressOrderListDto 예약id 추가 #54

Merged
merged 1 commit into from
Feb 13, 2023
Merged

refactor: DressOrderListDto 예약id 추가 #54

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
2 changes: 1 addition & 1 deletion src/main/java/com/pickle/server/dress/dto/DressOrderDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class DressOrderDto {


@QueryProjection
public DressOrderDto(DressReservation dressReservation, ReservedDress reservedDress, String dressImageUrl/*, DressStock dressStock*/) {
public DressOrderDto(DressReservation dressReservation, ReservedDress reservedDress, String dressImageUrl) {
DecimalFormat priceFormat = new DecimalFormat("###,###");

this.reservedDressId = reservedDress.getId();
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/pickle/server/dress/dto/DressOrderListDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

@Getter
public class DressOrderListDto {
// @ApiModelProperty(example = "예약내역 id")
// @JsonProperty("reserved_dress_id")
// private Long reservedDressId;
@ApiModelProperty(example = "예약내역 id")
@JsonProperty("reserved_dress_id")
private Long reservedDressId;

@ApiModelProperty(example = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("pickup_datetime")
Expand Down Expand Up @@ -45,6 +45,7 @@ public class DressOrderListDto {
public DressOrderListDto(DressReservation dressReservation, ReservedDress reservedDress, String dressImageUrl){
DecimalFormat priceFormat = new DecimalFormat("###,###");

this.reservedDressId = dressReservation.getId();
this.pickUpDateTime = dressReservation.getPickUpDateTime().toString();
this.storeName = dressReservation.getStore().getName();
this.dressName = reservedDress.getDress().getName();
Expand Down