diff --git a/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpRequest.java b/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpRequest.java index 34731d74..4be80b98 100644 --- a/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpRequest.java +++ b/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpRequest.java @@ -1,14 +1,11 @@ package net.pengcook.authentication.dto; -import com.google.firebase.database.annotations.NotNull; import jakarta.validation.constraints.NotBlank; -import java.time.LocalDate; public record GoogleSignUpRequest( @NotBlank String idToken, @NotBlank String username, @NotBlank String nickname, - @NotNull LocalDate birthday, @NotBlank String country ) { } diff --git a/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpResponse.java b/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpResponse.java index 87438c69..4a1e0682 100644 --- a/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpResponse.java +++ b/backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpResponse.java @@ -8,7 +8,6 @@ public record GoogleSignUpResponse( String username, String nickname, String image, - String birthday, String country, String accessToken, String refreshToken @@ -20,7 +19,6 @@ public GoogleSignUpResponse(User user, String accessToken, String refreshToken) user.getUsername(), user.getNickname(), user.getImage(), - user.getBirth().toString(), user.getRegion(), accessToken, refreshToken diff --git a/backend/src/main/java/net/pengcook/authentication/service/LoginService.java b/backend/src/main/java/net/pengcook/authentication/service/LoginService.java index 624de70f..3aed4ca5 100644 --- a/backend/src/main/java/net/pengcook/authentication/service/LoginService.java +++ b/backend/src/main/java/net/pengcook/authentication/service/LoginService.java @@ -75,7 +75,6 @@ private User createUser(GoogleSignUpRequest googleSignUpRequest) { googleSignUpRequest.username(), googleSignUpRequest.nickname(), decodedToken.getPicture(), - googleSignUpRequest.birthday(), googleSignUpRequest.country() ); } diff --git a/backend/src/main/java/net/pengcook/user/domain/User.java b/backend/src/main/java/net/pengcook/user/domain/User.java index 5010772a..6ff50e74 100644 --- a/backend/src/main/java/net/pengcook/user/domain/User.java +++ b/backend/src/main/java/net/pengcook/user/domain/User.java @@ -6,7 +6,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; -import java.time.LocalDate; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -35,13 +34,10 @@ public class User { @Column(nullable = false) private String image; - @Column(nullable = false) - private LocalDate birth; - @Column(nullable = false) private String region; - public User(String email, String username, String nickname, String image, LocalDate birth, String region) { - this(0L, email, username, nickname, image, birth, region); + public User(String email, String username, String nickname, String image, String region) { + this(0L, email, username, nickname, image, region); } } diff --git a/backend/src/main/java/net/pengcook/user/dto/UserResponse.java b/backend/src/main/java/net/pengcook/user/dto/UserResponse.java index 7557cf0e..916f133b 100644 --- a/backend/src/main/java/net/pengcook/user/dto/UserResponse.java +++ b/backend/src/main/java/net/pengcook/user/dto/UserResponse.java @@ -1,6 +1,5 @@ package net.pengcook.user.dto; -import java.time.LocalDate; import net.pengcook.user.domain.User; public record UserResponse( @@ -9,7 +8,6 @@ public record UserResponse( String username, String nickname, String image, - LocalDate birth, String region ) { @@ -20,7 +18,6 @@ public UserResponse(User user) { user.getUsername(), user.getNickname(), user.getImage(), - user.getBirth(), user.getRegion() ); } diff --git a/backend/src/test/java/net/pengcook/authentication/annotation/WithLoginUser.java b/backend/src/test/java/net/pengcook/authentication/annotation/WithLoginUser.java index 164a4958..a4730b6e 100644 --- a/backend/src/test/java/net/pengcook/authentication/annotation/WithLoginUser.java +++ b/backend/src/test/java/net/pengcook/authentication/annotation/WithLoginUser.java @@ -17,7 +17,5 @@ String image() default "tester.jpg"; - String birth() default "2000-01-01"; - String region() default "KOREA"; } diff --git a/backend/src/test/java/net/pengcook/authentication/controller/LoginControllerTest.java b/backend/src/test/java/net/pengcook/authentication/controller/LoginControllerTest.java index d3acdfc1..b631a975 100644 --- a/backend/src/test/java/net/pengcook/authentication/controller/LoginControllerTest.java +++ b/backend/src/test/java/net/pengcook/authentication/controller/LoginControllerTest.java @@ -14,7 +14,6 @@ import com.google.firebase.auth.FirebaseToken; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import java.time.LocalDate; import java.util.regex.Pattern; import net.pengcook.RestDocsSetting; import net.pengcook.authentication.domain.JwtTokenManager; @@ -127,7 +126,6 @@ void signUpWithGoogle() throws FirebaseAuthException { idToken, "new_face", "신입", - LocalDate.of(2000, 1, 1), "KOREA" ); @@ -144,7 +142,6 @@ void signUpWithGoogle() throws FirebaseAuthException { fieldWithPath("idToken").description("Google ID Token"), fieldWithPath("username").description("사용자 아이디"), fieldWithPath("nickname").description("사용자 닉네임"), - fieldWithPath("birthday").description("생년월일"), fieldWithPath("country").description("국가") ), responseFields( @@ -153,7 +150,6 @@ void signUpWithGoogle() throws FirebaseAuthException { fieldWithPath("username").description("사용자 아이디"), fieldWithPath("nickname").description("사용자 닉네임"), fieldWithPath("image").description("사용자 프로필 이미지"), - fieldWithPath("birthday").description("사용자 생년월일"), fieldWithPath("country").description("사용자 국가"), fieldWithPath("accessToken").description("JWT Access Token"), fieldWithPath("refreshToken").description("JWT Refresh Token") @@ -179,7 +175,6 @@ void signUpWithGoogleWhenEmailAleadyRegistered() throws FirebaseAuthException { idToken, "loki", "로키", - LocalDate.of(1999, 8, 8), "KOREA" ); @@ -196,7 +191,6 @@ void signUpWithGoogleWhenEmailAleadyRegistered() throws FirebaseAuthException { fieldWithPath("idToken").description("Google ID Token"), fieldWithPath("username").description("사용자 아이디"), fieldWithPath("nickname").description("사용자 닉네임"), - fieldWithPath("birthday").description("생년월일"), fieldWithPath("country").description("국가") ) )) diff --git a/backend/src/test/java/net/pengcook/authentication/extension/LoginExtension.java b/backend/src/test/java/net/pengcook/authentication/extension/LoginExtension.java index c9922f6f..51cba9a5 100644 --- a/backend/src/test/java/net/pengcook/authentication/extension/LoginExtension.java +++ b/backend/src/test/java/net/pengcook/authentication/extension/LoginExtension.java @@ -2,7 +2,6 @@ import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; -import java.time.LocalDate; import net.pengcook.authentication.annotation.WithLoginUser; import net.pengcook.authentication.domain.JwtTokenManager; import net.pengcook.authentication.domain.TokenPayload; @@ -49,7 +48,6 @@ private User saveUser(WithLoginUser annotation, UserRepository userRepository) { annotation.username(), annotation.nickname(), annotation.image(), - LocalDate.parse(annotation.birth()), annotation.region() ); return userRepository.save(user); diff --git a/backend/src/test/java/net/pengcook/authentication/service/LoginServiceTest.java b/backend/src/test/java/net/pengcook/authentication/service/LoginServiceTest.java index 1d075770..bf3849a8 100644 --- a/backend/src/test/java/net/pengcook/authentication/service/LoginServiceTest.java +++ b/backend/src/test/java/net/pengcook/authentication/service/LoginServiceTest.java @@ -9,7 +9,6 @@ import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseAuthException; import com.google.firebase.auth.FirebaseToken; -import java.time.LocalDate; import java.util.regex.Pattern; import net.pengcook.authentication.domain.JwtTokenManager; import net.pengcook.authentication.domain.TokenPayload; @@ -91,7 +90,6 @@ void signUpWithGoogle() throws FirebaseAuthException { idToken, "new_face", "신입", - LocalDate.of(2000, 1, 1), "KOREA" ); @@ -115,7 +113,6 @@ void signUpWithGoogleWhenEmailAleadyRegistered() throws FirebaseAuthException { idToken, "loki", "로키", - LocalDate.of(1999, 8, 8), "KOREA" ); diff --git a/backend/src/test/java/net/pengcook/category/service/CategoryServiceTest.java b/backend/src/test/java/net/pengcook/category/service/CategoryServiceTest.java index 89081ca1..3bb4cfad 100644 --- a/backend/src/test/java/net/pengcook/category/service/CategoryServiceTest.java +++ b/backend/src/test/java/net/pengcook/category/service/CategoryServiceTest.java @@ -3,7 +3,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -import java.time.LocalDate; import java.time.LocalTime; import java.util.List; import net.pengcook.category.repository.CategoryRecipeRepository; @@ -36,7 +35,7 @@ class CategoryServiceTest { @Test @DisplayName("레시피의 카테고리를 저장할 수 있다.") void saveCategories() { - User author = new User("ela@pengcook.net", "ela", "엘라", "ela.jpg", LocalDate.of(2024, 7, 22), "KOREA"); + User author = new User("ela@pengcook.net", "ela", "엘라", "ela.jpg", "KOREA"); Recipe recipe = new Recipe(1L, "김치볶음밥", author, LocalTime.of(0, 30, 0), "김치볶음밥이미지.jpg", 3, 2, "김치볶음밥 조리법"); categoryService.saveCategories(recipe, List.of("건강식", "매운음식")); diff --git a/backend/src/test/java/net/pengcook/user/controller/UserControllerTest.java b/backend/src/test/java/net/pengcook/user/controller/UserControllerTest.java index 59c2887f..d7209e91 100644 --- a/backend/src/test/java/net/pengcook/user/controller/UserControllerTest.java +++ b/backend/src/test/java/net/pengcook/user/controller/UserControllerTest.java @@ -9,7 +9,6 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; -import java.time.LocalDate; import net.pengcook.RestDocsSetting; import net.pengcook.authentication.annotation.WithLoginUser; import net.pengcook.authentication.annotation.WithLoginUserTest; @@ -36,7 +35,6 @@ void getUserProfile() { "loki", "로키", "loki.jpg", - LocalDate.of(1999, 8, 8), "KOREA" ); @@ -50,7 +48,6 @@ void getUserProfile() { fieldWithPath("username").description("사용자 아이디"), fieldWithPath("nickname").description("사용자 닉네임"), fieldWithPath("image").description("사용자 프로필 이미지"), - fieldWithPath("birth").description("사용자 생년월일"), fieldWithPath("region").description("사용자 국가") ) )) diff --git a/backend/src/test/java/net/pengcook/user/service/UserServiceTest.java b/backend/src/test/java/net/pengcook/user/service/UserServiceTest.java index 26d05957..25f1b73c 100644 --- a/backend/src/test/java/net/pengcook/user/service/UserServiceTest.java +++ b/backend/src/test/java/net/pengcook/user/service/UserServiceTest.java @@ -3,7 +3,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.time.LocalDate; import java.util.NoSuchElementException; import net.pengcook.user.dto.UserResponse; import net.pengcook.user.dto.UsernameCheckResponse; @@ -37,7 +36,6 @@ void getUserById() { "loki", "로키", "loki.jpg", - LocalDate.of(1999, 8, 8), "KOREA" ); @@ -54,7 +52,7 @@ void getUserByIdWhenNotExistId() { assertThatThrownBy(() -> userService.getUserById(id)) .isInstanceOf(NoSuchElementException.class); } - + @Test @DisplayName("중복되지 않은 username을 입력하면 사용 가능하다") void checkUsername() { diff --git a/backend/src/test/resources/data/category.sql b/backend/src/test/resources/data/category.sql index 10138fce..adf7f6df 100644 --- a/backend/src/test/resources/data/category.sql +++ b/backend/src/test/resources/data/category.sql @@ -28,8 +28,8 @@ ALTER TABLE ingredient_recipe SET REFERENTIAL_INTEGRITY TRUE; -INSERT INTO users (email, username, nickname, image, birth, region) -VALUES ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', '2024-07-22', 'KOREA'); +INSERT INTO users (email, username, nickname, image, region) +VALUES ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', 'KOREA'); INSERT INTO category (name) VALUES ('한식'), diff --git a/backend/src/test/resources/data/ingredient.sql b/backend/src/test/resources/data/ingredient.sql index 5a71e00d..e0ede220 100644 --- a/backend/src/test/resources/data/ingredient.sql +++ b/backend/src/test/resources/data/ingredient.sql @@ -20,15 +20,15 @@ ALTER TABLE ingredient_recipe ALTER COLUMN id RESTART; SET REFERENTIAL_INTEGRITY TRUE; -INSERT INTO users (email, username, nickname, image, birth, region) -VALUES ('loki@pengcook.net', 'loki', '로키', 'loki.jpg', '1999-08-08', 'KOREA'), - ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', '2024-07-22', 'KOREA'), - ('crocodile@pengcook.net', 'crocodile', '악어', 'crocodile.jpg', '2024-07-22', 'KOREA'), - ('birdsheep@pengcook.net', 'birdsheep', '새양', 'birdsheep.jpg', '2024-07-22', 'KOREA'), - ('pond@pengcook.net', 'pond', '폰드', 'pond.jpg', '2024-07-22', 'KOREA'), - ('ato@pengcook.net', 'ato', '아토', 'ato.jpg', '2024-07-22', 'KOREA'), - ('km@pengcook.net', 'km', '케이엠', 'km.jpg', '2024-07-22', 'KOREA'), - ('hadi@pengcook.net', 'hadi', '하디', 'hadi.jpg', '2024-07-22', 'KOREA'); +INSERT INTO users (email, username, nickname, image, region) +VALUES ('loki@pengcook.net', 'loki', '로키', 'loki.jpg', 'KOREA'), + ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', 'KOREA'), + ('crocodile@pengcook.net', 'crocodile', '악어', 'crocodile.jpg', 'KOREA'), + ('birdsheep@pengcook.net', 'birdsheep', '새양', 'birdsheep.jpg', 'KOREA'), + ('pond@pengcook.net', 'pond', '폰드', 'pond.jpg', 'KOREA'), + ('ato@pengcook.net', 'ato', '아토', 'ato.jpg', 'KOREA'), + ('km@pengcook.net', 'km', '케이엠', 'km.jpg', 'KOREA'), + ('hadi@pengcook.net', 'hadi', '하디', 'hadi.jpg', 'KOREA'); INSERT INTO recipe (title, author_id, cooking_time, thumbnail, difficulty, like_count, description) VALUES ('김밥', 1, '01:00:00', '김밥이미지.jpg', 8, 1, '김밥 조리법'), diff --git a/backend/src/test/resources/data/recipe.sql b/backend/src/test/resources/data/recipe.sql index 0731e34b..dc4814f7 100644 --- a/backend/src/test/resources/data/recipe.sql +++ b/backend/src/test/resources/data/recipe.sql @@ -23,15 +23,15 @@ ALTER TABLE recipe_step ALTER COLUMN id RESTART; SET REFERENTIAL_INTEGRITY TRUE; -INSERT INTO users (email, username, nickname, image, birth, region) -VALUES ('loki@pengcook.net', 'loki', '로키', 'loki.jpg', '1999-08-08', 'KOREA'), - ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', '2024-07-22', 'KOREA'), - ('crocodile@pengcook.net', 'crocodile', '악어', 'crocodile.jpg', '2024-07-22', 'KOREA'), - ('birdsheep@pengcook.net', 'birdsheep', '새양', 'birdsheep.jpg', '2024-07-22', 'KOREA'), - ('pond@pengcook.net', 'pond', '폰드', 'pond.jpg', '2024-07-22', 'KOREA'), - ('ato@pengcook.net', 'ato', '아토', 'ato.jpg', '2024-07-22', 'KOREA'), - ('km@pengcook.net', 'km', '케이엠', 'km.jpg', '2024-07-22', 'KOREA'), - ('hadi@pengcook.net', 'hadi', '하디', 'hadi.jpg', '2024-07-22', 'KOREA'); +INSERT INTO users (email, username, nickname, image, region) +VALUES ('loki@pengcook.net', 'loki', '로키', 'loki.jpg', 'KOREA'), + ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', 'KOREA'), + ('crocodile@pengcook.net', 'crocodile', '악어', 'crocodile.jpg', 'KOREA'), + ('birdsheep@pengcook.net', 'birdsheep', '새양', 'birdsheep.jpg', 'KOREA'), + ('pond@pengcook.net', 'pond', '폰드', 'pond.jpg', 'KOREA'), + ('ato@pengcook.net', 'ato', '아토', 'ato.jpg', 'KOREA'), + ('km@pengcook.net', 'km', '케이엠', 'km.jpg', 'KOREA'), + ('hadi@pengcook.net', 'hadi', '하디', 'hadi.jpg', 'KOREA'); INSERT INTO category (name) VALUES ('한식'), diff --git a/backend/src/test/resources/data/users.sql b/backend/src/test/resources/data/users.sql index 7cf47840..d55bc0d8 100644 --- a/backend/src/test/resources/data/users.sql +++ b/backend/src/test/resources/data/users.sql @@ -3,13 +3,13 @@ TRUNCATE TABLE users; ALTER TABLE users ALTER COLUMN id RESTART WITH 1; SET REFERENTIAL_INTEGRITY TRUE; -INSERT INTO users (email, username, nickname, image, birth, region) -VALUES ('loki@pengcook.net', 'loki', '로키', 'loki.jpg', '1999-08-08', 'KOREA'), - ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', '2024-07-22', 'KOREA'), - ('crocodile@pengcook.net', 'crocodile', '악어', 'crocodile.jpg', '2024-07-22', 'KOREA'), - ('birdsheep@pengcook.net', 'birdsheep', '새양', 'birdsheep.jpg', '2024-07-22', 'KOREA'), - ('pond@pengcook.net', 'pond', '폰드', 'pond.jpg', '2024-07-22', 'KOREA'), - ('ato@pengcook.net', 'ato', '아토', 'ato.jpg', '2024-07-22', 'KOREA'), - ('km@pengcook.net', 'km', '케이엠', 'km.jpg', '2024-07-22', 'KOREA'), - ('hadi@pengcook.net', 'hadi', '하디', 'hadi.jpg', '2024-07-22', 'KOREA'); +INSERT INTO users (email, username, nickname, image, region) +VALUES ('loki@pengcook.net', 'loki', '로키', 'loki.jpg', 'KOREA'), + ('ela@pengcook.net', 'ela', '엘라', 'ela.jpg', 'KOREA'), + ('crocodile@pengcook.net', 'crocodile', '악어', 'crocodile.jpg', 'KOREA'), + ('birdsheep@pengcook.net', 'birdsheep', '새양', 'birdsheep.jpg', 'KOREA'), + ('pond@pengcook.net', 'pond', '폰드', 'pond.jpg', 'KOREA'), + ('ato@pengcook.net', 'ato', '아토', 'ato.jpg', 'KOREA'), + ('km@pengcook.net', 'km', '케이엠', 'km.jpg', 'KOREA'), + ('hadi@pengcook.net', 'hadi', '하디', 'hadi.jpg', 'KOREA');