Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor - 정적 코드 분석을 이용한 리팩토링 #103

Merged
merged 13 commits into from
Feb 29, 2024
Merged

refactor - 정적 코드 분석을 이용한 리팩토링 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
915a416
refactor - #102 HMH 폴더 이름 소문자로 변경
kseysh Feb 22, 2024
f4427ad
refactor - #102 상수 클래스 생성자 private로 변경
kseysh Feb 22, 2024
b602dcb
refactor - #102 string 빈 값 체크 함수 변경
kseysh Feb 22, 2024
2e7d11b
refactor - #102 클래스의 이름과 필드 이름이 겹치지 않도록 수정
kseysh Feb 23, 2024
5061414
refactor - #102 빈 statement 삭제
kseysh Feb 23, 2024
af31e32
refactor - #102 첫 글자가 대문자인 함수, 변수 첫 글자 소문자로 변경
kseysh Feb 23, 2024
0bbb14f
refactor - #102 사용하지 않는 대괄호 삭제 및 람다를 메서드 참조로 변경
kseysh Feb 23, 2024
622be02
refactor - #102 리턴된 변수 인라인으로 변경
kseysh Feb 23, 2024
9163eb0
refactor - #102 deprecated인 isEmpty hasText로 변경
kseysh Feb 23, 2024
2374adb
refactor - #102 리턴 value 인라인으로 변경
kseysh Feb 23, 2024
5b8646b
refactor - #102 중복된 UserError 파일 삭제
kseysh Feb 24, 2024
8c27a37
refactor - #102 제네릭 와일드 카드 반환 타입 삭제
kseysh Feb 24, 2024
cd3f809
refactor - #102 사용하지 않는 메서드 삭제
kseysh Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/main/java/sopt/org/HMH/domain/app/domain/AppConstants.java
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ...ain/java/sopt/org/HMH/domain/dailychallenge/domain/exception/DailyChallengeException.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/sopt/org/HMH/domain/dailychallenge/repository/DailyChallengeRepository.java
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/main/java/sopt/org/HMH/domain/user/dto/request/SocialPlatformRequest.java
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/java/sopt/org/HMH/domain/user/exception/UserError.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/sopt/org/HMH/global/common/exception/base/RootEnum.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ain/java/sopt/org/HMH/HmhApplication.java → ...ain/java/sopt/org/hmh/HmhApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH;
package sopt.org.hmh;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
12 changes: 6 additions & 6 deletions ...org/HMH/domain/app/controller/AppApi.java → ...org/hmh/domain/app/controller/AppApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.controller;
package sopt.org.hmh.domain.app.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -9,11 +9,11 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import sopt.org.HMH.domain.app.dto.request.AppArrayGoalTimeRequest;
import sopt.org.HMH.domain.app.dto.request.AppDeleteRequest;
import sopt.org.HMH.global.auth.UserId;
import sopt.org.HMH.global.auth.jwt.JwtConstants;
import sopt.org.HMH.global.common.response.BaseResponse;
import sopt.org.hmh.domain.app.dto.request.AppArrayGoalTimeRequest;
import sopt.org.hmh.domain.app.dto.request.AppDeleteRequest;
import sopt.org.hmh.global.auth.UserId;
import sopt.org.hmh.global.auth.jwt.JwtConstants;
import sopt.org.hmh.global.common.response.BaseResponse;

@Tag(name = "스크린타임 앱 관련 API")
@SecurityRequirement(name = JwtConstants.AUTHORIZATION)
Expand Down
16 changes: 8 additions & 8 deletions .../domain/app/controller/AppController.java → .../domain/app/controller/AppController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.controller;
package sopt.org.hmh.domain.app.controller;

