Release: v0.1.1 배포

.dockerignore

@@ -1 +1,3 @@
-/src/main/resources/secret/
+/src/main/resources/secret/
+/src/main/resources/firebase/
+/.env

.github/workflows/ci_cd.yml

@@ -2,7 +2,7 @@ name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ main ] # develop
+    branches: [ develop ]
   workflow_dispatch:
 
 jobs:
@@ -55,12 +55,12 @@ jobs:
 
             # repo clone / pull
             if [ ! -d /opt/your-app ]; then
-              git clone --branch main https://github.com/Alzheimer-dinger/BE.git /opt/your-app
-              # git clone --branch develop https://github.com/Alzheimer-dinger/BE.git /opt/your-app
+              # git clone --branch main https://github.com/Alzheimer-dinger/BE.git /opt/your-app
+              git clone --branch develop https://github.com/Alzheimer-dinger/BE.git /opt/your-app
             else
               cd /opt/your-app
-              git pull origin main
-              # git pull origin develop
+              # git pull origin main
+              git pull origin develop
             fi
 
             # 작업 디렉토리 이동
@@ -102,4 +102,4 @@ jobs:
 
             # 4) Docker Compose로 배포
             docker-compose pull springboot
-            docker-compose up -d --remove-orphans
+            docker-compose up -d --remove-orphans

.gitignore

@@ -6,9 +6,11 @@ build/
 !**/src/test/**/build/
 /logs/
 /src/main/resources/secret/
+/src/main/resources/firebase/
+/.env
 
---data-binary
--H
+/--data-binary
+/-H
 
 ### STS ###
 .apt_generated

build.gradle

@@ -33,6 +33,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-batch'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation("org.springframework.boot:spring-boot-starter-aop")
 
     // Kafka
     implementation 'org.springframework.kafka:spring-kafka'

docker-compose.yml

@@ -104,6 +104,9 @@ services:
     image: prom/prometheus:latest
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+    command:
+      - --config.file=/etc/prometheus/prometheus.yml
+      - --web.external-url=https://api.alzheimerdinger.com/prometheus/
     ports:
       - "9090:9090"
     networks:
@@ -116,6 +119,8 @@ services:
     environment:
       GF_SECURITY_ADMIN_USER: "${GRAFANA_ADMIN_USER}"
       GF_SECURITY_ADMIN_PASSWORD: "${GRAFANA_ADMIN_PASSWORD}"
+      GF_SERVER_SERVE_FROM_SUB_PATH: "true"
+      GF_SERVER_ROOT_URL: "https://api.alzheimerdinger.com/grafana/"
     ports:
       - "3000:3000"
     networks:

nginx/conf.d/default.conf

