Merge branch 'bo_suggestion' into 'dev'
[BO] 커뮤니케이션 - 건의사항 작업 See merge request korea-research/korea-research!82
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionDao implements GetSuggestionPortOut {
|
||||
private final GetSuggestionMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetSuggestion> operate(GetSuggestionCmd cmd) {
|
||||
return mapper.getSuggestionById(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetSuggestionMapper {
|
||||
Optional<GetSuggestion> getSuggestionById(GetSuggestionCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
|
||||
|
||||
public interface GetSuggestionPortIn {
|
||||
Optional<GetSuggestion> operate(GetSuggestionCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
|
||||
|
||||
public interface GetSuggestionPortOut {
|
||||
Optional<GetSuggestion> operate(GetSuggestionCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionService implements GetSuggestionPortIn {
|
||||
private final GetSuggestionPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetSuggestion> operate(GetSuggestionCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestion {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private String ownerPhone;
|
||||
private String regionMainName;
|
||||
private String researcherName;
|
||||
private String researcherPhone;
|
||||
private String content;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestionCmd {
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestionUI;
|
||||
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
|
||||
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 org.springframework.web.bind.annotation.PathVariable;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestionUI.model.GetSuggestionUIReqVO;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionUIController {
|
||||
|
||||
private final GetSuggestionPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/communication/suggestions/{id}")
|
||||
String operate(@PathVariable Long id, Model model,
|
||||
@ModelAttribute("reqVO") GetSuggestionUIReqVO reqVO) {
|
||||
model.addAttribute("item",
|
||||
portIn.operate(new GetSuggestionCmd(id)).orElse(null));
|
||||
return "communication/suggestions/{id}";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestionUI.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestionUIReqVO {
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.persistence;
|
||||
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.PageImpl;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionsDao implements GetSuggestionsPortOut {
|
||||
private final GetSuggestionsMapper mapper;
|
||||
|
||||
@Override
|
||||
public Page<GetSuggestions> operate(Pageable pageable, GetSuggestionsCmd cmd) {
|
||||
|
||||
List<GetSuggestions> result = mapper.getSuggestions(pageable, cmd);
|
||||
|
||||
return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getTotal());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
@Mapper
|
||||
public interface GetSuggestionsMapper {
|
||||
List<GetSuggestions> getSuggestions(@Param("pageable") Pageable pageable,
|
||||
@Param("cmd")GetSuggestionsCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.web.PageableDefault;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsReqVO;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionsController {
|
||||
private final GetSuggestionsPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/communication/suggestions")
|
||||
ResponseEntity<?> operate(@PageableDefault(size = 10) Pageable pageable,
|
||||
GetSuggestionsReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(portIn.operate(pageable,
|
||||
new GetSuggestionsCmd(
|
||||
reqVO.getRecordMonth(),
|
||||
reqVO.getOwnerField(),
|
||||
reqVO.getOwnerValue())));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestionsReqVO {
|
||||
private String recordMonth;
|
||||
private String ownerField;
|
||||
private String ownerValue;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestionsResVO {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.ports;
|
||||
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetSuggestionsPortIn {
|
||||
Page<GetSuggestions> operate(Pageable pageable, GetSuggestionsCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.ports;
|
||||
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetSuggestionsPortOut {
|
||||
Page<GetSuggestions> operate(Pageable pageable, GetSuggestionsCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn;
|
||||
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionsService implements GetSuggestionsPortIn {
|
||||
private final GetSuggestionsPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Page<GetSuggestions> operate(Pageable pageable, GetSuggestionsCmd cmd) {
|
||||
return portOut.operate(pageable, cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestions {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private String content;
|
||||
private String ownerName;
|
||||
private String phone;
|
||||
private String updatedBy;
|
||||
private String updatedAt;
|
||||
private Integer total;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestionsCmd {
|
||||
private String recordMonth;
|
||||
private String ownerField;
|
||||
private String ownerValue;
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package app.module.admin.usecase.communication.suggestion.getSuggestionsUI;
|
||||
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
@@ -11,11 +13,12 @@ import app.module.admin.usecase.communication.suggestion.getSuggestionsUI.model.
|
||||
@RequiredArgsConstructor
|
||||
class GetSuggestionsUIController {
|
||||
|
||||
@GetMapping(path = "/communication/suggestions")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetSuggestionsUIReqVO reqVO) {
|
||||
@GetMapping(path = "/communication/suggestions")
|
||||
String operate(Model model, @ModelAttribute("reqVO") GetSuggestionsUIReqVO reqVO) {
|
||||
|
||||
return "communication/suggestions";
|
||||
}
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
return "communication/suggestions";
|
||||
}
|
||||
}
|
||||
@@ -10,4 +10,20 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetSuggestionsUIReqVO {
|
||||
private Integer page;
|
||||
private String sort;
|
||||
private Integer size;
|
||||
private String recordMonth;
|
||||
private String ownerField;
|
||||
private String ownerValue;
|
||||
|
||||
public Integer getPage() {
|
||||
// 요청 페이지 넘버 - 초기값 `0`
|
||||
return page != null ? page : 0;
|
||||
}
|
||||
|
||||
public Integer getSize() {
|
||||
// 페이지 당 아이템 수 - 초기값 `10`
|
||||
return size != null ? size : 10;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user