Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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.siteuser.repository.SiteUserRepository;
import com.example.solidconnection.type.VerifyStatus;
import com.example.solidconnection.university.domain.UniversityInfoForApply;
import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.time.LocalDate;

@Getter
@Entity
@NoArgsConstructor
Expand All @@ -33,8 +31,6 @@ public class GpaScore extends BaseEntity {
@Embedded
private Gpa gpa;

private LocalDate issueDate;

@Setter
@Column(columnDefinition = "varchar(50) not null default 'PENDING'")
@Enumerated(EnumType.STRING)
Expand All @@ -45,10 +41,9 @@ public class GpaScore extends BaseEntity {
@ManyToOne
private SiteUser siteUser;

public GpaScore(Gpa gpa, SiteUser siteUser, LocalDate issueDate) {
public GpaScore(Gpa gpa, SiteUser siteUser) {
this.gpa = gpa;
this.siteUser = siteUser;
this.issueDate = issueDate;
this.verifyStatus = VerifyStatus.PENDING;
this.rejectedReason = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.time.LocalDate;

@Getter
@Entity
@NoArgsConstructor
Expand All @@ -33,8 +31,6 @@ public class LanguageTestScore extends BaseEntity {
@Embedded
private LanguageTest languageTest;

private LocalDate issueDate;

@Setter
@Column(columnDefinition = "varchar(50) not null default 'PENDING'")
@Enumerated(EnumType.STRING)
Expand All @@ -45,9 +41,8 @@ public class LanguageTestScore extends BaseEntity {
@ManyToOne
private SiteUser siteUser;

public LanguageTestScore(LanguageTest languageTest, LocalDate issueDate, SiteUser siteUser) {
public LanguageTestScore(LanguageTest languageTest, SiteUser siteUser) {
this.languageTest = languageTest;
this.issueDate = issueDate;
this.verifyStatus = VerifyStatus.PENDING;
this.siteUser = siteUser;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,13 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;

public record GpaScoreRequest(
@NotNull(message = "학점을 입력해주세요.")
Double gpa,

@NotNull(message = "학점 기준을 입력해주세요.")
Double gpaCriteria,

@NotNull(message = "발급일자를 입력해주세요.")
LocalDate issueDate,

@NotBlank(message = "대학 성적 증명서를 첨부해주세요.")
String gpaReportUrl) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,16 @@
import com.example.solidconnection.score.domain.GpaScore;
import com.example.solidconnection.type.VerifyStatus;

import java.time.LocalDate;

public record GpaScoreStatus(
Long id,
Gpa gpa,
LocalDate issueDate,
VerifyStatus verifyStatus,
String rejectedReason
) {
public static GpaScoreStatus from(GpaScore gpaScore) {
return new GpaScoreStatus(
gpaScore.getId(),
gpaScore.getGpa(),
gpaScore.getIssueDate(),
gpaScore.getVerifyStatus(),
gpaScore.getRejectedReason()
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
package com.example.solidconnection.score.dto;


import com.example.solidconnection.application.domain.LanguageTest;
import com.example.solidconnection.type.LanguageTestType;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;

public record LanguageTestScoreRequest(
@NotNull(message = "어학 종류를 입력해주세요.")
LanguageTestType languageTestType,

@NotBlank(message = "어학 점수를 입력해주세요.")
String languageTestScore,

@NotNull(message = "발급일자를 입력해주세요.")
LocalDate issueDate,

@NotBlank(message = "어학 증명서를 첨부해주세요.")
String languageTestReportUrl) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,16 @@
import com.example.solidconnection.score.domain.LanguageTestScore;
import com.example.solidconnection.type.VerifyStatus;

import java.time.LocalDate;

public record LanguageTestScoreStatus(
Long id,
LanguageTest languageTest,
LocalDate issueDate,
VerifyStatus verifyStatus,
String rejectedReason
) {
public static LanguageTestScoreStatus from(LanguageTestScore languageTestScore) {
return new LanguageTestScoreStatus(
languageTestScore.getId(),
languageTestScore.getLanguageTest(),
languageTestScore.getIssueDate(),
languageTestScore.getVerifyStatus(),
languageTestScore.getRejectedReason()
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.solidconnection.score.dto;


import java.util.List;

public record LanguageTestScoreStatusResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class ScoreService {

@Transactional
public Long submitGpaScore(SiteUser siteUser, GpaScoreRequest gpaScoreRequest) {
GpaScore newGpaScore = new GpaScore(gpaScoreRequest.toGpa(), siteUser, gpaScoreRequest.issueDate());
GpaScore newGpaScore = new GpaScore(gpaScoreRequest.toGpa(), siteUser);
newGpaScore.setSiteUser(siteUser);
GpaScore savedNewGpaScore = gpaScoreRepository.save(newGpaScore); // 저장 후 반환된 객체
return savedNewGpaScore.getId(); // 저장된 GPA Score의 ID 반환
Expand All @@ -41,7 +41,7 @@ public Long submitLanguageTestScore(SiteUser siteUser, LanguageTestScoreRequest
LanguageTest languageTest = languageTestScoreRequest.toLanguageTest();

LanguageTestScore newScore = new LanguageTestScore(
languageTest, languageTestScoreRequest.issueDate(), siteUser);
languageTest, siteUser);
newScore.setSiteUser(siteUser);
LanguageTestScore savedNewScore = languageTestScoreRepository.save(newScore); // 새로 저장한 객체
return savedNewScore.getId(); // 저장된 객체의 ID 반환
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ALTER TABLE gpa_score
DROP COLUMN issue_date;

ALTER TABLE language_test_score
DROP COLUMN issue_date;
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;

import java.time.LocalDate;

import static com.example.solidconnection.application.service.ApplicationSubmissionService.APPLICATION_UPDATE_COUNT_LIMIT;
import static com.example.solidconnection.custom.exception.ErrorCode.APPLY_UPDATE_LIMIT_EXCEED;
import static com.example.solidconnection.custom.exception.ErrorCode.CANT_APPLY_FOR_SAME_UNIVERSITY;
Expand Down Expand Up @@ -165,17 +163,15 @@ class ApplicationSubmissionServiceTest extends BaseIntegrationTest {
private GpaScore createUnapprovedGpaScore(SiteUser siteUser) {
GpaScore gpaScore = new GpaScore(
new Gpa(4.0, 4.5, "/gpa-report.pdf"),
siteUser,
LocalDate.now()
siteUser
);
return gpaScoreRepository.save(gpaScore);
}

private GpaScore createApprovedGpaScore(SiteUser siteUser) {
GpaScore gpaScore = new GpaScore(
new Gpa(4.0, 4.5, "/gpa-report.pdf"),
siteUser,
LocalDate.now()
siteUser
);
gpaScore.setVerifyStatus(VerifyStatus.APPROVED);
return gpaScoreRepository.save(gpaScore);
Expand All @@ -184,7 +180,6 @@ private GpaScore createApprovedGpaScore(SiteUser siteUser) {
private LanguageTestScore createUnapprovedLanguageTestScore(SiteUser siteUser) {
LanguageTestScore languageTestScore = new LanguageTestScore(
new LanguageTest(LanguageTestType.TOEIC, "100", "/gpa-report.pdf"),
LocalDate.now(),
siteUser
);
return languageTestScoreRepository.save(languageTestScore);
Expand All @@ -193,7 +188,6 @@ private LanguageTestScore createUnapprovedLanguageTestScore(SiteUser siteUser) {
private LanguageTestScore createApprovedLanguageTestScore(SiteUser siteUser) {
LanguageTestScore languageTestScore = new LanguageTestScore(
new LanguageTest(LanguageTestType.TOEIC, "100", "/gpa-report.pdf"),
LocalDate.now(),
siteUser
);
languageTestScore.setVerifyStatus(VerifyStatus.APPROVED);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;

import java.time.LocalDate;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -129,7 +128,6 @@ class ScoreServiceTest extends BaseIntegrationTest {
() -> assertThat(savedScore.getId()).isEqualTo(scoreId),
() -> assertThat(savedScore.getGpa().getGpa()).isEqualTo(request.gpa()),
() -> assertThat(savedScore.getGpa().getGpaCriteria()).isEqualTo(request.gpaCriteria()),
() -> assertThat(savedScore.getIssueDate()).isEqualTo(request.issueDate()),
() -> assertThat(savedScore.getVerifyStatus()).isEqualTo(VerifyStatus.PENDING)
);
}
Expand All @@ -149,7 +147,6 @@ class ScoreServiceTest extends BaseIntegrationTest {
() -> assertThat(savedScore.getId()).isEqualTo(scoreId),
() -> assertThat(savedScore.getLanguageTest().getLanguageTestType()).isEqualTo(request.languageTestType()),
() -> assertThat(savedScore.getLanguageTest().getLanguageTestScore()).isEqualTo(request.languageTestScore()),
() -> assertThat(savedScore.getIssueDate()).isEqualTo(request.issueDate()),
() -> assertThat(savedScore.getVerifyStatus()).isEqualTo(VerifyStatus.PENDING)
);
}
Expand All @@ -170,8 +167,7 @@ private SiteUser createSiteUser() {
private GpaScore createGpaScore(SiteUser siteUser, double gpa, double gpaCriteria) {
GpaScore gpaScore = new GpaScore(
new Gpa(gpa, gpaCriteria, "/gpa-report.pdf"),
siteUser,
LocalDate.now()
siteUser
);
gpaScore.setSiteUser(siteUser);
return gpaScoreRepository.save(gpaScore);
Expand All @@ -180,7 +176,6 @@ private GpaScore createGpaScore(SiteUser siteUser, double gpa, double gpaCriteri
private LanguageTestScore createLanguageTestScore(SiteUser siteUser, LanguageTestType languageTestType, String score) {
LanguageTestScore languageTestScore = new LanguageTestScore(
new LanguageTest(languageTestType, score, "/gpa-report.pdf"),
LocalDate.now(),
siteUser
);
languageTestScore.setSiteUser(siteUser);
Expand All @@ -191,7 +186,6 @@ private GpaScoreRequest createGpaScoreRequest() {
return new GpaScoreRequest(
3.5,
4.5,
LocalDate.now(),
"/gpa-report.pdf"
);
}
Expand All @@ -200,7 +194,6 @@ private LanguageTestScoreRequest createLanguageTestScoreRequest() {
return new LanguageTestScoreRequest(
LanguageTestType.TOEFL_IBT,
"100",
LocalDate.now(),
"/gpa-report.pdf"
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

import java.time.LocalDate;
import java.util.HashSet;
import java.util.List;

Expand Down Expand Up @@ -511,8 +510,7 @@ private void saveLanguageTestRequirement(
private GpaScore createApprovedGpaScore(SiteUser siteUser) {
GpaScore gpaScore = new GpaScore(
new Gpa(4.0, 4.5, "/gpa-report.pdf"),
siteUser,
LocalDate.now()
siteUser
);
gpaScore.setVerifyStatus(VerifyStatus.APPROVED);
return gpaScoreRepository.save(gpaScore);
Expand All @@ -521,7 +519,6 @@ private GpaScore createApprovedGpaScore(SiteUser siteUser) {
private LanguageTestScore createApprovedLanguageTestScore(SiteUser siteUser) {
LanguageTestScore languageTestScore = new LanguageTestScore(
new LanguageTest(LanguageTestType.TOEIC, "100", "/gpa-report.pdf"),
LocalDate.now(),
siteUser
);
languageTestScore.setVerifyStatus(VerifyStatus.APPROVED);
Expand Down