feat: AI 인사이트 및 S3 이미지 업로드 인프라 설정 개선

.github/workflows/release.yml

@@ -117,13 +117,22 @@ jobs:
           GOOGLE_OAUTH_CLIENT_SECRET: ${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}
           APP_OAUTH2_REDIRECT_SUCCESS_URL: ${{ secrets.OAUTH2_REDIRECT_SUCCESS_URL }}
           APP_OAUTH2_EXTRA_INFO_URL: ${{ secrets.EXTRA_INFO_URL }}
-          FIREBASE_SERVICE_ACCOUNT_PATH: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_PATH }}
+          FIREBASE_SERVICE_ACCOUNT_JSON: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
+          AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+          AWS_S3_REGION: ${{ secrets.AWS_S3_REGION }}
+          AWS_S3_ACCESS_KEY: ${{ secrets.AWS_S3_ACCESS_KEY }}
+          AWS_S3_SECRET_KEY: ${{ secrets.AWS_S3_SECRET_KEY }}
+          GEMINI_PROJECT_ID: ${{ secrets.GEMINI_PROJECT_ID }}
+          GEMINI_ENABLED: ${{ secrets.GEMINI_ENABLED }}
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
-          envs: DATABASE_HOST,DATABASE_USERNAME,DATABASE_PASSWORD,APP_JWT_SECRET,APP_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS,APP_JWT_REFRESH_TOKEN_EXPIRATION_SECONDS,APP_OAUTH2_REDIRECT_SUCCESS_URL,APP_OAUTH2_EXTRA_INFO_URL,GOOGLE_CLIENT_ID,GOOGLE_OAUTH_CLIENT_SECRET,FIREBASE_SERVICE_ACCOUNT_PATH
+          envs: DATABASE_HOST,DATABASE_USERNAME,DATABASE_PASSWORD,APP_JWT_SECRET,APP_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS,APP_JWT_REFRESH_TOKEN_EXPIRATION_SECONDS,APP_OAUTH2_REDIRECT_SUCCESS_URL,APP_OAUTH2_EXTRA_INFO_URL,GOOGLE_CLIENT_ID,GOOGLE_OAUTH_CLIENT_SECRET,FIREBASE_SERVICE_ACCOUNT_JSON,AWS_S3_BUCKET,AWS_S3_REGION,AWS_S3_ACCESS_KEY,AWS_S3_SECRET_KEY,GEMINI_PROJECT_ID,GEMINI_ENABLED
           script: |
+            mkdir -p /home/ubuntu/app/secrets
+            echo "$FIREBASE_SERVICE_ACCOUNT_JSON" > /home/ubuntu/app/secrets/firebase-service-account.json
+            export FIREBASE_SERVICE_ACCOUNT_PATH=/app/secrets/firebase-service-account.json
             curl -fsSL https://raw.githubusercontent.com/JECT-Study/JECT2-4th-Server/main/scripts/setup-docker-caddy.sh \
               | bash
             curl -fsSL https://raw.githubusercontent.com/JECT-Study/JECT2-4th-Server/main/scripts/deploy.sh \

scripts/deploy.sh

@@ -107,15 +107,55 @@ fi
 
 # 새 컨테이너 실행 (트래픽 전환 전까지 Docker 기본 bridge에만 둔다)
 log "새 컨테이너($NEW_CONTAINER) 실행 중"
-docker run -d --name "$NEW_CONTAINER" \
-  -e SPRING_PROFILES_ACTIVE=prod \
-  -e DATABASE_HOST \
-  -e DATABASE_USERNAME \
-  -e DATABASE_PASSWORD \
-  -e APP_JWT_SECRET \
-  -e APP_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS \
-  -e APP_JWT_REFRESH_TOKEN_EXPIRATION_SECONDS \
-  "$IMAGE" >/dev/null
+
+# Docker run 옵션 구성
+DOCKER_OPTS=(
+  -d --name "$NEW_CONTAINER"
+  -e SPRING_PROFILES_ACTIVE=prod
+  -e DATABASE_HOST
+  -e DATABASE_USERNAME
+  -e DATABASE_PASSWORD
+  -e APP_JWT_SECRET
+  -e APP_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS
+  -e APP_JWT_REFRESH_TOKEN_EXPIRATION_SECONDS
+  -e APP_OAUTH2_REDIRECT_SUCCESS_URL
+  -e APP_OAUTH2_EXTRA_INFO_URL
+  -e GOOGLE_CLIENT_ID
+  -e GOOGLE_OAUTH_CLIENT_SECRET
+)
+
+# Firebase + GCP 서비스 계정 설정 (선택적)
+# 이 파일은 Firebase와 Vertex AI(Gemini) 인증에 모두 사용됨
+if [ -f "/home/ubuntu/app/secrets/firebase-service-account.json" ]; then
+  DOCKER_OPTS+=(
+    -v /home/ubuntu/app/secrets/firebase-service-account.json:/app/secrets/firebase-service-account.json:ro
+    -e FIREBASE_SERVICE_ACCOUNT_PATH=/app/secrets/firebase-service-account.json
+    -e GOOGLE_APPLICATION_CREDENTIALS=/app/secrets/firebase-service-account.json
+  )
+  log "Firebase + GCP 서비스 계정 마운트됨"
+fi
+
+# S3 설정 (선택적)
+if [ -n "${AWS_S3_BUCKET:-}" ]; then
+  DOCKER_OPTS+=(
+    -e AWS_S3_BUCKET
+    -e AWS_S3_REGION
+    -e AWS_S3_ACCESS_KEY
+    -e AWS_S3_SECRET_KEY
+  )
+  log "S3 설정 추가됨"
+fi
+
+# Gemini 설정 (선택적)
+if [ -n "${GEMINI_PROJECT_ID:-}" ]; then
+  DOCKER_OPTS+=(
+    -e GEMINI_PROJECT_ID
+    -e GEMINI_ENABLED
+  )
+  log "Gemini 설정 추가됨"
+fi
+
+docker run "${DOCKER_OPTS[@]}" "$IMAGE" >/dev/null
 
 # 헬스체크 (docker inspect로 healthy 상태 확인)
 # Docker health status가 start-period 직후 일시적으로 unhealthy가 될 수 있어

