[Deploy] 베타 버전 prod 배포

.github/workflows/ci.yml

@@ -1,60 +1,60 @@
-#name: Clokey CI
-#
-#on:
-#  pull_request:
-#    branches: [ "main", "develop" ]
-#    paths:
-#      - "clokey-api/**"
-#      - "clokey-domain/**"
-#      - "clokey-common/**"
-#      - "clokey-common-web/**"
-#      - ".github/workflows/ci.yml"
-#
-#permissions:
-#  contents: read
-#
-#jobs:
-#  build:
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          clean: true
-#
-#      - name: Setup Java 21
-#        uses: actions/setup-java@v4
-#        with:
-#          distribution: 'corretto'
-#          java-version: '21'
-#
-#      - name: Start Redis container for test
-#        run: docker compose -f ./docker-compose-test.yml up -d
-#
-#      - name: Gradle Caching
-#        uses: actions/cache@v4
-#        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: Spotless Check
-#        run: ./gradlew spotlessCheck
-#
-#      - name: SonarCloud Caching
-#        uses: actions/cache@v4
-#        with:
-#          path: ~/.sonar/cache
-#          key: ${{ runner.os }}-sonar
-#          restore-keys: ${{ runner.os }}-sonar
-#
-#      - name: Test and Analyze
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#        run: ./gradlew test sonar --info --stacktrace
+name: Clokey CI
+
+on:
+  pull_request:
+    branches: [ "main", "develop" ]
+    paths:
+      - "clokey-api/**"
+      - "clokey-domain/**"
+      - "clokey-common/**"
+      - "clokey-common-web/**"
+      - ".github/workflows/ci.yml"
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+
+      - name: Setup Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '21'
+
+      - name: Start Redis container for test
+        run: docker compose -f ./docker-compose-test.yml up -d
+
+      - name: Gradle Caching
+        uses: actions/cache@v4
+        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: Spotless Check
+        run: ./gradlew spotlessCheck
+
+      - name: SonarCloud Caching
+        uses: actions/cache@v4
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Test and Analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew test sonar --info --stacktrace

.github/workflows/dev-cd.yml

@@ -1,7 +1,7 @@
 name: Clokey-Dev CD
 
 on:
-  pull_request:
+  push:
     branches: [ develop ]
 
 jobs:
@@ -63,7 +63,7 @@ jobs:
           username: ubuntu
           host: ${{ secrets.DEV_EC2_HOST }}
           key: ${{ secrets.DEV_EC2_SSH_KEY }}
-          envs: DOCKERHUB_USERNAME,DEV_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,DEV_KAKAO_CLIENT_ID,DEV_KAKAO_CLIENT_SECRET,DEV_APPLE_CLIENT_ID,DEV_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,DEV_AWS_ACCESS_KEY_ID,DEV_AWS_SECRET_ACCESS_KEY,AWS_REGION,DEV_S3_BUCKET,DEV_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD
+          envs: DOCKERHUB_USERNAME,DEV_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,DEV_KAKAO_CLIENT_ID,DEV_KAKAO_CLIENT_SECRET,DEV_APPLE_CLIENT_ID,DEV_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,DEV_AWS_ACCESS_KEY_ID,DEV_AWS_SECRET_ACCESS_KEY,AWS_REGION,DEV_S3_BUCKET,DEV_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64
           script: |
             export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }}
             export DOCKER_TAG=dev-app
@@ -98,12 +98,18 @@ jobs:
 
             export SWAGGER_USERNAME=${{ secrets.SWAGGER_USERNAME }}
             export SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }}
-
+
+            sudo mkdir -p /home/ubuntu/secrets
+            echo "${{ secrets.FIREBASE_SA_JSON_B64 }}" | base64 -d | sudo tee /home/ubuntu/secrets/firebase-sa.json > /dev/null
+            sudo chmod 600 /home/ubuntu/secrets/firebase-sa.json
+
+            export FIREBASE_CREDENTIALS_PATH=/home/ubuntu/secrets/firebase-sa.json
+
             echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
 
             cd /home/ubuntu
             docker compose -f clokey-api/dev-compose.yml up -d
 
             echo "Cleaning up dangling Docker images..."
             docker image prune -f
