From 633c1e19878e2595d3a8812dd108398bd7e85590 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Thu, 13 Feb 2025 12:36:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-418=20HotFix:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EC=8B=9C=20=EC=9E=91=EC=97=85=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/clap/server/domain/model/task/Task.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; } From 6f9b6ae39fed572ef6de49b0a981a385679fdd5f Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 13 Feb 2025 12:41:13 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-419=20Fix=20:=20CSV=20=ED=8C=8C?= =?UTF-8?q?=EC=8B=B1=20=ED=95=9C=EA=B8=80=EA=B9=A8=EC=A7=90=20=EC=98=A4?= =?UTF-8?q?=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 --- .../clap/server/application/service/admin/CsvParseService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); From a8fa56cbacd032bb5858e8eccbbe6b57fd65dace Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Thu, 13 Feb 2025 12:50:33 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-418=20HotFix:=20=EC=9E=91=EC=97=85=20m?= =?UTF-8?q?ock=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20createdAt=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/clap/server/TestDataFactory.java | 1 + 1 file changed, 1 insertion(+) 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(); }