[release] 진행상황 Main 브랜치에 반영

.github/workflows/cd-develop.yml

@@ -3,6 +3,9 @@ name: CI/CD
 on:
 #  push:
 #    branches: [ "feature/seungmin" ]
+
+#push:
+#  branches: [ "feature/seungin" ]
   pull_request:
     branches: [ "main" ]
 
@@ -186,7 +189,7 @@ jobs:
         run: |
           curl -H "Content-Type: application/json" \
                -X POST \
-               -d "{\"content\": \"✅ EC2 배포 성공! (브랜치: develop)\"}" \
+               -d "{\"content\": \"✅ EC2 배포 성공!\"}" \
                ${{ secrets.DISCORD_WEBHOOK_URL }}
 
       # ❌ 배포 실패 알림 (Discord)

src/main/java/com/wayble/server/ServerApplication.java

@@ -1,6 +1,7 @@
 package com.wayble.server;
 
-import com.wayble.server.direction.external.tmap.TMapProperties;
+import com.wayble.server.common.client.tmap.TMapProperties;
+import com.wayble.server.direction.external.kric.KricProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration;
@@ -15,8 +16,8 @@
 )
 @EnableJpaAuditing
 @EnableScheduling
-@EnableElasticsearchRepositories(basePackages = "com.wayble.server.explore.repository")
-@EnableConfigurationProperties(TMapProperties.class)
+@EnableConfigurationProperties({TMapProperties.class, KricProperties.class})
+@EnableElasticsearchRepositories(basePackages = {"com.wayble.server.explore.repository", "com.wayble.server.logging.repository", "com.wayble.server.direction.repository"})
 @EntityScan(basePackages = "com.wayble.server")
 public class ServerApplication {
 

src/main/java/com/wayble/server/admin/controller/AdminController.java

@@ -1,9 +1,11 @@
 package com.wayble.server.admin.controller;
 
+import com.wayble.server.admin.dto.DailyStatsDto;
 import com.wayble.server.admin.dto.SystemStatusDto;
 import com.wayble.server.admin.service.AdminSystemService;
 import com.wayble.server.admin.service.AdminUserService;
 import com.wayble.server.admin.service.AdminWaybleZoneService;
+import com.wayble.server.common.response.CommonResponse;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +16,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Slf4j
 @Controller
@@ -74,13 +77,17 @@ public String adminDashboard(HttpSession session, Model model) {
             adminSystemService.isFileStorageHealthy()
         );
 
-        // 통계 데이터 조회
+        // 일일 통계 데이터 조회
+        DailyStatsDto dailyStats = adminSystemService.getDailyStats();
+
+        // 기존 통계 데이터 조회 (원래대로 복구)
         long totalUserCount = adminUserService.getTotalUserCount();
         long totalDeletedUserCount = adminUserService.getTotalDeletedUserCount();
         long totalWaybleZoneCount = adminWaybleZoneService.getTotalWaybleZoneCounts();
 
         model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
         model.addAttribute("systemStatus", systemStatus);
+        model.addAttribute("dailyStats", dailyStats);
         model.addAttribute("totalUserCount", totalUserCount);
         model.addAttribute("totalDeletedUserCount", totalDeletedUserCount);
         model.addAttribute("totalWaybleZoneCount", totalWaybleZoneCount);
@@ -93,4 +100,16 @@ public String adminLogout(HttpSession session) {
         log.info("관리자 로그아웃");
         return "redirect:/admin";
     }
+
+    @GetMapping("/api/daily-stats")
+    @ResponseBody
+    public CommonResponse<DailyStatsDto> getDailyStats(HttpSession session) {
+        // 로그인 확인 (API용)
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return CommonResponse.error(401, "관리자 인증이 필요합니다.");
+        }
+
+        DailyStatsDto dailyStats = adminSystemService.getDailyStats();
+        return CommonResponse.success(dailyStats);
+    }
 }

src/main/java/com/wayble/server/admin/dto/DailyStatsDto.java

