Skip to content

Commit 1d5065a

Browse files
authored
Merge pull request #608 from TaskFlow-CLAP/CLAP-486
CLAP-486 구분 중복성 검증 logic 및 카테고리 글자수 제한 logic 수정
2 parents a7f9d12 + 0f3187e commit 1d5065a

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ public record AddSubCategoryRequest(
1212
String name,
1313
@NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
1414
String code,
15-
@Length(max = 255)
15+
@Length(max = 1000)
1616
String descriptionExample) {
1717
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public record UpdateCategoryRequest(
99
String name,
1010
@NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
1111
String code,
12-
@Length(max = 255)
12+
@Length(max = 1000)
1313
String descriptionExample
1414
) {
1515
}

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
@@ -17,7 +17,7 @@ public record CreateTaskRequest(
1717
String title,
1818

1919
@Schema(description = "작업 설명")
20-
@Length(max = 200)
20+
@Length(max = 1000)
2121
String description
2222
) {
2323
}

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
@@ -19,7 +19,7 @@ public record UpdateTaskRequest(
1919
String title,
2020

2121
@Schema(description = "작업 설명", example = "업데이트된 설명.")
22-
@Length(max = 200)
22+
@Length(max = 1000)
2323
String description,
2424

2525
@Schema(description = "삭제할 파일 ID 목록, 없을 경우 emptylist 전송")

src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public List<Label> findLabelList() {
3737

3838
@Override
3939
public boolean existsByLabelName(String labelName) {
40-
return labelRepository.existsByLabelName(labelName);
40+
return labelRepository.existsByLabelNameAndIsDeletedFalse(labelName);
4141
}
4242

4343
@Override

src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class CategoryEntity extends BaseTimeEntity {
3333
@JoinColumn(name = "main_category_id")
3434
private CategoryEntity mainCategory;
3535

36-
@Column
36+
@Column(length = 1000)
3737
private String descriptionExample;
3838

3939
@Column(nullable = false)

src/main/java/clap/server/adapter/outbound/persistense/entity/task/TaskEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class TaskEntity extends BaseTimeEntity {
3030
@Column(nullable = false)
3131
private String title;
3232

33-
@Column
33+
@Column(length = 1000)
3434
private String description;
3535

3636
@ManyToOne(fetch = FetchType.EAGER)

src/main/java/clap/server/adapter/outbound/persistense/repository/task/LabelRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ public interface LabelRepository extends JpaRepository<LabelEntity, Long> {
1111

1212
List<LabelEntity> findByIsDeletedFalse();
1313

14-
boolean existsByLabelName(String labelName);
14+
boolean existsByLabelNameAndIsDeletedFalse(String labelName);
1515
}

0 commit comments

Comments
 (0)