Merge pull request #13 from HappyScrolls/feature/#11_invite_code

Feature/#11 invite code
HappyScrolls · Oct 7, 2024 · 4327687 · 4327687
2 parents 52066f5 + d0c5869
commit 4327687
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/src/main/kotlin/com/yedongsoon/account_service/application/couple/CoupleCommandService.kt b/src/main/kotlin/com/yedongsoon/account_service/application/couple/CoupleCommandService.kt
@@ -32,11 +32,11 @@ class CoupleCommandService(
     }
 
     suspend fun createCouple(command: CoupleCreateCommand) {
-        val memberNo = redisTemplate.opsForValue().getAndAwait(command.inviteCode) ?: throw InvalidInviteCodeException("유효하지 않은 초대코드입니다.")
-        coupleRepository.findByAccountNoAOrAccountNoB(memberNo.toInt(), command.accountNoB)?.let {
+        val memberNo = redisTemplate.opsForValue().getAndAwait(command.inviteCode)?.toInt() ?: throw InvalidInviteCodeException("유효하지 않은 초대코드입니다.")
+        coupleRepository.findByAccountNoAOrAccountNoB(memberNo, command.accountNoB)?.let {
             throw CoupleExistException("이미 커플이 존재하는 회원입니다.")
         }
-        coupleRepository.save(Couple.create(command))
+        coupleRepository.save(Couple.create(memberNo,command.accountNoB))
     }
 
     fun modifyCoupleInfo(memberNo: Int, command: CoupleInfoModifyCommand) {
@@ -48,8 +48,9 @@ class CoupleCommandService(
 
     }
 
-    suspend fun createInviteCode(memberNo: Int) {
+    suspend fun createInviteCode(memberNo: Int):String {
         val code=memberNo.toString()+LocalDateTime.now()
         redisTemplate.opsForValue().setAndAwait(code.encodeDtoToBase64(),memberNo.toString(), Duration.ofMinutes(5))
+        return code.encodeDtoToBase64()
     }
 }
diff --git a/src/main/kotlin/com/yedongsoon/account_service/domain/couple/Couple.kt b/src/main/kotlin/com/yedongsoon/account_service/domain/couple/Couple.kt
@@ -58,9 +58,9 @@ class Couple(
     }
 
     companion object {
-        fun create(command: CoupleCreateCommand)=Couple(
-                accountNoA = command.accountNoA,
-                accountNoB = command.accountNoB
+        fun create(accountNoA:Int,accountNoB:Int)=Couple(
+                accountNoA = accountNoA,
+                accountNoB = accountNoB
         )
     }
 

diff --git a/src/main/kotlin/com/yedongsoon/account_service/domain/member/model/CoupleCreateCommand.kt b/src/main/kotlin/com/yedongsoon/account_service/domain/member/model/CoupleCreateCommand.kt
@@ -2,6 +2,5 @@ package com.yedongsoon.account_service.domain.member.model
 
 data class CoupleCreateCommand(
         val inviteCode:String,
-        val accountNoA: Int?=null,
         val accountNoB: Int,
 )
diff --git a/src/main/kotlin/com/yedongsoon/account_service/infrastructure/RedisConfig.kt b/src/main/kotlin/com/yedongsoon/account_service/infrastructure/RedisConfig.kt
@@ -2,6 +2,7 @@ package com.yedongsoon.account_service.infrastructure
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory
 import org.springframework.data.redis.core.ReactiveRedisTemplate
 import org.springframework.data.redis.serializer.RedisSerializationContext
@@ -11,6 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer
 class RedisConfig {
 
     @Bean
+    @Primary
     fun reactiveRedisTemplate(factory: ReactiveRedisConnectionFactory): ReactiveRedisTemplate<String, String> {
         val serializationContext = RedisSerializationContext
                 .newSerializationContext<String, String>(StringRedisSerializer())

diff --git a/src/main/kotlin/com/yedongsoon/account_service/presentation/handler/CoupleHandler.kt b/src/main/kotlin/com/yedongsoon/account_service/presentation/handler/CoupleHandler.kt
@@ -63,8 +63,8 @@ class CoupleHandler(
     suspend fun createInviteCode(request: ServerRequest): ServerResponse = withContext(Dispatchers.IO) {
         val memberHeader = request.extractMemberCodeHeader()
 
-        coupleCommandService.createInviteCode(memberHeader.no)
+        val code= coupleCommandService.createInviteCode(memberHeader.no)
 
-        ServerResponse.ok().buildAndAwait()
+        ServerResponse.ok().bodyValueAndAwait(code)
     }
 }
diff --git a/src/test/http/couple.http b/src/test/http/couple.http
@@ -7,3 +7,9 @@ Member-Code: eyJubyI6MSwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
 GET {{url}}/couple/lover
 Content-Type: application/json
 Member-Code: eyJubyI6MSwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
+
+### 초대 코드
+POST {{url}}/couple/invite-code
+Content-Type: application/json
+Member-Code: eyJubyI6MSwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
+