Skip to content

Commit 9f3fc64

Browse files
authored
Merge pull request #461 from TaskFlow-CLAP/CLAP-363
CLAP-363 csv 회원 데이터 매개변수 매핑 오류 수정 및 직무 기입 validation 해제
2 parents c854861 + 04c1d97 commit 9f3fc64

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public record RegisterMemberRequest(
2424
Long departmentId,
2525
@NotNull @Schema(description = "회원 역할")
2626
MemberRole role,
27-
@NotBlank @Schema(description = "회원 직책")
27+
@Schema(description = "회원 직책")
2828
String departmentRole
2929
) {
3030
}

src/main/java/clap/server/application/service/admin/CsvParseService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private Member mapToMember(String[] fields, List<Department> departments) {
6161
.findFirst()
6262
.orElseThrow(() -> new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
6363

64-
managerDepartmentPolicy.validateDepartment(department, MemberRole.valueOf(fields[3].trim()));
64+
managerDepartmentPolicy.validateDepartment(department, MemberRole.valueOf(fields[5].trim()));
6565
MemberInfo memberInfo = toMemberInfo(
6666
fields[0].trim(), // name
6767
fields[4].trim(), // email

src/main/java/clap/server/domain/model/task/Attachment.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@ public void softDelete() {
4545
}
4646

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

5357
}

0 commit comments

Comments
 (0)