diff --git a/spring/src/main/java/com/bancow/bancowback/domain/common/util/mail/service/MailService.java b/spring/src/main/java/com/bancow/bancowback/domain/common/util/mail/service/MailService.java index 5c39da27..a8f0d6c1 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/common/util/mail/service/MailService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/common/util/mail/service/MailService.java @@ -7,7 +7,6 @@ import com.bancow.bancowback.domain.common.util.mail.MailComponent; import com.bancow.bancowback.domain.common.util.mail.entity.MailTemplate; import com.bancow.bancowback.domain.common.util.mail.repository.MailTemplateRepository; -import com.bancow.bancowback.domain.common.util.token.repository.TokenRepository; import com.bancow.bancowback.domain.common.util.token.service.TokenService; import com.bancow.bancowback.domain.main.farmqna.dto.FarmQnaReplyDto; import com.bancow.bancowback.domain.main.farmqna.entity.FarmQna; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/event/controller/EventController.java b/spring/src/main/java/com/bancow/bancowback/domain/main/event/controller/EventController.java index 246c2427..26d39434 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/event/controller/EventController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/event/controller/EventController.java @@ -26,7 +26,6 @@ import com.bancow.bancowback.domain.main.event.dto.EventInfo; import com.bancow.bancowback.domain.main.event.dto.EventUpdateRequestDto; import com.bancow.bancowback.domain.main.event.service.EventService; - import com.bancow.bancowback.infra.ncp.NcpService; import lombok.RequiredArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/event/service/EventService.java b/spring/src/main/java/com/bancow/bancowback/domain/main/event/service/EventService.java index 2533a81b..227e1e72 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/event/service/EventService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/event/service/EventService.java @@ -11,7 +11,6 @@ import com.bancow.bancowback.domain.common.dto.ServiceResult; import com.bancow.bancowback.domain.common.exception.ErrorCode; import com.bancow.bancowback.domain.common.exception.EventException; - import com.bancow.bancowback.domain.main.event.dto.EventAddRequestDto; import com.bancow.bancowback.domain.main.event.dto.EventDistributeResponseDto; import com.bancow.bancowback.domain.main.event.dto.EventInfo; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/controller/FaqController.java b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/controller/FaqController.java index 304886a4..afdc68de 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/controller/FaqController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/controller/FaqController.java @@ -1,7 +1,5 @@ package com.bancow.bancowback.domain.main.faq.controller; -import java.util.List; - import javax.validation.Valid; import org.springframework.data.domain.Page; @@ -22,7 +20,6 @@ import com.bancow.bancowback.domain.main.faq.dto.FaqDeleteListDto; import com.bancow.bancowback.domain.main.faq.dto.FaqSearchResultDto; import com.bancow.bancowback.domain.main.faq.dto.FaqUpdateDto; -import com.bancow.bancowback.domain.main.faq.entity.Faq; import com.bancow.bancowback.domain.main.faq.service.FaqService; import lombok.RequiredArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqAddDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqAddDto.java index 4a17cbac..ddb5a93e 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqAddDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqAddDto.java @@ -1,6 +1,5 @@ package com.bancow.bancowback.domain.main.faq.dto; -import javax.persistence.Column; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqDeleteListDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqDeleteListDto.java index 526b3459..a0e4f705 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqDeleteListDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqDeleteListDto.java @@ -2,6 +2,8 @@ import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.Getter; import lombok.Setter; @@ -9,5 +11,6 @@ @Setter public class FaqDeleteListDto { + @JsonProperty("id_list") private List idList; } diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqSearchResultDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqSearchResultDto.java index 59411e42..8e89e3ac 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqSearchResultDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqSearchResultDto.java @@ -2,17 +2,7 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; - import com.bancow.bancowback.domain.main.faq.entity.FaqCategory; -import com.bancow.bancowback.domain.manager.entity.Manager; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqUpdateDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqUpdateDto.java index db2ef38e..774f2b79 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqUpdateDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/dto/FaqUpdateDto.java @@ -1,6 +1,5 @@ package com.bancow.bancowback.domain.main.faq.dto; -import javax.persistence.Column; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/service/FaqService.java b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/service/FaqService.java index 2f338190..a796cc7e 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/faq/service/FaqService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/faq/service/FaqService.java @@ -2,10 +2,8 @@ import static com.bancow.bancowback.domain.common.exception.ErrorCode.*; -import java.util.ArrayList; import java.util.List; -import org.mapstruct.Mapper; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; @@ -14,12 +12,12 @@ import com.bancow.bancowback.domain.common.dto.ServiceResult; import com.bancow.bancowback.domain.common.exception.FaqException; import com.bancow.bancowback.domain.common.util.token.service.TokenService; -import com.bancow.bancowback.domain.main.faq.dto.FaqSearchResultDto; -import com.bancow.bancowback.domain.main.faq.entity.Faq; -import com.bancow.bancowback.domain.main.faq.mapper.FaqMapper; import com.bancow.bancowback.domain.main.faq.dto.FaqAddDto; import com.bancow.bancowback.domain.main.faq.dto.FaqResponseDto; +import com.bancow.bancowback.domain.main.faq.dto.FaqSearchResultDto; import com.bancow.bancowback.domain.main.faq.dto.FaqUpdateDto; +import com.bancow.bancowback.domain.main.faq.entity.Faq; +import com.bancow.bancowback.domain.main.faq.mapper.FaqMapper; import com.bancow.bancowback.domain.main.faq.repository.FaqRepository; import com.bancow.bancowback.domain.manager.entity.Manager; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaController.java b/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaController.java index 51b74e5c..142831e3 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaController.java @@ -20,7 +20,6 @@ import com.bancow.bancowback.domain.main.farmqna.dto.FarmQnaDeleteRequestDto; import com.bancow.bancowback.domain.main.farmqna.dto.FarmQnaReplyDto; import com.bancow.bancowback.domain.main.farmqna.dto.FarmQnaResponseDto; -import com.bancow.bancowback.domain.main.farmqna.entity.FarmQna; import com.bancow.bancowback.domain.main.farmqna.service.FarmQnaService; import lombok.RequiredArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/dto/FarmQnaAddRequestDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/dto/FarmQnaAddRequestDto.java index b452c096..e870cd80 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/dto/FarmQnaAddRequestDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/dto/FarmQnaAddRequestDto.java @@ -1,7 +1,6 @@ package com.bancow.bancowback.domain.main.farmqna.dto; import java.time.LocalDate; -import java.time.LocalDateTime; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/service/FarmQnaService.java b/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/service/FarmQnaService.java index d3c68e49..3b474b78 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/service/FarmQnaService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/farmqna/service/FarmQnaService.java @@ -2,7 +2,6 @@ import static com.bancow.bancowback.domain.common.exception.ErrorCode.*; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/history/entity/History.java b/spring/src/main/java/com/bancow/bancowback/domain/main/history/entity/History.java index ef22aca0..092e0a5f 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/history/entity/History.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/history/entity/History.java @@ -4,8 +4,6 @@ import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/history/repository/HistoryRepository.java b/spring/src/main/java/com/bancow/bancowback/domain/main/history/repository/HistoryRepository.java index 96d6af1f..42efd5a7 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/history/repository/HistoryRepository.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/history/repository/HistoryRepository.java @@ -3,7 +3,6 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; import com.bancow.bancowback.domain.main.history.entity.History; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/controller/NoticeController.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/controller/NoticeController.java index b6228c51..3c64d704 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/controller/NoticeController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/controller/NoticeController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import com.bancow.bancowback.domain.common.dto.Response; -import com.bancow.bancowback.domain.common.dto.ServiceResult; import com.bancow.bancowback.domain.main.notice.dto.NoticeAddDto; import com.bancow.bancowback.domain.main.notice.dto.NoticeDeleteListDto; import com.bancow.bancowback.domain.main.notice.dto.NoticeUpdateDto; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeAddDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeAddDto.java index 8cd931f6..7c42070c 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeAddDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeAddDto.java @@ -1,20 +1,9 @@ package com.bancow.bancowback.domain.main.notice.dto; -import java.time.LocalDateTime; - -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import com.bancow.bancowback.domain.main.notice.entity.NoticeCategory; -import com.bancow.bancowback.domain.manager.entity.Manager; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeDeleteListDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeDeleteListDto.java index 716e4222..b729125a 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeDeleteListDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeDeleteListDto.java @@ -2,6 +2,8 @@ import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.Getter; import lombok.Setter; @@ -9,5 +11,6 @@ @Setter public class NoticeDeleteListDto { + @JsonProperty("id_list") private List idList; } diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeResponseDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeResponseDto.java index ed287e51..83a50a81 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeResponseDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeResponseDto.java @@ -3,18 +3,8 @@ import java.time.LocalDateTime; import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import com.bancow.bancowback.domain.main.notice.entity.NoticeCategory; -import com.bancow.bancowback.domain.manager.entity.Manager; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeUpdateDto.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeUpdateDto.java index 04999aa2..b3f799db 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeUpdateDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/dto/NoticeUpdateDto.java @@ -1,13 +1,9 @@ package com.bancow.bancowback.domain.main.notice.dto; -import java.time.LocalDateTime; - -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import com.bancow.bancowback.domain.main.notice.entity.NoticeCategory; -import com.bancow.bancowback.domain.manager.entity.Manager; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/mapper/NoticeMapper.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/mapper/NoticeMapper.java index 177222cb..b8d915aa 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/mapper/NoticeMapper.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/mapper/NoticeMapper.java @@ -2,17 +2,6 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -20,7 +9,6 @@ import com.bancow.bancowback.domain.main.notice.dto.NoticeResponseDto; import com.bancow.bancowback.domain.main.notice.dto.NoticeUpdateDto; import com.bancow.bancowback.domain.main.notice.entity.Notice; -import com.bancow.bancowback.domain.main.notice.entity.NoticeCategory; import com.bancow.bancowback.domain.manager.entity.Manager; @Mapper(componentModel = "spring") diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/repository/NoticeRepository.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/repository/NoticeRepository.java index f380a37b..e0737cfb 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/repository/NoticeRepository.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/repository/NoticeRepository.java @@ -1,10 +1,9 @@ package com.bancow.bancowback.domain.main.notice.repository; import java.util.List; -import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; + import com.bancow.bancowback.domain.main.notice.entity.Notice; public interface NoticeRepository extends JpaRepository { diff --git a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/service/NoticeService.java b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/service/NoticeService.java index f1dc0d07..33e75705 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/main/notice/service/NoticeService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/main/notice/service/NoticeService.java @@ -2,9 +2,7 @@ import static com.bancow.bancowback.domain.common.exception.ErrorCode.*; -import java.time.LocalDateTime; import java.util.List; -import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -15,7 +13,6 @@ import com.bancow.bancowback.domain.common.exception.NoticeException; import com.bancow.bancowback.domain.common.util.token.service.TokenService; import com.bancow.bancowback.domain.main.notice.dto.NoticeAddDto; -import com.bancow.bancowback.domain.main.notice.dto.NoticeDeleteListDto; import com.bancow.bancowback.domain.main.notice.dto.NoticeResponseDto; import com.bancow.bancowback.domain.main.notice.dto.NoticeUpdateDto; import com.bancow.bancowback.domain.main.notice.entity.Notice; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/manager/controller/ManagerController.java b/spring/src/main/java/com/bancow/bancowback/domain/manager/controller/ManagerController.java index ceb5b2ff..2a247cd1 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/manager/controller/ManagerController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/manager/controller/ManagerController.java @@ -16,12 +16,12 @@ import com.bancow.bancowback.domain.common.dto.Response; import com.bancow.bancowback.domain.common.dto.ServiceResult; -import com.bancow.bancowback.domain.manager.dto.ManagerResponseDto; import com.bancow.bancowback.domain.manager.dto.ManagerFindDto; import com.bancow.bancowback.domain.manager.dto.ManagerLoginDto; import com.bancow.bancowback.domain.manager.dto.ManagerLoginResultDto; import com.bancow.bancowback.domain.manager.dto.ManagerPasswordDto; import com.bancow.bancowback.domain.manager.dto.ManagerRegisterDto; +import com.bancow.bancowback.domain.manager.dto.ManagerResponseDto; import com.bancow.bancowback.domain.manager.service.ManagerService; import lombok.RequiredArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/sub/buyer/controller/BuyerController.java b/spring/src/main/java/com/bancow/bancowback/domain/sub/buyer/controller/BuyerController.java index fd76a3fc..a46d5b50 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/sub/buyer/controller/BuyerController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/sub/buyer/controller/BuyerController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import com.bancow.bancowback.domain.common.dto.Response; - import com.bancow.bancowback.domain.common.util.token.service.TokenService; import com.bancow.bancowback.domain.sub.buyer.dto.BuyerDeleteRequestDto; import com.bancow.bancowback.domain.sub.buyer.dto.BuyerUpdateRequestDto; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/mapper/ChartMapper.java b/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/mapper/ChartMapper.java index 4b9e4f38..4847f72d 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/mapper/ChartMapper.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/mapper/ChartMapper.java @@ -1,7 +1,6 @@ package com.bancow.bancowback.domain.sub.chart.mapper; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/service/ChartService.java b/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/service/ChartService.java index 8f0339d0..2b1dfe28 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/service/ChartService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/sub/chart/service/ChartService.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.Comparator; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/sub/farm/service/FarmService.java b/spring/src/main/java/com/bancow/bancowback/domain/sub/farm/service/FarmService.java index 6c25dc5b..3fadb461 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/sub/farm/service/FarmService.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/sub/farm/service/FarmService.java @@ -6,17 +6,13 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; - import org.springframework.stereotype.Service; import com.bancow.bancowback.domain.common.dto.ServiceResult; import com.bancow.bancowback.domain.common.exception.ErrorCode; - import com.bancow.bancowback.domain.common.exception.FarmException; - import com.bancow.bancowback.domain.manager.entity.Manager; import com.bancow.bancowback.domain.sub.farm.dto.FarmAddRequestDto; - import com.bancow.bancowback.domain.sub.farm.dto.FarmDetailResponseDto; import com.bancow.bancowback.domain.sub.farm.dto.FarmDistributeResponseDto; import com.bancow.bancowback.domain.sub.farm.dto.FarmPagingResponseDto; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/sub/news/controller/NewsController.java b/spring/src/main/java/com/bancow/bancowback/domain/sub/news/controller/NewsController.java index 25a1379a..c984f938 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/sub/news/controller/NewsController.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/sub/news/controller/NewsController.java @@ -21,7 +21,6 @@ import com.bancow.bancowback.domain.sub.news.dto.NewsRequestDto; import com.bancow.bancowback.domain.sub.news.dto.NewsResponseDto; import com.bancow.bancowback.domain.sub.news.dto.NewsUpdateRequestDto; -import com.bancow.bancowback.domain.sub.news.entity.News; import com.bancow.bancowback.domain.sub.news.service.NewsService; import lombok.RequiredArgsConstructor; diff --git a/spring/src/main/java/com/bancow/bancowback/domain/sub/news/dto/NewsResponseDto.java b/spring/src/main/java/com/bancow/bancowback/domain/sub/news/dto/NewsResponseDto.java index 1aef09b0..d39f7145 100644 --- a/spring/src/main/java/com/bancow/bancowback/domain/sub/news/dto/NewsResponseDto.java +++ b/spring/src/main/java/com/bancow/bancowback/domain/sub/news/dto/NewsResponseDto.java @@ -2,7 +2,6 @@ import java.time.LocalDateTime; -import com.bancow.bancowback.domain.manager.entity.Manager; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/spring/src/test/java/com/bancow/bancowback/TestSupport.java b/spring/src/test/java/com/bancow/bancowback/TestSupport.java index c064f7e3..d6e86cd1 100644 --- a/spring/src/test/java/com/bancow/bancowback/TestSupport.java +++ b/spring/src/test/java/com/bancow/bancowback/TestSupport.java @@ -1,8 +1,8 @@ package com.bancow.bancowback; -import io.micrometer.core.instrument.util.IOUtils; import java.io.IOException; import java.nio.charset.StandardCharsets; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +24,8 @@ import com.bancow.bancowback.domain.manager.repository.ManagerRepository; import com.bancow.bancowback.domain.manager.service.ManagerService; +import io.micrometer.core.instrument.util.IOUtils; + @SpringBootTest @AutoConfigureMockMvc diff --git a/spring/src/test/java/com/bancow/bancowback/domain/main/faq/controller/FaqControllerTest.java b/spring/src/test/java/com/bancow/bancowback/domain/main/faq/controller/FaqControllerTest.java index 60b4a1d2..d3964df7 100644 --- a/spring/src/test/java/com/bancow/bancowback/domain/main/faq/controller/FaqControllerTest.java +++ b/spring/src/test/java/com/bancow/bancowback/domain/main/faq/controller/FaqControllerTest.java @@ -213,14 +213,7 @@ void addFaq() throws Exception { post("/api/faq/add") .header("TOKEN", token.getToken()) .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"faq_category\": \"AUCTION\",\n" - + " \"title\": \"FAQ 제목입니다..\",\n" - + " \"message\": \"FAQ 내용입니다.\",\n" - + " \"status\": false\n" - + "}" - ) + .content(readJson("json/faq/addFaq.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) @@ -282,14 +275,10 @@ void deleteFaqList() throws Exception { Manager manager = adminManagerLogin(); Token token = tokenRepository.findByManager(manager).get(); mockMvc.perform( - delete("/api/faq/delete") - .header("TOKEN", token.getToken()) - .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"idList\": [1]\n" - + "}" - ) + delete("/api/faq/delete") + .header("TOKEN", token.getToken()) + .contentType(MediaType.APPLICATION_JSON) + .content(readJson("json/faq/deleteFaqList.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) @@ -299,7 +288,7 @@ void deleteFaqList() throws Exception { headerWithName("TOKEN").description("해당 로그인 유저의 토큰값") ), requestFields( - fieldWithPath("idList").description("삭제할 항목") + fieldWithPath("id_list").description("삭제할 항목") ), responseFields( fieldWithPath("data").description("결과 데이터"), @@ -320,17 +309,10 @@ void updateFaq() throws Exception { Token token = tokenRepository.findByManager(manager).get(); mockMvc.perform( - patch("/api/faq/update", 1) - .header("TOKEN", token.getToken()) - .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"id\": \"1\",\n" - + " \"faq_category\": \"AUCTION\",\n" - + " \"title\": \"수정된 FAQ 제목입니다.\",\n" - + " \"message\": \"수정된 FAQ 내용입니다.\",\n" - + " \"status\": false\n" - + "}") + patch("/api/faq/update", 1) + .header("TOKEN", token.getToken()) + .contentType(MediaType.APPLICATION_JSON) + .content(readJson("json/faq/updateFaq.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) diff --git a/spring/src/test/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaControllerTest.java b/spring/src/test/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaControllerTest.java index cc6bc16d..af1dd4c6 100644 --- a/spring/src/test/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaControllerTest.java +++ b/spring/src/test/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaControllerTest.java @@ -27,16 +27,7 @@ void addFarmQna() throws Exception { mockMvc.perform( post("/api/farmqna/add") .contentType(MediaType.APPLICATION_JSON) - .content("{\n" - + " \"farm_qna_name\": \"김철수\",\n" - + " \"phone_number\": \"010-3991-7102\",\n" - + " \"email\": \"gmldnr2222@naver.com\",\n" - + " \"farm_name\": \"속초농장\",\n" - + " \"farm_address\": \"강원도 속초시 교동 밤골3길\",\n" - + " \"cow_num\": \"100\",\n" - + " \"feed_name\": \"먹이이름입니다.\",\n" - + " \"available_date\": \"2022-02-20\"\n" - + "}") + .content(readJson("json/farmQna/addFarmQna.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) diff --git a/spring/src/test/java/com/bancow/bancowback/domain/main/notice/controller/NoticeControllerTest.java b/spring/src/test/java/com/bancow/bancowback/domain/main/notice/controller/NoticeControllerTest.java index 68fc80b2..1dd59296 100644 --- a/spring/src/test/java/com/bancow/bancowback/domain/main/notice/controller/NoticeControllerTest.java +++ b/spring/src/test/java/com/bancow/bancowback/domain/main/notice/controller/NoticeControllerTest.java @@ -213,14 +213,7 @@ void addNotice() throws Exception { post("/api/notice/add") .header("TOKEN", token.getToken()) .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"notice_category\": \"INSPECTION\",\n" - + " \"title\": \"공지사항 제목입니다..\",\n" - + " \"message\": \"공지사항 내용입니다.\",\n" - + " \"status\": false\n" - + "}" - ) + .content(readJson("json/notice/addNotice.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) @@ -282,14 +275,10 @@ void deleteNoticeList() throws Exception { Manager manager = adminManagerLogin(); Token token = tokenRepository.findByManager(manager).get(); mockMvc.perform( - delete("/api/notice/delete") - .header("TOKEN", token.getToken()) - .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"idList\": [1]\n" - + "}" - ) + delete("/api/notice/delete") + .header("TOKEN", token.getToken()) + .contentType(MediaType.APPLICATION_JSON) + .content(readJson("json/notice/deleteNoticeList.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) @@ -299,7 +288,7 @@ void deleteNoticeList() throws Exception { headerWithName("TOKEN").description("해당 로그인 유저의 토큰값") ), requestFields( - fieldWithPath("idList").description("삭제할 항목") + fieldWithPath("id_list").description("삭제할 항목") ), responseFields( fieldWithPath("data").description("결과 데이터"), @@ -320,19 +309,12 @@ void updateNotice() throws Exception { Token token = tokenRepository.findByManager(manager).get(); mockMvc.perform( - patch("/api/notice/update", 1) - .header("TOKEN", token.getToken()) - .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"id\": \"1\",\n" - + " \"notice_category\": \"INSPECTION\",\n" - + " \"title\": \"수정된 공지사항 제목입니다.\",\n" - + " \"message\": \"수정된 공지사항 내용입니다.\",\n" - + " \"status\": false\n" - + "}") - .accept(MediaType.APPLICATION_JSON) - ) + patch("/api/notice/update", 1) + .header("TOKEN", token.getToken()) + .contentType(MediaType.APPLICATION_JSON) + .content(readJson("json/notice/updateNotice.json")) + .accept(MediaType.APPLICATION_JSON) + ) .andExpect(status().isOk()) .andDo( restDocs.document( diff --git a/spring/src/test/java/com/bancow/bancowback/domain/main/qna/controller/QnaControllerTest.java b/spring/src/test/java/com/bancow/bancowback/domain/main/qna/controller/QnaControllerTest.java index bda6860e..a0cde573 100644 --- a/spring/src/test/java/com/bancow/bancowback/domain/main/qna/controller/QnaControllerTest.java +++ b/spring/src/test/java/com/bancow/bancowback/domain/main/qna/controller/QnaControllerTest.java @@ -185,16 +185,7 @@ void addQna() throws Exception { mockMvc.perform( post("/api/qna/add") .contentType(MediaType.APPLICATION_JSON) - .content( - "{" - + " \"category\": \"INVESTMENT\",\n" - + " \"qna_name\": \"KimJiHun\",\n" - + " \"phone_number\": \"010-1234-5678\",\n" - + " \"email\": \"gmldnr2222@naver.com\",\n" - + " \"title\": \"투자 문의 입니다.\",\n" - + " \"message\": \"이메일 혹은 전화로 연락 부탁드립니다.\"\n" - + "}" - ) + .content(readJson("/json/qna/addQna.json")) .accept(MediaType.APPLICATION_JSON) ) .andExpect(status().isOk()) diff --git a/spring/src/test/java/com/bancow/bancowback/domain/manager/controller/ManagerControllerTest.java b/spring/src/test/java/com/bancow/bancowback/domain/manager/controller/ManagerControllerTest.java index 34c81438..dfe8d6c1 100644 --- a/spring/src/test/java/com/bancow/bancowback/domain/manager/controller/ManagerControllerTest.java +++ b/spring/src/test/java/com/bancow/bancowback/domain/manager/controller/ManagerControllerTest.java @@ -38,14 +38,7 @@ void registerManager() throws Exception { mockMvc.perform( post("/api/register") .contentType(MediaType.APPLICATION_JSON) - .content( - "{\n" - + " \"email\": \"gmldnr2222@naver.com\",\n" - + " \"username\": \"김지훈\",\n" - + " \"password\": \"passwordAndPassword2\",\n" - + " \"password2\": \"passwordAndPassword2\"\n" - + "}" - ) + .content(readJson("json/manager/registerManger.json")) ) .andExpect(status().isOk()) .andDo( @@ -73,12 +66,7 @@ void login() throws Exception { mockMvc.perform( post("/api/login") .contentType(MediaType.APPLICATION_JSON) - .content( - "{\n" - + " \"email\": \"smtptestkk@gmail.com\",\n" - + " \"password\": \"q1w2e3r4\"\n" - + "}" - ) + .content(readJson("json/manager/login.json")) ) .andExpect(status().isOk()) .andDo( @@ -251,10 +239,7 @@ void findManager() throws Exception { mockMvc.perform( post("/api/findmanager") .contentType(MediaType.APPLICATION_JSON) - .content("{\n" - + "\"email\": \"gmldnr2222@naver.com\",\n" - + "\"username\": \"가나다\"\n" - + "}") + .content(readJson("json/manager/findManager.json")) ) .andExpect(status().isOk()) .andDo( @@ -330,10 +315,7 @@ void changePassword() throws Exception { mockMvc.perform( patch("/api//authentication/findmanager/{token}/change-password", findToken.getToken()) .contentType(MediaType.APPLICATION_JSON) - .content("{" - + "\"password1\" : \"123123\",\n" - + "\"password2\" : \"123123\"\n" - + "}") + .content(readJson("/json/manager/changePassword.json")) ) .andExpect(status().isOk()) .andDo( diff --git a/spring/src/test/java/com/bancow/bancowback/domain/sub/chart/controller/ChartControllerTest.java b/spring/src/test/java/com/bancow/bancowback/domain/sub/chart/controller/ChartControllerTest.java index af493d88..ee964294 100644 --- a/spring/src/test/java/com/bancow/bancowback/domain/sub/chart/controller/ChartControllerTest.java +++ b/spring/src/test/java/com/bancow/bancowback/domain/sub/chart/controller/ChartControllerTest.java @@ -14,7 +14,6 @@ import com.bancow.bancowback.domain.common.util.token.entity.Token; import com.bancow.bancowback.domain.common.util.token.repository.TokenRepository; import com.bancow.bancowback.domain.manager.entity.Manager; -import com.bancow.bancowback.domain.sub.chart.entity.KoreanCowCategory; class ChartControllerTest extends TestSupport { diff --git a/spring/src/test/resources/json/faq/addFaq.json b/spring/src/test/resources/json/faq/addFaq.json new file mode 100644 index 00000000..93db8a2e --- /dev/null +++ b/spring/src/test/resources/json/faq/addFaq.json @@ -0,0 +1,6 @@ +{ + "faq_category": "AUCTION", + "title": "FAQ 제목입니다.", + "message": "FAQ 내용입니다.", + "status": false +} \ No newline at end of file diff --git a/spring/src/test/resources/json/faq/deleteFaqList.json b/spring/src/test/resources/json/faq/deleteFaqList.json new file mode 100644 index 00000000..37e8bb45 --- /dev/null +++ b/spring/src/test/resources/json/faq/deleteFaqList.json @@ -0,0 +1,3 @@ +{ + "id_list" : [1,2] +} \ No newline at end of file diff --git a/spring/src/test/resources/json/faq/updateFaq.json b/spring/src/test/resources/json/faq/updateFaq.json new file mode 100644 index 00000000..f9a86c5c --- /dev/null +++ b/spring/src/test/resources/json/faq/updateFaq.json @@ -0,0 +1,7 @@ +{ + "id": "1", + "faq_category": "AUCTION", + "title": "수정된 FAQ 제목입니다.", + "message": "수정된 FAQ 내용입니다.", + "status": false +} \ No newline at end of file diff --git a/spring/src/test/resources/json/farmQna/addFarmQna.json b/spring/src/test/resources/json/farmQna/addFarmQna.json new file mode 100644 index 00000000..122f366a --- /dev/null +++ b/spring/src/test/resources/json/farmQna/addFarmQna.json @@ -0,0 +1,10 @@ +{ + "farm_qna_name": "김철수", + "phone_number": "010-3991-7102", + "email": "gmldnr2222@naver.com", + "farm_name": "속초농장", + "farm_address": "강원도 속초시 교동 밤골3길", + "cow_num": "100", + "feed_name": "먹이이름입니다.", + "available_date": "2022-02-20" +} \ No newline at end of file diff --git a/spring/src/test/resources/json/manager/changePassword.json b/spring/src/test/resources/json/manager/changePassword.json new file mode 100644 index 00000000..59d7fc11 --- /dev/null +++ b/spring/src/test/resources/json/manager/changePassword.json @@ -0,0 +1,4 @@ +{ + "password1": "newPassword6403", + "password2": "newPassword6403" +} \ No newline at end of file diff --git a/spring/src/test/resources/json/manager/findManager.json b/spring/src/test/resources/json/manager/findManager.json new file mode 100644 index 00000000..110efeef --- /dev/null +++ b/spring/src/test/resources/json/manager/findManager.json @@ -0,0 +1,5 @@ +{ + "email": "smtptestkk@gmail.com", + "username": "김지훈" +} + diff --git a/spring/src/test/resources/json/manager/login.json b/spring/src/test/resources/json/manager/login.json new file mode 100644 index 00000000..10b5c9fb --- /dev/null +++ b/spring/src/test/resources/json/manager/login.json @@ -0,0 +1,5 @@ +{ +"email": "smtptestkk@gmail.com", +"password": "q1w2e3r4" +} + diff --git a/spring/src/test/resources/json/manager/registerManger.json b/spring/src/test/resources/json/manager/registerManger.json new file mode 100644 index 00000000..9bae9fbc --- /dev/null +++ b/spring/src/test/resources/json/manager/registerManger.json @@ -0,0 +1,6 @@ +{ +"email": "gmldnr2222@naver.com", +"username": "김지훈", +"password": "passwordAndPassword2", +"password2": "passwordAndPassword2" +} \ No newline at end of file diff --git a/spring/src/test/resources/json/notice/addNotice.json b/spring/src/test/resources/json/notice/addNotice.json new file mode 100644 index 00000000..d260d6b9 --- /dev/null +++ b/spring/src/test/resources/json/notice/addNotice.json @@ -0,0 +1,6 @@ +{ + "notice_category": "INSPECTION", + "title": "공지사항 제목입니다.", + "message": "공지사항 내용입니다.", + "status": false +} \ No newline at end of file diff --git a/spring/src/test/resources/json/notice/deleteNoticeList.json b/spring/src/test/resources/json/notice/deleteNoticeList.json new file mode 100644 index 00000000..62995d5a --- /dev/null +++ b/spring/src/test/resources/json/notice/deleteNoticeList.json @@ -0,0 +1,3 @@ +{ + "id_list": [1,2] +} \ No newline at end of file diff --git a/spring/src/test/resources/json/notice/updateNotice.json b/spring/src/test/resources/json/notice/updateNotice.json new file mode 100644 index 00000000..cf561187 --- /dev/null +++ b/spring/src/test/resources/json/notice/updateNotice.json @@ -0,0 +1,7 @@ +{ + "id": "1", + "notice_category": "INSPECTION", + "title": "수정된 공지사항 제목입니다.", + "message": "수정된 공지사항 내용입니다.", + "status": false +} \ No newline at end of file diff --git a/spring/src/test/resources/json/qna/addQna.json b/spring/src/test/resources/json/qna/addQna.json new file mode 100644 index 00000000..dbdb15e5 --- /dev/null +++ b/spring/src/test/resources/json/qna/addQna.json @@ -0,0 +1,8 @@ +{ + "category": "INVESTMENT", + "qna_name": "KimJiHun", + "phone_number": "010-1234-5678", + "email": "gmldnr2222@naver.com", + "title": "투자 문의 입니다.", + "message": "이메일 혹은 전화로 연락 부탁드립니다." +} \ No newline at end of file