Skip to content

Commit

Permalink
Merge pull request #294 from Team-Sopetit/refactor/292-check-style
Browse files Browse the repository at this point in the history
[REFACTOR] CheckStyle 적용 결과 일부가 github에 적용되지 않는 이슈 해결
  • Loading branch information
thguss authored Jun 25, 2024
2 parents d4080f2 + 44cca41 commit 7b330d4
Show file tree
Hide file tree
Showing 53 changed files with 177 additions and 177 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.soptie.server.member.service.MemberService;
import com.soptie.server.memberdoll.entity.MemberDoll;
import com.soptie.server.memberdoll.service.MemberDollService;
import com.soptie.server.memberroutine.adapter.MemberRoutineDeleter;
import com.soptie.server.memberroutine2.adapter.MemberRoutineDeleter;

import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.soptie.server.member.service.dto.response.MemberHomeInfoGetServiceResponse;
import com.soptie.server.memberdoll.adapter.MemberDollSaver;
import com.soptie.server.memberdoll.entity.MemberDoll;
import com.soptie.server.memberroutine.adapter.MemberRoutineSaver;
import com.soptie.server.memberroutine2.adapter.MemberRoutineSaver;
import com.soptie.server.routine.adapter.RoutineFinder;

import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.soptie.server.memberroutine.adapter;
package com.soptie.server.memberroutine2.adapter;

import com.soptie.server.common.support.RepositoryAdapter;
import com.soptie.server.member.entity.Member;
import com.soptie.server.memberroutine.entity.DeletedMemberRoutine;
import com.soptie.server.memberroutine.entity.MemberRoutine;
import com.soptie.server.memberroutine.repository.DeletedMemberRoutineRepository;
import com.soptie.server.memberroutine.repository.MemberRoutineRepository;
import com.soptie.server.memberroutine2.entity.DeletedMemberRoutine;
import com.soptie.server.memberroutine2.entity.MemberRoutine;
import com.soptie.server.memberroutine2.repository.DeletedMemberRoutineRepository;
import com.soptie.server.memberroutine2.repository.MemberRoutineRepository;

import lombok.RequiredArgsConstructor;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.adapter;
package com.soptie.server.memberroutine2.adapter;

import static com.soptie.server.routine.entity.RoutineType.*;
import static com.soptie.server.routine.message.RoutineErrorCode.*;
Expand All @@ -8,10 +8,10 @@

import com.soptie.server.common.support.RepositoryAdapter;
import com.soptie.server.member.entity.Member;
import com.soptie.server.memberroutine.entity.MemberRoutine;
import com.soptie.server.memberroutine.repository.MemberRoutineRepository;
import com.soptie.server.memberroutine.repository.dto.MemberChallengeResponse;
import com.soptie.server.memberroutine.repository.dto.MemberRoutineResponse;
import com.soptie.server.memberroutine2.entity.MemberRoutine;
import com.soptie.server.memberroutine2.repository.MemberRoutineRepository;
import com.soptie.server.memberroutine2.repository.dto.MemberChallengeResponse;
import com.soptie.server.memberroutine2.repository.dto.MemberRoutineResponse;
import com.soptie.server.routine.entity.Routine;
import com.soptie.server.routine.exception.RoutineException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.soptie.server.memberroutine.adapter;
package com.soptie.server.memberroutine2.adapter;

import static com.soptie.server.routine.entity.RoutineType.*;

import java.util.Optional;

import com.soptie.server.common.support.RepositoryAdapter;
import com.soptie.server.member.entity.Member;
import com.soptie.server.memberroutine.entity.DeletedMemberRoutine;
import com.soptie.server.memberroutine.entity.MemberRoutine;
import com.soptie.server.memberroutine.repository.DeletedMemberRoutineRepository;
import com.soptie.server.memberroutine.repository.MemberRoutineRepository;
import com.soptie.server.memberroutine2.entity.DeletedMemberRoutine;
import com.soptie.server.memberroutine2.entity.MemberRoutine;
import com.soptie.server.memberroutine2.repository.DeletedMemberRoutineRepository;
import com.soptie.server.memberroutine2.repository.MemberRoutineRepository;
import com.soptie.server.routine.entity.Challenge;
import com.soptie.server.routine.entity.Routine;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.soptie.server.memberroutine.controller.v1;
package com.soptie.server.memberroutine2.controller.v1;

