Data Normalization Mapper: Enhancements to getAllItems Method

Mapper to normalize the information fetched from GeneralItem and QuantizableItem, restructuring of the 'getAllItems' method to return the normalized and mapped list, and adding a header with the attributes returned in the mapper.
Integradorl-UdeA · Apr 19, 2024 · ced21b3 · ced21b3
1 parent 5a11c01
commit ced21b3
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -78,6 +78,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20240303</version>
+		</dependency>
 		<dependency>
 			<groupId>org.jacoco</groupId>
 			<artifactId>jacoco-maven-plugin</artifactId>

diff --git a/src/main/java/com/consola/lis/configuration/OpenAPIConfig.java b/src/main/java/com/consola/lis/configuration/OpenAPIConfig.java
@@ -26,14 +26,14 @@ public OpenAPI swagger() {
                 .bearerFormat("JWT");
 
         // Define security requirement for endpoints that require Bearer token
-        SecurityRequirement securityRequirement = new SecurityRequirement()
-                .addList("bearerAuth");
+        // SecurityRequirement securityRequirement = new SecurityRequirement()
+         //       .addList("bearerAuth");
 
         // Create OpenAPI object and configure servers, info, security schemes, and security requirements
         return new OpenAPI()
                 .info(info)
-                .components(new io.swagger.v3.oas.models.Components().addSecuritySchemes("bearerAuth", securityScheme))
-                .addSecurityItem(securityRequirement);
+                .components(new io.swagger.v3.oas.models.Components().addSecuritySchemes("bearerAuth", securityScheme));
+                //.addSecurityItem(securityRequirement);
 
 
     }

diff --git a/src/main/java/com/consola/lis/controller/InventoryController.java b/src/main/java/com/consola/lis/controller/InventoryController.java
@@ -12,6 +12,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
+import java.util.Map;
 
 @Tag(name = "Manage for Inventory", description = "something")
 @RestController
@@ -50,8 +51,9 @@ public void deleteCategory(@PathVariable("itemId") String itemId){
     }
 
     @GetMapping
