Merge pull request #14 from UMC-5th-Hackathon-N-Team/chulsoo

feat: 이미지

src/main/java/com/umc/sopi/domain/User.java

@@ -7,6 +7,7 @@
 import jakarta.persistence.Id;
 import lombok.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Entity
@@ -22,7 +23,7 @@ public class User extends BaseEntity {
 
     private String name;
 
-    private LocalDateTime birth;
+    private LocalDate birth;
 
     private String blood;
 
@@ -34,6 +35,8 @@ public class User extends BaseEntity {
 
     private Integer ingredient;
 
+    private String imageUri;
+
     public void wholeAdd(){
         this.whole += 1;
     }

src/main/java/com/umc/sopi/service/userService/Impl/UserServiceImpl.java

@@ -3,6 +3,7 @@
 import com.umc.sopi.domain.User;
 import com.umc.sopi.repository.UserRepository;
 import com.umc.sopi.service.userService.UserService;
+import com.umc.sopi.web.dto.UserResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,4 +57,22 @@ public Long getIngredient(){
                 new IllegalStateException("해당 유저가 존재하지 않습니다."));
         return user.getIngredient().longValue();
     }
+
+    @Override
+    public UserResponse.MyPageDTO myPage(){
+        User user = userRepository.findById(1L).orElseThrow(()->
+                new IllegalStateException("해당 유저가 존재하지 않습니다."));
+
+        UserResponse.MyPageDTO result = UserResponse.MyPageDTO.builder()
+                .blood(user.getBlood())
+                .whole(user.getWhole())
+                .birth(user.getBirth())
+                .name(user.getName())
+                .merit(user.getMerit())
+                .ingredient(user.getIngredient())
+                .imageUri(user.getImageUri())
+                .build();
+
+        return result;
+    }
 }

src/main/java/com/umc/sopi/service/userService/UserService.java

@@ -1,10 +1,13 @@
 package com.umc.sopi.service.userService;
 
+import com.umc.sopi.web.dto.UserResponse;
+
 public interface UserService {
     public void updateWhole();
     public void updateMerit();
     public void updateIngredient();
     public Long getWhole();
     public Long getMerit();
     public Long getIngredient();
+    public UserResponse.MyPageDTO myPage();
 }

src/main/java/com/umc/sopi/web/controller/UserController.java

@@ -9,27 +9,30 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/count")
 @CrossOrigin(origins = "http://localhost:3000")
 public class UserController {
     private final UserService userService;
 
-    @GetMapping("/whole")
+    @GetMapping("/count/whole")
     public ApiResponse<UserResponse.CountDTO> getWhole(){
         return ApiResponse.onSuccess(UserConverter.toCountResultDTO(userService.getWhole()));
     }
-    @GetMapping("/merit")
+    @GetMapping("/count/merit")
     public ApiResponse<UserResponse.CountDTO> getMerit(){
         return ApiResponse.onSuccess(UserConverter.toCountResultDTO(userService.getMerit()));
     }
-    @GetMapping("/ingredient")
+    @GetMapping("/count/ingredient")
     public ApiResponse<UserResponse.CountDTO> getIngredient(){
         return ApiResponse.onSuccess(UserConverter.toCountResultDTO(userService.getIngredient()));
     }
-    @GetMapping("/year")
+    @GetMapping("/count/year")
     public ApiResponse<UserResponse.CountDTO> getYear(){
         return ApiResponse.onSuccess(UserConverter.toCountResultDTO(userService.getIngredient() + userService.getWhole()));
     }
 
+    @GetMapping("/MyPage")
+    public ApiResponse<UserResponse.MyPageDTO> getMyPage(){
+        return ApiResponse.onSuccess(userService.myPage());
 
+    }
 }

src/main/java/com/umc/sopi/web/dto/UserResponse.java

@@ -6,6 +6,7 @@
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 public class UserResponse {
     @Builder
@@ -15,4 +16,18 @@ public class UserResponse {
     public static class CountDTO{
         Long count;
     }
+
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class MyPageDTO{
+        String name;
+        LocalDate birth;
+        String blood;
+        Integer merit;
+        Integer whole;
+        Integer ingredient;
+        String imageUri;
+    }
 }