Merge pull request feat/mappers

Data Normalization Mapper

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>

src/main/java/com/consola/lis/configuration/OpenAPIConfig.java

@@ -1,7 +1,6 @@
 package com.consola.lis.configuration;
 
 
-import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
@@ -26,14 +25,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);
 
 
     }

src/main/java/com/consola/lis/controller/CategoryController.java

@@ -1,7 +1,7 @@
 package com.consola.lis.controller;
 
 
-import com.consola.lis.constans.EndpointConstant;
+import com.consola.lis.util.constans.EndpointConstant;
 import com.consola.lis.dto.CategoryDTO;
 import com.consola.lis.model.entity.Category;
 import com.consola.lis.service.CategoryService;

src/main/java/com/consola/lis/controller/ControllerAdvice.java

@@ -1,7 +1,7 @@
 package com.consola.lis.controller;
 
 import com.consola.lis.dto.ErrorDTO;
-import com.consola.lis.exception.*;
+import com.consola.lis.util.exception.*;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

src/main/java/com/consola/lis/controller/InventoryController.java

@@ -1,6 +1,6 @@
 package com.consola.lis.controller;
 
-import com.consola.lis.constans.EndpointConstant;
+import com.consola.lis.util.constans.EndpointConstant;
 import com.consola.lis.dto.GeneralItemDTO;
 import com.consola.lis.dto.QuantizableItemDTO;
 import com.consola.lis.model.entity.GeneralItem;
@@ -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)

src/main/java/com/consola/lis/controller/LoginRequestController.java

@@ -1,6 +1,6 @@
 package com.consola.lis.controller;
 
-import com.consola.lis.constans.EndpointConstant;
+import com.consola.lis.util.constans.EndpointConstant;
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.LoginRequestDTO;
 import com.consola.lis.service.LoginService;

src/main/java/com/consola/lis/controller/RegisterRequestController.java

@@ -1,7 +1,7 @@
 package com.consola.lis.controller;
 
 
-import com.consola.lis.constans.EndpointConstant;
+import com.consola.lis.util.constans.EndpointConstant;
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.RegisterRequestDTO;
 import com.consola.lis.service.RegisterService;

src/main/java/com/consola/lis/controller/UserController.java

@@ -1,7 +1,7 @@
 package com.consola.lis.controller;
 
 
-import com.consola.lis.constans.EndpointConstant;
+import com.consola.lis.util.constans.EndpointConstant;
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.UserDTO;
 import com.consola.lis.model.entity.User;
@@ -21,24 +21,24 @@
 public class UserController {
 
     private final UserService userService;
-    @GetMapping("/{userName}")
-    public User oneUser(@PathVariable("userName") String userId){
-        return userService.getUser(userId);
+    @GetMapping(EndpointConstant.ENDPOINT_ONE_USER)
+    public ResponseEntity<UserDTO> oneUser(@PathVariable("username") String userId){
+        return ResponseEntity.ok(userService.getUser(userId));
     }
 
 
     @Operation(summary = "This method is used to login the options valid are ADMIN, AUXPROG, AUXADMI")
-    @PatchMapping("/role/{username}")
+    @PatchMapping(EndpointConstant.ENDPOINT_CHANGE_ROLE_USER)
     public ResponseEntity<AuthResponseDTO> changeRole(@PathVariable("username") String username, @RequestBody UserRole userRole){
         return ResponseEntity.ok(userService.changeUserRole(username, userRole));
     }
 
-    @GetMapping("/ldapUser/{username}")
+    @GetMapping(EndpointConstant.ENDPOINT_USER_LDAP)
     public ResponseEntity<UserDTO> userLDAP(@PathVariable("username") String username){
         return ResponseEntity.ok(userService.getUserLDAP(username));
     }
 
-    @DeleteMapping("/{username}")
+    @DeleteMapping(EndpointConstant.ENDPOINT_DELETE_USER)
     public void deleteUser(@PathVariable("username") String username){
          userService.deleteUser(username);
     }

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;
+}

src/main/java/com/consola/lis/jwt/JwtAuthenticationFilter.java

@@ -1,6 +1,6 @@
 package com.consola.lis.jwt;
 
-import com.consola.lis.exception.JwtExpiredException;
+import com.consola.lis.util.exception.JwtExpiredException;
 import io.jsonwebtoken.ExpiredJwtException;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

src/main/java/com/consola/lis/service/CategoryService.java

@@ -2,8 +2,8 @@
 
 
 import com.consola.lis.dto.CategoryDTO;
-import com.consola.lis.exception.AlreadyExistsException;
-import com.consola.lis.exception.NotExistingException;
+import com.consola.lis.util.exception.AlreadyExistsException;
+import com.consola.lis.util.exception.NotExistingException;
 import com.consola.lis.model.entity.Category;
 import com.consola.lis.model.repository.CategoryRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;

src/main/java/com/consola/lis/service/InventoryItemService.java

@@ -1,12 +1,13 @@
 package com.consola.lis.service;
 
 
-import com.consola.lis.constans.Util;
+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;
-import com.consola.lis.exception.AlreadyExistsException;
-import com.consola.lis.exception.IllegalParameterInRequest;
-import com.consola.lis.exception.NotExistingException;
+import com.consola.lis.util.exception.AlreadyExistsException;
+import com.consola.lis.util.exception.IllegalParameterInRequest;
+import com.consola.lis.util.exception.NotExistingException;
 import com.consola.lis.model.entity.Category;
 import com.consola.lis.model.entity.GeneralItem;
 import com.consola.lis.model.entity.QuantizableItem;
@@ -15,6 +16,7 @@
 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;
@@ -23,6 +25,7 @@
 
 import java.util.*;
 
+
 @Service
 
 public class InventoryItemService {
@@ -32,6 +35,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 +187,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;
+    }
+
 }

