test #210

Merged
klaus merged 7 commits from test into main 2024-09-06 19:00:39 +00:00
4 changed files with 50 additions and 1 deletions
Showing only changes of commit e8cb4c6ea2 - Show all commits

View File

@ -0,0 +1,9 @@
package kr.co.vividnext.sodalive.member
import com.querydsl.core.annotations.QueryProjection
data class GetMemberProfileResponse @QueryProjection constructor(
val memberId: Long,
val profileImageUrl: String,
val isBlocked: Boolean
)

View File

@ -10,6 +10,7 @@ import org.springframework.data.domain.Pageable
import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal
import org.springframework.security.core.userdetails.User import org.springframework.security.core.userdetails.User
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.PutMapping import org.springframework.web.bind.annotation.PutMapping
import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestBody
@ -240,4 +241,13 @@ class MemberController(private val service: MemberService) {
fun forgotPassword( fun forgotPassword(
@RequestBody request: ForgotPasswordRequest @RequestBody request: ForgotPasswordRequest
) = ApiResponse.ok(service.forgotPassword(request)) ) = ApiResponse.ok(service.forgotPassword(request))
@GetMapping("/profile/{id}")
fun getMemberProfile(
@PathVariable id: Long,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(service.getMemberProfile(memberId = id, myMemberId = member.id!!))
}
} }

View File

@ -8,10 +8,12 @@ import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
import kr.co.vividnext.sodalive.member.QMember.member import kr.co.vividnext.sodalive.member.QMember.member
import kr.co.vividnext.sodalive.member.auth.QAuth.auth import kr.co.vividnext.sodalive.member.auth.QAuth.auth
import kr.co.vividnext.sodalive.member.block.BlockMemberRepository import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing
import kr.co.vividnext.sodalive.member.nickname.QNicknameChangeLog.nicknameChangeLog import kr.co.vividnext.sodalive.member.nickname.QNicknameChangeLog.nicknameChangeLog
import kr.co.vividnext.sodalive.member.notification.QMemberNotification.memberNotification import kr.co.vividnext.sodalive.member.notification.QMemberNotification.memberNotification
import kr.co.vividnext.sodalive.message.QMessage.message import kr.co.vividnext.sodalive.message.QMessage.message
import org.springframework.beans.factory.annotation.Value
import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
@ -54,12 +56,17 @@ interface MemberQueryRepository {
fun getChangeNoticeRecipientPushTokens(creatorId: Long): Map<String, List<List<String>>> fun getChangeNoticeRecipientPushTokens(creatorId: Long): Map<String, List<List<String>>>
fun getPushTokenFromReservationList(roomId: Long): Map<String, List<List<String>>> fun getPushTokenFromReservationList(roomId: Long): Map<String, List<List<String>>>
fun getMemberProfile(memberId: Long, myMemberId: Long): GetMemberProfileResponse
} }
@Repository @Repository
class MemberQueryRepositoryImpl( class MemberQueryRepositoryImpl(
private val queryFactory: JPAQueryFactory, private val queryFactory: JPAQueryFactory,
private val blockMemberRepository: BlockMemberRepository private val blockMemberRepository: BlockMemberRepository,
@Value("\${cloud.aws.cloud-front.host}")
private val cloudFrontHost: String
) : MemberQueryRepository { ) : MemberQueryRepository {
override fun findByPushToken(pushToken: String): List<Member> { override fun findByPushToken(pushToken: String): List<Member> {
return queryFactory return queryFactory
@ -415,4 +422,23 @@ class MemberQueryRepositoryImpl(
return mapOf("aos" to aosPushTokens, "ios" to iosPushTokens) return mapOf("aos" to aosPushTokens, "ios" to iosPushTokens)
} }
override fun getMemberProfile(memberId: Long, myMemberId: Long): GetMemberProfileResponse {
return queryFactory
.select(
QGetMemberProfileResponse(
member.id,
member.profileImage.prepend("/").prepend(cloudFrontHost),
blockMember.id.isNotNull
)
)
.from(member)
.leftJoin(blockMember)
.on(
member.id.eq(blockMember.blockedMember.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.member.id.eq(memberId))
)
.fetchFirst()
}
} }

View File

@ -622,6 +622,10 @@ class MemberService(
) )
} }
fun getMemberProfile(memberId: Long, myMemberId: Long): GetMemberProfileResponse {
return repository.getMemberProfile(memberId, myMemberId)
}
private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock {
return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() } return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() }
} }