import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand All @@ -8,13 +8,13 @@
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import sopt.org.HMH.domain.app.domain.exception.AppSuccess;
import sopt.org.HMH.domain.app.dto.request.AppArrayGoalTimeRequest;
import sopt.org.HMH.domain.app.dto.request.AppDeleteRequest;
import sopt.org.HMH.domain.app.service.AppService;
import sopt.org.HMH.global.auth.UserId;
import sopt.org.HMH.global.common.response.BaseResponse;
import sopt.org.HMH.global.common.response.EmptyJsonResponse;
import sopt.org.hmh.domain.app.domain.exception.AppSuccess;
import sopt.org.hmh.domain.app.dto.request.AppArrayGoalTimeRequest;
import sopt.org.hmh.domain.app.dto.request.AppDeleteRequest;
import sopt.org.hmh.domain.app.service.AppService;
import sopt.org.hmh.global.auth.UserId;
import sopt.org.hmh.global.common.response.BaseResponse;
import sopt.org.hmh.global.common.response.EmptyJsonResponse;

@RestController
@RequiredArgsConstructor
Expand Down
4 changes: 2 additions & 2 deletions ...a/sopt/org/HMH/domain/app/domain/App.java → ...a/sopt/org/hmh/domain/app/domain/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.domain;
package sopt.org.hmh.domain.app.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
Expand All @@ -11,7 +11,7 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import sopt.org.HMH.domain.dailychallenge.domain.DailyChallenge;
import sopt.org.hmh.domain.dailychallenge.domain.DailyChallenge;

@Entity
@Getter
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/sopt/org/hmh/domain/app/domain/AppConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package sopt.org.hmh.domain.app.domain;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public abstract class AppConstants {
public static final Long MINIMUM_APP_TIME = 0L;
public static final Long MAXIMUM_APP_TIME = 3659000L;
}
4 changes: 2 additions & 2 deletions ...domain/app/domain/exception/AppError.java → ...domain/app/domain/exception/AppError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sopt.org.HMH.domain.app.domain.exception;
package sopt.org.hmh.domain.app.domain.exception;

import lombok.AllArgsConstructor;
import org.springframework.http.HttpStatus;
import sopt.org.HMH.global.common.exception.base.ErrorBase;
import sopt.org.hmh.global.common.exception.base.ErrorBase;

