Skip to content

Commit a40647e

Browse files
joowojrjoowojr
authored
Merge branch 'develop' into CLAP-213
2 parents 2074b5a + 788fe87 commit a40647e

File tree

54 files changed

+137
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+137
-106
lines changed

‎src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,23 @@
77
import java.util.List;
88

99
public record FilterLogRequest(
10-
@Schema(description = "검색 기간 (단위: 시간)", example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)")
10+
@Schema(description = "검색 기간 (단위: 시간)",
11+
example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)")
1112
Integer term,
13+
1214
@NotNull
15+
@Schema(description = "로그 상태 목록",
16+
example = "[\"LOGIN\", \"ASSIGNER_CHANGED\", \"COMMENT_ADDED\"]")
1317
List<LogStatus> logStatus,
18+
1419
@NotNull
20+
@Schema(description = "닉네임",
21+
example = "john_doe")
1522
String nickName,
23+
1624
@NotNull
25+
@Schema(description = "클라이언트 IP 주소",
26+
example = "192.168.1.1")
1727
String clientIp
18-
) {
28+
) {
1929
}

‎src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package clap.server.adapter.inbound.web.dto.task.request;
2+
3+
import jakarta.validation.constraints.NotNull;
4+
5+
import java.time.LocalDateTime;
6+
7+
import io.swagger.v3.oas.annotations.media.Schema;
8+
public record ApprovalTaskRequest(
9+
@NotNull
10+
@Schema(description = "2차 카테고리 ID",
11+
example = "1 ")
12+
Long categoryId,
13+
14+
@NotNull
15+
@Schema(description = "처리자 ID",
16+
example = "2")
17+
Long processorId,
18+
19+
@NotNull
20+
@Schema(description = "마감 기한",
21+
example = "2025-02-10T15:30:00")
22+
LocalDateTime dueDate,
23+
24+
@NotNull
25+
@Schema(description = "라벨 ID",
26+
example = "1")
27+
Long labelId
28+
) {
29+
}

src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/request/CreateTaskRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.request;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
44
import jakarta.validation.constraints.NotBlank;

src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.request;
22

33

44
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;

src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskLabelRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskLabelRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.request;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
44
import jakarta.validation.constraints.NotNull;

src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskProcessorRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskProcessorRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.request;
22

33

44
import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.request;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
44
import jakarta.validation.constraints.NotBlank;

src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskStatusRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.request;
22

33
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
44
import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/response/ApprovalTaskResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.inbound.web.dto.task;
1+
package clap.server.adapter.inbound.web.dto.task.response;
22

33
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
44

0 commit comments

Comments
 (0)