chore: conflict 해소와 import문 정리

Author: nayonsoso

src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java

@@ -1,7 +1,7 @@
 package com.example.solidconnection.admin.dto;
 
-import com.example.solidconnection.score.domain.GpaScore;
 import com.example.solidconnection.application.domain.VerifyStatus;
+import com.example.solidconnection.score.domain.GpaScore;
 
 public record GpaScoreResponse(
         long id,

src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java

@@ -1,7 +1,7 @@
 package com.example.solidconnection.admin.dto;
 
-import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
 import com.example.solidconnection.application.domain.VerifyStatus;
+import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
 import jakarta.validation.constraints.NotNull;
 
 @RejectedReasonRequired

src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java

@@ -1,8 +1,8 @@
 package com.example.solidconnection.admin.dto;
 
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.score.domain.LanguageTestScore;
 import com.example.solidconnection.university.domain.LanguageTestType;
-import com.example.solidconnection.application.domain.VerifyStatus;
 
 public record LanguageTestScoreResponse(
         long id,

src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java

@@ -1,8 +1,8 @@
 package com.example.solidconnection.admin.dto;
 
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
 import com.example.solidconnection.university.domain.LanguageTestType;
-import com.example.solidconnection.application.domain.VerifyStatus;
 import jakarta.validation.constraints.NotNull;
 
 @RejectedReasonRequired

src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java

@@ -5,10 +5,10 @@
 import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest;
 import com.example.solidconnection.admin.dto.ScoreSearchCondition;
 import com.example.solidconnection.application.domain.Gpa;
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.score.domain.GpaScore;
 import com.example.solidconnection.score.repository.GpaScoreRepository;
-import com.example.solidconnection.application.domain.VerifyStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java

@@ -5,10 +5,10 @@
 import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest;
 import com.example.solidconnection.admin.dto.ScoreSearchCondition;
 import com.example.solidconnection.application.domain.LanguageTest;
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.score.domain.LanguageTestScore;
 import com.example.solidconnection.score.repository.LanguageTestScoreRepository;
-import com.example.solidconnection.application.domain.VerifyStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java

@@ -1,9 +1,9 @@
 package com.example.solidconnection.application.repository;
 
 import com.example.solidconnection.application.domain.Application;
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.university.domain.UniversityInfoForApply;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java

@@ -1,14 +1,14 @@
 package com.example.solidconnection.application.service;
 
 import com.example.solidconnection.application.domain.Application;
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.application.dto.ApplicantResponse;
 import com.example.solidconnection.application.dto.ApplicationsResponse;
 import com.example.solidconnection.application.dto.UniversityApplicantsResponse;
 import com.example.solidconnection.application.repository.ApplicationRepository;
 import com.example.solidconnection.cache.annotation.ThunderingHerdCaching;
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.university.domain.University;
 import com.example.solidconnection.university.domain.UniversityInfoForApply;
 import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;

src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java

@@ -1,6 +1,7 @@
 package com.example.solidconnection.application.service;
 
 import com.example.solidconnection.application.domain.Application;
+import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.application.dto.ApplicationSubmissionResponse;
 import com.example.solidconnection.application.dto.ApplyRequest;
 import com.example.solidconnection.application.dto.UniversityChoiceRequest;
@@ -12,7 +13,6 @@
 import com.example.solidconnection.score.repository.GpaScoreRepository;
 import com.example.solidconnection.score.repository.LanguageTestScoreRepository;
 import com.example.solidconnection.siteuser.domain.SiteUser;
-import com.example.solidconnection.application.domain.VerifyStatus;
 import com.example.solidconnection.university.domain.UniversityInfoForApply;
 import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;
 import lombok.RequiredArgsConstructor;

src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java

@@ -1,8 +1,8 @@
 package com.example.solidconnection.auth.client;
 
+import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties;
 import com.example.solidconnection.auth.dto.oauth.AppleTokenDto;
 import com.example.solidconnection.auth.dto.oauth.AppleUserInfoDto;
-import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties;
 import com.example.solidconnection.common.exception.CustomException;
 import io.jsonwebtoken.Jwts;
 import lombok.RequiredArgsConstructor;