diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java index 10f82be1..89920c72 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java @@ -24,7 +24,7 @@ public record RegisterMemberRequest( Long departmentId, @NotNull @Schema(description = "회원 역할") MemberRole role, - @NotBlank @Schema(description = "회원 직책") + @Schema(description = "회원 직책") String departmentRole ) { } diff --git a/src/main/java/clap/server/application/service/admin/CsvParseService.java b/src/main/java/clap/server/application/service/admin/CsvParseService.java index 38578481..8d2db89a 100644 --- a/src/main/java/clap/server/application/service/admin/CsvParseService.java +++ b/src/main/java/clap/server/application/service/admin/CsvParseService.java @@ -61,7 +61,7 @@ private Member mapToMember(String[] fields, List 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 diff --git a/src/main/java/clap/server/domain/model/task/Attachment.java b/src/main/java/clap/server/domain/model/task/Attachment.java index 3d48ff55..21f02f64 100644 --- a/src/main/java/clap/server/domain/model/task/Attachment.java +++ b/src/main/java/clap/server/domain/model/task/Attachment.java @@ -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)); + } } }