diff --git a/.github/workflows/idle.yml b/.github/workflows/idle.yml new file mode 100644 index 0000000..c17c2ad --- /dev/null +++ b/.github/workflows/idle.yml @@ -0,0 +1,38 @@ +name: IdleCI + +on: + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + # gradle 빌드 캐싱 + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }} + restore-keys: | + ${{ runner.os }}-gradle- + + # gradle 권한 부여 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Code style check with Google Java Style + run: ./gradlew spotlessCheck diff --git a/build.gradle b/build.gradle index 125c325..baa21e9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.3.4' id 'io.spring.dependency-management' version '1.1.6' + id "com.diffplug.spotless" version "6.25.0" } group = 'com.ureca' @@ -23,6 +24,19 @@ repositories { mavenCentral() } +spotless { + java { + // 구글 자바 포맷 적용 + googleJavaFormat().aosp() + // 사용하지 않는 import 제거 + removeUnusedImports() + // 공백 제거 + trimTrailingWhitespace() + // 끝부분 New Line 처리 + endWithNewline() + } +} + dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/src/main/java/com/ureca/idle/IdleApplication.java b/src/main/java/com/ureca/idle/IdleApplication.java index 696a487..b05a679 100644 --- a/src/main/java/com/ureca/idle/IdleApplication.java +++ b/src/main/java/com/ureca/idle/IdleApplication.java @@ -6,8 +6,7 @@ @SpringBootApplication public class IdleApplication { - public static void main(String[] args) { - SpringApplication.run(IdleApplication.class, args); - } - + public static void main(String[] args) { + SpringApplication.run(IdleApplication.class, args); + } } diff --git a/src/main/java/com/ureca/idle/idleaiclient/LGAIClient.java b/src/main/java/com/ureca/idle/idleaiclient/LGAIClient.java index efdbdd0..ee432a0 100644 --- a/src/main/java/com/ureca/idle/idleaiclient/LGAIClient.java +++ b/src/main/java/com/ureca/idle/idleaiclient/LGAIClient.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleaiclient; -public class LGAIClient { -} +public class LGAIClient {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleapplyapi/IdleApplyApi.java b/src/main/java/com/ureca/idle/idleapi/idleapplyapi/IdleApplyApi.java index 4c36e35..748900a 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleapplyapi/IdleApplyApi.java +++ b/src/main/java/com/ureca/idle/idleapi/idleapplyapi/IdleApplyApi.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleapi.idleapplyapi; -public class IdleApplyApi { -} +public class IdleApplyApi {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/AuthUseCase.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/AuthUseCase.java index f32adde..3b5db8b 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/AuthUseCase.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/AuthUseCase.java @@ -7,7 +7,10 @@ public interface AuthUseCase { LoginResp login(LoginReq req); + void logout(); + SignupResp signup(SignupReq req); + void withdraw(); } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/SimpleJwtAuthService.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/SimpleJwtAuthService.java index cbc96fa..9ac7d80 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/SimpleJwtAuthService.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/SimpleJwtAuthService.java @@ -5,8 +5,8 @@ import com.ureca.idle.idleapi.idleoriginapi.business.auth.dto.SignupReq; import com.ureca.idle.idleapi.idleoriginapi.business.auth.dto.SignupResp; import com.ureca.idle.idleapi.idleoriginapi.implementation.mapper.AuthDtoMapper; -import com.ureca.idle.idlejpa.user.User; import com.ureca.idle.idleapi.idleoriginapi.implementation.user.UserManager; +import com.ureca.idle.idlejpa.user.User; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -25,20 +25,17 @@ public LoginResp login(LoginReq req) { } @Override - public void logout() { - - } + public void logout() {} @Override @Transactional public SignupResp signup(SignupReq req) { userManager.checkExitsUserByEmail(req.email()); - User registeredUser = userManager.registerUser(req.email(), req.password(), req.name(), req.phoneNum()); + User registeredUser = + userManager.registerUser(req.email(), req.password(), req.name(), req.phoneNum()); return authDtoMapper.toSignupResp(registeredUser); } @Override - public void withdraw() { - - } + public void withdraw() {} } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginReq.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginReq.java index 876ed10..04283cb 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginReq.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginReq.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleapi.idleoriginapi.business.auth.dto; -public record LoginReq(String email, String password) { -} +public record LoginReq(String email, String password) {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginResp.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginResp.java index f76057b..17ddd4e 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginResp.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/LoginResp.java @@ -1,3 +1,3 @@ package com.ureca.idle.idleapi.idleoriginapi.business.auth.dto; -public record LoginResp (Long id, String role) {} +public record LoginResp(Long id, String role) {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupReq.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupReq.java index ecf127c..306b0ee 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupReq.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupReq.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleapi.idleoriginapi.business.auth.dto; -public record SignupReq(String email, String password, String name, String phoneNum) { -} +public record SignupReq(String email, String password, String name, String phoneNum) {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupResp.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupResp.java index 96b3315..7d7bfd9 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupResp.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/auth/dto/SignupResp.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleapi.idleoriginapi.business.auth.dto; - public record SignupResp(String message) {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingService.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingService.java index c800d83..67e25f9 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingService.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingService.java @@ -6,12 +6,11 @@ import com.ureca.idle.idleapi.idleoriginapi.implementation.user.UserManager; import com.ureca.idle.idlejpa.kid.Kid; import com.ureca.idle.idlejpa.user.User; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor public class KidManagingService implements KidManagingUseCase { diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingUseCase.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingUseCase.java index 4667655..872e89b 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingUseCase.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/KidManagingUseCase.java @@ -4,6 +4,8 @@ public interface KidManagingUseCase { AddKidResp addMyKid(Long userId, AddKidReq req); + GetKidsProfilesResp getMyKidsProfiles(Long userId); + GetKidsDetailResp getMyKidsDetail(Long userId, Long kidId); } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/dto/GetKidsPersonalityResp.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/dto/GetKidsPersonalityResp.java index 7e1c35d..944ef9f 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/dto/GetKidsPersonalityResp.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/business/kid/dto/GetKidsPersonalityResp.java @@ -1,4 +1,4 @@ package com.ureca.idle.idleapi.idleoriginapi.business.kid.dto; -public record GetKidsPersonalityResp(Long personalityId, int ei, int sn, int tf, int jp, String mbti) { -} \ No newline at end of file +public record GetKidsPersonalityResp( + Long personalityId, int ei, int sn, int tf, int jp, String mbti) {} diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/kid/KidManager.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/kid/KidManager.java index 342e2a9..489a772 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/kid/KidManager.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/kid/KidManager.java @@ -5,11 +5,10 @@ import com.ureca.idle.idlejpa.kid.Gender; import com.ureca.idle.idlejpa.kid.Kid; import com.ureca.idle.idlejpa.user.User; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - import java.time.LocalDate; import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @@ -18,12 +17,13 @@ public class KidManager { private final KidRepository repository; public Kid registerKid(User user, String name, String gender, LocalDate birthDate) { - Kid newKid = Kid.builder() - .user(user) - .name(name) - .gender(Gender.from(gender)) - .birthDate(birthDate) - .build(); + Kid newKid = + Kid.builder() + .user(user) + .name(name) + .gender(Gender.from(gender)) + .birthDate(birthDate) + .build(); return repository.save(newKid); } @@ -32,12 +32,13 @@ public List getKidsByUser(User user) { } public Kid getKidWithPersonality(Long id) { - return repository.findKidWithPersonalityById(id) + return repository + .findKidWithPersonalityById(id) .orElseThrow(() -> new KidNotFoundException("해당 KID 를 찾을 수 없습니다.")); } public void checkDuplicatedKidName(User user, String name) { - if(repository.existsByUserAndName(user, name)) { + if (repository.existsByUserAndName(user, name)) { throw new RuntimeException("이미 존재하는 이름의 KID 입니다."); } } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/mapper/KidDtoMapper.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/mapper/KidDtoMapper.java index 5ddb479..59d4ddc 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/mapper/KidDtoMapper.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/mapper/KidDtoMapper.java @@ -3,9 +3,8 @@ import com.ureca.idle.idleapi.idleoriginapi.business.kid.dto.*; import com.ureca.idle.idlejpa.kid.Kid; import com.ureca.idle.idlejpa.kidspersonality.KidsPersonality; -import org.springframework.stereotype.Component; - import java.util.List; +import org.springframework.stereotype.Component; @Component public class KidDtoMapper { @@ -15,11 +14,7 @@ public AddKidResp toAddKidResp(Kid newKid) { } public GetKidsProfilesResp toGetMyKidsProfilesResp(List kids) { - return new GetKidsProfilesResp( - kids.stream() - .map(this::toGetMyKidsProfileResp) - .toList() - ); + return new GetKidsProfilesResp(kids.stream().map(this::toGetMyKidsProfileResp).toList()); } public GetKidsProfileResp toGetMyKidsProfileResp(Kid kid) { @@ -30,7 +25,12 @@ public GetKidsDetailResp toGetKidsDetailResp(Kid kid) { KidsPersonality personality = kid.getPersonality(); return new GetKidsDetailResp( new GetKidsProfileResp(kid.getId(), kid.getName(), kid.getProfileImageUrl()), - new GetKidsPersonalityResp(personality.getId(), personality.getEi(), personality.getSn(), personality.getTf(), personality.getJp(), personality.getMbti()) - ); + new GetKidsPersonalityResp( + personality.getId(), + personality.getEi(), + personality.getSn(), + personality.getTf(), + personality.getJp(), + personality.getMbti())); } } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/user/UserManager.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/user/UserManager.java index 07e8cd2..dce9bff 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/user/UserManager.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/implementation/user/UserManager.java @@ -14,45 +14,50 @@ public class UserManager { private final UserRepository repository; public User getUser(Long id) { - return repository.findById(id) + return repository + .findById(id) .orElseThrow(() -> new UserNotFoundException("해당 ID 를 가진 유저를 찾을 수 없습니다.")); } public User getUserByEmail(String email) { - return repository.findByEmail(email) + return repository + .findByEmail(email) .orElseThrow(() -> new UserNotFoundException("해당 이메일을 가진 유저를 찾을 수 없습니다.")); } public User getUserByEmailAndPassword(String email, String password) { - return repository.findByEmailAndPassword(email, password) + return repository + .findByEmailAndPassword(email, password) .orElseThrow(() -> new UserNotFoundException("해당 이메일, 혹은 비밀번호를 가진 유저를 찾을 수 없습니다.")); } // TODO AuthManager 생성 고려 public User getCurrentLoginUser(Long id) { - return repository.findById(id) + return repository + .findById(id) .orElseThrow(() -> new UserNotFoundException("현재 로그인한 유저를 찾을 수 없습니다, 다시 로그인해주세요.")); } public void checkCurrentLoginUser(Long id) { - if(!repository.existsById(id)) { + if (!repository.existsById(id)) { throw new UserNotFoundException("현재 로그인한 유저를 찾을 수 없습니다, 다시 로그인해주세요."); } } public User registerUser(String email, String password, String name, String phoneNum) { - User newUser = User.builder() - .email(email) - .password(password) - .name(name) - .phoneNum(phoneNum) - .role(Role.USER) - .build(); + User newUser = + User.builder() + .email(email) + .password(password) + .name(name) + .phoneNum(phoneNum) + .role(Role.USER) + .build(); return repository.save(newUser); } public void checkExitsUserByEmail(String email) { - if(repository.existsByEmail(email)) { + if (repository.existsByEmail(email)) { throw new UserNotFoundException("이미 해당 이메일을 가진 유저가 존재합니다."); } } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/kid/KidRepository.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/kid/KidRepository.java index 118edcf..4bbf739 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/kid/KidRepository.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/kid/KidRepository.java @@ -2,16 +2,17 @@ import com.ureca.idle.idlejpa.kid.Kid; import com.ureca.idle.idlejpa.user.User; +import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.Optional; - public interface KidRepository extends JpaRepository { boolean existsByUserAndName(User user, String name); + List getKidsByUser(User user); + @Query("SELECT k FROM Kid k JOIN FETCH k.personality WHERE k.id = :id") Optional findKidWithPersonalityById(@Param("id") Long id); } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/user/UserRepository.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/user/UserRepository.java index 92f434f..a3c7e17 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/user/UserRepository.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/persistence/user/UserRepository.java @@ -1,13 +1,14 @@ package com.ureca.idle.idleapi.idleoriginapi.persistence.user; import com.ureca.idle.idlejpa.user.User; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { Optional findByEmailAndPassword(String email, String password); + Optional findByEmail(String email); + boolean existsByEmail(String email); } diff --git a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/presentaion/kid/KidManagingController.java b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/presentaion/kid/KidManagingController.java index eeca16f..189f4e8 100644 --- a/src/main/java/com/ureca/idle/idleapi/idleoriginapi/presentaion/kid/KidManagingController.java +++ b/src/main/java/com/ureca/idle/idleapi/idleoriginapi/presentaion/kid/KidManagingController.java @@ -5,13 +5,12 @@ import com.ureca.idle.idleapi.idleoriginapi.business.kid.dto.AddKidResp; import com.ureca.idle.idleapi.idleoriginapi.business.kid.dto.GetKidsDetailResp; import com.ureca.idle.idleapi.idleoriginapi.business.kid.dto.GetKidsProfilesResp; -import com.ureca.idle.idleapi.web.auth.LoginUser; import com.ureca.idle.idleapi.web.auth.IdAndAuthority; +import com.ureca.idle.idleapi.web.auth.LoginUser; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - @RestController @RequestMapping("/api/v1/kids") @RequiredArgsConstructor @@ -20,21 +19,23 @@ public class KidManagingController { private final KidManagingUseCase kidManagingUseCase; @PostMapping("") - public ResponseEntity addMyKid(@LoginUser IdAndAuthority loginUser, @RequestBody AddKidReq req) { + public ResponseEntity addMyKid( + @LoginUser IdAndAuthority loginUser, @RequestBody AddKidReq req) { AddKidResp resp = kidManagingUseCase.addMyKid(loginUser.id(), req); return ResponseEntity.ok(resp); } @GetMapping("") - public ResponseEntity getMyKidsProfiles(@LoginUser IdAndAuthority loginUser) { + public ResponseEntity getMyKidsProfiles( + @LoginUser IdAndAuthority loginUser) { GetKidsProfilesResp resp = kidManagingUseCase.getMyKidsProfiles(loginUser.id()); return ResponseEntity.ok(resp); } @GetMapping("/{kidId}/detail") - public ResponseEntity getMyKidsDetail(@LoginUser IdAndAuthority loginUser, @PathVariable Long kidId) { + public ResponseEntity getMyKidsDetail( + @LoginUser IdAndAuthority loginUser, @PathVariable Long kidId) { GetKidsDetailResp resp = kidManagingUseCase.getMyKidsDetail(loginUser.id(), kidId); return ResponseEntity.ok(resp); } } - diff --git a/src/main/java/com/ureca/idle/idleapi/idlerecommendapi/IdleRecommendApi.java b/src/main/java/com/ureca/idle/idleapi/idlerecommendapi/IdleRecommendApi.java index a9f8a24..e1f93fb 100644 --- a/src/main/java/com/ureca/idle/idleapi/idlerecommendapi/IdleRecommendApi.java +++ b/src/main/java/com/ureca/idle/idleapi/idlerecommendapi/IdleRecommendApi.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleapi.idlerecommendapi; -public class IdleRecommendApi { -} +public class IdleRecommendApi {} diff --git a/src/main/java/com/ureca/idle/idleapi/web/WebConfig.java b/src/main/java/com/ureca/idle/idleapi/web/WebConfig.java index 1f59362..57b02e5 100644 --- a/src/main/java/com/ureca/idle/idleapi/web/WebConfig.java +++ b/src/main/java/com/ureca/idle/idleapi/web/WebConfig.java @@ -1,19 +1,17 @@ package com.ureca.idle.idleapi.web; import com.ureca.idle.idleapi.web.auth.LoginUserArgumentResolver; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import java.util.List; - @Configuration @RequiredArgsConstructor public class WebConfig implements WebMvcConfigurer { - private final LoginUserArgumentResolver loginUserArgumentResolver; @Override @@ -29,4 +27,4 @@ public void addCorsMappings(CorsRegistry registry) { .allowedHeaders("*") .allowCredentials(true); } -} \ No newline at end of file +} diff --git a/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUser.java b/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUser.java index 5ae1d8c..0456796 100644 --- a/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUser.java +++ b/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUser.java @@ -7,5 +7,4 @@ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) -public @interface LoginUser { -} +public @interface LoginUser {} diff --git a/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUserArgumentResolver.java b/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUserArgumentResolver.java index fb0c670..1792be6 100644 --- a/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUserArgumentResolver.java +++ b/src/main/java/com/ureca/idle/idleapi/web/auth/LoginUserArgumentResolver.java @@ -18,15 +18,17 @@ public class LoginUserArgumentResolver implements HandlerMethodArgumentResolver @Override public boolean supportsParameter(MethodParameter parameter) { - return parameter.getParameterAnnotation(LoginUser.class) != null && - parameter.getParameterType().equals(IdAndAuthority.class); + return parameter.getParameterAnnotation(LoginUser.class) != null + && parameter.getParameterType().equals(IdAndAuthority.class); } @Override - public IdAndAuthority resolveArgument(MethodParameter parameter, - ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, - WebDataBinderFactory binderFactory) throws Exception { + public IdAndAuthority resolveArgument( + MethodParameter parameter, + ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) + throws Exception { HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); String token = resolveToken(request); if (token != null) { @@ -44,4 +46,3 @@ private String resolveToken(HttpServletRequest request) { return null; } } - diff --git a/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtDto.java b/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtDto.java index 655d275..bf809e0 100644 --- a/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtDto.java +++ b/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtDto.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleapi.web.jwt; -public record JwtDto(String accessToken) { -} +public record JwtDto(String accessToken) {} diff --git a/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtProvider.java b/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtProvider.java index 9ad5bbb..b9a63c0 100644 --- a/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtProvider.java +++ b/src/main/java/com/ureca/idle/idleapi/web/jwt/JwtProvider.java @@ -4,14 +4,13 @@ import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import jakarta.annotation.PostConstruct; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - import java.security.Key; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Date; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; @Getter @Component @@ -49,16 +48,21 @@ private Date issuedAt() { private Date expiredAt() { LocalDateTime now = LocalDateTime.now(); - return Date.from(now.plusHours(jwtProperties.getExpiration()).atZone(ZoneId.systemDefault()).toInstant()); + return Date.from( + now.plusHours(jwtProperties.getExpiration()) + .atZone(ZoneId.systemDefault()) + .toInstant()); } public IdAndAuthority extract(String token) { try { - Claims claims = Jwts.parser() - .setSigningKey(jwtProperties.getSecret().getBytes()) - .parseClaimsJws(token) - .getBody(); - return new IdAndAuthority(claims.get("id", Long.class), claims.get("role", String.class)); + Claims claims = + Jwts.parser() + .setSigningKey(jwtProperties.getSecret().getBytes()) + .parseClaimsJws(token) + .getBody(); + return new IdAndAuthority( + claims.get("id", Long.class), claims.get("role", String.class)); } catch (MalformedJwtException e) { throw new JwtException("토큰의 길이 및 형식이 올바르지 않습니다."); } catch (ExpiredJwtException e) { diff --git a/src/main/java/com/ureca/idle/idlebatch/IdleBatch.java b/src/main/java/com/ureca/idle/idlebatch/IdleBatch.java index 0071d91..1104ba9 100644 --- a/src/main/java/com/ureca/idle/idlebatch/IdleBatch.java +++ b/src/main/java/com/ureca/idle/idlebatch/IdleBatch.java @@ -1,4 +1,3 @@ package com.ureca.idle.idlebatch; -public class IdleBatch { -} +public class IdleBatch {} diff --git a/src/main/java/com/ureca/idle/idlecache/IdleCache.java b/src/main/java/com/ureca/idle/idlecache/IdleCache.java index e701311..7619218 100644 --- a/src/main/java/com/ureca/idle/idlecache/IdleCache.java +++ b/src/main/java/com/ureca/idle/idlecache/IdleCache.java @@ -1,4 +1,3 @@ package com.ureca.idle.idlecache; -public class IdleCache { -} +public class IdleCache {} diff --git a/src/main/java/com/ureca/idle/idlecommon/config/ConfigDummy.java b/src/main/java/com/ureca/idle/idlecommon/config/ConfigDummy.java index 9541011..a5bbd35 100644 --- a/src/main/java/com/ureca/idle/idlecommon/config/ConfigDummy.java +++ b/src/main/java/com/ureca/idle/idlecommon/config/ConfigDummy.java @@ -1,4 +1,3 @@ package com.ureca.idle.idlecommon.config; -public class ConfigDummy { -} +public class ConfigDummy {} diff --git a/src/main/java/com/ureca/idle/idlecommon/language/IdleJavaUtil.java b/src/main/java/com/ureca/idle/idlecommon/language/IdleJavaUtil.java index 3af1ddd..626262b 100644 --- a/src/main/java/com/ureca/idle/idlecommon/language/IdleJavaUtil.java +++ b/src/main/java/com/ureca/idle/idlecommon/language/IdleJavaUtil.java @@ -1,4 +1,3 @@ package com.ureca.idle.idlecommon.language; -public class IdleJavaUtil { -} +public class IdleJavaUtil {} diff --git a/src/main/java/com/ureca/idle/idlecommon/logging/IdleLogging.java b/src/main/java/com/ureca/idle/idlecommon/logging/IdleLogging.java index 3a5a233..2773bb1 100644 --- a/src/main/java/com/ureca/idle/idlecommon/logging/IdleLogging.java +++ b/src/main/java/com/ureca/idle/idlecommon/logging/IdleLogging.java @@ -1,4 +1,3 @@ package com.ureca.idle.idlecommon.logging; -public class IdleLogging { -} +public class IdleLogging {} diff --git a/src/main/java/com/ureca/idle/idleconsumer/IdleConsumer.java b/src/main/java/com/ureca/idle/idleconsumer/IdleConsumer.java index d9f747a..54f8912 100644 --- a/src/main/java/com/ureca/idle/idleconsumer/IdleConsumer.java +++ b/src/main/java/com/ureca/idle/idleconsumer/IdleConsumer.java @@ -1,4 +1,3 @@ package com.ureca.idle.idleconsumer; -public class IdleConsumer { -} +public class IdleConsumer {} diff --git a/src/main/java/com/ureca/idle/idlejpa/bookpreference/BookPreferenceDeleteHistory.java b/src/main/java/com/ureca/idle/idlejpa/bookpreference/BookPreferenceDeleteHistory.java index 1474db3..58bb230 100644 --- a/src/main/java/com/ureca/idle/idlejpa/bookpreference/BookPreferenceDeleteHistory.java +++ b/src/main/java/com/ureca/idle/idlejpa/bookpreference/BookPreferenceDeleteHistory.java @@ -4,14 +4,13 @@ import jakarta.persistence.*; import lombok.*; - - @Getter @Builder @AllArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(access = AccessLevel.PROTECTED) @Entity -public class BookPreferenceDeleteHistory extends BaseEntity { // TODO 성향 삭제 시 기타 데이터로 포함될 것과 실제 선호 취소 기록과 네이밍 혼동, 추후 처리 +public class BookPreferenceDeleteHistory + extends BaseEntity { // TODO 성향 삭제 시 기타 데이터로 포함될 것과 실제 선호 취소 기록과 네이밍 혼동, 추후 처리 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/ureca/idle/idlejpa/bookpreference/Hobulho.java b/src/main/java/com/ureca/idle/idlejpa/bookpreference/Hobulho.java index 9a6a414..bf45449 100644 --- a/src/main/java/com/ureca/idle/idlejpa/bookpreference/Hobulho.java +++ b/src/main/java/com/ureca/idle/idlejpa/bookpreference/Hobulho.java @@ -1,12 +1,10 @@ package com.ureca.idle.idlejpa.bookpreference; -import lombok.Getter; - import java.util.Arrays; +import lombok.Getter; @Getter public enum Hobulho { - HO("ho"), BULHO("bulho"); @@ -20,6 +18,7 @@ public static Hobulho from(String hobulho) { return Arrays.stream(Hobulho.values()) .filter(it -> it.value.equalsIgnoreCase(hobulho)) .findFirst() - .orElseThrow(() -> new RuntimeException("give me ho or bulho.")); // TODO 예외의 정확한 포맷 정하기 + .orElseThrow( + () -> new RuntimeException("give me ho or bulho.")); // TODO 예외의 정확한 포맷 정하기 } } diff --git a/src/main/java/com/ureca/idle/idlejpa/config/BaseEntity.java b/src/main/java/com/ureca/idle/idlejpa/config/BaseEntity.java index 9e2bf9a..6726d9d 100644 --- a/src/main/java/com/ureca/idle/idlejpa/config/BaseEntity.java +++ b/src/main/java/com/ureca/idle/idlejpa/config/BaseEntity.java @@ -3,6 +3,7 @@ import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,8 +11,6 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; - @Getter @MappedSuperclass @NoArgsConstructor @@ -27,4 +26,3 @@ public abstract class BaseEntity { @LastModifiedDate private LocalDateTime updatedAt; } - diff --git a/src/main/java/com/ureca/idle/idlejpa/config/JpaConfig.java b/src/main/java/com/ureca/idle/idlejpa/config/JpaConfig.java index 171773f..ccebbad 100644 --- a/src/main/java/com/ureca/idle/idlejpa/config/JpaConfig.java +++ b/src/main/java/com/ureca/idle/idlejpa/config/JpaConfig.java @@ -5,5 +5,4 @@ @Configuration @EnableJpaAuditing -public class JpaConfig { -} +public class JpaConfig {} diff --git a/src/main/java/com/ureca/idle/idlejpa/kid/Gender.java b/src/main/java/com/ureca/idle/idlejpa/kid/Gender.java index e066707..851306a 100644 --- a/src/main/java/com/ureca/idle/idlejpa/kid/Gender.java +++ b/src/main/java/com/ureca/idle/idlejpa/kid/Gender.java @@ -1,11 +1,10 @@ package com.ureca.idle.idlejpa.kid; -import lombok.Getter; import java.util.Arrays; +import lombok.Getter; @Getter public enum Gender { - BOY("boy"), GIRL("girl"); @@ -22,4 +21,3 @@ public static Gender from(String gender) { .orElseThrow(() -> new RuntimeException("올바른 성별을 입력해주세요.")); // TODO 예외의 정확한 포맷 정하기 } } - diff --git a/src/main/java/com/ureca/idle/idlejpa/kid/Kid.java b/src/main/java/com/ureca/idle/idlejpa/kid/Kid.java index e075e81..b1f049f 100644 --- a/src/main/java/com/ureca/idle/idlejpa/kid/Kid.java +++ b/src/main/java/com/ureca/idle/idlejpa/kid/Kid.java @@ -4,9 +4,8 @@ import com.ureca.idle.idlejpa.kidspersonality.KidsPersonality; import com.ureca.idle.idlejpa.user.User; import jakarta.persistence.*; -import lombok.*; - import java.time.LocalDate; +import lombok.*; @Getter @Builder diff --git a/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidPersonalityDeleteHistory.java b/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidPersonalityDeleteHistory.java index ca321f7..f920ce0 100644 --- a/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidPersonalityDeleteHistory.java +++ b/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidPersonalityDeleteHistory.java @@ -4,8 +4,6 @@ import jakarta.persistence.*; import lombok.*; - - @Getter @Builder @AllArgsConstructor(access = AccessLevel.PRIVATE) @@ -34,4 +32,4 @@ public class KidPersonalityDeleteHistory extends BaseEntity { @Column(nullable = false) private String mbti; -} \ No newline at end of file +} diff --git a/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidsPersonality.java b/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidsPersonality.java index 496c93f..14bc9f5 100644 --- a/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidsPersonality.java +++ b/src/main/java/com/ureca/idle/idlejpa/kidspersonality/KidsPersonality.java @@ -29,4 +29,4 @@ public class KidsPersonality extends BaseEntity { @Column(nullable = false) private String mbti; -} \ No newline at end of file +} diff --git a/src/main/java/com/ureca/idle/idlejpa/user/Role.java b/src/main/java/com/ureca/idle/idlejpa/user/Role.java index 969ff59..f28e707 100644 --- a/src/main/java/com/ureca/idle/idlejpa/user/Role.java +++ b/src/main/java/com/ureca/idle/idlejpa/user/Role.java @@ -1,8 +1,7 @@ package com.ureca.idle.idlejpa.user; -import lombok.Getter; - import java.util.Arrays; +import lombok.Getter; @Getter public enum Role { diff --git a/src/test/java/com/ureca/idle/IdleApplicationTests.java b/src/test/java/com/ureca/idle/IdleApplicationTests.java index 9e8232b..cc7f435 100644 --- a/src/test/java/com/ureca/idle/IdleApplicationTests.java +++ b/src/test/java/com/ureca/idle/IdleApplicationTests.java @@ -6,8 +6,6 @@ @SpringBootTest class IdleApplicationTests { - @Test - void contextLoads() { - } - + @Test + void contextLoads() {} }