[FEAT] 모듈 분리

.github/workflows/deploy-websocket.yml

@@ -0,0 +1,101 @@
+name: Fintory Websocket Module CI/CD
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+
+env:
+  AWS_REGION: ap-northeast-2
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Grant permission to gradlew
+        run: chmod +x ./gradlew
+
+      - name: Cache Gradle
+        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: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build and push websocket
+        run: |
+          ./gradlew :websocket:clean build
+          docker build -t websocket:latest ./websocket
+          docker tag websocket:latest ${{ steps.login-ecr.outputs.registry }}/fintory-child:websocket-latest
+          docker push ${{ steps.login-ecr.outputs.registry }}/fintory-child:websocket-latest
+
+  deploy-websocket:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Deploy fintory-websocket to EC2
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host: ${{ secrets.FINTORY_WEBSOCKET_HOST }}
+          username: ubuntu
+          key: ${{ secrets.EC2_WEBSOCKET_SSH_KEY }}
+          script: |
+            cat > .env << 'EOF'
+            ECR_REGISTRY=${{ steps.login-ecr.outputs.registry }}
+            RDS_URL=${{ secrets.RDS_URL }}
+            RDS_USERNAME=${{ secrets.RDS_USERNAME }}
+            RDS_PASSWORD=${{ secrets.RDS_PASSWORD }} 
+            AWS_REDIS_HOST=${{ secrets.FINTORY_CHILD_PRIVATE_HOST }}
+            AWS_REDIS_PASSWORD=${{ secrets.AWS_REDIS_PASSWORD }}
+            HANTU_APPKEY=${{ secrets.HANTU_APPKEY}}
+            HANTU_APPSECRET=${{ secrets.HANTU_APPSECRET}}
+            DB_APPKEY=${{ secrets.DB_APPKEY}}
+            DB_APPSECRET=${{ secrets.DB_APPSECRET}}
+            EOS_API_KEY=${{ secrets.EOS_API_KEY}}
+            EOF
+
+
+            aws ecr get-login-password --region ap-northeast-2 | \
+            docker login --username AWS --password-stdin ${{ steps.login-ecr.outputs.registry }}
+
+            docker pull ${{ steps.login-ecr.outputs.registry }}/fintory-child:websocket-latest
+
+            docker compose down
+            docker compose up -d
+
+            docker image prune -f
+

.github/workflows/deploy.yml

@@ -95,15 +95,16 @@ jobs:
             export OPENAI_MODEL=${{ secrets.OPENAI_MODEL}}
             export OPENAI_TEMPERATURE=${{secrets.OPENAI_TEMPERATURE}}
             export OPENAI_MAX_TOKENS=${{secrets.OPENAI_MAX_TOKENS}}
+            export WEBSOCKET_PRIVATE_HOST=${{secrets.WEBSOCKET_PRIVATE_HOST}}
             export FIREBASE_CONFIG='${{secrets.FIREBASE_CONFIG}}' 
 
             aws ecr get-login-password --region ap-northeast-2 | \
-              docker login --username AWS --password-stdin ${{ steps.login-ecr.outputs.registry }}
+            docker login --username AWS --password-stdin ${{ steps.login-ecr.outputs.registry }}
 
             docker pull ${{ steps.login-ecr.outputs.registry }}/fintory-child:latest
 
             docker compose down
             docker compose up -d
 
             docker image prune -f
-            
+

app-child/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /app
 COPY build/libs/*.jar app.jar
 COPY src/main/resources/application-deploy.yml /app/application-deploy.yml
 
-ENTRYPOINT ["java", "-jar","app.jar", "--spring.profiles.active=deploy"]
+ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=deploy"]

app-child/src/main/java/com/fintory/child/ChildApplication.java

@@ -15,7 +15,7 @@
 @SpringBootApplication(scanBasePackages = {
         "com.fintory.infra",
         "com.fintory.auth",
-        "com.fintory.child"
+        "com.fintory.child",
 })
 @ConfigurationPropertiesScan(basePackages = {
         "com.fintory.auth"

app-child/src/main/java/com/fintory/child/domain/stock/controller/common/CommonStockControllerImpl.java

@@ -4,13 +4,14 @@
 import com.fintory.domain.stock.dto.korean.response.StockSearchResponse;
 import com.fintory.domain.stock.dto.websocket.MarketStatusResponse;
 import com.fintory.domain.stock.service.common.CommonStockService;
-import com.fintory.domain.stock.service.websocket.LiveStockPriceWebsocketService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 
@@ -20,22 +21,27 @@
 public class CommonStockControllerImpl implements CommonStockController {
 
     private final CommonStockService commonStockService;
-    private final LiveStockPriceWebsocketService websocketService;
+    private final RestTemplate restTemplate;
+
+    @Value("${websocket.server.url}")
+    private String websocketServerUrl;
 
 
     //주식 종목 검색
     @Override
     @GetMapping("/search")
     public ResponseEntity<ApiResponse<List<StockSearchResponse>>> searchStock(@RequestParam String keyword) {
-        List<StockSearchResponse> stockSearchRespons = commonStockService.searchStock(keyword);
-        return ResponseEntity.ok(ApiResponse.ok(stockSearchRespons));
+        List<StockSearchResponse> stockSearchResponse = commonStockService.searchStock(keyword);
+        return ResponseEntity.ok(ApiResponse.ok(stockSearchResponse));
     }
 
     //장시간 리턴
     @Override
     @GetMapping("/opened-market")
     public ResponseEntity<ApiResponse<MarketStatusResponse>> getMarketStatus(){
-        return ResponseEntity.ok(ApiResponse.ok(websocketService.getMarketStatus()));
+        String url = "http://"+websocketServerUrl+":8080" + "/api/websocket/market/status";
+        MarketStatusResponse response = restTemplate.getForObject(url, MarketStatusResponse.class);
+        return ResponseEntity.ok(ApiResponse.ok(response));
     }
 
 }