Skip to content

Commit 5bc0f4a

Browse files
simhyunminsimhyunmin
authored
Merge pull request #24 from NET-ZERO-FitFit/feature/modifying-post-api
Feat : Clothes PATCH API 구현 완료
2 parents 32d9405 + fb74a2c commit 5bc0f4a

11 files changed

Lines changed: 311 additions & 31 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ build/
77
!**/src/test/**/build/
88
src/main/generated/
99

10+
src/main/resources/application.yml
11+
1012
### STS ###
1113
.apt_generated
1214
.classpath

‎src/main/java/fitfit/domain/clothes/controller/ClothesRestController.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public ApiResponse<ClothesResponseDTO.CreateClothesResponse> registerClothes(
5353
return ApiResponse.onSuccess(response);
5454
}
5555

56-
@DeleteMapping("/{clothesId}")
56+
@DeleteMapping("/delete")
5757
@Operation(summary = "판매 옷 삭제 API", description = "자신이 등록한 판매 옷을 삭제하는 API입니다.")
5858
@ApiResponses({
5959
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
@@ -63,11 +63,27 @@ public ApiResponse<ClothesResponseDTO.CreateClothesResponse> registerClothes(
6363
})
6464
public ApiResponse<String> deleteClothes(
6565
@RequestHeader(value = "Authorization") String authorization,
66-
@PathVariable(name = "clothesId") Long clothesId) {
67-
clothesCommandService.deleteClothes(authorization, clothesId);
66+
@Valid @RequestBody ClothesRequestDTO.DeleteRequest request) {
67+
clothesCommandService.deleteClothes(authorization, request);
6868
return ApiResponse.onSuccess("판매 옷 삭제에 성공했습니다.");
6969
}
7070

71+
@PatchMapping("/update")
72+
@Operation(summary = "판매글 수정 API", description = "자신이 작성한 판매글의 제목, 내용, 가격 등을 선택 수정합니다.")
73+
@ApiResponses({
74+
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
75+
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효성 검사 실패(잘못된 요청 형식)", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
76+
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "403", description = "수정 권한 없음",content = @Content(schema = @Schema(implementation = ApiResponse.class))),
77+
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "판매글을 찾을 수 없음",content = @Content(schema = @Schema(implementation = ApiResponse.class))),
78+
})
79+
public ApiResponse<ClothesResponseDTO.UpdateResponse> updateClothes(
80+
@RequestHeader(value = "Authorization") String authorization,
81+
@Valid @RequestBody ClothesRequestDTO.UpdateRequest request) {
82+
83+
ClothesResponseDTO.UpdateResponse response = clothesCommandService.updateClothes(authorization, request);
84+
return ApiResponse.onSuccess(response);
85+
}
86+
7187
@GetMapping("/search")
7288
@Operation(summary = "판매 옷 일반 검색 API", description = """
7389
키워드 검색을 통해 판매 옷 정보를 가져오는 API입니다. (존재하지 않는 키워드인 경우 빈 리스트로 응답)

‎src/main/java/fitfit/domain/clothes/converter/ClothesConverter.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import fitfit.global.enums.Style;
99
import org.springframework.data.domain.Page;
1010

11-
import java.time.LocalDateTime;
1211
import java.util.List;
1312
import java.util.stream.Collectors;
1413

@@ -77,4 +76,40 @@ public static ClothesResponseDTO.ClothesPageDTO toClothesPageDTO(Page<Clothes> c
7776
.isLast(clothesPage.isLast())
7877
.build();
7978
}
79+
80+
//판매글 수정 응답을 위한 컨버터 메서드 추가
81+
public static ClothesResponseDTO.UpdateResponse toUpdateResponse(Clothes clothes) {
82+
return ClothesResponseDTO.UpdateResponse.builder()
83+
.title(clothes.getTitle())
84+
.price(clothes.getPrice())
85+
.comment(clothes.getComment())
86+
.address(clothes.getAddress())
87+
.totalLength(clothes.getTotalLength())
88+
.chestWidth(clothes.getChestWidth())
89+
.shoulderWidth(clothes.getShoulderWidth())
90+
.footSize(clothes.getFootSize())
91+
.waistMeasurement(clothes.getWaistMeasurement())
92+
.thighMeasurement(clothes.getThighMeasurement())
93+
.updatedAt(clothes.getUpdatedAt())
94+
.build();
95+
}
96+
97+
public static ClothesResponseDTO.MapMarkerDTO toMapMarkerDTO(Clothes clothes) {
98+
String mainImageUrl = clothes.getImages().isEmpty() ? null : clothes.getImages().get(0).getImageUrl();
99+
return new ClothesResponseDTO.MapMarkerDTO(
100+
clothes.getId(),
101+
clothes.getLat(),
102+
clothes.getLng(),
103+
mainImageUrl,
104+
clothes.getTitle(),
105+
clothes.getPrice(),
106+
clothes.getAddress()
107+
);
108+
}
109+
110+
public static List<ClothesResponseDTO.MapMarkerDTO> toMapMarkerDTOList(List<Clothes> clothesList) {
111+
return clothesList.stream()
112+
.map(ClothesConverter::toMapMarkerDTO)
113+
.collect(Collectors.toList());
114+
}
80115
}

‎src/main/java/fitfit/domain/clothes/dto/ClothesRequestDTO.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,68 @@ public static class CreateClothesRequest {
7575
@Schema(description = "전시 이미지 목록", example = "[\"https://example.com/image1.jpg\", \"https://example.com/image2.jpg\"]")
7676
private List<String> displayImages;
7777
}
78+
79+
80+
@Getter
81+
@NoArgsConstructor
82+
public static class UpdateRequest {
83+
84+
@NotNull(message = "옷 ID는 필수입니다.")
85+
@Schema(description = "옷 ID", example = "1")
86+
private Long clothesId;
87+
88+
//값이 넘어왔을 때 공백이나 빈 문자열 허용하지 않도록 작성.
89+
// 이미지, 카테고리, 스타일만 수정할 수 없고 나머지는 수정할 수 있음.
90+
91+
@NotBlank(message = "제목은 공백일 수 없습니다.")
92+
private String title;
93+
94+
@Schema(description = "수정할 가격", example = "35000")
95+
private Integer price;
96+
97+
@NotBlank(message = "코멘트는 공백일 수 없습니다.")
98+
private String comment;
99+
100+
@NotBlank(message = "주소는 공백일 수 없습니다.")
101+
private String address;
102+
103+
private Double lat;
104+
private Double lng;
105+
106+
private Boolean saleAgreed;
107+
private Boolean meetupAgreed;
108+
private Boolean offerAgreed;
109+
110+
// 사이즈 정보
111+
@Schema(description = "총장", example = "100")
112+
private String totalLength;
113+
@Schema(description = "가슴 단면", example = "50")
114+
private String chestWidth;
115+
@Schema(description = "어깨 너비", example = "45")
116+
private String shoulderWidth;
117+
@Schema(description = "발 사이즈", example = "270")
118+
private String footSize;
119+
@Schema(description = "허리 단면", example = "40")
120+
private String waistMeasurement;
121+
@Schema(description = "허벅지 단면", example = "30")
122+
private String thighMeasurement;
123+
124+
// 판매 정보
125+
private LocalDate salesPeriod;
126+
private Long discountRate;
127+
128+
@Schema(description = "수정할 피팅 이미지", example = "data:image/jpeg;base64,...")
129+
private String fittingImage;
130+
131+
@Schema(description = "수정할 전시 이미지 목록", example = "[\"data:image/jpeg;base64,...\", \"https://existing-url.com/img.jpg\"]")
132+
private List<String> displayImages;
133+
}
134+
135+
@Getter
136+
@NoArgsConstructor
137+
public static class DeleteRequest {
138+
@NotNull(message = "옷 ID는 필수입니다.")
139+
@Schema(description = "옷 ID", example = "1")
140+
private Long clothesId;
141+
}
78142
}

‎src/main/java/fitfit/domain/clothes/dto/ClothesResponseDTO.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import lombok.Builder;
66
import lombok.Getter;
77
import lombok.NoArgsConstructor;
8+
import org.springframework.stereotype.Component;
89

910
import java.time.LocalDateTime;
1011
import java.util.List;
@@ -62,6 +63,39 @@ public static class ClothesPageDTO {
6263
private Boolean isLast; // 마지막 페이지 여부
6364
}
6465

66+
@Builder
67+
@Getter
68+
@NoArgsConstructor
69+
@AllArgsConstructor
70+
71+
public static class UpdateResponse {
72+
@Schema(description = "수정 후 제목", example = "업데이트된 제목")
73+
private String title;
74+
@Schema(description = "수정 후 코멘트")
75+
private String comment;
76+
@Schema(description = "수정 후 주소")
77+
private String address;
78+
@Schema(description = "수정 후 가격")
79+
private Integer price;
80+
@Schema(description = "수정된 판매글 id", example = "8")
81+
private Long clothesId;
82+
@Schema(description = "수정 후 총 길이", example = "100")
83+
private String totalLength;
84+
@Schema(description = "수정 후 가슴 단면", example = "55")
85+
private String chestWidth;
86+
@Schema(description = "수정 후 어꺠 너비", example = "61")
87+
private String shoulderWidth;
88+
@Schema(description = "수정 후 발 사이즈", example = "270")
89+
private String footSize;
90+
@Schema(description = "수정 후 허리 단면", example = "40")
91+
private String waistMeasurement;
92+
@Schema(description = "수정 후 허벅지 단면", example = "50")
93+
private String thighMeasurement;
94+
95+
@Schema(description = "수정 시각", example = "2025-11-30T10:30:00")
96+
private LocalDateTime updatedAt;
97+
}
98+
6599
//지도 마커용
66100
public record MapMarkerDTO(
67101
@Schema(description = "상품 ID")

‎src/main/java/fitfit/domain/clothes/entity/Clothes.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import jakarta.persistence.*;
88
import lombok.*;
99
import org.hibernate.annotations.ColumnDefault;
10+
import org.springframework.util.StringUtils;
1011

1112
import java.time.LocalDate;
1213
import java.time.LocalDateTime;
@@ -120,6 +121,50 @@ public void addImage(ClothesImage clothesImage) {
120121
clothesImage.updateClothes(this);
121122
}
122123

124+
public void updateFittingImage(String fittingImage) {
125+
this.fittingImage = fittingImage;
126+
}
127+
128+
//판매글 수정 메서드.
129+
//DTO에서 null이나 공백으로 넘어온 필드는 기존 값 유지.
130+
//수정 불가능 필드 : seller, category, style, fittingImage, images, isSold, soldDate...
131+
public void update(String title, Integer price, String comment,
132+
String address, Double lat, Double lng, Boolean saleAgreed,
133+
Boolean meetupAgreed, Boolean offerAgreed, String totalLength,
134+
String chestWidth, String shoulderWidth, String footSize, String waistMeasurement, String thighMeasurement,
135+
LocalDate salesPeriod, Long discountRate) {
136+
137+
//null과 " " 방어.
138+
if(StringUtils.hasText(title)) {
139+
this.title = title;
140+
}
141+
142+
if(StringUtils.hasText(comment)) {
143+
this.comment = comment;
144+
}
145+
146+
if(StringUtils.hasText(address)) {
147+
this.address = address;
148+
}
149+
150+
if(StringUtils.hasText(totalLength)) {this.totalLength = totalLength;}
151+
if(StringUtils.hasText(chestWidth)) {this.chestWidth = chestWidth;}
152+
if(StringUtils.hasText(shoulderWidth)) {this.shoulderWidth = shoulderWidth;}
153+
if(StringUtils.hasText(footSize)) {this.footSize = footSize;}
154+
if(StringUtils.hasText(waistMeasurement)) {this.waistMeasurement = waistMeasurement;}
155+
if(StringUtils.hasText(thighMeasurement)) {this.thighMeasurement = thighMeasurement;}
156+
157+
// null만 체크 수행.
158+
if(price != null) {this.price = price;}
159+
if(lat != null) {this.lat = lat;}
160+
if(lng != null) {this.lng = lng;}
161+
162+
if(salesPeriod != null) {this.salesPeriod = salesPeriod;}
163+
if(discountRate != null) {this.discountRate = discountRate;}
164+
if(saleAgreed != null) {this.saleAgreed = saleAgreed;}
165+
if(meetupAgreed != null) {this.meetupAgreed = meetupAgreed;}
166+
if(offerAgreed != null) {this.offerAgreed = offerAgreed;}
167+
}
123168
//상태 변경 편의 메서드
124169
public void completeMatching() {
125170
this.isMatched = true;

‎src/main/java/fitfit/domain/clothes/service/ClothesCommandService.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66
import java.io.IOException;
77

88
public interface ClothesCommandService {
9+
//판매글 생성
910
ClothesResponseDTO.CreateClothesResponse createClothes(String authorization,
1011
ClothesRequestDTO.CreateClothesRequest requestDto) throws IOException;
1112

12-
void deleteClothes(String authorization, Long clothesId);
13+
//판매글 삭제
14+
void deleteClothes(String authorization, ClothesRequestDTO.DeleteRequest request);
15+
16+
//판매글 수정
17+
ClothesResponseDTO.UpdateResponse updateClothes(String authorization, ClothesRequestDTO.UpdateRequest request);
1318
}

0 commit comments

Comments
 (0)