Merge pull request '회원테이블에 adid 추가' (#135) from test into main
Reviewed-on: #135
This commit is contained in:
commit
49f95ab100
|
@ -0,0 +1,3 @@
|
||||||
|
package kr.co.vividnext.sodalive.member
|
||||||
|
|
||||||
|
data class AdidUpdateRequest(val adid: String)
|
|
@ -63,6 +63,7 @@ data class Member(
|
||||||
var blogUrl = ""
|
var blogUrl = ""
|
||||||
|
|
||||||
var pushToken: String? = null
|
var pushToken: String? = null
|
||||||
|
var adid: String? = null
|
||||||
|
|
||||||
// 화폐
|
// 화폐
|
||||||
var pgChargeCan: Int = 0
|
var pgChargeCan: Int = 0
|
||||||
|
|
|
@ -96,7 +96,7 @@ class MemberController(private val service: MemberService) {
|
||||||
fun updatePushToken(
|
fun updatePushToken(
|
||||||
@RequestBody pushTokenUpdateRequest: PushTokenUpdateRequest,
|
@RequestBody pushTokenUpdateRequest: PushTokenUpdateRequest,
|
||||||
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
||||||
) {
|
) = run {
|
||||||
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
||||||
|
|
||||||
ApiResponse.ok(
|
ApiResponse.ok(
|
||||||
|
@ -108,6 +108,21 @@ class MemberController(private val service: MemberService) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PutMapping("/adid/update")
|
||||||
|
fun updateAdid(
|
||||||
|
@RequestBody request: AdidUpdateRequest,
|
||||||
|
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
|
||||||
|
) = run {
|
||||||
|
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
|
||||||
|
|
||||||
|
ApiResponse.ok(
|
||||||
|
service.updateAdid(
|
||||||
|
memberId = member.id!!,
|
||||||
|
adid = request.adid
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/mypage")
|
@GetMapping("/mypage")
|
||||||
fun getMyPage(
|
fun getMyPage(
|
||||||
@RequestParam container: String,
|
@RequestParam container: String,
|
||||||
|
|
|
@ -168,6 +168,14 @@ class MemberService(
|
||||||
member.container = container
|
member.container = container
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
fun updateAdid(memberId: Long, adid: String) {
|
||||||
|
val member = repository.findByIdOrNull(id = memberId)
|
||||||
|
?: throw SodaException("로그인 정보를 확인해주세요.")
|
||||||
|
|
||||||
|
member.adid = adid
|
||||||
|
}
|
||||||
|
|
||||||
fun getMyPage(member: Member, container: String): MyPageResponse {
|
fun getMyPage(member: Member, container: String): MyPageResponse {
|
||||||
val liveReservationCount = liveReservationRepository.getReservationCount(memberId = member.id!!)
|
val liveReservationCount = liveReservationRepository.getReservationCount(memberId = member.id!!)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue