Skip to content

Commit

Permalink
fix: 이름, 생일, 성별 저장 오류 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
h-beeen committed Mar 20, 2024
1 parent e4f13ac commit b3d2bdb
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component
import java.net.URI

@Component
@Transactional
class AuthService(
private val authFactory: AuthFactory,
private val jwtFactory: JwtFactory,
Expand All @@ -29,7 +30,6 @@ class AuthService(
return authFactory.getAuthUriGenerator(provider).generate()
}

@Transactional
fun login(
providerType: String,
code: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@ import com.vacgom.backend.application.auth.dto.TokenResponse
import com.vacgom.backend.application.member.dto.request.SignUpRequest
import com.vacgom.backend.domain.auth.constants.Role
import com.vacgom.backend.domain.member.HealthProfile
import com.vacgom.backend.domain.member.MemberDetails
import com.vacgom.backend.domain.member.Nickname
import com.vacgom.backend.exception.member.MemberError
import com.vacgom.backend.exception.member.NicknameError
import com.vacgom.backend.global.exception.error.BusinessException
import com.vacgom.backend.global.security.jwt.JwtFactory
import com.vacgom.backend.infrastructure.member.persistence.HealthProfileRepository
import com.vacgom.backend.infrastructure.member.persistence.MemberRepository
import jakarta.transaction.Transactional
import org.springframework.stereotype.Service
import java.util.*

@Service
@Transactional
class MemberService(
private val memberRepository: MemberRepository,
private val healthProfileRepository: HealthProfileRepository,
Expand All @@ -34,9 +37,10 @@ class MemberService(
): AuthResponse {
val member = memberRepository.findById(memberId).orElseThrow { BusinessException(MemberError.NOT_FOUND) }
val nickname = Nickname(request.nickname)
val memberDetails = MemberDetails(request.name, request.birthday, request.sex)

member.memberDetails?.updateMemberInfo(request.name, request.birthday, request.sex)
member.updateNickname(nickname)
member.updateMemberDetails(memberDetails)
member.updateRole(Role.ROLE_USER)

val healthConditions = request.healthConditions.stream()
Expand Down
4 changes: 4 additions & 0 deletions src/main/kotlin/com/vacgom/backend/domain/member/Member.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ class Member(
@Embedded
var nickname: Nickname? = null

fun updateMemberDetails(memberDetails: MemberDetails) {
this.memberDetails = memberDetails
}

fun updateNickname(nickname: Nickname) {
this.nickname = nickname
}
Expand Down
31 changes: 12 additions & 19 deletions src/main/kotlin/com/vacgom/backend/domain/member/MemberDetails.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,18 @@ import java.time.LocalDate
import java.time.format.DateTimeFormatter

@Embeddable
class MemberDetails {
var name: String? = null
class MemberDetails(
var name: String,

@JsonFormat(
shape = JsonFormat.Shape.STRING,
pattern = "yyyy-MM-dd"
)
var birthday: LocalDate? = null

@Enumerated(EnumType.STRING)
var sex: Sex? = null
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
var birthday: LocalDate,

fun updateMemberInfo(
name: String,
birthday: String,
sex: String
) {
this.name = name
this.birthday = LocalDate.parse(birthday, DateTimeFormatter.ISO_LOCAL_DATE)
this.sex = Sex.valueOf(sex.uppercase())
}
@Enumerated(EnumType.STRING)
var sex: Sex
) {
constructor(name: String, birthday: String, sex: String) : this(
name,
LocalDate.parse(birthday, DateTimeFormatter.ofPattern("yyyy-MM-dd")),
Sex.valueOf(sex)
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.*
import java.util.*


@RestController
@RequestMapping("/api/v1/member")
class MemberController(
Expand Down

0 comments on commit b3d2bdb

Please sign in to comment.