diff --git a/src/main/java/com/gdscpknu/gdscpknu/domain/Member.java b/src/main/java/com/gdscpknu/gdscpknu/domain/Member.java index 895b964..3951b49 100644 --- a/src/main/java/com/gdscpknu/gdscpknu/domain/Member.java +++ b/src/main/java/com/gdscpknu/gdscpknu/domain/Member.java @@ -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; } } diff --git a/src/main/java/com/gdscpknu/gdscpknu/service/MemberService.java b/src/main/java/com/gdscpknu/gdscpknu/service/MemberService.java index d14c439..1532112 100644 --- a/src/main/java/com/gdscpknu/gdscpknu/service/MemberService.java +++ b/src/main/java/com/gdscpknu/gdscpknu/service/MemberService.java @@ -46,11 +46,13 @@ public List getAllMember() { extractName(resultInString); extractEmail(resultInString); extractRole(resultInString); - addMember(); + addMembers(); + sortMembers(); return members; } + private void getMemberIntroPage() { memberIntroPage = client.getDatabases().queryDatabase( gdscNotion.getDATABASE_ID(), @@ -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; + } + }); + + } + }