main으로 병합

.github/workflows/cd.yml

@@ -51,6 +51,16 @@ jobs:
           token: ${{ secrets.GIT_ACTION_TOKEN }}
           submodules: true
 
+      - name: Copy docker-compose.yml to Server
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          port: ${{ secrets.SSH_PORT }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          source: "docker-compose.yml"
+          target: "~/app"
+
       - name: Deploy on server
         uses: appleboy/ssh-action@master
         with:
@@ -68,6 +78,6 @@ jobs:
             docker compose down
             docker compose pull
             docker compose up -d --build
-
+            
             echo "🧼 사용하지 않는 이미지 정리"
             docker image prune -f

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "PICKL_BE_Config"]
 	path = PICKL_BE_Config
 	url = https://github.com/TEAMPICKL/PICKL_BE_Config.git
+	branch = main

build.gradle

@@ -30,10 +30,39 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation "org.springframework.boot:spring-boot-starter-cache"
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     // ==== Database ====
+    // MySQL JDBC 드라이버
     runtimeOnly 'com.mysql:mysql-connector-j'
 
+    // ==== Flyway (DB 마이그레이션) ====
+    // - flyway-core: 마이그레이션 엔진
+    // - flyway-mysql: MySQL 전용 기능/방언 분리 모듈 (Flyway 10+)
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-mysql'
+
+    // 레이트리미트/재시도
+    implementation "io.github.resilience4j:resilience4j-reactor:2.2.0"
+    implementation "io.github.resilience4j:resilience4j-ratelimiter:2.2.0"
+    implementation "io.github.resilience4j:resilience4j-bulkhead:2.2.0"
+
+    // Geometry
+    implementation "org.locationtech.jts:jts-core:1.19.0"
+    implementation "org.hibernate.orm:hibernate-spatial:6.6.22.Final"
+
+    // csv 정제
+    implementation "org.springframework.boot:spring-boot-starter-webflux" // WebClient
+    implementation "org.apache.commons:commons-csv:1.11.0"
+    implementation "org.slf4j:slf4j-api:2.0.13"
+    implementation "com.jayway.jsonpath:json-path:2.9.0"
+
+    // 원본 좌표 코드
+    implementation "org.locationtech.proj4j:proj4j:1.3.0"
+    implementation "org.locationtech.proj4j:proj4j-epsg:1.3.0"
+
     // ==== Lombok ====
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
@@ -46,6 +75,17 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
+    // ==== s3 ====
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.463'
+
+    // ==== Netty native DNS for macOS (Netty가 네이티브 DNS 리졸버를 사용) ====
+    // Spring Boot의 dependency management가 Netty 버전을 맞춰주므로 버전 표기는 생략
+    implementation "io.netty:netty-resolver-dns-native-macos::osx-aarch_64"
+
+    // ==== Cache ====
+    implementation "com.github.ben-manes.caffeine:caffeine:3.1.8"
+
     // ==== Test ====
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -98,4 +138,13 @@ test {
         def profile = project.hasProperty('profile') ? project.property('profile').toString() : 'local'
         jvmArgs = ["-Dspring.profiles.active=${profile}"]
     }
+}
+
+tasks.withType(JavaExec) {
+    jvmArgs += ["-Dfile.encoding=UTF-8"]
+}
+
+tasks.named('bootRun') {
+    args '--spring.profiles.active=local'
+    systemProperty 'spring.config.additional-location', "file:${projectDir}/PICKL_BE_Config/"
 }

docker-compose.yml

@@ -1,20 +1,34 @@
-version: "3.8"
-
 services:
   app:
-    image: ${DOCKER_USERNAME}/${DOCKER_REPO}
+    image: ${DOCKER_USERNAME}/${DOCKER_REPO}:latest
     ports:
       - "8080:8080"
     environment:
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}
-      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/pickl
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/pickl?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&useSSL=false
       - SPRING_DATASOURCE_USERNAME=root
       - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}
+      - SPRING_JPA_HIBERNATE_DDL_AUTO=update
+      - SPRING_FLYWAY_ENABLED=false
     command:
       - java -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE} -jar app.jar
     depends_on:
       mysql:
         condition: service_healthy
