Skip to content

Commit 5d76d8b

Browse files
authored
Merge pull request #319 from 7-umc-GrowIT/refactor/#318
[#318] Refactor: 챌린지 삭제 api 응답 반환 수정
2 parents ca19e47 + 9db8b5e commit 5d76d8b

File tree

7 files changed

+7
-31
lines changed

7 files changed

+7
-31
lines changed

config

src/main/java/umc/GrowIT/Server/converter/ChallengeConverter.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,6 @@ public static ChallengeResponseDTO.ModifyProofDTO toChallengeModifyProofDTO(User
152152
.build();
153153
}
154154

155-
// 챌린지 삭제
156-
public static ChallengeResponseDTO.DeleteChallengeResponseDTO toDeletedUserChallenge(UserChallenge userChallenge) {
157-
return ChallengeResponseDTO.DeleteChallengeResponseDTO.builder()
158-
.id(userChallenge.getId())
159-
.message("챌린지를 삭제했어요")
160-
.build();
161-
}
162-
163155
public static List<ChallengeResponseDTO.ChallengeDTO> toRecommendedChallenges(List<Challenge> dailyChallenges, Challenge randomChallenge) {
164156
// daily 챌린지 변환
165157
List<ChallengeResponseDTO.ChallengeDTO> recommendedChallenges = dailyChallenges.stream()

src/main/java/umc/GrowIT/Server/service/challengeService/ChallengeCommandService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
import umc.GrowIT.Server.web.dto.ChallengeDTO.ChallengeResponseDTO;
55

66
import java.util.List;
7-
import java.util.Map;
87

98
public interface ChallengeCommandService {
109

1110
ChallengeResponseDTO.SelectChallengeResponseDTO selectChallenges(Long userId, List<ChallengeRequestDTO.SelectChallengeRequestDTO> selectRequestList);
1211
ChallengeResponseDTO.ProofPresignedUrlResponseDTO createChallengePresignedUrl(Long userId, ChallengeRequestDTO.ProofRequestPresignedUrlDTO request);
1312
ChallengeResponseDTO.CreateProofDTO createChallengeProof(Long userId, Long userChallengeId, ChallengeRequestDTO.ProofRequestDTO proofRequest);
1413
ChallengeResponseDTO.ModifyProofDTO updateChallengeProof(Long userId, Long userChallengeId, ChallengeRequestDTO.ProofRequestDTO updateRequest);
15-
ChallengeResponseDTO.DeleteChallengeResponseDTO delete(Long userChallengeId, Long userId);
14+
void delete(Long userChallengeId, Long userId);
1615
}

src/main/java/umc/GrowIT/Server/service/challengeService/ChallengeCommandServiceImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public ChallengeResponseDTO.ModifyProofDTO updateChallengeProof(Long userId, Lon
170170

171171
// 삭제
172172
@Override
173-
public ChallengeResponseDTO.DeleteChallengeResponseDTO delete(Long userChallengeId, Long userId) {
173+
public void delete(Long userChallengeId, Long userId) {
174174
// 1. userId를 조회하고 없으면 오류
175175
userRepository.findById(userId)
176176
.orElseThrow(() -> new UserHandler(ErrorStatus.USER_NOT_FOUND));
@@ -186,8 +186,5 @@ public ChallengeResponseDTO.DeleteChallengeResponseDTO delete(Long userChallenge
186186

187187
// 4. 삭제
188188
userChallengeRepository.deleteById(userChallengeId);
189-
190-
// 5. converter 작업
191-
return ChallengeConverter.toDeletedUserChallenge(userChallenge);
192189
}
193190
}

src/main/java/umc/GrowIT/Server/web/controller/ChallengeController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ public ApiResponse<ChallengeResponseDTO.ModifyProofDTO> updateChallengeProof(@Pa
9898
}
9999

100100
@DeleteMapping("{userChallengeId}")
101-
public ApiResponse<ChallengeResponseDTO.DeleteChallengeResponseDTO> deleteChallenge(@PathVariable("userChallengeId") Long userChallengeId) {
101+
public ApiResponse<Void> deleteChallenge(@PathVariable("userChallengeId") Long userChallengeId) {
102102
//AccessToken에서 userId 추출
103103
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
104104
Long userId = (Long) authentication.getPrincipal();
105105

106-
ChallengeResponseDTO.DeleteChallengeResponseDTO deleteChallenge = challengeCommandService.delete(userChallengeId, userId);
107-
return ApiResponse.onSuccess(deleteChallenge);
106+
challengeCommandService.delete(userChallengeId, userId);
107+
return ApiResponse.onSuccess();
108108
}
109109
}

src/main/java/umc/GrowIT/Server/web/controller/specification/ChallengeSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,5 @@ ApiResponse<ChallengeResponseDTO.ModifyProofDTO> updateChallengeProof(@PathVaria
124124

125125
})
126126
@Parameter(name = "userChallengeId", description = "삭제할 사용자 챌린지의 ID", example = "1")
127-
ApiResponse<ChallengeResponseDTO.DeleteChallengeResponseDTO> deleteChallenge(@PathVariable("userChallengeId") Long userChallengeId);
127+
ApiResponse<Void> deleteChallenge(@PathVariable("userChallengeId") Long userChallengeId);
128128
}

src/main/java/umc/GrowIT/Server/web/dto/ChallengeDTO/ChallengeResponseDTO.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ public static class ModifyProofDTO {
205205
private String thoughts;
206206
}
207207

208-
@Getter
209-
@Builder
210-
@NoArgsConstructor
211-
@AllArgsConstructor
212-
@Schema(title = "챌린지 삭제 response")
213-
public static class DeleteChallengeResponseDTO {
214-
@Schema(description = "사용자 챌린지 id", example = "1")
215-
private Long id;
216-
@Schema(description = "챌린지 삭제 성공 메시지", example = "챌린지를 삭제했어요.")
217-
private String message;
218-
}
219-
220208
@Getter
221209
@Builder
222210
@NoArgsConstructor

0 commit comments

Comments
 (0)