import static com.soptie.server.common.dto.SuccessResponse.*;
import static com.soptie.server.memberroutine.message.MemberRoutineSuccessMassage.*;
import static com.soptie.server.memberroutine2.message.MemberRoutineSuccessMassage.*;

import java.security.Principal;
import java.util.List;
Expand All @@ -20,19 +20,19 @@
import com.soptie.server.common.dto.BaseResponse;
import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.common.support.UriGenerator;
import com.soptie.server.memberroutine.controller.v1.docs.MemberDailyRoutineApi;
import com.soptie.server.memberroutine.controller.v1.dto.request.MemberDailyRoutineCreateRequest;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineAchieveResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineCreateResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineListAcquireResponse;
import com.soptie.server.memberroutine.service.MemberRoutineCreateService;
import com.soptie.server.memberroutine.service.MemberRoutineDeleteService;
import com.soptie.server.memberroutine.service.MemberRoutineReadService;
import com.soptie.server.memberroutine.service.MemberRoutineUpdateService;
import com.soptie.server.memberroutine.service.dto.request.MemberDailyRoutineCreateServiceRequest;
import com.soptie.server.memberroutine.service.dto.request.MemberDailyRoutineListAcquireServiceRequest;
import com.soptie.server.memberroutine.service.dto.request.MemberRoutineAchieveServiceRequest;
import com.soptie.server.memberroutine.service.dto.request.MemberRoutinesDeleteServiceRequest;
import com.soptie.server.memberroutine2.controller.v1.docs.MemberDailyRoutineApi;
import com.soptie.server.memberroutine2.controller.v1.dto.request.MemberDailyRoutineCreateRequest;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineAchieveResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineCreateResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineListAcquireResponse;
import com.soptie.server.memberroutine2.service.MemberRoutineCreateService;
import com.soptie.server.memberroutine2.service.MemberRoutineDeleteService;
import com.soptie.server.memberroutine2.service.MemberRoutineReadService;
import com.soptie.server.memberroutine2.service.MemberRoutineUpdateService;
import com.soptie.server.memberroutine2.service.dto.request.MemberDailyRoutineCreateServiceRequest;
import com.soptie.server.memberroutine2.service.dto.request.MemberDailyRoutineListAcquireServiceRequest;
import com.soptie.server.memberroutine2.service.dto.request.MemberRoutineAchieveServiceRequest;
import com.soptie.server.memberroutine2.service.dto.request.MemberRoutinesDeleteServiceRequest;

import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.soptie.server.memberroutine.controller.v1;
package com.soptie.server.memberroutine2.controller.v1;

import static com.soptie.server.common.dto.SuccessResponse.*;
import static com.soptie.server.memberroutine.message.MemberRoutineSuccessMassage.*;
import static com.soptie.server.memberroutine2.message.MemberRoutineSuccessMassage.*;

import java.security.Principal;

Expand All @@ -18,18 +18,18 @@
import com.soptie.server.common.dto.BaseResponse;
import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.common.support.UriGenerator;
import com.soptie.server.memberroutine.controller.v1.docs.MemberHappinessRoutineApi;
import com.soptie.server.memberroutine.controller.v1.dto.request.MemberHappinessRoutineRequest;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberHappinessRoutineCreateResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberHappinessRoutineGetResponse;
import com.soptie.server.memberroutine.service.MemberRoutineCreateService;
import com.soptie.server.memberroutine.service.MemberRoutineDeleteService;
import com.soptie.server.memberroutine.service.MemberRoutineReadService;
import com.soptie.server.memberroutine.service.MemberRoutineUpdateService;
import com.soptie.server.memberroutine.service.dto.request.MemberHappinessRoutineCreateServiceRequest;
import com.soptie.server.memberroutine.service.dto.request.MemberHappinessRoutineGetServiceRequest;
import com.soptie.server.memberroutine.service.dto.request.MemberRoutineAchieveServiceRequest;
import com.soptie.server.memberroutine.service.dto.request.MemberRoutineDeleteServiceRequest;
import com.soptie.server.memberroutine2.controller.v1.docs.MemberHappinessRoutineApi;
import com.soptie.server.memberroutine2.controller.v1.dto.request.MemberHappinessRoutineRequest;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberHappinessRoutineCreateResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberHappinessRoutineGetResponse;
import com.soptie.server.memberroutine2.service.MemberRoutineCreateService;
import com.soptie.server.memberroutine2.service.MemberRoutineDeleteService;
import com.soptie.server.memberroutine2.service.MemberRoutineReadService;
import com.soptie.server.memberroutine2.service.MemberRoutineUpdateService;
import com.soptie.server.memberroutine2.service.dto.request.MemberHappinessRoutineCreateServiceRequest;
import com.soptie.server.memberroutine2.service.dto.request.MemberHappinessRoutineGetServiceRequest;
import com.soptie.server.memberroutine2.service.dto.request.MemberRoutineAchieveServiceRequest;
import com.soptie.server.memberroutine2.service.dto.request.MemberRoutineDeleteServiceRequest;

