diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeDao.java new file mode 100644 index 00000000..3b62b575 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeDao.java @@ -0,0 +1,57 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeDto; +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeHasUploadFilesParam; +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortOut; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class CreateNoticeDao implements CreateNoticePortOut { + + private final CreateNoticeMapper mapper; + + @Override + @Transactional + public Optional operate(CreateNoticeCmd command) { + + + CreateNoticeDto dto = + new CreateNoticeDto( + null, + command.getTitle(), + command.getContent(), + command.getVisible(), + command.getStartDate(), + command.getEndDate(), + command.getFileMappingId(), + command.getCreatedAt(), + command.getCreatedBy(), + command.getUpdatedAt(), + command.getUpdatedBy()); + + mapper.createNotice(dto); + + if (dto.getFileMappingId() != null && !dto.getFileMappingId().isEmpty()) { + mapper.createNoticeHasUploadFile(new CreateNoticeHasUploadFilesParam( + dto.getId(), + dto.getFileMappingId().stream() + .map(Long::parseLong) + .collect(Collectors.toList()), + dto.getCreatedAt(), + dto.getCreatedBy(), + dto.getUpdatedAt(), + dto.getUpdatedBy() + )); + } + + return Optional.of(new CreateNotice(dto.getId())); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeMapper.java new file mode 100644 index 00000000..5784775f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeDto; +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeHasUploadFilesParam; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateNoticeMapper { + void createNotice(CreateNoticeDto dto); + void createNoticeHasUploadFile(CreateNoticeHasUploadFilesParam param); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeDto.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeDto.java new file mode 100644 index 00000000..610c2b16 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeDto.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CreateNoticeDto { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeHasUploadFilesParam.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeHasUploadFilesParam.java new file mode 100644 index 00000000..1dfe4cfc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeHasUploadFilesParam.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CreateNoticeHasUploadFilesParam { + private Long id; + private List fileMappingIds; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java new file mode 100644 index 00000000..1e4dc05b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java @@ -0,0 +1,44 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web; + + +import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeReqVO; +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortIn; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller +@RequiredArgsConstructor +class CreateNoticeController { + + private final CreateNoticePortIn createNoticePortIn; + @PostMapping(path = "/api/communication/notices/create") + ResponseEntity operate(@RequestBody @Valid CreateNoticeReqVO reqVO, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + CreateNotice article = + createNoticePortIn + .operate( + new CreateNoticeCmd( + reqVO.getTitle(), + reqVO.getContent(), + reqVO.getVisible(), + reqVO.getStartDate(), + reqVO.getEndDate(), + reqVO.getFileMappingId())) + .orElseThrow(); + + return ResponseEntity.status(HttpStatus.OK).body(article); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java new file mode 100644 index 00000000..b0c0f412 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web; + + +import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeReqVO; +import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeUIReqVO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; + +@Controller +@RequiredArgsConstructor +class CreateNoticeUIController { + + @GetMapping(path = "/communication/notices/create") + String operate( + Model model, + @ModelAttribute("reqVO") CreateNoticeUIReqVO reqVO) { + + return "communication/notice/create"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java new file mode 100644 index 00000000..2d1faf61 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.*; +import org.apache.commons.text.StringEscapeUtils; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNoticeReqVO { + @NotBlank(message = "{valid.common.required}") + private String title; + + @NotBlank(message = "{valid.common.required}") + private String content; + + @NotNull(message = "{valid.common.required}") + private Boolean visible; + + @NotNull(message = "{valid.common.required}") + private LocalDateTime startDate; + + @NotNull(message = "{valid.common.required}") + private LocalDateTime endDate; + + private List fileMappingId; + + public String getTitle() { + return StringEscapeUtils.escapeHtml4(title); + } + + public String getContent() { + return StringEscapeUtils.escapeHtml4(content); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java new file mode 100644 index 00000000..6cb3962f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.text.StringEscapeUtils; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNoticeUIReqVO { + +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortIn.java new file mode 100644 index 00000000..89a8fd44 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortIn.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports; + + +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; + +import java.util.Optional; + +public interface CreateNoticePortIn { + + Optional operate(CreateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortOut.java new file mode 100644 index 00000000..85868cb8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortOut.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports; + + +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; + +import java.util.Optional; + +public interface CreateNoticePortOut { + + Optional operate(CreateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/CreateNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/CreateNoticeService.java new file mode 100644 index 00000000..34c3b996 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/CreateNoticeService.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports.application; + +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortIn; +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortOut; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class CreateNoticeService implements CreateNoticePortIn { + + private final CreateNoticePortOut portOut; + + @Override + @CreateCommand + public Optional operate(CreateNoticeCmd command) { + return portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNotice.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNotice.java new file mode 100644 index 00000000..63992faa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNotice.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNotice { + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNoticeCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNoticeCmd.java new file mode 100644 index 00000000..846838a8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNoticeCmd.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNoticeCmd extends AuditCommand { + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeDao.java new file mode 100644 index 00000000..ddde16d9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeDao.java @@ -0,0 +1,52 @@ +package app.module.admin.usecase.communication.notice.getNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortOut; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile; +import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class GetNoticeDao implements GetNoticePortOut { + + private final GetNoticeMapper mapper; + private final FileUrlPortIn fileUrlPortIn; + + @Override + @Transactional + public Optional operate(GetNoticeCmd command) { + GetNotice secArticle = mapper.getNotice(command); + + List setArticleUploadFile = + mapper.getUploadFiles(command.getId()); + + secArticle.setUploadFiles( + setArticleUploadFile.stream() + .map( + uploadFile -> { + // 참조 URL 전달 + uploadFile.setReferURL( + fileUrlPortIn.getInline( + uploadFile.getType().getFileStorageType(), + uploadFile.getPath(), + uploadFile.getName())); + // attachment URL 전달 + uploadFile.setAttachmentURL( + fileUrlPortIn.getAttachment( + uploadFile.getType().getFileStorageType(), uploadFile.getId())); + + return uploadFile; + }) + .collect(Collectors.toList())); + + return Optional.of(secArticle); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeMapper.java new file mode 100644 index 00000000..21cedd05 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeMapper.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.communication.notice.getNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface GetNoticeMapper { + + GetNotice getNotice(GetNoticeCmd command); + + List getUploadFiles(Long id); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/web/GetNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/web/GetNoticeController.java new file mode 100644 index 00000000..91a054ad --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/web/GetNoticeController.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.getNotice.adapters.web; + +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortIn; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class GetNoticeController { + private final GetNoticePortIn getNoticePortIn; + + @GetMapping(path = "/api/communication/notices/{id}") + ResponseEntity operate(@PathVariable Long id) { + return ResponseEntity.status(HttpStatus.OK) + .body(getNoticePortIn.operate(new GetNoticeCmd(id)).orElseThrow()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortIn.java new file mode 100644 index 00000000..6f1047fd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortIn.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports; + + +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; + +import java.util.Optional; + +public interface GetNoticePortIn { + + Optional operate(GetNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortOut.java new file mode 100644 index 00000000..588d9f01 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortOut.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports; + + +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; + +import java.util.Optional; + +public interface GetNoticePortOut { + + Optional operate(GetNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java new file mode 100644 index 00000000..ee8ccb3a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application; + +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortIn; +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortOut; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class GetNoticeService implements GetNoticePortIn { + + private final GetNoticePortOut portOut; + + @Override + public Optional operate(GetNoticeCmd command) { + return portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNotice.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNotice.java new file mode 100644 index 00000000..ed1de43e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNotice.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class GetNotice { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + private List uploadFiles; + public boolean getNewDate() { + LocalDateTime now = LocalDateTime.now(); + return now.toLocalDate().isEqual(createdAt.toLocalDate()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeCmd.java similarity index 55% rename from admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java rename to admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeCmd.java index f2d68206..d631614d 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.communication.notice.getNoticeUI.model; +package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,5 +9,6 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetNoticesReqVO { +public class GetNoticeCmd { + private Long id; } diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java new file mode 100644 index 00000000..a8101264 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; + +import app.module.core.config.application.enums.FileUploadType; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile} + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class GetNoticeUploadFile implements Serializable { + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + private Long id; + private FileUploadType type; + private String path; + private String name; + private String originName; + private Long fileLength; + private String referURL; + private String attachmentURL; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java deleted file mode 100644 index eb98c216..00000000 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java +++ /dev/null @@ -1,21 +0,0 @@ -package app.module.admin.usecase.communication.notice.getNoticeUI; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import app.module.admin.usecase.communication.notice.getNoticeUI.model.GetNoticesReqVO; - -@Controller -@RequiredArgsConstructor -class GetNoticesUIController { - - @GetMapping(path = "/communication/notices") - String operate( - Model model, - @ModelAttribute("reqVO") GetNoticesReqVO reqVO) { - - return "communication/notices"; - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesDao.java new file mode 100644 index 00000000..b82c65b9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesDao.java @@ -0,0 +1,127 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence.model.GetNoticesDto; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortOut; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticeFiles; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.config.application.enums.FileUploadType; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class GetNoticesDao implements GetNoticesPortOut { + + private final GetNoticesMapper mapper; + + @Override + @Transactional + public Page operate(Pageable pageable, GetNoticesCmd command) { + // 게시물 목록 얻기 + List contents = + ListUtils.emptyIfNull(mapper.getNotices(pageable, command)); + + // 대표 이미지 목록 얻기 + List uploadFiles = + contents.isEmpty() + ? Collections.emptyList() + : ListUtils.emptyIfNull( + mapper.getUploadFiles( + contents.stream().map(GetNoticesDto::getId) + .collect(Collectors.toList()), + FileUploadType.NOTICE)); + + return new PageImpl<>( + contents.stream() + .map( + article -> + new GetNotices( + article.getId(), + article.getUpdatedBy(), + article.getUpdatedAt(), + article.getCreatedBy(), + article.getCreatedAt(), + article.getTitle(), + article.getContent(), + article.getVisible(), + article.getStartDate(), + article.getEndDate(), + uploadFiles.stream() + .filter(file -> file.getNoticeId().equals(article.getId())) + .findFirst() + .orElse(null))) + .collect(Collectors.toList()), + pageable, + contents.isEmpty() ? 0 : contents.get(0).getTotal()); + } + + @Override + @Transactional + public List operateList(GetNoticesCmd command) { + /*// 검색조건 초기화 + Specification
spec = (root, query, criteriaBuilder) -> null; + + // 검색어 - like 검색 + if (!StringUtils.isEmpty(command.getSearchField())) { + spec = + spec.and( + (root, query, builder) -> + builder.like( + root.get(command.getSearchField()), + "%" + command.getSearchValue() + "%")); + } + + // 공개여부 검색 + if (!StringUtils.isEmpty(command.getSearchOpen())) { + spec = + spec.and( + ((root, query, criteriaBuilder) -> + criteriaBuilder.equal( + root.get("visible"), Boolean.valueOf(command.getSearchOpen())))); + } + + List
result = getArticlesRepo.findAll(spec); + + return result.stream() + .map( + article -> + new GetArticles( + article.getId(), + article.getUpdatedBy(), + article.getUpdatedAt(), + article.getTitle(), + article.getContent(), + article.getVisible(), + article.getStartDate(), + article.getEndDate(), + article.getOrderNo(), + article.getUploadFiles().stream() + // 목록에 보여줄 대표이미지만 담는다 + .filter( + uploadFile -> uploadFile.getType() + .equals(FileUploadType.EXAMPLE_REP)) + .map( + uploadFile -> + new GetArticleFiles( + uploadFile.getId(), + uploadFile.getType(), + uploadFile.getPath(), + uploadFile.getName(), + uploadFile.getOriginName(), + uploadFile.getFileLength())) + .findFirst() + .orElse(null))) + .collect(Collectors.toList());*/ + return null; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesMapper.java new file mode 100644 index 00000000..8b50d39d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesMapper.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence.model.GetNoticesDto; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticeFiles; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.config.application.enums.FileUploadType; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +@Mapper +public interface GetNoticesMapper { + List getNotices( + @Param("pageable") Pageable pageable, @Param("cmd") GetNoticesCmd cmd); + List getUploadFiles( + @Param("ids") List ids, @Param("fileUploadType") FileUploadType fileUploadType); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/model/GetNoticesDto.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/model/GetNoticesDto.java new file mode 100644 index 00000000..0512dcd4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/model/GetNoticesDto.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class GetNoticesDto { + private Long id; + private String updatedBy; + private LocalDateTime updatedAt; + private String createdBy; + private LocalDateTime createdAt; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private Long total; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java new file mode 100644 index 00000000..1cbbb135 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java @@ -0,0 +1,37 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web; + +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetNoticesController { + + private final GetNoticesPortIn getNoticesPortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/api/communication/notices") + ResponseEntity operate( + @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC, page = 0, size = 10) Pageable pageable, + GetNoticesReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK) + .body(getNoticesPortIn.operate(pageable, new GetNoticesCmd( + reqVO.getSearchField(), + reqVO.getSearchValue(), + reqVO.getSearchOpen() + ))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesUIController.java new file mode 100644 index 00000000..6e0309a0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesUIController.java @@ -0,0 +1,43 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web; + +import app.module.admin.config.application.util.AdminUtil; +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetNoticesUIController { + + private final GetNoticesPortIn getNoticesPortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/communication/notices") + String operate(Model model, @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC, page = 0, size = 10) Pageable pageable + , GetNoticesReqVO reqVO) { + + Page notices = + getNoticesPortIn.operate( + pageable, + new GetNoticesCmd( + reqVO.getSearchField(), reqVO.getSearchValue(), reqVO.getSearchOpen())); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("notices", notices); + + model.addAttribute("userRole", AdminUtil.getLoginUserRole()); + model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows")); + + return "communication/notice/notices"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/model/GetNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/model/GetNoticesReqVO.java new file mode 100644 index 00000000..6b1a685b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/model/GetNoticesReqVO.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.thymeleaf.util.StringUtils; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticesReqVO { + + private String searchField; + private String searchValue; + private String searchOpen; + + + private Integer page; + private String sort; + private Integer size; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public String getSort() { + // 정렬 값 - 초기값 `orderNo 내림차순` + return StringUtils.isEmpty(sort) ? "createdAt,DESC" : sort; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortIn.java new file mode 100644 index 00000000..fc01e7a9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortIn.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports; + +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +public interface GetNoticesPortIn { + + Page operate(Pageable pageable, GetNoticesCmd command); + + List operateList(GetNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortOut.java new file mode 100644 index 00000000..62296dce --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortOut.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports; + +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +public interface GetNoticesPortOut { + + Page operate(Pageable pageable, GetNoticesCmd command); + + List operateList(GetNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/GetNoticesService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/GetNoticesService.java new file mode 100644 index 00000000..a8a69299 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/GetNoticesService.java @@ -0,0 +1,29 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application; + +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortOut; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +class GetNoticesService implements GetNoticesPortIn { + + private final GetNoticesPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetNoticesCmd command) { + return portOut.operate(pageable, command); + } + + @Override + public List operateList(GetNoticesCmd command) { + return portOut.operateList(command); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticeFiles.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticeFiles.java new file mode 100644 index 00000000..95e71754 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticeFiles.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain; + +import app.module.core.config.application.enums.FileUploadType; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticeFiles { + private Long noticeId; + private Long id; + private FileUploadType type; + private String path; + private String name; + private String originName; + private Long fileLength; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNotices.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNotices.java new file mode 100644 index 00000000..bb9ef372 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNotices.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNotices { + private Long id; + private String updatedBy; + private LocalDateTime updatedAt; + private String createdBy; + private LocalDateTime createdAt; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private GetNoticeFiles uploadFile; + + public boolean getNewDate() { + LocalDateTime now = LocalDateTime.now(); + return now.toLocalDate().isEqual(createdAt.toLocalDate()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticesCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticesCmd.java new file mode 100644 index 00000000..0f5c49c7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticesCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticesCmd { + + private String searchField; + private String searchValue; + private String searchOpen; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesDao.java new file mode 100644 index 00000000..15af73d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesDao.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence; + +import app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence.model.RemoveNoticesParam; +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortOut; +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; +import app.module.core.config.application.util.CommonUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; + +@Repository +@RequiredArgsConstructor +class RemoveNoticesDao implements RemoveNoticesPortOut { + + private final RemoveNoticesMapper mapper; + + @Override + public void operate(RemoveNoticesCmd command) { + String loginUser = CommonUtil.getLoginUsername();; + LocalDateTime now = LocalDateTime.now(); + + mapper.deleteNoticeHasFiles( + new RemoveNoticesParam(command.getRemoveIds(), now, loginUser, now, loginUser)); + mapper.deleteNotices( + new RemoveNoticesParam(command.getRemoveIds(), now, loginUser, now, loginUser)); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesMapper.java new file mode 100644 index 00000000..6f2fdcce --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence; + +import app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence.model.RemoveNoticesParam; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveNoticesMapper { + void deleteNotices(RemoveNoticesParam param); + void deleteNoticeHasFiles(RemoveNoticesParam param); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/model/RemoveNoticesParam.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/model/RemoveNoticesParam.java new file mode 100644 index 00000000..97002d89 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/model/RemoveNoticesParam.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.Set; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveNoticesParam { + private Set removeIds; + private LocalDateTime updatedAt; + private String updatedBy; + private LocalDateTime deletedAt; + private String deletedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/RemoveNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/RemoveNoticesController.java new file mode 100644 index 00000000..f789f0b8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/RemoveNoticesController.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.web; + +import app.module.admin.usecase.communication.notice.removeNotices.adapters.web.model.RemoveNoticesReqVO; +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortIn; +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class RemoveNoticesController { + private final RemoveNoticesPortIn removeNoticesPortIn; + + @DeleteMapping(path = "/api/communication/notices/remove") + ResponseEntity operate(@Valid RemoveNoticesReqVO reqVO, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + removeNoticesPortIn.operate(new RemoveNoticesCmd(reqVO.getSelectIds())); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/model/RemoveNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/model/RemoveNoticesReqVO.java new file mode 100644 index 00000000..38efb322 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/model/RemoveNoticesReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.util.Set; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveNoticesReqVO { + private Set selectIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortIn.java new file mode 100644 index 00000000..868352d4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortIn.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports; + + +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; + +public interface RemoveNoticesPortIn { + void operate(RemoveNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortOut.java new file mode 100644 index 00000000..1797f923 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortOut.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports; + + +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; + +public interface RemoveNoticesPortOut { + void operate(RemoveNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/RemoveNoticesService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/RemoveNoticesService.java new file mode 100644 index 00000000..63311299 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/RemoveNoticesService.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports.application; + +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortIn; +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortOut; +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveNoticesService implements RemoveNoticesPortIn { + + private final RemoveNoticesPortOut portOut; + + @Override + public void operate(RemoveNoticesCmd command) { + portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/domain/RemoveNoticesCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/domain/RemoveNoticesCmd.java new file mode 100644 index 00000000..6f2ded2c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/domain/RemoveNoticesCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.util.Set; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveNoticesCmd { + private Set removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeDao.java new file mode 100644 index 00000000..f5276435 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeDao.java @@ -0,0 +1,54 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.CreateUploadFileParam; +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.UpdateNoticeDto; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortOut; +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; +import app.module.core.config.adapters.persistence.entity.NoticeHasUploadFile; +import app.module.core.config.application.util.CommonUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; + +@Repository +@RequiredArgsConstructor +class UpdateNoticeDao implements UpdateNoticePortOut { + + private final UpdateNoticeMapper mapper; + + + @Override + public void operate(UpdateNoticeCmd command) { + mapper.updateNotice( + + new UpdateNoticeDto( + command.getId(), + command.getTitle(), + command.getContent(), + command.getVisible(), + command.getStartDate(), + command.getEndDate(), + command.getFileMappingId(), + LocalDateTime.now(), + CommonUtil.getLoginUsername() + )); + + // 첨부파일 초기화 + mapper.deleteFileUploads(new NoticeHasUploadFile(command.getId())); + + // 첨부파일 있을 시, 등록 + if (command.getFileMappingId() != null && !command.getFileMappingId().isEmpty()) { + mapper.createFileUploads(new CreateUploadFileParam( + command.getId(), + command.getFileMappingId().stream() + .map(Long::parseLong) + .toList(), + LocalDateTime.now(), + CommonUtil.getLoginUsername(), + LocalDateTime.now(), + CommonUtil.getLoginUsername() + )); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeMapper.java new file mode 100644 index 00000000..f2b2c4ef --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeMapper.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.CreateUploadFileParam; +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.UpdateNoticeDto; +import app.module.core.config.adapters.persistence.entity.ArticleHasUploadFile; +import app.module.core.config.adapters.persistence.entity.NoticeHasUploadFile; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UpdateNoticeMapper { + void updateNotice(UpdateNoticeDto dto); + void deleteFileUploads(NoticeHasUploadFile noticeHasUploadFile); + void createFileUploads(CreateUploadFileParam param); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/CreateUploadFileParam.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/CreateUploadFileParam.java new file mode 100644 index 00000000..99fce30b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/CreateUploadFileParam.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@AllArgsConstructor +public class CreateUploadFileParam { + private Long id; + private List fileMappingId; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/UpdateNoticeDto.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/UpdateNoticeDto.java new file mode 100644 index 00000000..26041e2a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/UpdateNoticeDto.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class UpdateNoticeDto { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java new file mode 100644 index 00000000..7159cd89 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.web; + +import app.module.admin.usecase.communication.notice.updateNotice.adapters.web.model.UpdateNoticeReqVO; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class UpdateNoticeController { + private final UpdateNoticePortIn updateNoticePortIn; + + @PutMapping(path = "/api/communication/notices/update") + ResponseEntity operate(@RequestBody @Valid UpdateNoticeReqVO reqVO, BindingResult bindingResult) { + + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + updateNoticePortIn.operate( + new UpdateNoticeCmd( + reqVO.getId(), + reqVO.getTitle(), + reqVO.getContent(), + reqVO.getVisible(), + reqVO.getStartDate(), + reqVO.getEndDate(), + reqVO.getFileMappingId() + )); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java new file mode 100644 index 00000000..2d7237d9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java @@ -0,0 +1,35 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.web; + +import app.module.admin.config.application.util.AdminUtil; +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; + +@Controller +@RequiredArgsConstructor +class UpdateNoticeUIController { + + private final UpdateNoticePortIn updateNoticePortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/communication/notices/{id}") + String operate(Model model + , @PathVariable @ModelAttribute("id") Long id) { + + + return "communication/notice/{id}"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java new file mode 100644 index 00000000..2124128a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java @@ -0,0 +1,49 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.*; +import org.apache.commons.text.StringEscapeUtils; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateNoticeReqVO { + @NotNull(message = "{valid.common.required}") + private Long id; + + @NotBlank(message = "{valid.common.required}") + private String title; + + @NotBlank(message = "{valid.common.required}") + private String content; + + @NotNull(message = "{valid.common.required}") + private Boolean visible; + + + @NotNull(message = "{valid.common.required}") + private LocalDateTime startDate; + + @NotNull(message = "{valid.common.required}") + private LocalDateTime endDate; + + private List fileMappingId; + + private LocalDateTime createdAt; + + private String createdBy; + + public String getTitle() { + return StringEscapeUtils.escapeHtml4(title); + } + + public String getContent() { + return StringEscapeUtils.escapeHtml4(content); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortIn.java new file mode 100644 index 00000000..9e393175 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports; + + +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; + +public interface UpdateNoticePortIn { + + void operate(UpdateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortOut.java new file mode 100644 index 00000000..120af13c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports; + + +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; + +public interface UpdateNoticePortOut { + + void operate(UpdateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java new file mode 100644 index 00000000..ca91ed2b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports.application; + +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortOut; +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class UpdateNoticeService implements UpdateNoticePortIn { + + private final UpdateNoticePortOut portOut; + + @Override + public void operate(UpdateNoticeCmd command) { + portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/domain/UpdateNoticeCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/domain/UpdateNoticeCmd.java new file mode 100644 index 00000000..e22bc500 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/domain/UpdateNoticeCmd.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateNoticeCmd { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; +} diff --git a/admin/src/main/resources/mappers/notice/CreateNoticeMapper.xml b/admin/src/main/resources/mappers/notice/CreateNoticeMapper.xml new file mode 100644 index 00000000..e5d1c88a --- /dev/null +++ b/admin/src/main/resources/mappers/notice/CreateNoticeMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + SELECT nextval('notice_seq') + + + INSERT INTO notice ( + id, + content, + end_date, + start_date, + title, + visible, + created_at, + created_by, + updated_at, + updated_by, + is_deleted + ) VALUES ( + #{id}, + #{content}, + #{endDate}, + #{startDate}, + #{title}, + #{visible}, + #{createdAt}, + #{createdBy}, + #{updatedAt}, + #{updatedBy}, + false + ) + + + + + INSERT INTO notice_has_upload_file + ( + notice_id, + upload_files_id, + + ) + VALUES + + ( + #{id}, + #{fileId}, + + ) + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/GetNoticeMapper.xml b/admin/src/main/resources/mappers/notice/GetNoticeMapper.xml new file mode 100644 index 00000000..1a0fb58c --- /dev/null +++ b/admin/src/main/resources/mappers/notice/GetNoticeMapper.xml @@ -0,0 +1,49 @@ + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/GetNoticesMapper.xml b/admin/src/main/resources/mappers/notice/GetNoticesMapper.xml new file mode 100644 index 00000000..c0ccc944 --- /dev/null +++ b/admin/src/main/resources/mappers/notice/GetNoticesMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/RemoveNoticesMapper.xml b/admin/src/main/resources/mappers/notice/RemoveNoticesMapper.xml new file mode 100644 index 00000000..d253a98a --- /dev/null +++ b/admin/src/main/resources/mappers/notice/RemoveNoticesMapper.xml @@ -0,0 +1,26 @@ + + + + + /* deleteNotices : 게시물 삭제 */ + UPDATE notice + SET + WHERE id IN + + #{id} + + + + + /* deleteNoticeHasFiles : 게시물-파일 매핑 논리 삭제 */ + UPDATE notice_has_upload_file + SET + WHERE notice_id IN + + #{id} + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/UpdateNoticeMapper.xml b/admin/src/main/resources/mappers/notice/UpdateNoticeMapper.xml new file mode 100644 index 00000000..fa705ec4 --- /dev/null +++ b/admin/src/main/resources/mappers/notice/UpdateNoticeMapper.xml @@ -0,0 +1,45 @@ + + + + + + /* deleteFileUploads 게시글 수정 시, 첨부파일 join 데이터 삭제 */ + UPDATE notice_has_upload_file + SET + + WHERE notice_id = #{noticeId} + + + + /* createFileUploads 게시글 수정 시, 첨부파일 join 데이터 등록 */ + INSERT INTO notice_has_upload_file + ( + notice_id, + upload_files_id, + + ) + VALUES + + ( + #{id}, + #{fileId}, + + ) + + + + + /* updateNotice 게시글 수정 */ + UPDATE notice + SET + content = #{content}, + end_date = #{endDate}, + start_date = #{startDate}, + title = #{title}, + visible = #{visible}, + + WHERE id = #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 06803740..0cb7779f 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -37,6 +37,9 @@ let uiUtil = { isoStrToReadable(isoStr) { return isoStr.replace(/T/, ' ').substring(0, 19); }, + isoStrToDateOnly(isoStr) { + return isoStr.split('T')[0]; + }, // Pagination UI 생성 함수 getPagingUI(curPageNo, size, totalPages, moveHandler) { curPageNo = parseInt(curPageNo); @@ -280,6 +283,8 @@ uiUtil.showFileInfo = (input, uploadFile, showImg) => { inputGroup.find('.fileInfo').remove(); + + inputGroup.append(` `); + const fileInfo = inputGroup.find('.fileInfo'); if (!showImg) { fileInfo.find('img').remove(); diff --git a/admin/src/main/resources/templates/communication/notice/create.html b/admin/src/main/resources/templates/communication/notice/create.html new file mode 100644 index 00000000..520cc0cf --- /dev/null +++ b/admin/src/main/resources/templates/communication/notice/create.html @@ -0,0 +1,182 @@ + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목* +
+
+ +
+
+
내용* + +
첨부파일* +
+ +
+ + + + +
게시기간* +
+
+
+ +
+
- +
+
+ +
+
+
+ +
노출여부* +
+ +
+
+ +
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notice/notices.html b/admin/src/main/resources/templates/communication/notice/notices.html new file mode 100644 index 00000000..9d463823 --- /dev/null +++ b/admin/src/main/resources/templates/communication/notice/notices.html @@ -0,0 +1,237 @@ + + + +
+
+ + + + + + + +
+ +
+
+ +
+
+

+ 검색필드 +

+
+
+ +
+
+ +
+
+

+ 검색필드 +

+
+
+
+ +
+
+
+ +
+
+

+ 검색필드 +

+
+
+ +
+
+ +
+ + +
+
+ + +
+
+
+ +
+

총 0건

+ + + + + + + + + + + + + + + +
+
+ +
+
제목게시일게시기간노출
여부
최종수정자
+
+ + +
+ +
+
+ + + + +
+
+
+
+ + +
+ +
+ + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html new file mode 100644 index 00000000..6eb51c31 --- /dev/null +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -0,0 +1,239 @@ + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목* +
+
+ +
+
+
내용* + +
첨부파일* +
+ +
+ + + + +
게시기간* +
+
+
+ +
+
- +
+
+ +
+
+
+ +
노출여부* +
+ +
+
+ +
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notices.html b/admin/src/main/resources/templates/communication/notices.html deleted file mode 100644 index 1419696b..00000000 --- a/admin/src/main/resources/templates/communication/notices.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -
-

/communication/notices

-
- - \ No newline at end of file diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java new file mode 100644 index 00000000..9b1a58e6 --- /dev/null +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java @@ -0,0 +1,22 @@ +package app.module.core.config.adapters.persistence.entity; + +import app.module.core.config.adapters.persistence.component.AuditEntity; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class NoticeHasUploadFile extends AuditEntity { + + private Long noticeId; + + private Long uploadFilesId; + + public NoticeHasUploadFile(Long noticeId) { + this.noticeId = noticeId; + } +} diff --git a/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java b/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java index 16ed115f..39d2e05a 100644 --- a/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java @@ -40,10 +40,10 @@ class GetInfoUIController { - //TODO 일계부를 등록하지 않은 날짜 처리 필요 + //TODO 일계부입력상태에 따른 경고문구 노출 boolean isUnregisteredDate = false; - //TODO 최근등록일 취득 해야함 + //TODO 일계부입력 최근등록일 취득 해야함 String latestRegisteredDate = "2025년 5월 16~17일"; model.addAttribute("userInfo",getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow());