Merge pull request #6 from neuefische/add-groseries

Add groseries
neuefische · Aug 22, 2024 · cd9cc53 · cd9cc53
2 parents a42c875 + 5126d23
commit cd9cc53
Show file tree

Hide file tree

Showing 21 changed files with 336 additions and 84 deletions.
diff --git a/.idea/sonarlint.xml b/.idea/sonarlint.xml
diff --git a/backend/src/main/java/org/example/backend/IdService.java b/backend/src/main/java/org/example/backend/IdService.java
@@ -0,0 +1,15 @@
+package org.example.backend;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+
+public class IdService {
+
+    public String randomId() {
+        return UUID.randomUUID().toString();
+    }
+}
diff --git a/backend/src/main/java/org/example/backend/NewProduct.java b/backend/src/main/java/org/example/backend/NewProduct.java
@@ -0,0 +1,9 @@
+package org.example.backend;
+
+import lombok.With;
+
+@With
+public record NewProduct(
+    String name,
+    int amount
+){}
diff --git a/backend/src/main/java/org/example/backend/ProductController.java b/backend/src/main/java/org/example/backend/ProductController.java
@@ -2,12 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import java.util.List;
+
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/products")
@@ -19,12 +15,16 @@ public List<Product> getAllGroceries() {
         return productService.findAllGroceries();
     }
 
+    @PostMapping
+    public Product addProduct(@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/main/java/org/example/backend/ProductService.java b/backend/src/main/java/org/example/backend/ProductService.java
@@ -11,6 +11,7 @@
 @Service
 public class ProductService {
     private final ProductRepository productRepository;
+    private final IdService idService;
 
     public void deletebyid(String id) {
         productRepository.deleteById(id);
@@ -21,6 +22,10 @@ public List<Product> findAllGroceries(){
         return productRepository.findAll();
     }
 
+    public Product saveProduct(NewProduct newProduct){
+        Product product = new Product(idService.randomId(), newProduct.name(), newProduct.amount());
+        return productRepository.save(product);
+    }
 
     public Product findGroceriesById(String id) {
      return productRepository.findById(id)

diff --git a/backend/src/main/resources/static/index.html b/backend/src/main/resources/static/index.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
-    <script type="module" crossorigin src="/assets/index-W6eCT1eM.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-zl8kUJ8_.css">
-  </head>
-  <body>
-    <div id="root"></div>
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Vite + React + TS</title>
+  <script type="module" crossorigin src="/assets/index-W6eCT1eM.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-zl8kUJ8_.css">
+</head>
+<body>
+<div id="root"></div>
 
-  </body>
-</html>
+</body>
+</html>
diff --git a/backend/src/test/java/org/example/backend/ProductControllerTest.java b/backend/src/test/java/org/example/backend/ProductControllerTest.java
@@ -4,12 +4,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 
 @SpringBootTest
@@ -21,8 +22,9 @@ class ProductControllerTest {
 
     @Autowired
     ProductRepository productRepository;
-    @DirtiesContext
+
     @Test
+    @DirtiesContext
     void getAllGroceries() throws Exception {
         //GIVEN
         //WHEN
@@ -42,13 +44,29 @@ void deletebyid() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.delete("/api/products/2"))
                 //Then
                 .andExpect(status().isOk());
+    }
+    @Test
+    @DirtiesContext
+    void addNewProduct() throws Exception {
+        //GIVEN
 
-
-
-
-
+        //WHEN
+      mockMvc.perform(post("/api/products")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content("""
+       {
+            "name": "Milch",
+            "amount": 1
+       }
+       """))
+        //THEN
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.id").exists())
+                .andExpect(jsonPath("$.name").value("Milch"))
+                .andExpect(jsonPath("$.amount").value(1));
     }
 
+
     @Test
     @DirtiesContext
     void getGroceryProductById() throws Exception {

diff --git a/backend/src/test/java/org/example/backend/ProductServiceTest.java b/backend/src/test/java/org/example/backend/ProductServiceTest.java
@@ -1,16 +1,18 @@
 package org.example.backend;
 
 import org.junit.jupiter.api.Test;
-
 import java.util.List;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 class ProductServiceTest {
+
+    IdService idService = mock(IdService.class);
     ProductRepository productRepository = mock(ProductRepository.class);
-    ProductService productService = new ProductService(productRepository);
+    ProductService productService = new ProductService(productRepository, idService);
+
 
     @Test
     void findAllGroceries() {
@@ -28,22 +30,37 @@ void findAllGroceries() {
         assertEquals(products, actual);
     }
     @Test
+    void addProdukt() {
+        // GIVEN
+        NewProduct newProduct = new NewProduct("Orangen", 5);
+        Product saveProduct = new Product(idService.randomId(), newProduct.name(), newProduct.amount());
+        when(productRepository.save(saveProduct)).thenReturn(saveProduct);
+        when(idService.randomId()).thenReturn(saveProduct.id());
+
+        // WHEN
+        Product actual = productService.saveProduct(newProduct);
+
+        // THEN
+        Product expected = new Product(idService.randomId(), newProduct.name(), newProduct.amount());
+        verify(productRepository).save(saveProduct);
+        assertEquals(expected, 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);
+        @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);
     }
 }
diff --git a/frontend/dist/assets/index-DO30CrK6.js b/frontend/dist/assets/index-DO30CrK6.js
diff --git a/frontend/dist/assets/index-DiwrgTda.css b/frontend/dist/assets/index-DiwrgTda.css
diff --git a/frontend/dist/vite.svg b/frontend/dist/vite.svg
diff --git a/frontend/index.html b/frontend/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Vite + React + TS</title>
+</head>
+<body>
+<div id="root"></div>
+<script type="module" src="/src/main.tsx"></script>
+</body>
+</html>
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -12,7 +12,8 @@
   "dependencies": {
     "axios": "^1.7.4",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.26.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -26,7 +26,7 @@ body{
   text-align: center;
 }
 .search-card{
-background-color: darkgray;
+  background-color: darkgray;
   padding: 1.2rem;
 }
 
@@ -99,5 +99,4 @@ background-color: darkgray;
   padding: 1rem;
   background-color: #f8f8f8;
   border-radius: 10px;
-}
-
+}
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -14,5 +14,4 @@ export default function App() {
 
         </div>
     )
-}
-
+}