import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.controller.v1.docs;
package com.soptie.server.memberroutine2.controller.v1.api;

import java.security.Principal;
import java.util.List;
Expand All @@ -11,10 +11,10 @@
import com.soptie.server.common.dto.BaseResponse;
import com.soptie.server.common.dto.ErrorResponse;
import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.memberroutine.controller.v1.dto.request.MemberDailyRoutineCreateRequest;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineAchieveResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineCreateResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineListAcquireResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.request.MemberDailyRoutineCreateRequest;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineAchieveResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineCreateResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineListAcquireResponse;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.controller.v1.api;
package com.soptie.server.memberroutine2.controller.v1.docs;

import java.security.Principal;
import java.util.List;
Expand All @@ -11,10 +11,10 @@
import com.soptie.server.common.dto.BaseResponse;
import com.soptie.server.common.dto.ErrorResponse;
import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.memberroutine.controller.v1.dto.request.MemberDailyRoutineCreateRequest;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineAchieveResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineCreateResponse;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberDailyRoutineListAcquireResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.request.MemberDailyRoutineCreateRequest;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineAchieveResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineCreateResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberDailyRoutineListAcquireResponse;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.controller.v1.docs;
package com.soptie.server.memberroutine2.controller.v1.docs;

import java.security.Principal;

Expand All @@ -9,8 +9,8 @@
import com.soptie.server.common.dto.BaseResponse;
import com.soptie.server.common.dto.ErrorResponse;
import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.memberroutine.controller.v1.dto.request.MemberHappinessRoutineRequest;
import com.soptie.server.memberroutine.controller.v1.dto.response.MemberHappinessRoutineCreateResponse;
import com.soptie.server.memberroutine2.controller.v1.dto.request.MemberHappinessRoutineRequest;
import com.soptie.server.memberroutine2.controller.v1.dto.response.MemberHappinessRoutineCreateResponse;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.controller.v1.dto.request;
package com.soptie.server.memberroutine2.controller.v1.dto.request;

