Feature 36/알림 여부

src/main/java/com/modernfarmer/farmusspring/domain/user/controller/UserController.java

@@ -1,13 +1,12 @@
 package com.modernfarmer.farmusspring.domain.user.controller;
 
 import com.modernfarmer.farmusspring.domain.auth.entity.CustomUser;
-import com.modernfarmer.farmusspring.domain.user.dto.request.SetLevelRequest;
-import com.modernfarmer.farmusspring.domain.user.dto.request.UpdateProfileDto;
-import com.modernfarmer.farmusspring.domain.user.dto.response.SetLevelResponse;
+import com.modernfarmer.farmusspring.domain.user.dto.request.AlarmUpdate;
+import com.modernfarmer.farmusspring.domain.user.dto.response.AlarmStatus;
 import com.modernfarmer.farmusspring.domain.user.dto.response.UserProfileResponse;
 import com.modernfarmer.farmusspring.domain.user.service.UserService;
 import com.modernfarmer.farmusspring.global.response.BaseResponseDto;
-import jakarta.servlet.http.HttpServletRequest;
+import com.modernfarmer.farmusspring.global.response.SuccessCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
@@ -28,17 +27,29 @@ public class UserController {
 
     @GetMapping(value = "")
     public BaseResponseDto<UserProfileResponse> selectUserProfile(@AuthenticationPrincipal CustomUser user)  {
-
         return userService.selectUserProfile(user.getUserId());
     }
 
 
     @PatchMapping(value = "/profile-image")
     public BaseResponseDto<Void> deleteProfleImage(@AuthenticationPrincipal CustomUser user)  {
-
         return userService.deleteProfleImage(user.getUserId());
     }
 
+    @PatchMapping("/notification")
+    public BaseResponseDto<?> modifyNotification(@AuthenticationPrincipal CustomUser user, @Validated  @RequestBody  AlarmUpdate alarmUpdate)  {
+        userService.modifyNotification(user.getUserId(), alarmUpdate.getStatus());
+        return BaseResponseDto.of(SuccessCode.SUCCESS, null);
+    }
+
+    @GetMapping("/notification")
+    public BaseResponseDto<?> bringNotification(@AuthenticationPrincipal CustomUser user)  {
+        AlarmStatus result = userService.bringNotification(user.getUserId());
+        return BaseResponseDto.of(SuccessCode.SUCCESS, result);
+    }
+
+
+
     @PostMapping(value = "/profile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public BaseResponseDto<Void> settingProfile(
             @AuthenticationPrincipal CustomUser user,
@@ -54,4 +65,8 @@ public void initUser(
     ) {
         userService.initUser(userId);
     }
+
+
+
+
 }

src/main/java/com/modernfarmer/farmusspring/domain/user/dto/request/AlarmUpdate.java

@@ -0,0 +1,16 @@
+package com.modernfarmer.farmusspring.domain.user.dto.request;
+
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class AlarmUpdate {
+
+    @NotNull(message = "null 값을 가지면 안됩니다.")
+    private Boolean status;
+}

src/main/java/com/modernfarmer/farmusspring/domain/user/dto/response/AlarmStatus.java

@@ -0,0 +1,14 @@
+package com.modernfarmer.farmusspring.domain.user.dto.response;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor(staticName = "of")
+@Getter
+public class AlarmStatus {
+
+    private Boolean status;
+}

src/main/java/com/modernfarmer/farmusspring/domain/user/entity/User.java

@@ -46,6 +46,9 @@ public class User extends BaseEntity {
     @Column(nullable = true)
     private String level;
 
+    @Column(nullable = false)
+    private Boolean notificationStatus;
+
 
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @Builder.Default
@@ -80,6 +83,7 @@ public static User createUser(String role, String userNumber, boolean early){
                 .role(role)
                 .userNumber(userNumber)
                 .early(early)
+                .notificationStatus(true)
                 .build();
 
         return newUser;

src/main/java/com/modernfarmer/farmusspring/domain/user/repository/UserRepository.java

@@ -31,9 +31,11 @@ public interface UserRepository  extends JpaRepository<User, Long> {
 
     @Modifying
     @Query("update user as u set u.profileImage = null where u.id = :userId")
-    void updateProfileImage( @Param("userId") Long userId);
-
+    void updateProfileImage(@Param("userId") Long userId);
 
+    @Modifying
+    @Query("update user as u set u.notificationStatus = :status where u.id = :userId")
+    void updateNotification(@Param("userId") Long userId, @Param("status") Boolean status);
     @Modifying
     @Query("update user as u set u.profileImage = :profileImage, u.nickname = :nickName where u.id = :userId")
     void selectProfileAndNickname(@Param("userId") Long userId, @Param("profileImage") String profileImage, @Param("nickName") String nickName);

src/main/java/com/modernfarmer/farmusspring/domain/user/service/UserService.java

@@ -1,7 +1,9 @@
 package com.modernfarmer.farmusspring.domain.user.service;
 
+import com.modernfarmer.farmusspring.domain.auth.entity.CustomUser;
 import com.modernfarmer.farmusspring.domain.myveggiegarden.entity.Diary;
 import com.modernfarmer.farmusspring.domain.myveggiegarden.exception.DiaryNotFoundException;
+import com.modernfarmer.farmusspring.domain.user.dto.response.AlarmStatus;
 import com.modernfarmer.farmusspring.domain.user.dto.response.UserProfileResponse;
 import com.modernfarmer.farmusspring.domain.user.entity.User;
 import com.modernfarmer.farmusspring.domain.user.exception.UserNotFoundException;
@@ -12,6 +14,7 @@
 import com.modernfarmer.farmusspring.infra.s3.S3Service;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,7 +49,6 @@ public BaseResponseDto<UserProfileResponse> selectUserProfile(Long userId) {
 
     @Transactional
     public BaseResponseDto<Void> deleteProfleImage(Long userId) {
-
         updateProfileImage(userId);
         return BaseResponseDto.of(SuccessCode.SUCCESS,null);
     }
@@ -84,6 +86,20 @@ public void initUser(Long userId) {
         user.initUser();
     }
 
+
+    @Transactional
+    public void modifyNotification(Long userId, Boolean status) {
+        userRepository.updateNotification(userId, status);
+    }
+
+    @Transactional
+    public AlarmStatus bringNotification(Long userId) {
+        User user = selectUserById(userId);
+        return AlarmStatus.of(user.getNotificationStatus());
+    }
+
+
+
     private void updateUserProfileAccordingToProfileImage(MultipartFile multipartFile, String nickName, Long userId) throws IOException {
         if(multipartFile.isEmpty()){