ASAP-409 IndexedSpace, Space 도메인에 isMain 프로퍼티 적용 및 isMain 여부 수정 api 추가

tlarbals824 · tlarbals824 · commit b04c1adbb1b6 · 2025-02-08T22:02:36.000+09:00
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/port/in/UpdateSpaceIndexUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/space/port/in/UpdateSpaceIndexUsecase.kt
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/port/in/UpdateSpaceUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/space/port/in/UpdateSpaceUsecase.kt
@@ -0,0 +1,25 @@
+package com.asap.application.space.port.`in`
+
+interface UpdateSpaceUsecase {
+    fun update(command: Command.Index)
+
+    fun update(command: Command.Main)
+
+
+    sealed class Command {
+        data class Index(
+            val userId: String,
+            val orders: List<SpaceOrder>,
+        ) : Command()
+
+        data class SpaceOrder(
+            val spaceId: String,
+            val index: Int,
+        )
+
+        data class Main(
+            val userId: String,
+            val spaceId: String,
+        ) : Command()
+    }
+}
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceCommandService.kt b/Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceCommandService.kt
@@ -3,8 +3,8 @@ package com.asap.application.space.service
 import com.asap.application.space.exception.SpaceException
 import com.asap.application.space.port.`in`.CreateSpaceUsecase
 import com.asap.application.space.port.`in`.DeleteSpaceUsecase
-import com.asap.application.space.port.`in`.UpdateSpaceIndexUsecase
 import com.asap.application.space.port.`in`.UpdateSpaceNameUsecase
+import com.asap.application.space.port.`in`.UpdateSpaceUsecase
 import com.asap.application.space.port.out.SpaceManagementPort
 import com.asap.common.exception.DefaultException
 import com.asap.domain.common.DomainId
@@ -20,7 +20,7 @@ class SpaceCommandService(
 ) : CreateSpaceUsecase,
     UpdateSpaceNameUsecase,
     DeleteSpaceUsecase,
