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 @@ -24,7 +24,7 @@ public record RegisterMemberRequest(
Long departmentId,
@NotNull @Schema(description = "회원 역할")
MemberRole role,
@NotBlank @Schema(description = "회원 직책")
@Schema(description = "회원 직책")
String departmentRole
) {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private Member mapToMember(String[] fields, List<Department> departments) {
.findFirst()
.orElseThrow(() -> new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));

managerDepartmentPolicy.validateDepartment(department, MemberRole.valueOf(fields[3].trim()));
managerDepartmentPolicy.validateDepartment(department, MemberRole.valueOf(fields[5].trim()));
MemberInfo memberInfo = toMemberInfo(
fields[0].trim(), // name
fields[4].trim(), // email
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/clap/server/domain/model/task/Attachment.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ public void softDelete() {
}

public static String formatFileSize(long size) {
if (size < 1024) return size + " B";
int z = (63 - Long.numberOfLeadingZeros(size)) / 10;
return String.format("%.1f %sB", (double) size / (1L << (z * 10)), " KMGTPE".charAt(z));
if (size < 1024) {
return size + " B";
} else if (size < 1024 * 1024) {
return String.format("%.1f KB", size / 1024.0);
} else {
return String.format("%.1f MB", size / (1024.0 * 1024.0));
}
}

}