Merge pull request #42 from FC-InnerCircle/main

stage deploy
FC-InnerCircle-ICD1 · Sep 15, 2024 · 0d35fd4 · 0d35fd4
2 parents a264615 + 2c117a6
commit 0d35fd4
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 21 deletions.
diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/application/MemberInfoFacade.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/application/MemberInfoFacade.kt
@@ -24,10 +24,12 @@ class MemberInfoFacade(
     }
 
     @Transactional
-    fun deleteMember(id: String) {
+    fun deleteMember(id: String): Long {
         val member = getMemberInfo(id)
         memberUseCase.deleteMember(id)
         externalUseCase.sendDeleteMemberRequest(member.memberId!!)
+
+        return member.memberId!!
     }
 
     fun getAddresses(memberId: String): List<Address> {

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/domain/Address.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/domain/Address.kt
@@ -8,7 +8,7 @@ class Address(
     @Id val addressId: Long? = 0,
     val memberId: String,
     val address: String,
-    val detail: String,
+    val addressDetail: String,
     val latitude: Double,
     val longitude: Double,
     val zipCode: String,
@@ -19,7 +19,7 @@ class Address(
             addressId = this.addressId,
             memberId = this.memberId,
             address = this.address,
-            detail = this.detail,
+            addressDetail = this.addressDetail,
             latitude = this.latitude,
             longitude = this.longitude,
             zipCode = this.zipCode,

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/domain/MemberService.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/domain/MemberService.kt
@@ -67,7 +67,7 @@ class MemberService(
             addressId = addressId,
             memberId = address.memberId,
             address = address.address,
-            detail = address.detail,
+            addressDetail = address.addressDetail,
             longitude = address.longitude,
             latitude = address.latitude,
             zipCode = address.zipCode,

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/api/AddressController.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/api/AddressController.kt
@@ -36,7 +36,7 @@ class AddressController(
                 AddressResponseItem(
                     addressId = address.addressId!!,
                     address = address.address,
-                    detail = address.detail,
+                    addressDetail = address.addressDetail,
                     latitude = address.latitude,
                     longitude = address.longitude,
                     zipCode = address.zipCode,

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/api/MemberInfoController.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/api/MemberInfoController.kt
@@ -2,6 +2,7 @@ package org.inner.circle.o2oserver.member.presentation.api
 
 import org.inner.circle.o2oserver.commons.response.BaseResponse
 import org.inner.circle.o2oserver.member.application.MemberInfoFacade
+import org.inner.circle.o2oserver.member.presentation.dto.MemberIdResponse
 import org.inner.circle.o2oserver.member.presentation.dto.MemberInfoResponse
 import org.inner.circle.o2oserver.member.presentation.dto.MemberRequest
 import org.slf4j.LoggerFactory
@@ -47,17 +48,17 @@ class MemberInfoController(
         val address = MemberRequest.MemberInfo.toAddress(createRequest, memberId)
         memberInfoFacade.createMemberInfo(memberInfo, address)
 
-        return BaseResponse.success(Any())
+        return BaseResponse.success(Unit)
     }
 
     @DeleteMapping
     override fun deleteMember(
         @AuthenticationPrincipal userDetails: UserDetails,
-    ): BaseResponse<Any> {
-        val memberId = userDetails.username
-        log.info("Delete member ID: $memberId")
-        memberInfoFacade.deleteMember(memberId)
+    ): BaseResponse<MemberIdResponse> {
+        val id = userDetails.username
+        log.info("Delete member ID: $id")
+        val memberId = memberInfoFacade.deleteMember(id)
 
-        return BaseResponse.success(Any())
+        return BaseResponse.success(MemberIdResponse(memberId))
     }
 }
diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/api/MemberInfoDoc.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/api/MemberInfoDoc.kt
@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.responses.ApiResponses
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.inner.circle.o2oserver.commons.response.BaseResponse
+import org.inner.circle.o2oserver.member.presentation.dto.MemberIdResponse
 import org.inner.circle.o2oserver.member.presentation.dto.MemberInfoResponse
 import org.inner.circle.o2oserver.member.presentation.dto.MemberRequest
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
@@ -58,13 +59,13 @@ interface MemberInfoDoc {
             content = [
                 Content(
                     mediaType = APPLICATION_JSON_VALUE,
-                    schema = Schema(implementation = Map::class),
+                    schema = Schema(implementation = MemberIdResponse::class),
                 ),
             ],
             description = "회원 정보 삭제 성공",
         ),
     )
     fun deleteMember(
         @AuthenticationPrincipal userDetails: UserDetails,
-    ): BaseResponse<Any>
+    ): BaseResponse<MemberIdResponse>
 }
diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/AddressRequest.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/AddressRequest.kt
@@ -5,7 +5,7 @@ import org.inner.circle.o2oserver.member.domain.Address
 class AddressRequest {
     data class CreateAddress(
         val address: String,
-        val detail: String,
+        val addressDetail: String,
         val latitude: Double,
         val longitude: Double,
         val zipCode: String,
@@ -15,7 +15,7 @@ class AddressRequest {
                 return Address(
                     memberId = memberId,
                     address = createAddress.address,
-                    detail = createAddress.detail,
+                    addressDetail = createAddress.addressDetail,
                     latitude = createAddress.latitude,
                     longitude = createAddress.longitude,
                     zipCode = createAddress.zipCode,

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/AddressResponse.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/AddressResponse.kt
@@ -7,7 +7,7 @@ data class GetAddressResponse(
 data class AddressResponseItem(
     val addressId: Long,
     val address: String,
-    val detail: String,
+    val addressDetail: String,
     val latitude: Double,
     val longitude: Double,
     val zipCode: String,

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/MemberRequest.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/MemberRequest.kt
@@ -18,7 +18,7 @@ class MemberRequest {
                 return Address(
                     memberId = memberId,
                     address = memberInfo.address.address,
-                    detail = memberInfo.address.detailAddress,
+                    addressDetail = memberInfo.address.addressDetail,
                     latitude = memberInfo.address.latitude,
                     longitude = memberInfo.address.longitude,
                     zipCode = memberInfo.address.zipCode,
@@ -29,7 +29,7 @@ class MemberRequest {
 
         data class AddressRequest(
             val address: String,
-            val detailAddress: String,
+            val addressDetail: String,
             val latitude: Double,
             val longitude: Double,
             val zipCode: String,

diff --git a/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/MemberResponse.kt b/src/main/kotlin/org/inner/circle/o2oserver/member/presentation/dto/MemberResponse.kt
@@ -6,3 +6,7 @@ data class MemberInfoResponse(
     val contact: String,
     val nickName: String,
 )
+
+data class MemberIdResponse(
+    val memberId: Long,
+)
diff --git a/src/test/kotlin/org/inner/circle/o2oserver/member/presentation/api/AddressControllerTest.kt b/src/test/kotlin/org/inner/circle/o2oserver/member/presentation/api/AddressControllerTest.kt
@@ -39,7 +39,7 @@ class AddressControllerTest {
         val mockAddress = Address(
             memberId = "605c72b8f9a5b812dcd81458",
             address = "Seoul",
-            detail = "Some detail",
+            addressDetail = "Some detail",
             latitude = 37.5665,
             longitude = 126.9780,
             zipCode = "12345",
@@ -60,7 +60,7 @@ class AddressControllerTest {
     fun createAddress() {
         val createAddressRequest = AddressRequest.CreateAddress(
             address = "Seoul",
-            detail = "Some detail",
+            addressDetail = "Some detail",
             latitude = 37.5665,
             longitude = 126.9780,
             zipCode = "12345",

diff --git a/...est/kotlin/org/inner/circle/o2oserver/member/presentation/api/MemberInfoControllerTest.kt b/...est/kotlin/org/inner/circle/o2oserver/member/presentation/api/MemberInfoControllerTest.kt
@@ -63,7 +63,7 @@ class MemberInfoControllerTest {
             contact = "010-1234-5678",
             address = MemberRequest.MemberInfo.AddressRequest(
                 address = "서울시 강남구",
-                detailAddress = "테스트 주소",
+                addressDetail = "테스트 주소",
                 latitude = 37.123456,
                 longitude = 127.123456,
                 zipCode = "12345",