Merge pull request #106 from prgrms-web-devcourse-final-project/dev

Dev

Author: KangDaegyeom

src/main/java/com/grepp/teamnotfound/app/controller/api/auth/AuthController.java

@@ -96,7 +96,7 @@ public ResponseEntity<ApiResponse<?>> registerAdmin(@RequestBody RegisterRequest
     @Operation(summary = "소셜 로그인")
     @GetMapping("v1/social-auth/{provider}")
     public ResponseEntity<?> socialLogin(@PathVariable String provider) {
-        ProviderType providerType = ProviderType.valueOf(provider.toUpperCase());
+        ProviderType providerType = ProviderType.valueOf(provider.toLowerCase());
         String url = customOAuth2UserService.getAuthUrl(providerType);
         return ResponseEntity.ok(url);
     }

src/main/java/com/grepp/teamnotfound/app/controller/api/dashboard/DashboardApiController.java

@@ -57,7 +57,10 @@ public ResponseEntity<?> getDashboardProfile(
     ){
         PetDto petDto = dashboardService.getProfile(petId, principal.getUserId());
         ProfileResponse response = modelMapper.map(petDto, ProfileResponse.class);
-        response.setAge(Period.between(petDto.getBirthday(), date).getMonths());
+        
+        Period period = Period.between(petDto.getBirthday(), date);
+        int totalMonths = period.getYears() * 12 + period.getMonths();
+        response.setAge(totalMonths);
 
         String analysis = aiAnalysisService.getAiAnalysis(petId, date);
         if (analysis == null) {

src/main/java/com/grepp/teamnotfound/app/model/dashboard/DashboardService.java

@@ -53,8 +53,9 @@ public class DashboardService {
     public PetDto getProfile(Long petId, Long userId) {
         Pet pet = petService.getPet(petId);
         if(!pet.getUser().getUserId().equals(userId)) throw new UserException(UserErrorCode.USER_ACCESS_DENIED);
-
-        return modelMapper.map(pet, PetDto.class);
+        PetDto dto = modelMapper.map(pet, PetDto.class);
+        dto.setImgUrl(petService.getProfileImgPath(petId));
+        return dto;
     }
 
     @Transactional(readOnly = true)

src/main/java/com/grepp/teamnotfound/app/model/user/AdminService.java

@@ -238,6 +238,7 @@ public Page<ReportsListDto> getReportsList(ReportsListRequest request) {
         return reportRepository.findReportListWithMeta(request, pageable);
     }
 
+    @Transactional
     public void updateUserSuspensionEndAtNow(Long userId) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_FOUND));