Merge remote-tracking branch 'refs/remotes/origin/add-groseries' into…

… add-groseries # Conflicts: # backend/src/main/java/org/example/backend/ProductController.java # backend/src/test/java/org/example/backend/ProductControllerTest.java # backend/src/test/java/org/example/backend/ProductServiceTest.java
neuefische · Aug 22, 2024 · 4cc3140 · 4cc3140
2 parents 4b99bb9 + cd464d0
commit 4cc3140
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/backend/src/main/java/org/example/backend/ProductController.java b/backend/src/main/java/org/example/backend/ProductController.java
@@ -2,7 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 @RequiredArgsConstructor
@@ -20,6 +19,13 @@ public List<Product> getAllGroceries() {
     public Product saveProduct(@RequestBody NewProduct newProduct) {
         return productService.saveProduct(newProduct);
     }
+
+    @DeleteMapping("{id}")
+    void delete(@PathVariable String id) {
+        productService.deletebyid(id);
+    }
+
+
    @GetMapping("{id}")
     public Product getGroceryProductById(@PathVariable String id){
         return productService.findGroceriesById(id);

diff --git a/backend/src/test/java/org/example/backend/ProductControllerTest.java b/backend/src/test/java/org/example/backend/ProductControllerTest.java
@@ -45,7 +45,6 @@ void deletebyid() throws Exception {
                 //Then
                 .andExpect(status().isOk());
     }
-
     @Test
     @DirtiesContext
     void addNewProduct() throws Exception {
@@ -60,7 +59,7 @@ void addNewProduct() throws Exception {
             "amount": 1
        }
        """))
-              //THEN
+        //THEN
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.id").exists())
                 .andExpect(jsonPath("$.name").value("Milch"))

diff --git a/backend/src/test/java/org/example/backend/ProductServiceTest.java b/backend/src/test/java/org/example/backend/ProductServiceTest.java
@@ -45,16 +45,23 @@ void addProdukt() {
         verify(productRepository).save(saveProduct);
         assertEquals(expected, actual);
     }
-        @Test
-        void findGroceriesById() {
-            //GIVEN
-            String id = "4";
-            Product product = new Product("4","apple", 7);
-            when(productRepository.findById(id)).thenReturn(Optional.of(product));
-            //WHEN
-            Product actual = productService.findGroceriesById(id);
-            //THEN
-            verify(productRepository).findById(id);
-            assertEquals(product, actual);
+    @Test
+    void deleteProduct_Test() {
+        doNothing().when(productRepository).deleteById("2");
+        productService.deletebyid("2");
+        verify(productRepository).deleteById("2");
+    }
+
+    @Test
+    void findGroceriesById() {
+        //GIVEN
+        String id = "4";
+        Product product = new Product("4","apple", 7);
+        when(productRepository.findById(id)).thenReturn(Optional.of(product));
+        //WHEN
+        Product actual = productService.findGroceriesById(id);
+        //THEN
+        verify(productRepository).findById(id);
+        assertEquals(product, actual);
     }
 }