Skip to content

Commit 7e4c3e7

Browse files
authored
Merge pull request #548 from TaskFlow-CLAP/CLAP-419
CLAP-419 CSV 파싱 한글깨짐 오류 수정
2 parents 2bb7189 + ee8fa01 commit 7e4c3e7

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.io.BufferedReader;
1818
import java.io.IOException;
1919
import java.io.InputStreamReader;
20+
import java.nio.charset.Charset;
2021
import java.util.ArrayList;
2122
import java.util.List;
2223

@@ -35,7 +36,7 @@ public List<Member> parseDataAndMapToMember(MultipartFile file) {
3536
List<Member> members = new ArrayList<>();
3637
List<Department> departments = loadDepartmentPort.findActiveDepartments();
3738

38-
try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream()))) {
39+
try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getInputStream(), Charset.forName("EUC-KR")))) {
3940
String headerLine = reader.readLine();
4041
if (headerLine == null) {
4142
throw new ApplicationException(MemberErrorCode.INVALID_CSV_FORMAT);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,19 @@ public void approveTask(Member reviewer, Member processor, LocalDateTime dueDate
100100
this.dueDate = dueDate;
101101
this.category = category;
102102
this.label = label;
103+
this.taskCode = toTaskCodeWithApproval(category);
103104
this.taskStatus = TaskStatus.IN_PROGRESS;
104105
}
105106

106107
private static String toTaskCode(Category category) {
107108
return category.getMainCategory().getCode() + category.getCode() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
108109
}
109110

111+
private String toTaskCodeWithApproval(Category category) {
112+
return category.getMainCategory().getCode() + category.getCode() + super.getCreatedAt().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
113+
}
114+
115+
110116
public void updateProcessorOrder(long newProcessorOrder) {
111117
this.processorOrder = newProcessorOrder;
112118
}

src/test/java/clap/server/TestDataFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ public static Task createTask(Long id, String taskCode, String title, TaskStatus
194194
.requester(createUser())
195195
.processor(processor)
196196
.label(createLabel())
197+
.createdAt(LocalDateTime.now())
197198
.build();
198199
}
199200

0 commit comments

Comments
 (0)