public record MemberDailyRoutineCreateRequest(
long routineId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.controller.v1.dto.request;
package com.soptie.server.memberroutine2.controller.v1.dto.request;

public record MemberHappinessRoutineRequest(
long subRoutineId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.soptie.server.memberroutine.controller.v1.dto.response;
package com.soptie.server.memberroutine2.controller.v1.dto.response;

import static lombok.AccessLevel.*;

import com.soptie.server.memberroutine.service.dto.response.MemberRoutineAchieveServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberRoutineAchieveServiceResponse;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.soptie.server.memberroutine.controller.v1.dto.response;
package com.soptie.server.memberroutine2.controller.v1.dto.response;

import static lombok.AccessLevel.*;

import com.soptie.server.memberroutine.service.dto.response.MemberDailyRoutineCreateServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberDailyRoutineCreateServiceResponse;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.soptie.server.memberroutine.controller.v1.dto.response;
package com.soptie.server.memberroutine2.controller.v1.dto.response;

import static lombok.AccessLevel.*;

import java.util.List;

import com.soptie.server.memberroutine.service.dto.response.MemberDailyRoutinesAcquireServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberDailyRoutinesAcquireServiceResponse;

import lombok.Builder;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.soptie.server.memberroutine.controller.v1.dto.response;
package com.soptie.server.memberroutine2.controller.v1.dto.response;

import static lombok.AccessLevel.*;

import com.soptie.server.memberroutine.service.dto.response.MemberHappinessRoutineCreateServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberHappinessRoutineCreateServiceResponse;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.soptie.server.memberroutine.controller.v1.dto.response;
package com.soptie.server.memberroutine2.controller.v1.dto.response;

import static lombok.AccessLevel.*;

import com.soptie.server.memberroutine.service.dto.response.MemberHappinessRoutineGetServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberHappinessRoutineGetServiceResponse;

import lombok.Builder;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.soptie.server.memberroutine.controller.v2;
package com.soptie.server.memberroutine2.controller.v2;

import static com.soptie.server.common.dto.SuccessResponse.*;
import static com.soptie.server.memberroutine.message.MemberRoutineSuccessMassage.*;
import static com.soptie.server.memberroutine2.message.MemberRoutineSuccessMassage.*;

import java.security.Principal;

Expand All @@ -11,10 +11,10 @@
import org.springframework.web.bind.annotation.RestController;

import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.memberroutine.controller.v2.docs.MemberDailyRoutineApi;
import com.soptie.server.memberroutine.controller.v2.dto.response.MemberDailyRoutineListAcquireResponseV2;
import com.soptie.server.memberroutine.service.MemberRoutineReadService;
import com.soptie.server.memberroutine.service.dto.request.MemberDailyRoutineListAcquireServiceRequest;
import com.soptie.server.memberroutine2.controller.v2.docs.MemberDailyRoutineApi;
import com.soptie.server.memberroutine2.controller.v2.dto.response.MemberDailyRoutineListAcquireResponseV2;
import com.soptie.server.memberroutine2.service.MemberRoutineReadService;
import com.soptie.server.memberroutine2.service.dto.request.MemberDailyRoutineListAcquireServiceRequest;

import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.soptie.server.memberroutine.controller.v2.docs;
package com.soptie.server.memberroutine2.controller.v2.docs;

import java.security.Principal;

import org.springframework.http.ResponseEntity;

import com.soptie.server.common.dto.ErrorResponse;
import com.soptie.server.common.dto.SuccessResponse;
import com.soptie.server.memberroutine.controller.v2.dto.response.MemberDailyRoutineListAcquireResponseV2;
import com.soptie.server.memberroutine2.controller.v2.dto.response.MemberDailyRoutineListAcquireResponseV2;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.soptie.server.memberroutine.controller.v2.dto.response;
package com.soptie.server.memberroutine2.controller.v2.dto.response;

import static lombok.AccessLevel.*;

import java.util.List;

import com.soptie.server.memberroutine.service.dto.response.MemberDailyRoutineListAcquireServiceResponse;
import com.soptie.server.memberroutine.service.dto.response.MemberDailyRoutinesAcquireServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberDailyRoutineListAcquireServiceResponse;
import com.soptie.server.memberroutine2.service.dto.response.MemberDailyRoutinesAcquireServiceResponse;

import lombok.Builder;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.entity;
package com.soptie.server.memberroutine2.entity;

import static jakarta.persistence.EnumType.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.entity;
package com.soptie.server.memberroutine2.entity;

import static com.soptie.server.member.message.ErrorCode.*;
import static com.soptie.server.routine.entity.RoutineType.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.soptie.server.memberroutine.message;
package com.soptie.server.memberroutine2.message;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.soptie.server.memberroutine.repository;
package com.soptie.server.memberroutine2.repository;

import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;

import com.soptie.server.member.entity.Member;
import com.soptie.server.memberroutine.entity.DeletedMemberRoutine;
import com.soptie.server.memberroutine2.entity.DeletedMemberRoutine;
import com.soptie.server.routine.entity.RoutineType;

public interface DeletedMemberRoutineRepository extends JpaRepository<DeletedMemberRoutine, Long> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.soptie.server.memberroutine.repository;
package com.soptie.server.memberroutine2.repository;

import java.util.List;
import java.util.Optional;

import com.soptie.server.member.entity.Member;
import com.soptie.server.memberroutine.repository.dto.MemberChallengeResponse;
import com.soptie.server.memberroutine.repository.dto.MemberRoutineResponse;
import com.soptie.server.memberroutine2.repository.dto.MemberChallengeResponse;
import com.soptie.server.memberroutine2.repository.dto.MemberRoutineResponse;
import com.soptie.server.routine.entity.RoutineType;

public interface MemberRoutineCustomRepository {
Expand Down
Loading

0 comments on commit 7b330d4

Please sign in to comment.