feat: controller, service 수정 #14

src/main/java/HookKiller/server/notice/controller/NoticeController.java

@@ -0,0 +1,82 @@
+package HookKiller.server.notice.controller;
+
+import HookKiller.server.common.type.LanguageType;
+import HookKiller.server.notice.dto.NoticeArticleDto;
+import HookKiller.server.notice.dto.NoticeContentDto;
+import HookKiller.server.notice.entity.NoticeArticle;
+import HookKiller.server.repository.NoticeArticleRepository;
+import HookKiller.server.repository.NoticeContentRepository;
+import HookKiller.server.service.NoticeService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/notice")
+public class NoticeController {
+
+    private final NoticeService noticeService;
+    private final NoticeArticleRepository articleRepository;
+    private final NoticeContentRepository contentRepository;
+
+    /**
+     *  단건 조회
+     * @param noticeArticleId
+     * @param request
+     * @param languageType
+     * @return
+     */
+    @GetMapping("{/noticeArticleId}")
+    public NoticeArticleDto getNoticeArticle(@PathVariable Long noticeArticleId, HttpServletRequest request, LanguageType languageType) {
+        request.getHeader("languageType");
+        return noticeService.getNoticeArticleByArticleId(noticeArticleId, languageType);
+    }
+
+    /**
+     * 리스트 조회
+     * @param request
+     * @param languageType
+     * @param requestData
+     * @return
+     */
+    @GetMapping
+    public List<NoticeArticleDto> getNoticeArticleList(HttpServletRequest request, LanguageType languageType, NoticeArticleDto requestData) {
+        request.getHeader("id");
+        Long id = requestData.getId();
+        List<NoticeArticleDto> articleDto = noticeService.getNoticeArticleList(id, languageType);
+        return articleDto;
+    }
+
+    /**
+     * 공지사항 등록
+     */
+    @PostMapping
+    public void addNotice(@RequestBody @Valid NoticeArticleDto articleRequest, NoticeContentDto contentRequest) {
+        noticeService.saveNotice(articleRequest, contentRequest);
+    }
+
+    /**
+     * 공지사항 수정
+     */
+    @PutMapping("/{id}")
+    public void updateNotice(@PathVariable Long id,
+                             @RequestBody @Valid NoticeArticleDto articleDto, NoticeContentDto contentDto) {
+        noticeService.update(id, articleDto);
+        Optional<NoticeArticle> findNotice = articleRepository.findById(id);
+    }
+
+    /**
+     * 공지사항 삭제
+     */
+    @DeleteMapping("/{noticeArticleId}")
+    public void deleteNotice(@PathVariable Long noticeArticleId) {
+        noticeService.deleteNotice(noticeArticleId);
+    }
+
+}
+

src/main/java/HookKiller/server/notice/dto/NoticeArticleDto.java

@@ -0,0 +1,35 @@
+package HookKiller.server.notice.dto;
+
+import HookKiller.server.common.type.LanguageType;
+import HookKiller.server.common.type.NoticeArticleStatus;
+import HookKiller.server.notice.entity.NoticeArticle;
+import HookKiller.server.notice.entity.NoticeContent;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.sql.Timestamp;
+
+@Getter
+@Builder
+public class NoticeArticleDto {
+
+    private Long id;
+    private LanguageType language;
+    private NoticeArticleStatus status;
+    private Timestamp createdAt;
+    private Long createdUser;
+    private Timestamp updatedAt;
+    private Long updatedUser;
+
+    public static NoticeArticleDto of(NoticeArticle noticeArticle, NoticeContent noticeContent) {
+        return NoticeArticleDto.builder()
+                .id(noticeArticle.getId())
+                .language(noticeArticle.getLanguage())
+                .status(noticeArticle.getStatus())
+                .createdAt(noticeArticle.getCreatedAt())
+                .createdUser(noticeArticle.getCreatedUser())
+                .updatedAt(noticeArticle.getUpdatedAt())
+                .updatedUser(noticeArticle.getUpdatedUser())
+                .build();
+    }
+}

src/main/java/HookKiller/server/notice/dto/NoticeContentDto.java

@@ -0,0 +1,27 @@
+package HookKiller.server.notice.dto;
+
+import HookKiller.server.common.type.LanguageType;
+import HookKiller.server.notice.entity.NoticeArticle;
+import HookKiller.server.notice.entity.NoticeContent;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class NoticeContentDto {
+
+    private Long id;
+    private LanguageType language;
+    private String title;
+    private String content;
+
+    public NoticeContentDto of(NoticeArticle noticeArticle, NoticeContent noticeContent) {
+
+        return NoticeContentDto.builder()
+                .id(noticeContent.getId())
+                .language(noticeContent.getLanguage())
+                .title(noticeContent.getTitle())
+                .content(noticeContent.getContent())
+                .build();
+    }
+}

src/main/java/HookKiller/server/notice/exception/NoticeArticleNotFoundException.java