-    public List<Object> inventoryItems() {
-        return inventoryItemService.getAllItems();
+    public Map<String, Object> inventoryItems() {
+        System.out.println("al menos me dan click");
+        return inventoryItemService.getAllItemsMapped();
     }
 
     @GetMapping(EndpointConstant.ENDPOINT_ONE_GENERAL_ITEM)

diff --git a/src/main/java/com/consola/lis/dto/ItemInfoDTO.java b/src/main/java/com/consola/lis/dto/ItemInfoDTO.java
@@ -0,0 +1,19 @@
+package com.consola.lis.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ItemInfoDTO {
+    private String id;
+    private String state;
+    private String category;
+    private String wallet;
+    private String[] attributes;
+    private boolean quantizable;
+}
diff --git a/src/main/java/com/consola/lis/service/InventoryItemService.java b/src/main/java/com/consola/lis/service/InventoryItemService.java
@@ -1,6 +1,7 @@
 package com.consola.lis.service;
 
 
+import com.consola.lis.dto.ItemInfoDTO;
 import com.consola.lis.util.constans.Util;
 import com.consola.lis.dto.GeneralItemDTO;
 import com.consola.lis.dto.QuantizableItemDTO;
@@ -15,14 +16,17 @@
 import com.consola.lis.model.repository.CategoryRepository;
 import com.consola.lis.model.repository.GeneralItemRepository;
 import com.consola.lis.model.repository.QuantizableItemRepository;
+import com.consola.lis.util.mapper.InventoryItemMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.transaction.Transactional;
+import org.json.JSONObject;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
 
+
 @Service
 
 public class InventoryItemService {
@@ -32,6 +36,7 @@ public class InventoryItemService {
     private final QuantizableItemRepository quantizableItemRepository;
     private final CategoryRepository categoryRepository;
 
+
     private final Map<Boolean, Map<Boolean, List<String>>> validStatesMap = new HashMap<>();
 
     public InventoryItemService(ObjectMapper objectMapper,
@@ -183,17 +188,44 @@ public boolean existItem(String itemId) {
         return generalItemRepository.existsById(itemId);
     }
 
-    public List<Object> getAllItems() {
+    public Map<String, Object> getAllItemsMapped() {
+        List<ItemInfoDTO> inventoryItems = getAllItems();
+        Map<String, Object> result = new HashMap<>();
+        result.put("header", createHeader());
+        result.put("allRegisters", inventoryItems);
+        return result;
+    }
+
+    private List<String> createHeader() {
+        List<String> header = new ArrayList<>();
+        header.add("Id");
+        header.add("Estado");
+        header.add("Categoría");
+        header.add("Wallet");
+        header.add("Atributos");
+        return header;
+    }
 
+    private List<ItemInfoDTO> getAllItems() {
         List<GeneralItem> generalItems = getAllGeneralItems();
-        List<Object> inventoryItems = new ArrayList<>(generalItems);
         List<QuantizableItem> quantizableItems = getAllQuantizableItems();
-        inventoryItems.addAll(quantizableItems);
 
-        return  inventoryItems;
+        List<ItemInfoDTO> inventoryItems = new ArrayList<>();
 
-    }
+        generalItems.forEach(generalItem -> {
+            Category category = categoryRepository.findCategoryById(generalItem.getCategoryId());
+            inventoryItems.add(InventoryItemMapper.mapToItemInfoDTO(generalItem, category));
+        });
 
+        // Mapear los QuantizableItems
+        quantizableItems.forEach(quantizableItem -> {
+            GeneralItem generalItem = quantizableItem.getGeneralItem();
+            Category category = categoryRepository.findCategoryById(generalItem.getCategoryId());
+            inventoryItems.add(InventoryItemMapper.mapToItemInfoDTO(generalItem, category));
+        });
 
 
+        return inventoryItems;
+    }
+
 }
diff --git a/src/main/java/com/consola/lis/service/UserService.java b/src/main/java/com/consola/lis/service/UserService.java
@@ -2,7 +2,7 @@
 
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.UserDTO;
-import com.consola.lis.mapper.UserMapper;
+import com.consola.lis.util.mapper.UserMapper;
 import com.consola.lis.util.exception.NotExistingException;
 import com.consola.lis.jwt.JwtService;
 import com.consola.lis.model.entity.User;

diff --git a/src/main/java/com/consola/lis/util/constans/EndpointConstant.java b/src/main/java/com/consola/lis/util/constans/EndpointConstant.java
@@ -7,18 +7,18 @@ public class EndpointConstant {
 
     //Endpoints authentication
     public static final String ENDPOINT_LOGIN = "/api/console-lis/auth/login";
-    public static final String ENDPOINT_REGISTER = "/api/console-lis/admin/register";
+    public static final String ENDPOINT_REGISTER = "/api/console-lis/auth/register";
 
 
     //Endpoints Category
-    public static final String ENDPOINT_CATEGORY = "/api/console-lis/user/category";
+    public static final String ENDPOINT_CATEGORY = "/api/console-lis/auth/category";
     public static final String ENDPOINT_DELETE_CATEGORY = "/{categoryName}";
     public static final String ENDPOINT_ONE_CATEGORY = "/{categoryName}";
     public static final String ENDPOINT_ALL_NAMES_CATEGORYS = "/categoriesNames";
 
 
     //Endpoints Inventory Item
-    public static final String ENDPOINT_INVENTORY = "/api/console-lis/user/inventory";
+    public static final String ENDPOINT_INVENTORY = "/api/console-lis/auth/inventory";
 
     public static final String ENDPOINT_INVENTORY_GENERAL_ITEM = "/generalItem";
     public static final String ENDPOINT_INVENTORY_QUANTIZABLE_ITEM = "/quantizableItem";
@@ -33,7 +33,7 @@ public class EndpointConstant {
 
     //user
 
-    public static final String ENDPOINT_USER = "/api/console-lis/user";
+    public static final String ENDPOINT_USER = "/api/console-lis/auth/user";
     public static final String ENDPOINT_ONE_USER ="/{username}";
     public static final String ENDPOINT_USER_LDAP = "/ldapUser/{username}";
     public static final String ENDPOINT_DELETE_USER = "/delete/{username}";

diff --git a/src/main/java/com/consola/lis/util/mapper/InventoryItemMapper.java b/src/main/java/com/consola/lis/util/mapper/InventoryItemMapper.java
@@ -0,0 +1,34 @@
+package com.consola.lis.util.mapper;
+
+import com.consola.lis.dto.CategoryDTO;
+import com.consola.lis.dto.ItemInfoDTO;
+import com.consola.lis.dto.UserDTO;
+import com.consola.lis.model.entity.Category;
+import com.consola.lis.model.entity.GeneralItem;
+import com.consola.lis.model.entity.User;
+import org.json.JSONObject;
+
+import java.util.Set;
+
+public class InventoryItemMapper {
+    private InventoryItemMapper () {
+    }
+    public static ItemInfoDTO mapToItemInfoDTO(GeneralItem generalItem, Category category) {
+
+        return ItemInfoDTO.builder()
+                .id(generalItem.getItemId())
+                .state(String.valueOf(generalItem.getState()))
+                .category(category.getCategoryName())
+                .wallet(String.valueOf(generalItem.getWallet()).replace("_"," "))
+                .quantizable(category.getQuantizable())
+                .attributes(convertAttributes(generalItem.getAttributes()))
+                .build();
+    }
+
+
+    private static String[] convertAttributes(String attributes){
+        JSONObject jsonObject = new JSONObject(attributes);
+        Set<String> keySet = jsonObject.keySet();
+        return keySet.toArray(new String[0]);
+    }
+}
diff --git a/...va/com/consola/lis/mapper/UserMapper.java → ...m/consola/lis/util/mapper/UserMapper.java b/...va/com/consola/lis/mapper/UserMapper.java → ...m/consola/lis/util/mapper/UserMapper.java
@@ -1,4 +1,4 @@
-package com.consola.lis.mapper;
+package com.consola.lis.util.mapper;
 
 import com.consola.lis.dto.UserDTO;
 import com.consola.lis.model.entity.User;

diff --git a/src/test/java/com/consola/lis/service/UserServiceTest.java b/src/test/java/com/consola/lis/service/UserServiceTest.java
@@ -2,7 +2,6 @@
 
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.UserDTO;
-import com.consola.lis.mapper.UserMapper;
 import com.consola.lis.util.exception.NotExistingException;
 import com.consola.lis.jwt.JwtService;
 import com.consola.lis.model.entity.User;