review: 다섯 번째 리뷰 PR

.github/workflows/prod-cd.yml

@@ -0,0 +1,26 @@
+name: Prod-CD
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ap-northeast-2
+
+      - name: Code Deploy
+        run: |
+          aws deploy create-deployment \
+          --application-name gamsa-codedeploy \
+          --deployment-config-name CodeDeployDefault.AllAtOnce \
+          --deployment-group-name gamsa-deploy-group \
+          --s3-location bucket=gamja-bongsa,bundleType=tgz,key=deploy.tar.gz

.github/workflows/prod-ci.yml

@@ -0,0 +1,43 @@
+name: Prod-CI
+
+on:
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build
+
+      - name: archive build directory
+        run: |
+          mkdir deploy
+          cp scripts/*.sh deploy
+          cp appspec.yml deploy
+          cp build/libs/*.jar deploy
+          tar cvfz deploy.tar.gz deploy
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ap-northeast-2
+
+      - name: upload to S3
+        run: |
+          aws s3 cp deploy.tar.gz s3://gamja-bongsa

.gitignore

@@ -88,3 +88,9 @@ nb-configuration.xml
 ## Miscellaneous
 ##############################
 *.log
+
+##############################
+## Production
+##############################
+src/main/resources/application-prod-db.yml
+src/main/resources/application-jwt.yml

appspec.yml

@@ -0,0 +1,18 @@
+version: 0.0
+os: linux
+files:
+  - source: /
+    destination: /home/ubuntu/deploy
+    overwrite: yes
+
+permissions:
+  - object: /
+    pattern: "**"
+    owner: ubuntu
+    group: ubuntu
+
+hooks:
+  ApplicationStart:
+    - location: deploy.sh
+      timeout: 60
+      runas: ubuntu

build.gradle

@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'com.opencsv:opencsv:5.5.2'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
@@ -34,6 +34,12 @@ dependencies {
     annotationProcessor 'jakarta.persistence:jakarta.persistence-api'
     implementation 'org.hibernate.validator:hibernate-validator'
 
+    // jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
+
+    implementation 'com.mysql:mysql-connector-j:9.1.0'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
@@ -44,4 +50,4 @@ dependencies {
 
 tasks.named('test') {
     useJUnitPlatform()
-}
+}

scripts/deploy.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+REPOSITORY=/home/ubuntu/deploy
+APP_NAME=gamsa
+
+cd $REPOSITORY
+
+echo "> 현재 구동 중인 애플리케이션 pid 확인"
+CURRENT_PID=$(lsof -i :8080 -t)
+
+echo "> 현재 구동 중인 애플리케이션 pid: $CURRENT_PID"
+if [ -z "$CURRENT_PID" ]; then
+        echo "> 구동 중인 애플리케이션이 없습니다."
+else
+        echo "> kill -15 $CURRENT_PID"
+        kill -15 $CURRENT_PID
+        sleep 5
+fi
+
+echo "> 새 애플리케이션 배포"
+JAR_NAME=$(ls -tr $REPOSITORY/ | grep jar | head -n 1)
+
+echo "> JAR Name: $JAR_NAME"
+
+echo "> $JAR_NAME에 실행권한 추가"
+chmod +x $JAR_NAME
+
+echo "> $JAR_NAME 실행"
+nohup java -jar \
+        -Dspring.config.location=/home/ubuntu/prod/application-prod-db.yml,/home/ubuntu/prod/application-jwt.yml \
+        -Dspring.profiles.active=prod \
+        $REPOSITORY/$JAR_NAME 2>&1 &

src/main/java/com/gamsa/Application.java

@@ -2,14 +2,16 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@ConfigurationPropertiesScan
 @EnableJpaAuditing
+@EnableScheduling
 @SpringBootApplication
 public class Application {
-
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
-
 }

src/main/java/com/gamsa/activity/constant/Category.java

@@ -1,5 +1,7 @@
 package com.gamsa.activity.constant;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -15,4 +17,28 @@ public enum Category {
     OTHER_ACTIVITIES("기타 활동");
 
     private final String name;
+
+    @JsonCreator
+    public static Category fromValues(String value) {
+        for (Category category : Category.values()) {
+            if (category.getName().equals(value)) {
+                return category;
+            }
+        }
+        throw new IllegalArgumentException("Unknown value: " + value);
+    }
+
+    public static Category fromValuesForSlice(String value) {
+        for (Category category : Category.values()) {
+            if (category.getName().equals(value)) {
+                return category;
+            }
+        }
+        return null;    // QueryDSL 에서는 null일 경우 필터링에서 제외하므로 null 반환 허용
+    }
+
+    @JsonValue
+    public String toValue() {
+        return this.name;
+    }
 }

src/main/java/com/gamsa/activity/controller/ActivityController.java

@@ -28,15 +28,15 @@ public class ActivityController {
 
     @GetMapping
     public Slice<ActivityFindSliceResponse> findSlice(
-        @RequestParam(required = false) Category category,
+        @RequestParam(required = false) String category,
         @RequestParam(required = false) Integer sidoGunguCode,
         @RequestParam(required = false) Integer sidoCode,
         @RequestParam(defaultValue = "false") boolean teenPossibleOnly,
         @RequestParam(defaultValue = "false") boolean beforeDeadlineOnly,
         Pageable pageable) {
 
         ActivityFilterRequest request = ActivityFilterRequest.builder()
-            .category(category)
+            .category(Category.fromValuesForSlice(category))
             .sidoGunguCode(sidoGunguCode)
             .sidoCode(sidoCode)
             .teenPossibleOnly(teenPossibleOnly)

src/main/java/com/gamsa/activity/controller/CategoryController.java

@@ -0,0 +1,17 @@
+package com.gamsa.activity.controller;
+
+import com.gamsa.activity.constant.Category;
+import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1/activities/categories")
+public class CategoryController {
+
+    @GetMapping
+    public List<Category> findAllCategories() {
+        return List.of(Category.values());
+    }
+}

src/main/java/com/gamsa/activity/domain/District.java

@@ -3,6 +3,8 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import java.math.BigDecimal;
+
 @Getter
 @Builder
 public class District {
@@ -11,5 +13,7 @@ public class District {
     private int sidoCode;
     private String sidoName;
     private String gunguName;
+    private BigDecimal latitude;
+    private BigDecimal longitude;
     private boolean sido;
 }

src/main/java/com/gamsa/activity/dto/ActivityApiResponse.java

@@ -0,0 +1,62 @@
+package com.gamsa.activity.dto;
+
+import com.gamsa.activity.constant.Category;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@RequiredArgsConstructor
+public class ActivityApiResponse {
+
+    private final Long actId;
+    private final String actTitle;
+    private final String actLocation;
+    private final String description;
+    private final LocalDateTime noticeStartDate;
+    private final LocalDateTime noticeEndDate;
+    private final LocalDateTime actStartDate;
+    private final LocalDateTime actEndDate;
+    private final int actStartTime;
+    private final int actEndTime;
+    private final int recruitTotalNum;
+    private final boolean adultPossible;
+    private final boolean teenPossible;
+    private final boolean groupPossible;
+    private final int actWeek;
+    private final String actManager;
+    private final String actPhone;
+    private final String url;
+    private final Category category;
+    private final String instituteName;
+    private final Integer sidoGunguCode;
+
+    public ActivitySaveRequest toSaveRequest(long instituteId) {
+        return ActivitySaveRequest.builder()
+                .actId(actId)
+                .actTitle(actTitle)
+                .actLocation(actLocation)
+                .description(description)
+                .noticeStartDate(noticeStartDate)
+                .noticeEndDate(noticeEndDate)
+                .actStartDate(actStartDate)
+                .actEndDate(actEndDate)
+                .actStartTime(actStartTime)
+                .actEndTime(actEndTime)
+                .recruitTotalNum(recruitTotalNum)
+                .adultPossible(adultPossible)
+                .teenPossible(teenPossible)
+                .groupPossible(groupPossible)
+                .actWeek(actWeek)
+                .actManager(actManager)
+                .actPhone(actPhone)
+                .url(url)
+                .category(category)
+                .instituteId(instituteId)
+                .sidoGunguCode(sidoGunguCode)
+                .build();
+    }
+}