Skip to content

Commit

Permalink
refactor: [#3] Controller, Service 일관성 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
welshimeat committed Apr 27, 2021
1 parent 6bb32ea commit d63cc2c
Show file tree
Hide file tree
Showing 74 changed files with 135 additions and 148 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package MakeUs.Moira.config.logging;

import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
Expand All @@ -10,6 +11,7 @@
import javax.servlet.http.HttpServletResponse;

@Component
@Slf4j
public class LoggerInterceptor implements HandlerInterceptor {

private final Logger logger = LoggerFactory.getLogger(this.getClass());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Api(tags = {"1.홈"})
@RequiredArgsConstructor
@RestController
public class homeController {
public class HomeController {

private final HomeService homeService;
private final ResponseService responseService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package MakeUs.Moira.controller.security;
package MakeUs.Moira.controller.jwt;

import MakeUs.Moira.controller.security.dto.LoginRequestDto;
import MakeUs.Moira.controller.security.dto.LoginResponseDto;
import MakeUs.Moira.controller.jwt.dto.LoginRequestDto;
import MakeUs.Moira.controller.jwt.dto.LoginResponseDto;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.SingleResult;
import MakeUs.Moira.service.security.LoginService;
import MakeUs.Moira.service.jwt.JwtService;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
Expand All @@ -18,9 +18,9 @@
@Api(tags = {"1. 로그인"})
@RequiredArgsConstructor
@RestController
public class LoginController {
public class JwtController {

private final LoginService loginService;
private final JwtService loginService;
private final ResponseService responseService;
private final Logger logger = LoggerFactory.getLogger(this.getClass());

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.security.dto;
package MakeUs.Moira.controller.jwt.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.security.dto;
package MakeUs.Moira.controller.jwt.dto;

import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package MakeUs.Moira.controller.user;
package MakeUs.Moira.controller.myPage;

import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.user.dto.myPage.*;
import MakeUs.Moira.controller.myPage.dto.*;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.ListResult;
import MakeUs.Moira.response.model.SingleResult;
import MakeUs.Moira.service.user.MyPageService;
import MakeUs.Moira.service.myPage.MyPageService;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPage;
package MakeUs.Moira.controller.myPage.dto;


import MakeUs.Moira.domain.project.Project;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPage;
package MakeUs.Moira.controller.myPage.dto;

import MakeUs.Moira.domain.project.ProjectHashtag;
import MakeUs.Moira.domain.user.UserHashtag;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPage;
package MakeUs.Moira.controller.myPage.dto;



Expand All @@ -9,7 +9,6 @@
import lombok.Getter;
import lombok.ToString;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPage;
package MakeUs.Moira.controller.myPage.dto;

import MakeUs.Moira.domain.userPool.UserPool;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPage;
package MakeUs.Moira.controller.myPage.dto;

import MakeUs.Moira.domain.user.User;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPage;
package MakeUs.Moira.controller.myPage.dto;


import MakeUs.Moira.domain.project.Project;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package MakeUs.Moira.controller.user;
package MakeUs.Moira.controller.myPageEdit;


import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto;
import MakeUs.Moira.controller.user.dto.myPageEdit.*;
import MakeUs.Moira.controller.myPageEdit.dto.*;

import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.ListResult;
import MakeUs.Moira.response.model.SingleResult;
import MakeUs.Moira.service.user.MyPageEditService;
import MakeUs.Moira.service.myPageEdit.MyPageEditService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Getter;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto;
import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Getter;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Builder;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Getter;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Builder;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Builder;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Getter;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;

import lombok.Builder;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package MakeUs.Moira.controller.user.dto.myPageEdit;
package MakeUs.Moira.controller.myPageEdit.dto;


import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto;
import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto;
import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto;
import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto;
import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package MakeUs.Moira.controller.project;
package MakeUs.Moira.controller.myProject;

import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.project.dto.myProject.MyProjectResponseDTO;
import MakeUs.Moira.controller.project.dto.myProject.MyProjectsResponseDTO;
import MakeUs.Moira.controller.myProject.dto.MyProjectResponseDTO;
import MakeUs.Moira.controller.myProject.dto.MyProjectsResponseDTO;
import MakeUs.Moira.domain.user.UserProjectStatus;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.ListResult;
import MakeUs.Moira.response.model.SingleResult;
import MakeUs.Moira.service.project.MyProjectService;
import MakeUs.Moira.service.myProject.MyProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.myProject;
package MakeUs.Moira.controller.myProject.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.myProject;
package MakeUs.Moira.controller.myProject.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.myProject;
package MakeUs.Moira.controller.myProject.dto;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.project.dto.*;
import MakeUs.Moira.controller.project.dto.project.*;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.CommonResult;
import MakeUs.Moira.response.model.ListResult;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.project;
package MakeUs.Moira.controller.project.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.project;
package MakeUs.Moira.controller.project.dto;

import MakeUs.Moira.domain.project.ProjectStatus;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.project;
package MakeUs.Moira.controller.project.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.project;
package MakeUs.Moira.controller.project.dto;

import MakeUs.Moira.domain.project.projectDetail.ProjectDuration;
import MakeUs.Moira.domain.project.projectDetail.ProjectLocalType;
Expand All @@ -8,8 +8,6 @@
import lombok.Setter;
import lombok.ToString;

import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.project;
package MakeUs.Moira.controller.project.dto;

import MakeUs.Moira.domain.project.projectDetail.ProjectDuration;
import MakeUs.Moira.domain.project.projectDetail.ProjectLocalType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.project;
package MakeUs.Moira.controller.project.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package MakeUs.Moira.controller.project;
package MakeUs.Moira.controller.projectApply;

import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.project.dto.projectApply.*;
import MakeUs.Moira.controller.projectApply.dto.ProjectApplicantsResponseDTO;
import MakeUs.Moira.controller.projectApply.dto.ProjectApplyModifyStatusRequestDTO;
import MakeUs.Moira.controller.projectApply.dto.ProjectApplyRequestDTO;
import MakeUs.Moira.controller.projectApply.dto.ProjectApplyResponseDTO;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.CommonResult;
import MakeUs.Moira.response.model.ListResult;
import MakeUs.Moira.response.model.SingleResult;
import MakeUs.Moira.service.project.ProjectApplyService;
import MakeUs.Moira.service.projectApply.ProjectApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.projectApply;
package MakeUs.Moira.controller.projectApply.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.projectApply;
package MakeUs.Moira.controller.projectApply.dto;

import MakeUs.Moira.domain.project.projectApply.ProjectApplyStatus;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.projectApply;
package MakeUs.Moira.controller.projectApply.dto;

import MakeUs.Moira.domain.userPortfolio.UserPortfolioType;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package MakeUs.Moira.controller.project.dto.projectApply;
package MakeUs.Moira.controller.projectApply.dto;


import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto;
import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto;
import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto;
import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto;
import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package MakeUs.Moira.controller.project;
package MakeUs.Moira.controller.projectComment;

import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.project.dto.projectComment.ProjectCommentRequestDTO;
import MakeUs.Moira.controller.project.dto.projectComment.ProjectCommentResponseDTO;
import MakeUs.Moira.controller.projectComment.dto.ProjectCommentRequestDTO;
import MakeUs.Moira.controller.projectComment.dto.ProjectCommentResponseDTO;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.CommonResult;
import MakeUs.Moira.response.model.ListResult;
import MakeUs.Moira.response.model.SingleResult;
import MakeUs.Moira.service.project.ProjectCommentService;
import MakeUs.Moira.service.projectComment.ProjectCommentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.projectComment;
package MakeUs.Moira.controller.projectComment.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package MakeUs.Moira.controller.project.dto.projectComment;
package MakeUs.Moira.controller.projectComment.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@


import MakeUs.Moira.config.security.JwtTokenProvider;
import MakeUs.Moira.controller.project.dto.project.ProjectRequestDTO;
import MakeUs.Moira.controller.report.dto.ReportRequestDTO;
import MakeUs.Moira.domain.report.ReportRepo;
import MakeUs.Moira.response.ResponseService;
import MakeUs.Moira.response.model.CommonResult;
import MakeUs.Moira.service.report.ReportService;
Expand Down
Loading

0 comments on commit d63cc2c

Please sign in to comment.