[Deploy]: 운영서버 배포 24/02/21

.github/workflows/DeployOnPRD.yml

@@ -0,0 +1,86 @@
+name: Deploy on STG Server (Amazon ECS)
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [release]
+
+env:
+  AWS_REGION: ap-northeast-2
+  ECR_REPOSITORY: community-prd
+  ECS_SERVICE: community-service
+  ECS_CLUSTER: gloddy-ecs-prd
+  ECS_TASK_DEFINITION: task-definition-prd.json
+
+  CONTAINER_NAME: springboot
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew clean :bootstrap:bootJar
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ECS_ACCESS }}
+          aws-secret-access-key: ${{ secrets.AWS_ECS_SECRET }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build, tag, and push image to Amazon ECR
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: latest
+        run: |
+          docker build -f Dockerfile_PRD -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+      - name: Fill in the new image ID in the Amazon ECS task definition
+        id: task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: ${{ env.ECS_TASK_DEFINITION }}
+          container-name: ${{ env.CONTAINER_NAME }}
+          image: ${{ steps.build-image.outputs.image }}
+
+      - name: Deploy Amazon ECS task definition
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+        with:
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: ${{ env.ECS_SERVICE }}
+          cluster: ${{ env.ECS_CLUSTER }}
+          wait-for-service-stability: true

.github/workflows/DeployOnSTG.yml

@@ -1,4 +1,4 @@
-name: Deploy on STG Server (Amazon ECS)
+name: Deploy on PRD Server (Amazon ECS)
 
 on:
   pull_request:

Dockerfile_PRD

@@ -0,0 +1,17 @@
+FROM openjdk:17.0-slim
+
+ARG PROJECT_DIRECTORY=/build
+WORKDIR $PROJECT_DIRECTORY
+
+ARG JAR_FILE_PATH=bootstrap/build/libs/bootstrap-0.0.1-SNAPSHOT.jar
+COPY ${JAR_FILE_PATH} app.jar
+
+ENV TZ=Asia/Seoul
+
+EXPOSE 8080
+
+RUN apt-get update && apt-get install -y curl wget \
+  && wget -O dd-java-agent.jar 'https://dtdg.co/latest-java-tracer' \
+  && rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["java", "-javaagent:dd-java-agent.jar", "-Ddd.profiling.enabled=true", "-XX:FlightRecorderOptions=stackdepth=256", "-Ddd.appsec.enabled=true", "-Ddd.iast.enabled=true", "-Ddd.logs.injection=true", "-Ddd.jmxfetch.enabled=true", "-Ddd.service=gloddy-community", "-Ddd.env=production", "-jar", "app.jar"]

Dockerfile_STG

@@ -14,4 +14,4 @@ RUN apt-get update && apt-get install -y curl wget \
   && wget -O dd-java-agent.jar 'https://dtdg.co/latest-java-tracer' \
   && rm -rf /var/lib/apt/lists/*
 
-ENTRYPOINT ["sh", "-c", "export TOKEN=$(curl -X PUT \"http://169.254.169.254/latest/api/token\" -H \"X-aws-ec2-metadata-token-ttl-seconds: 21600\") && export DD_AGENT_HOST=$(curl -H \"X-aws-ec2-metadata-token: $TOKEN\" http://169.254.169.254/latest/meta-data/local-ipv4) && java -javaagent:dd-java-agent.jar -Ddd.profiling.enabled=true -XX:FlightRecorderOptions=stackdepth=256 -Ddd.appsec.enabled=true -Ddd.iast.enabled=true -Ddd.logs.injection=true -Ddd.jmxfetch.enabled=true -Ddd.service=gloddy-community -Ddd.env=staging -jar app.jar"]
+ENTRYPOINT ["java", "-javaagent:dd-java-agent.jar", "-Ddd.profiling.enabled=true", "-XX:FlightRecorderOptions=stackdepth=256", "-Ddd.appsec.enabled=true", "-Ddd.iast.enabled=true", "-Ddd.logs.injection=true", "-Ddd.jmxfetch.enabled=true", "-Ddd.service=gloddy-community", "-Ddd.env=staging", "-jar", "app.jar"]

community-application/src/main/kotlin/gloddy/article/port/in/ArticleCommandUseCase.kt

@@ -1,10 +1,12 @@
 package gloddy.article.port.`in`
 
 import gloddy.article.port.`in`.dto.command.ArticleCreateRequest
+import gloddy.article.port.`in`.dto.command.ArticleUpsertCommentRequest
 import gloddy.article.port.`in`.dto.read.ArticleCreateResponse
 
 interface ArticleCommandUseCase {
     fun create(userId: Long, command: ArticleCreateRequest): ArticleCreateResponse
     fun delete(userId: Long, articleId: Long)
     fun upsertLike(userId: Long, articleId: Long)
+    fun upsertComment(request: ArticleUpsertCommentRequest)
 }

community-application/src/main/kotlin/gloddy/article/port/in/dto/command/ArticleUpsertCommentRequest.kt

@@ -0,0 +1,10 @@
+package gloddy.article.port.`in`.dto.command
+
+data class ArticleUpsertCommentRequest(
+    val articleId: Long,
+    val status: CommentStatus
+)
+
+enum class CommentStatus {
+    CREATE, DELETE
+}

community-application/src/main/kotlin/gloddy/article/service/ArticleCommandService.kt

@@ -5,6 +5,8 @@ import gloddy.article.ArticleLike
 import gloddy.article.port.`in`.dto.command.ArticleCreateRequest
 import gloddy.article.port.`in`.dto.read.ArticleCreateResponse
 import gloddy.article.port.`in`.ArticleCommandUseCase
+import gloddy.article.port.`in`.dto.command.ArticleUpsertCommentRequest
+import gloddy.article.port.`in`.dto.command.CommentStatus
 import gloddy.article.port.out.ArticleCommandPersistencePort
 import gloddy.article.port.out.ArticleLikeCommandPersistencePort
 import gloddy.article.port.out.ArticleLikeQueryPersistencePort
@@ -19,7 +21,6 @@ class ArticleCommandService(
     private val categoryQueryPersistencePort: CategoryQueryPersistencePort,
     private val articleQueryPersistencePort: ArticleQueryPersistencePort,
     private val articleCommandPersistencePort: ArticleCommandPersistencePort,
-    private val articleLikeCommandPersistencePort: ArticleLikeCommandPersistencePort,
     private val articleLikeQueryPersistencePort: ArticleLikeQueryPersistencePort,
 ) : ArticleCommandUseCase {
 
@@ -60,4 +61,12 @@ class ArticleCommandService(
                 article = article.like()
             )
     }
+
+    override fun upsertComment(request: ArticleUpsertCommentRequest) {
+        val article = articleQueryPersistencePort.findById(request.articleId)
+        when(request.status) {
+            CommentStatus.CREATE -> articleCommandPersistencePort.save(article.comment())
+            CommentStatus.DELETE -> articleCommandPersistencePort.save(article.unComment())
+        }
+    }
 }

community-application/src/main/kotlin/gloddy/article/service/ArticleQueryService.kt

@@ -48,7 +48,7 @@ class ArticleQueryService(
             id = request.id,
             userId = request.userId
         )
-        val userPreviewUnit = userQueryPort.getUserPreviewUnit(request.userId)
+        val userPreviewUnit = userQueryPort.getUserPreviewUnit(articleDetailUnit.userId)
         return ArticleDetailResponse(
             article = articleDetailUnit,
             writer = userPreviewUnit

community-application/src/main/kotlin/gloddy/comment/dto/ChildCommentGetRequest.kt

@@ -0,0 +1,6 @@
+package gloddy.comment.dto
+
+data class ChildCommentGetRequest(
+    val parentId: Long,
+    val userId: Long
+)

community-application/src/main/kotlin/gloddy/comment/dto/CommentChildUpsertRequest.kt

@@ -0,0 +1,9 @@
+package gloddy.comment.dto
+
+import gloddy.article.port.`in`.dto.command.CommentStatus
+import gloddy.core.CommentId
+
+data class CommentChildUpsertRequest(
+    val commentId: CommentId,
+    val status: CommentStatus
+)

community-application/src/main/kotlin/gloddy/comment/dto/CommentCreateRequest.kt

@@ -0,0 +1,19 @@
+package gloddy.comment.dto
+
+import gloddy.core.ArticleId
+import gloddy.core.CommentId
+import gloddy.core.UserId
+
+data class ParentCommentCreateRequest(
+    val userId: UserId,
+    val articleId: ArticleId,
+    val content: String
+)
+
+data class ChildCommentCreateRequest(
+    val userId: UserId,
+    val articleId: ArticleId,
+    val parentCommentId: CommentId,
+    val content: String
+)
+

community-application/src/main/kotlin/gloddy/comment/dto/CommentCreateResponse.kt

@@ -0,0 +1,11 @@
+package gloddy.comment.dto
+
+import gloddy.comment.Comment
+
+data class CommentCreateResponse(
+    val commentId: Long
+) {
+    constructor(comment: Comment) : this(
+        commentId = comment.id!!.value
+    )
+}

community-application/src/main/kotlin/gloddy/comment/dto/CommentDeleteRequest.kt

@@ -0,0 +1,11 @@
+package gloddy.comment.dto
+
+import gloddy.core.ArticleId
+import gloddy.core.CommentId
+import gloddy.core.UserId
+
+data class CommentDeleteRequest(
+    val commentId: CommentId,
+    val userId: UserId,
+    val articleId: ArticleId
+)

community-application/src/main/kotlin/gloddy/comment/dto/CommentGetResponse.kt

@@ -0,0 +1,30 @@
+package gloddy.comment.dto
+
+import gloddy.comment.Comment
+
+data class CommentGetResponse(
+    val comments: List<CommentUnit>
+)
+
+data class CommentUnit(
+    val commentId: Long,
+    val content: String,
+    val depth: Int,
+    val likeCount: Long,
+    val commentCount: Long,
+    val isLiked: Boolean,
+    val user: UserUnit
+)
+
+data class UserUnit(
+    val userId: Long,
+    val name: String,
+    val imageUrl: String,
+    val reliabilityLevel: String,
+    val country: UserCountry
+)
+
+data class UserCountry(
+    val name: String,
+    val imageUrl: String
+)

community-application/src/main/kotlin/gloddy/comment/dto/CommentLikeUpsertRequest.kt

@@ -0,0 +1,9 @@
+package gloddy.comment.dto
+
+import gloddy.core.CommentId
+import gloddy.core.UserId
+
+data class CommentLikeUpsertRequest(
+    val userId: UserId,
+    val commentId: CommentId
+)

community-application/src/main/kotlin/gloddy/comment/dto/ParentCommentGetRequest.kt

@@ -0,0 +1,9 @@
+package gloddy.comment.dto
+
+import gloddy.core.ArticleId
+import gloddy.core.UserId
+
+data class ParentCommentGetRequest(
+    val userId: UserId,
+    val articleId: ArticleId
+)

community-application/src/main/kotlin/gloddy/comment/dto/readModel/ChildCommentUnit.kt

@@ -0,0 +1,16 @@
+package gloddy.comment.dto.readModel
+
+import java.time.LocalDateTime
+
+data class ChildCommentUnit(
+    val id: Long,
+    val isWriter: Boolean,
+    val isLiked: Boolean,
+    val userId: Long,
+    val articleId: Long,
+    val parentId: Long,
+    val content: String,
+    val likeCount: Int,
+    val createdAt: LocalDateTime,
+    val updatedAt: LocalDateTime
+)

community-application/src/main/kotlin/gloddy/comment/dto/readModel/FindChildCommentByParentIdResponse.kt

@@ -0,0 +1,8 @@
+package gloddy.comment.dto.readModel
+
+import gloddy.user.port.`in`.dto.UserPreviewUnit
+
+data class FindChildCommentByParentIdResponse(
+    val childComment: ChildCommentUnit,
+    val writer: UserPreviewUnit
+)

community-application/src/main/kotlin/gloddy/comment/dto/readModel/FindChildCommentsByParentIdResponse.kt

@@ -0,0 +1,5 @@
+package gloddy.comment.dto.readModel
+
+data class FindChildCommentsByParentIdResponse(
+    val childComments: List<FindChildCommentByParentIdResponse>
+)

community-application/src/main/kotlin/gloddy/comment/dto/readModel/FindParentCommentByArticleIdResponse.kt

@@ -0,0 +1,8 @@
+package gloddy.comment.dto.readModel
+
+import gloddy.user.port.`in`.dto.UserPreviewUnit
+
+data class FindParentCommentByArticleIdResponse(
+    val comment: ParentCommentUnit,
+    val writer: UserPreviewUnit
+)

community-application/src/main/kotlin/gloddy/comment/dto/readModel/FindParentCommentsByArticleIdResponse.kt

@@ -0,0 +1,5 @@
+package gloddy.comment.dto.readModel
+
+data class FindParentCommentsByArticleIdResponse(
+    val comments: List<FindParentCommentByArticleIdResponse>
+)

community-application/src/main/kotlin/gloddy/comment/dto/readModel/ParentCommentUnit.kt

@@ -0,0 +1,16 @@
+package gloddy.comment.dto.readModel
+
+import java.time.LocalDateTime
+
+data class ParentCommentUnit(
+    val id: Long,
+    val isWriter: Boolean,
+    val isLiked: Boolean,
+    val userId: Long,
+    val articleId: Long,
+    val content: String,
+    val likeCount: Int,
+    val commentCount: Int,
+    val createdAt: LocalDateTime,
+    val updatedAt: LocalDateTime,
+)

community-application/src/main/kotlin/gloddy/comment/port/out/CommentCommandPort.kt

@@ -0,0 +1,10 @@
+package gloddy.comment.port.out
+
+import gloddy.comment.Comment
+import gloddy.comment.CommentLike
+
+interface CommentCommandPort {
+    fun save(comment: Comment): Comment
+    fun delete(comment: Comment)
+    fun upsertLike(commentLike: CommentLike, comment: Comment)
+}

community-application/src/main/kotlin/gloddy/comment/port/out/CommentLikeCommandPort.kt

@@ -0,0 +1,8 @@
+package gloddy.comment.port.out
+
+import gloddy.comment.CommentLike
+
+interface CommentLikeCommandPort {
+    fun save(commentLike: CommentLike): CommentLike
+    fun delete(commentLike: CommentLike)
+}