Skip to content

Commit 85d7e87

Browse files
authored
Merge pull request #330 from TaskFlow-CLAP/CLAP-284
CLAP-276 fix:Member.createMember 사용해서 생성하도록 수정
2 parents 37b36c4 + e1039c5 commit 85d7e87

File tree

4 files changed

+10
-136
lines changed

4 files changed

+10
-136
lines changed

src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class MemberEntity extends BaseTimeEntity {
4646
@Column(nullable = false)
4747
private MemberStatus status;
4848

49+
@Column
4950
private String password;
5051

5152
@Column

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ private Member mapToMember(String[] fields, List<Department> departments) {
6565
fields[0].trim(), // name
6666
fields[4].trim(), // email
6767
fields[1].trim(), // nickname
68-
Boolean.parseBoolean(fields[6].trim()), // isReviewer
68+
Boolean.parseBoolean(fields[6].trim().toLowerCase()), // isReviewer
6969
department, // department
7070
MemberRole.valueOf(fields[5].trim()), // role
7171
fields[3].trim() // departmentRole
7272
);
7373

74-
return toMember(memberInfo);
74+
return Member.builder()
75+
.memberInfo(memberInfo)
76+
.build();
7577
}
7678
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ public class RegisterMemberCSVService implements RegisterMemberCSVUsecase {
2323
public int registerMembersFromCsv(Long adminId, MultipartFile file) {
2424
List<Member> members = csvParser.parseDataAndMapToMember(file);
2525
Member admin = memberService.findActiveMember(adminId);
26-
members.forEach(member -> {member.register(admin);});
2726

28-
commandMemberPort.saveAll(members);
27+
List<Member> newMembers = members.stream()
28+
.map(memberData -> Member.createMember(admin, memberData.getMemberInfo()))
29+
.toList();
30+
31+
commandMemberPort.saveAll(newMembers);
2932
return members.size();
3033
}
3134
}

src/test/java/clap/server/application/service/admin/RegisterMemberCSVServiceTest.java

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)