Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #419

Merged
merged 3 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package com.dotori.v2.domain.member.domain.entity

import com.dotori.v2.domain.member.enums.*
import com.dotori.v2.domain.rule.domain.entity.RuleViolation
import com.dotori.v2.domain.student.presentation.data.req.ModifyStudentInfoRequest
import com.dotori.v2.global.entity.BaseTimeEntity
import java.time.LocalDateTime
import javax.persistence.*
import java.util.*

@Entity
@Table(name = "member",
Expand All @@ -18,7 +20,7 @@ class Member(
val id: Long = 0,

@Column(name = "member_name", nullable = false)
val memberName: String,
var memberName: String,

@Column(name = "member_stu_num", nullable = false)
var stuNum: String,
Expand All @@ -30,13 +32,13 @@ class Member(

@Enumerated(EnumType.STRING)
@Column(name = "member_gender")
val gender: Gender,
var gender: Gender,

@Enumerated(EnumType.STRING)
@Column(name = "Role")
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "Role", joinColumns = [JoinColumn(name = "member_id")])
val roles: MutableList<Role>,
var roles: MutableList<Role>,

@OneToMany(mappedBy = "member")
val ruleViolation: MutableList<RuleViolation>,
Expand Down Expand Up @@ -108,4 +110,12 @@ class Member(
this.stuNum = period
return this
}

fun updateMemberInfo(request: ModifyStudentInfoRequest) : Member {
this.memberName = request.memberName
this.stuNum = request.stuNum
this.gender = request.gender
this.roles = Collections.singletonList(request.role)
return this
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.dotori.v2.domain.student.presentation.data.res

import com.dotori.v2.domain.member.domain.entity.Member
import com.dotori.v2.domain.member.enums.Gender
import com.dotori.v2.domain.member.enums.Role
import com.dotori.v2.domain.member.enums.SelfStudyStatus
Expand All @@ -12,4 +13,16 @@ data class FindAllStudentResDto(
val role: Role,
val selfStudyStatus: SelfStudyStatus,
val profileImage: String?
)
) {
companion object {
fun of(member: Member): FindAllStudentResDto = FindAllStudentResDto(
id = member.id,
gender = member.gender,
memberName = member.memberName,
stuNum = member.stuNum,
role = member.roles[0],
selfStudyStatus = member.selfStudyStatus,
profileImage = member.profileImage
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.dotori.v2.domain.student.service.impl
import com.dotori.v2.domain.member.domain.entity.Member
import com.dotori.v2.domain.member.domain.repository.MemberRepository
import com.dotori.v2.domain.member.exception.MemberNotFoundException
import com.dotori.v2.domain.music.presentation.data.res.MusicListResDto
import com.dotori.v2.domain.student.presentation.data.req.ModifyStudentInfoRequest
import com.dotori.v2.domain.student.presentation.data.res.FindAllStudentResDto
import com.dotori.v2.domain.student.service.ModifyStudentInfoService
Expand All @@ -22,29 +23,20 @@ class ModifyStudentInfoServiceImpl(
private val CACHE_KEY = "memberList"

override fun execute(modifyStudentInfoRequest: ModifyStudentInfoRequest) {
val member = memberRepository.findByIdOrNull(modifyStudentInfoRequest.memberId) ?: throw MemberNotFoundException()
updateMemberInfo(member, modifyStudentInfoRequest)
}
val member = memberRepository.findByIdOrNull(modifyStudentInfoRequest.memberId)
?: throw MemberNotFoundException()

private fun updateMemberInfo(member: Member, modifyStudentInfoRequest: ModifyStudentInfoRequest) {
val newMember = Member(
id = member.id,
memberName = modifyStudentInfoRequest.memberName,
stuNum = modifyStudentInfoRequest.stuNum,
email = member.email,
password = member.password,
gender = modifyStudentInfoRequest.gender,
roles = Collections.singletonList(modifyStudentInfoRequest.role),
ruleViolation = member.ruleViolation,
profileImage = member.profileImage
)
val updated = memberRepository.save(member.updateMemberInfo(modifyStudentInfoRequest))
updateCache(updated)
}

private fun updateCache(member: Member) {
val cachedData = redisCacheService.getFromCache(CACHE_KEY) as? List<FindAllStudentResDto>

if (cachedData != null) {
redisCacheService.putToCache(CACHE_KEY, cachedData)
val content = cachedData.toMutableList()
content.add(FindAllStudentResDto.of(member))
redisCacheService.putToCache(CACHE_KEY, content)
}

memberRepository.save(newMember)
}
}
Loading