more reorganization of packages

docker/backend/Dockerfile

@@ -1,6 +1,6 @@
 # Stage 1: Build the application (The Build Stage)
 # Use a Java SDK image with Maven pre-installed
-FROM maven:3.9-jdk-17-slim AS build
+FROM maven:3.9-jdk-21-slim AS build
 
 # Set the working directory inside the container
 WORKDIR /app
@@ -17,7 +17,7 @@ RUN mvn clean package -DskipTests
 
 # Stage 2: Create the final lightweight image (The Runtime Stage)
 # Use a smaller Java Runtime Environment (JRE) image for a smaller footprint
-FROM openjdk:17-jre-slim
+FROM openjdk:21
 
 # Set the working directory in the final image
 WORKDIR /app

docker/compose.yaml

@@ -1,9 +0,0 @@
-services:
-  postgres:
-    image: 'postgres:latest'
-    environment:
-      - 'POSTGRES_DB=mydatabase'
-      - 'POSTGRES_PASSWORD=secret'
-      - 'POSTGRES_USER=myuser'
-    ports:
-      - '5432'

src/main/java/group/goforward/battlbuilder/common/ApiResponse.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.utils;
+package group.goforward.battlbuilder.common;
 
 import java.time.LocalDateTime;
 

src/main/java/group/goforward/battlbuilder/common/Counter.java

@@ -1,6 +1,4 @@
-package group.goforward.battlbuilder.utils;
-
-import org.springframework.context.annotation.Bean;
+package group.goforward.battlbuilder.common;
 
 public class Counter {
 

src/main/java/group/goforward/battlbuilder/common/PingController.java

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.utils;
+package group.goforward.battlbuilder.common;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

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

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

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

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;

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

@@ -1,5 +1,5 @@
 // src/main/java/com/example/config/CorsConfig.java
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import org.springframework.context.annotation.Configuration;
 //import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

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

@@ -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;

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

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.configuration;
+package group.goforward.battlbuilder.config;
 
 import group.goforward.battlbuilder.security.JwtAuthenticationFilter;
 import org.springframework.context.annotation.Bean;

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-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;

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

@@ -1,4 +1,4 @@
-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;

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

@@ -1,6 +1,6 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
-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;

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

@@ -1,4 +1,4 @@
-package group.goforward.battlbuilder.controllers.api;
+package group.goforward.battlbuilder.controllers.api.v1;
 
 import group.goforward.battlbuilder.model.ImageMeta;
 import group.goforward.battlbuilder.security.UserPrincipal;

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

@@ -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;

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

@@ -1,4 +1,4 @@
-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;

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

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

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

@@ -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;

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

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

src/main/java/group/goforward/battlbuilder/services/utils/Snippet.java

@@ -1,11 +0,0 @@
-/**
- * Services package for the BattlBuilder application.
- * <p>
- * Contains business logic service classes for product management,
- * category classification, mapping recommendations, and merchant operations.
- * 
- * @author Forward Group, LLC
- * @version 1.0
- * @since 2025-12-10
- */
-package group.goforward.battlbuilder.services.utils;

src/main/resources/application.properties

@@ -71,3 +71,6 @@ app.beta.invite.tokenMinutes=30
 ai.minConfidence=0.75
 ai.openai.apiKey=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
 ai.openai.model=gpt-4.1-mini
+
+# application.properties
+spring.jpa.properties.hibernate.transaction.jta.platform=org.hibernate.engine.transaction.jta.platform.internal.NoopJtaPlatform