Forward/ballistic-builder-spring
2
0
Fork 0
mirror of https://gitea.gofwd.group/Forward_Group/ballistic-builder-spring.git synced 2026-01-20 16:51:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

organizing

Browse Source
This commit is contained in:
Don Strawsburg
2026-01-06 12:23:14 -05:00
parent 887ccc01d5
commit f0f12d76a6
68 changed files with 667 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/group/goforward/battlbuilder/catalog/query/package-info.java
View File

@@ -1,4 +1,4 @@
/**
* Query projections for the catalog domain.
*/
package group.goforward.battlbuilder.catalog.query;
/**
* Query projections for the catalog domain.
*/
package group.goforward.battlbuilder.catalog.query;

8
src/main/java/group/goforward/battlbuilder/cli/package-info.java
View File

@@ -1,4 +1,4 @@
/**
* Command line runners and CLI utilities.
*/
package group.goforward.battlbuilder.cli;
/**
* Command line runners and CLI utilities.
*/
package group.goforward.battlbuilder.cli;

148
src/main/java/group/goforward/battlbuilder/common/ApiResponse.java
View File

@@ -1,74 +1,74 @@
package group.goforward.battlbuilder.utils;
import java.time.LocalDateTime;
/**
* @param <T>
*/
public class ApiResponse<T> {
private static final String API_SUCCESS = "success";
private static final String API_FAILURE = "failure";
private static final String API_ERROR = "error";
private String[] messages;
private T data;
private String status;
private LocalDateTime timestamp;
private ApiResponse(String status, String[] message, T data) {
this.status = status;
this.messages = message;
this.data = data;
this.timestamp = LocalDateTime.now();
}
public static <T> ApiResponse<T> error(String message, T data) {
String[] msg = {message}; // ✅ Include the message
return new ApiResponse<>(API_ERROR, msg, data);
}
public static <T> ApiResponse<T> success(T data, String emailSentSuccessfully) {
String[] msg = {};
return new ApiResponse<>(API_SUCCESS, msg, data);
}
public static <T> ApiResponse<T> error(String[] messages) {
return new ApiResponse<>(API_ERROR, messages, null);
}
public static <T> ApiResponse<T> error(String message) {
String[] msg = {};
return new ApiResponse<>(API_ERROR, msg, null);
}
public String[] getMessages() {
return messages;
}
public void setMessages(String[] messages) {
this.messages = messages;
}
public T getData() {return data;}
public void setData(T data) {
this.data = data;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public LocalDateTime getTimestamp() {
return timestamp;
}
public void setTimestamp(LocalDateTime timestamp) {
this.timestamp = timestamp;
}
}
package group.goforward.battlbuilder.common;
import java.time.LocalDateTime;
/**
* @param <T>
*/
public class ApiResponse<T> {
private static final String API_SUCCESS = "success";
private static final String API_FAILURE = "failure";
private static final String API_ERROR = "error";
private String[] messages;
private T data;
private String status;
private LocalDateTime timestamp;
private ApiResponse(String status, String[] message, T data) {
this.status = status;
this.messages = message;
this.data = data;
this.timestamp = LocalDateTime.now();
}
public static <T> ApiResponse<T> error(String message, T data) {
String[] msg = {message}; // ✅ Include the message
return new ApiResponse<>(API_ERROR, msg, data);
}
public static <T> ApiResponse<T> success(T data, String emailSentSuccessfully) {
String[] msg = {};
return new ApiResponse<>(API_SUCCESS, msg, data);
}
public static <T> ApiResponse<T> error(String[] messages) {
return new ApiResponse<>(API_ERROR, messages, null);
}
public static <T> ApiResponse<T> error(String message) {
String[] msg = {};
return new ApiResponse<>(API_ERROR, msg, null);
}
public String[] getMessages() {
return messages;
}
public void setMessages(String[] messages) {
this.messages = messages;
}
public T getData() {return data;}
public void setData(T data) {
this.data = data;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public LocalDateTime getTimestamp() {
return timestamp;
}
public void setTimestamp(LocalDateTime timestamp) {
this.timestamp = timestamp;
}
}

38
src/main/java/group/goforward/battlbuilder/common/Counter.java
View File

@@ -1,20 +1,18 @@
package group.goforward.battlbuilder.utils;
import org.springframework.context.annotation.Bean;
public class Counter {
Integer count = 0;
public void addOne() {
count +=1;
}
public Integer getCount() {
return count;
}
private void setCount(Integer count) {
this.count = count;
}
}
package group.goforward.battlbuilder.common;
public class Counter {
Integer count = 0;
public void addOne() {
count +=1;
}
public Integer getCount() {
return count;
}
private void setCount(Integer count) {
this.count = count;
}
}

2
src/main/java/group/goforward/battlbuilder/common/package-info.java
View File

@@ -8,4 +8,4 @@
* @version 1.0
* @since 2025-12-10
*/
package group.goforward.battlbuilder.utils;
package group.goforward.battlbuilder.common;

42
src/main/java/group/goforward/battlbuilder/config/CacheConfig.java
View File

@@ -1,22 +1,22 @@
package group.goforward.battlbuilder.configuration;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableCaching
public class CacheConfig {
@Bean
public CacheManager cacheManager() {
// Must match the @Cacheable value(s) used in controllers/services.
// ProductV1Controller uses: "gunbuilderProductsV1"
return new ConcurrentMapCacheManager(
"gunbuilderProductsV1",
"gunbuilderProducts" // keep if anything else still references it
);
}
package group.goforward.battlbuilder.config;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableCaching
public class CacheConfig {
@Bean
public CacheManager cacheManager() {
// Must match the @Cacheable value(s) used in controllers/services.
// ProductV1Controller uses: "gunbuilderProductsV1"
return new ConcurrentMapCacheManager(
"gunbuilderProductsV1",
"gunbuilderProducts" // keep if anything else still references it
);
}
}

166
src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
View File

@@ -1,84 +1,84 @@
// src/main/java/com/example/config/CorsConfig.java
package group.goforward.battlbuilder.configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import java.util.Arrays;
@Configuration
public class CorsConfig {
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
// Allow credentials
config.setAllowCredentials(true);
// Allow Angular development server
config.setAllowedOrigins(Arrays.asList(
"http://localhost:4200",
"http://localhost:4201",
"http://localhost:8070",
"https://localhost:8070",
"http://localhost:8080",
"https://localhost:8080",
"http://localhost:3000",
"https://localhost:3000",
"https://localhost:3000/gunbuilder",
"http://localhost:3000/gunbuilder",
"https://localhost:3000/builder",
"http://localhost:3000/builder"
));
// Allow all headers
config.addAllowedHeader("*");
// Allow all HTTP methods
config.setAllowedMethods(Arrays.asList(
"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"
));
// Expose headers
config.setExposedHeaders(Arrays.asList(
"Authorization",
"Content-Type",
"X-Total-Count"
));
// Max age for preflight cache (1 hour)
config.setMaxAge(3600L);
source.registerCorsConfiguration("/**", config);
return new CorsFilter(source);
}
}
// Alternative using WebMvcConfigurer:
/*
package group.goforward.citysites.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebConfig implements WebMvcConfigurer {
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/api/**")
.allowedOrigins("http://localhost:4200")
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
.allowedHeaders("*")
.allowCredentials(true)
.maxAge(3600);
}
}
// src/main/java/com/example/config/CorsConfig.java
package group.goforward.battlbuilder.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import java.util.Arrays;
@Configuration
public class CorsConfig {
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
// Allow credentials
config.setAllowCredentials(true);
// Allow Angular development server
config.setAllowedOrigins(Arrays.asList(
"http://localhost:4200",
"http://localhost:4201",
"http://localhost:8070",
"https://localhost:8070",
"http://localhost:8080",
"https://localhost:8080",
"http://localhost:3000",
"https://localhost:3000",
"https://localhost:3000/gunbuilder",
"http://localhost:3000/gunbuilder",
"https://localhost:3000/builder",
"http://localhost:3000/builder"
));
// Allow all headers
config.addAllowedHeader("*");
// Allow all HTTP methods
config.setAllowedMethods(Arrays.asList(
"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"
));
// Expose headers
config.setExposedHeaders(Arrays.asList(
"Authorization",
"Content-Type",
"X-Total-Count"
));
// Max age for preflight cache (1 hour)
config.setMaxAge(3600L);
source.registerCorsConfiguration("/**", config);
return new CorsFilter(source);
}
}
// Alternative using WebMvcConfigurer:
/*
package group.goforward.citysites.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebConfig implements WebMvcConfigurer {
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/api/**")
.allowedOrigins("http://localhost:4200")
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
.allowedHeaders("*")
.allowCredentials(true)
.maxAge(3600);
}
}
*/

18
src/main/java/group/goforward/battlbuilder/config/JpaConfig.java
View File

@@ -1,10 +1,10 @@
package group.goforward.battlbuilder.configuration;
import org.springframework.context.annotation.Configuration;
//import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@Configuration
public class JpaConfig {
// Enables @CreatedDate / @LastModifiedDate processing
package group.goforward.battlbuilder.config;
import org.springframework.context.annotation.Configuration;
//import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@Configuration
public class JpaConfig {
// Enables @CreatedDate / @LastModifiedDate processing
}

2
src/main/java/group/goforward/battlbuilder/config/MinioConfig.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.configuration;
package group.goforward.battlbuilder.config;
import io.minio.MinioClient;
import org.springframework.beans.factory.annotation.Value;

21
src/main/java/group/goforward/battlbuilder/config/ShortLinksProperties.java
View File

@@ -4,27 +4,30 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "shortlinks")
public class ShortLinksProperties {
/**
* Master switch to enable short links.
*/
private boolean enabled = true;
/**
* The public base URL used when generating short links (differs in dev vs prod).
* Examples:
* - http://localhost:8080
* - https://bb.ooo
*/
private String publicBaseUrl = "http://localhost:8080";
public static final String PUBLIC_BASE_URL = "http://localhost:8080";
/**
* The frontend base URL used when redirecting BUILD short links.
* Examples:
* - http://localhost:3000
* - https://battlbuilder.com
*/
private String frontendBaseUrl = "http://localhost:3000";
public static final String FRONT_END_BASE_URL = "http://localhost:3000";
/**
* Master switch to enable short links.
*/
private boolean enabled = true;
private String publicBaseUrl = PUBLIC_BASE_URL;
private String frontendBaseUrl = FRONT_END_BASE_URL;
public boolean isEnabled() {
return enabled;

2
src/main/java/group/goforward/battlbuilder/config/package-info.java
View File

@@ -8,4 +8,4 @@
* @version 1.0
* @since 2025-12-10
*/
package group.goforward.battlbuilder.configuration;
package group.goforward.battlbuilder.config;

2
src/main/java/group/goforward/battlbuilder/controllers/api/EmailController.java
View File

@@ -1,6 +1,6 @@
package group.goforward.battlbuilder.controllers.api;
import group.goforward.battlbuilder.utils.ApiResponse;
import group.goforward.battlbuilder.common.ApiResponse;
import group.goforward.battlbuilder.dto.EmailRequestDto;
import group.goforward.battlbuilder.model.EmailRequest;
import group.goforward.battlbuilder.model.EmailStatus;

2
src/main/java/group/goforward/battlbuilder/controllers/api/v1/AuthController.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.User;
import group.goforward.battlbuilder.repos.UserRepository;

100
src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java
View File

@@ -1,50 +1,50 @@
package group.goforward.battlbuilder.controllers;
import group.goforward.battlbuilder.model.Brand;
import group.goforward.battlbuilder.repos.BrandRepository;
import group.goforward.battlbuilder.services.BrandService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping({"/api/v1/brands", "/api/brands"})
public class BrandController {
@Autowired
private BrandRepository repo;
@Autowired
private BrandService brandService;
//@Cacheable(value="getAllStates")
@GetMapping("/all")
public ResponseEntity<List<Brand>> getAllBrands() {
List<Brand> brand = repo.findAll();
return ResponseEntity.ok(brand);
}
@GetMapping("/{id}")
public ResponseEntity<Brand> getAllBrandsById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@PostMapping("/add")
public ResponseEntity<Brand> createbrand(@RequestBody Brand item) {
Brand created = brandService.save(item);
return ResponseEntity.status(HttpStatus.CREATED).body(created);
}
@DeleteMapping("/delete/{id}")
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
return brandService.findById(id)
.map(item -> {
brandService.deleteById(id);
return ResponseEntity.noContent().<Void>build();
})
.orElse(ResponseEntity.notFound().build());
}
}
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.Brand;
import group.goforward.battlbuilder.repos.build.BrandRepository;
import group.goforward.battlbuilder.services.BrandService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping({"/api/v1/brands", "/api/brands"})
public class BrandController {
@Autowired
private BrandRepository repo;
@Autowired
private BrandService brandService;
//@Cacheable(value="getAllStates")
@GetMapping("/all")
public ResponseEntity<List<Brand>> getAllBrands() {
List<Brand> brand = repo.findAll();
return ResponseEntity.ok(brand);
}
@GetMapping("/{id}")
public ResponseEntity<Brand> getAllBrandsById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@PostMapping("/add")
public ResponseEntity<Brand> createbrand(@RequestBody Brand item) {
Brand created = brandService.save(item);
return ResponseEntity.status(HttpStatus.CREATED).body(created);
}
@DeleteMapping("/delete/{id}")
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
return brandService.findById(id)
.map(item -> {
brandService.deleteById(id);
return ResponseEntity.noContent().<Void>build();
})
.orElse(ResponseEntity.notFound().build());
}
}

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

@@ -1,34 +1,34 @@
package group.goforward.battlbuilder.controllers.api;
import group.goforward.battlbuilder.model.Build;
import group.goforward.battlbuilder.repos.BuildRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/v1/api/builds")
public class BuildController {
@Autowired
private BuildRepository repo;
@Autowired
// private BuildsService service;
//@Cacheable(value="getAllStates")
@GetMapping("/all")
public ResponseEntity<List<Build>> getAll() {
List<Build> builds = repo.findAll();
return ResponseEntity.ok(builds);
}
@GetMapping("/{id}")
public ResponseEntity<Build> getAllBuildsById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
}
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.Build;
import group.goforward.battlbuilder.repos.build.BuildRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/v1/api/builds")
public class BuildController {
@Autowired
private BuildRepository repo;
@Autowired
// private BuildsService service;
//@Cacheable(value="getAllStates")
@GetMapping("/all")
public ResponseEntity<List<Build>> getAll() {
List<Build> builds = repo.findAll();
return ResponseEntity.ok(builds);
}
@GetMapping("/{id}")
public ResponseEntity<Build> getAllBuildsById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
}

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

@@ -1,10 +1,10 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.services.BuildService;
import group.goforward.battlbuilder.web.dto.BuildDto;
import group.goforward.battlbuilder.web.dto.BuildFeedCardDto;
import group.goforward.battlbuilder.web.dto.BuildSummaryDto;
import group.goforward.battlbuilder.web.dto.UpdateBuildRequest;
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.*;
@@ -68,7 +68,7 @@ public class BuildV1Controller {
* POST /api/v1/builds/me
*/
@PostMapping("/me")
public ResponseEntity<BuildDto> createMyBuild(@RequestBody UpdateBuildRequest req) {
public ResponseEntity<BuildDto> createMyBuild(@RequestBody UpdateBuildRequestDto req) {
return ResponseEntity.ok(buildService.createMyBuild(req));
}
@@ -79,7 +79,7 @@ public class BuildV1Controller {
@PutMapping("/me/{uuid}")
public ResponseEntity<BuildDto> updateMyBuild(
@PathVariable("uuid") UUID uuid,
@RequestBody UpdateBuildRequest req
@RequestBody UpdateBuildRequestDto req
) {
return ResponseEntity.ok(buildService.updateMyBuild(uuid, req));
}

2
src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuilderBootstrapController.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.PartRoleMapping;
import group.goforward.battlbuilder.repos.PartCategoryRepository;

4
src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java
View File

@@ -1,7 +1,7 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.services.CatalogQueryService;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest;
import org.springframework.data.domain.Page;

2
src/main/java/group/goforward/battlbuilder/controllers/api/v1/CategoryController.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.repos.PartCategoryRepository;
import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto;

78
src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImportController.java
View File

@@ -1,40 +1,40 @@
package group.goforward.battlbuilder.controllers;
import group.goforward.battlbuilder.services.MerchantFeedImportService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping({"/api/admin/imports", "/api/v1/admin/imports"})
@CrossOrigin(origins = "http://localhost:3000")
public class ImportController {
private final MerchantFeedImportService merchantFeedImportService;
public ImportController(MerchantFeedImportService merchantFeedImportService) {
this.merchantFeedImportService = merchantFeedImportService;
}
/**
* Full product + offer import for a merchant.
*
* POST /admin/imports/{merchantId}
*/
@PostMapping("/{merchantId}")
public ResponseEntity<Void> importMerchant(@PathVariable Integer merchantId) {
merchantFeedImportService.importMerchantFeed(merchantId);
return ResponseEntity.noContent().build();
}
/**
* Offers-only sync (price/stock) for a merchant.
*
* POST /admin/imports/{merchantId}/offers-only
*/
@PostMapping("/{merchantId}/offers-only")
public ResponseEntity<Void> syncOffersOnly(@PathVariable Integer merchantId) {
merchantFeedImportService.syncOffersOnly(merchantId);
return ResponseEntity.noContent().build();
}
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.services.MerchantFeedImportService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping({"/api/admin/imports", "/api/v1/admin/imports"})
@CrossOrigin(origins = "http://localhost:3000")
public class ImportController {
private final MerchantFeedImportService merchantFeedImportService;
public ImportController(MerchantFeedImportService merchantFeedImportService) {
this.merchantFeedImportService = merchantFeedImportService;
}
/**
* Full product + offer import for a merchant.
*
* POST /admin/imports/{merchantId}
*/
@PostMapping("/{merchantId}")
public ResponseEntity<Void> importMerchant(@PathVariable Integer merchantId) {
merchantFeedImportService.importMerchantFeed(merchantId);
return ResponseEntity.noContent().build();
}
/**
* Offers-only sync (price/stock) for a merchant.
*
* POST /admin/imports/{merchantId}/offers-only
*/
@PostMapping("/{merchantId}/offers-only")
public ResponseEntity<Void> syncOffersOnly(@PathVariable Integer merchantId) {
merchantFeedImportService.syncOffersOnly(merchantId);
return ResponseEntity.noContent().build();
}
}

2
src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.controllers.api;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.User;
import group.goforward.battlbuilder.repos.UserRepository;

48
src/main/java/group/goforward/battlbuilder/controllers/api/v1/MerchantDebugController.java
View File

@@ -1,25 +1,25 @@
package group.goforward.battlbuilder.controllers;
import group.goforward.battlbuilder.model.Merchant;
import group.goforward.battlbuilder.repos.MerchantRepository;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping({"/api/admin", "/api/v1/admin"})
public class MerchantDebugController {
private final MerchantRepository merchantRepository;
public MerchantDebugController(MerchantRepository merchantRepository) {
this.merchantRepository = merchantRepository;
}
@GetMapping("/debug/merchants")
public List<Merchant> listMerchants() {
return merchantRepository.findAll();
}
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.Merchant;
import group.goforward.battlbuilder.repos.MerchantRepository;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping({"/api/admin", "/api/v1/admin"})
public class MerchantDebugController {
private final MerchantRepository merchantRepository;
public MerchantDebugController(MerchantRepository merchantRepository) {
this.merchantRepository = merchantRepository;
}
@GetMapping("/debug/merchants")
public List<Merchant> listMerchants() {
return merchantRepository.findAll();
}
}

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

@@ -1,56 +1,54 @@
package group.goforward.battlbuilder.controllers;
import group.goforward.battlbuilder.web.dto.ProductOfferDto;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* LEGACY CONTROLLER (Deprecated)
*
* Do not add new features here.
* Canonical API lives in ProductV1Controller (/api/v1/products).
*
* This exists only to keep older clients working temporarily.
* Disable by default using:
* app.api.legacy.enabled=false
*
* NOTE:
* Even when disabled, Spring still compiles this class. So it must not reference
* missing services/methods.
*/
@Deprecated
@RestController
@RequestMapping({"/api/products", "/api/v1/products"})
@CrossOrigin
@ConditionalOnProperty(name = "app.api.legacy.enabled", havingValue = "true", matchIfMissing = false)
public class ProductController {
private static final String MSG =
"Legacy endpoint disabled. Use /api/v1/products instead.";
@GetMapping
public ResponseEntity<?> getProducts(
@RequestParam(defaultValue = "AR-15") String platform,
@RequestParam(required = false, name = "partRoles") List<String> partRoles
) {
// Legacy disabled by design (Option B cleanup)
return ResponseEntity.status(410).body(MSG);
}
@GetMapping("/{id}/offers")
public ResponseEntity<?> getOffersForProduct(@PathVariable("id") Integer productId) {
return ResponseEntity.status(410).body(MSG);
}
@GetMapping("/{id}")
public ResponseEntity<?> getProductById(@PathVariable("id") Integer productId) {
return ResponseEntity.status(410).body(MSG);
}
// 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.
package group.goforward.battlbuilder.controllers.api.v1;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* LEGACY CONTROLLER (Deprecated)
*
* Do not add new features here.
* Canonical API lives in ProductV1Controller (/api/v1/products).
*
* This exists only to keep older clients working temporarily.
* Disable by default using:
* app.api.legacy.enabled=false
*
* NOTE:
* Even when disabled, Spring still compiles this class. So it must not reference
* missing services/methods.
*/
@Deprecated
@RestController
@RequestMapping({"/api/products", "/api/v1/products"})
@CrossOrigin
@ConditionalOnProperty(name = "app.api.legacy.enabled", havingValue = "true", matchIfMissing = false)
public class ProductController {
private static final String MSG =
"Legacy endpoint disabled. Use /api/v1/products instead.";
@GetMapping
public ResponseEntity<?> getProducts(
@RequestParam(defaultValue = "AR-15") String platform,
@RequestParam(required = false, name = "partRoles") List<String> partRoles
) {
// Legacy disabled by design (Option B cleanup)
return ResponseEntity.status(410).body(MSG);
}
@GetMapping("/{id}/offers")
public ResponseEntity<?> getOffersForProduct(@PathVariable("id") Integer productId) {
return ResponseEntity.status(410).body(MSG);
}
@GetMapping("/{id}")
public ResponseEntity<?> getProductById(@PathVariable("id") Integer productId) {
return ResponseEntity.status(410).body(MSG);
}
// 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.
}

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

@@ -1,8 +1,8 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.services.ProductQueryService;
import group.goforward.battlbuilder.web.dto.ProductOfferDto;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
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;

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

@@ -1,55 +1,55 @@
package group.goforward.battlbuilder.controllers;
import group.goforward.battlbuilder.model.State;
import group.goforward.battlbuilder.repos.StateRepository;
import group.goforward.battlbuilder.services.admin.StatesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping({"/api/states", "/api/v1/states"})
public class StateController {
@Autowired
private StateRepository repo;
@Autowired
private StatesService statesService;
//@Cacheable(value="getAllStates")
@GetMapping("/all")
public ResponseEntity<List<State>> getAllStates() {
List<State> state = repo.findAll();
return ResponseEntity.ok(state);
}
@GetMapping("/{id}")
public ResponseEntity<State> getAllStatesById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@GetMapping("/byAbbrev/{abbreviation}")
public ResponseEntity<State> getAllStatesByAbbreviation(@PathVariable String abbreviation) {
return repo.findByAbbreviation(abbreviation)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@PostMapping("/addState")
public ResponseEntity<State> createState(@RequestBody State item) {
State created = statesService.save(item);
return ResponseEntity.status(HttpStatus.CREATED).body(created);
}
@DeleteMapping("/deleteState/{id}")
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
return statesService.findById(id)
.map(item -> {
statesService.deleteById(id);
return ResponseEntity.noContent().<Void>build();
})
.orElse(ResponseEntity.notFound().build());
}
}
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.State;
import group.goforward.battlbuilder.repos.StateRepository;
import group.goforward.battlbuilder.services.admin.StatesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping({"/api/states", "/api/v1/states"})
public class StateController {
@Autowired
private StateRepository repo;
@Autowired
private StatesService statesService;
//@Cacheable(value="getAllStates")
@GetMapping("/all")
public ResponseEntity<List<State>> getAllStates() {
List<State> state = repo.findAll();
return ResponseEntity.ok(state);
}
@GetMapping("/{id}")
public ResponseEntity<State> getAllStatesById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@GetMapping("/byAbbrev/{abbreviation}")
public ResponseEntity<State> getAllStatesByAbbreviation(@PathVariable String abbreviation) {
return repo.findByAbbreviation(abbreviation)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@PostMapping("/addState")
public ResponseEntity<State> createState(@RequestBody State item) {
State created = statesService.save(item);
return ResponseEntity.status(HttpStatus.CREATED).body(created);
}
@DeleteMapping("/deleteState/{id}")
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
return statesService.findById(id)
.map(item -> {
statesService.deleteById(id);
return ResponseEntity.noContent().<Void>build();
})
.orElse(ResponseEntity.notFound().build());
}
}

104
src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java
View File

@@ -1,52 +1,52 @@
package group.goforward.battlbuilder.controllers;
import group.goforward.battlbuilder.model.User;
import group.goforward.battlbuilder.repos.UserRepository;
import group.goforward.battlbuilder.services.admin.UsersService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping({"/api/user", "/api/v1/user"})
public class UserController {
private final UserRepository repo;
private final UsersService usersService;
public UserController(UserRepository repo, UsersService usersService) {
this.repo = repo;
this.usersService = usersService;
}
@GetMapping("/all")
public ResponseEntity<List<User>> getAllUsers() {
List<User> data = repo.findAll();
return ResponseEntity.ok(data);
}
@GetMapping("/byId/{id}")
public ResponseEntity<User> getAllStatesById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@PostMapping("/addUser")
public ResponseEntity<User> createUser(@RequestBody User item) {
User created = usersService.save(item);
return ResponseEntity.status(HttpStatus.CREATED).body(created);
}
@DeleteMapping("/deleteUser/{id}")
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
return usersService.findById(id)
.map(item -> {
usersService.deleteById(id);
return ResponseEntity.noContent().<Void>build();
})
.orElse(ResponseEntity.notFound().build());
}
}
package group.goforward.battlbuilder.controllers.api.v1;
import group.goforward.battlbuilder.model.User;
import group.goforward.battlbuilder.repos.UserRepository;
import group.goforward.battlbuilder.services.admin.UsersService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping({"/api/user", "/api/v1/user"})
public class UserController {
private final UserRepository repo;
private final UsersService usersService;
public UserController(UserRepository repo, UsersService usersService) {
this.repo = repo;
this.usersService = usersService;
}
@GetMapping("/all")
public ResponseEntity<List<User>> getAllUsers() {
List<User> data = repo.findAll();
return ResponseEntity.ok(data);
}
@GetMapping("/byId/{id}")
public ResponseEntity<User> getAllStatesById(@PathVariable Integer id) {
return repo.findById(id)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
@PostMapping("/addUser")
public ResponseEntity<User> createUser(@RequestBody User item) {
User created = usersService.save(item);
return ResponseEntity.status(HttpStatus.CREATED).body(created);
}
@DeleteMapping("/deleteUser/{id}")
public ResponseEntity<Void> deleteItem(@PathVariable Integer id) {
return usersService.findById(id)
.map(item -> {
usersService.deleteById(id);
return ResponseEntity.noContent().<Void>build();
})
.orElse(ResponseEntity.notFound().build());
}
}

2
src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java
View File

@@ -8,4 +8,4 @@
* @version 1.0
* @since 2025-12-10
*/
package group.goforward.battlbuilder.controllers.api;
package group.goforward.battlbuilder.controllers.api.v1;

2
src/main/java/group/goforward/battlbuilder/controllers/EmailTrackingController.java → src/main/java/group/goforward/battlbuilder/controllers/utils/EmailTrackingController.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.utils;
import group.goforward.battlbuilder.repos.EmailRequestRepository;
import org.springframework.http.ResponseEntity;

2
src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java
View File

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class PingController {
@GetMapping("/ping")
@GetMapping("/api/ping")
public String ping() {
return "pong";
}

2
src/main/java/group/goforward/battlbuilder/controllers/ShortLinkRedirectController.java → src/main/java/group/goforward/battlbuilder/controllers/utils/ShortLinkRedirectController.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.controllers;
package group.goforward.battlbuilder.controllers.utils;
import group.goforward.battlbuilder.config.ShortLinksProperties;
import group.goforward.battlbuilder.repos.ShortLinkRepository;

7
src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java
View File

@@ -1,7 +1,12 @@
package group.goforward.battlbuilder.enrichment.ai;
import group.goforward.battlbuilder.enrichment.*;
import group.goforward.battlbuilder.enrichment.ai.dto.CaliberExtractionResult;
import group.goforward.battlbuilder.enrichment.domain.CaliberTaxonomy;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentSource;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentStatus;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentType;
import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository;
import group.goforward.battlbuilder.model.Product;
import group.goforward.battlbuilder.repos.ProductRepository;
import org.springframework.beans.factory.annotation.Value;

8
src/main/java/group/goforward/battlbuilder/enrichment/controller/AdminEnrichmentController.java
View File

@@ -1,6 +1,12 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.controller;
import group.goforward.battlbuilder.enrichment.ai.AiEnrichmentOrchestrator;
import group.goforward.battlbuilder.enrichment.domain.CaliberTaxonomy;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentStatus;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentType;
import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository;
import group.goforward.battlbuilder.enrichment.service.CaliberEnrichmentService;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;

2
src/main/java/group/goforward/battlbuilder/enrichment/CaliberRuleExtractor.java → src/main/java/group/goforward/battlbuilder/enrichment/domain/CaliberRuleExtractor.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.domain;
import java.util.Optional;

2
src/main/java/group/goforward/battlbuilder/enrichment/CaliberTaxonomy.java → src/main/java/group/goforward/battlbuilder/enrichment/domain/CaliberTaxonomy.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.domain;
import java.util.Locale;

11
src/main/java/group/goforward/battlbuilder/enrichment/domain/package-info.java Normal file
View File

@@ -0,0 +1,11 @@
/**
* Domain objects package for the BattlBuilder application.
* <p>
* Contains Objects with business logic.
*
*
* @author Forward Group, LLC
* @version 1.0
* @since 2025-12-10
*/
package group.goforward.battlbuilder.enrichment.domain;

4
src/main/java/group/goforward/battlbuilder/enrichment/dto/EnrichmentQueueItem.java
View File

@@ -1,6 +1,8 @@
package group.goforward.battlbuilder.enrichment.dto;
import group.goforward.battlbuilder.enrichment.*;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentSource;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentStatus;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentType;
import java.math.BigDecimal;
import java.time.OffsetDateTime;

11
src/main/java/group/goforward/battlbuilder/enrichment/dto/package-info.java Normal file
View File

@@ -0,0 +1,11 @@
/**
* Data Transfer Objects package for the BattlBuilder application.
* <p>
* Contains DTOs for the with Enrichments package.
*
*
* @author Forward Group, LLC
* @version 1.0
* @since 2025-12-10
*/
package group.goforward.battlbuilder.enrichment.dto;

2
src/main/java/group/goforward/battlbuilder/enrichment/enums/EnrichmentSource.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.enums;
public enum EnrichmentSource {
AI,

2
src/main/java/group/goforward/battlbuilder/enrichment/enums/EnrichmentStatus.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.enums;
public enum EnrichmentStatus {
PENDING_REVIEW,

2
src/main/java/group/goforward/battlbuilder/enrichment/enums/EnrichmentType.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.enums;
public enum EnrichmentType {
CALIBER,

11
src/main/java/group/goforward/battlbuilder/enrichment/enums/package-info.java Normal file
View File

@@ -0,0 +1,11 @@
/**
* Enumeration package for the BattlBuilder application.
* <p>
* Contains enumerations for the Enrichments package.
*
*
* @author Forward Group, LLC
* @version 1.0
* @since 2025-12-10
*/
package group.goforward.battlbuilder.enrichment.enums;

5
src/main/java/group/goforward/battlbuilder/enrichment/model/ProductEnrichment.java
View File

@@ -1,5 +1,8 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.model;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentSource;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentStatus;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentType;
import jakarta.persistence.*;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;

5
src/main/java/group/goforward/battlbuilder/enrichment/repo/ProductEnrichmentRepository.java
View File

@@ -1,5 +1,8 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.repo;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentStatus;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentType;
import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;

8
src/main/java/group/goforward/battlbuilder/enrichment/service/CaliberEnrichmentService.java
View File

@@ -1,5 +1,11 @@
package group.goforward.battlbuilder.enrichment;
package group.goforward.battlbuilder.enrichment.service;
import group.goforward.battlbuilder.enrichment.domain.CaliberRuleExtractor;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentSource;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentStatus;
import group.goforward.battlbuilder.enrichment.enums.EnrichmentType;
import group.goforward.battlbuilder.enrichment.model.ProductEnrichment;
import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import org.springframework.stereotype.Service;

2
src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java → src/main/java/group/goforward/battlbuilder/repos/build/BrandRepository.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.repos;
package group.goforward.battlbuilder.repos.build;
import group.goforward.battlbuilder.model.Brand;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;

2
src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java → src/main/java/group/goforward/battlbuilder/repos/build/BuildItemRepository.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.repos;
package group.goforward.battlbuilder.repos.build;
import group.goforward.battlbuilder.model.BuildItem;
import org.springframework.data.jpa.repository.JpaRepository;

2
src/main/java/group/goforward/battlbuilder/repos/BuildProfileRepository.java → src/main/java/group/goforward/battlbuilder/repos/build/BuildProfileRepository.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.repos;
package group.goforward.battlbuilder.repos.build;
import group.goforward.battlbuilder.model.BuildProfile;
import org.springframework.data.jpa.repository.JpaRepository;

2
src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java → src/main/java/group/goforward/battlbuilder/repos/build/BuildRepository.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.repos;
package group.goforward.battlbuilder.repos.build;
import group.goforward.battlbuilder.model.Build;
import org.springframework.data.domain.Page;

12
src/main/java/group/goforward/battlbuilder/services/BuildService.java
View File

@@ -1,9 +1,9 @@
package group.goforward.battlbuilder.services;
import group.goforward.battlbuilder.web.dto.BuildDto;
import group.goforward.battlbuilder.web.dto.BuildFeedCardDto;
import group.goforward.battlbuilder.web.dto.BuildSummaryDto;
import group.goforward.battlbuilder.web.dto.UpdateBuildRequest;
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 java.util.List;
import java.util.UUID;
@@ -16,9 +16,9 @@ public interface BuildService {
BuildDto getMyBuild(UUID uuid);
BuildDto createMyBuild(UpdateBuildRequest req);
BuildDto createMyBuild(UpdateBuildRequestDto req);
BuildDto updateMyBuild(UUID uuid, UpdateBuildRequest req);
BuildDto updateMyBuild(UUID uuid, UpdateBuildRequestDto req);
BuildDto getPublicBuild(UUID uuid);

2
src/main/java/group/goforward/battlbuilder/services/CatalogQueryService.java
View File

@@ -1,6 +1,6 @@
package group.goforward.battlbuilder.services;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest;
import org.springframework.data.domain.Page;

4
src/main/java/group/goforward/battlbuilder/services/ProductQueryService.java
View File

@@ -1,7 +1,7 @@
package group.goforward.battlbuilder.services;
import group.goforward.battlbuilder.web.dto.ProductOfferDto;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
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.data.domain.Page;
import org.springframework.data.domain.Pageable;

2
src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java
View File

@@ -2,7 +2,7 @@ package group.goforward.battlbuilder.services.impl;
import group.goforward.battlbuilder.model.Brand;
import group.goforward.battlbuilder.repos.BrandRepository;
import group.goforward.battlbuilder.repos.build.BrandRepository;
import group.goforward.battlbuilder.services.BrandService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

26
src/main/java/group/goforward/battlbuilder/services/impl/BuildServiceImpl.java
View File

@@ -4,17 +4,17 @@ import group.goforward.battlbuilder.model.Build;
import group.goforward.battlbuilder.model.BuildItem;
import group.goforward.battlbuilder.model.BuildProfile;
import group.goforward.battlbuilder.model.ProductOffer;
import group.goforward.battlbuilder.repos.BuildItemRepository;
import group.goforward.battlbuilder.repos.BuildProfileRepository;
import group.goforward.battlbuilder.repos.BuildRepository;
import group.goforward.battlbuilder.repos.build.BuildItemRepository;
import group.goforward.battlbuilder.repos.build.BuildProfileRepository;
import group.goforward.battlbuilder.repos.build.BuildRepository;
import group.goforward.battlbuilder.repos.ProductOfferRepository;
import group.goforward.battlbuilder.security.CurrentUserService;
import group.goforward.battlbuilder.services.BuildService;
import group.goforward.battlbuilder.web.dto.BuildDto;
import group.goforward.battlbuilder.web.dto.BuildFeedCardDto;
import group.goforward.battlbuilder.web.dto.BuildItemDto;
import group.goforward.battlbuilder.web.dto.BuildSummaryDto;
import group.goforward.battlbuilder.web.dto.UpdateBuildRequest;
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.repos.ProductRepository;
import org.springframework.data.domain.PageRequest;
@@ -22,8 +22,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.server.ResponseStatusException;
import java.time.OffsetDateTime;
@@ -189,7 +187,7 @@ public class BuildServiceImpl implements BuildService {
@Override
@Transactional
public BuildDto createMyBuild(UpdateBuildRequest req) {
public BuildDto createMyBuild(UpdateBuildRequestDto req) {
if (req == null) throw new IllegalArgumentException("request body is required");
Integer userId = currentUserService.requireUserId();
@@ -269,7 +267,7 @@ public class BuildServiceImpl implements BuildService {
@Override
@Transactional
public BuildDto updateMyBuild(UUID uuid, UpdateBuildRequest req) {
public BuildDto updateMyBuild(UUID uuid, UpdateBuildRequestDto req) {
if (uuid == null) throw new IllegalArgumentException("uuid is required");
if (req == null) throw new IllegalArgumentException("request body is required");
@@ -326,11 +324,11 @@ public class BuildServiceImpl implements BuildService {
// BuildItem helper
// ---------------------------
private List<BuildItem> buildItemsFromRequest(Build build, List<UpdateBuildRequest.Item> incoming) {
private List<BuildItem> buildItemsFromRequest(Build build, List<UpdateBuildRequestDto.Item> incoming) {
List<BuildItem> out = new ArrayList<>();
if (incoming == null || incoming.isEmpty()) return out;
for (UpdateBuildRequest.Item it : incoming) {
for (UpdateBuildRequestDto.Item it : incoming) {
if (it == null) continue;
if (it.getProductId() == null) continue;
if (it.getSlot() == null || it.getSlot().isBlank()) continue;

2
src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java
View File

@@ -7,7 +7,7 @@ import group.goforward.battlbuilder.repos.ProductRepository;
import group.goforward.battlbuilder.repos.spec.CatalogProductSpecifications;
import group.goforward.battlbuilder.services.CatalogQueryService;
import group.goforward.battlbuilder.services.ShortLinkService;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest;
import group.goforward.battlbuilder.web.mapper.ProductMapper;
import org.springframework.data.domain.*;

3
src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java
View File

@@ -12,7 +12,7 @@ import group.goforward.battlbuilder.model.ImportStatus;
import group.goforward.battlbuilder.model.Merchant;
import group.goforward.battlbuilder.model.Product;
import group.goforward.battlbuilder.model.ProductOffer;
import group.goforward.battlbuilder.repos.BrandRepository;
import group.goforward.battlbuilder.repos.build.BrandRepository;
import group.goforward.battlbuilder.repos.MerchantRepository;
import group.goforward.battlbuilder.repos.ProductOfferRepository;
import group.goforward.battlbuilder.repos.ProductRepository;
@@ -27,7 +27,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.InputStreamReader;
import java.io.Reader;

4
src/main/java/group/goforward/battlbuilder/services/impl/ProductQueryServiceImpl.java
View File

@@ -6,8 +6,8 @@ import group.goforward.battlbuilder.repos.ProductOfferRepository;
import group.goforward.battlbuilder.repos.ProductRepository;
import group.goforward.battlbuilder.services.ProductQueryService;
import group.goforward.battlbuilder.services.ShortLinkService;
import group.goforward.battlbuilder.web.dto.ProductOfferDto;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
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 group.goforward.battlbuilder.web.mapper.ProductMapper;
import org.springframework.data.domain.Page;

2
src/main/java/group/goforward/battlbuilder/web/dto/UpdateBuildRequest.java → src/main/java/group/goforward/battlbuilder/web/dto/UpdateBuildRequestDto.java
View File

@@ -9,7 +9,7 @@ import java.util.List;
* NOTE:
* - We reuse this for BOTH create (POST /me) and update (PUT /me/{uuid}) for MVP speed.
*/
public class UpdateBuildRequest {
public class UpdateBuildRequestDto {
private String title;
private String description;

2
src/main/java/group/goforward/battlbuilder/web/dto/BuildCreateRequest.java → src/main/java/group/goforward/battlbuilder/web/dto/build/BuildCreateRequest.java
View File

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

2
src/main/java/group/goforward/battlbuilder/web/dto/BuildDto.java → src/main/java/group/goforward/battlbuilder/web/dto/build/BuildDto.java
View File

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

2
src/main/java/group/goforward/battlbuilder/web/dto/BuildFeedCardDto.java → src/main/java/group/goforward/battlbuilder/web/dto/build/BuildFeedCardDto.java
View File

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

2
src/main/java/group/goforward/battlbuilder/web/dto/BuildItemDto.java → src/main/java/group/goforward/battlbuilder/web/dto/build/BuildItemDto.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.web.dto;
package group.goforward.battlbuilder.web.dto.build;
import java.math.BigDecimal;
import java.util.UUID;

2
src/main/java/group/goforward/battlbuilder/web/dto/BuildItemSummaryDto.java → src/main/java/group/goforward/battlbuilder/web/dto/build/BuildItemSummaryDto.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.web.dto;
package group.goforward.battlbuilder.web.dto.build;
import java.math.BigDecimal;

2
src/main/java/group/goforward/battlbuilder/web/dto/BuildSummaryDto.java → src/main/java/group/goforward/battlbuilder/web/dto/build/BuildSummaryDto.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.web.dto;
package group.goforward.battlbuilder.web.dto.build;
import group.goforward.battlbuilder.model.Build;

2
src/main/java/group/goforward/battlbuilder/web/dto/ProductDetailsDto.java → src/main/java/group/goforward/battlbuilder/web/dto/product/ProductDetailsDto.java
View File

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

2
src/main/java/group/goforward/battlbuilder/web/dto/ProductDto.java → src/main/java/group/goforward/battlbuilder/web/dto/product/ProductDto.java
View File

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

3
src/main/java/group/goforward/battlbuilder/web/dto/ProductOfferDto.java → src/main/java/group/goforward/battlbuilder/web/dto/product/ProductOfferDto.java
View File

@@ -1,8 +1,7 @@
package group.goforward.battlbuilder.web.dto;
package group.goforward.battlbuilder.web.dto.product;
import java.math.BigDecimal;
import java.time.OffsetDateTime;
import java.util.List;
public class ProductOfferDto {
private String id;

2
src/main/java/group/goforward/battlbuilder/web/dto/ProductSummaryDto.java → src/main/java/group/goforward/battlbuilder/web/dto/product/ProductSummaryDto.java
View File

@@ -1,4 +1,4 @@
package group.goforward.battlbuilder.web.dto;
package group.goforward.battlbuilder.web.dto.product;
import java.math.BigDecimal;

2
src/main/java/group/goforward/battlbuilder/web/mapper/ProductMapper.java
View File

@@ -1,7 +1,7 @@
package group.goforward.battlbuilder.web.mapper;
import group.goforward.battlbuilder.model.Product;
import group.goforward.battlbuilder.web.dto.ProductSummaryDto;
import group.goforward.battlbuilder.web.dto.product.ProductSummaryDto;
import java.math.BigDecimal;