[DEPLOY] 배포

.github/workflows/dev_deploy.yml

@@ -29,7 +29,6 @@ jobs:
           spring.jpa.hibernate.ddl-auto=update
           server.forward-headers-strategy=framework
 
-          # PostgreSQL 설정 추가 ✅
           spring.datasource.url=\${SPRING_DATASOURCE_URL}
           spring.datasource.username=\${SPRING_DATASOURCE_USERNAME}
           spring.datasource.password=\${SPRING_DATASOURCE_PASSWORD}
@@ -91,25 +90,98 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  deploy:
+  deploy-dev:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/develop'
+    environment: development
+
+    steps:
+      - name: Deploy to Dev Server
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ vars.EC2_HOST }}
+          username: ${{ vars.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            cd /home/ubuntu/edison-infra
+
+            cat > .env << 'ENVEOF'
+            DOCKERHUB_USERNAME=${{ vars.DOCKERHUB_USERNAME }}
+
+            SPRING_TAG=${{ github.sha }}
+            AI_TAG=latest
+
+            RDS_URL=${{ vars.RDS_URL }}
+            RDS_USERNAME=${{ vars.RDS_USERNAME }}
+            RDS_PASSWORD=${{ secrets.RDS_PASSWORD }}
+
+            REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
+
+            JWT_SECRET=${{ secrets.JWT_SECRET }}
+            JWT_ACCESS_EXPIRATION=${{ vars.JWT_ACCESS_EXPIRATION }}
+            JWT_REFRESH_EXPIRATION=${{ vars.JWT_REFRESH_EXPIRATION }}
+
+            GOOGLE_CLIENT_ID=${{ vars.GOOGLE_CLIENT_ID }}
+            GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}
+
+            OPENAI_KEY=${{ secrets.OPENAI_KEY }}
+
+            AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }}
+            AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}
+            CLOUD_AWS_CREDENTIALS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }}
+            CLOUD_AWS_CREDENTIALS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}
+            CLOUD_AWS_S3_BUCKET=${{ vars.AWS_S3_BUCKET }}
+            ENVEOF
+
+            ./deploy.sh spring ${{ github.sha }} dev
+
+            echo "✅ Deployed to DEV server"
+
+  deploy-prod:
     needs: build
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
+    environment: production
 
     steps:
-      - name: Deploy to EC2
+      - name: Deploy to Prod Server
         uses: appleboy/ssh-action@v1.0.3
         with:
-          host: ${{ secrets.EC2_HOST }}
-          username: ${{ secrets.EC2_USERNAME }}
+          host: ${{ vars.EC2_HOST }}
+          username: ${{ vars.EC2_USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
             cd /home/ubuntu/edison-infra
 
             cat > .env << 'ENVEOF'
-            ${{ secrets.ENV_FILE }}
+            DOCKERHUB_USERNAME=${{ vars.DOCKERHUB_USERNAME }}
+
+            SPRING_TAG=${{ github.sha }}
+            AI_TAG=latest
+
+            RDS_URL=${{ vars.RDS_URL }}
+            RDS_USERNAME=${{ vars.RDS_USERNAME }}
+            RDS_PASSWORD=${{ secrets.RDS_PASSWORD }}
+
+            REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
+
+            JWT_SECRET=${{ secrets.JWT_SECRET }}
+            JWT_ACCESS_EXPIRATION=${{ vars.JWT_ACCESS_EXPIRATION }}
+            JWT_REFRESH_EXPIRATION=${{ vars.JWT_REFRESH_EXPIRATION }}
+
+            GOOGLE_CLIENT_ID=${{ vars.GOOGLE_CLIENT_ID }}
+            GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}
+
+            OPENAI_KEY=${{ secrets.OPENAI_KEY }}
+
+            AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }}
+            AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}
+            CLOUD_AWS_CREDENTIALS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY }}
+            CLOUD_AWS_CREDENTIALS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}
+            CLOUD_AWS_S3_BUCKET=${{ vars.AWS_S3_BUCKET }}
             ENVEOF
 
-            sed -i 's/^SPRING_TAG=.*/SPRING_TAG=${{ github.sha }}/' .env
+            ./deploy.sh spring ${{ github.sha }} prod
 
-            ./deploy.sh spring ${{ github.sha }}
+            echo "✅ Deployed to PROD server"

docker-compose.yml

@@ -0,0 +1,14 @@
+# local redis용 docker-compose
+services:
+  redis:
+    image: redis:alpine
+    container_name: edison-redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis_volume:/data
+    command: redis-server --appendonly yes
+    restart: always
+
+volumes:
+  redis_volume:

project/.gitignore

@@ -37,4 +37,5 @@ out/
 ### VS Code ###
 .vscode/
 .idea/
-.idea/
+
+load-test.js

project/build.gradle

