-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* remove: 기존 멤버 관련 컴포넌트 삭제 - controller, service, reader, writer, repository 및 관련 dto 삭제 * feat: 멤버 상태에 따라 멤버 domain 분리 * feat: 상태별 멤버 entity 추가 * feat: 상태별 멤버 목록 조회 및 검색을 위한 repository 메서드 추가 * feat: 상태별 멤버 목록 조회 및 검색을 위한 reader 메서드 추가 * feat: 상태별 멤버 목록 조회 및 검색에 사용할 service 메서드 추가 * feat: 상태별 멤버 목록 조회 및 검색 api 추가
- Loading branch information
1 parent
1478e5b
commit 0f0e2bc
Showing
49 changed files
with
1,358 additions
and
485 deletions.
There are no files selected for viewing
82 changes: 0 additions & 82 deletions
82
src/main/kotlin/com/yourssu/scouter/hrms/application/domain/member/CreateMemberRequest.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...ain/kotlin/com/yourssu/scouter/hrms/application/domain/member/ReadActiveMemberResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
package com.yourssu.scouter.hrms.application.domain.member | ||
|
||
import com.fasterxml.jackson.annotation.JsonFormat | ||
import com.yourssu.scouter.hrms.business.domain.member.ActiveMemberDto | ||
import com.yourssu.scouter.hrms.business.support.utils.MemberRoleConverter | ||
import com.yourssu.scouter.hrms.business.support.utils.MemberStateConverter | ||
import com.yourssu.scouter.hrms.business.support.utils.NicknameConverter | ||
import java.time.LocalDate | ||
|
||
data class ReadActiveMemberResponse( | ||
|
||
val memberId: Long, | ||
|
||
val parts: List<ReadDivisionAndPartInMemberResponse>, | ||
|
||
val role: String, | ||
|
||
val name: String, | ||
|
||
val nickname: String, | ||
|
||
val state: String, | ||
|
||
val email: String, | ||
|
||
val phoneNumber: String, | ||
|
||
val department: String, | ||
|
||
val studentId: String, | ||
|
||
@JsonFormat(pattern = "yyyy.MM.dd") | ||
val birthDate: LocalDate, | ||
|
||
@JsonFormat(pattern = "yyyy.MM.dd") | ||
val joinDate: LocalDate, | ||
|
||
val membershipFee: Boolean, | ||
|
||
val note: String, | ||
) { | ||
|
||
companion object { | ||
fun from(activeMemberDto: ActiveMemberDto): ReadActiveMemberResponse = ReadActiveMemberResponse( | ||
memberId = activeMemberDto.member.id, | ||
parts = activeMemberDto.member.parts.map { ReadDivisionAndPartInMemberResponse.from(it) }, | ||
role = MemberRoleConverter.convertToString(activeMemberDto.member.role), | ||
name = activeMemberDto.member.name, | ||
nickname = NicknameConverter.combine( | ||
nicknameEnglish = activeMemberDto.member.nicknameEnglish, | ||
nicknameKorean = activeMemberDto.member.nicknameKorean | ||
), | ||
state = MemberStateConverter.convertToString(activeMemberDto.member.state), | ||
email = activeMemberDto.member.email, | ||
phoneNumber = activeMemberDto.member.phoneNumber, | ||
department = activeMemberDto.member.department.name, | ||
studentId = activeMemberDto.member.studentId, | ||
birthDate = activeMemberDto.member.birthDate, | ||
joinDate = activeMemberDto.member.joinDate, | ||
membershipFee = activeMemberDto.isMembershipFeePaid, | ||
note = activeMemberDto.member.note, | ||
) | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
...com/yourssu/scouter/hrms/application/domain/member/ReadDivisionAndPartInMemberResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.yourssu.scouter.hrms.application.domain.member | ||
|
||
import com.yourssu.scouter.common.business.domain.part.PartDto | ||
|
||
data class ReadDivisionAndPartInMemberResponse( | ||
|
||
val division: String, | ||
val part: String, | ||
) { | ||
companion object { | ||
fun from(partDto: PartDto): ReadDivisionAndPartInMemberResponse = ReadDivisionAndPartInMemberResponse( | ||
division = partDto.division.name, | ||
part = partDto.name, | ||
) | ||
} | ||
} |
67 changes: 67 additions & 0 deletions
67
.../kotlin/com/yourssu/scouter/hrms/application/domain/member/ReadGraduatedMemberResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package com.yourssu.scouter.hrms.application.domain.member | ||
|
||
import com.fasterxml.jackson.annotation.JsonFormat | ||
import com.yourssu.scouter.hrms.business.domain.member.GraduatedMemberDto | ||
import com.yourssu.scouter.hrms.business.support.utils.MemberRoleConverter | ||
import com.yourssu.scouter.hrms.business.support.utils.MemberStateConverter | ||
import com.yourssu.scouter.hrms.business.support.utils.NicknameConverter | ||
import java.time.LocalDate | ||
|
||
data class ReadGraduatedMemberResponse( | ||
|
||
val memberId: Long, | ||
|
||
val parts: List<ReadDivisionAndPartInMemberResponse>, | ||
|
||
val role: String, | ||
|
||
val name: String, | ||
|
||
val nickname: String, | ||
|
||
val state: String, | ||
|
||
val email: String, | ||
|
||
val phoneNumber: String, | ||
|
||
val department: String, | ||
|
||
val studentId: String, | ||
|
||
@JsonFormat(pattern = "yyyy.MM.dd") | ||
val birthDate: LocalDate, | ||
|
||
@JsonFormat(pattern = "yyyy.MM.dd") | ||
val joinDate: LocalDate, | ||
|
||
val activePeriod: ReadSemesterPeriodInMemberResponse, | ||
|
||
val isAdvisorDesired: Boolean, | ||
|
||
val note: String, | ||
) { | ||
|
||
companion object { | ||
fun from(graduatedMemberDto: GraduatedMemberDto): ReadGraduatedMemberResponse = ReadGraduatedMemberResponse( | ||
memberId = graduatedMemberDto.member.id, | ||
parts = graduatedMemberDto.member.parts.map { ReadDivisionAndPartInMemberResponse.from(it) }, | ||
role = MemberRoleConverter.convertToString(graduatedMemberDto.member.role), | ||
name = graduatedMemberDto.member.name, | ||
nickname = NicknameConverter.combine( | ||
nicknameEnglish = graduatedMemberDto.member.nicknameEnglish, | ||
nicknameKorean = graduatedMemberDto.member.nicknameKorean | ||
), | ||
state = MemberStateConverter.convertToString(graduatedMemberDto.member.state), | ||
email = graduatedMemberDto.member.email, | ||
phoneNumber = graduatedMemberDto.member.phoneNumber, | ||
department = graduatedMemberDto.member.department.name, | ||
studentId = graduatedMemberDto.member.studentId, | ||
birthDate = graduatedMemberDto.member.birthDate, | ||
joinDate = graduatedMemberDto.member.joinDate, | ||
activePeriod = ReadSemesterPeriodInMemberResponse.from(graduatedMemberDto.activePeriod), | ||
isAdvisorDesired = graduatedMemberDto.isAdvisorDesired, | ||
note = graduatedMemberDto.member.note, | ||
) | ||
} | ||
} |
Oops, something went wrong.