src/main/java/com/consola/lis/service/LoginService.java

@@ -2,7 +2,7 @@
 
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.LoginRequestDTO;
-import com.consola.lis.exception.UserAuthenticationException;
+import com.consola.lis.util.exception.UserAuthenticationException;
 import com.consola.lis.jwt.JwtService;
 import com.consola.lis.model.entity.User;
 import com.consola.lis.model.repository.UserRepository;

src/main/java/com/consola/lis/service/RegisterService.java

@@ -2,7 +2,7 @@
 
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.RegisterRequestDTO;
-import com.consola.lis.exception.AlreadyExistsException;
+import com.consola.lis.util.exception.AlreadyExistsException;
 import com.consola.lis.jwt.JwtService;
 import com.consola.lis.model.entity.User;
 import com.consola.lis.model.repository.UserRepository;

src/main/java/com/consola/lis/service/UserService.java

@@ -2,7 +2,8 @@
 
 import com.consola.lis.dto.AuthResponseDTO;
 import com.consola.lis.dto.UserDTO;
-import com.consola.lis.exception.NotExistingException;
+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;
 import com.consola.lis.model.enums.UserRole;
@@ -25,13 +26,12 @@ public class UserService {
     public final PasswordEncoder passwordEncoder;
     public final JwtService jwtService;
 
-    public User getUser(String username) {
+
+    public UserDTO getUser(String username) {
         Optional<User> user = userRepository.findByUsername(username);
         if (user.isEmpty()) {
             throw new NotExistingException("404", HttpStatus.NOT_FOUND, "the category whit id " + username + " not exist ");
-        } else {
-            return user.get();
-        }
+        } else return UserMapper.mapToUserDTO(user.get());
     }
 
 

src/main/java/com/consola/lis/constans/EndpointConstant.java → src/main/java/com/consola/lis/util/constans/EndpointConstant.java

@@ -1,4 +1,4 @@
-package com.consola.lis.constans;
+package com.consola.lis.util.constans;
 
 import lombok.experimental.UtilityClass;
 
@@ -14,7 +14,7 @@ public class EndpointConstant {
     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";
+    public static final String ENDPOINT_ALL_NAMES_CATEGORYS = "/categoriesNames";
 
 
     //Endpoints Inventory Item
@@ -34,6 +34,14 @@ public class EndpointConstant {
     //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}";
+    public static final String ENDPOINT_CHANGE_ROLE_USER = "/role/{username}";
+
+
+
+
 
 
 

src/main/java/com/consola/lis/constans/Util.java → src/main/java/com/consola/lis/util/constans/Util.java

@@ -1,4 +1,4 @@
-package com.consola.lis.constans;
+package com.consola.lis.util.constans;
 
 import lombok.experimental.UtilityClass;
 

src/main/java/com/consola/lis/exception/AlreadyExistsException.java → src/main/java/com/consola/lis/util/exception/AlreadyExistsException.java

@@ -1,4 +1,4 @@
-package com.consola.lis.exception;
+package com.consola.lis.util.exception;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/consola/lis/exception/IllegalParameterInRequest.java → src/main/java/com/consola/lis/util/exception/IllegalParameterInRequest.java

@@ -1,4 +1,4 @@
-package com.consola.lis.exception;
+package com.consola.lis.util.exception;
 
 
 import lombok.Data;

src/main/java/com/consola/lis/exception/JwtExpiredException.java → src/main/java/com/consola/lis/util/exception/JwtExpiredException.java

@@ -1,4 +1,4 @@
-package com.consola.lis.exception;
+package com.consola.lis.util.exception;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/consola/lis/exception/NotExistingException.java → src/main/java/com/consola/lis/util/exception/NotExistingException.java

@@ -1,4 +1,4 @@
-package com.consola.lis.exception;
+package com.consola.lis.util.exception;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;