+      langchain:
+        condition: service_healthy
+    networks:
+      - pickl-network
+
+  langchain:
+    image: ${DOCKER_USERNAME}/${CHATBOT_REPO}:${CHATBOT_TAG:-latest}
+    env_file: .env
+    command: [ "uvicorn","app.main:app","--host","0.0.0.0","--port","8000" ]  # ← 추가
+    healthcheck:
+      test: [ "CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/health')" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     networks:
       - pickl-network
 
@@ -28,7 +42,7 @@ services:
     volumes:
       - mysql-data:/var/lib/mysql
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -49,6 +63,19 @@ services:
     networks:
       - pickl-network
 
+  dozzle:
+    image: amir20/dozzle:latest
+    container_name: dozzle
+    restart: unless-stopped
+    environment:
+      - DOZZLE_BASE=/dozzle
+      - DOZZLE_AUTH_PROVIDER=simple
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./dozzle/users.yml:/data/users.yml:ro
+    networks:
+      - pickl-network
+
 networks:
   pickl-network:
     driver: bridge

gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Dfile.encoding=UTF-8

src/main/java/com/likelion/picklbe/PicklbeApplication.java

@@ -2,7 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableCaching
+@EnableJpaAuditing
+@EnableScheduling
 @SpringBootApplication
 public class PicklbeApplication {
 

src/main/java/com/likelion/picklbe/domain/auth/service/AuthService.java

@@ -47,7 +47,7 @@ public LoginResponse login(LoginRequest loginRequest) {
     authenticationManager.authenticate(authenticationToken);
 
     // 액세스 토큰 및 리프레시 토큰 발급
-    String accessToken = jwtProvider.createAccessToken(user.getUsername());
+    String accessToken = jwtProvider.createAccessToken(user.getUsername(), user.getId());
     String refreshToken =
         jwtProvider.createRefreshToken(user.getUsername(), UUID.randomUUID().toString());
 

src/main/java/com/likelion/picklbe/domain/brand/Brand.java

@@ -0,0 +1,142 @@
+package com.likelion.picklbe.domain.brand;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public enum Brand {
+  EMART_EVERYDAY(
+      "emart-everyday",
+      "이마트 에브리데이",
+      "emart_everyday.png",
+      List.of(
+          Pattern.compile("이마트\\s*에브리데이"),
+          Pattern.compile("emart\\s*everyday", Pattern.CASE_INSENSITIVE))),
+  NO_BRAND(
+      "no-brand",
+      "노브랜드",
+      "no_brand.png",
+      List.of(
+          Pattern.compile("노\\s*브랜드"), Pattern.compile("no\\s*brand", Pattern.CASE_INSENSITIVE))),
+  EMART(
+      "emart",
+      "이마트",
+      "emart.png",
+      List.of(
+          Pattern.compile("\\b이마트\\b"), Pattern.compile("\\bemart\\b", Pattern.CASE_INSENSITIVE))),
+  HOMEPLUS(
+      "homeplus",
+      "홈플러스",
+      "homeplus.png",
+      List.of(
+          Pattern.compile("홈\\s*플러스"), Pattern.compile("home\\s*plus", Pattern.CASE_INSENSITIVE))),
+  COSTCO(
+      "costco",
+      "코스트코",
+      "costco.png",
+      List.of(Pattern.compile("코스트코"), Pattern.compile("costco", Pattern.CASE_INSENSITIVE))),
+  LOTTE_MART(
+      "lotte-mart",
+      "롯데마트",
+      "lotte_mart.png",
+      List.of(
+          Pattern.compile("롯데\\s*마트"), Pattern.compile("lotte\\s*mart", Pattern.CASE_INSENSITIVE))),
+  LOTTE_SUPER(
+      "lotte-super",
+      "롯데슈퍼",
+      "lotte_super.png",
+      List.of(
+          Pattern.compile("롯데\\s*슈퍼"),
+          Pattern.compile("lotte\\s*super", Pattern.CASE_INSENSITIVE))),
+  LOTTE_FRESH(
+      "lotte-fresh",
+      "롯데프레시",
+      "lotte_fresh.png",
+      List.of(
+          Pattern.compile("롯데\\s*프레시"),
+          Pattern.compile("lotte\\s*fresh", Pattern.CASE_INSENSITIVE))),
+  TRADERS(
+      "traders",
+      "트레이더스",
+      "traders.png",
+      List.of(Pattern.compile("트레이더스"), Pattern.compile("traders", Pattern.CASE_INSENSITIVE))),
+  HANARO(
+      "hanaro",
+      "하나로마트",
+      "hanaro.png",
+      List.of(
+          Pattern.compile("(농협|하나로)\\s*마트"),
+          Pattern.compile("하나로클럽"),
+          Pattern.compile("hanaro", Pattern.CASE_INSENSITIVE))),
+  GS_SUPER(
+      "gs-super",
+      "GS슈퍼",
+      "gs_super.png",
+      List.of(
+          Pattern.compile("지에스리테일"),
+          Pattern.compile("\\bGS\\b\\s*(THE\\s*FRESH|슈퍼)?", Pattern.CASE_INSENSITIVE))),
+  DEFAULT("default", "기타", "mart_default.png", List.of());
+
+  private final String code;
+  private final String displayName;
+  private final String filename;
+  private final List<Pattern> patterns;
+
+  Brand(String code, String displayName, String filename, List<Pattern> patterns) {
+    this.code = code;
+    this.displayName = displayName;
+    this.filename = filename;
+    this.patterns = patterns;
+  }
+
+  public String code() {
+    return code;
+  }
+
+  public String filename() {
+    return filename;
+  }
+
+  public String displayName() {
+    return displayName;
+  }
+
+  private static final Map<String, Brand> BY_CODE;
+
+  static {
+    Map<String, Brand> m = new HashMap<>();
+    for (Brand b : values()) {
+      m.put(b.code().toLowerCase(Locale.ROOT), b);
+    }
+    BY_CODE = Collections.unmodifiableMap(m);
+  }
+
+  public static Brand fromCodeSafe(String code) {
+    if (code == null || code.isBlank()) {
+      return DEFAULT;
+    }
+    Brand b = BY_CODE.get(code.toLowerCase(Locale.ROOT));
+    return (b != null) ? b : DEFAULT;
+  }
+
+  public static Brand fromStoreName(String name) {
+    if (name == null || name.isBlank()) {
+      return DEFAULT;
+    }
+    // 우선순위: 에브리데이 → GS → 이마트 등 (선언 순서 유지)
+    for (Brand b : values()) {
+      if (b == DEFAULT) {
+        continue;
+      }
+      for (Pattern p : b.patterns) {
+        if (p.matcher(name).find()) {
+          return b;
+        }
+      }
+    }
+    return DEFAULT;
+  }
+}