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 8d2db89a..dafa2844 100644 --- a/src/main/java/clap/server/application/service/admin/CsvParseService.java +++ b/src/main/java/clap/server/application/service/admin/CsvParseService.java @@ -17,6 +17,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; @@ -35,7 +36,7 @@ public List parseDataAndMapToMember(MultipartFile file) { List members = new ArrayList<>(); List departments = loadDepartmentPort.findActiveDepartments(); - try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream()))) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream(), Charset.forName("EUC-KR")))) { String headerLine = reader.readLine(); if (headerLine == null) { throw new ApplicationException(MemberErrorCode.INVALID_CSV_FORMAT); diff --git a/src/main/java/clap/server/domain/model/task/Task.java b/src/main/java/clap/server/domain/model/task/Task.java index 4e032ab3..60a76251 100644 --- a/src/main/java/clap/server/domain/model/task/Task.java +++ b/src/main/java/clap/server/domain/model/task/Task.java @@ -100,6 +100,7 @@ public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate this.dueDate = dueDate; this.category = category; this.label = label; + this.taskCode = toTaskCodeWithApproval(category); this.taskStatus = TaskStatus.IN_PROGRESS; } @@ -107,6 +108,11 @@ private static String toTaskCode(Category category) { return category.getMainCategory().getCode() + category.getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm")); } + private String toTaskCodeWithApproval(Category category) { + return category.getMainCategory().getCode() + category.getCode() + super.getCreatedAt().format(DateTimeFormatter.ofPattern("yyMMddHHmm")); + } + + public void updateProcessorOrder(long newProcessorOrder) { this.processorOrder = newProcessorOrder; } diff --git a/src/test/java/clap/server/TestDataFactory.java b/src/test/java/clap/server/TestDataFactory.java index 62ef0a47..e485bb7b 100644 --- a/src/test/java/clap/server/TestDataFactory.java +++ b/src/test/java/clap/server/TestDataFactory.java @@ -194,6 +194,7 @@ public static Task createTask(Long id, String taskCode, String title, TaskStatus .requester(createUser()) .processor(processor) .label(createLabel()) + .createdAt(LocalDateTime.now()) .build(); }