Merge pull request #352 from 2022-bancow-teamProject/feature/kim-jihun

[REFACTOR] Extract Json and Formatting
2022-bancow-teamProject · Feb 13, 2022 · fed8fea · fed8fea
2 parents ad1e556 + 5598789
commit fed8fea
Show file tree

Hide file tree

Showing 48 changed files with 112 additions and 184 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,12 +2,15 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class FaqDeleteListDto {
 
+	@JsonProperty("id_list")
 	private List<Long> 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
@@ -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
@@ -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
@@ -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/...src/main/java/com/bancow/bancowback/domain/main/farmqna/controller/FarmQnaController.java b/...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
@@ -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
@@ -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
@@ -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/...src/main/java/com/bancow/bancowback/domain/main/history/repository/HistoryRepository.java b/...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/...g/src/main/java/com/bancow/bancowback/domain/main/notice/controller/NoticeController.java b/...g/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
@@ -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
@@ -2,12 +2,15 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class NoticeDeleteListDto {
 
+	@JsonProperty("id_list")
 	private List<Long> 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
@@ -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
@@ -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
@@ -2,25 +2,13 @@
 
 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;
 
 import com.bancow.bancowback.domain.main.notice.dto.NoticeAddDto;
 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/...g/src/main/java/com/bancow/bancowback/domain/main/notice/repository/NoticeRepository.java b/...g/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<Notice, Long> {

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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