Merge pull request #38 from Nexters/change/proposal-api

Change/proposal api

Author: JunRain2

docker/init.sql

@@ -47,7 +47,7 @@ CREATE TABLE IF NOT EXISTS gathering_member
 CREATE TABLE IF NOT EXISTS proposal
 (
     id           BIGINT AUTO_INCREMENT PRIMARY KEY,
-    gathering_id BIGINT       NOT NULL,
+    gathering_id BIGINT,
     member_id    BIGINT       NOT NULL,
     purpose      VARCHAR(255) NOT NULL,
     created_at   TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,

tuk-api/src/main/kotlin/nexters/tuk/application/auth/dto/response/AuthResponse.kt

@@ -1,17 +1,14 @@
 package nexters.tuk.application.auth.dto.response
 
-import io.swagger.v3.oas.annotations.media.Schema
 
 class AuthResponse {
-    @Schema(name = "LoginResponse")
     data class Login(
         val memberId: Long,
         val accessToken: String,
         val refreshToken: String,
         val isFirstLogin: Boolean,
     )
 
-    @Schema(name = "RefreshResponse")
     data class Refresh(
         val accessToken: String,
         val refreshToken: String,

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/GatheringProposalService.kt

@@ -0,0 +1,44 @@
+package nexters.tuk.application.gathering
+
+import nexters.tuk.application.gathering.dto.request.GatheringProposalCommand
+import nexters.tuk.application.proposal.ProposalMemberService
+import nexters.tuk.application.proposal.ProposalService
+import nexters.tuk.application.push.PushService
+import nexters.tuk.application.push.dto.request.PushCommand
+import nexters.tuk.contract.push.PushType
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+class GatheringProposalService(
+    private val proposalService: ProposalService,
+    private val gatheringMemberService: GatheringMemberService,
+    private val proposalMemberService: ProposalMemberService,
+    private val pushService: PushService,
+) {
+    @Transactional
+    fun addProposal(command: GatheringProposalCommand.AddProposal) {
+        gatheringMemberService.verifyGatheringAccess(
+            memberId = command.memberId,
+            gatheringId = command.gatheringId
+        )
+        proposalService.addGathering(
+            proposalId = command.proposalId,
+            gatheringId = command.gatheringId
+        )
+
+        val gatheringMembers = gatheringMemberService.getGatheringMemberIds(command.gatheringId)
+
+        proposalMemberService.publishGatheringMembers(
+            proposalId = command.proposalId,
+            memberIds = gatheringMembers
+        )
+
+        pushService.sendPush(
+            PushCommand.Push.Proposal(
+                pushType = PushType.PROPOSAL,
+                gatheringId = command.gatheringId
+            )
+        )
+    }
+}

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/dto/request/GatheringProposalCommand.kt

@@ -0,0 +1,10 @@
+package nexters.tuk.application.gathering.dto.request
+
+
+class GatheringProposalCommand {
+    data class AddProposal(
+        val memberId: Long,
+        val gatheringId: Long,
+        val proposalId: Long,
+    )
+}

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/dto/response/GatheringMemberResponse.kt

@@ -1,10 +1,8 @@
 package nexters.tuk.application.gathering.dto.response
 
-import io.swagger.v3.oas.annotations.media.Schema
 import java.time.LocalDateTime
 
 class GatheringMemberResponse {
-    @Schema(name = "JoinGatheringResponse")
     data class JoinGathering(
         val id: Long,
     )

tuk-api/src/main/kotlin/nexters/tuk/application/gathering/dto/response/GatheringResponse.kt

@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema
 import nexters.tuk.application.gathering.vo.RelativeTime
 
 class GatheringResponse {
-    @Schema(name = "GenerateResponse")
     data class Generate(
         @Schema(description = "생성된 모임 id")
         val gatheringId: Long,
@@ -16,7 +15,6 @@ class GatheringResponse {
         val intervalDays: Long,
     )
 
-    @Schema(name = "GatheringOverviewsResponse")
     data class GatheringOverviews(
         @Schema(description = "총 데이터 수")
         val totalCount: Int,
@@ -33,7 +31,6 @@ class GatheringResponse {
         )
     }
 
-    @Schema(name = "GatheringDetailResponse")
     data class GatheringDetail(
         @Schema(description = "모임 id")
         val gatheringId: Long,

tuk-api/src/main/kotlin/nexters/tuk/application/member/dto/response/MemberResponse.kt

@@ -19,7 +19,6 @@ class MemberResponse {
         val memberName: String,
     )
 
-    @Schema(name = "OnboardingResponse")
     data class Onboarding(
         val memberId: Long,
         val name: String

tuk-api/src/main/kotlin/nexters/tuk/application/onboarding/dto/response/OnboardingResponse.kt

@@ -1,15 +1,12 @@
 package nexters.tuk.application.onboarding.dto.response
 
-import io.swagger.v3.oas.annotations.media.Schema
 import nexters.tuk.application.onboarding.OnboardingField
 
 class OnboardingResponse {
-    @Schema(name = "OnboardingInitResponse")
     data class Init(
         val memberId: Long
     )
 
-    @Schema(name = "OnboardingRequiredFields")
     data class RequiredFields(
         val fields: List<OnboardingField>
     )

tuk-api/src/main/kotlin/nexters/tuk/application/proposal/ProposalCreateService.kt

@@ -1,41 +1,18 @@
 package nexters.tuk.application.proposal
 
-import nexters.tuk.application.gathering.GatheringMemberService
 import nexters.tuk.application.proposal.dto.request.ProposalCommand
 import nexters.tuk.application.proposal.dto.response.ProposalResponse
-import nexters.tuk.application.push.PushService
-import nexters.tuk.application.push.dto.request.PushCommand
-import nexters.tuk.contract.push.PushType
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class ProposalCreateService(
     private val proposalService: ProposalService,
-    private val proposalMemberService: ProposalMemberService,
-    private val gatheringMemberService: GatheringMemberService,
-    private val pushService: PushService,
 ) {
     @Transactional
     fun propose(command: ProposalCommand.Propose): ProposalResponse.Propose {
-        gatheringMemberService.verifyGatheringAccess(
-            memberId = command.memberId,
-            gatheringId = command.gatheringId
-        )
         val proposal = proposalService.propose(command)
-        val gatheringMembers = gatheringMemberService.getGatheringMemberIds(command.gatheringId)
 
-        proposalMemberService.publishGatheringMembers(
-            proposalId = proposal.proposalId,
-            memberIds = gatheringMembers
-        )
-
-        pushService.sendPush(
-            PushCommand.Push.Proposal(
-                pushType = PushType.PROPOSAL,
-                gatheringId = command.gatheringId
-            )
-        )
         return ProposalResponse.Propose(proposalId = proposal.proposalId)
     }
 }

tuk-api/src/main/kotlin/nexters/tuk/application/proposal/ProposalQueryService.kt

@@ -5,6 +5,7 @@ import nexters.tuk.application.proposal.dto.request.ProposalQuery
 import nexters.tuk.application.proposal.dto.response.ProposalResponse
 import nexters.tuk.contract.BaseException
 import nexters.tuk.contract.ErrorType
+import nexters.tuk.contract.SliceDto.SliceRequest
 import nexters.tuk.contract.SliceDto.SliceResponse
 import nexters.tuk.domain.proposal.ProposalQueryRepository
 import org.springframework.stereotype.Service
@@ -21,9 +22,15 @@ class ProposalQueryService(
 ) {
     @Transactional(readOnly = true)
     fun getMemberProposals(query: ProposalQuery.MemberProposals): SliceResponse<ProposalResponse.ProposalOverview> {
+        // 1-based pageNumber를 0-based로 변환
+        val repositoryPage = SliceRequest(
+            pageNumber = query.page.pageNumber - 1,
+            pageSize = query.page.pageSize
+        )
+        
         val memberProposals = proposalQueryRepository.findMemberProposals(
             memberId = query.memberId,
-            page = query.page
+            page = repositoryPage
         )
 
         val proposalOverviews = memberProposals.map {
@@ -40,11 +47,17 @@ class ProposalQueryService(
 
     @Transactional(readOnly = true)
     fun getGatheringProposals(query: ProposalQuery.GatheringProposals): SliceResponse<ProposalResponse.ProposalOverview> {
+        // 1-based pageNumber를 0-based로 변환
+        val repositoryPage = SliceRequest(
+            pageNumber = query.page.pageNumber - 1,
+            pageSize = query.page.pageSize
+        )
+        
         val gatheringProposals = proposalQueryRepository.findGatheringProposals(
             query.memberId,
             query.gatheringId,
             query.type,
-            query.page
+            repositoryPage
         )
 
         val proposalOverviews = gatheringProposals.map {