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
@@ -1,11 +1,15 @@
package in.koreatech.koin.domain.owner.dto;

import com.fasterxml.jackson.annotation.JsonProperty;

import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;

public record VerifyEmailRequest(
@Email(message = "이메일 형식을 지켜주세요.")
@NotBlank(message = "이메일을 입력해주세요.")
@JsonProperty("address")
String email
) {

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public record StudentResponse(
String email,

@Schema(description = "성별(남:0, 여:1)", example = "1")
String gender,
Integer gender,

@Schema(description = "전공{기계공학부, 컴퓨터공학부, 메카트로닉스공학부, 전기전자통신공학부, 디자인공학부, "
+ "건축공학부, 화학생명공학부, 에너지신소재공학부, 산업경영학부, 고용서비스정책학과}", example = "컴퓨터공학부")
Expand All @@ -40,7 +40,7 @@ public static StudentResponse from(Student student) {
return new StudentResponse(
student.getAnonymousNickname(),
user.getEmail(),
user.getGender().name(),
user.getGender().ordinal(),
student.getDepartment(),
user.getName(),
user.getNickname(),
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/in/koreatech/koin/acceptance/OwnerApiTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void requestSignUpEmailVerification() {
.given()
.body("""
{
"email": "test@gmail.com"
"address": "test@gmail.com"
}
""")
.contentType(ContentType.JSON)
Expand All @@ -190,7 +190,7 @@ void requestAndVerifySign() {
.given()
.body(String.format("""
{
"email": "%s"
"address": "%s"
}
""", ownerEmail))
.contentType(ContentType.JSON)
Expand Down Expand Up @@ -223,7 +223,7 @@ void checkOwnerEventListener() {
.given()
.body("""
{
"email": "test@gmail.com"
"address": "test@gmail.com"
}
""")
.contentType(ContentType.JSON)
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/in/koreatech/koin/acceptance/UserApiTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ void studentCheckMe() {
.isEqualTo(student.getAnonymousNickname());
softly.assertThat(response.body().jsonPath().getString("email"))
.isEqualTo(user.getEmail());
softly.assertThat(response.body().jsonPath().getString("gender"))
.isEqualTo(user.getGender().name());
softly.assertThat(response.body().jsonPath().getInt("gender"))
.isEqualTo(user.getGender().ordinal());
softly.assertThat(response.body().jsonPath().getString("major"))
.isEqualTo(student.getDepartment());
softly.assertThat(response.body().jsonPath().getString("name"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.time.ZonedDateTime;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.localstack.LocalStackContainer;
import org.testcontainers.containers.localstack.LocalStackContainer.Service;
Expand All @@ -30,6 +31,7 @@
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import software.amazon.awssdk.services.s3.presigner.S3Presigner.Builder;

@Disabled
class UploadServiceTest extends AcceptanceTest {

private AmazonS3 s3Client;
Expand Down