[Feat/#93] MemberType 정의 및 구독시 멤버 저장 과정 추가

api-repo/build.gradle.kts

@@ -22,6 +22,9 @@ sourceSets {
 }
 
 dependencies {
+    /** module */
+    api(project(":data"))
+
     /** spring starter */
     api("org.springframework.boot:spring-boot-starter-data-jdbc")
     implementation("com.mysql:mysql-connector-j")

api-repo/src/main/kotlin/com/few/api/repo/dao/member/MemberDao.kt

@@ -1,6 +1,9 @@
 package com.few.api.repo.dao.member
 
+import com.few.api.repo.dao.member.command.InsertMemberCommand
+import com.few.api.repo.dao.member.query.SelectMemberQuery
 import com.few.api.repo.dao.member.query.SelectWriterQuery
+import com.few.api.repo.dao.member.record.MemberRecord
 import com.few.api.repo.dao.member.record.WriterRecord
 import jooq.jooq_dsl.tables.Member
 import org.jooq.DSLContext
@@ -27,4 +30,30 @@ class MemberDao(
             .fetchOneInto(WriterRecord::class.java)
             ?: throw IllegalArgumentException("cannot find writer record by writerId: $writerId")
     }
+
+    fun selectMember(query: SelectMemberQuery): MemberRecord {
+        val email = query.email
+
+        return dslContext.select(
+            Member.MEMBER.ID.`as`(MemberRecord::memberId.name),
+            DSL.jsonGetAttributeAsText(Member.MEMBER.DESCRIPTION, "name").`as`(MemberRecord::name.name),
+            DSL.jsonGetAttribute(Member.MEMBER.DESCRIPTION, "url").`as`(WriterRecord::url.name)
+        )
+            .from(Member.MEMBER)
+            .where(Member.MEMBER.EMAIL.eq(email))
+            .and(Member.MEMBER.DELETED_AT.isNull)
+            .fetchOneInto(MemberRecord::class.java)
+            ?: throw IllegalArgumentException("cannot find member record by email: $email")
+    }
+
+    fun insertMember(command: InsertMemberCommand): Long {
+        val result = dslContext.insertInto(Member.MEMBER)
+            .set(Member.MEMBER.EMAIL, command.email)
+            .set(Member.MEMBER.TYPE_CD, command.memberType.code)
+            .returning(Member.MEMBER.ID)
+            .fetchOne()
+
+        return result?.getValue(Member.MEMBER.ID)
+            ?: throw RuntimeException("Member with email ${command.email} insertion fail") // TODO: 에러 표준화
+    }
 }

api-repo/src/main/kotlin/com/few/api/repo/dao/member/command/InsertMemberCommand.kt

@@ -0,0 +1,8 @@
+package com.few.api.repo.dao.member.command
+
+import com.few.data.common.code.MemberType
+
+data class InsertMemberCommand(
+    val email: String,
+    val memberType: MemberType
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/member/query/SelectMemberQuery.kt

@@ -0,0 +1,5 @@
+package com.few.api.repo.dao.member.query
+
+data class SelectMemberQuery(
+    val email: String
+)

api-repo/src/main/kotlin/com/few/api/repo/dao/member/record/MemberRecord.kt

@@ -0,0 +1,9 @@
+package com.few.api.repo.dao.member.record
+
+import java.net.URL
+
+data class MemberRecord(
+    val memberId: Long,
+    val name: String,
+    val url: URL
+)

api/src/main/kotlin/com/few/api/domain/subscription/service/MemberService.kt

@@ -1,12 +1,22 @@
 package com.few.api.domain.subscription.service
 
-import com.few.api.domain.subscription.service.dto.readMemberIdDto
+import com.few.api.domain.subscription.service.dto.InsertMemberDto
+import com.few.api.domain.subscription.service.dto.ReadMemberIdDto
+import com.few.api.repo.dao.member.MemberDao
+import com.few.api.repo.dao.member.command.InsertMemberCommand
+import com.few.api.repo.dao.member.query.SelectMemberQuery
 import org.springframework.stereotype.Service
 
 @Service
-class MemberService {
+class MemberService(
+    private val memberDao: MemberDao
+) {
 
-    fun readMemberId(dto: readMemberIdDto): Long {
-        return 1L // TODO: implemenets
+    fun readMemberId(dto: ReadMemberIdDto): Long? {
+        return memberDao.selectMember(SelectMemberQuery(dto.email)).memberId
+    }
+
+    fun insertMember(dto: InsertMemberDto): Long {
+        return memberDao.insertMember(InsertMemberCommand(dto.email, dto.memberType))
     }
 }

api/src/main/kotlin/com/few/api/domain/subscription/service/dto/InsertMemberDto.kt

@@ -0,0 +1,8 @@
+package com.few.api.domain.subscription.service.dto
+
+import com.few.data.common.code.MemberType
+
+data class InsertMemberDto(
+    val email: String,
+    val memberType: MemberType
+)

api/src/main/kotlin/com/few/api/domain/subscription/service/dto/readMemberIdDto.kt → api/src/main/kotlin/com/few/api/domain/subscription/service/dto/ReadMemberIdDto.kt

@@ -1,5 +1,5 @@
 package com.few.api.domain.subscription.service.dto
 
-data class readMemberIdDto(
+data class ReadMemberIdDto(
     val email: String
 )

api/src/main/kotlin/com/few/api/domain/subscription/usecase/SubscribeWorkbookUseCase.kt

@@ -1,23 +1,32 @@
 package com.few.api.domain.subscription.usecase
 
+import com.few.api.domain.subscription.service.MemberService
+import com.few.api.domain.subscription.service.dto.InsertMemberDto
+import com.few.api.domain.subscription.service.dto.ReadMemberIdDto
 import com.few.api.repo.dao.subscription.SubscriptionDao
 import com.few.api.repo.dao.subscription.command.InsertWorkbookSubscriptionCommand
 import com.few.api.repo.dao.subscription.query.CountWorkbookSubscriptionQuery
 import com.few.api.domain.subscription.usecase.`in`.SubscribeWorkbookUseCaseIn
+import com.few.data.common.code.MemberType
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
 
 @Component
 class SubscribeWorkbookUseCase(
-    private val subscriptionDao: SubscriptionDao
+    private val subscriptionDao: SubscriptionDao,
+    private val memberService: MemberService
 ) {
 
     @Transactional
     fun execute(useCaseIn: SubscribeWorkbookUseCaseIn) {
         // TODO: request sending email
 
+        val memberId = memberService.readMemberId(ReadMemberIdDto(useCaseIn.email)) ?: memberService.insertMember(
+            InsertMemberDto(useCaseIn.email, MemberType.NORMAL_USER)
+        )
+
         // 이미 구독중인지 확인
-        CountWorkbookSubscriptionQuery(memberId = useCaseIn.memberId, workbookId = useCaseIn.workbookId).let { query ->
+        CountWorkbookSubscriptionQuery(memberId = memberId, workbookId = useCaseIn.workbookId).let { query ->
             subscriptionDao.selectCountWorkbookSubscription(query).let { cnt ->
                 if (cnt > 0) {
                     throw RuntimeException("Already subscribed")
@@ -26,7 +35,7 @@ class SubscribeWorkbookUseCase(
         }
 
         subscriptionDao.insertWorkbookSubscription(
-            InsertWorkbookSubscriptionCommand(memberId = useCaseIn.memberId, workbookId = useCaseIn.workbookId)
+            InsertWorkbookSubscriptionCommand(memberId = memberId, workbookId = useCaseIn.workbookId)
         )
     }
 }

api/src/main/kotlin/com/few/api/domain/subscription/usecase/UnsubscribeAllUseCase.kt

@@ -1,7 +1,7 @@
 package com.few.api.domain.subscription.usecase
 
 import com.few.api.domain.subscription.service.MemberService
-import com.few.api.domain.subscription.service.dto.readMemberIdDto
+import com.few.api.domain.subscription.service.dto.ReadMemberIdDto
 import com.few.api.domain.subscription.usecase.`in`.UnsubscribeAllUseCaseIn
 import com.few.api.repo.dao.subscription.SubscriptionDao
 import com.few.api.repo.dao.subscription.command.UpdateDeletedAtInAllSubscriptionCommand
@@ -18,7 +18,8 @@ class UnsubscribeAllUseCase(
     fun execute(useCaseIn: UnsubscribeAllUseCaseIn) {
         // TODO: request sending email
 
-        val memberId = memberService.readMemberId(readMemberIdDto(useCaseIn.email))
+        val memberId =
+            memberService.readMemberId(ReadMemberIdDto(useCaseIn.email)) ?: throw RuntimeException("Member Not Found")
 
         subscriptionDao.updateDeletedAtInAllSubscription(
             UpdateDeletedAtInAllSubscriptionCommand(memberId = memberId, opinion = useCaseIn.opinion)

api/src/main/kotlin/com/few/api/domain/subscription/usecase/UnsubscribeWorkbookUseCase.kt

@@ -1,7 +1,7 @@
 package com.few.api.domain.subscription.usecase
 
 import com.few.api.domain.subscription.service.MemberService
-import com.few.api.domain.subscription.service.dto.readMemberIdDto
+import com.few.api.domain.subscription.service.dto.ReadMemberIdDto
 import com.few.api.repo.dao.subscription.SubscriptionDao
 import com.few.api.repo.dao.subscription.command.UpdateDeletedAtInWorkbookSubscriptionCommand
 import com.few.api.domain.subscription.usecase.`in`.UnsubscribeWorkbookUseCaseIn
@@ -18,7 +18,8 @@ class UnsubscribeWorkbookUseCase(
     fun execute(useCaseIn: UnsubscribeWorkbookUseCaseIn) {
         // TODO: request sending email
 
-        val memberId = memberService.readMemberId(readMemberIdDto(useCaseIn.email))
+        val memberId =
+            memberService.readMemberId(ReadMemberIdDto(useCaseIn.email)) ?: throw RuntimeException("Member Not Found")
 
         subscriptionDao.updateDeletedAtInWorkbookSubscription(
             UpdateDeletedAtInWorkbookSubscriptionCommand(

api/src/main/kotlin/com/few/api/domain/subscription/usecase/in/SubscribeWorkbookUseCaseIn.kt

@@ -2,6 +2,5 @@ package com.few.api.domain.subscription.usecase.`in`
 
 data class SubscribeWorkbookUseCaseIn(
     val workbookId: Long,
-    val email: String,
-    val memberId: Long
+    val email: String
 )

api/src/main/kotlin/com/few/api/web/controller/subscription/SubscriptionController.kt

@@ -30,7 +30,7 @@ class SubscriptionController(
         @RequestBody body: SubscribeWorkbookRequest
     ): ApiResponse<ApiResponse.Success> {
         subscribeWorkbookUseCase.execute(
-            SubscribeWorkbookUseCaseIn(workbookId = workbookId, email = body.email, memberId = 1L) // TODO: memberId
+            SubscribeWorkbookUseCaseIn(workbookId = workbookId, email = body.email) // TODO: memberId
         )
 
         return ApiResponseGenerator.success(HttpStatus.OK)

batch/src/.gitignore

@@ -0,0 +1,2 @@
+# DB schema migration path
+**/*.sql

data/src/main/kotlin/com/few/data/common/code/MemberType.kt

@@ -0,0 +1,13 @@
+package com.few.data.common.code
+
+enum class MemberType(val code: Byte, val displayName: String) {
+    NORMAL_USER(60, "일반유저"),
+    ADMIN_USER(0, "어드민유저"),
+    AUTHOR_USER(120, "작가유저");
+
+    companion object {
+        fun fromCode(code: Byte): MemberType? {
+            return values().find { it.code == code }
+        }
+    }
+}