Skip to content

Commit

Permalink
Merge pull request #608 from TaskFlow-CLAP/CLAP-486
Browse files Browse the repository at this point in the history
CLAP-486 구분 중복성 검증 logic 및 카테고리 글자수 제한 logic 수정
  • Loading branch information
starboxxxx authored Feb 19, 2025
2 parents a7f9d12 + 0f3187e commit 1d5065a
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public record AddSubCategoryRequest(
String name,
@NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
String code,
@Length(max = 255)
@Length(max = 1000)
String descriptionExample) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public record UpdateCategoryRequest(
String name,
@NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
String code,
@Length(max = 255)
@Length(max = 1000)
String descriptionExample
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public record CreateTaskRequest(
String title,

@Schema(description = "작업 설명")
@Length(max = 200)
@Length(max = 1000)
String description
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public record UpdateTaskRequest(
String title,

@Schema(description = "작업 설명", example = "업데이트된 설명.")
@Length(max = 200)
@Length(max = 1000)
String description,

@Schema(description = "삭제할 파일 ID 목록, 없을 경우 emptylist 전송")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public List<Label> findLabelList() {

@Override
public boolean existsByLabelName(String labelName) {
return labelRepository.existsByLabelName(labelName);
return labelRepository.existsByLabelNameAndIsDeletedFalse(labelName);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class CategoryEntity extends BaseTimeEntity {
@JoinColumn(name = "main_category_id")
private CategoryEntity mainCategory;

@Column
@Column(length = 1000)
private String descriptionExample;

@Column(nullable = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class TaskEntity extends BaseTimeEntity {
@Column(nullable = false)
private String title;

@Column
@Column(length = 1000)
private String description;

@ManyToOne(fetch = FetchType.EAGER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ public interface LabelRepository extends JpaRepository<LabelEntity, Long> {

List<LabelEntity> findByIsDeletedFalse();

boolean existsByLabelName(String labelName);
boolean existsByLabelNameAndIsDeletedFalse(String labelName);
}

0 comments on commit 1d5065a

Please sign in to comment.