Skip to content

Commit 1aa5528

Browse files
authored
Merge pull request #72 from TaskFlow-CLAP/CLAP-109
CLAP-109 api 명세 수정 및 url path 수정
2 parents 5b3a266 + 56ee2f5 commit 1aa5528

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.web.bind.annotation.RequestBody;
1313
import org.springframework.web.bind.annotation.RequestMapping;
1414

15-
@Tag(name = "로그인 / 로그아웃 / 토큰 재발급")
15+
@Tag(name = "로그인 / 로그아웃")
1616
@WebAdapter
1717
@RequiredArgsConstructor
1818
@RequestMapping("/api/auths")

src/main/java/clap/server/adapter/inbound/web/dto/admin/RegisterMemberRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import jakarta.validation.constraints.Pattern;
88

99
public record RegisterMemberRequest(
10-
@NotBlank @Schema(description = "회원 이름")
10+
@NotBlank @Schema(description = "회원 이름", example = "서주원")
1111
String name,
1212
@NotBlank
1313
@Pattern(regexp = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$",
1414
message = "올바른 이메일 형식이 아닙니다.")
15-
@Schema(description = "회원 이메일")
15+
@Schema(description = "회원 이메일", example = "siena@gmail.com")
1616
String email,
17-
@NotBlank @Schema(description = "회원 닉네임, 로그인할 때 쓰입니다.")
17+
@NotBlank @Schema(description = "회원 닉네임, 로그인할 때 쓰입니다.", example = "siena.it")
1818
@Pattern(regexp = "^[a-z]{3,10}\\.[a-z]{1,5}$",
1919
message = "올바른 닉네임 형식이 아닙니다.")
2020
String nickname,

src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,41 @@
55
import clap.server.application.port.inbound.statistics.FindPeriodTaskRequestUsecase;
66
import clap.server.application.port.inbound.statistics.FindSubCategoryTaskRequestUsecase;
77
import clap.server.common.annotation.architecture.WebAdapter;
8+
import io.swagger.v3.oas.annotations.tags.Tag;
89
import lombok.RequiredArgsConstructor;
910
import org.springframework.http.ResponseEntity;
1011
import org.springframework.web.bind.annotation.GetMapping;
12+
import org.springframework.web.bind.annotation.RequestMapping;
1113
import org.springframework.web.bind.annotation.RequestParam;
1214

1315
import java.util.Map;
1416

17+
@Tag(name = "작업 관련 통계")
1518
@WebAdapter
1619
@RequiredArgsConstructor
20+
@RequestMapping("/api/tasks/statistics")
1721
public class FindStatisticsController {
1822
private final FindPeriodTaskRequestUsecase findPeriodTaskRequestUsecase;
1923
private final FindPeriodTaskProcessUsecase findPeriodTaskProcessUsecase;
2024
private final FindCategoryTaskRequestUsecase findCategoryTaskRequestUsecase;
2125
private final FindSubCategoryTaskRequestUsecase findSubCategoryTaskRequestUsecase;
2226
// private final ManagerTaskProcessUsecase managerTaskProcessUsecase;
2327

24-
@GetMapping(value = "/task/statistics/task-requests-by-period")
28+
@GetMapping(value = "/task-requests-by-period")
2529
public ResponseEntity<Map<String, Long>> aggregatePeriodTaskRequest(@RequestParam String period) {
2630
return ResponseEntity.ok(findPeriodTaskRequestUsecase.aggregatePeriodTaskRequest(period));
2731
}
2832

29-
@GetMapping("/task/statistics/task-processed-by-period")
33+
@GetMapping("/task-processed-by-period")
3034
public ResponseEntity<Map<String, Long>> aggregatePeriodTaskProcess(@RequestParam String period) {
3135
return ResponseEntity.ok(findPeriodTaskProcessUsecase.aggregatePeriodTaskProcess(period));
3236
}
33-
@GetMapping("/task/statistics/task-requests-by-category")
37+
@GetMapping("/task-requests-by-category")
3438
public ResponseEntity<Map<String, Long>> aggregateCategoryTaskRequest(@RequestParam String period) {
3539
return ResponseEntity.ok(findCategoryTaskRequestUsecase.aggregateCategoryTaskRequest(period));
3640
}
3741

38-
@GetMapping("/task/statistics/task-requests-by-subcategory")
42+
@GetMapping("/task-requests-by-subcategory")
3943
public ResponseEntity<Map<String, Long>> aggregateSubCategoryTaskRequest(@RequestParam String period, @RequestParam String mainCategory) {
4044
return ResponseEntity.ok(findSubCategoryTaskRequestUsecase.aggregateSubCategoryTaskRequest(period, mainCategory));
4145
}

0 commit comments

Comments
 (0)