Skip to content

Commit

Permalink
feat: GDSC-PKNU-Official#6 sortMembers() 함수 추가
Browse files Browse the repository at this point in the history
- members리스트를 Lead, Core Member, Member, Senior 순으로 정렬하는 함수 추가
- 테이블 순서에따라 member클래스 변수를 name, role, email 순서로 변경
  • Loading branch information
coke98 committed Sep 21, 2022
1 parent 2a0ddc5 commit 0745d84
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 7 deletions.
7 changes: 3 additions & 4 deletions src/main/java/com/gdscpknu/gdscpknu/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
@Getter
public class Member {
private String name;
private String email;
private String role;

private String email;
@Builder
public Member(String name, String email, String role) {
public Member(String name, String role, String email) {
this.name = name;
this.email = email;
this.role = role;
this.email = email;
}
}
35 changes: 32 additions & 3 deletions src/main/java/com/gdscpknu/gdscpknu/service/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ public List<Member> getAllMember() {
extractName(resultInString);
extractEmail(resultInString);
extractRole(resultInString);
addMember();
addMembers();
sortMembers();

return members;
}


private void getMemberIntroPage() {
memberIntroPage = client.getDatabases().queryDatabase(
gdscNotion.getDATABASE_ID(),
Expand Down Expand Up @@ -84,14 +86,41 @@ private void extractRole(String resultInString) {
}
}

private void addMember() {
private void addMembers() {
for (int i = 0; i < nameList.size(); i++) {
Member member = Member.builder()
.name(nameList.get(i))
.email(emailList.get(i))
.role(roleList.get(i))
.email(emailList.get(i))
.build();
members.add(member);
}
}

private void sortMembers() {
// members를 Lead, Core Member, Member, Senior 순으로 정렬
members.sort((o1, o2) -> {
if (o1.getRole().equals("Lead")) {
return -1;
} else if (o2.getRole().equals("Lead")) {
return 1;
} else if (o1.getRole().equals("Core Member")) {
return -1;
} else if (o2.getRole().equals("Core Member")) {
return 1;
} else if (o1.getRole().equals("Member")) {
return -1;
} else if (o2.getRole().equals("Member")) {
return 1;
} else if (o1.getRole().equals("Senior")) {
return -1;
} else if (o2.getRole().equals("Senior")) {
return 1;
} else {
return 0;
}
});

}

}

0 comments on commit 0745d84

Please sign in to comment.