Merge pull request #7 from codestates-seb/be

Be
codestates-seb · Sep 12, 2023 · 3a9e919 · 3a9e919
2 parents 00e26bc + 078e9ec
commit 3a9e919
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/server/src/main/java/com/green/greenEarthForUs/post/DTO/PostPostDto.java b/server/src/main/java/com/green/greenEarthForUs/post/DTO/PostPostDto.java
@@ -6,7 +6,7 @@
 @Getter @Setter
 public class PostPostDto { // 생성
 
-    private Long userId;
+    //private Long userId;
 
     private String type;
 

diff --git a/server/src/main/java/com/green/greenEarthForUs/user/dto/UserPostDto.java b/server/src/main/java/com/green/greenEarthForUs/user/dto/UserPostDto.java
@@ -7,7 +7,7 @@
 @Setter
 public class UserPostDto { // 가입
 
-    private Long userId;
+    //private Long userId;
 
     private String username;
 

diff --git a/server/src/main/java/com/green/greenEarthForUs/user/service/UserService.java b/server/src/main/java/com/green/greenEarthForUs/user/service/UserService.java
@@ -15,6 +15,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -37,15 +38,22 @@ public User createUser(UserPostDto userPostDto, String imageUrl) {
 
         // 이미지 업로드
         user.setImageUrl(imageUrl);
+        user.setCreateAt(LocalDateTime.now());
+
+        updateGradePostCount(user);
 
         return userRepository.save(user);
     }
 
     // 사용자 조회
     public User getUser(Long userId) {
 
-        Optional<User> userOptional = userRepository.findById(userId);
-        return userOptional.orElseThrow(() -> new BusinessLogicException(ExceptionCode.USER_NOT_FOUND));
+        User findUser = userRepository.findById(userId)
+                .orElseThrow(() -> new BusinessLogicException(ExceptionCode.USER_NOT_FOUND));
+
+        updateGradePostCount(findUser);
+
+        return findUser;
 
     }
 
@@ -58,13 +66,17 @@ public boolean verifyAnswer(Long userId, String answer) {
 
     // 사용자 수정
     public User updateUser(Long userId, UserPatchDto userPatchDto) {
+
         User existing = getUser(userId);
 
-        existing.setUserName(userPatchDto.getUsername());
-        existing.setPassword(userPatchDto.getPassword());
-        existing.setPasswordQuestion(userPatchDto.getPasswordQuestion());
-        existing.setPasswordAnswer(userPatchDto.getPasswordAnswer());
-        existing.setImageUrl(userPatchDto.getImageUrl());
+        Optional.ofNullable(userPatchDto.getUsername()).ifPresent(username -> existing.setUserName(username));
+        Optional.ofNullable(userPatchDto.getPassword()).ifPresent(password -> existing.setPassword(password));
+        Optional.ofNullable(userPatchDto.getPasswordQuestion()).ifPresent(passwordQuestion -> existing.setPasswordQuestion(passwordQuestion));
+        Optional.ofNullable(userPatchDto.getPasswordAnswer()).ifPresent(passwordAnswer -> existing.setPasswordAnswer(passwordAnswer));
+        Optional.ofNullable(userPatchDto.getImageUrl()).ifPresent(imageUrl -> existing.setImageUrl(imageUrl));
+
+        updateGradePostCount(existing);
+
 
         return userRepository.save(existing);
     }