-            
+

.github/workflows/prod-cd.yml

@@ -73,12 +73,12 @@ jobs:
           username: ubuntu
           host: ${{ secrets.PROD_EC2_HOST }}
           key: ${{ secrets.PROD_EC2_SSH_KEY }}
-          envs: DOCKERHUB_USERNAME,SPRING_PROFILES_ACTIVE,PROD_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,PROD_KAKAO_CLIENT_ID,PROD_KAKAO_CLIENT_SECRET,PROD_APPLE_CLIENT_ID,PROD_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,PROD_AWS_ACCESS_KEY_ID,PROD_AWS_SECRET_ACCESS_KEY,AWS_REGION,PROD_S3_BUCKET,PROD_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD
+          envs: DOCKERHUB_USERNAME,SPRING_PROFILES_ACTIVE,PROD_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,PROD_KAKAO_CLIENT_ID,PROD_KAKAO_CLIENT_SECRET,PROD_APPLE_CLIENT_ID,PROD_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,PROD_AWS_ACCESS_KEY_ID,PROD_AWS_SECRET_ACCESS_KEY,AWS_REGION,PROD_S3_BUCKET,PROD_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64
           script: |
             export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }}
             export DOCKER_TAG=prod-app
 
-            export DEV_MYSQL_HOST=${{ secrets.PROD_MYSQL_HOST }}
+            export PROD_MYSQL_HOST=${{ secrets.PROD_MYSQL_HOST }}
             export MYSQL_PORT=${{ secrets.MYSQL_PORT }}
             export DB_NAME=${{ secrets.DB_NAME }}
             export DB_USERNAME=${{ secrets.DB_USERNAME }}
@@ -100,15 +100,21 @@ jobs:
             export JWT_REFRESH_TOKEN_EXPIRATION_TIME=${{ secrets.JWT_REFRESH_TOKEN_EXPIRATION_TIME }}
             export JWT_ISSUER=${{ secrets.JWT_ISSUER }}
 
-            export DEV_AWS_ACCESS_KEY_ID=${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
-            export DEV_AWS_SECRET_ACCESS_KEY=${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
+            export PROD_AWS_ACCESS_KEY_ID=${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
+            export PROD_AWS_SECRET_ACCESS_KEY=${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
             export AWS_REGION=${{ secrets.AWS_REGION }}
-            export DEV_S3_BUCKET=${{ secrets.PROD_S3_BUCKET }}
-            export DEV_S3_ENDPOINT=${{ secrets.PROD_S3_ENDPOINT }}
+            export PROD_S3_BUCKET=${{ secrets.PROD_S3_BUCKET }}
+            export PROD_S3_ENDPOINT=${{ secrets.PROD_S3_ENDPOINT }}
 
             export SWAGGER_USERNAME=${{ secrets.SWAGGER_USERNAME }}
             export SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }}
 
+            sudo mkdir -p /home/ubuntu/secrets
+            echo "${{ secrets.FIREBASE_SA_JSON_B64 }}" | base64 -d | sudo tee /home/ubuntu/secrets/firebase-sa.json > /dev/null
+            sudo chmod 600 /home/ubuntu/secrets/firebase-sa.json
+
+            export FIREBASE_CREDENTIALS_PATH=/home/ubuntu/secrets/firebase-sa.json
+
             echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
 
             cd /home/ubuntu

clokey-api/dev-compose.yml

@@ -29,6 +29,9 @@ services:
       APPLE_CLIENT_ID: ${APPLE_CLIENT_ID}
       APPLE_CLIENT_SECRET: ${APPLE_CLIENT_SECRET}
 
+      # Firebase
+      FIREBASE_CREDENTIALS_PATH: /run/secrets/firebase-sa.json
+
       # JWT
       JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET}
       JWT_REFRESH_TOKEN_SECRET: ${JWT_REFRESH_TOKEN_SECRET}
@@ -46,6 +49,10 @@ services:
       # Swagger
       SWAGGER_USERNAME: ${SWAGGER_USERNAME}
       SWAGGER_PASSWORD: ${SWAGGER_PASSWORD}
+
+    volumes:
+      - /home/ubuntu/secrets/firebase-sa.json:/run/secrets/firebase-sa.json:ro
+
     networks:
       - app_network
 

clokey-api/prod-compose.yml

@@ -29,6 +29,9 @@ services:
       APPLE_CLIENT_ID: ${APPLE_CLIENT_ID}
       APPLE_CLIENT_SECRET: ${APPLE_CLIENT_SECRET}
 
+      # Firebase
+      FIREBASE_CREDENTIALS_PATH: /run/secrets/firebase-sa.json
+
       # JWT
       JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET}
       JWT_REFRESH_TOKEN_SECRET: ${JWT_REFRESH_TOKEN_SECRET}