@AllArgsConstructor
public enum AppError implements ErrorBase {
Expand Down
4 changes: 2 additions & 2 deletions ...in/app/domain/exception/AppException.java → ...in/app/domain/exception/AppException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sopt.org.HMH.domain.app.domain.exception;
package sopt.org.hmh.domain.app.domain.exception;

import sopt.org.HMH.global.common.exception.base.ExceptionBase;
import sopt.org.hmh.global.common.exception.base.ExceptionBase;

public class AppException extends ExceptionBase {

Expand Down
4 changes: 2 additions & 2 deletions ...main/app/domain/exception/AppSuccess.java → ...main/app/domain/exception/AppSuccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sopt.org.HMH.domain.app.domain.exception;
package sopt.org.hmh.domain.app.domain.exception;

import lombok.AllArgsConstructor;
import org.springframework.http.HttpStatus;
import sopt.org.HMH.global.common.exception.base.SuccessBase;
import sopt.org.hmh.global.common.exception.base.SuccessBase;

@AllArgsConstructor
public enum AppSuccess implements SuccessBase {
Expand Down
2 changes: 1 addition & 1 deletion .../dto/request/AppArrayGoalTimeRequest.java → .../dto/request/AppArrayGoalTimeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.dto.request;
package sopt.org.hmh.domain.app.dto.request;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...dto/request/AppArrayUsageTimeRequest.java → ...dto/request/AppArrayUsageTimeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.dto.request;
package sopt.org.hmh.domain.app.dto.request;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...ain/app/dto/request/AppDeleteRequest.java → ...ain/app/dto/request/AppDeleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.dto.request;
package sopt.org.hmh.domain.app.dto.request;

public record AppDeleteRequest(
String appCode
Expand Down
2 changes: 1 addition & 1 deletion ...n/app/dto/request/AppGoalTimeRequest.java → ...n/app/dto/request/AppGoalTimeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.dto.request;
package sopt.org.hmh.domain.app.dto.request;

public record AppGoalTimeRequest(
String appCode,
Expand Down
2 changes: 1 addition & 1 deletion .../app/dto/request/AppUsageTimeRequest.java → .../app/dto/request/AppUsageTimeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.dto.request;
package sopt.org.hmh.domain.app.dto.request;

public record AppUsageTimeRequest(
String appCode,
Expand Down
2 changes: 1 addition & 1 deletion ...app/dto/response/AppGoalTimeResponse.java → ...app/dto/response/AppGoalTimeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.app.dto.response;
package sopt.org.hmh.domain.app.dto.response;

public record AppGoalTimeResponse(
String appCode,
Expand Down
8 changes: 4 additions & 4 deletions .../domain/app/repository/AppRepository.java → .../domain/app/repository/AppRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package sopt.org.HMH.domain.app.repository;
package sopt.org.hmh.domain.app.repository;

import org.springframework.data.jpa.repository.JpaRepository;
import sopt.org.HMH.domain.app.domain.App;
import sopt.org.HMH.domain.app.domain.exception.AppError;
import sopt.org.HMH.domain.app.domain.exception.AppException;
import sopt.org.hmh.domain.app.domain.App;
import sopt.org.hmh.domain.app.domain.exception.AppError;
import sopt.org.hmh.domain.app.domain.exception.AppException;

import java.util.Optional;

Expand Down
22 changes: 11 additions & 11 deletions ...rg/HMH/domain/app/service/AppService.java → ...rg/hmh/domain/app/service/AppService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package sopt.org.HMH.domain.app.service;
package sopt.org.hmh.domain.app.service;

import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import sopt.org.HMH.domain.app.domain.App;
import sopt.org.HMH.domain.app.domain.AppConstants;
import sopt.org.HMH.domain.app.domain.exception.AppError;
import sopt.org.HMH.domain.app.domain.exception.AppException;
import sopt.org.HMH.domain.app.dto.request.AppDeleteRequest;
import sopt.org.HMH.domain.app.dto.request.AppGoalTimeRequest;
import sopt.org.HMH.domain.app.repository.AppRepository;
import sopt.org.HMH.domain.dailychallenge.domain.DailyChallenge;
import sopt.org.HMH.domain.dailychallenge.service.DailyChallengeService;
import sopt.org.hmh.domain.app.domain.App;
import sopt.org.hmh.domain.app.domain.AppConstants;
import sopt.org.hmh.domain.app.domain.exception.AppError;
import sopt.org.hmh.domain.app.domain.exception.AppException;
import sopt.org.hmh.domain.app.dto.request.AppDeleteRequest;
import sopt.org.hmh.domain.app.dto.request.AppGoalTimeRequest;
import sopt.org.hmh.domain.app.repository.AppRepository;
import sopt.org.hmh.domain.dailychallenge.domain.DailyChallenge;
import sopt.org.hmh.domain.dailychallenge.service.DailyChallengeService;

import java.util.List;

Expand Down Expand Up @@ -68,7 +68,7 @@ private void validateAppExist(Long dailyChallengeId, String appCode, String os)
}

private void validateAppCode(String appCode) {
if (appCode == "") {
if (appCode.isEmpty()) {
throw new AppException(AppError.INVALID_APP_CODE_NULL);
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...in/challenge/controller/ChallengeApi.java → ...in/challenge/controller/ChallengeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.challenge.controller;
package sopt.org.hmh.domain.challenge.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -9,11 +9,11 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import sopt.org.HMH.domain.challenge.dto.request.ChallengeRequest;
import sopt.org.HMH.domain.challenge.dto.response.ChallengeResponse;
import sopt.org.HMH.global.auth.UserId;
import sopt.org.HMH.global.auth.jwt.JwtConstants;
import sopt.org.HMH.global.common.response.BaseResponse;
import sopt.org.hmh.domain.challenge.dto.request.ChallengeRequest;
import sopt.org.hmh.domain.challenge.dto.response.ChallengeResponse;
import sopt.org.hmh.global.auth.UserId;
import sopt.org.hmh.global.auth.jwt.JwtConstants;
import sopt.org.hmh.global.common.response.BaseResponse;

@Tag(name = "챌린지 관련 API")
@SecurityRequirement(name = JwtConstants.AUTHORIZATION)
Expand Down
17 changes: 8 additions & 9 deletions ...lenge/controller/ChallengeController.java → ...lenge/controller/ChallengeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.challenge.controller;
package sopt.org.hmh.domain.challenge.controller;

import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand All @@ -8,14 +8,13 @@
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import sopt.org.HMH.domain.challenge.domain.exception.ChallengeSuccess;
import sopt.org.HMH.domain.challenge.dto.request.ChallengeRequest;
import sopt.org.HMH.domain.challenge.dto.response.ChallengeResponse;
import sopt.org.HMH.domain.challenge.service.ChallengeService;
import sopt.org.HMH.global.auth.UserId;
import sopt.org.HMH.global.common.response.BaseResponse;
import sopt.org.HMH.global.common.response.BaseResponse;
import sopt.org.HMH.global.common.response.EmptyJsonResponse;
import sopt.org.hmh.domain.challenge.domain.exception.ChallengeSuccess;
import sopt.org.hmh.domain.challenge.dto.request.ChallengeRequest;
import sopt.org.hmh.domain.challenge.dto.response.ChallengeResponse;
import sopt.org.hmh.domain.challenge.service.ChallengeService;
import sopt.org.hmh.global.auth.UserId;
import sopt.org.hmh.global.common.response.BaseResponse;
import sopt.org.hmh.global.common.response.EmptyJsonResponse;

@RestController
@RequiredArgsConstructor
Expand Down
6 changes: 3 additions & 3 deletions ...MH/domain/challenge/domain/Challenge.java → ...mh/domain/challenge/domain/Challenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.challenge.domain;
package sopt.org.hmh.domain.challenge.domain;

import static jakarta.persistence.GenerationType.*;

Expand All @@ -7,8 +7,8 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import sopt.org.HMH.global.common.domain.BaseTimeEntity;
import sopt.org.HMH.domain.dailychallenge.domain.DailyChallenge;
import sopt.org.hmh.global.common.domain.BaseTimeEntity;
import sopt.org.hmh.domain.dailychallenge.domain.DailyChallenge;

import java.util.ArrayList;
import java.util.List;
Expand Down
6 changes: 5 additions & 1 deletion .../challenge/domain/ChallengeConstants.java → .../challenge/domain/ChallengeConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package sopt.org.HMH.domain.challenge.domain;
package sopt.org.hmh.domain.challenge.domain;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public abstract class ChallengeConstants {
public static final Long MINIMUM_GOAL_TIME = 7200000L;
public static final Long MAXIMUM_GOAL_TIME = 21600000L;
Expand Down
2 changes: 1 addition & 1 deletion ...domain/challenge/domain/ChallengeDay.java → ...domain/challenge/domain/ChallengeDay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.org.HMH.domain.challenge.domain;
package sopt.org.hmh.domain.challenge.domain;

import lombok.AccessLevel;
import lombok.Getter;
Expand Down
4 changes: 2 additions & 2 deletions ...enge/domain/exception/ChallengeError.java → ...enge/domain/exception/ChallengeError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sopt.org.HMH.domain.challenge.domain.exception;
package sopt.org.hmh.domain.challenge.domain.exception;

import lombok.AllArgsConstructor;
import org.springframework.http.HttpStatus;
import sopt.org.HMH.global.common.exception.base.ErrorBase;
import sopt.org.hmh.global.common.exception.base.ErrorBase;

@AllArgsConstructor
public enum ChallengeError implements ErrorBase {
Expand Down
4 changes: 2 additions & 2 deletions .../domain/exception/ChallengeException.java → .../domain/exception/ChallengeException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sopt.org.HMH.domain.challenge.domain.exception;
package sopt.org.hmh.domain.challenge.domain.exception;

import sopt.org.HMH.global.common.exception.base.ExceptionBase;
import sopt.org.hmh.global.common.exception.base.ExceptionBase;

public class ChallengeException extends ExceptionBase {

Expand Down
Loading
Loading