Feature 246 공지사항 삭제 기능 구현

module-api/src/main/java/com/checkping/api/controller/notice/NoticeController.java

@@ -2,13 +2,14 @@
 
 import com.checkping.common.response.BaseResponse;
 import com.checkping.dto.notice.request.NoticeCreateRequestDto;
-import com.checkping.dto.notice.response.NoticeResponseDto;
+import com.checkping.dto.notice.request.NoticeUpdateRequestDto;
+import com.checkping.dto.notice.response.NoticeCreateResponseDto;
+import com.checkping.dto.notice.response.NoticeUpdateResponseDto;
 import com.checkping.service.notice.NoticeServiceImpl;
+import jakarta.persistence.Id;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -18,8 +19,24 @@ public class NoticeController {
     private NoticeServiceImpl noticeService;
 
     @PostMapping("/admins/notices")
-    public BaseResponse<NoticeResponseDto> registerNotice(@RequestBody NoticeCreateRequestDto noticeCreateRequestDto) {
-        NoticeResponseDto noticeResponseDto = noticeService.registerNotice(noticeCreateRequestDto);
-        return BaseResponse.success(noticeResponseDto);
+    public BaseResponse<NoticeCreateResponseDto> registerNotice(@RequestBody NoticeCreateRequestDto noticeCreateRequestDto) {
+        NoticeCreateResponseDto noticeCreateResponseDto = noticeService.registerNotice(noticeCreateRequestDto);
+        return BaseResponse.success(noticeCreateResponseDto);
+    }
+
+    @PatchMapping("/admins/notices/{noticeid}")
+    public BaseResponse<NoticeUpdateResponseDto> updateNotice(
+            @PathVariable Long noticeid,
+            @RequestBody NoticeUpdateRequestDto noticeUpdateRequestDto) {
+        NoticeUpdateResponseDto noticeUpdateResponseDto = noticeService.updateNotice(noticeid, noticeUpdateRequestDto);
+        return BaseResponse.success(noticeUpdateResponseDto);
+    }
+
+    @DeleteMapping("/admins/notices/{noticeid}")
+    public BaseResponse<NoticeUpdateResponseDto> deleteNotice(
+            @PathVariable Long noticeid
+    ){
+        NoticeUpdateResponseDto noticeDeleteResponseDto = noticeService.deleteNotice(noticeid);
+        return BaseResponse.success(noticeDeleteResponseDto);
     }
 }

module-domain/src/main/java/com/checkping/domain/notice/Notice.java

@@ -68,7 +68,6 @@ public enum Category {
         private final String descrption;
 
     }
-
     @Getter
     @RequiredArgsConstructor
     public enum Priority {
@@ -77,4 +76,11 @@ public enum Priority {
 
         private final String descrption;
     }
+
+    public void updateNotice(String title, String content,String category, String priority){
+        if (title != null) this.title = title;
+        if (content != null) this.content = content;
+        if (category != null) this.category = Category.valueOf(category);
+        if (priority != null) this.priority = Priority.valueOf(priority);
+    }
 }

module-service/src/main/java/com/checkping/dto/notice/request/NoticeUpdateRequestDto.java

@@ -0,0 +1,29 @@
+package com.checkping.dto.notice.request;
+
+import com.checkping.domain.notice.Notice;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class NoticeUpdateRequestDto {
+
+    private String title;
+
+    private String content;
+
+    private String category;
+
+    private String priority;
+
+    public Notice toEntity(){
+        return Notice.builder()
+                .title(title)
+                .content(content)
+                .category(Notice.Category.valueOf(category))
+                .priority(Notice.Priority.valueOf(priority))
+                .build();
+    }
+}

module-service/src/main/java/com/checkping/dto/notice/response/NoticeResponseDto.java → module-service/src/main/java/com/checkping/dto/notice/response/NoticeCreateResponseDto.java

@@ -9,7 +9,9 @@
 
 @Getter
 @Builder
-public class NoticeResponseDto {
+public class NoticeCreateResponseDto {
+    private Long id;
+
     private Long adminId;
 
     private String title;
@@ -22,8 +24,9 @@ public class NoticeResponseDto {
 
     private LocalDateTime regAt;
 
-    public static NoticeResponseDto toDto(Notice notice){
-        return NoticeResponseDto.builder()
+    public static NoticeCreateResponseDto toDto(Notice notice){
+        return NoticeCreateResponseDto.builder()
+                .id(notice.getId())
                 .adminId(notice.getAdminId())
                 .title(notice.getTitle())
                 .content(notice.getContent())

module-service/src/main/java/com/checkping/dto/notice/response/NoticeUpdateResponseDto.java

@@ -0,0 +1,44 @@
+package com.checkping.dto.notice.response;
+
+import com.checkping.domain.notice.Notice;
+import com.checkping.dto.notice.request.NoticeUpdateRequestDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Builder
+@Getter
+public class NoticeUpdateResponseDto {
+
+    private Long id;
+
+    private Long adminId;
+
+    private String title;
+
+    private String content;
+
+    private Notice.Category category;
+
+    private Notice.Priority priority;
+
+    private LocalDateTime regAt;
+
+    private LocalDateTime updatedAt;
+
+    public static NoticeUpdateResponseDto toDto(Notice notice){
+        return NoticeUpdateResponseDto.builder()
+                .id(notice.getId())
+                .adminId(notice.getAdminId())
+                .title(notice.getTitle())
+                .content(notice.getContent())
+                .category(notice.getCategory())
+                .priority(notice.getPriority())
+                .regAt(notice.getUpdatedAt())
+                .updatedAt(notice.getUpdatedAt())
+                .build();
+    }
+}

module-service/src/main/java/com/checkping/service/notice/NoticeService.java

@@ -1,10 +1,16 @@
 package com.checkping.service.notice;
 
 import com.checkping.dto.notice.request.NoticeCreateRequestDto;
-import com.checkping.dto.notice.response.NoticeResponseDto;
+import com.checkping.dto.notice.request.NoticeUpdateRequestDto;
+import com.checkping.dto.notice.response.NoticeCreateResponseDto;
+import com.checkping.dto.notice.response.NoticeUpdateResponseDto;
 
 public interface NoticeService {
 
-    NoticeResponseDto registerNotice(NoticeCreateRequestDto noticeCreateRequestDto);
+    NoticeCreateResponseDto registerNotice(NoticeCreateRequestDto noticeCreateRequestDto);
+
+    NoticeUpdateResponseDto updateNotice(Long noticeid, NoticeUpdateRequestDto noticeUpdateRequestDto);
+
+    NoticeUpdateResponseDto deleteNotice(Long noticeid);
 
 }

module-service/src/main/java/com/checkping/service/notice/NoticeServiceImpl.java

@@ -3,9 +3,14 @@
 import com.checkping.common.enums.ErrorCode;
 import com.checkping.common.exception.BaseException;
 import com.checkping.domain.notice.Notice;
+import com.checkping.domain.project.Project;
 import com.checkping.dto.notice.request.NoticeCreateRequestDto;
-import com.checkping.dto.notice.response.NoticeResponseDto;
+import com.checkping.dto.notice.request.NoticeUpdateRequestDto;
+import com.checkping.dto.notice.response.NoticeCreateResponseDto;
+import com.checkping.dto.notice.response.NoticeUpdateResponseDto;
 import com.checkping.infra.repository.notice.NoticeRepository;
+import jakarta.persistence.Id;
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +24,7 @@ public class NoticeServiceImpl implements NoticeService {
     private NoticeRepository noticeRepository;
 
     @Override
-    public NoticeResponseDto registerNotice(NoticeCreateRequestDto noticeCreateRequestDto) {
+    public NoticeCreateResponseDto registerNotice(NoticeCreateRequestDto noticeCreateRequestDto) {
 
         if (noticeCreateRequestDto.getAdminId() == null ||
                 StringUtils.isBlank(noticeCreateRequestDto.getTitle()) ||
@@ -30,6 +35,37 @@ public NoticeResponseDto registerNotice(NoticeCreateRequestDto noticeCreateReque
         }
 
         Notice notice = noticeRepository.save(noticeCreateRequestDto.toEntity());
-        return NoticeResponseDto.toDto(notice);
+        return NoticeCreateResponseDto.toDto(notice);
+    }
+
+    @Override
+    @Transactional
+    public NoticeUpdateResponseDto updateNotice(Long noticeid, NoticeUpdateRequestDto noticeUpdateRequestDto) {
+
+        if(StringUtils.isBlank(noticeUpdateRequestDto.getTitle()) &&
+                StringUtils.isBlank(noticeUpdateRequestDto.getContent()) &&
+                noticeUpdateRequestDto.getCategory() == null &&
+                noticeUpdateRequestDto.getPriority() == null){
+            throw new BaseException(ErrorCode.BAD_REQUEST);
+        }
+
+        Notice notice = noticeRepository.findById(noticeid)
+                .orElseThrow(() -> new BaseException(ErrorCode.NOT_FOUND));
+
+        notice.updateNotice(noticeUpdateRequestDto.getTitle(), noticeUpdateRequestDto.getContent(), noticeUpdateRequestDto.getCategory(), noticeUpdateRequestDto.getPriority());
+
+        return NoticeUpdateResponseDto.toDto(notice);
+
+    }
+
+    @Override
+    public NoticeUpdateResponseDto deleteNotice(Long noticeid){
+
+        Notice notice = noticeRepository.findById(noticeid)
+                .orElseThrow(() -> new BaseException(ErrorCode.NOT_FOUND));
+
+        noticeRepository.deleteById(noticeid);
+
+        return NoticeUpdateResponseDto.toDto(notice);
     }
 }