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 @@ -52,8 +52,8 @@ public class Application {
@Column(length = 50, nullable = false)
private String term;

@Column(columnDefinition = "TINYINT(1) NOT NULL DEFAULT 0")
private Boolean isDelete;
@Column
private boolean isDelete = false;

@ManyToOne(fetch = FetchType.LAZY)
private UniversityInfoForApply firstChoiceUniversity;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/example/solidconnection/e2e/SignUpTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class SignUpTest extends BaseEndToEndTest {
List<String> interestedRegionNames = List.of("유럽");
List<String> interestedCountryNames = List.of("프랑스", "독일");
SignUpRequest signUpRequest = new SignUpRequest(generatedKakaoToken, interestedRegionNames, interestedCountryNames,
PreparationStatus.CONSIDERING, "nickname", Gender.FEMALE, "profile", "2000-01-01");
PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, "nickname", "2000-01-01");
SignUpResponse response = RestAssured.given().log().all()
.contentType(ContentType.JSON)
.body(signUpRequest)
Expand Down Expand Up @@ -127,7 +127,7 @@ class SignUpTest extends BaseEndToEndTest {

// request - body 생성 및 요청
SignUpRequest signUpRequest = new SignUpRequest(generatedKakaoToken, null, null,
PreparationStatus.CONSIDERING, alreadyExistNickname, Gender.FEMALE, "profile", "2000-01-01");
PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, alreadyExistNickname, "2000-01-01");
ErrorResponse errorResponse = RestAssured.given().log().all()
.contentType(ContentType.JSON)
.body(signUpRequest)
Expand All @@ -153,7 +153,7 @@ class SignUpTest extends BaseEndToEndTest {

// request - body 생성 및 요청
SignUpRequest signUpRequest = new SignUpRequest(generatedKakaoToken, null, null,
PreparationStatus.CONSIDERING, "nickname0", Gender.FEMALE, "profile", "2000-01-01");
PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, "nickname0", "2000-01-01");
ErrorResponse errorResponse = RestAssured.given().log().all()
.contentType(ContentType.JSON)
.body(signUpRequest)
Expand All @@ -169,7 +169,7 @@ class SignUpTest extends BaseEndToEndTest {
@Test
void 유효하지_않은_카카오_토큰으로_회원가입을_하면_예외를_응답한다() {
SignUpRequest signUpRequest = new SignUpRequest("invalid", null, null,
PreparationStatus.CONSIDERING, "nickname", Gender.FEMALE, "profile", "2000-01-01");
PreparationStatus.CONSIDERING, "profile", Gender.FEMALE, "nickname", "2000-01-01");
ErrorResponse errorResponse = RestAssured.given().log().all()
.contentType(ContentType.JSON)
.body(signUpRequest)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import com.example.solidconnection.type.PostCategory;
import com.example.solidconnection.type.PreparationStatus;
import com.example.solidconnection.type.Role;
import jakarta.persistence.EntityManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand All @@ -31,7 +30,7 @@


@SpringBootTest
@ActiveProfiles("local")
@ActiveProfiles("dev")
@DisplayName("댓글 레포지토리 테스트")
class CommentRepositoryTest {
@Autowired
Expand All @@ -41,8 +40,6 @@ class CommentRepositoryTest {
@Autowired
private SiteUserRepository siteUserRepository;
@Autowired
private EntityManager entityManager;
@Autowired
private CommentRepository commentRepository;

private Board board;
Expand All @@ -66,9 +63,6 @@ public void setUp() {
childComment = createChildComment();
commentRepository.save(parentComment);
commentRepository.save(childComment);

entityManager.flush();
entityManager.clear();
}

private Board createBoard() {
Expand Down