Skip to content

Commit

Permalink
Merge pull request #548 from TaskFlow-CLAP/CLAP-419
Browse files Browse the repository at this point in the history
CLAP-419 CSV 파싱 한글깨짐 오류 수정
  • Loading branch information
joowojr authored Feb 13, 2025
2 parents 2bb7189 + ee8fa01 commit 7e4c3e7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -35,7 +36,7 @@ public List<Member> parseDataAndMapToMember(MultipartFile file) {
List<Member> members = new ArrayList<>();
List<Department> 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);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/clap/server/domain/model/task/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,19 @@ 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;
}

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;
}
Expand Down
1 change: 1 addition & 0 deletions src/test/java/clap/server/TestDataFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit 7e4c3e7

Please sign in to comment.