Skip to content

Commit 9c59985

Browse files
committed
fix: conflict 해결
2 parents 2938a79 + b4a5d09 commit 9c59985

81 files changed

Lines changed: 1214 additions & 171 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44
import com.example.solidconnection.score.domain.GpaScore;
55

66
public record GpaScoreResponse(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44

55
import java.time.ZonedDateTime;
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44
import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
55
import jakarta.validation.constraints.NotNull;
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44
import com.example.solidconnection.score.domain.LanguageTestScore;
55
import com.example.solidconnection.university.domain.LanguageTestType;
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44

55
import java.time.ZonedDateTime;
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44
import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
55
import com.example.solidconnection.university.domain.LanguageTestType;
66
import jakarta.validation.constraints.NotNull;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44

55
import java.time.LocalDate;
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.admin.dto;
22

3-
import com.example.solidconnection.application.domain.VerifyStatus;
3+
import com.example.solidconnection.common.VerifyStatus;
44

55
public interface ScoreUpdateRequest {
66
VerifyStatus verifyStatus();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest;
66
import com.example.solidconnection.admin.dto.ScoreSearchCondition;
77
import com.example.solidconnection.application.domain.Gpa;
8-
import com.example.solidconnection.application.domain.VerifyStatus;
8+
import com.example.solidconnection.common.VerifyStatus;
99
import com.example.solidconnection.common.exception.CustomException;
1010
import com.example.solidconnection.score.domain.GpaScore;
1111
import com.example.solidconnection.score.repository.GpaScoreRepository;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest;
66
import com.example.solidconnection.admin.dto.ScoreSearchCondition;
77
import com.example.solidconnection.application.domain.LanguageTest;
8-
import com.example.solidconnection.application.domain.VerifyStatus;
8+
import com.example.solidconnection.common.VerifyStatus;
99
import com.example.solidconnection.common.exception.CustomException;
1010
import com.example.solidconnection.score.domain.LanguageTestScore;
1111
import com.example.solidconnection.score.repository.LanguageTestScoreRepository;

0 commit comments

Comments
 (0)