diff --git a/src/main/java/app/mealsmadeeasy/api/MealsMadeEasyApiApplication.java b/src/main/java/app/mealsmadeeasy/api/MealsMadeEasyApiApplication.java index 0c27b5e..0b49bc5 100644 --- a/src/main/java/app/mealsmadeeasy/api/MealsMadeEasyApiApplication.java +++ b/src/main/java/app/mealsmadeeasy/api/MealsMadeEasyApiApplication.java @@ -1,5 +1,8 @@ package app.mealsmadeeasy.api; +import app.mealsmadeeasy.api.recipe.Recipe; +import app.mealsmadeeasy.api.recipe.RecipeService; +import app.mealsmadeeasy.api.user.User; import app.mealsmadeeasy.api.user.UserService; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -16,15 +19,23 @@ public class MealsMadeEasyApiApplication { } private final UserService userService; + private final RecipeService recipeService; - public MealsMadeEasyApiApplication(UserService userService) { + public MealsMadeEasyApiApplication(UserService userService, RecipeService recipeService) { this.userService = userService; - } + this.recipeService = recipeService; + } @Bean - public CommandLineRunner addTestUser() { + public CommandLineRunner addTestData() { return args -> { - this.userService.createUser("test", "test@test.com", "test", Set.of()); + final User testUser = this.userService.createUser( + "test", "test@test.com", "test", Set.of() + ); + final Recipe recipe = this.recipeService.create(testUser, "Test Recipe", "Hello, World!"); + this.recipeService.setPublic(recipe, testUser, true); + System.out.println("Created " + testUser); + System.out.println("Created " + recipe); }; } diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserEntity.java b/src/main/java/app/mealsmadeeasy/api/user/UserEntity.java index c9e2d2d..0951c0e 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/UserEntity.java +++ b/src/main/java/app/mealsmadeeasy/api/user/UserEntity.java @@ -177,7 +177,7 @@ public final class UserEntity implements User { @Override public String toString() { - return "User(" + this.id + ", " + this.username + ", " + this.email + ")"; + return "UserEntity(" + this.id + ", " + this.username + ", " + this.email + ")"; } } diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserRepository.java b/src/main/java/app/mealsmadeeasy/api/user/UserRepository.java index 6e11353..4ffd9b4 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/UserRepository.java +++ b/src/main/java/app/mealsmadeeasy/api/user/UserRepository.java @@ -6,6 +6,7 @@ import java.util.Optional; public interface UserRepository extends JpaRepository { Optional findByUsername(String username); + UserEntity getByUsername(String username); boolean existsByUsername(String username); boolean existsByEmail(String email); void deleteByUsername(String username); diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserService.java b/src/main/java/app/mealsmadeeasy/api/user/UserService.java index 323b7bd..6109050 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/UserService.java +++ b/src/main/java/app/mealsmadeeasy/api/user/UserService.java @@ -11,6 +11,8 @@ public interface UserService { return this.createUser(username, email, rawPassword, Set.of()); } + User getUser(String username); + User updateUser(User user); void deleteUser(User user); void deleteUser(String username); diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java b/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java index b00ad08..db0a388 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java +++ b/src/main/java/app/mealsmadeeasy/api/user/UserServiceImpl.java @@ -40,6 +40,11 @@ public final class UserServiceImpl implements UserService { return this.userRepository.save(draft); } + @Override + public User getUser(String username) { + return this.userRepository.getByUsername(username); + } + @Override public User updateUser(User user) { return this.userRepository.save((UserEntity) user);