Skip to content
Snippets Groups Projects
Commit 18dbcf41 authored by Birk Øvstetun Narvhus's avatar Birk Øvstetun Narvhus
Browse files

Merge branch 'feature/59-change-existing-repositories-to-jpa' into 'main'

change to extend JpaRepository

See merge request idatt2106-v23-03/backend!28
parents a1109be6 cfcc13b1
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,9 @@ package ntnu.idatt2016.v233.SmartMat.repository; ...@@ -3,7 +3,9 @@ package ntnu.idatt2016.v233.SmartMat.repository;
import ntnu.idatt2016.v233.SmartMat.entity.Allergy; import ntnu.idatt2016.v233.SmartMat.entity.Allergy;
import java.util.List; import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
/** /**
* Repository for allergies * Repository for allergies
...@@ -12,13 +14,8 @@ import java.util.Optional; ...@@ -12,13 +14,8 @@ import java.util.Optional;
* @version 1.0 * @version 1.0
* @since 04.04.2023 * @since 04.04.2023
*/ */
public interface AllergyRepository { @Repository
/** public interface AllergyRepository extends JpaRepository<Allergy, String> {
* Saves a allergy to the database
*
* @param allergy Allergy to save
*/
Allergy save (Allergy allergy);
/** /**
* Gets an allergy by name * Gets an allergy by name
...@@ -26,21 +23,6 @@ public interface AllergyRepository { ...@@ -26,21 +23,6 @@ public interface AllergyRepository {
* @param name the name of the allergy * @param name the name of the allergy
* @return an optional containing the Allergy if it exists * @return an optional containing the Allergy if it exists
*/ */
Optional<Allergy> getByName(String name); List<Allergy> findByName(String name);
/**
* Gets all allergies
*
* @return an optional containing a list of all allergies
*/
Optional<List<Allergy>> getAll();
/**
* Deletes an allergy by its name
*
* @param name the name of the allergy
*/
void deleteById(String name);
} }
...@@ -2,30 +2,19 @@ package ntnu.idatt2016.v233.SmartMat.repository; ...@@ -2,30 +2,19 @@ package ntnu.idatt2016.v233.SmartMat.repository;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product; import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
/** /**
* Repository for Products * Repository for Products
* @author Birk * @author Birk & Stian
* @version 1.0 * @version 1.0
* @since 04.04.2023 * @since 19.04.2023
*/ */
public interface ProductRepository { @Repository
/** public interface ProductRepository extends JpaRepository<Product, Long> {
* Saves a Product to the database
*
* @param product Product to save
*/
Product save (Product product);
/**
* Gets a Product by its ID
*
* @param id the ID of the product
* @return an optional containing the product if it exists
*/
Optional<Product> getById(int id);
/** /**
* Gets a Product by name * Gets a Product by name
...@@ -33,21 +22,4 @@ public interface ProductRepository { ...@@ -33,21 +22,4 @@ public interface ProductRepository {
* @param id the ID of the group * @param id the ID of the group
* @return an optional containing the product if it exists * @return an optional containing the product if it exists
*/ */
Optional<Product> getByProductName(String name); Optional<Product> getByProductName(String name);}
/**
* Gets all Products
*
* @return an optional containing a list of all products
*/
Optional<List<Product>> getAll();
/**
* Deletes a product by its ID
*
* @param id the ID of the Product
*/
void deleteById(int id);
}
package ntnu.idatt2016.v233.SmartMat.repository; package ntnu.idatt2016.v233.SmartMat.repository;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import ntnu.idatt2016.v233.SmartMat.entity.Recipe; import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
...@@ -11,22 +10,8 @@ import ntnu.idatt2016.v233.SmartMat.entity.Recipe; ...@@ -11,22 +10,8 @@ import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
* @author Stian Lyng * @author Stian Lyng
* @version 1.0 * @version 1.0
*/ */
public interface RecipeRepository { @Repository
public interface RecipeRepository extends JpaRepository<Recipe, Long> {
/**
* Saves a recipe to the database
*
* @param recipe the recipe to save
*/
Recipe save (Recipe recipe);
/**
* Gets a recipe by its ID
*
* @param id the ID of the recipe
* @return an optional containing the recipe if it exists
*/
Optional<Recipe> getById(long id);
/** /**
* Gets a recipe by its name * Gets a recipe by its name
...@@ -35,18 +20,4 @@ public interface RecipeRepository { ...@@ -35,18 +20,4 @@ public interface RecipeRepository {
*/ */
Optional<Recipe> getByName(String name); Optional<Recipe> getByName(String name);
/**
* Gets all recipes
*
* @return an optional containing a list of all recipes
*/
Optional<List<Recipe>> getAll();
/**
* Deletes a recipe by its ID
*
* @param id the ID of the recipe
*/
void deleteById(int id);
} }
...@@ -12,23 +12,9 @@ import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList; ...@@ -12,23 +12,9 @@ import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
* @version 1.0 * @version 1.0
* *
*/ */
public interface ShoppingListRepository { @Repository
public interface ShoppingListRepository extends JpaRepository<ShoppingList, Long>{
/**
* Saves a shopping list to the database
*
* @param shoppingList the shopping list to save
*/
ShoppingList save (ShoppingList shoppingList);
/**
* Gets a shopping list by its ID
*
* @param id the ID of the shopping list
* @return an optional containing the shopping list if it exists
*/
Optional<ShoppingList> getById(int id);
/** /**
* Gets a shopping list by its group ID * Gets a shopping list by its group ID
* *
...@@ -36,14 +22,7 @@ public interface ShoppingListRepository { ...@@ -36,14 +22,7 @@ public interface ShoppingListRepository {
* @return an optional containing the shopping list if it exists * @return an optional containing the shopping list if it exists
*/ */
Optional<ShoppingList> getByGroupID(int id); Optional<ShoppingList> getByGroupID(int id);
/**
* Gets all shopping lists
*
* @return an optional containing a list of all shopping lists
*/
Optional<List<ShoppingList>> getAll();
/** /**
* Gets all shopping lists by group ID * Gets all shopping lists by group ID
* *
...@@ -51,12 +30,5 @@ public interface ShoppingListRepository { ...@@ -51,12 +30,5 @@ public interface ShoppingListRepository {
* @return an optional containing a list of all shopping lists in the group * @return an optional containing a list of all shopping lists in the group
*/ */
Optional<List<ShoppingList>> getAllByGroupID(int id); Optional<List<ShoppingList>> getAllByGroupID(int id);
/**
* Deletes a shopping list by its ID
*
* @param id the ID of the shopping list
*/
void deleteById(int id);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment