From a4fe120564b0bbdfa77db501fd274d1d582a3230 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 15:15:18 +0900
Subject: [PATCH] =?UTF-8?q?CLAP-361=20Fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C?=
 =?UTF-8?q?=20=EB=A7=A4=EA=B0=9C=EB=B3=80=EC=88=98=20=EB=A7=A4=ED=95=91=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #458
---
 .../application/service/admin/CsvParseService.java     |  2 +-
 .../java/clap/server/domain/model/task/Attachment.java | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

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<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
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));
+        }
     }
 
 }