feat: userId 카카오 로그인에서 추출

.github/workflows/deploy.yml

@@ -107,13 +107,13 @@ jobs:
           # 환경변수 파일 업데이트
           cat > .env << EOF
           DB_HOST=${{ secrets.DB_HOST }}
-          DB_NAME=db-wisecard
+          DB_NAME=wisecarddb
           DB_USERNAME=admin
-          DB_PASSWORD=${{ secrets.DB_PASSWORD }}
+          DB_PASSWORD=wisecard
           DB_PORT=3306
-          REDIS_HOST=172.17.0.1
+          REDIS_HOST=redis
           REDIS_PORT=6379
-          REDIS_PASSWORD=1234
+          REDIS_PASSWORD=
           APP_API_KAKAO_KEY=${{ secrets.APP_API_KAKAO_KEY }}
           APP_PORT=8080
           GRPC_PORT=9091

Dockerfile

@@ -35,11 +35,11 @@ WORKDIR /app
 COPY --from=builder /app/build/libs/*.jar app.jar
 
 # 포트 노출 (Spring Boot 기본 포트 + gRPC 포트)
-EXPOSE 8080 9091
+EXPOSE 8080 9090
 
 # 헬스체크 추가
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
   CMD curl -f http://localhost:8080/actuator/health || exit 1
 
 # 애플리케이션 실행
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

build.gradle

@@ -58,7 +58,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation 'me.paulschwarz:spring-dotenv:4.0.0' // .env 읽기
+//    implementation 'me.paulschwarz:spring-dotenv:4.0.0' // .env 읽기
+
+    implementation 'io.github.cdimascio:dotenv-java:2.2.0' // 최신 안정화 버전으로 변경하세요
 
 	// JWT
 	implementation("io.jsonwebtoken:jjwt-api:0.12.6")

docker-compose.yml

@@ -1,6 +1,11 @@
-
 services:
-  # Redis는 AWS ElastiCache를 사용하므로 로컬 컨테이너 제거
+  # Redis 컨테이너 추가
+  redis:
+    image: redis:alpine
+    container_name: redis
+    restart: unless-stopped
+    networks:
+      - wisecard-network
 
   # WiseCard Backend 애플리케이션
   app:
@@ -24,39 +29,23 @@ services:
       JWT_SECRET: ${JWT_SECRET:-}
     ports:
       - "${APP_PORT:-8080}:8080"
-      - "${GRPC_PORT:-9091}:9091"
+      - "${GRPC_PORT:-9090}:9090"
     # volumes:
     #  - app_logs:/app/logs
     networks:
       - wisecard-network
     # Redis는 AWS ElastiCache를 사용하므로 의존성 제거
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/api/health/check"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 40s
 
-  # Nginx 리버스 프록시 (선택사항)
-#  nginx:
-#    image: nginx:alpine
-#    container_name: wisecard-nginx
-#    restart: unless-stopped
-#    ports:
-#      - "80:80"
-#      - "443:443"
-#    volumes:
-#      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-#      - ./nginx/ssl:/etc/nginx/ssl:ro
-#    networks:
-#      - wisecard-network
-#    depends_on:
-#      - app
-
 volumes:
   app_logs:
     driver: local
 
 networks:
   wisecard-network:
-    driver: bridge
+    driver: bridge

gRPC/src/main/proto/cardCompany.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package com.sub.grpc;
+
+enum CardCompany {
+  HANA = 0;
+  HYUNDAI = 1;
+  KOOKMIN = 2;
+  LOTTE = 3;
+  SAMSUNG = 4;
+  SHINHAN = 5;
+}

gRPC/src/main/proto/cardData.proto

@@ -2,64 +2,72 @@ syntax = "proto3";
 
 package com.sub.grpc;
 
-// 온라인/오프라인/BOTH 구분
+import "google/protobuf/empty.proto";
+import "cardCompany.proto";
+
 enum ChannelType {
   ONLINE = 0;
   OFFLINE = 1;
   BOTH = 2;
 }
 
-// 할인 혜택
+enum CardType {
+  CREDIT = 0;
+  DEBIT = 1;
+}
+
 message DiscountBenefit {
-  int64 id = 6; // 변경 식별용 id 추가
-  double rate = 1;           // 정률 할인 (0이면 null)
-  double amount = 2;         // 정액 할인 (0이면 null)
-  int64 minimum_amount = 3;  // 최소 결제 금액 (0이면 null)
-  int64 benefit_limit = 4;   // 최대 혜택 한도 (0이면 null)
-  ChannelType channel = 5;   // 온라인/오프라인/BOTH
+  double rate = 1;           // 정률 할인
+  int32 amount = 2;         // 정액 할인
+  int32 minimum_amount = 3;  // 최소 결제 금액
+  int32 benefit_limit = 4;   // 최대 혜택 한도
+  int32 minimum_spending = 5; // 전월 최소 실적 (원 단위)
+  ChannelType channel = 6;   // 온라인/오프라인/BOTH
 }
 
-// 포인트 적립 혜택
 message PointBenefit {
-  int64 id = 6; // 변경 식별용 id 추가
-  double rate = 1;           // 적립률 (0이면 null)
-  int64 minimum_amount = 2;  // 최소 결제 금액 (0이면 null)
-  int64 benefit_limit = 3;   // 최대 혜택 한도 (0이면 null)
-  ChannelType channel = 4;   // 온라인/오프라인/BOTH
+  string name = 1;            //포인트 이름
+  int32 amount = 2;          //적립금
+  double rate = 3;           // 적립률
+  int32 minimum_amount = 4;  // 최소 결제 금액
+  int32 benefit_limit = 5;   // 최대 혜택 한도
+  int32 minimum_spending = 6; // 전월 최소 실적 (원 단위)
+  ChannelType channel = 7;   // 온라인/오프라인/BOTH
 }
 
-// 캐시백 혜택
 message CashbackBenefit {
-  int64 id = 6; // 변경 식별용 id 추가
-  double rate = 1;           // 캐시백률 (0이면 null)
-  double amount = 2;         // 정액 캐시백 (0이면 null)
-  int64 minimum_amount = 3;  // 최소 결제 금액 (0이면 null)
-  int64 benefit_limit = 4;   // 최대 혜택 한도 (0이면 null)
-  ChannelType channel = 5;   // 온라인/오프라인/BOTH
+  double rate = 1;           // 캐시백률
+  int32 amount = 2;         // 정액 캐시백
+  int32 minimum_amount = 3;  // 최소 결제 금액
+  int32 benefit_limit = 4;   // 최대 혜택 한도
+  int32 minimum_spending = 5; // 전월 최소 실적 (원 단위)
+  ChannelType channel = 6;   // 온라인/오프라인/BOTH
 }
 
-// 카드 단위
 message Benefit {
-  int64 benefit_id = 1;                    // 혜택 고유 ID (기존 혜택 식별용) -> 추가한 것 
-  repeated DiscountBenefit discounts = 2;  // 할인 혜택 배열
-  repeated PointBenefit points = 3;        // 포인트 혜택 배열
-  repeated CashbackBenefit cashbacks = 4;  // 캐시백 혜택 배열
-  repeated string applicable_category = 5; // 카카오맵 업종 코드 (MT1, FD6, CE7 ...)
-  repeated string applicable_targets = 6;  // 브랜드명 또는 한글 설명
+  repeated DiscountBenefit discounts = 1;       // 할인 혜택 배열
+  repeated PointBenefit points = 2;            // 포인트 혜택 배열
+  repeated CashbackBenefit cashbacks = 3;      // 캐시백 혜택 배열
+  repeated string categories = 4;     // 카카오맵 업종 코드 (MT1, FD6, CE7 ...)
+  repeated string targets = 5;      // 브랜드명 또는 한글 설명
+  string summary = 6; //한줄 요약
+}
+
+message CardBenefit {
+  int32 card_id = 1; // 카드 id
+  CardCompany card_company = 2; // 카드사
+  string card_name = 3; //카드명
+  string img_url = 4; //카드 이미지
+  CardType card_type = 5; //CREDIT|DEBIT
+  repeated Benefit benefits = 6; // 카드에 속한 여러 혜택
 }
 
-message CrawledBenefit {
-  int64 card_id = 6; // 변경 식별용 id 추가
-  string card_bank = 1; // 카드사
-  string card_name = 2; //카드명
-  string img_url = 3; //카드 이미지
-  string type = 4; //CreditCard|DebitCard
-  repeated Benefit benefits = 5; // 카드에 속한 여러 혜택
+message CardBenefitList {
+  repeated CardBenefit cardBenefits = 1;
 }
 
-// 카드 여러 장 처리
-message CrawledBenefitList {
-  repeated CrawledBenefit crawledBenefit = 1;
+service CardService {
+  rpc receiveCardBenefits(CardBenefitList) returns (google.protobuf.Empty);
 }
 
 // 응답 메시지
@@ -69,7 +77,7 @@ message CardSaveResponse {
   int32 saved_count = 3;
 }
 
-// gRPC 서비스 정의
+// API 서버 저장 서비스
 service CardDataService {
-  rpc SaveCardData(CrawledBenefitList) returns (CardSaveResponse);
+  rpc SaveCardData(CardBenefitList) returns (CardSaveResponse);
 }

gRPC/src/main/proto/promotion.proto

@@ -0,0 +1,37 @@
+syntax = "proto3";
+
+package com.sub.grpc;
+
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+import "cardCompany.proto";
+
+message CardPromotion {
+  CardCompany card_company = 1; // 카드사
+  string description = 2; // 프로모션 설명
+  string img_url = 3; // 프로모션 이미지
+  string url = 4; // 프로모션 링크
+  google.protobuf.Timestamp start_date = 5; // 시작 날짜
+  google.protobuf.Timestamp end_date = 6;   // 끝 날짜
+}
+
+message CardPromotionList {
+  repeated CardPromotion cardPromotion = 1;
+}
+
+service PromotionService {
+  rpc receivePromotions(CardPromotionList) returns (google.protobuf.Empty);
+}
+
+// 응답 메시지
+message PromotionSaveResponse {
+  bool success = 1;
+  string message = 2;
+  int32 saved_count = 3;
+}
+
+// API 서버 저장 서비스
+service CardPromotionService{
+  rpc SavedPromotions(CardPromotionList) returns (PromotionSaveResponse);
+}

gRPC/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 grpc:
   client:
-    local-grpc-server: # ????? ??
-      address: "static://localhost:9090" # ?? ??(??? ??? ?? ??IP)
+    local-grpc-server:
+      address: "static://localhost:9090"
       negotiationType: "plaintext"
 
 server:
-  port: 50051
+  port: 9092

src/main/java/com/example/demo/auth/repository/RefreshTokenRepository.java

@@ -9,4 +9,6 @@ public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Long
     Optional<RefreshToken> findByMemberId(Long memberId);
 
     Boolean existsByToken(String token);
+
+    void deleteByMemberId(Long memberId);
 }

src/main/java/com/example/demo/auth/service/KakaoLoginService.java

@@ -8,6 +8,7 @@
 import com.example.demo.auth.entity.Member;
 import com.example.demo.auth.jwt.JwtTokenProvider;
 import com.example.demo.auth.repository.MemberRepository;
+import com.example.demo.auth.repository.RefreshTokenRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,35 +24,19 @@ public class KakaoLoginService {
     private final KakaoOAuthClient kakaoOAuthClient;
     private final JwtTokenProvider jwtTokenProvider;
     private final RefreshTokenService refreshTokenService;
-
-    @Transactional
-    public TokenResponse signup(AccessTokenRequest request) {
-        KakaoUserInfo kakaoUserInfo = kakaoOAuthClient.retrieveUserInfo(request.accessToken());
-
-        if (memberRepository.findBySocialId(kakaoUserInfo.getId()).isPresent()) {
-            throw new RuntimeException("이미 가입된 사용자입니다.");
-        }
-
-        Member member = Member.builder()
-                .socialId(kakaoUserInfo.getId())
-                .name(kakaoUserInfo.getNickName())
-                .email(kakaoUserInfo.getEmail())
-                .build();
-
-        Member newMember = memberRepository.save(member);
-
-        String accessToken = jwtTokenProvider.createAccessToken(newMember.getId());
-        String refreshToken = jwtTokenProvider.createRefreshToken(newMember.getId());
-
-        refreshTokenService.save(newMember.getId(), refreshToken);
-
-        return new TokenResponse(accessToken, refreshToken);
-    }
+    private final RefreshTokenRepository refreshTokenRepository;
 
     @Transactional
     public TokenResponse login(AccessTokenRequest request) {
         KakaoUserInfo kakaoUserInfo = kakaoOAuthClient.retrieveUserInfo(request.accessToken());
-        Member member = memberRepository.findBySocialId(kakaoUserInfo.getId()).orElseThrow();
+        Member member = memberRepository.findBySocialId(kakaoUserInfo.getId()).orElseGet(() -> {
+            Member newMember = Member.builder()
+                    .socialId(kakaoUserInfo.getId())
+                    .name(kakaoUserInfo.getNickName())
+                    .email(kakaoUserInfo.getEmail())
+                    .build();
+            return memberRepository.save(newMember);
+        });
 
         String accessToken = jwtTokenProvider.createAccessToken(member.getId());
         String refreshToken = jwtTokenProvider.createRefreshToken(member.getId());
@@ -66,10 +51,10 @@ public TokenResponse reissue(RefreshTokenRequest request) {
         return jwtTokenProvider.reissueToken(request.refreshToken());
     }
 
-
     @Transactional
     public void withdraw() {
         Long memberId = getMemberId();
+        refreshTokenRepository.deleteByMemberId(memberId);
         memberRepository.deleteById(memberId);
     }
 }

src/main/java/com/example/demo/benefit/application/dto/CashbackBenefitDTO.java

@@ -8,6 +8,7 @@ public record CashbackBenefitDTO(
         double amount,
         long minimumAmount,
         long benefitLimit, 
-        ChannelType channel
+        ChannelType channel,
+        Integer minimumSpending
 ) {
 }

src/main/java/com/example/demo/benefit/application/dto/DiscountBenefitDTO.java

@@ -8,6 +8,7 @@ public record DiscountBenefitDTO(
         double amount,
         double minimumAmount,
         double benefitLimit,
-        ChannelType channel
+        ChannelType channel,
+        Integer minimumSpending
 ) {
 }

src/main/java/com/example/demo/benefit/application/dto/PointBenefitDTO.java

@@ -7,6 +7,8 @@ public record PointBenefitDTO(
         double rate,
         long minimumAmount,
         long benefitLimit,
-        ChannelType channel
+        ChannelType channel,
+        Integer minimumSpending,
+        String name
 ){
 }