♻️ Refactor : 코드 스타일 적용

src/main/java/com/example/namo2/domain/category/application/impl/CategoryService.java

@@ -37,7 +37,7 @@ public void delete(Long categoryId) {
 		category.delete();
 	}
 
-	public void removeCategoriesByUser(User user){
+	public void removeCategoriesByUser(User user) {
 		categoryRepository.deleteAllByUser(user);
 	}
 

src/main/java/com/example/namo2/domain/memo/application/impl/MoimMemoLocationService.java

@@ -15,6 +15,7 @@
 import com.example.namo2.domain.moim.domain.MoimSchedule;
 
 import com.example.namo2.domain.user.domain.User;
+
 import com.example.namo2.global.common.exception.BaseException;
 import com.example.namo2.global.common.response.BaseResponseStatus;
 
@@ -53,7 +54,7 @@ public void removeMoimMemoLocationAndUsers(List<MoimMemoLocation> moimMemoLocati
 		moimMemoLocationAndUserRepository.deleteMoimMemoLocationAndUserByMoimMemoLocation(moimMemoLocation);
 	}
 
-	public void removeMoimMemoLocationAndUsersByUser(User user){
+	public void removeMoimMemoLocationAndUsersByUser(User user) {
 		moimMemoLocationAndUserRepository.deleteAllByUser(user);
 	}
 

src/main/java/com/example/namo2/domain/memo/dao/repository/MoimMemoLocationAndUserRepository.java

@@ -8,6 +8,7 @@
 
 import com.example.namo2.domain.memo.domain.MoimMemoLocation;
 import com.example.namo2.domain.memo.domain.MoimMemoLocationAndUser;
+
 import com.example.namo2.domain.user.domain.User;
 
 public interface MoimMemoLocationAndUserRepository extends JpaRepository<MoimMemoLocationAndUser, Long> {

src/main/java/com/example/namo2/domain/moim/application/impl/MoimAndUserService.java

@@ -57,7 +57,7 @@ public void removeMoimAndUser(MoimAndUser moimAndUser) {
 		moimAndUserRepository.delete(moimAndUser);
 	}
 
-	public void removeMoimAndUsersByUser(User user){
+	public void removeMoimAndUsersByUser(User user) {
 		moimAndUserRepository.deleteAllByUser(user);
 	}
 }

src/main/java/com/example/namo2/domain/moim/application/impl/MoimScheduleAndUserService.java

@@ -8,7 +8,6 @@
 
 import com.example.namo2.domain.moim.dao.repository.MoimScheduleAlarmRepository;
 import com.example.namo2.domain.moim.dao.repository.MoimScheduleAndUserRepository;
-import com.example.namo2.domain.moim.domain.Moim;
 import com.example.namo2.domain.moim.domain.MoimSchedule;
 import com.example.namo2.domain.moim.domain.MoimScheduleAlarm;
 import com.example.namo2.domain.moim.domain.MoimScheduleAndUser;
@@ -43,17 +42,16 @@ public void removeMoimScheduleAndUser(MoimSchedule moimSchedule, MoimScheduleAnd
 		moimScheduleAndUserRepository.delete(moimScheduleAndUser);
 	}
 
-	public void removeMoimScheduleAndUsers(List<MoimScheduleAndUser> moimScheduleAndUsers){
+	public void removeMoimScheduleAndUsers(List<MoimScheduleAndUser> moimScheduleAndUsers) {
 		moimScheduleAndUserRepository.deleteAll(moimScheduleAndUsers);
 	}
 
-
 	public MoimScheduleAndUser getMoimScheduleAndUser(MoimSchedule moimSchedule, User user) {
 		return moimScheduleAndUserRepository.findMoimScheduleAndUserByMoimScheduleAndUser(moimSchedule, user)
 			.orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MOIM_SCHEDULE_AND_USER_FAILURE));
 	}
 
-	public List<MoimScheduleAndUser> getAllByUser(User user){
+	public List<MoimScheduleAndUser> getAllByUser(User user) {
 		return moimScheduleAndUserRepository.findAllByUser(user);
 	}
 
@@ -65,7 +63,7 @@ public void removeMoimScheduleAlarm(List<MoimScheduleAndUser> moimScheduleAndUse
 		moimScheduleAlarmRepository.deleteMoimScheduleAlarmByMoimScheduleAndUser(moimScheduleAndUser);
 	}
 
-	public void removeMoimScheduleAlarms(List<MoimScheduleAndUser> moimScheduleAndUsers){
+	public void removeMoimScheduleAlarms(List<MoimScheduleAndUser> moimScheduleAndUsers) {
 		moimScheduleAndUsers.forEach(moimScheduleAndUser ->
 			moimScheduleAlarmRepository.deleteAll(moimScheduleAndUser.getMoimScheduleAlarms()));
 	}

src/main/java/com/example/namo2/domain/moim/application/impl/MoimService.java

@@ -57,7 +57,7 @@ public void removeSchedule(Long moimScheduleId) {
 		            moimMemoRepository.delete(moimMemo);
 		        }
 		*/
-		
+
 		moimScheduleAndUserRepository.deleteMoimScheduleAndUserByMoimSchedule(moimSchedule);
 		moimScheduleRepository.delete(moimSchedule);
 	}

src/main/java/com/example/namo2/domain/moim/dao/repository/MoimScheduleAlarmRepository.java

@@ -9,7 +9,6 @@
 
 import com.example.namo2.domain.moim.domain.MoimScheduleAlarm;
 import com.example.namo2.domain.moim.domain.MoimScheduleAndUser;
-import com.example.namo2.domain.user.domain.User;
 
 public interface MoimScheduleAlarmRepository extends JpaRepository<MoimScheduleAlarm, Long> {
 	@Modifying

src/main/java/com/example/namo2/domain/schedule/application/ScheduleFacade.java

@@ -12,9 +12,6 @@
 import com.example.namo2.domain.category.application.impl.CategoryService;
 import com.example.namo2.domain.category.domain.Category;
 
-import com.example.namo2.domain.memo.application.impl.MoimMemoLocationService;
-import com.example.namo2.domain.memo.application.impl.MoimMemoService;
-
 import com.example.namo2.domain.moim.application.impl.MoimScheduleAndUserService;
 import com.example.namo2.domain.moim.application.impl.MoimScheduleService;
 import com.example.namo2.domain.moim.domain.MoimSchedule;

src/main/java/com/example/namo2/domain/schedule/application/impl/AlarmService.java

@@ -13,13 +13,14 @@
 @RequiredArgsConstructor
 public class AlarmService {
 	private final AlarmRepository alarmRepository;
-	public void removeAlarmsBySchedule(Schedule schedule){
+
+	public void removeAlarmsBySchedule(Schedule schedule) {
 		alarmRepository.deleteAllBySchedule(schedule);
 	}
 
-	public void removeAlarmsBySchedules(List<Schedule> schedules){
+	public void removeAlarmsBySchedules(List<Schedule> schedules) {
 		schedules.forEach(schedule ->
-				alarmRepository.deleteAll(schedule.getAlarms())
+			alarmRepository.deleteAll(schedule.getAlarms())
 		);
 	}
 }

src/main/java/com/example/namo2/domain/schedule/application/impl/ImageService.java

@@ -23,7 +23,7 @@ public void removeImgsBySchedule(Schedule schedule) {
 		imageRepository.deleteDiaryImages(schedule);
 	}
 
-	public void removeImgsBySchedules(List<Schedule> schedules){
+	public void removeImgsBySchedules(List<Schedule> schedules) {
 		schedules.forEach(schedule ->
 			imageRepository.deleteAll(schedule.getImages())
 		);

src/main/java/com/example/namo2/domain/schedule/application/impl/ScheduleService.java

@@ -31,11 +31,10 @@ public Schedule getScheduleById(Long scheduleId) {
 		return scheduleRepository.findById(scheduleId).orElseThrow(() -> new BaseException(NOT_FOUND_SCHEDULE_FAILURE));
 	}
 
-	public List<Schedule> getSchedulesByUser(User user){
+	public List<Schedule> getSchedulesByUser(User user) {
 		return scheduleRepository.findAllByUser(user);
 	}
 
-
 	public List<ScheduleResponse.GetScheduleDto> getSchedulesByUserId(User user, LocalDateTime startDate,
 		LocalDateTime endDate
 	) throws BaseException {
@@ -73,7 +72,7 @@ public void removeSchedule(Schedule schedule) {
 		scheduleRepository.delete(schedule);
 	}
 
-	public void removeSchedules(List<Schedule> schedules){
+	public void removeSchedules(List<Schedule> schedules) {
 		scheduleRepository.deleteAll(schedules);
 	}
 

src/main/java/com/example/namo2/domain/schedule/dao/repository/ScheduleRepository.java

@@ -1,7 +1,6 @@
 package com.example.namo2.domain.schedule.dao.repository;
 
 import java.util.List;
-import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/example/namo2/domain/user/application/UserFacade.java

@@ -24,6 +24,8 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.openssl.PEMParser;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
@@ -32,29 +34,33 @@
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
 import com.example.namo2.domain.category.application.converter.CategoryConverter;
 import com.example.namo2.domain.category.application.impl.CategoryService;
 import com.example.namo2.domain.category.application.impl.PaletteService;
 import com.example.namo2.domain.category.domain.Category;
 
 import com.example.namo2.domain.memo.application.impl.MoimMemoLocationService;
-import com.example.namo2.domain.memo.domain.MoimMemoLocationAndUser;
+
 import com.example.namo2.domain.moim.application.impl.MoimAndUserService;
 import com.example.namo2.domain.moim.application.impl.MoimScheduleAndUserService;
 import com.example.namo2.domain.moim.domain.MoimScheduleAndUser;
+
 import com.example.namo2.domain.schedule.application.impl.AlarmService;
 import com.example.namo2.domain.schedule.application.impl.ImageService;
 import com.example.namo2.domain.schedule.application.impl.ScheduleService;
-import com.example.namo2.domain.schedule.domain.Image;
 import com.example.namo2.domain.schedule.domain.Schedule;
+
 import com.example.namo2.domain.user.application.converter.TermConverter;
 import com.example.namo2.domain.user.application.converter.UserConverter;
 import com.example.namo2.domain.user.application.impl.UserService;
@@ -63,22 +69,18 @@
 import com.example.namo2.domain.user.domain.UserStatus;
 import com.example.namo2.domain.user.ui.dto.UserRequest;
 import com.example.namo2.domain.user.ui.dto.UserResponse;
+
 import com.example.namo2.global.common.exception.BaseException;
 import com.example.namo2.global.common.response.BaseResponseStatus;
 import com.example.namo2.global.feignClient.apple.AppleAuthClient;
 import com.example.namo2.global.feignClient.apple.AppleProperties;
 import com.example.namo2.global.feignClient.apple.AppleResponse;
 import com.example.namo2.global.feignClient.apple.AppleResponseConverter;
 import com.example.namo2.global.feignClient.kakao.KakaoAuthClient;
-import com.example.namo2.global.feignClient.kakao.KakaoResponse;
 import com.example.namo2.global.feignClient.naver.NaverAuthClient;
 import com.example.namo2.global.utils.JwtUtils;
 import com.example.namo2.global.utils.SocialUtils;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -106,7 +108,6 @@ public class UserFacade {
 	private final AppleAuthClient appleAuthClient;
 	private final AppleProperties appleProperties;
 
-
 	@Transactional
 	public UserResponse.SignUpDto signupKakao(UserRequest.SocialSignUpDto signUpDto) {
 		try {
@@ -147,6 +148,7 @@ public UserResponse.SignUpDto signupNaver(UserRequest.SocialSignUpDto signUpDto)
 		}
 	}
 
+	@SuppressWarnings("checkstyle:NeedBraces")
 	@Transactional
 	public UserResponse.SignUpDto signupApple(UserRequest.AppleSignUpDto req) {
 		AppleResponse.ApplePublicKeyListDto applePublicKeys = appleAuthClient.getApplePublicKeys();
@@ -181,7 +183,7 @@ public UserResponse.SignUpDto signupApple(UserRequest.AppleSignUpDto req) {
 		String appleEmail = claims.get("email", String.class);
 		log.debug("email: {}, oauthId : {}", appleEmail, appleOauthId);
 
-		if(!req.getEmail().isBlank())//첫 로그인
+		if (!req.getEmail().isBlank())//첫 로그인
 			email = req.getEmail();
 		else//재로그인
 			email = appleEmail;
@@ -193,7 +195,7 @@ public UserResponse.SignUpDto signupApple(UserRequest.AppleSignUpDto req) {
 			userService.checkEmailAndName(req.getEmail(), req.getUsername());
 			savedUser = userService.createUser(UserConverter.toUser(req.getEmail(), req.getUsername()));
 			makeBaseCategory(savedUser);
-		}else{//재로그인
+		} else {//재로그인
 			savedUser = userByEmail.get();
 			savedUser.setStatus(UserStatus.ACTIVE);
 		}
@@ -306,7 +308,6 @@ private void validateLogout(UserRequest.SignUpDto signUpDto) {
 		}
 	}
 
-
 	@Transactional(readOnly = false)
 	public void createTerm(UserRequest.TermDto termDto, Long userId) {
 		User user = userService.getUser(userId);
@@ -315,7 +316,7 @@ public void createTerm(UserRequest.TermDto termDto, Long userId) {
 	}
 
 	@Transactional
-	public void removeKakaoUser(HttpServletRequest request, String kakaoAccessToken){
+	public void removeKakaoUser(HttpServletRequest request, String kakaoAccessToken) {
 		//유저 토큰 만료시 예외 처리
 		String accessToken = request.getHeader("Authorization");
 		if (!jwtUtils.validateToken(accessToken)) {
@@ -328,7 +329,7 @@ public void removeKakaoUser(HttpServletRequest request, String kakaoAccessToken)
 	}
 
 	@Transactional
-	public void removeNaverUser(HttpServletRequest request, String naverAccessToken){
+	public void removeNaverUser(HttpServletRequest request, String naverAccessToken) {
 		//유저 토큰 만료시 예외 처리
 		String accessToken = request.getHeader("Authorization");
 		if (!jwtUtils.validateToken(accessToken)) {
@@ -342,7 +343,7 @@ public void removeNaverUser(HttpServletRequest request, String naverAccessToken)
 	}
 
 	@Transactional
-	public void removeAppleUser(HttpServletRequest request, String authorizationCode){
+	public void removeAppleUser(HttpServletRequest request, String authorizationCode) {
 		//유저 토큰 만료시 예외 처리
 		String accessToken = request.getHeader("Authorization");
 		if (!jwtUtils.validateToken(accessToken)) {
@@ -352,18 +353,18 @@ public void removeAppleUser(HttpServletRequest request, String authorizationCode
 		String clientSecret = "";
 		try {
 			clientSecret = createClientSecret();
-		}catch (IOException  e){
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		String appleToken = appleAuthClient.getAppleToken(clientSecret,authorizationCode);
+		String appleToken = appleAuthClient.getAppleToken(clientSecret, authorizationCode);
 		logger.debug("appleToken {}", appleToken);
 		appleAuthClient.revoke(clientSecret, appleToken);
 		// appleAuthClient.revoke(clientSecret, authorizationCode);
 
 		setUserInactive(request);
 	}
 
-	public String createClientSecret() throws IOException{
+	public String createClientSecret() throws IOException {
 		Date expirationDate = Date.from(LocalDateTime.now().plusDays(30).atZone(ZoneId.systemDefault()).toInstant());
 
 		return Jwts.builder()
@@ -378,18 +379,18 @@ public String createClientSecret() throws IOException{
 			.compact();
 	}
 
-	public PrivateKey getPrivateKey() throws IOException{
-			ClassPathResource resource = new ClassPathResource(appleProperties.getPrivateKeyPath());
-			String privateKey = new String(Files.readAllBytes(Paths.get(resource.getURI())));
-			Reader pemReader = new StringReader(privateKey);
+	public PrivateKey getPrivateKey() throws IOException {
+		ClassPathResource resource = new ClassPathResource(appleProperties.getPrivateKeyPath());
+		String privateKey = new String(Files.readAllBytes(Paths.get(resource.getURI())));
+		Reader pemReader = new StringReader(privateKey);
 
-			PEMParser pemParser = new PEMParser(pemReader);
-			JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
-			PrivateKeyInfo object = (PrivateKeyInfo) pemParser.readObject();
-			return converter.getPrivateKey(object);
+		PEMParser pemParser = new PEMParser(pemReader);
+		JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
+		PrivateKeyInfo object = (PrivateKeyInfo)pemParser.readObject();
+		return converter.getPrivateKey(object);
 	}
 
-	private void setUserInactive(HttpServletRequest request){
+	private void setUserInactive(HttpServletRequest request) {
 		User user = userService.getUser(jwtUtils.resolveRequest(request));
 		user.setStatus(UserStatus.INACTIVE);
 
@@ -412,11 +413,11 @@ private void setUserInactive(HttpServletRequest request){
 	 */
 	@Scheduled(cron = "0 0 0 * * *") // 매일 자정에 실행
 	@Transactional
-	public void removeUserFromDB(){
+	public void removeUserFromDB() {
 		List<User> users = userService.getInactiveUser();
 		users.forEach(
 			user -> { //db에서 삭제
-				logger.debug("[Delete] user name : "+user.getName());
+				logger.debug("[Delete] user name : " + user.getName());
 
 				categoryService.removeCategoriesByUser(user);
 
@@ -436,6 +437,5 @@ public void removeUserFromDB(){
 			}
 		);
 
-
 	}
 }