@@ -52,13 +52,24 @@ dependencies {
 
 	implementation 'com.fasterxml.jackson.core:jackson-databind'
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.3'
 
 	// Lombok 설정
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 
+	runtimeOnly 'com.mysql:mysql-connector-j'
 	runtimeOnly 'org.postgresql:postgresql'
 
+	// Vector Database (pgvector)
+    implementation 'com.pgvector:pgvector:0.1.6'
+    implementation 'org.hibernate.orm:hibernate-vector:6.6.4.Final'
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.0'
+    implementation 'com.github.haifengl:smile-core:3.1.1'
+
+	// 차원 축소 (PCA, t-SNE)
+	implementation 'org.apache.commons:commons-math3:3.6.1'
+
 	// 테스트 관련
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

project/src/main/java/com/edison/project/domain/artletter/entity/Artletter.java

@@ -11,7 +11,7 @@
 @AllArgsConstructor
 @Table(name = "Artletter", indexes = {
         @Index(name = "idx_artletter_title", columnList = "title"),
-        @Index(name = "idx_artletter_writer", columnList = "writer")
+        @Index(name = "idx_artletter_writer", columnList = "writer_id")
 })
 public class Artletter extends BaseEntity {
 

project/src/main/java/com/edison/project/domain/bubble/controller/BubbleRestController.java

@@ -147,5 +147,44 @@ public ResponseEntity<ApiResponse> getAllBubbles(
         return bubbleService.getAllBubbles(userPrincipal, pageable);
     }
 
+    /**
+     * 단일 버블 벡터화
+     * POST /bubbles/{localIdx}/vectorize
+     */
+    @PostMapping("/{localIdx}/vectorize")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<ApiResponse> vectorizeBubble(
+            @AuthenticationPrincipal CustomUserPrincipal userPrincipal,
+            @PathVariable String localIdx) {
+        BubbleResponseDto.VectorizeResultDto result = bubbleService.vectorizeBubble(userPrincipal, localIdx);
+        return ApiResponse.onSuccess(SuccessStatus._OK, result);
+    }
+
+    /**
+     * 모든 버블 벡터화
+     * POST /bubbles/vectorize-all
+     */
+    @PostMapping("/vectorize-all")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<ApiResponse> vectorizeAllBubbles(
+            @AuthenticationPrincipal CustomUserPrincipal userPrincipal) {
+        return bubbleService.vectorizeAllBubbles(userPrincipal);
+    }
+
+    /**
+     * 사용자의 모든 버블 2D 벡터 좌표 조회
+     * GET /bubbles/embeddings
+     */
+    @GetMapping("/embeddings")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<ApiResponse> getAllBubbleEmbeddings(
+            @AuthenticationPrincipal CustomUserPrincipal userPrincipal,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "50") int size) {
+
+        Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+        return bubbleService.getAllBubbleEmbeddings(userPrincipal, pageable);
+    }
+
 }
 

project/src/main/java/com/edison/project/domain/bubble/dto/BubbleResponseDto.java

@@ -68,4 +68,22 @@ public static class DeleteRestoreResultDto {
         private boolean isTrashed;
     }
 
+    public record VectorizeResultDto(
+            String localIdx,
+            String title,
+            boolean isVectorized,
+            Double embedding2dX,
+            Double embedding2dY,
+            LocalDateTime vectorizedAt,
+            String message
+    ) {}
+
+    public record BubbleEmbeddingDto(
+            String localIdx,
+            String title,
+            Double embedding2dX,
+            Double embedding2dY,
+            LocalDateTime createdAt
+    ) {}
+
 }

project/src/main/java/com/edison/project/domain/bubble/entity/Bubble.java

@@ -2,8 +2,11 @@
 
 import com.edison.project.domain.label.entity.Label;
 import com.edison.project.domain.member.entity.Member;
+import com.pgvector.PGvector;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 import java.time.LocalDateTime;
 import java.util.HashSet;
@@ -15,7 +18,7 @@
 @Setter
 @Table(name = "Bubble", indexes = {
         @Index(name = "idx_bubble_member_id", columnList = "member_id"),
-        @Index(name = "idx_localIdx", columnList = "local_idx")})
+        @Index(name = "idx_bubble_local_idx", columnList = "local_idx")})
 public class Bubble {
 
     @Id
@@ -63,6 +66,16 @@ public class Bubble {
     @OneToMany(mappedBy = "backlinkBubble", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
     private Set<BubbleBacklink> referencingBubbles = new HashSet<>();
 
+    @Column(name = "embedding")
+    @JdbcTypeCode(SqlTypes.VECTOR)
+    private float[] embedding;
+
+    @Column(name = "embedding_2d_x")
+    private Double embedding2dX;
+
+    @Column(name = "embedding_2d_y")
+    private Double embedding2dY;
+
     @Builder
     public Bubble(Member member, String localIdx, String title, String content, String mainImg, Set<BubbleLabel> labels,
                   boolean isTrashed, LocalDateTime createdAt, LocalDateTime updatedAt, LocalDateTime deletedAt) {

project/src/main/java/com/edison/project/domain/bubble/repository/BubbleEmbeddingProjection.java

@@ -0,0 +1,11 @@
+package com.edison.project.domain.bubble.repository;
+
+import java.time.LocalDateTime;
+
+public interface BubbleEmbeddingProjection {
+    String getLocalIdx();
+    String getTitle();
+    Double getEmbedding2dX();
+    Double getEmbedding2dY();
+    LocalDateTime getCreatedAt();
+}