@@ -0,0 +1,13 @@
+package HookKiller.server.notice.exception;
+
+import HookKiller.server.common.exception.BaseException;
+
+import static HookKiller.server.notice.exception.NoticeException.NOTICE_ARTICLE_NOT_FOUND_EXCEPTION;
+
+public class NoticeArticleNotFoundException extends BaseException {
+    public static final BaseException EXCEPTION = new NoticeArticleNotFoundException();
+
+    private NoticeArticleNotFoundException() {
+        super(NOTICE_ARTICLE_NOT_FOUND_EXCEPTION);
+    }
+}

src/main/java/HookKiller/server/notice/exception/NoticeException.java

@@ -0,0 +1,24 @@
+package HookKiller.server.notice.exception;
+
+import HookKiller.server.common.dto.ErrorDetail;
+import HookKiller.server.common.exception.BaseErrorCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+@Getter
+@AllArgsConstructor
+public enum NoticeException implements BaseErrorCode {
+    NOTICE_ARTICLE_NOT_FOUND_EXCEPTION(NOT_FOUND.value(), "404-1", "공지사항 게시물이 존재하지 않습니다.");
+
+    private final Integer statusCode;
+    private final String errorCode;
+    private final String reason;
+
+    @Override
+    public ErrorDetail getErrorDetail() {
+        return ErrorDetail.of(statusCode, errorCode, reason);
+    }
+}

src/main/java/HookKiller/server/repository/NoticeArticleRepository.java

@@ -6,6 +6,7 @@
 
 @Repository
 public interface NoticeArticleRepository extends JpaRepository<NoticeArticle, Long> {
-    NoticeArticle findAllById(NoticeArticle noticeArticle);
+    NoticeArticle findAll(NoticeArticle noticeArticle);
+    NoticeArticle getById(Long id);
 
 }

src/main/java/HookKiller/server/repository/NoticeContentRepository.java

@@ -4,7 +4,6 @@
 import HookKiller.server.notice.entity.NoticeArticle;
 import HookKiller.server.notice.entity.NoticeContent;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 

src/main/java/HookKiller/server/service/NoticeService.java

@@ -0,0 +1,90 @@
+package HookKiller.server.service;
+
+import HookKiller.server.common.type.LanguageType;
+import HookKiller.server.notice.dto.NoticeArticleDto;
+import HookKiller.server.notice.dto.NoticeContentDto;
+import HookKiller.server.notice.entity.NoticeArticle;
+import HookKiller.server.notice.entity.NoticeContent;
+import HookKiller.server.notice.exception.NoticeArticleNotFoundException;
+import HookKiller.server.repository.NoticeArticleRepository;
+import HookKiller.server.repository.NoticeContentRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class NoticeService {
+
+    private final NoticeArticleRepository noticeArticleRepository;
+    private final NoticeContentRepository noticeContentRepository;
+
+    @Transactional
+    public void saveNotice(NoticeArticleDto articleDto, NoticeContentDto contentDto) {
+        NoticeArticle noticeArticle = NoticeArticle.builder()
+                .id(articleDto.getId())
+                .build();
+        NoticeContent noticeContent = NoticeContent.builder()
+                        .id(contentDto.getId())
+                                .build();
+        noticeArticleRepository.save(noticeArticle);
+        noticeContentRepository.save(noticeContent);
+    }
+
+    @Transactional(readOnly = true)
+    public List<NoticeArticleDto> getNoticeList() {
+
+        List<NoticeArticle> all = noticeArticleRepository.findAll();
+        List<NoticeArticleDto> noticeArticleDtoList = new ArrayList<>();
+
+        for (NoticeArticle noticeArticle : all) {
+            NoticeArticleDto articleDto = NoticeArticleDto.builder()
+                    .id(noticeArticle.getId())
+                    .language(noticeArticle.getLanguage())
+                    .status(noticeArticle.getStatus())
+                    .createdAt(noticeArticle.getCreatedAt())
+                    .createdUser(noticeArticle.getCreatedUser())
+                    .updatedAt(noticeArticle.getUpdatedAt())
+                    .updatedUser(noticeArticle.getUpdatedUser())
+                    .build();
+            noticeArticleDtoList.add(articleDto);
+        }
+        return noticeArticleDtoList;
+    }
+
+    @Transactional
+    public NoticeContentDto getNotice(Long id) {
+        NoticeContent noticeContent = noticeContentRepository.findById(id).orElseThrow(() -> NoticeArticleNotFoundException.EXCEPTION);
+
+        return NoticeContentDto.builder()
+                .id(noticeContent.getId())
+                .language(noticeContent.getLanguage())
+                .title(noticeContent.getTitle())
+                .content(noticeContent.getContent())
+                .build();
+    }
+
+    @Transactional
+    public void deleteNotice(Long id) {
+        noticeArticleRepository.deleteById(id);
+    }
+
+    @Transactional
+    public void update(Long id, NoticeArticleDto articleDto) {
+        Optional<NoticeArticle> byId = noticeArticleRepository.findById(id);
+        // TODO : 수정 받고 다시 작업 예정
+    }
+
+    public NoticeArticleDto getNoticeArticleByArticleId(Long noticeArticleId, LanguageType languageType) {
+        return null;
+    }
+
+    public List<NoticeArticleDto> getNoticeArticleList(Long noticeArticleId, LanguageType languageType) {
+        return null;
+    }
+
+}