diff --git a/api/src/main/java/fr/gameovergne/api/controller/app/BrandController.java b/api/src/main/java/fr/gameovergne/api/controller/app/BrandController.java index ad0a1a4..1327003 100644 --- a/api/src/main/java/fr/gameovergne/api/controller/app/BrandController.java +++ b/api/src/main/java/fr/gameovergne/api/controller/app/BrandController.java @@ -25,8 +25,11 @@ public class BrandController { } @GetMapping - public List getAllBrands() { - return brandService.getAllBrands(); + public List getAllBrands() { + return brandService.getAllBrands() + .stream() + .map(brandMapper::toDto) + .toList(); } @GetMapping("/{id}") diff --git a/api/src/main/java/fr/gameovergne/api/controller/app/CategoryController.java b/api/src/main/java/fr/gameovergne/api/controller/app/CategoryController.java index 9b9757a..707fafa 100644 --- a/api/src/main/java/fr/gameovergne/api/controller/app/CategoryController.java +++ b/api/src/main/java/fr/gameovergne/api/controller/app/CategoryController.java @@ -24,8 +24,11 @@ public class CategoryController { } @GetMapping - public List getAllCategories() { - return categoryService.getAllCategories(); + public List getAllCategories() { + return categoryService.getAllCategories() + .stream() + .map(categoryMapper::toDto) + .toList(); } @GetMapping("/{id}") diff --git a/api/src/main/java/fr/gameovergne/api/dto/app/BrandDTO.java b/api/src/main/java/fr/gameovergne/api/dto/app/BrandDTO.java index 1092ce5..f9a0573 100644 --- a/api/src/main/java/fr/gameovergne/api/dto/app/BrandDTO.java +++ b/api/src/main/java/fr/gameovergne/api/dto/app/BrandDTO.java @@ -10,6 +10,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class BrandDTO { + @JsonProperty("id") + private Long id; + @JsonProperty("name") private String name; } diff --git a/api/src/main/java/fr/gameovergne/api/dto/app/CategoryDTO.java b/api/src/main/java/fr/gameovergne/api/dto/app/CategoryDTO.java index f1b685f..36bc5da 100644 --- a/api/src/main/java/fr/gameovergne/api/dto/app/CategoryDTO.java +++ b/api/src/main/java/fr/gameovergne/api/dto/app/CategoryDTO.java @@ -10,6 +10,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class CategoryDTO { + @JsonProperty("id") + private Long id; + @JsonProperty("name") private String name; } diff --git a/api/src/main/java/fr/gameovergne/api/dto/app/PlatformDTO.java b/api/src/main/java/fr/gameovergne/api/dto/app/PlatformDTO.java index 1a66208..20a77e3 100644 --- a/api/src/main/java/fr/gameovergne/api/dto/app/PlatformDTO.java +++ b/api/src/main/java/fr/gameovergne/api/dto/app/PlatformDTO.java @@ -10,6 +10,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class PlatformDTO { + @JsonProperty("id") + private Long id; + @JsonProperty("name") private String name; diff --git a/api/src/main/java/fr/gameovergne/api/mapper/app/BrandMapper.java b/api/src/main/java/fr/gameovergne/api/mapper/app/BrandMapper.java index eebf800..fd3f3d5 100644 --- a/api/src/main/java/fr/gameovergne/api/mapper/app/BrandMapper.java +++ b/api/src/main/java/fr/gameovergne/api/mapper/app/BrandMapper.java @@ -10,6 +10,7 @@ public class BrandMapper { public Brand fromDto(BrandDTO brandDTO) { if (brandDTO == null) return null; Brand brand = new Brand(); + brand.setId(brandDTO.getId()); brand.setName(brandDTO.getName()); return brand; } @@ -17,6 +18,7 @@ public class BrandMapper { public BrandDTO toDto(Brand brand) { if (brand == null) return null; BrandDTO brandDTO = new BrandDTO(); + brandDTO.setId(brand.getId()); brandDTO.setName(brand.getName()); return brandDTO; } diff --git a/api/src/main/java/fr/gameovergne/api/mapper/app/CategoryMapper.java b/api/src/main/java/fr/gameovergne/api/mapper/app/CategoryMapper.java index 5c518cf..7ee803f 100644 --- a/api/src/main/java/fr/gameovergne/api/mapper/app/CategoryMapper.java +++ b/api/src/main/java/fr/gameovergne/api/mapper/app/CategoryMapper.java @@ -10,6 +10,7 @@ public class CategoryMapper { public Category fromDto(CategoryDTO categoryDTO) { if (categoryDTO == null) return null; Category category = new Category(); + category.setId(categoryDTO.getId()); category.setName(categoryDTO.getName()); return category; } @@ -17,6 +18,7 @@ public class CategoryMapper { public CategoryDTO toDto(Category category) { if (category == null) return null; CategoryDTO categoryDTO = new CategoryDTO(); + categoryDTO.setId(category.getId()); categoryDTO.setName(category.getName()); return categoryDTO; } diff --git a/api/src/main/java/fr/gameovergne/api/mapper/app/PlatformMapper.java b/api/src/main/java/fr/gameovergne/api/mapper/app/PlatformMapper.java index de1680c..ccd3481 100644 --- a/api/src/main/java/fr/gameovergne/api/mapper/app/PlatformMapper.java +++ b/api/src/main/java/fr/gameovergne/api/mapper/app/PlatformMapper.java @@ -18,6 +18,7 @@ public class PlatformMapper { public Platform fromDto(PlatformDTO platformDTO) { if (platformDTO == null) return null; Platform platform = new Platform(); + platform.setId(platformDTO.getId()); platform.setName(platformDTO.getName()); if (platformDTO.getBrandDTO() != null && platformDTO.getBrandDTO().getName() != null) { @@ -31,9 +32,10 @@ public class PlatformMapper { public PlatformDTO toDto(Platform platform) { if (platform == null) return null; PlatformDTO platformDTO = new PlatformDTO(); + platformDTO.setId(platform.getId()); platformDTO.setName(platform.getName()); if (platform.getBrand() != null) { - platformDTO.setBrandDTO(new BrandDTO(platform.getBrand().getName())); + platformDTO.setBrandDTO(new BrandDTO(platform.getBrand().getId(), platform.getBrand().getName())); } else { platformDTO.setBrandDTO(null); } diff --git a/api/src/main/java/fr/gameovergne/api/mapper/app/ProductMapper.java b/api/src/main/java/fr/gameovergne/api/mapper/app/ProductMapper.java index 91a8ae9..bd767d3 100644 --- a/api/src/main/java/fr/gameovergne/api/mapper/app/ProductMapper.java +++ b/api/src/main/java/fr/gameovergne/api/mapper/app/ProductMapper.java @@ -90,7 +90,7 @@ public class ProductMapper { productDTO.setManualIncluded(product.isManualIncluded()); if (product.getCategory() != null) { - productDTO.setCategoryDTO(new CategoryDTO(product.getCategory().getName())); + productDTO.setCategoryDTO(new CategoryDTO(product.getCategory().getId(), product.getCategory().getName())); } else { productDTO.setCategoryDTO(null); } @@ -101,7 +101,7 @@ public class ProductMapper { platformDTO.setName(platform.getName()); if (platform.getBrand() != null) { - platformDTO.setBrandDTO(new BrandDTO(platform.getBrand().getName())); + platformDTO.setBrandDTO(new BrandDTO(platform.getBrand().getId(), platform.getBrand().getName())); } else { platformDTO.setBrandDTO(null); }