-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
16 changed files
with
33 additions
and
65 deletions.
There are no files selected for viewing
3 changes: 0 additions & 3 deletions
3
backend/src/main/java/net/pengcook/authentication/dto/GoogleSignUpRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,5 @@ | |
|
||
String image() default "tester.jpg"; | ||
|
||
String birth() default "2000-01-01"; | ||
|
||
String region() default "KOREA"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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("[email protected]", "ela", "μλΌ", "ela.jpg", LocalDate.of(2024, 7, 22), "KOREA"); | ||
User author = new User("[email protected]", "ela", "μλΌ", "ela.jpg", "KOREA"); | ||
Recipe recipe = new Recipe(1L, "κΉμΉλ³Άμλ°₯", author, LocalTime.of(0, 30, 0), "κΉμΉλ³Άμλ°₯μ΄λ―Έμ§.jpg", 3, 2, "κΉμΉλ³Άμλ°₯ 쑰리λ²"); | ||
|
||
categoryService.saveCategories(recipe, List.of("건κ°μ", "맀μ΄μμ")); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,8 +28,8 @@ ALTER TABLE ingredient_recipe | |
SET | ||
REFERENTIAL_INTEGRITY TRUE; | ||
|
||
INSERT INTO users (email, username, nickname, image, birth, region) | ||
VALUES ('[email protected]', 'ela', 'μλΌ', 'ela.jpg', '2024-07-22', 'KOREA'); | ||
INSERT INTO users (email, username, nickname, image, region) | ||
VALUES ('[email protected]', 'ela', 'μλΌ', 'ela.jpg', 'KOREA'); | ||
|
||
INSERT INTO category (name) | ||
VALUES ('νμ'), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 ('[email protected]', 'loki', 'λ‘ν€', 'loki.jpg', '1999-08-08', 'KOREA'), | ||
('[email protected]', 'ela', 'μλΌ', 'ela.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'crocodile', 'μ μ΄', 'crocodile.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'birdsheep', 'μμ', 'birdsheep.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'pond', 'ν°λ', 'pond.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'ato', 'μν ', 'ato.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'km', 'μΌμ΄μ ', 'km.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'hadi', 'νλ', 'hadi.jpg', '2024-07-22', 'KOREA'); | ||
INSERT INTO users (email, username, nickname, image, region) | ||
VALUES ('[email protected]', 'loki', 'λ‘ν€', 'loki.jpg', 'KOREA'), | ||
('[email protected]', 'ela', 'μλΌ', 'ela.jpg', 'KOREA'), | ||
('[email protected]', 'crocodile', 'μ μ΄', 'crocodile.jpg', 'KOREA'), | ||
('[email protected]', 'birdsheep', 'μμ', 'birdsheep.jpg', 'KOREA'), | ||
('[email protected]', 'pond', 'ν°λ', 'pond.jpg', 'KOREA'), | ||
('[email protected]', 'ato', 'μν ', 'ato.jpg', 'KOREA'), | ||
('[email protected]', 'km', 'μΌμ΄μ ', 'km.jpg', 'KOREA'), | ||
('[email protected]', '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, 'κΉλ°₯ 쑰리λ²'), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 ('[email protected]', 'loki', 'λ‘ν€', 'loki.jpg', '1999-08-08', 'KOREA'), | ||
('[email protected]', 'ela', 'μλΌ', 'ela.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'crocodile', 'μ μ΄', 'crocodile.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'birdsheep', 'μμ', 'birdsheep.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'pond', 'ν°λ', 'pond.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'ato', 'μν ', 'ato.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'km', 'μΌμ΄μ ', 'km.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'hadi', 'νλ', 'hadi.jpg', '2024-07-22', 'KOREA'); | ||
INSERT INTO users (email, username, nickname, image, region) | ||
VALUES ('[email protected]', 'loki', 'λ‘ν€', 'loki.jpg', 'KOREA'), | ||
('[email protected]', 'ela', 'μλΌ', 'ela.jpg', 'KOREA'), | ||
('[email protected]', 'crocodile', 'μ μ΄', 'crocodile.jpg', 'KOREA'), | ||
('[email protected]', 'birdsheep', 'μμ', 'birdsheep.jpg', 'KOREA'), | ||
('[email protected]', 'pond', 'ν°λ', 'pond.jpg', 'KOREA'), | ||
('[email protected]', 'ato', 'μν ', 'ato.jpg', 'KOREA'), | ||
('[email protected]', 'km', 'μΌμ΄μ ', 'km.jpg', 'KOREA'), | ||
('[email protected]', 'hadi', 'νλ', 'hadi.jpg', 'KOREA'); | ||
|
||
INSERT INTO category (name) | ||
VALUES ('νμ'), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 ('[email protected]', 'loki', 'λ‘ν€', 'loki.jpg', '1999-08-08', 'KOREA'), | ||
('[email protected]', 'ela', 'μλΌ', 'ela.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'crocodile', 'μ μ΄', 'crocodile.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'birdsheep', 'μμ', 'birdsheep.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'pond', 'ν°λ', 'pond.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'ato', 'μν ', 'ato.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'km', 'μΌμ΄μ ', 'km.jpg', '2024-07-22', 'KOREA'), | ||
('[email protected]', 'hadi', 'νλ', 'hadi.jpg', '2024-07-22', 'KOREA'); | ||
INSERT INTO users (email, username, nickname, image, region) | ||
VALUES ('[email protected]', 'loki', 'λ‘ν€', 'loki.jpg', 'KOREA'), | ||
('[email protected]', 'ela', 'μλΌ', 'ela.jpg', 'KOREA'), | ||
('[email protected]', 'crocodile', 'μ μ΄', 'crocodile.jpg', 'KOREA'), | ||
('[email protected]', 'birdsheep', 'μμ', 'birdsheep.jpg', 'KOREA'), | ||
('[email protected]', 'pond', 'ν°λ', 'pond.jpg', 'KOREA'), | ||
('[email protected]', 'ato', 'μν ', 'ato.jpg', 'KOREA'), | ||
('[email protected]', 'km', 'μΌμ΄μ ', 'km.jpg', 'KOREA'), | ||
('[email protected]', 'hadi', 'νλ', 'hadi.jpg', 'KOREA'); | ||
|