@@ -1,29 +1,76 @@
+# 80 포트 - 헬스체크만 예외, 나머지는 HTTPS에 담당
 server {
     listen 80;
     server_name alzheimerdinger.com www.alzheimerdinger.com api.alzheimerdinger.com;
 
-    add_header 'Access-Control-Allow-Origin'  'http://localhost:5173 http://localhost:8080' always;
-    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-    add_header 'Access-Control-Allow-Headers' 'DNT,Authorization,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Upgrade,Connection' always;
-    add_header 'Access-Control-Allow-Credentials' 'true' always;
+    # CORS headers are handled by Spring Boot only
 
-    # API & WebSocket 프록시
-    location / {
-        proxy_pass         http://app;
+    # WebSocket 프록시
+    location /ws/ {
+        proxy_pass         http://call;
         proxy_http_version 1.1;
         proxy_set_header   Host              $host;
         proxy_set_header   X-Real-IP         $remote_addr;
         proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
         proxy_set_header   Upgrade           $http_upgrade;
         proxy_set_header   Connection        $connection_upgrade;
-        proxy_cache_bypass $http_upgrade;
 
         # 타임아웃
-        proxy_read_timeout  3600s;
-        proxy_send_timeout  3600s;
+        proxy_read_timeout  1800s;
+        proxy_send_timeout  1800s;
 
         # 버퍼링 비활성화
         proxy_buffering off;
         proxy_cache_bypass $http_upgrade;
     }
+
+    # API 프록시
+    location / {
+        proxy_pass         http://app;
+        proxy_set_header   Host              $host;
+        proxy_set_header   X-Real-IP         $remote_addr;
+        proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
+    }
+
+    # Grafana
+    location = /grafana { return 301 /grafana/; } # spring으로 프록시 방지
+    location /grafana/ {
+        proxy_pass http://grafana;
+        proxy_http_version 1.1;
+
+        proxy_set_header   Host              $host;
+        proxy_set_header   X-Real-IP         $remote_addr;
+
+        proxy_set_header X-Forwarded-Proto  $xfp;
+        proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Prefix /grafana;
+
+        proxy_set_header   Upgrade           $http_upgrade;
+        proxy_set_header   Connection        "upgrade";
+
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 3600s;
+        proxy_redirect     off;
+    }
+
+    # Prometheus
+    location = /prometheus { return 301 /prometheus/; } # spring으로 프록시 방지
+    location /prometheus/ {
+        proxy_pass http://prometheus;
+        proxy_http_version 1.1;
+
+        proxy_set_header   Host              $host;
+        proxy_set_header   X-Real-IP         $remote_addr;
+
+        proxy_set_header X-Forwarded-Proto  $xfp;
+        proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Prefix /prometheus;
+
+        proxy_set_header   Upgrade           $http_upgrade;
+        proxy_set_header   Connection        "upgrade";
+
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 3600s;
+        proxy_redirect     off;
+    }
 }

nginx/nginx.conf

@@ -10,21 +10,26 @@ http {
     default upgrade;
     ''      close;
   }
+
+  # LB가 준 값이 있으면 그대로, 없으면 https로 간주
+  map $http_x_forwarded_proto $xfp {
+      default $http_x_forwarded_proto;
+      ""      https;
+    }
 
   upstream app {
     server springboot:8080;
   }
+  upstream call {
+    server 172.17.0.1:8765;
+  }
+  upstream grafana {
+    server grafana:3000;
+  }
+  upstream prometheus {
+      server prometheus:9090;
+  }
 
   # Load server configurations from conf.d
   include /etc/nginx/conf.d/*.conf;
-
-  # HTTPS 설정(SSL 인증서가 있을 경우)
-  # server {
-  #   listen 443 ssl;
-  #   ssl_certificate     /etc/nginx/certs/fullchain.pem;
-  #   ssl_certificate_key /etc/nginx/certs/privkey.pem;
-  #   include             /etc/nginx/certs/options-ssl-nginx.conf;
-  #   ssl_dhparam         /etc/nginx/certs/ssl-dhparams.pem;
-  #   …위와 동일한 location / 설정…
-  # }
 }

src/main/java/opensource/alzheimerdinger/core/domain/analysis/application/dto/response/AnalysisDayResponse.java

@@ -1,23 +1,16 @@
 package opensource.alzheimerdinger.core.domain.analysis.application.dto.response;
 
 import java.time.LocalDate;
-import java.util.List;
 
 public record AnalysisDayResponse(
         String userId,
         LocalDate analysisDate,
+        boolean hasData,
 
         Double happyScore,
         Double sadScore,
         Double angryScore,
         Double surprisedScore,
-        Double boredScore,
-
-        List<EmotionSummary> monthlyEmotionData
+        Double boredScore
 ) {
-
-    public record EmotionSummary(
-            LocalDate date,
-            String emotionType
-    ) {}
 }

src/main/java/opensource/alzheimerdinger/core/domain/analysis/application/dto/response/AnalysisMonthlyEmotionResponse.java

@@ -0,0 +1,17 @@
+package opensource.alzheimerdinger.core.domain.analysis.application.dto.response;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public record AnalysisMonthlyEmotionResponse(
+        String userId,
+        LocalDate month,
+        List<EmotionSummary> monthlyEmotionData
+) {
+    public record EmotionSummary(
+            LocalDate date,
+            String emotionType
+    ) {}
+}
+
+

src/main/java/opensource/alzheimerdinger/core/domain/analysis/application/dto/response/AnalysisResponse.java

@@ -10,12 +10,12 @@ public record AnalysisResponse(
 
         Double averageRiskScore,
 
-        List<EmotionDataPoint> emotionTimeline,
+        List<EmotionDataScore> emotionTimeline,
 
         Integer totalParticipate,
         String averageCallTime // 임시값으로 지정되어 있는 상황 AI쪽 구현 후 수정 필요
 ) {    
-    public record EmotionDataPoint(
+    public record EmotionDataScore(
             LocalDate date,
 
             Double happyScore,

src/main/java/opensource/alzheimerdinger/core/domain/analysis/application/usecase/AnalysisUseCase.java

@@ -5,8 +5,10 @@
 import opensource.alzheimerdinger.core.domain.analysis.application.dto.response.AnalysisResponse;
 import opensource.alzheimerdinger.core.domain.analysis.application.dto.response.AnalysisDayResponse;
 import opensource.alzheimerdinger.core.domain.analysis.application.dto.response.AnalysisReportResponse;
+import opensource.alzheimerdinger.core.domain.analysis.application.dto.response.AnalysisMonthlyEmotionResponse;
 import opensource.alzheimerdinger.core.domain.analysis.domain.entity.AnalysisReport;
 import opensource.alzheimerdinger.core.domain.analysis.domain.service.AnalysisService;
+import opensource.alzheimerdinger.core.global.metric.UseCaseMetric;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -20,25 +22,34 @@ public class AnalysisUseCase {
 
 
     //특정 기간 감정 분석 데이터 조회
+    @UseCaseMetric(domain = "analysis", value = "get-period", type = "query")
     public AnalysisResponse getAnalysisPeriodData(String userId, LocalDate start, LocalDate end) {
         return analysisService.getPeriodData(userId, start, end);
     }
 
 
     //일별 감정 분석 데이터 조회 (달력용 데이터 포함)
+    @UseCaseMetric(domain = "analysis", value = "get-day", type = "query")
     public AnalysisDayResponse getAnalysisDayData(String userId, LocalDate date) {
         return analysisService.getDayData(userId, date);
     }
 
+    // 월간 달력용 데이터 조회
+    @UseCaseMetric(domain = "analysis", value = "get-month", type = "query")
+    public AnalysisMonthlyEmotionResponse getAnalysisMonthlyEmotionData(String userId, LocalDate date) {
+        return analysisService.getMonthlyEmotionData(userId, date);
+    }
+
     //기존 분석 리포트 중 가장 최근 리포트 조회
+    @UseCaseMetric(domain = "analysis", value = "get-latest-report", type = "query")
     public AnalysisReportResponse getLatestReport(String userId, LocalDate periodEnd) {
         AnalysisReport latestReport = analysisService.findLatestReport(userId, periodEnd);
 
         return new AnalysisReportResponse(
                 latestReport.getAnalysisReportId(),
                 userId,
                 latestReport.getCreatedAt().toLocalDate(),
-                latestReport.getReport()
+                latestReport.getContent()
         );
     }
 }

src/main/java/opensource/alzheimerdinger/core/domain/analysis/domain/entity/AnalysisReport.java

@@ -6,21 +6,31 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import opensource.alzheimerdinger.core.domain.user.domain.entity.User;
 import opensource.alzheimerdinger.core.global.common.BaseEntity;
+import opensource.alzheimerdinger.core.domain.user.domain.entity.User;
 
 @Entity
 @Getter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Table(name = "analysis_report")
+@Table(name = "reports")
 public class AnalysisReport extends BaseEntity {
 
     @Id @Tsid
+    @Column(name = "id")
     private String analysisReportId;
 
-    private String report;
+    // Self reference to base report (nullable)
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "base_report_id")
+    private AnalysisReport baseReport;
+
+    @Column(name = "session_id", nullable = false)
+    private String sessionId;
+
+    @Column(name = "content", columnDefinition = "TEXT")
+    private String content;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)

src/main/java/opensource/alzheimerdinger/core/domain/analysis/domain/entity/DementiaAnalysis.java

@@ -0,0 +1,35 @@
+package opensource.alzheimerdinger.core.domain.analysis.domain.entity;
+
+import io.hypersistence.utils.hibernate.id.Tsid;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import opensource.alzheimerdinger.core.domain.user.domain.entity.User;
+import opensource.alzheimerdinger.core.global.common.BaseEntity;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "dementia_analysis")
+public class DementiaAnalysis extends BaseEntity {
+
+    @Id @Tsid
+    @Column(name = "id")
+    private String dementiaId;
+
+    @Column(name = "session_id", nullable = false)
+    private String sessionId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(name = "risk_score", nullable = false)
+    private double riskScore;
+}
+
+