[DVK-6] fix: 회원정보 수정 API에 이메일 추가

LeeSM0518 · LeeSM0518 · commit 9958fd19af75 · 2024-10-31T17:36:27.000+09:00
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/controller/MemberController.kt b/src/main/kotlin/com/devooks/backend/member/v1/controller/MemberController.kt
@@ -154,9 +154,11 @@ class MemberController(
         val requesterId: UUID = tokenService.getMemberId(Authorization(authorization))
         val command: ModifyProfileCommand = request.toCommand()
         val memberInfo: MemberInfo = memberInfoService.updateProfile(command, requesterId)
-        val categories: List<Category> = categoryService.getAll(command.favoriteCategoryIdList)
-        favoriteCategoryService.deleteByMemberId(requesterId)
-        favoriteCategoryService.save(categories, requesterId)
+        val categories = command.favoriteCategoryIdList?.let {
+            val categories: List<Category> = categoryService.getAll(it)
+            favoriteCategoryService.deleteByMemberId(requesterId)
+            favoriteCategoryService.save(categories, requesterId)
+        }.let { favoriteCategoryService.findByMemberId(requesterId) }
         return ModifyProfileResponse(memberInfo, categories)
     }
 
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/domain/MemberInfo.kt b/src/main/kotlin/com/devooks/backend/member/v1/domain/MemberInfo.kt
@@ -14,6 +14,7 @@ class MemberInfo(
     val accountNumber: String,
     val introduction: String,
     val phoneNumber: String,
+    val email: String,
 ) {
     companion object {
         fun MemberInfoEntity.toDomain(): MemberInfo =
@@ -28,6 +29,7 @@ class MemberInfo(
                 accountNumber = this.accountNumber,
                 introduction = this.introduction,
                 phoneNumber = this.phoneNumber,
+                email = this.email,
             )
     }
-}
+}
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/dto/ModifyProfileCommand.kt b/src/main/kotlin/com/devooks/backend/member/v1/dto/ModifyProfileCommand.kt
@@ -1,12 +1,13 @@
 package com.devooks.backend.member.v1.dto
 
-import java.util.UUID
+import java.util.*
 
 class ModifyProfileCommand(
-    val phoneNumber: String,
-    val blogLink: String,
-    val instagramLink: String,
-    val youtubeLink: String,
-    val introduction: String,
-    val favoriteCategoryIdList: List<UUID>,
+    val phoneNumber: String?,
+    val blogLink: String?,
+    val instagramLink: String?,
+    val youtubeLink: String?,
+    val introduction: String?,
+    val favoriteCategoryIdList: List<UUID>?,
+    val email: String?,
 )
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/dto/ModifyProfileRequest.kt b/src/main/kotlin/com/devooks/backend/member/v1/dto/ModifyProfileRequest.kt
@@ -1,6 +1,7 @@
 package com.devooks.backend.member.v1.dto
 
 import com.devooks.backend.member.v1.error.validateBlogLink
+import com.devooks.backend.member.v1.error.validateEmail
 import com.devooks.backend.member.v1.error.validateFavoriteCategoryIdList
 import com.devooks.backend.member.v1.error.validateInstagramLink
 import com.devooks.backend.member.v1.error.validateIntroduction
@@ -14,14 +15,16 @@ data class ModifyProfileRequest(
     val youtubeLink: String?,
     val introduction: String?,
     val favoriteCategoryIdList: List<String>?,
+    val email: String?,
 ) {
     fun toCommand(): ModifyProfileCommand =
         ModifyProfileCommand(
-            phoneNumber = phoneNumber.validatePhoneNumber(),
-            blogLink = blogLink.validateBlogLink(),
-            instagramLink = instagramLink.validateInstagramLink(),
-            youtubeLink = youtubeLink.validateYoutubeLink(),
-            introduction = introduction.validateIntroduction(),
-            favoriteCategoryIdList = favoriteCategoryIdList.validateFavoriteCategoryIdList()
+            phoneNumber = phoneNumber?.validatePhoneNumber(),
+            blogLink = blogLink?.validateBlogLink(),
+            instagramLink = instagramLink?.validateInstagramLink(),
+            youtubeLink = youtubeLink?.validateYoutubeLink(),
+            introduction = introduction?.validateIntroduction(),
+            favoriteCategoryIdList = favoriteCategoryIdList?.validateFavoriteCategoryIdList(),
+            email = email?.validateEmail(),
         )
 }
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/entity/MemberInfoEntity.kt b/src/main/kotlin/com/devooks/backend/member/v1/entity/MemberInfoEntity.kt
@@ -1,5 +1,6 @@
 package com.devooks.backend.member.v1.entity
 