src/main/java/com/ject/vs/ai/config/GeminiConfig.java

@@ -1,6 +1,7 @@
 package com.ject.vs.ai.config;
 
 import com.google.cloud.vertexai.VertexAI;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,10 +11,8 @@
 public class GeminiConfig {
 
     @Bean
+    @ConditionalOnProperty(name = "gemini.enabled", havingValue = "true")
     public VertexAI vertexAI(GeminiProperties properties) {
-        if (!properties.enabled() || properties.projectId() == null || properties.projectId().isBlank()) {
-            return null;
-        }
         return new VertexAI(properties.projectId(), properties.location());
     }
 }

src/main/java/com/ject/vs/ai/port/AiInsightService.java

@@ -17,20 +17,20 @@
 @Slf4j
 public class AiInsightService implements AiInsightUseCase {
 
-    private final VertexAI vertexAI;
+    private final Optional<VertexAI> vertexAI;
     private final GeminiProperties properties;
 
     @Override
     public Optional<AiInsightResult> generateVoteInsight(VoteInsightRequest request) {
-        if (vertexAI == null || !properties.enabled()) {
+        if (vertexAI.isEmpty() || !properties.enabled()) {
             log.warn("AI insight generation is disabled or Gemini is not configured");
             return Optional.empty();
         }
 
         try {
             String prompt = buildPrompt(request);
 
-            GenerativeModel model = new GenerativeModel(properties.model(), vertexAI);
+            GenerativeModel model = new GenerativeModel(properties.model(), vertexAI.get());
             GenerateContentResponse response = model.generateContent(prompt);
             String responseText = ResponseHandler.getText(response);
 

src/main/java/com/ject/vs/config/S3Config.java

@@ -1,6 +1,6 @@
 package com.ject.vs.config;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,7 +11,7 @@
 
 @Configuration
 @EnableConfigurationProperties(S3Properties.class)
-@ConditionalOnProperty(prefix = "aws.s3", name = "bucket")
+@ConditionalOnExpression("!'${aws.s3.bucket:}'.isEmpty()")
 public class S3Config {
 
     @Bean

src/main/java/com/ject/vs/image/adapter/web/ImageController.java

@@ -10,11 +10,12 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import software.amazon.awssdk.services.s3.S3Client;
 
 @RestController
 @RequestMapping("/api/images")
 @RequiredArgsConstructor
-@ConditionalOnBean(ImageService.class)
+@ConditionalOnBean(S3Client.class)
 public class ImageController {
 
     private final ImageService imageService;

src/main/java/com/ject/vs/vote/adapter/web/GuestFreeVoteController.java

@@ -8,6 +8,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +23,13 @@ public class GuestFreeVoteController {
 
     @Operation(summary = "잔여 무료 투표권 조회", description = "비회원의 잔여 무료 투표권 수를 조회합니다. 회원은 remainingFreeVotes가 null로 응답됩니다.")
     @GetMapping("/free-votes")
-    public FreeVotesResponse getFreeVotes(@Parameter(hidden = true) @AnonymousId String anonymousId) {
+    public FreeVotesResponse getFreeVotes(
+            @AuthenticationPrincipal Long userId,
+            @Parameter(hidden = true) @AnonymousId String anonymousId) {
+        // 회원은 무료 투표권 제한이 없으므로 null로 응답
+        if (userId != null) {
+            return new FreeVotesResponse(null, null);
+        }
         return new FreeVotesResponse(
                 guestFreeVoteService.remaining(anonymousId),
                 GuestFreeVote.totalFreeVotes()

src/main/java/com/ject/vs/vote/adapter/web/dto/FreeVotesResponse.java

@@ -1,4 +1,4 @@
 package com.ject.vs.vote.adapter.web.dto;
 
-public record FreeVotesResponse(int remainingFreeVotes, int totalFreeVotes) {
+public record FreeVotesResponse(Integer remainingFreeVotes, Integer totalFreeVotes) {
 }

src/main/java/com/ject/vs/vote/adapter/web/dto/VoteResultResponse.java

@@ -51,12 +51,11 @@ public record GenderDistributionResponse(
         public record GenderDetail(long count, int ratio) {
         }
 
-        public record AgeDistributionResponse(String ageGroup, int ratio, boolean isHighlighted) {
+        public record AgeDistributionResponse(String ageGroup, int ratio, boolean isMyGroup) {
         }
 
         static InsightResponse from(Insight insight) {
             if (insight == null) return null;
-            if (insight.locked()) return new InsightResponse(true, null, null, null, null);
 
             GenderDistributionResponse gender = null;
             if (insight.genderDistribution() != null) {
@@ -72,11 +71,11 @@ static InsightResponse from(Insight insight) {
             List<AgeDistributionResponse> ages = null;
             if (insight.ageDistribution() != null) {
                 ages = insight.ageDistribution().stream()
-                        .map(a -> new AgeDistributionResponse(a.ageGroup(), a.ratio(), a.isHighlighted()))
+                        .map(a -> new AgeDistributionResponse(a.ageGroup(), a.ratio(), a.isHighlighted())) // UseCase의 isHighlighted를 API 스펙의 isMyGroup으로 매핑
                         .toList();
             }
 
-            return new InsightResponse(false, insight.scope() != null ? insight.scope().name() : null,
+            return new InsightResponse(insight.locked(), insight.scope() != null ? insight.scope().name() : null,
                     insight.selectionCount(), gender, ages);
         }
     }

src/main/resources/application-local.yml

@@ -53,3 +53,20 @@ management:
   endpoint:
     health:
       show-details: never
+
+# Firebase 푸시 알림 (선택적 - 파일이 없으면 자동 비활성화)
+firebase:
+  service-account-path: secret/firebase-service-account.json
+
+# Gemini AI 인사이트
+gemini:
+  project-id: jectvsserver
+  enabled: true
+
+# AWS S3 이미지 업로드
+aws:
+  s3:
+    bucket: ject-vs-images
+    region: ap-southeast-2
+    access-key: ${AWS_S3_ACCESS_KEY}
+    secret-key: ${AWS_S3_SECRET_KEY}

src/test/java/com/ject/vs/vote/adapter/web/VoteResultControllerTest.java

@@ -182,7 +182,7 @@ class 회원_참여자_결과 {
                     .andExpect(jsonPath("$.insight.genderDistribution.male.ratio").value(38))
                     .andExpect(jsonPath("$.insight.genderDistribution.highlightedGender").value("FEMALE"))
                     .andExpect(jsonPath("$.insight.ageDistribution[0].ageGroup").value("20s"))
-                    .andExpect(jsonPath("$.insight.ageDistribution[0].isHighlighted").value(true))
+                    .andExpect(jsonPath("$.insight.ageDistribution[0].isMyGroup").value(true))
                     .andExpect(jsonPath("$.aiInsight.available").value(true))
                     .andExpect(jsonPath("$.aiInsight.headline").exists());
         }
@@ -223,8 +223,8 @@ class 회원_미참여자_결과 {
                     .andExpect(jsonPath("$.myVote.selectedOptionId").doesNotExist())
                     .andExpect(jsonPath("$.insight.scope").value("TOTAL"))
                     .andExpect(jsonPath("$.insight.genderDistribution.highlightedGender").value("FEMALE"))
-                    .andExpect(jsonPath("$.insight.ageDistribution[0].isHighlighted").value(false))
-                    .andExpect(jsonPath("$.insight.ageDistribution[1].isHighlighted").value(true))
+                    .andExpect(jsonPath("$.insight.ageDistribution[0].isMyGroup").value(false))
+                    .andExpect(jsonPath("$.insight.ageDistribution[1].isMyGroup").value(true))
                     .andExpect(jsonPath("$.aiInsight.available").value(false))
                     .andExpect(jsonPath("$.aiInsight.headline").doesNotExist());
         }

src/test/java/com/ject/vs/vote/port/VoteResultQueryServiceTest.java

@@ -124,7 +124,7 @@ class getResult {
             given(voteParticipationRepository.findByVoteIdAndUserId(1L, 1L)).willReturn(Optional.empty());
             given(voteParticipationRepository.findGenderDistributionByVote(1L)).willReturn(List.of());
             given(voteParticipationRepository.findAllUserIdsByVoteId(1L)).willReturn(List.of());
-            given(userRepository.findById(1L)).willReturn(Optional.empty());
+            given(userRepository.findAllById(List.of())).willReturn(List.of());
 
             VoteResultDetail result = service.getResult(1L, 1L);
 

src/test/resources/application-test.yml

@@ -50,3 +50,14 @@ management:
   endpoint:
     health:
       show-details: never
+
+# 테스트 환경에서 S3, Gemini 비활성화
+aws:
+  s3:
+    bucket: ~
+
+gemini:
+  enabled: false
+  project-id: test-project
+  location: us-central1
+  model: gemini-1.5-flash