-    UpdateSpaceIndexUsecase {
+    UpdateSpaceUsecase {
     private val spaceIndexValidator: SpaceIndexValidator = SpaceIndexValidator()
 
     override fun create(command: CreateSpaceUsecase.Command) {
@@ -76,7 +76,7 @@ class SpaceCommandService(
         }
     }
 
-    override fun update(command: UpdateSpaceIndexUsecase.Command) {
+    override fun update(command: UpdateSpaceUsecase.Command.Index) {
         val indexedSpaces = spaceManagementPort.getAllIndexedSpace(DomainId(command.userId))
         val changeIndexMap = command.orders.associateBy({ DomainId(it.spaceId) }, { it.index })
 
@@ -107,4 +107,8 @@ class SpaceCommandService(
                 spaceManagementPort.update(indexedSpace)
             }
     }
+
+    override fun update(command: UpdateSpaceUsecase.Command.Main) {
+        TODO("Not yet implemented")
+    }
 }
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceQueryService.kt b/Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceQueryService.kt
@@ -47,7 +47,7 @@ class SpaceQueryService(
                     GetSpaceUsecase.SpaceDetail(
                         spaceName = it.name,
                         letterCount = spaceLetterManagementPort.countSpaceLetterBy(it.id, DomainId(query.userId)),
-                        isMainSpace = it.isMain(),
+                        isMainSpace = it.isMain,
                         spaceIndex = it.index,
                         spaceId = it.id.value,
                     )
diff --git a/Application-Module/src/test/kotlin/com/asap/application/space/service/SpaceCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/space/service/SpaceCommandServiceTest.kt
@@ -3,8 +3,8 @@ package com.asap.application.space.service
 import com.asap.application.space.exception.SpaceException
 import com.asap.application.space.port.`in`.CreateSpaceUsecase
 import com.asap.application.space.port.`in`.DeleteSpaceUsecase
-import com.asap.application.space.port.`in`.UpdateSpaceIndexUsecase
 import com.asap.application.space.port.`in`.UpdateSpaceNameUsecase
+import com.asap.application.space.port.`in`.UpdateSpaceUsecase
 import com.asap.application.space.port.out.SpaceManagementPort
 import com.asap.domain.common.DomainId
 import com.asap.domain.space.entity.IndexedSpace
@@ -114,12 +114,12 @@ class SpaceCommandServiceTest :
 
         given("스페이스 인덱스 수정 요청이 들어올 때") {
             val spaceUpdateIndexCommand =
-                UpdateSpaceIndexUsecase.Command(
+                UpdateSpaceUsecase.Command.Index(
                     userId = "userId",
                     orders =
                         listOf(
-                            UpdateSpaceIndexUsecase.Command.SpaceOrder("spaceId1", 1),
-                            UpdateSpaceIndexUsecase.Command.SpaceOrder("spaceId2", 0),
+                            UpdateSpaceUsecase.Command.SpaceOrder("spaceId1", 1),
+                            UpdateSpaceUsecase.Command.SpaceOrder("spaceId2", 0),
                         ),
                 )
             val indexedSpaces =
@@ -159,13 +159,13 @@ class SpaceCommandServiceTest :
             }
 
             val invalidCommand =
-                UpdateSpaceIndexUsecase.Command(
+                UpdateSpaceUsecase.Command.Index(
                     userId = "userId",
                     orders =
                         listOf(
-                            UpdateSpaceIndexUsecase.Command.SpaceOrder("spaceId1", 1),
-                            UpdateSpaceIndexUsecase.Command.SpaceOrder("spaceId2", 2),
-                            UpdateSpaceIndexUsecase.Command.SpaceOrder("spaceId3", 3),
+                            UpdateSpaceUsecase.Command.SpaceOrder("spaceId1", 1),
+                            UpdateSpaceUsecase.Command.SpaceOrder("spaceId2", 2),
+                            UpdateSpaceUsecase.Command.SpaceOrder("spaceId3", 3),
                         ),
                 )
             every {
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/api/SpaceApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/api/SpaceApi.kt
@@ -114,6 +114,21 @@ interface SpaceApi {
         @AccessUser userId: String,
     )
 
+    @Operation(summary = "메인 스페이스 변경")
+    @PutMapping("/{spaceId}/main")
+    @ApiResponses(
+        value = [
+            ApiResponse(
+                responseCode = "200",
+                description = "메인 스페이스 변경 성공",
+            ),
+        ],
+    )
+    fun updateSpaceMain(
+        @PathVariable spaceId: String,
+        @AccessUser userId: String,
+    )
+
     @Operation(summary = "여러 스페이스 삭제")
     @DeleteMapping
     @ApiResponses(
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/controller/SpaceController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/space/controller/SpaceController.kt
@@ -12,7 +12,7 @@ class SpaceController(
     private val updateSpaceNameUsecase: UpdateSpaceNameUsecase,
     private val getSpaceUsecase: GetSpaceUsecase,
     private val deleteSpaceUsecase: DeleteSpaceUsecase,
-    private val updateSpaceIndexUsecase: UpdateSpaceIndexUsecase,
+    private val updateSpaceUsecase: UpdateSpaceUsecase,
 ) : SpaceApi {
     override fun getMainSpace(userId: String): MainSpaceInfoResponse {
         val response =
@@ -83,14 +83,18 @@ class SpaceController(
         request: UpdateSpaceOrderRequest,
         userId: String,
     ) {
-        updateSpaceIndexUsecase.update(
-            UpdateSpaceIndexUsecase.Command(
+        updateSpaceUsecase.update(
+            UpdateSpaceUsecase.Command.Index(
                 userId = userId,
-                orders = request.orders.map { UpdateSpaceIndexUsecase.Command.SpaceOrder(it.spaceId, it.index) },
+                orders = request.orders.map { UpdateSpaceUsecase.Command.SpaceOrder(it.spaceId, it.index) },
             ),
         )
     }
 
+    override fun updateSpaceMain(spaceId: String, userId: String) {
+
+    }
+
     override fun deleteSpaces(
         request: DeleteMultipleSpacesRequest,
         userId: String,
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/space/controller/SpaceControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/space/controller/SpaceControllerTest.kt
@@ -33,7 +33,7 @@ class SpaceControllerTest : AcceptanceSupporter() {
     lateinit var deleteSpaceUsecase: DeleteSpaceUsecase
 
     @MockBean
-    lateinit var updateSpaceIndexUsecase: UpdateSpaceIndexUsecase
+    lateinit var updateSpaceUsecase: UpdateSpaceUsecase
 
     @Test
     fun getMainSpaceId() {
@@ -293,4 +293,20 @@ class SpaceControllerTest : AcceptanceSupporter() {
             }
         }
     }
+
+    @Test
+    fun updateSpaceMain() {
+        // given
+        val accessToken = jwtMockManager.generateAccessToken()
+        val spaceId = "spaceId"
+        // when
+        val response =
+            mockMvc.put("/api/v1/spaces/$spaceId/main") {
+                header("Authorization", "Bearer $accessToken")
+            }
+        // then
+        response.andExpect {
+            status { isOk() }
+        }
+    }
 }
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt
@@ -1,28 +1,30 @@
 package com.asap.bootstrap.integration.space
 
 import com.asap.application.space.SpaceMockManager
+import com.asap.application.space.port.out.SpaceManagementPort
 import com.asap.bootstrap.IntegrationSupporter
 import com.asap.bootstrap.web.space.dto.CreateSpaceRequest
 import com.asap.bootstrap.web.space.dto.DeleteMultipleSpacesRequest
 import com.asap.bootstrap.web.space.dto.UpdateSpaceNameRequest
 import com.asap.bootstrap.web.space.dto.UpdateSpaceOrderRequest
+import com.asap.domain.common.DomainId
 import io.kotest.matchers.maps.haveValue
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.haveLength
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.MediaType
 import org.springframework.test.web.servlet.delete
 import org.springframework.test.web.servlet.get
 import org.springframework.test.web.servlet.post
 import org.springframework.test.web.servlet.put
 import java.util.*
 
-class SpaceApiIntegrationTest : IntegrationSupporter() {
-    @Autowired
-    lateinit var spaceMockManager: SpaceMockManager
+class SpaceApiIntegrationTest(
+    private val spaceMockManager: SpaceMockManager,
+    private val spaceManagementPort: SpaceManagementPort
+) : IntegrationSupporter() {
 
     @Nested
     inner class GetMainSpace {
@@ -190,26 +192,31 @@ class SpaceApiIntegrationTest : IntegrationSupporter() {
         }
     }
 
-    @Test
-    fun updateSpaceName() {
-        // given
-        val userId = userMockManager.settingUser()
-        val accessToken = jwtMockManager.generateAccessToken(userId)
-        val spaceId = spaceMockManager.settingSpace(userId).id.value
-        val request =
-            UpdateSpaceNameRequest(
-                spaceName = "change space name",
-            )
-        // when
-        val response =
-            mockMvc.put("/api/v1/spaces/$spaceId/name") {
-                contentType = MediaType.APPLICATION_JSON
-                content = objectMapper.writeValueAsString(request)
-                header("Authorization", "Bearer $accessToken")
+
+    @Nested
+    @DisplayName("updateSpaceName")
+    inner class UpdateSpaceName{
+        @Test
+        fun updateSpaceName() {
+            // given
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+            val spaceId = spaceMockManager.settingSpace(userId).id.value
+            val request =
+                UpdateSpaceNameRequest(
+                    spaceName = "change space name",
+                )
+            // when
+            val response =
+                mockMvc.put("/api/v1/spaces/$spaceId/name") {
+                    contentType = MediaType.APPLICATION_JSON
+                    content = objectMapper.writeValueAsString(request)
+                    header("Authorization", "Bearer $accessToken")
+                }
+            // then
+            response.andExpect {
+                status { isOk() }
             }
-        // then
-        response.andExpect {
-            status { isOk() }
         }
     }
 
@@ -612,4 +619,35 @@ class SpaceApiIntegrationTest : IntegrationSupporter() {
             }
         }
     }
+
+    @Nested
+    @DisplayName("updateSpaceMain")
+    inner class UpdateSpaceMain{
+        @Test
+        fun updateSpaceMain() {
+            // given
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+            val spaceId = spaceMockManager.settingSpace(userId).id.value
+            (0..2).forEach {
+                spaceMockManager.settingSpace(userId)
+            }
+            // when
+            val response =
+                mockMvc.put("/api/v1/spaces/$spaceId/main") {
+                    header("Authorization", "Bearer $accessToken")
+                }
+            // then
+            response.andExpect {
+                status { isOk() }
+            }
+            spaceManagementPort.getAllSpaceBy(DomainId(userId)).forEach {
+                if(it.id.value == spaceId) {
+                    it.isMain shouldBe true
+                }else{
+                    it.isMain shouldBe false
+                }
+            }
+        }
+    }
 }
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/IndexedSpace.kt b/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/IndexedSpace.kt
@@ -9,9 +9,8 @@ class IndexedSpace(
     val name: String,
     var index: Int,
     val templateType: Int,
+    var isMain: Boolean = false,
 ) : Aggregate<IndexedSpace>(id) {
-    fun isMain(): Boolean = index == 0
-
     fun updateIndex(index: Int) {
         check(index >= 0) { "Index must be greater than or equal to 0" }
         this.index = index
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/Space.kt b/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/Space.kt
@@ -9,6 +9,7 @@ class Space(
     val userId: DomainId,
     var name: String,
     val templateType: Int,
+    var isMain: Boolean = false,
 ) : Aggregate<Space>(id) {
     companion object {
         fun create(

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class SpaceQueryService(`
`47`	`47`	`GetSpaceUsecase.SpaceDetail(`
`48`	`48`	`spaceName = it.name,`
`49`	`49`	`letterCount = spaceLetterManagementPort.countSpaceLetterBy(it.id, DomainId(query.userId)),`
`50`		`- isMainSpace = it.isMain(),`
	`50`	`+ isMainSpace = it.isMain,`
`51`	`51`	`spaceIndex = it.index,`
`52`	`52`	`spaceId = it.id.value,`
`53`	`53`	`)`