112 feature 테스트 계정 생성 및 로그인 기능 구현

src/main/java/dev/book/accountbook/controller/BudgetController.java

@@ -22,8 +22,7 @@ public class BudgetController implements BudgetApi {
     @GetMapping
     public ResponseEntity<BudgetResponse> getBudget(@AuthenticationPrincipal CustomUserDetails userDetails, @RequestParam LocalDate date) {
         Long userId = userDetails.user().getId();
-        int month = date.getMonthValue();
-        BudgetResponse response = budgetService.getBudget(userId, month);
+        BudgetResponse response = budgetService.getBudget(userId, date);
 
         return ResponseEntity.ok(response);
     }

src/main/java/dev/book/accountbook/repository/querydsl/budget/BudgetRepositoryCustom.java

@@ -2,7 +2,9 @@
 
 import dev.book.accountbook.dto.response.BudgetResponse;
 
+import java.time.LocalDate;
+
 public interface BudgetRepositoryCustom {
-    BudgetResponse findBudgetWithTotal(Long userId);
+    BudgetResponse findBudgetWithTotal(Long userId, LocalDate localDate);
     BudgetResponse findBudgetByUserIdWithTotal(Long userId);
 }

src/main/java/dev/book/accountbook/repository/querydsl/budget/BudgetRepositoryImpl.java

@@ -6,17 +6,23 @@
 import dev.book.accountbook.dto.response.BudgetResponse;
 import dev.book.accountbook.entity.QAccountBook;
 import dev.book.accountbook.entity.QBudget;
+import dev.book.accountbook.type.CategoryType;
 import lombok.RequiredArgsConstructor;
 
+import java.time.LocalDate;
+
 @RequiredArgsConstructor
 public class BudgetRepositoryImpl implements BudgetRepositoryCustom {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public BudgetResponse findBudgetWithTotal(Long id) {
+    public BudgetResponse findBudgetWithTotal(Long id, LocalDate localDate) {
         QBudget budget = QBudget.budget;
         QAccountBook accountBook = QAccountBook.accountBook;
 
+        LocalDate startOfMonth = localDate.withDayOfMonth(1);
+        LocalDate endOfMonth = localDate.withDayOfMonth(localDate.lengthOfMonth());
+
         return queryFactory
                 .select(Projections.constructor(BudgetResponse.class,
                         budget.id,
@@ -26,8 +32,8 @@ public BudgetResponse findBudgetWithTotal(Long id) {
                 .from(budget)
                 .leftJoin(accountBook)
                 .on(accountBook.user.id.eq(budget.user.id)
-                        .and(Expressions.numberTemplate(Integer.class, "month({0})", accountBook.occurredAt)
-                                .eq(budget.month))
+                        .and(accountBook.type.eq(CategoryType.SPEND))
+                        .and(accountBook.occurredAt.between(startOfMonth, endOfMonth))
                 )
                 .where(budget.id.eq(id))
                 .groupBy(budget.id, budget.budgetLimit)

src/main/java/dev/book/accountbook/service/AccountBookSpendService.java

@@ -16,7 +16,7 @@
 import dev.book.accountbook.type.CategoryType;
 import dev.book.achievement.achievement_user.dto.event.GetWarningBudgetEvent;
 import dev.book.challenge.rank.SpendCreatedRankingEvent;
-import dev.book.global.config.Firebase.dto.LimitWarningFcmEvent;
+import dev.book.global.config.firebase.dto.LimitWarningFcmEvent;
 import dev.book.global.entity.Category;
 import dev.book.global.repository.CategoryRepository;
 import dev.book.user.entity.UserEntity;

src/main/java/dev/book/accountbook/service/BudgetService.java

@@ -27,11 +27,11 @@ public class BudgetService {
     private final ApplicationEventPublisher eventPublisher;
 
     @Transactional(readOnly = true)
-    public BudgetResponse getBudget(Long userId, int month) {
+    public BudgetResponse getBudget(Long userId, LocalDate localDate) {
         UserEntity user = userRepository.findById(userId).orElseThrow(() -> new UserErrorException(UserErrorCode.USER_NOT_FOUND));
-        Budget budget = budgetRepository.findByMonthAndUserId(month, user.getId()).orElseThrow(() -> new AccountBookErrorException(AccountBookErrorCode.NOT_FOUND_BUDGET));
+        Budget budget = budgetRepository.findByMonthAndUserId(localDate.getMonthValue(), user.getId()).orElseThrow(() -> new AccountBookErrorException(AccountBookErrorCode.NOT_FOUND_BUDGET));
 
-        return budgetRepository.findBudgetWithTotal(budget.getId());
+        return budgetRepository.findBudgetWithTotal(budget.getId(), localDate);
     }
 
     @Transactional
@@ -44,7 +44,7 @@ public BudgetResponse createBudget(Long userId, BudgetRequest budgetRequest) {
 
         eventPublisher.publishEvent(new CreateBudgetEvent(userEntity));
 
-        return budgetRepository.findBudgetWithTotal(budget.getId());
+        return budgetRepository.findBudgetWithTotal(budget.getId(), LocalDate.now());
     }
 
     @Transactional
@@ -53,7 +53,7 @@ public BudgetResponse modify(Long userId, Long id, BudgetRequest budgetRequest)
         budget.modifyBudget(budgetRequest.budget());
         budgetRepository.flush();
 
-        return budgetRepository.findBudgetWithTotal(budget.getId());
+        return budgetRepository.findBudgetWithTotal(budget.getId(), LocalDate.now());
     }
 
     @Transactional

src/main/java/dev/book/achievement/service/AchievementService.java

@@ -8,11 +8,11 @@
 import dev.book.achievement.exception.AchievementErrorCode;
 import dev.book.achievement.exception.AchievementException;
 import dev.book.achievement.repository.AchievementRepository;
-import dev.book.global.config.Firebase.entity.FcmToken;
-import dev.book.global.config.Firebase.exception.FcmTokenErrorCode;
-import dev.book.global.config.Firebase.exception.FcmTokenErrorException;
-import dev.book.global.config.Firebase.repository.FcmTokenRepository;
-import dev.book.global.config.Firebase.service.FCMService;
+import dev.book.global.config.firebase.entity.FcmToken;
+import dev.book.global.config.firebase.exception.FcmTokenErrorCode;
+import dev.book.global.config.firebase.exception.FcmTokenErrorException;
+import dev.book.global.config.firebase.repository.FcmTokenRepository;
+import dev.book.global.config.firebase.service.FCMService;
 import dev.book.global.sse.service.SseService;
 import dev.book.user.entity.UserEntity;
 import dev.book.user.exception.UserErrorCode;

src/main/java/dev/book/global/config/Firebase/FirebaseConfig.java → src/main/java/dev/book/global/config/firebase/FirebaseConfig.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase;
+package dev.book.global.config.firebase;
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.firebase.FirebaseApp;

src/main/java/dev/book/global/config/Firebase/controller/FcmController.java → src/main/java/dev/book/global/config/firebase/controller/FcmController.java

@@ -1,8 +1,8 @@
-package dev.book.global.config.Firebase.controller;
+package dev.book.global.config.firebase.controller;
 
 import dev.book.accountbook.service.AccountBookSpendService;
-import dev.book.global.config.Firebase.controller.swagger.FcmControllerApi;
-import dev.book.global.config.Firebase.service.FCMService;
+import dev.book.global.config.firebase.controller.swagger.FcmControllerApi;
+import dev.book.global.config.firebase.service.FCMService;
 import dev.book.global.config.security.dto.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;

src/main/java/dev/book/global/config/Firebase/controller/swagger/FcmControllerApi.java → src/main/java/dev/book/global/config/firebase/controller/swagger/FcmControllerApi.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase.controller.swagger;
+package dev.book.global.config.firebase.controller.swagger;
 
 import dev.book.global.config.security.dto.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/dev/book/global/config/Firebase/dto/LimitWarningFcmEvent.java → src/main/java/dev/book/global/config/firebase/dto/LimitWarningFcmEvent.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase.dto;
+package dev.book.global.config.firebase.dto;
 
 public record LimitWarningFcmEvent (Long userId, String nickname, int budget, long total, long usageRate){
 }

src/main/java/dev/book/global/config/Firebase/entity/FcmToken.java → src/main/java/dev/book/global/config/firebase/entity/FcmToken.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase.entity;
+package dev.book.global.config.firebase.entity;
 
 import dev.book.user.entity.UserEntity;
 import jakarta.persistence.*;

src/main/java/dev/book/global/config/Firebase/exception/FcmTokenErrorCode.java → src/main/java/dev/book/global/config/firebase/exception/FcmTokenErrorCode.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase.exception;
+package dev.book.global.config.firebase.exception;
 
 import dev.book.global.exception.ErrorCode;
 import lombok.Getter;

src/main/java/dev/book/global/config/Firebase/exception/FcmTokenErrorException.java → src/main/java/dev/book/global/config/firebase/exception/FcmTokenErrorException.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase.exception;
+package dev.book.global.config.firebase.exception;
 
 import dev.book.global.exception.CustomErrorException;
 import lombok.Getter;

src/main/java/dev/book/global/config/Firebase/repository/FcmTokenRepository.java → src/main/java/dev/book/global/config/firebase/repository/FcmTokenRepository.java

@@ -1,6 +1,6 @@
-package dev.book.global.config.Firebase.repository;
+package dev.book.global.config.firebase.repository;
 
-import dev.book.global.config.Firebase.entity.FcmToken;
+import dev.book.global.config.firebase.entity.FcmToken;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/dev/book/global/config/Firebase/service/FCMService.java → src/main/java/dev/book/global/config/firebase/service/FCMService.java

@@ -1,4 +1,4 @@
-package dev.book.global.config.Firebase.service;
+package dev.book.global.config.firebase.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.firebase.messaging.FirebaseMessaging;
@@ -7,11 +7,11 @@
 import com.google.firebase.messaging.Notification;
 import dev.book.accountbook.dto.event.CreateTransEvent;
 import dev.book.achievement.entity.Achievement;
-import dev.book.global.config.Firebase.dto.LimitWarningFcmEvent;
-import dev.book.global.config.Firebase.entity.FcmToken;
-import dev.book.global.config.Firebase.exception.FcmTokenErrorCode;
-import dev.book.global.config.Firebase.exception.FcmTokenErrorException;
-import dev.book.global.config.Firebase.repository.FcmTokenRepository;
+import dev.book.global.config.firebase.dto.LimitWarningFcmEvent;
+import dev.book.global.config.firebase.entity.FcmToken;
+import dev.book.global.config.firebase.exception.FcmTokenErrorCode;
+import dev.book.global.config.firebase.exception.FcmTokenErrorException;
+import dev.book.global.config.firebase.repository.FcmTokenRepository;
 import dev.book.user.entity.UserEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/dev/book/global/log/ControllerLogAspect.java

@@ -1,7 +1,6 @@
 package dev.book.global.log;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import dev.book.global.config.security.dto.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -24,18 +23,9 @@ public Object logController(ProceedingJoinPoint joinPoint) throws Throwable {
 
         String methodName = joinPoint.getSignature().toShortString();
 
-        Long userId = null;
-
-        for (Object arg : joinPoint.getArgs()) {
-            if (arg instanceof CustomUserDetails userDetails) {
-                userId = userDetails.user().getId();
-            }
-        }
-
         log.info("{}", objectMapper.writeValueAsString(Map.of(
                 "layer", "controller",
-                "method", methodName,
-                "userId", userId
+                "method", methodName
         )));
 
         return result;

src/main/java/dev/book/user/controller/UserController.java

@@ -12,12 +12,15 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/users")
@@ -26,66 +29,70 @@ public class UserController implements UserApi {
     private final UserService userService;
 
     @GetMapping("/profile")
-    public ResponseEntity<UserProfileResponse> getUserProfile(@AuthenticationPrincipal CustomUserDetails userDetails){
+    public ResponseEntity<UserProfileResponse> getUserProfile(@AuthenticationPrincipal CustomUserDetails userDetails) {
         return ResponseEntity.ok()
                 .body(userService.getUserProfile(userDetails));
     }
 
     @PutMapping("/profile")
     public ResponseEntity<UserProfileResponse> updateUserProfile(@RequestBody UserProfileUpdateRequest profileUpdateRequest,
-                                                                 @AuthenticationPrincipal CustomUserDetails userDetails){
+                                                                 @AuthenticationPrincipal CustomUserDetails userDetails) {
         return ResponseEntity.ok()
                 .body(userService.updateUserProfile(profileUpdateRequest, userDetails));
     }
 
     @GetMapping("/categories")
-    public ResponseEntity<UserCategoryResponse> getUserCategories(@AuthenticationPrincipal CustomUserDetails userDetails){
+    public ResponseEntity<UserCategoryResponse> getUserCategories(@AuthenticationPrincipal CustomUserDetails userDetails) {
         return ResponseEntity.ok()
                 .body(userService.getUserCategories(userDetails));
     }
 
     @PutMapping("/categories")
     public ResponseEntity<?> updateUserCategories(@RequestBody UserCategoriesRequest userCategoriesRequest,
-                                                  @AuthenticationPrincipal CustomUserDetails userDetails){
+                                                  @AuthenticationPrincipal CustomUserDetails userDetails) {
         userService.updateUserCategories(userCategoriesRequest, userDetails);
         return ResponseEntity.ok().build();
     }
 
     @DeleteMapping
     public ResponseEntity<?> deleteUser(HttpServletRequest request, HttpServletResponse response,
-                                                            @AuthenticationPrincipal CustomUserDetails userDetails){
+                                        @AuthenticationPrincipal CustomUserDetails userDetails) {
         userService.deleteUser(request, response, userDetails);
         return ResponseEntity.ok().build();
     }
 
     @GetMapping("/check/login") //로그인 확인
-    public ResponseEntity<?> checkIsUserLogin(@AuthenticationPrincipal CustomUserDetails userDetails){
+    public ResponseEntity<?> checkIsUserLogin(@AuthenticationPrincipal CustomUserDetails userDetails) {
         userService.checkIsUserLogin(userDetails);
         return ResponseEntity.ok().build();
     }
 
     @PostMapping("/validate/nickname")
-    public ResponseEntity<Boolean> checkIsValidateNickname(@RequestParam(name = "nickname", required = true) String nickname){
+    public ResponseEntity<Boolean> checkIsValidateNickname(@RequestParam(name = "nickname", required = true) String nickname) {
         userService.checkIsValidateNickname(nickname);
         return ResponseEntity.ok().build();
     }
 
     @DeleteMapping("/delete/nickname")
-    public ResponseEntity<?> deleteUserNickname(@AuthenticationPrincipal CustomUserDetails userDetails){
+    public ResponseEntity<?> deleteUserNickname(@AuthenticationPrincipal CustomUserDetails userDetails) {
         userService.deleteUserNickname(userDetails);
         return ResponseEntity.ok().build();
     }
 
     @GetMapping("/achievement")
-    public ResponseEntity<List<UserAchievementResponse>> getUserAchievement(@AuthenticationPrincipal CustomUserDetails userDetails){
+    public ResponseEntity<List<UserAchievementResponse>> getUserAchievement(@AuthenticationPrincipal CustomUserDetails userDetails) {
         return ResponseEntity.ok()
                 .body(userService.getUserAchievement(userDetails));
     }
 
     @GetMapping("/challenge")
-    public ResponseEntity<UserChallengeInfoResponse> getUserChallengeInfo(@AuthenticationPrincipal CustomUserDetails userDetails){
+    public ResponseEntity<UserChallengeInfoResponse> getUserChallengeInfo(@AuthenticationPrincipal CustomUserDetails userDetails) {
         return ResponseEntity.ok()
                 .body(userService.getUserChallengeInfo(userDetails));
     }
 
+    @GetMapping("/test")
+    public void loginTestUser(HttpServletResponse response) throws IOException {
+        userService.login(response);
+    }
 }

src/main/java/dev/book/user/service/UserService.java

@@ -1,9 +1,10 @@
 package dev.book.user.service;
 
-import dev.book.achievement.achievement_user.service.IndividualAchievementStatusService;
 import dev.book.achievement.achievement_user.entity.AchievementUser;
 import dev.book.achievement.achievement_user.repository.AchievementUserRepository;
+import dev.book.achievement.achievement_user.service.IndividualAchievementStatusService;
 import dev.book.global.config.security.dto.CustomUserDetails;
+import dev.book.global.config.security.jwt.JwtAuthenticationToken;
 import dev.book.global.config.security.jwt.JwtUtil;
 import dev.book.global.config.security.service.refresh.RefreshTokenService;
 import dev.book.global.entity.Category;
@@ -24,9 +25,14 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,6 +41,7 @@
 public class UserService {
 
     private final UserRepository userRepository;
+    private final UserDetailsService userDetailsService;
     private final CategoryRepository categoryRepository;
     private final AchievementUserRepository achievementUserRepository;
 
@@ -121,7 +128,7 @@ public void checkIsValidateNickname(String nickname) {
     @Transactional
     public void deleteUserNickname(CustomUserDetails userDetails) {
         UserEntity user = userRepository.findByEmail(userDetails.getUsername())
-                        .orElseThrow(() -> new UserErrorException(UserErrorCode.USER_NOT_FOUND));
+                .orElseThrow(() -> new UserErrorException(UserErrorCode.USER_NOT_FOUND));
         user.deleteNickname();
     }
 
@@ -166,4 +173,18 @@ public UserChallengeInfoResponse getUserChallengeInfo(CustomUserDetails userDeta
         return new UserChallengeInfoResponse(user.getSavings(), user.getCompletedChallenges(),
                 user.getParticipatingChallenges(), user.getFinishedChallenge());
     }
+
+    public void login(HttpServletResponse response) throws IOException {
+        UserEntity user = userRepository.findByEmail("test@sample.com").orElseThrow(() -> new UserErrorException(UserErrorCode.USER_NOT_FOUND));
+
+        jwtUtil.generateToken(response, getAuthentication(user));
+    }
+
+    private Authentication getAuthentication(UserEntity user) {
+        UserDetails userDetails = userDetailsService.loadUserByUsername(user.getEmail());
+        Authentication authentication = new JwtAuthenticationToken(userDetails, userDetails.getAuthorities());
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+
+        return authentication;
+    }
 }

src/main/resources/application-jwt.yaml

@@ -18,6 +18,7 @@ spring:
         - "/signup"
         - "/login"
         - "/actuator/prometheus"
+        - "/api/v1/users/test"
 
 
   aes: