Merge pull request #24 from Nexters/fix/change-domain

Author: JunRain2

docker/init.sql

@@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS gathering_member
     INDEX idx_deleted_at (deleted_at)
 );
 
-CREATE TABLE IF NOT EXISTS invitation
+CREATE TABLE IF NOT EXISTS proposal
 (
     id           BIGINT AUTO_INCREMENT PRIMARY KEY,
     gathering_id BIGINT       NOT NULL,
@@ -58,8 +58,8 @@ CREATE TABLE IF NOT EXISTS invitation
     updated_at   TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     deleted_at   TIMESTAMP    NULL,
 
-    CONSTRAINT fk_invitation_gathering_id FOREIGN KEY (gathering_id) REFERENCES gathering (id),
-    CONSTRAINT fk_invitation_member_id FOREIGN KEY (member_id) REFERENCES member (id),
+    CONSTRAINT fk_proposal_gathering_id FOREIGN KEY (gathering_id) REFERENCES gathering (id),
+    CONSTRAINT fk_proposal_member_id FOREIGN KEY (member_id) REFERENCES member (id),
     INDEX idx_gathering_member (gathering_id, member_id),
     INDEX idx_deleted_at (deleted_at)
 );

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

@@ -3,7 +3,7 @@ package nexters.tuk.application.gathering
 import nexters.tuk.application.gathering.dto.request.GatheringQuery
 import nexters.tuk.application.gathering.dto.response.GatheringResponse
 import nexters.tuk.application.gathering.vo.RelativeTime
-import nexters.tuk.application.invitation.InvitationService
+import nexters.tuk.application.proposal.ProposalService
 import nexters.tuk.application.member.MemberService
 import nexters.tuk.domain.gathering.GatheringRepository
 import nexters.tuk.domain.gathering.findByIdOrThrow
@@ -15,7 +15,7 @@ import org.springframework.transaction.annotation.Transactional
 class GatheringQueryService(
     private val gatheringRepository: GatheringRepository,
     private val gatheringMemberService: GatheringMemberService,
-    private val invitationService: InvitationService,
+    private val proposalService: ProposalService,
     private val memberService: MemberService,
 ) {
     @Transactional(readOnly = true)
@@ -35,7 +35,7 @@ class GatheringQueryService(
     fun getGatheringDetail(query: GatheringQuery.GatheringDetail): GatheringResponse.GatheringDetail {
         gatheringMemberService.verifyGatheringAccess(query.gatheringId, query.memberId)
 
-        val invitationStat = invitationService.getGatheringInvitationStat(query.gatheringId, query.memberId)
+        val proposalStat = proposalService.getGatheringProposalStat(query.gatheringId, query.memberId)
 
         val gatheringMemberIds = gatheringMemberService.getGatheringMemberIds(query.gatheringId)
         val members = memberService.getMemberOverviews(gatheringMemberIds).map {
@@ -48,8 +48,8 @@ class GatheringQueryService(
             gatheringId = gatheringDetail.id,
             gatheringName = gatheringDetail.name,
             lastNotificationRelativeTime = RelativeTime.fromDays(0),
-            sentInvitationCount = invitationStat.sentCount,
-            receivedInvitationCount = invitationStat.receivedCount,
+            sentProposalCount = proposalStat.sentCount,
+            receivedProposalCount = proposalStat.receivedCount,
             members = members
         )
     }

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

@@ -35,10 +35,10 @@ class GatheringResponse {
         val gatheringName: String,
         @Schema(description = "상대 시간 타입 - \"오늘\", \"n일 전\", \"n주 전\", \"n개월 전\", \"n년 전\" ")
         val lastNotificationRelativeTime: RelativeTime,
-        @Schema(description = "보낸 초대장 수")
-        val sentInvitationCount: Int,
-        @Schema(description = "받은 초대장 수")
-        val receivedInvitationCount: Int,
+        @Schema(description = "보낸 제안 수")
+        val sentProposalCount: Int,
+        @Schema(description = "받은 제안 수")
+        val receivedProposalCount: Int,
         @Schema(description = "모임원")
         val members: List<MemberOverview>
     ) {

tuk-api/src/main/kotlin/nexters/tuk/application/invitation/InvitationService.kt

@@ -0,0 +1,25 @@
+package nexters.tuk.application.proposal
+
+import nexters.tuk.application.proposal.dto.response.ProposalResponse
+import nexters.tuk.domain.gathering.GatheringRepository
+import nexters.tuk.domain.gathering.findByIdOrThrow
+import nexters.tuk.domain.proposal.ProposalRepository
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+class ProposalService(
+    private val proposalRepository: ProposalRepository,
+    private val gatheringRepository: GatheringRepository,
+) {
+    @Transactional(readOnly = true)
+    fun getGatheringProposalStat(gatheringId: Long, memberId: Long): ProposalResponse.ProposalStat {
+        val gathering = gatheringRepository.findByIdOrThrow(gatheringId)
+        val proposals = proposalRepository.findByGathering(gathering).toList()
+
+        val sentCount = proposals.count { it.proposerId == memberId }
+        val receivedCount = proposals.size - sentCount
+
+        return ProposalResponse.ProposalStat(sentCount, receivedCount)
+    }
+}

tuk-api/src/main/kotlin/nexters/tuk/application/invitation/dto/response/InvitationResponse.kt

@@ -0,0 +1,12 @@
+package nexters.tuk.application.proposal.dto.response
+
+import io.swagger.v3.oas.annotations.media.Schema
+
+class ProposalResponse {
+    data class ProposalStat(
+        @Schema(description = "보낸 제안 수")
+        val sentCount: Int,
+        @Schema(description = "받은 제안 수")
+        val receivedCount: Int,
+    )
+}

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

@@ -0,0 +1,32 @@
+package nexters.tuk.domain.proposal
+
+import jakarta.persistence.*
+import nexters.tuk.domain.BaseEntity
+import nexters.tuk.domain.gathering.Gathering
+import org.hibernate.annotations.SQLRestriction
+
+// FIXME: 모임 생성을 위한 임시 제안 엔티티
+@SQLRestriction("deleted_at is NULL")
+@Table(name = "proposal")
+@Entity
+class Proposal(
+    @Column(name = "member_id", nullable = false)
+    val proposerId: Long,
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "gathering_id", nullable = false)
+    val gathering: Gathering,
+
+    @Column(nullable = false)
+    val purpose: String,
+) : BaseEntity() {
+    companion object {
+        fun publish(gathering: Gathering, proposerId: Long, purpose: String): Proposal {
+            return Proposal(
+                proposerId = proposerId,
+                gathering = gathering,
+                purpose = purpose
+            )
+        }
+    }
+}