+import com.devooks.backend.member.v1.dto.ModifyProfileCommand
 import java.util.*
 import org.springframework.data.annotation.Id
 import org.springframework.data.domain.Persistable
@@ -21,8 +22,19 @@ data class MemberInfoEntity(
     val accountNumber: String = "",
     val introduction: String = "",
     val phoneNumber: String = "",
+    val email: String = "",
 ) : Persistable<UUID> {
     override fun getId(): UUID? = id
 
     override fun isNew(): Boolean = id == null
-}
+
+    fun update(command: ModifyProfileCommand) =
+        copy(
+            phoneNumber = command.phoneNumber ?: this.phoneNumber,
+            blogLink = command.blogLink ?: this.blogLink,
+            instagramLink = command.instagramLink ?: this.instagramLink,
+            youtubeLink = command.youtubeLink ?: this.youtubeLink,
+            introduction = command.introduction ?: this.introduction,
+            email = command.email ?: this.email,
+        )
+}
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/error/MemberError.kt b/src/main/kotlin/com/devooks/backend/member/v1/error/MemberError.kt
@@ -23,6 +23,8 @@ enum class MemberError(val exception: GeneralException) {
     INVALID_FAVORITE_CATEGORIES(GeneralException("MEMBER-400-13", BAD_REQUEST, "잘못된 형식의 카테고리 식별자 입니다.")),
     REQUIRED_WITHDRAWAL_REASON(GeneralException("MEMBER-400-14", BAD_REQUEST, "탈퇴 이유가 반드시 필요합니다.")),
     INVALID_MEMBER_ID(GeneralException("MEMBER-400-15", BAD_REQUEST, "잘못된 형식의 회원 식별자 입니다.")),
+    REQUIRED_EMAIL(GeneralException("MEMBER-400-16", BAD_REQUEST, "이메일은 반드시 필요합니다.")),
+    INVALID_EMAIL(GeneralException("MEMBER-400-17", BAD_REQUEST, "잘못도니 형식의 이메일 입니다.")),
 
     // 403
     SUSPENDED_MEMBER(GeneralException("MEMBER-403-1", FORBIDDEN, "정지된 회원으로 서비스 이용이 불가합니다.")),
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/error/MemberValidation.kt b/src/main/kotlin/com/devooks/backend/member/v1/error/MemberValidation.kt
@@ -6,6 +6,7 @@ import com.devooks.backend.common.error.validateUUID
 import java.util.*
 
 private val phoneRegex = Regex("^[0-9]{2,3}-[0-9]{3,4}-[0-9]{3,4}$")
+val emailRegex = Regex("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$")
 
 fun String?.validateNickname(): String =
     validateNotBlank(MemberError.REQUIRED_NICKNAME.exception)
@@ -28,36 +29,27 @@ fun String?.validateAccountNumber(): String =
     validateNotBlank(MemberError.REQUIRED_ACCOUNT_NUMBER.exception)
 
 fun String?.validatePhoneNumber(): String =
-    validateNotNull(MemberError.REQUIRED_PHONE_NUMBER.exception)
-        .takeIf { it.isNotBlank() }
-        ?.also {
-            it.takeIf { phoneRegex.matches(it) }
-                ?: throw MemberError.INVALID_PHONE_NUMBER.exception
-        }
-        ?: ""
+    validateNotBlank(MemberError.REQUIRED_PHONE_NUMBER.exception)
+        .also { it.takeIf { phoneRegex.matches(it) } ?: throw MemberError.INVALID_PHONE_NUMBER.exception }
 
 fun String?.validateBlogLink(): String =
-    validateNotNull(MemberError.REQUIRED_BLOG_LINK.exception)
-        .takeIf { it.isNotBlank() }
-        ?: ""
+    validateNotBlank(MemberError.REQUIRED_BLOG_LINK.exception)
 
 fun String?.validateInstagramLink(): String =
-    validateNotNull(MemberError.REQUIRED_INSTAGRAM_LINK.exception)
-        .takeIf { it.isNotBlank() }
-        ?: ""
+    validateNotBlank(MemberError.REQUIRED_INSTAGRAM_LINK.exception)
 
 fun String?.validateYoutubeLink(): String =
-    validateNotNull(MemberError.REQUIRED_YOUTUBE_LINK.exception)
-        .takeIf { it.isNotBlank() }
-        ?: ""
+    validateNotBlank(MemberError.REQUIRED_YOUTUBE_LINK.exception)
 
 fun String?.validateIntroduction(): String =
-    validateNotNull(MemberError.REQUIRED_INTRODUCTION_LINK.exception)
-        .takeIf { it.isNotBlank() }
-        ?: ""
+    validateNotBlank(MemberError.REQUIRED_INTRODUCTION_LINK.exception)
 
 fun String?.validateWithdrawalReason(): String =
     validateNotBlank(MemberError.REQUIRED_WITHDRAWAL_REASON.exception)
 
 fun String?.validateMemberId(): UUID =
     validateUUID(MemberError.INVALID_MEMBER_ID.exception)
+
+fun String?.validateEmail(): String =
+    validateNotBlank(MemberError.REQUIRED_EMAIL.exception)
+        .also { it.takeIf { emailRegex.matches(it) } ?: throw MemberError.INVALID_EMAIL.exception }
diff --git a/src/main/kotlin/com/devooks/backend/member/v1/service/MemberInfoService.kt b/src/main/kotlin/com/devooks/backend/member/v1/service/MemberInfoService.kt
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service
 
 @Service
 class MemberInfoService(
-    private val memberInfoRepository: MemberInfoRepository
+    private val memberInfoRepository: MemberInfoRepository,
 ) {
 
     suspend fun create(member: Member): MemberInfo {
@@ -44,14 +44,7 @@ class MemberInfoService(
         requesterId: UUID,
     ): MemberInfo {
         val memberInfo = findMemberInfoById(requesterId)
-        val updateMemberInfo = memberInfo
-            .copy(
-                phoneNumber = command.phoneNumber,
-                blogLink = command.blogLink,
-                instagramLink = command.instagramLink,
-                youtubeLink = command.youtubeLink,
-                introduction = command.introduction
-            )
+        val updateMemberInfo = memberInfo.update(command)
         return memberInfoRepository.save(updateMemberInfo).toDomain()
     }
 
@@ -60,4 +53,4 @@ class MemberInfoService(
             .findByMemberId(requesterId)
             ?: throw MemberError.NOT_FOUND_MEMBER_INFO_BY_ID.exception
 
-}
+}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS member_info
     introduction   TEXT    NOT NULL,
     phone_number   VARCHAR NOT NULL,
     member_id      uuid    NOT NULL UNIQUE,
+    email          VARCHAR NOT NULL,
     CONSTRAINT fk_member_id FOREIGN KEY (member_id) REFERENCES member_info (member_id) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
diff --git a/src/test/kotlin/com/devooks/backend/member/v1/controller/MemberControllerTest.kt b/src/test/kotlin/com/devooks/backend/member/v1/controller/MemberControllerTest.kt
@@ -445,7 +445,8 @@ internal class MemberControllerTest @Autowired constructor(
                 instagramLink = "www.instagram.com",
                 youtubeLink = "www.youtube.com",
                 introduction = "hello",
-                favoriteCategoryIdList = listOf(categoryId)
+                favoriteCategoryIdList = listOf(categoryId),
+                email = "asd@naver.com"
             )
 
         postModifyProfile(tokenGroup, modifyProfileRequest)
@@ -756,6 +757,7 @@ internal class MemberControllerTest @Autowired constructor(
         assertThat(memberInfo.instagramLink).isEqualTo(modifyProfileRequest.instagramLink)
         assertThat(memberInfo.youtubeLink).isEqualTo(modifyProfileRequest.youtubeLink)
         assertThat(memberInfo.introduction).isEqualTo(modifyProfileRequest.introduction)
+        assertThat(memberInfo.email).isEqualTo(modifyProfileRequest.email)
         assertIterableEquals(favoriteCategories, modifyProfileRequest.favoriteCategoryIdList)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,8 @@ internal class MemberControllerTest @Autowired constructor(`
`445`	`445`	`instagramLink = "www.instagram.com",`
`446`	`446`	`youtubeLink = "www.youtube.com",`
`447`	`447`	`introduction = "hello",`
`448`		`- favoriteCategoryIdList = listOf(categoryId)`
	`448`	`+ favoriteCategoryIdList = listOf(categoryId),`
	`449`	`+ email = "asd@naver.com"`
`449`	`450`	`)`
`450`	`451`
`451`	`452`	`postModifyProfile(tokenGroup, modifyProfileRequest)`
`@@ -756,6 +757,7 @@ internal class MemberControllerTest @Autowired constructor(`
`756`	`757`	`assertThat(memberInfo.instagramLink).isEqualTo(modifyProfileRequest.instagramLink)`
`757`	`758`	`assertThat(memberInfo.youtubeLink).isEqualTo(modifyProfileRequest.youtubeLink)`
`758`	`759`	`assertThat(memberInfo.introduction).isEqualTo(modifyProfileRequest.introduction)`
	`760`	`+ assertThat(memberInfo.email).isEqualTo(modifyProfileRequest.email)`
`759`	`761`	`assertIterableEquals(favoriteCategories, modifyProfileRequest.favoriteCategoryIdList)`
`760`	`762`	`}`
`761`	`763`	`}`