Merge branch 'develop' of ssh://gitea.gofwd.group:2225/Forward_Group/ballistic-builder-spring into develop

src/main/java/group/goforward/battlbuilder/config/CacheConfig.java

@@ -13,7 +13,7 @@ public class CacheConfig {
     @Bean
     public CacheManager cacheManager() {
         // Must match the @Cacheable value(s) used in controllers/services.
-        // ProductV1Controller uses: "gunbuilderProductsV1"
+        // ProductController uses: "gunbuilderProductsV1"
         return new ConcurrentMapCacheManager(
                 "gunbuilderProductsV1",
                 "gunbuilderProducts" // keep if anything else still references it

src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java

@@ -1,35 +1,113 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controllers.api.v1;
-
+
-import group.goforward.battlbuilder.mapper.BuildMapper;
+import group.goforward.battlbuilder.mapper.BuildMapper;
-import group.goforward.battlbuilder.model.Build;
+import group.goforward.battlbuilder.model.Build;
-import group.goforward.battlbuilder.repos.build.BuildRepository;
+import group.goforward.battlbuilder.repos.build.BuildRepository;
-import group.goforward.battlbuilder.web.dto.build.BuildDto;
+import group.goforward.battlbuilder.services.BuildService;
-import org.springframework.beans.factory.annotation.Autowired;
+import group.goforward.battlbuilder.web.dto.build.BuildDto;
-import org.springframework.cache.annotation.Cacheable;
+import group.goforward.battlbuilder.web.dto.build.BuildFeedCardDto;
-import org.springframework.http.ResponseEntity;
+import group.goforward.battlbuilder.web.dto.build.BuildSummaryDto;
-import org.springframework.web.bind.annotation.*;
+import group.goforward.battlbuilder.web.dto.mapping.UpdateBuildRequestDto;
-
+import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
+import org.springframework.http.HttpStatus;
-
+import org.springframework.http.ResponseEntity;
-@RestController
+import org.springframework.web.bind.annotation.*;
-@RequestMapping({"/api/builds", "/api/v1fix/builds"})
+
-public class BuildController {
+import java.util.List;
-    @Autowired
+import java.util.UUID;
-    private BuildRepository repo;
+
-   // @Autowired
+@CrossOrigin
-    //  private BuildsService service;
+@RestController
-    //@Cacheable(value="getAllBuilds")
+@RequestMapping("/api/v1/builds")
-    @GetMapping("/all")
+public class BuildController {
-    public ResponseEntity<List<BuildDto>> getAll() {
+    @Autowired
-        List<Build> builds = repo.findAll();
+    private BuildRepository repo;
-        return ResponseEntity.ok(BuildMapper.toDtoList(builds));
+    private final BuildService buildService;
-    }
+
-
+    public BuildController(BuildService buildService) {
-    @GetMapping("/{id}")
+        this.buildService = buildService;
-    public ResponseEntity<BuildDto> getAllBuildsById(@PathVariable Integer id) {
+    }
-        return repo.findById(id)
+
-                .map(build -> ResponseEntity.ok(BuildMapper.toDto(build)))
+    /**
-                .orElse(ResponseEntity.notFound().build());
+     * Public builds feed for /builds page.
-    }
+     * GET /api/v1/builds?limit=50
-
+     */
-}
+    @GetMapping
+    public ResponseEntity<List<BuildFeedCardDto>> listPublicBuilds(
+            @RequestParam(name = "limit", required = false, defaultValue = "50") Integer limit
+    ) {
+        return ResponseEntity.ok(buildService.listPublicBuilds(limit == null ? 50 : limit));
+    }
+
+    /**
+     * Public build detail for /builds/{uuid}
+     * GET /api/v1/builds/{uuid}
+     */
+    @GetMapping("/{uuid}")
+    public ResponseEntity<BuildDto> getPublicBuild(@PathVariable("uuid") UUID uuid) {
+        return ResponseEntity.ok(buildService.getPublicBuild(uuid));
+    }
+
+    /**
+     * Vault builds (authenticated user).
+     * GET /api/v1/builds/me?limit=100
+     */
+    @GetMapping("/me")
+    public ResponseEntity<List<BuildSummaryDto>> listMyBuilds(
+            @RequestParam(name = "limit", required = false, defaultValue = "100") Integer limit
+    ) {
+        return ResponseEntity.ok(buildService.listMyBuilds(limit == null ? 100 : limit));
+    }
+
+    /**
+     * Load a single build (Vault edit + Builder ?load=uuid).
+     * GET /api/v1/builds/me/{uuid}
+     */
+    @GetMapping("/me/{uuid}")
+    public ResponseEntity<BuildDto> getMyBuild(@PathVariable("uuid") UUID uuid) {
+        return ResponseEntity.ok(buildService.getMyBuild(uuid));
+    }
+
+    /**
+     * Create a NEW build in Vault (Save As…).
+     * POST /api/v1/builds/me
+     */
+    @PostMapping("/me")
+    public ResponseEntity<BuildDto> createMyBuild(@RequestBody UpdateBuildRequestDto req) {
+        return ResponseEntity.ok(buildService.createMyBuild(req));
+    }
+
+    /**
+     * Update build (authenticated user; must own build eventually).
+     * PUT /api/v1/builds/me/{uuid}
+     */
+    @PutMapping("/me/{uuid}")
+    public ResponseEntity<BuildDto> updateMyBuild(
+            @PathVariable("uuid") UUID uuid,
+            @RequestBody UpdateBuildRequestDto req
+    ) {
+        return ResponseEntity.ok(buildService.updateMyBuild(uuid, req));
+    }
+
+    /**
+     * Delete a build (authenticated user; must own build).
+     * DELETE /api/v1/builds/me/{uuid}
+     */
+    @DeleteMapping("/me/{uuid}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteMyBuild(@PathVariable("uuid") UUID uuid) {
+        buildService.deleteMyBuild(uuid);
+    }
+    @GetMapping("/all")
+    public ResponseEntity<List<BuildDto>> getAll() {
+        List<Build> builds = repo.findAll();
+        return ResponseEntity.ok(BuildMapper.toDtoList(builds));
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<BuildDto> getAllBuildsById(@PathVariable Integer id) {
+        return repo.findById(id)
+                .map(build -> ResponseEntity.ok(BuildMapper.toDto(build)))
+                .orElse(ResponseEntity.notFound().build());
+    }
+}

src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java

@@ -1,96 +0,0 @@
-package group.goforward.battlbuilder.controllers.api.v1;
-
-import group.goforward.battlbuilder.services.BuildService;
-import group.goforward.battlbuilder.web.dto.build.BuildDto;
-import group.goforward.battlbuilder.web.dto.build.BuildFeedCardDto;
-import group.goforward.battlbuilder.web.dto.build.BuildSummaryDto;
-import group.goforward.battlbuilder.web.dto.UpdateBuildRequestDto;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.UUID;
-
-@CrossOrigin
-@RestController
-@RequestMapping("/api/v1/builds")
-public class BuildV1Controller {
-
-    private final BuildService buildService;
-
-    public BuildV1Controller(BuildService buildService) {
-        this.buildService = buildService;
-    }
-
-    /**
-     * Public builds feed for /builds page.
-     * GET /api/v1/builds?limit=50
-     */
-    @GetMapping
-    public ResponseEntity<List<BuildFeedCardDto>> listPublicBuilds(
-            @RequestParam(name = "limit", required = false, defaultValue = "50") Integer limit
-    ) {
-        return ResponseEntity.ok(buildService.listPublicBuilds(limit == null ? 50 : limit));
-    }
-
-    /**
-     * Public build detail for /builds/{uuid}
-     * GET /api/v1/builds/{uuid}
-     */
-    @GetMapping("/{uuid}")
-    public ResponseEntity<BuildDto> getPublicBuild(@PathVariable("uuid") UUID uuid) {
-        return ResponseEntity.ok(buildService.getPublicBuild(uuid));
-    }
-
-    /**
-     * Vault builds (authenticated user).
-     * GET /api/v1/builds/me?limit=100
-     */
-    @GetMapping("/me")
-    public ResponseEntity<List<BuildSummaryDto>> listMyBuilds(
-            @RequestParam(name = "limit", required = false, defaultValue = "100") Integer limit
-    ) {
-        return ResponseEntity.ok(buildService.listMyBuilds(limit == null ? 100 : limit));
-    }
-
-    /**
-     * Load a single build (Vault edit + Builder ?load=uuid).
-     * GET /api/v1/builds/me/{uuid}
-     */
-    @GetMapping("/me/{uuid}")
-    public ResponseEntity<BuildDto> getMyBuild(@PathVariable("uuid") UUID uuid) {
-        return ResponseEntity.ok(buildService.getMyBuild(uuid));
-    }
-
-    /**
-     * Create a NEW build in Vault (Save As…).
-     * POST /api/v1/builds/me
-     */
-    @PostMapping("/me")
-    public ResponseEntity<BuildDto> createMyBuild(@RequestBody UpdateBuildRequestDto req) {
-        return ResponseEntity.ok(buildService.createMyBuild(req));
-    }
-
-    /**
-     * Update build (authenticated user; must own build eventually).
-     * PUT /api/v1/builds/me/{uuid}
-     */
-    @PutMapping("/me/{uuid}")
-    public ResponseEntity<BuildDto> updateMyBuild(
-            @PathVariable("uuid") UUID uuid,
-            @RequestBody UpdateBuildRequestDto req
-    ) {
-        return ResponseEntity.ok(buildService.updateMyBuild(uuid, req));
-    }
-
-    /**
-     * Delete a build (authenticated user; must own build).
-     * DELETE /api/v1/builds/me/{uuid}
-     */
-    @DeleteMapping("/me/{uuid}")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void deleteMyBuild(@PathVariable("uuid") UUID uuid) {
-        buildService.deleteMyBuild(uuid);
-    }
-}

src/main/java/group/goforward/battlbuilder/controllers/api/v1/PartRoleMappingController.java

@@ -2,7 +2,7 @@ package group.goforward.battlbuilder.controllers.api.v1;
 //
 import group.goforward.battlbuilder.services.PartRoleMappingService;
 import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
-import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
+import group.goforward.battlbuilder.web.dto.mapping.PartRoleToCategoryDto;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductController.java

@@ -1,54 +1,59 @@
-package group.goforward.battlbuilder.controllers.api.v1;
+package group.goforward.battlbuilder.controllers.api.v1;
-
+
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import group.goforward.battlbuilder.services.ProductQueryService;
-import org.springframework.http.ResponseEntity;
+import group.goforward.battlbuilder.web.dto.product.ProductOfferDto;
-import org.springframework.web.bind.annotation.*;
+import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;
-
+import group.goforward.battlbuilder.web.dto.catalog.ProductSort;
-import java.util.List;
+import org.springframework.cache.annotation.Cacheable;
-
+import org.springframework.data.domain.Page;
-/**
+import org.springframework.data.domain.Pageable;
- * LEGACY CONTROLLER (Deprecated)
+import org.springframework.data.web.PageableDefault;
- *
+import org.springframework.http.ResponseEntity;
- * Do not add new features here.
+import org.springframework.web.bind.annotation.*;
- * Canonical API lives in ProductV1Controller (/api/v1/products).
+
- *
+import java.util.List;
- * This exists only to keep older clients working temporarily.
+
- * Disable by default using:
+@RestController
- *   app.api.legacy.enabled=false
+@RequestMapping("/api/v1/products")
- *
+@CrossOrigin
- * NOTE:
+public class ProductController {
- * Even when disabled, Spring still compiles this class. So it must not reference
+
- * missing services/methods.
+    private final ProductQueryService productQueryService;
- */
+
-@Deprecated
+    public ProductController(ProductQueryService productQueryService) {
-@RestController
+        this.productQueryService = productQueryService;
-@RequestMapping({"/api/products", "/api/v1/products"})
+    }
-@CrossOrigin
+
-@ConditionalOnProperty(name = "app.api.legacy.enabled", havingValue = "true", matchIfMissing = false)
+    /**
-public class ProductController {
+     * Product list endpoint
-
+     * Example:
-    private static final String MSG =
+     * /api/v1/products?platform=AR-15&partRoles=upper-receiver&priceSort=price_asc&page=0&size=50
-            "Legacy endpoint disabled. Use /api/v1/products instead.";
+     *
-
+     * NOTE: do NOT use `sort=` here — Spring reserves it for Pageable sorting.
-    @GetMapping
+     */
-    public ResponseEntity<?> getProducts(
+    @GetMapping
-            @RequestParam(defaultValue = "AR-15") String platform,
+    @Cacheable(
-            @RequestParam(required = false, name = "partRoles") List<String> partRoles
+            value = "gunbuilderProductsV1",
-    ) {
+            key = "#platform + '::' + (#partRoles == null ? 'ALL' : #partRoles) + '::' + #priceSort + '::' + #pageable.pageNumber + '::' + #pageable.pageSize"
-        // Legacy disabled by design (Option B cleanup)
+    )
-        return ResponseEntity.status(410).body(MSG);
+    public Page<ProductSummaryDto> getProducts(
-    }
+            @RequestParam(defaultValue = "AR-15") String platform,
-
+            @RequestParam(required = false, name = "partRoles") List<String> partRoles,
-    @GetMapping("/{id}/offers")
+            @RequestParam(name = "priceSort", defaultValue = "price_asc") String priceSort,
-    public ResponseEntity<?> getOffersForProduct(@PathVariable("id") Integer productId) {
+            @PageableDefault(size = 50) Pageable pageable
-        return ResponseEntity.status(410).body(MSG);
+    ) {
-    }
+        ProductSort sortEnum = ProductSort.from(priceSort);
-
+        return productQueryService.getProductsPage(platform, partRoles, pageable, sortEnum);
-    @GetMapping("/{id}")
+    }
-    public ResponseEntity<?> getProductById(@PathVariable("id") Integer productId) {
+
-        return ResponseEntity.status(410).body(MSG);
+    @GetMapping("/{id}/offers")
-    }
+    public List<ProductOfferDto> getOffersForProduct(@PathVariable("id") Integer productId) {
-
+        return productQueryService.getOffersForProduct(productId);
-    // If you *really* need typed responses for an old client, we can re-add
+    }
-    // a real service layer once we align on the actual ProductQueryService API.
+
+    @GetMapping("/{id}")
+    public ResponseEntity<ProductSummaryDto> getProductById(@PathVariable("id") Integer productId) {
+        ProductSummaryDto dto = productQueryService.getProductById(productId);
+        return dto != null ? ResponseEntity.ok(dto) : ResponseEntity.notFound().build();
+    }
 }

src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java

@@ -1,59 +0,0 @@
-package group.goforward.battlbuilder.controllers.api.v1;
-
-import group.goforward.battlbuilder.services.ProductQueryService;
-import group.goforward.battlbuilder.web.dto.product.ProductOfferDto;
-import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;
-import group.goforward.battlbuilder.web.dto.catalog.ProductSort;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/v1/products")
-@CrossOrigin
-public class ProductV1Controller {
-
-    private final ProductQueryService productQueryService;
-
-    public ProductV1Controller(ProductQueryService productQueryService) {
-        this.productQueryService = productQueryService;
-    }
-
-    /**
-     * Product list endpoint
-     * Example:
-     * /api/v1/products?platform=AR-15&partRoles=upper-receiver&priceSort=price_asc&page=0&size=50
-     *
-     * NOTE: do NOT use `sort=` here — Spring reserves it for Pageable sorting.
-     */
-    @GetMapping
-    @Cacheable(
-            value = "gunbuilderProductsV1",
-            key = "#platform + '::' + (#partRoles == null ? 'ALL' : #partRoles) + '::' + #priceSort + '::' + #pageable.pageNumber + '::' + #pageable.pageSize"
-    )
-    public Page<ProductSummaryDto> getProducts(
-            @RequestParam(defaultValue = "AR-15") String platform,
-            @RequestParam(required = false, name = "partRoles") List<String> partRoles,
-            @RequestParam(name = "priceSort", defaultValue = "price_asc") String priceSort,
-            @PageableDefault(size = 50) Pageable pageable
-    ) {
-        ProductSort sortEnum = ProductSort.from(priceSort);
-        return productQueryService.getProductsPage(platform, partRoles, pageable, sortEnum);
-    }
-
-    @GetMapping("/{id}/offers")
-    public List<ProductOfferDto> getOffersForProduct(@PathVariable("id") Integer productId) {
-        return productQueryService.getOffersForProduct(productId);
-    }
-
-    @GetMapping("/{id}")
-    public ResponseEntity<ProductSummaryDto> getProductById(@PathVariable("id") Integer productId) {
-        ProductSummaryDto dto = productQueryService.getProductById(productId);
-        return dto != null ? ResponseEntity.ok(dto) : ResponseEntity.notFound().build();
-    }
-}

src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java

@@ -1,6 +1,6 @@
 package group.goforward.battlbuilder.controllers.api.v1;
 
-import group.goforward.battlbuilder.web.dto.StateDto;
+import group.goforward.battlbuilder.dto.StateDto;
 import group.goforward.battlbuilder.mapper.StateMapper;
 import group.goforward.battlbuilder.model.State;
 import group.goforward.battlbuilder.repos.StateRepository;

src/main/java/group/goforward/battlbuilder/dto/StateDto.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.dto;
 
 public class StateDto {
 

src/main/java/group/goforward/battlbuilder/mapper/PartRoleMappingMapper.java

@@ -3,7 +3,7 @@ package group.goforward.battlbuilder.mapper;
 import group.goforward.battlbuilder.model.PartCategory;
 import group.goforward.battlbuilder.model.PartRoleMapping;
 import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
-import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
+import group.goforward.battlbuilder.web.dto.mapping.PartRoleToCategoryDto;
 
 public final class PartRoleMappingMapper {
 

src/main/java/group/goforward/battlbuilder/mapper/StateMapper.java

@@ -1,6 +1,6 @@
 package group.goforward.battlbuilder.mapper;
 
-import group.goforward.battlbuilder.web.dto.StateDto;
+import group.goforward.battlbuilder.dto.StateDto;
 import group.goforward.battlbuilder.model.State;
 
 

src/main/java/group/goforward/battlbuilder/services/BuildService.java

@@ -3,7 +3,7 @@ package group.goforward.battlbuilder.services;
 import group.goforward.battlbuilder.web.dto.build.BuildDto;
 import group.goforward.battlbuilder.web.dto.build.BuildFeedCardDto;
 import group.goforward.battlbuilder.web.dto.build.BuildSummaryDto;
-import group.goforward.battlbuilder.web.dto.UpdateBuildRequestDto;
+import group.goforward.battlbuilder.web.dto.mapping.UpdateBuildRequestDto;
 
 import java.util.List;
 import java.util.UUID;

src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java

@@ -3,7 +3,7 @@ package group.goforward.battlbuilder.services;
 
 import group.goforward.battlbuilder.model.Product;
 import group.goforward.battlbuilder.repos.ProductRepository;
-import group.goforward.battlbuilder.web.dto.CategoryMappingRecommendationDto;
+import group.goforward.battlbuilder.web.dto.mapping.CategoryMappingRecommendationDto;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java

@@ -8,9 +8,9 @@ import group.goforward.battlbuilder.repos.CanonicalCategoryRepository;
 import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository;
 import group.goforward.battlbuilder.repos.MerchantRepository;
 import group.goforward.battlbuilder.repos.ProductRepository;
-import group.goforward.battlbuilder.web.dto.MappingOptionsDto;
+import group.goforward.battlbuilder.web.dto.mapping.MappingOptionsDto;
-import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto;
+import group.goforward.battlbuilder.web.dto.mapping.PendingMappingBucketDto;
-import group.goforward.battlbuilder.web.dto.RawCategoryMappingRowDto;
+import group.goforward.battlbuilder.web.dto.mapping.RawCategoryMappingRowDto;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java

@@ -2,7 +2,7 @@ package group.goforward.battlbuilder.services;
 
 import group.goforward.battlbuilder.repos.PartRoleMappingRepository;
 import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto;
-import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto;
+import group.goforward.battlbuilder.web.dto.mapping.PartRoleToCategoryDto;
 import group.goforward.battlbuilder.mapper.PartRoleMappingMapper;
 import org.springframework.stereotype.Service;
 

src/main/java/group/goforward/battlbuilder/services/impl/BuildServiceImpl.java

@@ -14,7 +14,7 @@ import group.goforward.battlbuilder.web.dto.build.BuildDto;
 import group.goforward.battlbuilder.web.dto.build.BuildFeedCardDto;
 import group.goforward.battlbuilder.web.dto.build.BuildItemDto;
 import group.goforward.battlbuilder.web.dto.build.BuildSummaryDto;
-import group.goforward.battlbuilder.web.dto.UpdateBuildRequestDto;
+import group.goforward.battlbuilder.web.dto.mapping.UpdateBuildRequestDto;
 import group.goforward.battlbuilder.repos.ProductRepository;
 
 import org.springframework.data.domain.PageRequest;

src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminCaliberController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
 import group.goforward.battlbuilder.model.Caliber;
 import group.goforward.battlbuilder.repos.CaliberRepository;

src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminImportStatusController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
 import group.goforward.battlbuilder.model.enums.ImportStatus;
 import group.goforward.battlbuilder.repos.ProductRepository;

src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminMappingController.java

@@ -1,9 +1,9 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
 import group.goforward.battlbuilder.services.MappingAdminService;
-import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto;
+import group.goforward.battlbuilder.web.dto.mapping.PendingMappingBucketDto;
-import group.goforward.battlbuilder.web.dto.MappingOptionsDto;
+import group.goforward.battlbuilder.web.dto.mapping.MappingOptionsDto;
-import group.goforward.battlbuilder.web.dto.RawCategoryMappingRowDto;
+import group.goforward.battlbuilder.web.dto.mapping.RawCategoryMappingRowDto;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminMerchantController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
 import group.goforward.battlbuilder.services.MerchantFeedImportService;
 import org.springframework.http.ResponseEntity;

src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminProductController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
 import group.goforward.battlbuilder.services.admin.AdminProductService;
 import group.goforward.battlbuilder.web.dto.admin.AdminProductSearchRequest;

src/main/java/group/goforward/battlbuilder/web/admin/controller/AdminUserController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
 import group.goforward.battlbuilder.common.Constants;
 import group.goforward.battlbuilder.services.admin.AdminUserService;

src/main/java/group/goforward/battlbuilder/web/admin/controller/CategoryMappingAdminController.java

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;
 
-import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto;
+import group.goforward.battlbuilder.web.dto.mapping.PendingMappingBucketDto;
 import group.goforward.battlbuilder.services.MappingAdminService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

src/main/java/group/goforward/battlbuilder/web/admin/controller/package-info.java

@@ -9,4 +9,4 @@
  * @version 1.0
  * @since 2025-12-10
  */
-package group.goforward.battlbuilder.web.admin;
+package group.goforward.battlbuilder.web.admin.controller;

src/main/java/group/goforward/battlbuilder/web/dto/mapping/CategoryMappingRecommendationDto.java

@@ -1,5 +1,5 @@
 // src/main/java/group/goforward/ballistic/web/dto/CategoryMappingRecommendationDto.java
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 public record CategoryMappingRecommendationDto(
         String merchantName,

src/main/java/group/goforward/battlbuilder/web/dto/mapping/MappingOptionsDto.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 import java.util.List;
 

src/main/java/group/goforward/battlbuilder/web/dto/mapping/PartRoleToCategoryDto.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 public record PartRoleToCategoryDto(
         String platform,

src/main/java/group/goforward/battlbuilder/web/dto/mapping/PendingMappingBucketDto.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 public record PendingMappingBucketDto(
         Integer merchantId,

src/main/java/group/goforward/battlbuilder/web/dto/mapping/RawCategoryMappingRowDto.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 public record RawCategoryMappingRowDto(
         Integer merchantId,

src/main/java/group/goforward/battlbuilder/web/dto/mapping/UpdateBuildRequestDto.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 import java.util.List;
 

src/main/java/group/goforward/battlbuilder/web/dto/mapping/UpsertMerchantCategoryMappingRequest.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.web.dto;
+package group.goforward.battlbuilder.web.dto.mapping;
 
 public class UpsertMerchantCategoryMappingRequest {