@@ -46,6 +49,10 @@ services:
       # Swagger
       SWAGGER_USERNAME: ${SWAGGER_USERNAME}
       SWAGGER_PASSWORD: ${SWAGGER_PASSWORD}
+
+    volumes:
+      - /home/ubuntu/secrets/firebase-sa.json:/run/secrets/firebase-sa.json:ro
+
     networks:
       - app_network
 

clokey-api/src/main/java/org/clokey/domain/cloth/repository/ClothRepository.java

@@ -3,4 +3,6 @@
 import org.clokey.cloth.entity.Cloth;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface ClothRepository extends JpaRepository<Cloth, Long>, ClothRepositoryCustom {}
+public interface ClothRepository extends JpaRepository<Cloth, Long>, ClothRepositoryCustom {
+    boolean existsByMemberId(Long memberId);
+}

clokey-api/src/main/java/org/clokey/domain/coordinate/repository/CoordinateRepository.java

@@ -30,4 +30,6 @@ default boolean existsDailyCoordinateByDateAndMemberId(LocalDate date, Long memb
 
     @Query("select c from Coordinate c where c.member.id = :memberId and c.liked = true")
     List<Coordinate> findLikedCoordinatesByMemberId(Long memberId);
+
+    boolean existsByMemberId(Long memberId);
 }

clokey-api/src/main/java/org/clokey/domain/history/repository/HistoryRepository.java

@@ -3,4 +3,6 @@
 import org.clokey.history.entity.History;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface HistoryRepository extends JpaRepository<History, Long> {}
+public interface HistoryRepository extends JpaRepository<History, Long> {
+    boolean existsByMemberId(Long memberId);
+}

clokey-api/src/main/java/org/clokey/domain/notification/controller/CodiveNotificationController.java

@@ -3,8 +3,10 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.clokey.code.GlobalBaseSuccessCode;
+import org.clokey.domain.notification.dto.request.TemperatureNotificationRequest;
 import org.clokey.domain.notification.dto.response.NotificationListResponse;
 import org.clokey.domain.notification.dto.response.UnreadNotificationResponse;
 import org.clokey.domain.notification.service.CodiveNotificationService;
@@ -55,4 +57,12 @@ public BaseResponse<Void> updateAllReadStatus() {
         codiveNotificationService.updateAllReadStatus();
         return BaseResponse.onSuccess(GlobalBaseSuccessCode.NO_CONTENT, null);
     }