@@ -0,0 +1,15 @@
+package com.wayble.server.admin.dto;
+
+import lombok.Builder;
+
+import java.time.LocalDate;
+
+@Builder
+public record DailyStatsDto(
+        LocalDate date,
+        long dailyRegistrationCount,
+        long dailyActiveUserCount,
+        long totalUserCount,
+        long totalWaybleZoneCount
+) {
+}

src/main/java/com/wayble/server/admin/service/AdminSystemService.java

@@ -2,12 +2,15 @@
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+import com.wayble.server.admin.dto.DailyStatsDto;
+import com.wayble.server.logging.service.UserActionLogService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
+import java.time.LocalDate;
 
 @Slf4j
 @Service
@@ -16,6 +19,9 @@ public class AdminSystemService {
 
     private final ElasticsearchClient elasticsearchClient;
     private final DataSource dataSource;
+    private final UserActionLogService userActionLogService;
+    private final AdminUserService adminUserService;
+    private final AdminWaybleZoneService adminWaybleZoneService;
 
     public boolean isElasticsearchHealthy() {
         try {
@@ -46,4 +52,42 @@ public boolean isFileStorageHealthy() {
         // 파일 스토리지 상태 체크 (예: S3 연결 확인 등)
         return true;
     }
+
+    public DailyStatsDto getDailyStats() {
+        try {
+            LocalDate today = LocalDate.now();
+
+            // 일일 가입자 수
+            long dailyRegistrationCount = userActionLogService.getTodayUserRegistrationCount();
+
+            // 일일 활성 유저 수 (방문자)
+            long dailyActiveUserCount = userActionLogService.getTodayActiveUserCount();
+
+            // 전체 유저 수
+            long totalUserCount = adminUserService.getTotalUserCount();
+
+            // 전체 웨이블존 수
+            long totalWaybleZoneCount = adminWaybleZoneService.getTotalWaybleZoneCounts();
+
+            return DailyStatsDto.builder()
+                    .date(today)
+                    .dailyRegistrationCount(dailyRegistrationCount)
+                    .dailyActiveUserCount(dailyActiveUserCount)
+                    .totalUserCount(totalUserCount)
+                    .totalWaybleZoneCount(totalWaybleZoneCount)
+                    .build();
+
+        } catch (Exception e) {
+            log.error("Failed to get daily stats", e);
+
+            // 에러 발생시 기본값 반환
+            return DailyStatsDto.builder()
+                    .date(LocalDate.now())
+                    .dailyRegistrationCount(0)
+                    .dailyActiveUserCount(0)
+                    .totalUserCount(0)
+                    .totalWaybleZoneCount(0)
+                    .build();
+        }
+    }
 }

src/main/java/com/wayble/server/admin/service/AdminUserService.java

@@ -165,8 +165,8 @@ private AdminUserThumbnailDto convertToThumbnailDto(Object[] row) {
         String email = (String) row[2];
         LocalDate birthDate = row[3] != null ? ((Date) row[3]).toLocalDate() : null;
         Gender gender = row[4] != null ? Gender.valueOf((String) row[4]) : null;
-        LoginType loginType = LoginType.valueOf((String) row[5]);
-        UserType userType = UserType.valueOf((String) row[6]);
+        LoginType loginType = row[5] != null ? LoginType.valueOf((String) row[5]) : null;
+        UserType userType = row[6] != null ? UserType.valueOf((String) row[6]) : null;
         String disabilityType = (String) row[7];
         String mobilityAid = (String) row[8];
 
@@ -181,8 +181,8 @@ private AdminUserDetailDto convertToDetailDto(Object[] row, long reviewCount, lo
         String email = (String) row[3];
         LocalDate birthDate = row[4] != null ? ((Date) row[4]).toLocalDate() : null;
         Gender gender = row[5] != null ? Gender.valueOf((String) row[5]) : null;
-        LoginType loginType = LoginType.valueOf((String) row[6]);
-        UserType userType = UserType.valueOf((String) row[7]);
+        LoginType loginType = row[6] != null ? LoginType.valueOf((String) row[6]) : null;
+        UserType userType = row[7] != null ? UserType.valueOf((String) row[7]) : null;
         String profileImageUrl = (String) row[8];
         String disabilityType = (String) row[9];
         String mobilityAid = (String) row[10];
@@ -203,8 +203,8 @@ private AdminUserDetailDto convertToDetailDtoWithStats(Object[] row, long review
         String email = (String) row[3];
         LocalDate birthDate = row[4] != null ? ((Date) row[4]).toLocalDate() : null;
         Gender gender = row[5] != null ? Gender.valueOf((String) row[5]) : null;
-        LoginType loginType = LoginType.valueOf((String) row[6]);
-        UserType userType = UserType.valueOf((String) row[7]);
+        LoginType loginType = row[6] != null ? LoginType.valueOf((String) row[6]) : null;
+        UserType userType = row[7] != null ? UserType.valueOf((String) row[7]) : null;
         String profileImageUrl = (String) row[8];
         String disabilityType = (String) row[9];
         String mobilityAid = (String) row[10];

src/main/java/com/wayble/server/admin/service/AdminWaybleZoneService.java

@@ -7,6 +7,7 @@
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneUpdateDto;
 import com.wayble.server.admin.exception.AdminErrorCase;
 import com.wayble.server.admin.repository.AdminWaybleZoneRepository;
+import com.wayble.server.aws.AmazonS3Manager;
 import com.wayble.server.common.exception.ApplicationException;
 import com.wayble.server.explore.service.WaybleZoneDocumentService;
 import com.wayble.server.user.repository.UserPlaceWaybleZoneMappingRepository;
@@ -31,6 +32,7 @@ public class AdminWaybleZoneService {
     private final WaybleZoneRepository waybleZoneRepository;
     private final UserPlaceWaybleZoneMappingRepository userPlaceWaybleZoneMappingRepository;
     private final WaybleZoneVisitLogRepository waybleZoneVisitLogRepository;
+    private final AmazonS3Manager amazonS3Manager;
 
     public long getTotalWaybleZoneCounts() {
         return adminWaybleZoneRepository.count();
@@ -87,6 +89,18 @@ public Long updateWaybleZone(AdminWaybleZoneUpdateDto updateDto) {
             WaybleZone waybleZone = waybleZoneRepository.findById(updateDto.id())
                     .orElseThrow(() -> new ApplicationException(AdminErrorCase.WAYBLE_ZONE_NOT_FOUND));
 
+            // 메인 이미지 변경 시 기존 이미지 S3에서 삭제
+            String oldImageUrl = waybleZone.getMainImageUrl();
+            String newImageUrl = updateDto.mainImageUrl();
+            if (oldImageUrl != null && !oldImageUrl.equals(newImageUrl)) {
+                try {
+                    amazonS3Manager.deleteImageFileFromS3(oldImageUrl);
+                    log.info("기존 메인 이미지 삭제 완료 - URL: {}", oldImageUrl);
+                } catch (Exception e) {
+                    log.warn("기존 메인 이미지 삭제 실패 - URL: {}, 오류: {}", oldImageUrl, e.getMessage());
+                }
+            }
+
             // 주소 정보 업데이트
             com.wayble.server.common.entity.Address updatedAddress = com.wayble.server.common.entity.Address
                     .builder()
@@ -135,6 +149,16 @@ public void deleteWaybleZone(Long waybleZoneId) {
 
             log.info("웨이블존 삭제 시작 - ID: {}, 이름: {}", waybleZoneId, waybleZone.getZoneName());
 
+            // 메인 이미지 S3에서 삭제
+            if (waybleZone.getMainImageUrl() != null) {
+                try {
+                    amazonS3Manager.deleteImageFileFromS3(waybleZone.getMainImageUrl());
+                    log.info("메인 이미지 삭제 완료 - URL: {}", waybleZone.getMainImageUrl());
+                } catch (Exception e) {
+                    log.warn("메인 이미지 삭제 실패 - URL: {}, 오류: {}", waybleZone.getMainImageUrl(), e.getMessage());
+                }
+            }
+
             // 연관된 리뷰들 soft delete
             waybleZone.getReviewList().forEach(review -> {
                 review.softDelete();

src/main/java/com/wayble/server/auth/entity/RefreshToken.java

@@ -15,7 +15,7 @@ public class RefreshToken {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(nullable = false, unique = true) // 1인 1토큰
+    @Column(name = "user_id", nullable = false, unique = true)
     private Long userId;
 
     @Column(nullable = false)

src/main/java/com/wayble/server/auth/service/AuthService.java

@@ -2,6 +2,7 @@
 
 import com.wayble.server.common.config.security.jwt.JwtTokenProvider;
 import com.wayble.server.common.exception.ApplicationException;
+import com.wayble.server.logging.service.UserActionLogService;
 import com.wayble.server.user.dto.UserLoginRequestDto;
 import com.wayble.server.auth.dto.TokenResponseDto;
 import com.wayble.server.auth.entity.RefreshToken;
@@ -22,6 +23,7 @@ public class AuthService {
     private final RefreshTokenRepository refreshTokenRepository;
     private final PasswordEncoder encoder;
     private final JwtTokenProvider jwtProvider;
+    private final UserActionLogService userActionLogService;
 
     public TokenResponseDto login(UserLoginRequestDto req) {
         User user = userRepository.findByEmailAndLoginType(req.email(), req.loginType())
@@ -42,6 +44,12 @@ public TokenResponseDto login(UserLoginRequestDto req) {
                 .build();
         refreshTokenRepository.save(entity);
 
+        // 첫 로그인시에도 활성 유저 로그 저장 (비동기, 하루 1회만)
+        userActionLogService.logTokenRefresh(
+                user.getId(), 
+                user.getUserType() != null ? user.getUserType().name() : null
+        );
+
         return new TokenResponseDto(accessToken, refreshToken);
     }
 
@@ -73,6 +81,13 @@ public TokenResponseDto reissue(String refreshToken) {
         refreshTokenRepository.save(saved);
 
         String newAccessToken = jwtProvider.generateToken(userId, user.getUserType() != null ? user.getUserType().name() : null);
+
+        // 토큰 갱신 로그 저장 (비동기, 하루 1회만)
+        userActionLogService.logTokenRefresh(
+                userId, 
+                user.getUserType() != null ? user.getUserType().name() : null
+        );
+
         return new TokenResponseDto(newAccessToken, newRefreshToken);
     }
 

src/main/java/com/wayble/server/auth/service/KakaoLoginService.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wayble.server.common.config.security.jwt.JwtTokenProvider;
 import com.wayble.server.common.exception.ApplicationException;
+import com.wayble.server.logging.service.UserActionLogService;
 import com.wayble.server.user.dto.KakaoLoginRequestDto;
 import com.wayble.server.user.dto.KakaoLoginResponseDto;
 import com.wayble.server.user.dto.KakaoUserInfoDto;
@@ -26,6 +27,7 @@ public class KakaoLoginService {
     private final JwtTokenProvider jwtProvider;
     private final ObjectMapper objectMapper;
     private final WebClient webClient;
+    private final UserActionLogService userActionLogService;
 
     private static final String KAKAO_USERINFO_URL = "https://kapi.kakao.com/v2/user/me";
 
@@ -66,6 +68,21 @@ public KakaoLoginResponseDto kakaoLogin(KakaoLoginRequestDto request) {
         );
         String refreshToken = jwtProvider.generateRefreshToken(user.getId());
 
+        // 로그 저장 (비동기)
+        if (isNewUser) {
+            // 신규 가입 로그
+            userActionLogService.logUserRegister(
+                    user.getId(), 
+                    LoginType.KAKAO.name(), 
+                    user.getUserType() != null ? user.getUserType().name() : null
+            );
+        }
+
+        // 모든 카카오 로그인시 활성 유저 로그 저장 (하루 1회만)
+        userActionLogService.logTokenRefresh(
+                user.getId(), 
+                user.getUserType() != null ? user.getUserType().name() : null
+        );
 
         return KakaoLoginResponseDto.builder()
                 .accessToken(accessToken)