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 @@ -2,10 +2,12 @@

import jakarta.validation.Valid;

import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import com.project.common.api.response.ApiResponse;
Expand Down Expand Up @@ -47,10 +49,11 @@ public ApiResponse<SignInResponse> signIn(
}

@PostMapping("/signup")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "관리자 회원가입", description = "관리자 이메일/비밀번호로 회원가입합니다.")
public ApiResponse<SignUpResponse> signUp(
@Valid @RequestBody AdminSignInRequest signInRequest) {
return ApiResponse.success(
return ApiResponse.created(
adminService.signUp(signInRequest.email(), signInRequest.password()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;

import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
Expand All @@ -12,6 +13,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import com.project.common.api.response.ApiResponse;
Expand Down Expand Up @@ -97,6 +99,7 @@ public ApiResponse<AppealDetailResponse> getAppealDetail(

/** 이의제기 생성 처리 */
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "이의제기 생성")
public ApiResponse<AppealCreateResponse> createAppeal(
@Parameter(hidden = true) @CustomerId Long customerId,
Expand All @@ -121,6 +124,7 @@ public ApiResponse<AppealRespondResponse> respondAppeal(

/** 이의제기 댓글 작성 처리 */
@PostMapping("/{appealId}/comments")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "이의제기 댓글 작성")
public ApiResponse<AppealCommentResponse> createComment(
@Parameter(hidden = true) @CustomerId Long customerId,
Expand All @@ -143,6 +147,7 @@ public ApiResponse<AppealCancelResponse> cancelAppeal(

/** 긴급 쿼터 요청 처리 */
@PostMapping("/emergency")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "긴급 쿼터 요청")
public ApiResponse<EmergencyQuotaResponse> requestEmergencyQuota(
@Parameter(hidden = true) @CustomerId Long customerId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import jakarta.validation.Valid;

import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import com.project.common.api.response.ApiResponse;
Expand Down Expand Up @@ -48,10 +50,11 @@ public ApiResponse<SignInResponse> signIn(
}

@PostMapping("/signup")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "사용자 회원가입", description = "사용자 이메일/비밀번호로 회원가입합니다.")
public ApiResponse<SignUpResponse> signUp(
@Valid @RequestBody CustomerSignUpRequest requestDto) {
return ApiResponse.success(customerService.signUp(requestDto));
return ApiResponse.created(customerService.signUp(requestDto));
}

@PostMapping("/refresh")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;

import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -12,6 +13,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import com.project.common.api.response.ApiResponse;
Expand Down Expand Up @@ -89,6 +91,7 @@ public ApiResponse<MissionRequestHistoryListResponse> getMissionRequestHistory(
/** OWNER가 미션을 생성한다. */
@OwnerOnly
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "미션 생성")
public ApiResponse<CreateMissionResponse> createMission(
@Parameter(hidden = true) @CustomerId Long customerId,
Expand All @@ -111,11 +114,12 @@ public ApiResponse<Void> cancelMission(

/** MEMBER가 본인 미션 완료 요청을 생성한다. */
@PostMapping("/{missionId}/request")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "미션 완료 요청")
public ApiResponse<MissionRequestResponse> requestMissionApproval(
@Parameter(hidden = true) @CustomerId Long customerId, @PathVariable Long missionId) {
AuthContext auth = authContextService.resolve(customerId);
MissionRequestResult result = missionService.requestMissionApproval(auth, missionId);
return ApiResponse.success(MissionRequestResponse.from(result));
return ApiResponse.created(MissionRequestResponse.from(result));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down Expand Up @@ -56,11 +58,12 @@ public ApiResponse<PolicyResponse.ListResult> getPolicyList(

@PostMapping
@AdminOnly
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "정책 생성", description = "새로운 정책 템플릿을 생성합니다.")
public ApiResponse<PolicyResponse.Create> createPolicy(
@Valid @RequestBody PolicyRequest.Create policyRequest) {
Policy policy = policyService.createPolicy(policyRequest);
return ApiResponse.success(PolicyResponse.Create.from(policy));
return ApiResponse.created(PolicyResponse.Create.from(policy));
}

@PutMapping("/{policyId}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public ApiResponse<RewardTemplateResponse.Detail> updateTemplate(

@DeleteMapping("/{id}")
@AdminOnly
@ResponseStatus(HttpStatus.NO_CONTENT)
@Operation(summary = "보상 템플릿 삭제", description = "보상 템플릿을 삭제합니다. (Soft Delete)")
public ApiResponse<Void> deleteTemplate(
@Parameter(description = "보상 템플릿 ID", required = true) @PathVariable("id") Long id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void missionFlowKeepsRewardShape() throws Exception {
.header("Authorization", "Bearer " + OWNER_TOKEN)
.contentType(MediaType.APPLICATION_JSON)
.content(createBody))
.andExpect(status().isOk())
.andExpect(status().isCreated())
.andReturn();
Long createdMissionId =
objectMapper
Expand All @@ -192,7 +192,7 @@ void missionFlowKeepsRewardShape() throws Exception {
mockMvc.perform(
post("/missions/{missionId}/request", mission.getId())
.header("Authorization", "Bearer " + MEMBER_TOKEN))
.andExpect(status().isOk())
.andExpect(status().isCreated())
.andReturn();
JsonNode requestData =
objectMapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void rewardFlowKeepsRewardShape() throws Exception {
mockMvc.perform(
post("/missions/{missionId}/request", mission.getId())
.header("Authorization", "Bearer " + MEMBER_TOKEN))
.andExpect(status().isOk())
.andExpect(status().isCreated())
.andReturn();
Long requestId =
objectMapper
Expand Down
Loading