+
+    @PostMapping("/today-temperature")
+    @Operation(summary = "오늘의 온도 API", description = "오늘의 온도를 알리는 알림을 발송합니다.")
+    public BaseResponse<Void> sendTemperatureNotification(
+            @Valid @RequestBody TemperatureNotificationRequest request) {
+        codiveNotificationService.sendNewTemperatureNotification(request);
+        return BaseResponse.onSuccess(GlobalBaseSuccessCode.NO_CONTENT, null);
+    }
 }

clokey-api/src/main/java/org/clokey/domain/notification/dto/request/TemperatureNotificationRequest.java

@@ -0,0 +1,8 @@
+package org.clokey.domain.notification.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+public record TemperatureNotificationRequest(
+        @NotNull(message = "온도는 비워둘 수 없습니다.") @Schema(description = "현재 기온", example = "-10.5")
+                Double temperature) {}

clokey-api/src/main/java/org/clokey/domain/notification/service/CodiveNotificationService.java

@@ -2,6 +2,7 @@
 
 import org.clokey.domain.comment.event.NewCommentEvent;
 import org.clokey.domain.comment.event.NewReplyEvent;
+import org.clokey.domain.notification.dto.request.TemperatureNotificationRequest;
 import org.clokey.domain.notification.dto.response.NotificationListResponse;
 import org.clokey.domain.notification.dto.response.UnreadNotificationResponse;
 import org.clokey.response.SliceResponse;
@@ -16,6 +17,8 @@ public interface CodiveNotificationService {
 
     void sendNewReplyNotification(NewReplyEvent event);
 
+    void sendNewTemperatureNotification(TemperatureNotificationRequest request);
+
     SliceResponse<NotificationListResponse> getNotificationList(
             Long lastNotificationId, Integer size);
 

clokey-api/src/main/java/org/clokey/domain/notification/service/CodiveNotificationServiceImpl.java

@@ -14,6 +14,7 @@
 import org.clokey.domain.history.repository.HistoryRepository;
 import org.clokey.domain.member.exception.MemberErrorCode;
 import org.clokey.domain.member.repository.MemberRepository;
+import org.clokey.domain.notification.dto.request.TemperatureNotificationRequest;
 import org.clokey.domain.notification.dto.response.NotificationListResponse;
 import org.clokey.domain.notification.dto.response.UnreadNotificationResponse;
 import org.clokey.domain.notification.exception.NotificationErrorCode;
@@ -52,6 +53,9 @@ public class CodiveNotificationServiceImpl implements CodiveNotificationService
     private static final String NEW_COMMENT_NOTIFICATION = "%s님이 회원님의 기록에 댓글을 남겼습니다. : %s";
     private static final String NEW_REPLY_NOTIFICATION = "%s님이 회원님의 댓글에 답장을 남겼습니다. : %s";
 
+    private static final String TODAY_TEMPERATURE_NOTIFICATION =
+            "오늘의 기온은 %d도 입니다!\n날씨에 맞는 오늘의 옷차림이 기다리고 있어요👀";
+
     @Override
     public void sendNewFollowerNotification(Long followFromId, Long followToId) {
         Member followFromMember = getMemberById(followFromId);
@@ -214,6 +218,28 @@ public void sendNewReplyNotification(NewReplyEvent event) {
         }
     }
 
+    @Override
+    public void sendNewTemperatureNotification(TemperatureNotificationRequest request) {
+        Member receiver = memberUtil.getCurrentMember();
+        String content = "";
+
+        if (isAbleToSendNotification(receiver)) {
+
+            Notification notification = Notification.builder().setBody(content).build();
+            Message message =
+                    Message.builder()
+                            .setToken(receiver.getDeviceToken())
+                            .setNotification(notification)
+                            .build();
+
+            try {
+                firebaseMessaging.send(message);
+            } catch (FirebaseMessagingException e) {
+                throw new BaseCustomException(NotificationErrorCode.NOTIFICATION_FIREBASE_ERROR);
+            }
+        }
+    }
+
     @Override
     public SliceResponse<NotificationListResponse> getNotificationList(
             Long lastNotificationId, Integer size) {