fixed the CORS issue

Reviewed-on: https://gitea.gofwd.group/Forward_Group/ballistic-builder-spring/pulls/1

.idea/dataSources.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="r710" uuid="e6a29f5c-71d9-45f0-931b-554bcf8a94ba">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://r710.dev.gofwd.group:5433/postgres</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="ss_builder@r710.gofwd.group" uuid="e0fa459b-2f6c-45f1-9c41-66423c870df9">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <imported>true</imported>
+      <remarks>$PROJECT_DIR$/src/main/resources/application.properties</remarks>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://r710.gofwd.group:5433/ss_builder</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

README.md

@@ -0,0 +1,67 @@
+# Ballistic Builder ( The Armory?) Backend  
+### Internal Engine for the Shadow System Armory?
+
+The Ballistic Backend is the operational backbone behind the Shadown System Armory and its admin tools. It ingests merchant feeds, normalizes product data, manages categories, synchronizes prices, and powers the compatibility, pricing, and product logic behind the consumer-facing Builder.
+
+It’s built for reliability, longevity, and clean extensibility — the kind of foundation you want when scaling from a small beta to a fully public platform.
+
+---
+
+## What This Backend Does
+
+### **Merchant Feed Ingestion**
+- Pulls AvantLink feeds (CSV or TSV)
+- Automatically detects delimiters
+- Normalizes raw merchant fields
+- Creates or updates product records
+- Upserts price and stock offers
+- Tracks first-seen / last-seen timestamps
+- Safely handles malformed or incomplete rows  
+- Ensures repeat imports never duplicate offers
+
+### **Category Mapping Engine**
+- Identifies every unique raw category coming from each merchant feed  
+- Exposes *unmapped* categories in the admin UI  
+- Allows you to assign:  
+  - Part Role  
+  - Product Configuration (Stripped, Complete, Kit, etc.)
+- Applies mappings automatically on future imports  
+- Respects manual overrides such as `platform_locked`
+
+### **Builder Support**
+The frontend Builder depends on this backend for:
+
+- Loading parts grouped by role  
+- Offering compatible options  
+- Calculating build cost  
+- Comparing offers across merchants  
+- Providing product metadata, imagery, and offer data  
+
+**Future expansions include:** price history, compatibility engine, build exports, public build pages, multi-merchant aggregation, and automated anomaly detection.
+
+---
+
+## Tech Stack
+
+- **Spring Boot 3.x**  
+- **Java 17**  
+- **PostgreSQL**  
+- **Hibernate (JPA)**  
+- **HikariCP**  
+- **Apache Commons CSV**  
+- **Maven**  
+- **REST API**
+
+---
+
+## Local Development
+
+### Requirements
+- Java 17 or newer  
+- PostgreSQL running locally  
+- Port 8080 open (default backend port)
+
+### Run Development Server
+
+```bash
+./mvnw spring-boot:run

action1.yaml

@@ -0,0 +1,39 @@
+# File: .gitea/workflows/build-and-upload.yml
+name: Build and Upload Artifact
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Check out repository code
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Step 2: Set up Node.js (example for a JS project; adjust for your stack)
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      # Step 3: Install dependencies
+      - name: Install dependencies
+        run: npm ci
+
+      # Step 4: Build project
+      - name: Build project
+        run: npm run build
+
+      # Step 5: Upload build output as artifact
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-output
+          path: dist/   # Change to your build output directory
+          retention-days: 7  # Optional: how long to keep artifact

docker/backend/Dockerfile

@@ -0,0 +1,34 @@
+# 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
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Copy the Maven project files (pom.xml) first to leverage Docker layer caching
+COPY pom.xml .
+
+# Copy the source code
+COPY src ./src
+
+# Build the Spring Boot application, skipping tests to speed up the Docker build
+# This creates the executable JAR file in the 'target' directory
+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
+
+# Set the working directory in the final image
+WORKDIR /app
+
+# Copy the built JAR file from the 'build' stage into the final image
+# The JAR file is typically named 'target/<your-app-name>-<version>.jar'
+# You may need to adjust the name if you have a non-standard pom.xml
+COPY --from=build /app/target/*.jar app.jar
+
+# Expose the default Spring Boot port
+EXPOSE 8080
+
+# Define the command to run the application
+ENTRYPOINT ["java", "-jar", "app.jar"]

docker/docker-compose.yaml

@@ -0,0 +1,43 @@
+version: '3.8'
+
+services:
+  # --- 1. Spring API Service (Backend) ---
+  ss_builder-api:
+    build:
+      context: ./backend # Path to your Spring project's root folder
+      dockerfile: Dockerfile # Assumes you have a Dockerfile in ./backend
+    container_name: ss_builder-api
+    ports:
+      - "8080:8080" # Map host port 8080 to container port 8080
+    environment:
+      # These environment variables link the API to the database service defined below
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://r710.dev.gofwd.group:5433/ss_builder
+      - SPRING_DATASOURCE_USERNAME=dba
+      - SPRING_DATASOURCE_PASSWORD=!@#Qwerty
+    networks:
+      - app-network
+
+  # --- 2. Next.js App Service (Frontend) ---
+  nextjs-app:
+    build:
+      context: ./frontend # Path to your Next.js project's root folder
+      dockerfile: Dockerfile # Assumes you have a Dockerfile in ./frontend
+    container_name: ss_builder-app
+    ports:
+      - "3000:3000" # Map host port 3000 to container port 3000
+    environment:
+      # This variable is crucial: Next.js needs the URL for the Spring API
+      # Use the Docker internal service name 'spring-api' and its port 8080
+      - NEXT_PUBLIC_API_URL=http://ss_builder-api:8080
+      # For local testing, you might need the host IP for Next.js to call back
+      # - NEXT_PUBLIC_API_URL_LOCAL=http://localhost:8080
+    depends_on:
+      - ss_builder-api
+    networks:
+      - app-network
+
+
+# --- Docker Network for Inter-Container Communication ---
+networks:
+  app-network:
+    driver: bridge

docker/frontend/Dockerfile

@@ -0,0 +1,22 @@
+# Stage 1: Build the static assets
+FROM node:20-alpine as builder
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm install
+COPY . .
+# Run the Next.js build command
+RUN npm run build
+
+# Stage 2: Run the production application (Next.js server)
+FROM node:20-alpine
+WORKDIR /app
+# Copy only the necessary files for running the app
+COPY --from=builder /app/.next ./.next
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/public ./public
+# Set environment variables
+ENV NODE_ENV production
+EXPOSE 3000
+# Run the Next.js production server
+CMD ["npm", "start"]

importLogic.md

@@ -0,0 +1,213 @@
+# Ballistic Import Pipeline  
+A high-level overview of how merchant data flows through the Spring ETL system.
+
+---
+
+## Purpose
+
+This document explains how the Ballistic backend:
+
+1. Fetches merchant product feeds (CSV/TSV)
+2. Normalizes raw data into structured entities  
+3. Updates products and offers in an idempotent way  
+4. Supports two sync modes:
+   - Full Import
+   - Offer-Only Sync
+
+---
+
+# 1. High-Level Flow
+
+## ASCII Diagram
+
+```
+                         ┌──────────────────────────┐
+                         │   /admin/imports/{id}     │
+                         │  (Full Import Trigger)    │
+                         └─────────────┬────────────┘
+                                       │
+                                       ▼
+                        ┌──────────────────────────────┐
+                        │ importMerchantFeed(merchantId)│
+                        └─────────────┬────────────────┘
+                                      │
+                                      ▼
+           ┌────────────────────────────────────────────────────────┐
+           │ readFeedRowsForMerchant()                               │
+           │  - auto-detect delimiter                               │
+           │  - parse CSV/TSV → MerchantFeedRow objects             │
+           └─────────────────┬──────────────────────────────────────┘
+                             │ List<MerchantFeedRow>
+                             ▼
+          ┌──────────────────────────────────────┐
+          │ For each MerchantFeedRow row:        │
+          │  resolveBrand()                      │
+          │  upsertProduct()                     │
+          │    - find existing via brand+mpn/upc │
+          │    - update fields (mapped partRole) │
+          │  upsertOfferFromRow()                │
+          └──────────────────────────────────────┘
+```
+
+---
+
+# 2. Full Import Explained
+
+Triggered by:
+
+```
+POST /admin/imports/{merchantId}
+```
+
+### Step 1 — Load merchant  
+Using `merchantRepository.findById()`.
+
+### Step 2 — Parse feed rows  
+`readFeedRowsForMerchant()`:
+- Auto-detects delimiter (`\t`, `,`, `;`)
+- Validates required headers
+- Parses each row into `MerchantFeedRow`
+
+### Step 3 — Process each row
+
+For each parsed row:
+
+#### a. resolveBrand()
+- Finds or creates brand
+- Defaults to “Aero Precision” if missing
+
+#### b. upsertProduct()
+Dedupes by:
+
+1. Brand + MPN  
+2. Brand + UPC (currently SKU placeholder)  
+
+If no match → create new product.
+
+Then applies:
+- Name + slug
+- Descriptions
+- Images
+- MPN/identifiers
+- Platform inference
+- Category mapping
+- Part role inference
+
+#### c. upsertOfferFromRow()
+Creates or updates a ProductOffer:
+- Prices
+- Stock
+- Buy URL
+- lastSeenAt
+- firstSeenAt when newly created
+
+Idempotent — does not duplicate offers.
+
+---
+
+# 3. Offer-Only Sync
+
+Triggered by:
+
+```
+POST /admin/imports/{merchantId}/offers-only
+```
+
+Does NOT:
+- Create products  
+- Update product fields  
+
+It only updates:
+- price
+- originalPrice
+- inStock
+- buyUrl
+- lastSeenAt
+
+If the offer does not exist, it is skipped.
+
+---
+
+# 4. Auto-Detecting CSV/TSV Parser
+
+The parser:
+
+- Attempts multiple delimiters
+- Validates headers
+- Handles malformed or short rows
+- Never throws on missing columns
+- Returns clean MerchantFeedRow objects
+
+Designed for messy merchant feeds.
+
+---
+
+# 5. Entities Updated During Import
+
+### Product
+- name  
+- slug  
+- short/long description  
+- main image  
+- mpn  
+- upc (future)  
+- platform  
+- rawCategoryKey  
+- partRole  
+
+### ProductOffer
+- merchant
+- product
+- avantlinkProductId (SKU placeholder)
+- price
+- originalPrice
+- inStock
+- buyUrl
+- lastSeenAt
+- firstSeenAt
+
+### Merchant
+- lastFullImportAt
+- lastOfferSyncAt
+
+---
+
+# 6. Extension Points
+
+You can extend the import pipeline in these areas:
+
+- Add per-merchant column mapping  
+- Add true UPC parsing  
+- Support multi-platform parts  
+- Improve partRole inference  
+- Implement global deduplication across merchants  
+
+---
+
+# 7. Quick Reference: Main Methods
+
+| Method | Purpose |
+|--------|---------|
+| importMerchantFeed | Full product + offer import |
+| readFeedRowsForMerchant | Detect delimiter + parse feed |
+| resolveBrand | Normalize brand names |
+| upsertProduct | Idempotent product write |
+| updateProductFromRow | Apply product fields |
+| upsertOfferFromRow | Idempotent offer write |
+| syncOffersOnly | Offer-only sync |
+| upsertOfferOnlyFromRow | Update existing offers |
+| detectCsvFormat | Auto-detect delimiter |
+| fetchFeedRows | Simpler parser for offers |
+
+---
+
+# 8. Summary
+
+The Ballistic importer is:
+
+- Robust against bad data  
+- Idempotent and safe  
+- Flexible for multiple merchants  
+- Extensible for long-term scaling  
+
+This pipeline powers the product catalog and offer data for the Ballistic ecosystem.

pom.xml

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.4.3</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
+
     <groupId>group.goforward</groupId>
     <artifactId>ballistic</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>ballistic</name>
     <description>Ballistic Builder API</description>
+
     <url/>
+
     <licenses>
         <license/>
     </licenses>
+
     <developers>
         <developer>
             <name>Don Strawsburg</name>
@@ -29,68 +35,102 @@
             <organization>Forward Group, LLC</organization>
         </developer>
     </developers>
+
     <scm>
-        <connection/>
-        <developerConnection/>
+        <connection></connection>
+        <developerConnection>scm:git:https://gitea.gofwd.group/Forward_Group/ballistic-builder-spring.git</developerConnection>
         <tag/>
-        <url/>
+        <url>ssh://git@gitea.gofwd.group:2225/Forward_Group/ballistic-builder-spring.git</url>
+
     </scm>
+
     <properties>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+
+        <!--
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
         </dependency>
+        -->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
+
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>2.8.5</version>
         </dependency>
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-docker-compose</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>-->
-        <!-- Jakarta / validation API is pulled by starters; explicit jakarta persistence if needed -->
+
+        <!-- Jakarta persistence API (optional, JPA starter already brings it transitively) -->
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
             <version>3.1.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>42.7.7</version>
             <scope>runtime</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
             <version>1.11.0</version>
         </dependency>
+
+        <!-- Spring Security -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!-- JSON Web Tokens (JJWT) -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.11.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.11.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.11.5</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -104,6 +144,7 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

sql/add_timestamp_columns.sql

@@ -0,0 +1,159 @@
+-- Add timestamp columns (created_at, updated_at, deleted_at) to all tables
+-- PostgreSQL script for ballistic-builder-spring project
+
+-- accounts
+ALTER TABLE accounts
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_accounts_updated_at BEFORE UPDATE ON accounts FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+
+-- affiliate_category_map
+ALTER TABLE affiliate_category_map
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_affiliate_category_map_updated_at BEFORE UPDATE ON affiliate_category_map FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+
+
+-- brands
+ALTER TABLE brands
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_brands_updated_at BEFORE UPDATE ON brands FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+
+-- builds
+ALTER TABLE build_items
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_builds_items_updated_at BEFORE UPDATE ON build_items FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- builds
+ALTER TABLE builds
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_builds_updated_at BEFORE UPDATE ON builds FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- category_mappings
+ALTER TABLE category_mappings
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_category_mappings_updated_at BEFORE UPDATE ON category_mappings FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- feed_imports
+ALTER TABLE feed_imports
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_feed_imports_updated_at BEFORE UPDATE ON feed_imports FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- merchants
+ALTER TABLE merchants
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_merchants_updated_at BEFORE UPDATE ON merchants FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- merchant_category_mappings (truncated table name in search results)
+ALTER TABLE merchant_category_mappings
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_category_mappings_updated_at BEFORE UPDATE ON category_mappings FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- merchant_category_mappings (truncated table name in search results)
+ALTER TABLE merchant_category_map
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_merchant_category_map_updated_at BEFORE UPDATE ON merchant_category_map FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- part_categories
+ALTER TABLE part_categories
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_part_categories_updated_at BEFORE UPDATE ON part_categories FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+
+-- part_role_mappings
+ALTER TABLE part_role_mappings
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_part_role_mappings_updated_at BEFORE UPDATE ON part_role_mappings FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- part_role_mappings
+ALTER TABLE platforms
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_platforms_updated_at BEFORE UPDATE ON platforms FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- price_history
+ALTER TABLE price_history
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_price_history_updated_at BEFORE UPDATE ON price_history FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+--
+-- product_offers
+ALTER TABLE product_offers
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_product_offers_updated_at BEFORE UPDATE ON product_offers FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- products
+ALTER TABLE products
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_products_updated_at BEFORE UPDATE ON products FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+
+-- states
+ALTER TABLE states
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_states_updated_at BEFORE UPDATE ON states FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+-- users
+ALTER TABLE users
+    ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMP WITH TIME ZONE;
+CREATE TRIGGER update_users_updated_at BEFORE UPDATE ON users FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+
+-- Create function to automatically update updated_at timestamp
+CREATE OR REPLACE FUNCTION update_updated_at_column()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = CURRENT_TIMESTAMP;
+    RETURN NEW;
+END;
+$$ language 'plpgsql';
+
+-- Create triggers for all tables to auto-update updated_at on row modification
+CREATE TRIGGER update_accounts_updated_at BEFORE UPDATE ON accounts FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_affiliate_category_map_updated_at BEFORE UPDATE ON affiliate_category_map FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_brands_updated_at BEFORE UPDATE ON brands FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_builds_updated_at BEFORE UPDATE ON builds FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_builds_items_updated_at BEFORE UPDATE ON build_items FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_merchants_updated_at BEFORE UPDATE ON merchants FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_merchant_category_mappings_updated_at BEFORE UPDATE ON merchant_category_mappings FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+
+CREATE TRIGGER update_part_role_mappings_updated_at BEFORE UPDATE ON part_role_mappings FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_price_history_updated_at BEFORE UPDATE ON price_history FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_product_offers_updated_at BEFORE UPDATE ON product_offers FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
+CREATE TRIGGER update_products_updated_at BEFORE UPDATE ON products FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();

src/main/java/group/goforward/ballistic/ApiResponse.java

@@ -2,6 +2,9 @@ package group.goforward.ballistic;
 
 import java.time.LocalDateTime;
 
+/**
+ * @param <T>
+ */
 public class ApiResponse<T> {
 
     private static final String API_SUCCESS = "success";

src/main/java/group/goforward/ballistic/BallisticApplication.java

@@ -3,11 +3,11 @@ package group.goforward.ballistic;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
- //@ComponentScan(basePackages = "group.goforward.ballistic")
+@EnableCaching
 @EntityScan(basePackages = "group.goforward.ballistic.model")
 @EnableJpaRepositories(basePackages = "group.goforward.ballistic.repos")
 public class BallisticApplication {

src/main/java/group/goforward/ballistic/configuration/CacheConfig.java

@@ -0,0 +1,16 @@
+package group.goforward.ballistic.configuration;
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class CacheConfig {
+
+    @Bean
+    public CacheManager cacheManager() {
+        // Simple in-memory cache for dev/local
+        return new ConcurrentMapCacheManager("gunbuilderProducts");
+    }
+}

src/main/java/group/goforward/ballistic/configuration/CorsConfig.java

@@ -30,14 +30,11 @@ public class CorsConfig {
                 "https://localhost:8080",
                 "http://localhost:3000",
                 "https://localhost:3000",
-                "http://192.168.11.210:8070",
-                "https://192.168.11.210:8070",
-                "http://citysites.gofwd.group",
-                "https://citysites.gofwd.group",
-                "http://citysites.gofwd.group:8070",
-                "https://citysites.gofwd.group:8070"
-
-        ));
+                "https://localhost:3000/gunbuilder",
+                "http://localhost:3000/gunbuilder",
+                "https://localhost:3000/builder",
+                "http://localhost:3000/builder"
+      ));
 
         // Allow all headers
         config.addAllowedHeader("*");

src/main/java/group/goforward/ballistic/configuration/PasswordConfig.java

@@ -0,0 +1,16 @@
+package group.goforward.ballistic.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+// @Configuration
+// public class PasswordConfig {
+
+//     @Bean
+//     public PasswordEncoder passwordEncoder() {
+//         // BCrypt default password
+//         return new BCryptPasswordEncoder();
+//     }
+// }

src/main/java/group/goforward/ballistic/configuration/SecurityConfig.java

@@ -0,0 +1,59 @@
+package group.goforward.ballistic.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+            .csrf(AbstractHttpConfigurer::disable)
+            .sessionManagement(sm ->
+                sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+            )
+            .authorizeHttpRequests(auth -> auth
+                
+                // Auth endpoints always open
+                .requestMatchers("/api/auth/**").permitAll()
+                
+                // Swagger / docs
+                .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll()
+                
+                // Health
+                .requestMatchers("/actuator/health", "/actuator/info").permitAll()
+                
+                // Public product endpoints
+                .requestMatchers("/api/products/gunbuilder/**").permitAll()
+
+                // Everything else (for now) also open – we can tighten later
+                .anyRequest().permitAll()
+            );
+
+        return http.build();
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        // BCrypt is a solid default for user passwords
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager(
+            AuthenticationConfiguration configuration
+    ) throws Exception {
+        return configuration.getAuthenticationManager();
+    }
+}

src/main/java/group/goforward/ballistic/configuration/package-info.java

@@ -1 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Configurations for the ballistic -Builder application.
+ * This package includes Configurations for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Don Strawsburg
+ * @version 1.1
+ */
 package group.goforward.ballistic.configuration;

src/main/java/group/goforward/ballistic/controllers/AuthController.java

@@ -0,0 +1,102 @@
+package group.goforward.ballistic.controllers;
+
+import group.goforward.ballistic.model.User;
+import group.goforward.ballistic.repos.UserRepository;
+import group.goforward.ballistic.security.JwtService;
+import group.goforward.ballistic.web.dto.auth.AuthResponse;
+import group.goforward.ballistic.web.dto.auth.LoginRequest;
+import group.goforward.ballistic.web.dto.auth.RegisterRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/api/auth")
+@CrossOrigin
+public class AuthController {
+
+    private final UserRepository users;
+    private final PasswordEncoder passwordEncoder;
+    private final JwtService jwtService;
+
+    public AuthController(
+            UserRepository users,
+            PasswordEncoder passwordEncoder,
+            JwtService jwtService
+    ) {
+        this.users = users;
+        this.passwordEncoder = passwordEncoder;
+        this.jwtService = jwtService;
+    }
+
+    @PostMapping("/register")
+    public ResponseEntity<?> register(@RequestBody RegisterRequest request) {
+        String email = request.getEmail().trim().toLowerCase();
+
+        if (users.existsByEmailIgnoreCaseAndDeletedAtIsNull(email)) {
+            return ResponseEntity
+                    .status(HttpStatus.CONFLICT)
+                    .body("Email is already registered");
+        }
+
+        User user = new User();
+        // Let DB generate id
+        user.setUuid(UUID.randomUUID()); 
+        user.setEmail(email);
+        user.setPasswordHash(passwordEncoder.encode(request.getPassword()));
+        user.setDisplayName(request.getDisplayName());
+        user.setRole("USER");
+        user.setIsActive(true);
+        user.setCreatedAt(OffsetDateTime.now());
+        user.setUpdatedAt(OffsetDateTime.now());
+
+        users.save(user);
+
+        String token = jwtService.generateToken(user);
+
+        AuthResponse response = new AuthResponse(
+                token,
+                user.getEmail(),
+                user.getDisplayName(),
+                user.getRole()
+        );
+
+        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+    }
+
+    @PostMapping("/login")
+    public ResponseEntity<?> login(@RequestBody LoginRequest request) {
+        String email = request.getEmail().trim().toLowerCase();
+
+        User user = users.findByEmailIgnoreCaseAndDeletedAtIsNull(email)
+                .orElse(null);
+
+        if (user == null || !user.getIsActive()) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid credentials");
+        }
+
+        if (!passwordEncoder.matches(request.getPassword(), user.getPasswordHash())) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid credentials");
+        }
+
+        user.setLastLoginAt(OffsetDateTime.now());
+        user.incrementLoginCount();
+        user.setUpdatedAt(OffsetDateTime.now());
+        users.save(user);
+
+        String token = jwtService.generateToken(user);
+
+        AuthResponse response = new AuthResponse(
+                token,
+                user.getEmail(),
+                user.getDisplayName(),
+                user.getRole()
+        );
+
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/group/goforward/ballistic/controllers/BrandController.java

@@ -0,0 +1,51 @@
+package group.goforward.ballistic.controllers;
+
+import group.goforward.ballistic.model.Brand;
+import group.goforward.ballistic.model.State;
+import group.goforward.ballistic.repos.BrandRepository;
+import group.goforward.ballistic.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/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());
+    }
+}

src/main/java/group/goforward/ballistic/controllers/CategoryController.java

@@ -0,0 +1,34 @@
+package group.goforward.ballistic.controllers;
+
+import group.goforward.ballistic.repos.PartCategoryRepository;
+import group.goforward.ballistic.web.dto.admin.PartCategoryDto;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/categories")
+@CrossOrigin // you can tighten origins later
+public class CategoryController {
+
+    private final PartCategoryRepository partCategories;
+
+    public CategoryController(PartCategoryRepository partCategories) {
+        this.partCategories = partCategories;
+    }
+
+    @GetMapping
+    public List<PartCategoryDto> list() {
+        return partCategories.findAllByOrderByGroupNameAscSortOrderAscNameAsc()
+                .stream()
+                .map(pc -> new PartCategoryDto(
+                        pc.getId(),
+                        pc.getSlug(),
+                        pc.getName(),
+                        pc.getDescription(),
+                        pc.getGroupName(),
+                        pc.getSortOrder()
+                ))
+                .toList();
+    }
+}

src/main/java/group/goforward/ballistic/controllers/ImportController.java

@@ -1,22 +1,39 @@
 package group.goforward.ballistic.controllers;
 
-import group.goforward.ballistic.imports.MerchantFeedImportService;
+import group.goforward.ballistic.services.MerchantFeedImportService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/admin/imports")
+@CrossOrigin(origins = "http://localhost:3000")
 public class ImportController {
 
-    private final MerchantFeedImportService importService;
+    private final MerchantFeedImportService merchantFeedImportService;
 
-    public ImportController(MerchantFeedImportService importService) {
-        this.importService = importService;
+    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) {
-        importService.importMerchantFeed(merchantId);
-        return ResponseEntity.accepted().build();
+        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();
     }
 }

src/main/java/group/goforward/ballistic/controllers/MerchantAdminController.java

@@ -0,0 +1,63 @@
+// MerchantAdminController.java
+package group.goforward.ballistic.controllers;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import group.goforward.ballistic.model.Merchant;
+import group.goforward.ballistic.repos.MerchantRepository;
+import group.goforward.ballistic.web.dto.MerchantAdminDto;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/admin/merchants")
+@CrossOrigin(origins = "http://localhost:3000") // TEMP for Cross-Origin Bug
+public class MerchantAdminController {
+
+    private final MerchantRepository merchantRepository;
+
+    public MerchantAdminController(MerchantRepository merchantRepository) {
+        this.merchantRepository = merchantRepository;
+    }
+
+    @GetMapping
+    public List<MerchantAdminDto> listMerchants() {
+        return merchantRepository.findAll().stream().map(this::toDto).toList();
+    }
+
+    @PutMapping("/{id}")
+    public MerchantAdminDto updateMerchant(
+            @PathVariable Integer id,
+            @RequestBody MerchantAdminDto payload
+    ) {
+        Merchant merchant = merchantRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("Merchant not found"));
+
+        merchant.setFeedUrl(payload.getFeedUrl());
+        merchant.setOfferFeedUrl(payload.getOfferFeedUrl());
+        merchant.setIsActive(payload.getIsActive() != null ? payload.getIsActive() : true);
+        // don’t touch last* here; those are set by import jobs
+
+        merchant = merchantRepository.save(merchant);
+        return toDto(merchant);
+    }
+
+    private MerchantAdminDto toDto(Merchant m) {
+        MerchantAdminDto dto = new MerchantAdminDto();
+        dto.setId(m.getId());
+        dto.setName(m.getName());
+        dto.setFeedUrl(m.getFeedUrl());
+        dto.setOfferFeedUrl(m.getOfferFeedUrl());
+        dto.setIsActive(m.getIsActive());
+        dto.setLastFullImportAt(m.getLastFullImportAt());
+        dto.setLastOfferSyncAt(m.getLastOfferSyncAt());
+        return dto;
+    }
+}

src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java

@@ -0,0 +1,65 @@
+package group.goforward.ballistic.controllers;
+
+import group.goforward.ballistic.model.Merchant;
+import group.goforward.ballistic.model.MerchantCategoryMapping;
+import group.goforward.ballistic.repos.MerchantRepository;
+import group.goforward.ballistic.services.MerchantCategoryMappingService;
+import group.goforward.ballistic.web.dto.MerchantCategoryMappingDto;
+import group.goforward.ballistic.web.dto.UpsertMerchantCategoryMappingRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/admin/merchant-category-mappings")
+@CrossOrigin
+public class MerchantCategoryMappingController {
+
+    private final MerchantCategoryMappingService mappingService;
+    private final MerchantRepository merchantRepository;
+
+    public MerchantCategoryMappingController(
+            MerchantCategoryMappingService mappingService,
+            MerchantRepository merchantRepository
+    ) {
+        this.mappingService = mappingService;
+        this.merchantRepository = merchantRepository;
+    }
+
+    @GetMapping
+    public List<MerchantCategoryMappingDto> listMappings(
+            @RequestParam("merchantId") Integer merchantId
+    ) {
+        List<MerchantCategoryMapping> mappings = mappingService.findByMerchant(merchantId);
+        return mappings.stream()
+                .map(this::toDto)
+                .collect(Collectors.toList());
+    }
+
+    @PostMapping
+    public MerchantCategoryMappingDto upsertMapping(
+            @RequestBody UpsertMerchantCategoryMappingRequest request
+    ) {
+        Merchant merchant = merchantRepository
+                .findById(request.getMerchantId())
+                .orElseThrow(() -> new IllegalArgumentException("Merchant not found: " + request.getMerchantId()));
+
+        MerchantCategoryMapping mapping = mappingService.upsertMapping(
+                merchant,
+                request.getRawCategory(),
+                request.getMappedPartRole()
+        );
+
+        return toDto(mapping);
+    }
+
+    private MerchantCategoryMappingDto toDto(MerchantCategoryMapping mapping) {
+        MerchantCategoryMappingDto dto = new MerchantCategoryMappingDto();
+        dto.setId(mapping.getId());
+        dto.setMerchantId(mapping.getMerchant().getId());
+        dto.setMerchantName(mapping.getMerchant().getName());
+        dto.setRawCategory(mapping.getRawCategory());
+        dto.setMappedPartRole(mapping.getMappedPartRole());
+        return dto;
+    }
+}

src/main/java/group/goforward/ballistic/controllers/ProductController.java

@@ -3,9 +3,11 @@ package group.goforward.ballistic.controllers;
 import group.goforward.ballistic.model.Product;
 import group.goforward.ballistic.model.ProductOffer;
 import group.goforward.ballistic.repos.ProductOfferRepository;
+import group.goforward.ballistic.web.dto.ProductOfferDto;
 import group.goforward.ballistic.repos.ProductRepository;
 import group.goforward.ballistic.web.dto.ProductSummaryDto;
 import group.goforward.ballistic.web.mapper.ProductMapper;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -29,35 +31,54 @@ public class ProductController {
     }
 
     @GetMapping("/gunbuilder")
+    @Cacheable(
+            value = "gunbuilderProducts",
+            key = "#platform + '::' + (#partRoles == null ? 'ALL' : #partRoles.toString())"
+    )
     public List<ProductSummaryDto> getGunbuilderProducts(
             @RequestParam(defaultValue = "AR-15") String platform,
             @RequestParam(required = false, name = "partRoles") List<String> partRoles
     ) {
-        // 1) Load products
+        long started = System.currentTimeMillis();
+        System.out.println("getGunbuilderProducts: start, platform=" + platform +
+                ", partRoles=" + (partRoles == null ? "null" : partRoles));
+
+        // 1) Load products (with brand pre-fetched)
+        long tProductsStart = System.currentTimeMillis();
         List<Product> products;
         if (partRoles == null || partRoles.isEmpty()) {
-            products = productRepository.findByPlatform(platform);
+            products = productRepository.findByPlatformWithBrand(platform);
         } else {
-            products = productRepository.findByPlatformAndPartRoleIn(platform, partRoles);
+            products = productRepository.findByPlatformAndPartRoleInWithBrand(platform, partRoles);
         }
+        long tProductsEnd = System.currentTimeMillis();
+        System.out.println("getGunbuilderProducts: loaded products: " +
+                products.size() + " in " + (tProductsEnd - tProductsStart) + " ms");
 
         if (products.isEmpty()) {
+            long took = System.currentTimeMillis() - started;
+            System.out.println("getGunbuilderProducts: 0 products in " + took + " ms");
             return List.of();
         }
 
-        // 2) Load offers for these product IDs (Integer IDs)
+        // 2) Load offers for these product IDs
+        long tOffersStart = System.currentTimeMillis();
         List<Integer> productIds = products.stream()
                 .map(Product::getId)
                 .toList();
 
         List<ProductOffer> allOffers =
                 productOfferRepository.findByProductIdIn(productIds);
+        long tOffersEnd = System.currentTimeMillis();
+        System.out.println("getGunbuilderProducts: loaded offers: " +
+                allOffers.size() + " in " + (tOffersEnd - tOffersStart) + " ms");
 
         Map<Integer, List<ProductOffer>> offersByProductId = allOffers.stream()
                 .collect(Collectors.groupingBy(o -> o.getProduct().getId()));
 
         // 3) Map to DTOs with price and buyUrl
-        return products.stream()
+        long tMapStart = System.currentTimeMillis();
+        List<ProductSummaryDto> result = products.stream()
                 .map(p -> {
                     List<ProductOffer> offersForProduct =
                             offersByProductId.getOrDefault(p.getId(), Collections.emptyList());
@@ -70,6 +91,36 @@ public class ProductController {
                     return ProductMapper.toSummary(p, price, buyUrl);
                 })
                 .toList();
+        long tMapEnd = System.currentTimeMillis();
+        long took = System.currentTimeMillis() - started;
+
+        System.out.println("getGunbuilderProducts: mapping to DTOs took " +
+                (tMapEnd - tMapStart) + " ms");
+        System.out.println("getGunbuilderProducts: TOTAL " + took + " ms (" +
+                "products=" + (tProductsEnd - tProductsStart) + " ms, " +
+                "offers=" + (tOffersEnd - tOffersStart) + " ms, " +
+                "map=" + (tMapEnd - tMapStart) + " ms)");
+
+        return result;
+    }
+
+    @GetMapping("/{id}/offers")
+    public List<ProductOfferDto> getOffersForProduct(@PathVariable("id") Integer productId) {
+        List<ProductOffer> offers = productOfferRepository.findByProductId(productId);
+
+        return offers.stream()
+                .map(offer -> {
+                    ProductOfferDto dto = new ProductOfferDto();
+                    dto.setId(offer.getId().toString());
+                    dto.setMerchantName(offer.getMerchant().getName());
+                    dto.setPrice(offer.getEffectivePrice());
+                    dto.setOriginalPrice(offer.getOriginalPrice());
+                    dto.setInStock(Boolean.TRUE.equals(offer.getInStock()));
+                    dto.setBuyUrl(offer.getBuyUrl());
+                    dto.setLastUpdated(offer.getLastSeenAt());
+                    return dto;
+                })
+                .toList();
     }
 
     private ProductOffer pickBestOffer(List<ProductOffer> offers) {

src/main/java/group/goforward/ballistic/controllers/PsaController.java

@@ -1,57 +0,0 @@
-package group.goforward.ballistic.controllers;
-
-import group.goforward.ballistic.model.Psa;
-import group.goforward.ballistic.service.PsaService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-@RestController
-@RequestMapping("/api/psa")
-public class PsaController {
-
-    private final PsaService psaService;
-
-    @Autowired
-    public PsaController(PsaService psaService) {
-        this.psaService = psaService;
-    }
-
-    @GetMapping("/api/getAllPsa")
-    public List<Psa> getAllPsa() {
-        return psaService.findAll();
-    }
-
-    @GetMapping("/api/getPSAById/{id}")
-    public ResponseEntity<Psa> getPsaById(@PathVariable UUID id) {
-        Optional<Psa> psa = psaService.findById(id);
-        return psa.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
-    }
-
-    @PostMapping
-    public Psa createPsa(@RequestBody Psa psa) {
-        return psaService.save(psa);
-    }
-
-    @PutMapping("/api/updatePsa/{id}")
-    public ResponseEntity<Psa> updatePsa(@PathVariable UUID id, @RequestBody Psa psaDetails) {
-        Optional<Psa> psa = psaService.findById(id);
-        if (psa.isPresent()) {
-            Psa updatedPsa = psa.get();
-            // Update fields of the Psa entity as needed
-            return ResponseEntity.ok(psaService.save(updatedPsa));
-        } else {
-            return ResponseEntity.notFound().build();
-        }
-    }
-
-    @DeleteMapping("/api/deletePsa/{id}")
-    public ResponseEntity<Void> deletePsa(@PathVariable UUID id) {
-        psaService.deleteById(id);
-        return ResponseEntity.noContent().build();
-    }
-}

src/main/java/group/goforward/ballistic/controllers/StateController.java

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

src/main/java/group/goforward/ballistic/controllers/UserController.java

@@ -0,0 +1,53 @@
+package group.goforward.ballistic.controllers;
+
+import group.goforward.ballistic.model.User;
+import group.goforward.ballistic.repos.UserRepository;
+import group.goforward.ballistic.services.UsersService;
+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/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());
+    }
+}

src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryController.java

@@ -0,0 +1,40 @@
+package group.goforward.ballistic.controllers.admin;
+
+import group.goforward.ballistic.model.PartCategory;
+import group.goforward.ballistic.repos.PartCategoryRepository;
+import group.goforward.ballistic.web.dto.admin.PartCategoryDto;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin/categories")
+@CrossOrigin
+public class AdminCategoryController {
+
+    private final PartCategoryRepository partCategories;
+
+    public AdminCategoryController(PartCategoryRepository partCategories) {
+        this.partCategories = partCategories;
+    }
+
+    @GetMapping
+    public List<PartCategoryDto> listCategories() {
+        return partCategories
+                .findAllByOrderByGroupNameAscSortOrderAscNameAsc()
+                .stream()
+                .map(this::toDto)
+                .toList();
+    }
+
+    private PartCategoryDto toDto(PartCategory entity) {
+        return new PartCategoryDto(
+                entity.getId(),
+                entity.getSlug(),
+                entity.getName(),
+                entity.getDescription(),
+                entity.getGroupName(),
+                entity.getSortOrder()
+        );
+    }
+}

src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryMappingController.java

@@ -0,0 +1,117 @@
+package group.goforward.ballistic.controllers.admin;
+
+import group.goforward.ballistic.model.CategoryMapping;
+import group.goforward.ballistic.model.Merchant;
+import group.goforward.ballistic.model.PartCategory;
+import group.goforward.ballistic.repos.CategoryMappingRepository;
+import group.goforward.ballistic.repos.MerchantRepository;
+import group.goforward.ballistic.repos.PartCategoryRepository;
+import group.goforward.ballistic.web.dto.admin.MerchantCategoryMappingDto;
+import group.goforward.ballistic.web.dto.admin.SimpleMerchantDto;
+import group.goforward.ballistic.web.dto.admin.UpdateMerchantCategoryMappingRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin/category-mappings")
+@CrossOrigin // you can tighten origins later
+public class AdminCategoryMappingController {
+
+    private final CategoryMappingRepository categoryMappingRepository;
+    private final MerchantRepository merchantRepository;
+    private final PartCategoryRepository partCategoryRepository;
+
+    public AdminCategoryMappingController(
+            CategoryMappingRepository categoryMappingRepository,
+            MerchantRepository merchantRepository,
+            PartCategoryRepository partCategoryRepository
+    ) {
+        this.categoryMappingRepository = categoryMappingRepository;
+        this.merchantRepository = merchantRepository;
+        this.partCategoryRepository = partCategoryRepository;
+    }
+
+    /**
+     * Merchants that have at least one category_mappings row.
+     * Used for the "All Merchants" dropdown in the UI.
+     */
+    @GetMapping("/merchants")
+    public List<SimpleMerchantDto> listMerchantsWithMappings() {
+        List<Merchant> merchants = categoryMappingRepository.findDistinctMerchantsWithMappings();
+        return merchants.stream()
+                .map(m -> new SimpleMerchantDto(m.getId(), m.getName()))
+                .toList();
+    }
+
+    /**
+     * List mappings for a specific merchant, or all mappings if no merchantId is provided.
+     * GET /api/admin/category-mappings?merchantId=1
+     */
+    @GetMapping
+    public List<MerchantCategoryMappingDto> listByMerchant(
+            @RequestParam(name = "merchantId", required = false) Integer merchantId
+    ) {
+        List<CategoryMapping> mappings;
+
+        if (merchantId != null) {
+            mappings = categoryMappingRepository.findByMerchantIdOrderByRawCategoryPathAsc(merchantId);
+        } else {
+            // fall back to all mappings; you can add a more specific repository method later if desired
+            mappings = categoryMappingRepository.findAll();
+        }
+
+        return mappings.stream()
+                .map(cm -> new MerchantCategoryMappingDto(
+                        cm.getId(),
+                        cm.getMerchant().getId(),
+                        cm.getMerchant().getName(),
+                        cm.getRawCategoryPath(),
+                        cm.getPartCategory() != null ? cm.getPartCategory().getId() : null,
+                        cm.getPartCategory() != null ? cm.getPartCategory().getName() : null
+                ))
+                .toList();
+    }
+
+    /**
+     * Update a single mapping's part_category.
+     * POST /api/admin/category-mappings/{id}
+     * Body: { "partCategoryId": 24 }
+     */
+    @PostMapping("/{id}")
+    public MerchantCategoryMappingDto updateMapping(
+            @PathVariable Integer id,
+            @RequestBody UpdateMerchantCategoryMappingRequest request
+    ) {
+        CategoryMapping mapping = categoryMappingRepository.findById(id)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Mapping not found"));
+
+        PartCategory partCategory = null;
+        if (request.partCategoryId() != null) {
+            partCategory = partCategoryRepository.findById(request.partCategoryId())
+                    .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Part category not found"));
+        }
+
+        mapping.setPartCategory(partCategory);
+        mapping = categoryMappingRepository.save(mapping);
+
+        return new MerchantCategoryMappingDto(
+                mapping.getId(),
+                mapping.getMerchant().getId(),
+                mapping.getMerchant().getName(),
+                mapping.getRawCategoryPath(),
+                mapping.getPartCategory() != null ? mapping.getPartCategory().getId() : null,
+                mapping.getPartCategory() != null ? mapping.getPartCategory().getName() : null
+        );
+    }
+    @PutMapping("/{id}")
+    public MerchantCategoryMappingDto updateMappingPut(
+            @PathVariable Integer id,
+            @RequestBody UpdateMerchantCategoryMappingRequest request
+    ) {
+        // just delegate so POST & PUT behave the same
+        return updateMapping(id, request);
+    }
+}

src/main/java/group/goforward/ballistic/controllers/admin/AdminPartRoleMappingController.java

@@ -0,0 +1,123 @@
+package group.goforward.ballistic.controllers.admin;
+
+import group.goforward.ballistic.model.PartCategory;
+import group.goforward.ballistic.model.PartRoleMapping;
+import group.goforward.ballistic.repos.PartCategoryRepository;
+import group.goforward.ballistic.repos.PartRoleMappingRepository;
+import group.goforward.ballistic.web.dto.admin.AdminPartRoleMappingDto;
+import group.goforward.ballistic.web.dto.admin.CreatePartRoleMappingRequest;
+import group.goforward.ballistic.web.dto.admin.UpdatePartRoleMappingRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin/part-role-mappings")
+@CrossOrigin
+public class AdminPartRoleMappingController {
+
+    private final PartRoleMappingRepository partRoleMappingRepository;
+    private final PartCategoryRepository partCategoryRepository;
+
+    public AdminPartRoleMappingController(
+            PartRoleMappingRepository partRoleMappingRepository,
+            PartCategoryRepository partCategoryRepository
+    ) {
+        this.partRoleMappingRepository = partRoleMappingRepository;
+        this.partCategoryRepository = partCategoryRepository;
+    }
+
+    // GET /api/admin/part-role-mappings?platform=AR-15
+    @GetMapping
+    public List<AdminPartRoleMappingDto> list(
+            @RequestParam(name = "platform", required = false) String platform
+    ) {
+        List<PartRoleMapping> mappings;
+
+        if (platform != null && !platform.isBlank()) {
+            mappings = partRoleMappingRepository.findByPlatformOrderByPartRoleAsc(platform);
+        } else {
+            mappings = partRoleMappingRepository.findAll();
+        }
+
+        return mappings.stream()
+                .map(this::toDto)
+                .toList();
+    }
+
+    // POST /api/admin/part-role-mappings
+    @PostMapping
+    public AdminPartRoleMappingDto create(
+            @RequestBody CreatePartRoleMappingRequest request
+    ) {
+        PartCategory category = partCategoryRepository.findBySlug(request.categorySlug())
+                .orElseThrow(() -> new ResponseStatusException(
+                        HttpStatus.BAD_REQUEST,
+                        "PartCategory not found for slug: " + request.categorySlug()
+                ));
+
+        PartRoleMapping mapping = new PartRoleMapping();
+        mapping.setPlatform(request.platform());
+        mapping.setPartRole(request.partRole());
+        mapping.setPartCategory(category);
+        mapping.setNotes(request.notes());
+
+        mapping = partRoleMappingRepository.save(mapping);
+        return toDto(mapping);
+    }
+
+    // PUT /api/admin/part-role-mappings/{id}
+    @PutMapping("/{id}")
+    public AdminPartRoleMappingDto update(
+            @PathVariable Integer id,
+            @RequestBody UpdatePartRoleMappingRequest request
+    ) {
+        PartRoleMapping mapping = partRoleMappingRepository.findById(id)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Mapping not found"));
+
+        if (request.platform() != null) {
+            mapping.setPlatform(request.platform());
+        }
+        if (request.partRole() != null) {
+            mapping.setPartRole(request.partRole());
+        }
+        if (request.categorySlug() != null) {
+            PartCategory category = partCategoryRepository.findBySlug(request.categorySlug())
+                    .orElseThrow(() -> new ResponseStatusException(
+                            HttpStatus.BAD_REQUEST,
+                            "PartCategory not found for slug: " + request.categorySlug()
+                    ));
+            mapping.setPartCategory(category);
+        }
+        if (request.notes() != null) {
+            mapping.setNotes(request.notes());
+        }
+
+        mapping = partRoleMappingRepository.save(mapping);
+        return toDto(mapping);
+    }
+
+    // DELETE /api/admin/part-role-mappings/{id}
+    @DeleteMapping("/{id}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void delete(@PathVariable Integer id) {
+        if (!partRoleMappingRepository.existsById(id)) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Mapping not found");
+        }
+        partRoleMappingRepository.deleteById(id);
+    }
+
+    private AdminPartRoleMappingDto toDto(PartRoleMapping mapping) {
+        PartCategory cat = mapping.getPartCategory();
+        return new AdminPartRoleMappingDto(
+                mapping.getId(),
+                mapping.getPlatform(),
+                mapping.getPartRole(),
+                cat != null ? cat.getSlug() : null,
+                cat != null ? cat.getGroupName() : null,
+                mapping.getNotes()
+        );
+    }
+}

src/main/java/group/goforward/ballistic/controllers/admin/PartCategoryAdminController.java

@@ -0,0 +1,35 @@
+package group.goforward.ballistic.controllers.admin;
+
+import group.goforward.ballistic.model.PartCategory;
+import group.goforward.ballistic.repos.PartCategoryRepository;
+import group.goforward.ballistic.web.dto.admin.PartCategoryDto;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin/part-categories")
+@CrossOrigin // keep it loose for now, you can tighten origins later
+public class PartCategoryAdminController {
+
+    private final PartCategoryRepository partCategories;
+
+    public PartCategoryAdminController(PartCategoryRepository partCategories) {
+        this.partCategories = partCategories;
+    }
+
+    @GetMapping
+    public List<PartCategoryDto> list() {
+        return partCategories.findAllByOrderByGroupNameAscSortOrderAscNameAsc()
+                .stream()
+                .map(pc -> new PartCategoryDto(
+                        pc.getId(),
+                        pc.getSlug(),
+                        pc.getName(),
+                        pc.getDescription(),
+                        pc.getGroupName(),
+                        pc.getSortOrder()
+                ))
+                .toList();
+    }
+}

src/main/java/group/goforward/ballistic/controllers/package-info.java

@@ -0,0 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Controllers for the ballistic -Builder application.
+ * This package includes Controllers for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Don Strawsburg
+ * @version 1.1
+ */
+package group.goforward.ballistic.controllers;

src/main/java/group/goforward/ballistic/imports/MerchantFeedImportService.java

@@ -1,9 +0,0 @@
-package group.goforward.ballistic.imports;
-
-public interface MerchantFeedImportService {
-
-    /**
-     * Import the feed for a given merchant id.
-     */
-    void importMerchantFeed(Integer merchantId);
-}

src/main/java/group/goforward/ballistic/imports/MerchantFeedImportServiceImpl.java

@@ -1,469 +0,0 @@
-package group.goforward.ballistic.imports;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.io.Reader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-
-import group.goforward.ballistic.model.Brand;
-import group.goforward.ballistic.model.Merchant;
-import group.goforward.ballistic.model.Product;
-import group.goforward.ballistic.repos.BrandRepository;
-import group.goforward.ballistic.repos.MerchantRepository;
-import group.goforward.ballistic.repos.ProductRepository;
-import group.goforward.ballistic.repos.MerchantCategoryMapRepository;
-import group.goforward.ballistic.model.MerchantCategoryMap;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import group.goforward.ballistic.repos.ProductOfferRepository;
-import group.goforward.ballistic.model.ProductOffer;
-
-import java.time.OffsetDateTime;
-
-@Service
-@Transactional
-public class MerchantFeedImportServiceImpl implements MerchantFeedImportService {
-
-    private final MerchantRepository merchantRepository;
-    private final BrandRepository brandRepository;
-    private final ProductRepository productRepository;
-    private final MerchantCategoryMapRepository merchantCategoryMapRepository;
-    private final ProductOfferRepository productOfferRepository;
-
-    public MerchantFeedImportServiceImpl(MerchantRepository merchantRepository,
-                                         BrandRepository brandRepository,
-                                         ProductRepository productRepository,
-                                         MerchantCategoryMapRepository merchantCategoryMapRepository,
-                                         ProductOfferRepository productOfferRepository) {
-        this.merchantRepository = merchantRepository;
-        this.brandRepository = brandRepository;
-        this.productRepository = productRepository;
-        this.merchantCategoryMapRepository = merchantCategoryMapRepository;
-        this.productOfferRepository = productOfferRepository;
-    }
-
-    @Override
-    public void importMerchantFeed(Integer merchantId) {
-        System.out.println("IMPORT >>> importMerchantFeed(" + merchantId + ")");
-
-        Merchant merchant = merchantRepository.findById(merchantId)
-                .orElseThrow(() -> new IllegalArgumentException("Merchant not found: " + merchantId));
-
-        // Read all rows from the merchant feed
-        List<MerchantFeedRow> rows = readFeedRowsForMerchant(merchant);
-        System.out.println("IMPORT >>> read " + rows.size() + " rows for merchant=" + merchant.getName());
-
-        for (MerchantFeedRow row : rows) {
-            // Resolve brand from the row (fallback to "Aero Precision" or whatever you want as default)
-            Brand brand = resolveBrand(row);
-            Product p = upsertProduct(merchant, brand, row);
-
-            System.out.println("IMPORT >>> upserted product id=" + p.getId()
-                    + ", name=" + p.getName()
-                    + ", slug=" + p.getSlug()
-                    + ", platform=" + p.getPlatform()
-                    + ", partRole=" + p.getPartRole()
-                    + ", merchant=" + merchant.getName());
-        }
-    }
-
-    // ---------------------------------------------------------------------
-    //  Upsert logic
-    // ---------------------------------------------------------------------
-
-    private Product upsertProduct(Merchant merchant, Brand brand, MerchantFeedRow row) {
-        System.out.println("IMPORT >>> upsertProduct brand=" + brand.getName()
-                + ", sku=" + row.sku()
-                + ", productName=" + row.productName());
-
-        String mpn = trimOrNull(row.manufacturerId());
-        String upc = trimOrNull(row.sku()); // placeholder until real UPC field
-
-        List<Product> candidates = Collections.emptyList();
-
-        if (mpn != null) {
-            candidates = productRepository.findAllByBrandAndMpn(brand, mpn);
-        }
-        if ((candidates == null || candidates.isEmpty()) && upc != null) {
-            candidates = productRepository.findAllByBrandAndUpc(brand, upc);
-        }
-
-        Product p;
-        boolean isNew = (candidates == null || candidates.isEmpty());
-
-        if (isNew) {
-            p = new Product();
-            p.setBrand(brand);
-        } else {
-            if (candidates.size() > 1) {
-                System.out.println("IMPORT !!! WARNING: multiple existing products found for brand="
-                        + brand.getName() + ", mpn=" + mpn + ", upc=" + upc
-                        + ". Using the first match (id=" + candidates.get(0).getId() + ")");
-            }
-            p = candidates.get(0);
-        }
-
-        updateProductFromRow(p, merchant, row, isNew);
-
-        // Save the product first
-        Product saved = productRepository.save(p);
-
-        // Then upsert the offer for this row
-        upsertOfferFromRow(saved, merchant, row);
-
-        return saved;
-    }
-
-    private void updateProductFromRow(Product p, Merchant merchant, MerchantFeedRow row, boolean isNew) {
-        // ---------- NAME ----------
-        String name = coalesce(
-                trimOrNull(row.productName()),
-                trimOrNull(row.shortDescription()),
-                trimOrNull(row.longDescription()),
-                trimOrNull(row.sku())
-        );
-        if (name == null) {
-            name = "Unknown Product";
-        }
-        p.setName(name);
-
-        // ---------- SLUG ----------
-        if (isNew || p.getSlug() == null || p.getSlug().isBlank()) {
-            String baseForSlug = coalesce(
-                    trimOrNull(name),
-                    trimOrNull(row.sku())
-            );
-            if (baseForSlug == null) {
-                baseForSlug = "product-" + System.currentTimeMillis();
-            }
-
-            String slug = baseForSlug
-                    .toLowerCase()
-                    .replaceAll("[^a-z0-9]+", "-")
-                    .replaceAll("(^-|-$)", "");
-            if (slug.isBlank()) {
-                slug = "product-" + System.currentTimeMillis();
-            }
-
-            String uniqueSlug = generateUniqueSlug(slug);
-            p.setSlug(uniqueSlug);
-        }
-
-        // ---------- DESCRIPTIONS ----------
-        p.setShortDescription(trimOrNull(row.shortDescription()));
-        p.setDescription(trimOrNull(row.longDescription()));
-
-        // ---------- IMAGE ----------
-        String mainImage = coalesce(
-                trimOrNull(row.imageUrl()),
-                trimOrNull(row.mediumImageUrl()),
-                trimOrNull(row.thumbUrl())
-        );
-        p.setMainImageUrl(mainImage);
-
-        // ---------- IDENTIFIERS ----------
-        String mpn = coalesce(
-                trimOrNull(row.manufacturerId()),
-                trimOrNull(row.sku())
-        );
-        p.setMpn(mpn);
-
-        // UPC placeholder
-        p.setUpc(null);
-
-        // ---------- PLATFORM ----------
-        String platform = inferPlatform(row);
-        p.setPlatform(platform != null ? platform : "AR-15");
-
-        // ---------- RAW CATEGORY KEY (for debugging / analytics) ----------
-        String rawCategoryKey = buildRawCategoryKey(row);
-        p.setRawCategoryKey(rawCategoryKey);
-
-        // ---------- PART ROLE ----------
-        String partRole = resolvePartRole(merchant, row);
-        if (partRole == null || partRole.isBlank()) {
-            partRole = "unknown";
-        }
-        p.setPartRole(partRole);
-    }
-    private void upsertOfferFromRow(Product product, Merchant merchant, MerchantFeedRow row) {
-        // For now, we’ll use SKU as the "avantlinkProductId" placeholder.
-        // If/when you have a real AvantLink product_id in the feed, switch to that.
-        String avantlinkProductId = trimOrNull(row.sku());
-        if (avantlinkProductId == null) {
-            // If there's truly no SKU, bail out – we can't match this offer reliably.
-            System.out.println("IMPORT !!! skipping offer: no SKU for product id=" + product.getId());
-            return;
-        }
-    
-        // Simple approach: always create a new offer row.
-        // (If you want idempotent imports later, we can add a repository finder
-        //  like findByProductAndMerchantAndAvantlinkProductId(...) and reuse the row.)
-        ProductOffer offer = new ProductOffer();
-        offer.setProduct(product);
-        offer.setMerchant(merchant);
-        offer.setAvantlinkProductId(avantlinkProductId);
-    
-        // Identifiers
-        offer.setSku(trimOrNull(row.sku()));
-        // No real UPC in this feed yet – leave null for now
-        offer.setUpc(null);
-    
-        // Buy URL
-        offer.setBuyUrl(trimOrNull(row.buyLink()));
-    
-        // Prices from feed
-        BigDecimal retail = row.retailPrice(); // parsed as BigDecimal in readFeedRowsForMerchant
-        BigDecimal sale   = row.salePrice();
-    
-        BigDecimal effectivePrice;
-        BigDecimal originalPrice;
-    
-        if (sale != null) {
-            effectivePrice = sale;
-            originalPrice = (retail != null ? retail : sale);
-        } else {
-            effectivePrice = retail;
-            originalPrice = retail;
-        }
-    
-        offer.setPrice(effectivePrice);
-        offer.setOriginalPrice(originalPrice);
-    
-        // Currency + stock
-        offer.setCurrency("USD");
-        // We don't have a real stock flag in this CSV, so assume in-stock for now
-        offer.setInStock(Boolean.TRUE);
-    
-        // Timestamps
-        OffsetDateTime now = OffsetDateTime.now();
-        offer.setLastSeenAt(now);
-        offer.setFirstSeenAt(now); // first import: treat now as first seen
-    
-        productOfferRepository.save(offer);
-    }
-
-    private String resolvePartRole(Merchant merchant, MerchantFeedRow row) {
-        // Build a merchant-specific raw category key like "Department > Category > SubCategory"
-        String rawCategoryKey = buildRawCategoryKey(row);
-
-        if (rawCategoryKey != null) {
-            MerchantCategoryMap mapping = merchantCategoryMapRepository
-                    .findByMerchantAndRawCategoryIgnoreCase(merchant, rawCategoryKey)
-                    .orElse(null);
-
-            if (mapping != null && mapping.isEnabled()) {
-                String mappedPartRole = trimOrNull(mapping.getPartRole());
-                if (mappedPartRole != null && !mappedPartRole.isBlank()) {
-                    return mappedPartRole;
-                }
-            }
-        }
-
-        // Fallback: keyword-based inference
-        String keywordRole = inferPartRole(row);
-        if (keywordRole != null && !keywordRole.isBlank()) {
-            return keywordRole;
-        }
-
-        // Last resort: log as unmapped and return null/unknown
-        System.out.println("IMPORT !!! UNMAPPED CATEGORY for merchant=" + merchant.getName()
-                + ", rawCategoryKey='" + rawCategoryKey + "'"
-                + ", sku=" + row.sku()
-                + ", productName=" + row.productName());
-
-        return null;
-    }
-
-    // ---------------------------------------------------------------------
-    //  Feed reading + brand resolution
-    // ---------------------------------------------------------------------
-
-    private List<MerchantFeedRow> readFeedRowsForMerchant(Merchant merchant) {
-        String rawFeedUrl = merchant.getFeedUrl();
-        if (rawFeedUrl == null || rawFeedUrl.isBlank()) {
-            throw new IllegalStateException("Merchant " + merchant.getName() + " has no feed_url configured");
-        }
-
-        String feedUrl = rawFeedUrl.trim();
-        System.out.println("IMPORT >>> reading feed for merchant=" + merchant.getName() + " from: " + feedUrl);
-
-        List<MerchantFeedRow> rows = new ArrayList<>();
-
-        try (Reader reader = (feedUrl.startsWith("http://") || feedUrl.startsWith("https://"))
-                ? new InputStreamReader(new URL(feedUrl).openStream(), StandardCharsets.UTF_8)
-                : java.nio.file.Files.newBufferedReader(java.nio.file.Paths.get(feedUrl), StandardCharsets.UTF_8);
-             CSVParser parser = CSVFormat.DEFAULT
-                     .withFirstRecordAsHeader()
-                     .withIgnoreSurroundingSpaces()
-                     .withTrim()
-                     .parse(reader)) {
-
-            for (CSVRecord rec : parser) {
-                MerchantFeedRow row = new MerchantFeedRow(
-                        rec.get("SKU"),
-                        rec.get("Manufacturer Id"),
-                        rec.get("Brand Name"),
-                        rec.get("Product Name"),
-                        rec.get("Long Description"),
-                        rec.get("Short Description"),
-                        rec.get("Department"),
-                        rec.get("Category"),
-                        rec.get("SubCategory"),
-                        rec.get("Thumb URL"),
-                        rec.get("Image URL"),
-                        rec.get("Buy Link"),
-                        rec.get("Keywords"),
-                        rec.get("Reviews"),
-                        parseBigDecimal(rec.get("Retail Price")),
-                        parseBigDecimal(rec.get("Sale Price")),
-                        rec.get("Brand Page Link"),
-                        rec.get("Brand Logo Image"),
-                        rec.get("Product Page View Tracking"),
-                        rec.get("Variants XML"),
-                        rec.get("Medium Image URL"),
-                        rec.get("Product Content Widget"),
-                        rec.get("Google Categorization"),
-                        rec.get("Item Based Commission")
-                );
-
-                rows.add(row);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Failed to read feed for merchant "
-                    + merchant.getName() + " from " + feedUrl, ex);
-        }
-
-        System.out.println("IMPORT >>> parsed " + rows.size() + " rows for merchant=" + merchant.getName());
-        return rows;
-    }
-
-    private Brand resolveBrand(MerchantFeedRow row) {
-        String rawBrand = trimOrNull(row.brandName());
-        final String brandName = (rawBrand != null) ? rawBrand : "Aero Precision";
-    
-        return brandRepository.findByNameIgnoreCase(brandName)
-                .orElseGet(() -> {
-                    Brand b = new Brand();
-                    b.setName(brandName);
-                    return brandRepository.save(b);
-                });
-    }
-
-    private String getCol(String[] cols, int index) {
-        return (index >= 0 && index < cols.length) ? cols[index] : null;
-    }
-
-    private BigDecimal parseBigDecimal(String raw) {
-        if (raw == null) return null;
-        String trimmed = raw.trim();
-        if (trimmed.isEmpty()) return null;
-        try {
-            return new BigDecimal(trimmed);
-        } catch (NumberFormatException ex) {
-            System.out.println("IMPORT !!! bad BigDecimal value: '" + raw + "', skipping");
-            return null;
-        }
-    }
-
-    // ---------------------------------------------------------------------
-    //  Misc helpers
-    // ---------------------------------------------------------------------
-
-    private String trimOrNull(String value) {
-        if (value == null) return null;
-        String trimmed = value.trim();
-        return trimmed.isEmpty() ? null : trimmed;
-    }
-
-    private String coalesce(String... values) {
-        if (values == null) return null;
-        for (String v : values) {
-            if (v != null && !v.isBlank()) {
-                return v;
-            }
-        }
-        return null;
-    }
-
-    private String generateUniqueSlug(String baseSlug) {
-        String candidate = baseSlug;
-        int suffix = 1;
-        while (productRepository.existsBySlug(candidate)) {
-            candidate = baseSlug + "-" + suffix;
-            suffix++;
-        }
-        return candidate;
-    }
-
-    private String buildRawCategoryKey(MerchantFeedRow row) {
-        String dept = trimOrNull(row.department());
-        String cat = trimOrNull(row.category());
-        String sub = trimOrNull(row.subCategory());
-
-        java.util.List<String> parts = new java.util.ArrayList<>();
-        if (dept != null) parts.add(dept);
-        if (cat != null) parts.add(cat);
-        if (sub != null) parts.add(sub);
-
-        if (parts.isEmpty()) {
-            return null;
-        }
-
-        return String.join(" > ", parts);
-    }
-
-    private String inferPlatform(MerchantFeedRow row) {
-        String department = coalesce(trimOrNull(row.department()), trimOrNull(row.category()));
-        if (department == null) return null;
-
-        String lower = department.toLowerCase();
-        if (lower.contains("ar-15") || lower.contains("ar15")) return "AR-15";
-        if (lower.contains("ar-10") || lower.contains("ar10")) return "AR-10";
-        if (lower.contains("ak-47") || lower.contains("ak47")) return "AK-47";
-
-        return "AR-15";
-    }
-
-    private String inferPartRole(MerchantFeedRow row) {
-        String cat = coalesce(
-                trimOrNull(row.subCategory()),
-                trimOrNull(row.category())
-        );
-        if (cat == null) return null;
-
-        String lower = cat.toLowerCase();
-
-        if (lower.contains("handguard") || lower.contains("rail")) {
-            return "handguard";
-        }
-        if (lower.contains("barrel")) {
-            return "barrel";
-        }
-        if (lower.contains("upper")) {
-            return "upper-receiver";
-        }
-        if (lower.contains("lower")) {
-            return "lower-receiver";
-        }
-        if (lower.contains("magazine") || lower.contains("mag")) {
-            return "magazine";
-        }
-        if (lower.contains("stock") || lower.contains("buttstock")) {
-            return "stock";
-        }
-        if (lower.contains("grip")) {
-            return "grip";
-        }
-
-        return "unknown";
-    }
-}

src/main/java/group/goforward/ballistic/imports/dto/package-info.java

@@ -0,0 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Data Transfer Objects for the ballistic -Builder application.
+ * This package includes DTO for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Sean Strawsburg
+ * @version 1.1
+ */
+package group.goforward.ballistic.imports.dto;

src/main/java/group/goforward/ballistic/model/Account.java

@@ -6,6 +6,7 @@ import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import org.hibernate.annotations.ColumnDefault;
 
+import java.time.OffsetDateTime;
 import java.util.UUID;
 
 @Entity
@@ -53,6 +54,15 @@ public class Account {
     @Column(name = "scope", length = Integer.MAX_VALUE)
     private String scope;
 
+    @Column(name = "created_at")
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at")
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at")
+    private OffsetDateTime deletedAt;
+
     public UUID getId() {
         return id;
     }
@@ -157,4 +167,28 @@ public class Account {
         this.scope = scope;
     }
 
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public OffsetDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(OffsetDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
 }

src/main/java/group/goforward/ballistic/model/AeroPrecision.java

@@ -1,293 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.math.BigDecimal;
-import java.util.UUID;
-
-@Entity
-@Table(name = "aero_precision")
-public class
-AeroPrecision {
-    @Id
-    @Column(name = "sku", nullable = false, length = Integer.MAX_VALUE)
-    private String sku;
-
-    @Column(name = "manufacturer_id", length = Integer.MAX_VALUE)
-    private String manufacturerId;
-
-    @Column(name = "brand_name", length = Integer.MAX_VALUE)
-    private String brandName;
-
-    @Column(name = "product_name", length = Integer.MAX_VALUE)
-    private String productName;
-
-    @Column(name = "long_description", length = Integer.MAX_VALUE)
-    private String longDescription;
-
-    @Column(name = "short_description", length = Integer.MAX_VALUE)
-    private String shortDescription;
-
-    @Column(name = "department", length = Integer.MAX_VALUE)
-    private String department;
-
-    @Column(name = "category", length = Integer.MAX_VALUE)
-    private String category;
-
-    @Column(name = "subcategory", length = Integer.MAX_VALUE)
-    private String subcategory;
-
-    @Column(name = "thumb_url", length = Integer.MAX_VALUE)
-    private String thumbUrl;
-
-    @Column(name = "image_url", length = Integer.MAX_VALUE)
-    private String imageUrl;
-
-    @Column(name = "buy_link", length = Integer.MAX_VALUE)
-    private String buyLink;
-
-    @Column(name = "keywords", length = Integer.MAX_VALUE)
-    private String keywords;
-
-    @Column(name = "reviews", length = Integer.MAX_VALUE)
-    private String reviews;
-
-    @Column(name = "retail_price")
-    private BigDecimal retailPrice;
-
-    @Column(name = "sale_price")
-    private BigDecimal salePrice;
-
-    @Column(name = "brand_page_link", length = Integer.MAX_VALUE)
-    private String brandPageLink;
-
-    @Column(name = "brand_logo_image", length = Integer.MAX_VALUE)
-    private String brandLogoImage;
-
-    @Column(name = "product_page_view_tracking", length = Integer.MAX_VALUE)
-    private String productPageViewTracking;
-
-    @Column(name = "variants_xml", length = Integer.MAX_VALUE)
-    private String variantsXml;
-
-    @Column(name = "medium_image_url", length = Integer.MAX_VALUE)
-    private String mediumImageUrl;
-
-    @Column(name = "product_content_widget", length = Integer.MAX_VALUE)
-    private String productContentWidget;
-
-    @Column(name = "google_categorization", length = Integer.MAX_VALUE)
-    private String googleCategorization;
-
-    @Column(name = "item_based_commission", length = Integer.MAX_VALUE)
-    private String itemBasedCommission;
-
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
-    private UUID uuid;
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    public String getManufacturerId() {
-        return manufacturerId;
-    }
-
-    public void setManufacturerId(String manufacturerId) {
-        this.manufacturerId = manufacturerId;
-    }
-
-    public String getBrandName() {
-        return brandName;
-    }
-
-    public void setBrandName(String brandName) {
-        this.brandName = brandName;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    public void setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getSubcategory() {
-        return subcategory;
-    }
-
-    public void setSubcategory(String subcategory) {
-        this.subcategory = subcategory;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-
-    public String getBuyLink() {
-        return buyLink;
-    }
-
-    public void setBuyLink(String buyLink) {
-        this.buyLink = buyLink;
-    }
-
-    public String getKeywords() {
-        return keywords;
-    }
-
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-    public String getReviews() {
-        return reviews;
-    }
-
-    public void setReviews(String reviews) {
-        this.reviews = reviews;
-    }
-
-    public BigDecimal getRetailPrice() {
-        return retailPrice;
-    }
-
-    public void setRetailPrice(BigDecimal retailPrice) {
-        this.retailPrice = retailPrice;
-    }
-
-    public BigDecimal getSalePrice() {
-        return salePrice;
-    }
-
-    public void setSalePrice(BigDecimal salePrice) {
-        this.salePrice = salePrice;
-    }
-
-    public String getBrandPageLink() {
-        return brandPageLink;
-    }
-
-    public void setBrandPageLink(String brandPageLink) {
-        this.brandPageLink = brandPageLink;
-    }
-
-    public String getBrandLogoImage() {
-        return brandLogoImage;
-    }
-
-    public void setBrandLogoImage(String brandLogoImage) {
-        this.brandLogoImage = brandLogoImage;
-    }
-
-    public String getProductPageViewTracking() {
-        return productPageViewTracking;
-    }
-
-    public void setProductPageViewTracking(String productPageViewTracking) {
-        this.productPageViewTracking = productPageViewTracking;
-    }
-
-    public String getVariantsXml() {
-        return variantsXml;
-    }
-
-    public void setVariantsXml(String variantsXml) {
-        this.variantsXml = variantsXml;
-    }
-
-    public String getMediumImageUrl() {
-        return mediumImageUrl;
-    }
-
-    public void setMediumImageUrl(String mediumImageUrl) {
-        this.mediumImageUrl = mediumImageUrl;
-    }
-
-    public String getProductContentWidget() {
-        return productContentWidget;
-    }
-
-    public void setProductContentWidget(String productContentWidget) {
-        this.productContentWidget = productContentWidget;
-    }
-
-    public String getGoogleCategorization() {
-        return googleCategorization;
-    }
-
-    public void setGoogleCategorization(String googleCategorization) {
-        this.googleCategorization = googleCategorization;
-    }
-
-    public String getItemBasedCommission() {
-        return itemBasedCommission;
-    }
-
-    public void setItemBasedCommission(String itemBasedCommission) {
-        this.itemBasedCommission = itemBasedCommission;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/AffiliateCategoryMap.java

@@ -2,26 +2,46 @@ package group.goforward.ballistic.model;
 
 import jakarta.persistence.*;
 
+import java.time.OffsetDateTime;
+
 @Entity
 @Table(name = "affiliate_category_map")
 public class AffiliateCategoryMap {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", nullable = false)
     private Integer id;
 
-    @Column(name = "feedname", nullable = false, length = 100)
-    private String feedname;
+    // e.g. "PART_ROLE", "RAW_CATEGORY", etc.
+    @Column(name = "source_type", nullable = false)
+    private String sourceType;
 
-    @Column(name = "affiliatecategory", nullable = false)
-    private String affiliatecategory;
+    // the value we’re mapping from (e.g. "suppressor", "TRIGGER")
+    @Column(name = "source_value", nullable = false)
+    private String sourceValue;
 
-    @Column(name = "buildercategoryid", nullable = false)
-    private Integer buildercategoryid;
+    // optional platform ("AR-15", "PRECISION", etc.)
+    @Column(name = "platform")
+    private String platform;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "part_category_id", nullable = false)
+    private PartCategory partCategory;
 
     @Column(name = "notes")
     private String notes;
 
+    @Column(name = "created_at")
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at")
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at")
+    private OffsetDateTime deletedAt;
+
+    // --- getters / setters ---
+
     public Integer getId() {
         return id;
     }
@@ -30,28 +50,36 @@ public class AffiliateCategoryMap {
         this.id = id;
     }
 
-    public String getFeedname() {
-        return feedname;
+    public String getSourceType() {
+        return sourceType;
     }
 
-    public void setFeedname(String feedname) {
-        this.feedname = feedname;
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
     }
 
-    public String getAffiliatecategory() {
-        return affiliatecategory;
+    public String getSourceValue() {
+        return sourceValue;
     }
 
-    public void setAffiliatecategory(String affiliatecategory) {
-        this.affiliatecategory = affiliatecategory;
+    public void setSourceValue(String sourceValue) {
+        this.sourceValue = sourceValue;
     }
 
-    public Integer getBuildercategoryid() {
-        return buildercategoryid;
+    public String getPlatform() {
+        return platform;
     }
 
-    public void setBuildercategoryid(Integer buildercategoryid) {
-        this.buildercategoryid = buildercategoryid;
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public PartCategory getPartCategory() {
+        return partCategory;
+    }
+
+    public void setPartCategory(PartCategory partCategory) {
+        this.partCategory = partCategory;
     }
 
     public String getNotes() {
@@ -62,4 +90,27 @@ public class AffiliateCategoryMap {
         this.notes = notes;
     }
 
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public OffsetDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(OffsetDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
 }

src/main/java/group/goforward/ballistic/model/Authenticator.java

@@ -1,88 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name = "authenticator")
-public class Authenticator {
-    @EmbeddedId
-    private AuthenticatorId id;
-
-    @Column(name = "\"providerAccountId\"", nullable = false, length = Integer.MAX_VALUE)
-    private String providerAccountId;
-
-    @Column(name = "\"credentialPublicKey\"", nullable = false, length = Integer.MAX_VALUE)
-    private String credentialPublicKey;
-
-    @Column(name = "counter", nullable = false)
-    private Integer counter;
-
-    @Column(name = "\"credentialDeviceType\"", nullable = false, length = Integer.MAX_VALUE)
-    private String credentialDeviceType;
-
-    @Column(name = "\"credentialBackedUp\"", nullable = false)
-    private Boolean credentialBackedUp = false;
-
-    @Column(name = "transports", length = Integer.MAX_VALUE)
-    private String transports;
-
-    public AuthenticatorId getId() {
-        return id;
-    }
-
-    public void setId(AuthenticatorId id) {
-        this.id = id;
-    }
-
-    public String getProviderAccountId() {
-        return providerAccountId;
-    }
-
-    public void setProviderAccountId(String providerAccountId) {
-        this.providerAccountId = providerAccountId;
-    }
-
-    public String getCredentialPublicKey() {
-        return credentialPublicKey;
-    }
-
-    public void setCredentialPublicKey(String credentialPublicKey) {
-        this.credentialPublicKey = credentialPublicKey;
-    }
-
-    public Integer getCounter() {
-        return counter;
-    }
-
-    public void setCounter(Integer counter) {
-        this.counter = counter;
-    }
-
-    public String getCredentialDeviceType() {
-        return credentialDeviceType;
-    }
-
-    public void setCredentialDeviceType(String credentialDeviceType) {
-        this.credentialDeviceType = credentialDeviceType;
-    }
-
-    public Boolean getCredentialBackedUp() {
-        return credentialBackedUp;
-    }
-
-    public void setCredentialBackedUp(Boolean credentialBackedUp) {
-        this.credentialBackedUp = credentialBackedUp;
-    }
-
-    public String getTransports() {
-        return transports;
-    }
-
-    public void setTransports(String transports) {
-        this.transports = transports;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/AuthenticatorId.java

@@ -1,48 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import org.hibernate.Hibernate;
-
-import java.util.Objects;
-
-@Embeddable
-public class AuthenticatorId implements java.io.Serializable {
-    private static final long serialVersionUID = -4147080603801184737L;
-    @Column(name = "\"credentialId\"", nullable = false, length = Integer.MAX_VALUE)
-    private String credentialId;
-
-    @Column(name = "\"userId\"", nullable = false, length = Integer.MAX_VALUE)
-    private String userId;
-
-    public String getCredentialId() {
-        return credentialId;
-    }
-
-    public void setCredentialId(String credentialId) {
-        this.credentialId = credentialId;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
-        AuthenticatorId entity = (AuthenticatorId) o;
-        return Objects.equals(this.credentialId, entity.credentialId) &&
-                Objects.equals(this.userId, entity.userId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(credentialId, userId);
-    }
-
-}

src/main/java/group/goforward/ballistic/model/BalReseller.java

@@ -1,107 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@Entity
-@Table(name = "bal_resellers")
-public class BalReseller {
-    @Id
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "name", nullable = false, length = 100)
-    private String name;
-
-    @Column(name = "website_url")
-    private String websiteUrl;
-
-    @Column(name = "contact_email", length = 100)
-    private String contactEmail;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
-    private UUID uuid;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getWebsiteUrl() {
-        return websiteUrl;
-    }
-
-    public void setWebsiteUrl(String websiteUrl) {
-        this.websiteUrl = websiteUrl;
-    }
-
-    public String getContactEmail() {
-        return contactEmail;
-    }
-
-    public void setContactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/BbProduct.java

@@ -1,393 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@Entity
-@Table(name = "bb_products")
-public class BbProduct {
-    @Id
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid", nullable = false)
-    private UUID id;
-
-    @Column(name = "\"UPC\"", length = 100)
-    private String upc;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    @Column(name = "\"SKU\"", length = 50)
-    private String sku;
-
-    @Column(name = "\"MANUFACTURER_ID\"", length = 50)
-    private String manufacturerId;
-
-    @Column(name = "\"BRAND_NAME\"", length = 50)
-    private String brandName;
-
-    @Column(name = "\"PRODUCT_NAME\"")
-    private String productName;
-
-    @Column(name = "\"LONG_DESCRIPTION\"", length = Integer.MAX_VALUE)
-    private String longDescription;
-
-    @Column(name = "\"SHORT_DESCRIPTION\"", length = 500)
-    private String shortDescription;
-
-    @Column(name = "\"DEPARTMENT\"", length = 100)
-    private String department;
-
-    @Column(name = "\"CATEGORY\"", length = 100)
-    private String category;
-
-    @Column(name = "\"SUBCATEGORY\"", length = 100)
-    private String subcategory;
-
-    @Column(name = "\"THUMB_URL\"", length = 500)
-    private String thumbUrl;
-
-    @Column(name = "\"IMAGE_URL\"", length = 500)
-    private String imageUrl;
-
-    @Column(name = "\"BUY_LINK\"", length = 500)
-    private String buyLink;
-
-    @Column(name = "\"KEYWORDS\"", length = 500)
-    private String keywords;
-
-    @Column(name = "\"REVIEWS\"", length = 500)
-    private String reviews;
-
-    @Column(name = "\"RETAIL_PRICE\"", length = 50)
-    private String retailPrice;
-
-    @Column(name = "\"SALE_PRICE\"", length = 50)
-    private String salePrice;
-
-    @Column(name = "\"BRAND_PAGE_LINK\"", length = 500)
-    private String brandPageLink;
-
-    @Column(name = "\"BRAND_LOGO_IMAGE\"", length = 500)
-    private String brandLogoImage;
-
-    @Column(name = "\"PRODUCT_PAGE_VIEW_TRACKING\"", length = 500)
-    private String productPageViewTracking;
-
-    @Column(name = "\"PARENT_GROUP_ID\"", length = 200)
-    private String parentGroupId;
-
-    @Column(name = "\"FINELINE\"", length = 200)
-    private String fineline;
-
-    @Column(name = "\"SUPERFINELINE\"", length = 200)
-    private String superfineline;
-
-    @Column(name = "\"MODELNUMBER\"", length = 100)
-    private String modelnumber;
-
-    @Column(name = "\"CALIBER\"", length = 200)
-    private String caliber;
-
-    @Column(name = "\"MEDIUM_IMAGE_URL\"", length = 500)
-    private String mediumImageUrl;
-
-    @Column(name = "\"PRODUCT_CONTENT_WIDGET\"", length = 500)
-    private String productContentWidget;
-
-    @Column(name = "\"GOOGLE_CATEGORIZATION\"", length = 500)
-    private String googleCategorization;
-
-    @Column(name = "\"ITEM_BASED_COMMISSION\"", length = 500)
-    private String itemBasedCommission;
-
-    @Column(name = "\"ITEM_BASED_COMMISSION RATE\"", length = 50)
-    private String itemBasedCommissionRate;
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getUpc() {
-        return upc;
-    }
-
-    public void setUpc(String upc) {
-        this.upc = upc;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    public String getManufacturerId() {
-        return manufacturerId;
-    }
-
-    public void setManufacturerId(String manufacturerId) {
-        this.manufacturerId = manufacturerId;
-    }
-
-    public String getBrandName() {
-        return brandName;
-    }
-
-    public void setBrandName(String brandName) {
-        this.brandName = brandName;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    public void setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getSubcategory() {
-        return subcategory;
-    }
-
-    public void setSubcategory(String subcategory) {
-        this.subcategory = subcategory;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-
-    public String getBuyLink() {
-        return buyLink;
-    }
-
-    public void setBuyLink(String buyLink) {
-        this.buyLink = buyLink;
-    }
-
-    public String getKeywords() {
-        return keywords;
-    }
-
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-    public String getReviews() {
-        return reviews;
-    }
-
-    public void setReviews(String reviews) {
-        this.reviews = reviews;
-    }
-
-    public String getRetailPrice() {
-        return retailPrice;
-    }
-
-    public void setRetailPrice(String retailPrice) {
-        this.retailPrice = retailPrice;
-    }
-
-    public String getSalePrice() {
-        return salePrice;
-    }
-
-    public void setSalePrice(String salePrice) {
-        this.salePrice = salePrice;
-    }
-
-    public String getBrandPageLink() {
-        return brandPageLink;
-    }
-
-    public void setBrandPageLink(String brandPageLink) {
-        this.brandPageLink = brandPageLink;
-    }
-
-    public String getBrandLogoImage() {
-        return brandLogoImage;
-    }
-
-    public void setBrandLogoImage(String brandLogoImage) {
-        this.brandLogoImage = brandLogoImage;
-    }
-
-    public String getProductPageViewTracking() {
-        return productPageViewTracking;
-    }
-
-    public void setProductPageViewTracking(String productPageViewTracking) {
-        this.productPageViewTracking = productPageViewTracking;
-    }
-
-    public String getParentGroupId() {
-        return parentGroupId;
-    }
-
-    public void setParentGroupId(String parentGroupId) {
-        this.parentGroupId = parentGroupId;
-    }
-
-    public String getFineline() {
-        return fineline;
-    }
-
-    public void setFineline(String fineline) {
-        this.fineline = fineline;
-    }
-
-    public String getSuperfineline() {
-        return superfineline;
-    }
-
-    public void setSuperfineline(String superfineline) {
-        this.superfineline = superfineline;
-    }
-
-    public String getModelnumber() {
-        return modelnumber;
-    }
-
-    public void setModelnumber(String modelnumber) {
-        this.modelnumber = modelnumber;
-    }
-
-    public String getCaliber() {
-        return caliber;
-    }
-
-    public void setCaliber(String caliber) {
-        this.caliber = caliber;
-    }
-
-    public String getMediumImageUrl() {
-        return mediumImageUrl;
-    }
-
-    public void setMediumImageUrl(String mediumImageUrl) {
-        this.mediumImageUrl = mediumImageUrl;
-    }
-
-    public String getProductContentWidget() {
-        return productContentWidget;
-    }
-
-    public void setProductContentWidget(String productContentWidget) {
-        this.productContentWidget = productContentWidget;
-    }
-
-    public String getGoogleCategorization() {
-        return googleCategorization;
-    }
-
-    public void setGoogleCategorization(String googleCategorization) {
-        this.googleCategorization = googleCategorization;
-    }
-
-    public String getItemBasedCommission() {
-        return itemBasedCommission;
-    }
-
-    public void setItemBasedCommission(String itemBasedCommission) {
-        this.itemBasedCommission = itemBasedCommission;
-    }
-
-    public String getItemBasedCommissionRate() {
-        return itemBasedCommissionRate;
-    }
-
-    public void setItemBasedCommissionRate(String itemBasedCommissionRate) {
-        this.itemBasedCommissionRate = itemBasedCommissionRate;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/BuildItem.java

@@ -0,0 +1,143 @@
+package group.goforward.ballistic.model;
+
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "build_items")
+public class BuildItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @NotNull
+    @ColumnDefault("gen_random_uuid()")
+    @Column(name = "uuid", nullable = false)
+    private UUID uuid;
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "build_id", nullable = false)
+    private Build build;
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "product_id", nullable = false)
+    private Product product;
+
+    @NotNull
+    @Column(name = "slot", nullable = false, length = Integer.MAX_VALUE)
+    private String slot;
+
+    @NotNull
+    @ColumnDefault("0")
+    @Column(name = "\"position\"", nullable = false)
+    private Integer position;
+
+    @NotNull
+    @ColumnDefault("1")
+    @Column(name = "quantity", nullable = false)
+    private Integer quantity;
+
+    @NotNull
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("CURRENT_TIMESTAMP")
+    @Column(name = "updated_at")
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at")
+    private OffsetDateTime deletedAt;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public Build getBuild() {
+        return build;
+    }
+
+    public void setBuild(Build build) {
+        this.build = build;
+    }
+
+    public Product getProduct() {
+        return product;
+    }
+
+    public void setProduct(Product product) {
+        this.product = product;
+    }
+
+    public String getSlot() {
+        return slot;
+    }
+
+    public void setSlot(String slot) {
+        this.slot = slot;
+    }
+
+    public Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer position) {
+        this.position = position;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public OffsetDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(OffsetDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+}

src/main/java/group/goforward/ballistic/model/Category.java

@@ -1,96 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@Entity
-@Table(name = "categories")
-public class Category {
-    @Id
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "name", nullable = false, length = 100)
-    private String name;
-
-    @Column(name = "parent_category_id")
-    private Integer parentCategoryId;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
-    private UUID uuid;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getParentCategoryId() {
-        return parentCategoryId;
-    }
-
-    public void setParentCategoryId(Integer parentCategoryId) {
-        this.parentCategoryId = parentCategoryId;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/CategoryMapping.java

@@ -0,0 +1,98 @@
+// src/main/java/group/goforward/ballistic/model/CategoryMapping.java
+package group.goforward.ballistic.model;
+
+import jakarta.persistence.*;
+import java.time.OffsetDateTime;
+
+@Entity
+@Table(name = "category_mappings")
+public class CategoryMapping {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "merchant_id", nullable = false)
+    private Merchant merchant;
+
+    @Column(name = "raw_category_path", nullable = false)
+    private String rawCategoryPath;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "part_category_id")
+    private PartCategory partCategory;
+
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt = OffsetDateTime.now();
+
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt = OffsetDateTime.now();
+
+    @PrePersist
+    public void onCreate() {
+        OffsetDateTime now = OffsetDateTime.now();
+        if (createdAt == null) {
+            createdAt = now;
+        }
+        if (updatedAt == null) {
+            updatedAt = now;
+        }
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        this.updatedAt = OffsetDateTime.now();
+    }
+
+    // --- getters & setters ---
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Merchant getMerchant() {
+        return merchant;
+    }
+
+    public void setMerchant(Merchant merchant) {
+        this.merchant = merchant;
+    }
+
+    public String getRawCategoryPath() {
+        return rawCategoryPath;
+    }
+
+    public void setRawCategoryPath(String rawCategoryPath) {
+        this.rawCategoryPath = rawCategoryPath;
+    }
+
+    public PartCategory getPartCategory() {
+        return partCategory;
+    }
+
+    public void setPartCategory(PartCategory partCategory) {
+        this.partCategory = partCategory;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+}

src/main/java/group/goforward/ballistic/model/Compartment.java

@@ -1,85 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@Entity
-@Table(name = "compartment")
-public class Compartment {
-    @Id
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "id", nullable = false)
-    private UUID id;
-
-    @Column(name = "name", nullable = false, length = 100)
-    private String name;
-
-    @Column(name = "description", length = 300)
-    private String description;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/EmailVerificationCode.java

@@ -1,71 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.OffsetDateTime;
-
-@Entity
-@Table(name = "email_verification_codes")
-public class EmailVerificationCode {
-    @Id
-    @ColumnDefault("nextval('email_verification_codes_id_seq')")
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "user_id", nullable = false, length = 21)
-    private String userId;
-
-    @Column(name = "email", nullable = false)
-    private String email;
-
-    @Column(name = "code", nullable = false, length = 8)
-    private String code;
-
-    @Column(name = "expires_at", nullable = false)
-    private OffsetDateTime expiresAt;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public OffsetDateTime getExpiresAt() {
-        return expiresAt;
-    }
-
-    public void setExpiresAt(OffsetDateTime expiresAt) {
-        this.expiresAt = expiresAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/Lipseycatalog.java

@@ -1,909 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-
-@Entity
-@Table(name = "lipseycatalog")
-public class Lipseycatalog {
-    @Id
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "itemno", nullable = false, length = 20)
-    private String itemno;
-
-    @Column(name = "description1", length = Integer.MAX_VALUE)
-    private String description1;
-
-    @Column(name = "description2", length = Integer.MAX_VALUE)
-    private String description2;
-
-    @Column(name = "upc", length = 20)
-    private String upc;
-
-    @Column(name = "manufacturermodelno", length = 30)
-    private String manufacturermodelno;
-
-    @Column(name = "msrp")
-    private Double msrp;
-
-    @Column(name = "model", length = Integer.MAX_VALUE)
-    private String model;
-
-    @Column(name = "calibergauge", length = Integer.MAX_VALUE)
-    private String calibergauge;
-
-    @Column(name = "manufacturer", length = Integer.MAX_VALUE)
-    private String manufacturer;
-
-    @Column(name = "type", length = Integer.MAX_VALUE)
-    private String type;
-
-    @Column(name = "action", length = Integer.MAX_VALUE)
-    private String action;
-
-    @Column(name = "barrellength", length = Integer.MAX_VALUE)
-    private String barrellength;
-
-    @Column(name = "capacity", length = Integer.MAX_VALUE)
-    private String capacity;
-
-    @Column(name = "finish", length = Integer.MAX_VALUE)
-    private String finish;
-
-    @Column(name = "overalllength", length = Integer.MAX_VALUE)
-    private String overalllength;
-
-    @Column(name = "receiver", length = Integer.MAX_VALUE)
-    private String receiver;
-
-    @Column(name = "safety", length = Integer.MAX_VALUE)
-    private String safety;
-
-    @Column(name = "sights", length = Integer.MAX_VALUE)
-    private String sights;
-
-    @Column(name = "stockframegrips", length = Integer.MAX_VALUE)
-    private String stockframegrips;
-
-    @Column(name = "magazine", length = Integer.MAX_VALUE)
-    private String magazine;
-
-    @Column(name = "weight", length = Integer.MAX_VALUE)
-    private String weight;
-
-    @Column(name = "imagename", length = Integer.MAX_VALUE)
-    private String imagename;
-
-    @Column(name = "chamber", length = Integer.MAX_VALUE)
-    private String chamber;
-
-    @Column(name = "drilledandtapped", length = Integer.MAX_VALUE)
-    private String drilledandtapped;
-
-    @Column(name = "rateoftwist", length = Integer.MAX_VALUE)
-    private String rateoftwist;
-
-    @Column(name = "itemtype", length = Integer.MAX_VALUE)
-    private String itemtype;
-
-    @Column(name = "additionalfeature1", length = Integer.MAX_VALUE)
-    private String additionalfeature1;
-
-    @Column(name = "additionalfeature2", length = Integer.MAX_VALUE)
-    private String additionalfeature2;
-
-    @Column(name = "additionalfeature3", length = Integer.MAX_VALUE)
-    private String additionalfeature3;
-
-    @Column(name = "shippingweight", length = Integer.MAX_VALUE)
-    private String shippingweight;
-
-    @Column(name = "boundbookmanufacturer", length = Integer.MAX_VALUE)
-    private String boundbookmanufacturer;
-
-    @Column(name = "boundbookmodel", length = Integer.MAX_VALUE)
-    private String boundbookmodel;
-
-    @Column(name = "boundbooktype", length = Integer.MAX_VALUE)
-    private String boundbooktype;
-
-    @Column(name = "nfathreadpattern", length = Integer.MAX_VALUE)
-    private String nfathreadpattern;
-
-    @Column(name = "nfaattachmentmethod", length = Integer.MAX_VALUE)
-    private String nfaattachmentmethod;
-
-    @Column(name = "nfabaffletype", length = Integer.MAX_VALUE)
-    private String nfabaffletype;
-
-    @Column(name = "silencercanbedisassembled", length = Integer.MAX_VALUE)
-    private String silencercanbedisassembled;
-
-    @Column(name = "silencerconstructionmaterial", length = Integer.MAX_VALUE)
-    private String silencerconstructionmaterial;
-
-    @Column(name = "nfadbreduction", length = Integer.MAX_VALUE)
-    private String nfadbreduction;
-
-    @Column(name = "silenceroutsidediameter", length = Integer.MAX_VALUE)
-    private String silenceroutsidediameter;
-
-    @Column(name = "\"nfaform3Caliber\"", length = Integer.MAX_VALUE)
-    private String nfaform3Caliber;
-
-    @Column(name = "opticmagnification", length = Integer.MAX_VALUE)
-    private String opticmagnification;
-
-    @Column(name = "maintubesize", length = Integer.MAX_VALUE)
-    private String maintubesize;
-
-    @Column(name = "adjustableobjective", length = Integer.MAX_VALUE)
-    private String adjustableobjective;
-
-    @Column(name = "objectivesize", length = Integer.MAX_VALUE)
-    private String objectivesize;
-
-    @Column(name = "opticadjustments", length = Integer.MAX_VALUE)
-    private String opticadjustments;
-
-    @Column(name = "illuminatedreticle", length = Integer.MAX_VALUE)
-    private String illuminatedreticle;
-
-    @Column(name = "reticle", length = Integer.MAX_VALUE)
-    private String reticle;
-
-    @Column(name = "exclusive", length = Integer.MAX_VALUE)
-    private String exclusive;
-
-    @ColumnDefault("NULL")
-    @Column(name = "quantity", length = 10)
-    private String quantity;
-
-    @Column(name = "allocated", length = Integer.MAX_VALUE)
-    private String allocated;
-
-    @Column(name = "onsale", length = Integer.MAX_VALUE)
-    private String onsale;
-
-    @Column(name = "price")
-    private Double price;
-
-    @Column(name = "currentprice")
-    private Double currentprice;
-
-    @Column(name = "retailmap")
-    private Double retailmap;
-
-    @Column(name = "fflrequired", length = Integer.MAX_VALUE)
-    private String fflrequired;
-
-    @Column(name = "sotrequired", length = Integer.MAX_VALUE)
-    private String sotrequired;
-
-    @Column(name = "exclusivetype", length = Integer.MAX_VALUE)
-    private String exclusivetype;
-
-    @Column(name = "scopecoverincluded", length = Integer.MAX_VALUE)
-    private String scopecoverincluded;
-
-    @Column(name = "special", length = Integer.MAX_VALUE)
-    private String special;
-
-    @Column(name = "sightstype", length = Integer.MAX_VALUE)
-    private String sightstype;
-
-    @Column(name = "\"case\"", length = Integer.MAX_VALUE)
-    private String caseField;
-
-    @Column(name = "choke", length = Integer.MAX_VALUE)
-    private String choke;
-
-    @Column(name = "dbreduction", length = Integer.MAX_VALUE)
-    private String dbreduction;
-
-    @Column(name = "family", length = Integer.MAX_VALUE)
-    private String family;
-
-    @Column(name = "finishtype", length = Integer.MAX_VALUE)
-    private String finishtype;
-
-    @Column(name = "frame", length = Integer.MAX_VALUE)
-    private String frame;
-
-    @Column(name = "griptype", length = 30)
-    private String griptype;
-
-    @Column(name = "handgunslidematerial", length = Integer.MAX_VALUE)
-    private String handgunslidematerial;
-
-    @Column(name = "countryoforigin", length = 4)
-    private String countryoforigin;
-
-    @Column(name = "itemlength", length = Integer.MAX_VALUE)
-    private String itemlength;
-
-    @Column(name = "itemwidth", length = Integer.MAX_VALUE)
-    private String itemwidth;
-
-    @Column(name = "itemheight", length = Integer.MAX_VALUE)
-    private String itemheight;
-
-    @Column(name = "packagelength")
-    private Double packagelength;
-
-    @Column(name = "packagewidth")
-    private Double packagewidth;
-
-    @Column(name = "packageheight")
-    private Double packageheight;
-
-    @Column(name = "itemgroup", length = 40)
-    private String itemgroup;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getItemno() {
-        return itemno;
-    }
-
-    public void setItemno(String itemno) {
-        this.itemno = itemno;
-    }
-
-    public String getDescription1() {
-        return description1;
-    }
-
-    public void setDescription1(String description1) {
-        this.description1 = description1;
-    }
-
-    public String getDescription2() {
-        return description2;
-    }
-
-    public void setDescription2(String description2) {
-        this.description2 = description2;
-    }
-
-    public String getUpc() {
-        return upc;
-    }
-
-    public void setUpc(String upc) {
-        this.upc = upc;
-    }
-
-    public String getManufacturermodelno() {
-        return manufacturermodelno;
-    }
-
-    public void setManufacturermodelno(String manufacturermodelno) {
-        this.manufacturermodelno = manufacturermodelno;
-    }
-
-    public Double getMsrp() {
-        return msrp;
-    }
-
-    public void setMsrp(Double msrp) {
-        this.msrp = msrp;
-    }
-
-    public String getModel() {
-        return model;
-    }
-
-    public void setModel(String model) {
-        this.model = model;
-    }
-
-    public String getCalibergauge() {
-        return calibergauge;
-    }
-
-    public void setCalibergauge(String calibergauge) {
-        this.calibergauge = calibergauge;
-    }
-
-    public String getManufacturer() {
-        return manufacturer;
-    }
-
-    public void setManufacturer(String manufacturer) {
-        this.manufacturer = manufacturer;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getBarrellength() {
-        return barrellength;
-    }
-
-    public void setBarrellength(String barrellength) {
-        this.barrellength = barrellength;
-    }
-
-    public String getCapacity() {
-        return capacity;
-    }
-
-    public void setCapacity(String capacity) {
-        this.capacity = capacity;
-    }
-
-    public String getFinish() {
-        return finish;
-    }
-
-    public void setFinish(String finish) {
-        this.finish = finish;
-    }
-
-    public String getOveralllength() {
-        return overalllength;
-    }
-
-    public void setOveralllength(String overalllength) {
-        this.overalllength = overalllength;
-    }
-
-    public String getReceiver() {
-        return receiver;
-    }
-
-    public void setReceiver(String receiver) {
-        this.receiver = receiver;
-    }
-
-    public String getSafety() {
-        return safety;
-    }
-
-    public void setSafety(String safety) {
-        this.safety = safety;
-    }
-
-    public String getSights() {
-        return sights;
-    }
-
-    public void setSights(String sights) {
-        this.sights = sights;
-    }
-
-    public String getStockframegrips() {
-        return stockframegrips;
-    }
-
-    public void setStockframegrips(String stockframegrips) {
-        this.stockframegrips = stockframegrips;
-    }
-
-    public String getMagazine() {
-        return magazine;
-    }
-
-    public void setMagazine(String magazine) {
-        this.magazine = magazine;
-    }
-
-    public String getWeight() {
-        return weight;
-    }
-
-    public void setWeight(String weight) {
-        this.weight = weight;
-    }
-
-    public String getImagename() {
-        return imagename;
-    }
-
-    public void setImagename(String imagename) {
-        this.imagename = imagename;
-    }
-
-    public String getChamber() {
-        return chamber;
-    }
-
-    public void setChamber(String chamber) {
-        this.chamber = chamber;
-    }
-
-    public String getDrilledandtapped() {
-        return drilledandtapped;
-    }
-
-    public void setDrilledandtapped(String drilledandtapped) {
-        this.drilledandtapped = drilledandtapped;
-    }
-
-    public String getRateoftwist() {
-        return rateoftwist;
-    }
-
-    public void setRateoftwist(String rateoftwist) {
-        this.rateoftwist = rateoftwist;
-    }
-
-    public String getItemtype() {
-        return itemtype;
-    }
-
-    public void setItemtype(String itemtype) {
-        this.itemtype = itemtype;
-    }
-
-    public String getAdditionalfeature1() {
-        return additionalfeature1;
-    }
-
-    public void setAdditionalfeature1(String additionalfeature1) {
-        this.additionalfeature1 = additionalfeature1;
-    }
-
-    public String getAdditionalfeature2() {
-        return additionalfeature2;
-    }
-
-    public void setAdditionalfeature2(String additionalfeature2) {
-        this.additionalfeature2 = additionalfeature2;
-    }
-
-    public String getAdditionalfeature3() {
-        return additionalfeature3;
-    }
-
-    public void setAdditionalfeature3(String additionalfeature3) {
-        this.additionalfeature3 = additionalfeature3;
-    }
-
-    public String getShippingweight() {
-        return shippingweight;
-    }
-
-    public void setShippingweight(String shippingweight) {
-        this.shippingweight = shippingweight;
-    }
-
-    public String getBoundbookmanufacturer() {
-        return boundbookmanufacturer;
-    }
-
-    public void setBoundbookmanufacturer(String boundbookmanufacturer) {
-        this.boundbookmanufacturer = boundbookmanufacturer;
-    }
-
-    public String getBoundbookmodel() {
-        return boundbookmodel;
-    }
-
-    public void setBoundbookmodel(String boundbookmodel) {
-        this.boundbookmodel = boundbookmodel;
-    }
-
-    public String getBoundbooktype() {
-        return boundbooktype;
-    }
-
-    public void setBoundbooktype(String boundbooktype) {
-        this.boundbooktype = boundbooktype;
-    }
-
-    public String getNfathreadpattern() {
-        return nfathreadpattern;
-    }
-
-    public void setNfathreadpattern(String nfathreadpattern) {
-        this.nfathreadpattern = nfathreadpattern;
-    }
-
-    public String getNfaattachmentmethod() {
-        return nfaattachmentmethod;
-    }
-
-    public void setNfaattachmentmethod(String nfaattachmentmethod) {
-        this.nfaattachmentmethod = nfaattachmentmethod;
-    }
-
-    public String getNfabaffletype() {
-        return nfabaffletype;
-    }
-
-    public void setNfabaffletype(String nfabaffletype) {
-        this.nfabaffletype = nfabaffletype;
-    }
-
-    public String getSilencercanbedisassembled() {
-        return silencercanbedisassembled;
-    }
-
-    public void setSilencercanbedisassembled(String silencercanbedisassembled) {
-        this.silencercanbedisassembled = silencercanbedisassembled;
-    }
-
-    public String getSilencerconstructionmaterial() {
-        return silencerconstructionmaterial;
-    }
-
-    public void setSilencerconstructionmaterial(String silencerconstructionmaterial) {
-        this.silencerconstructionmaterial = silencerconstructionmaterial;
-    }
-
-    public String getNfadbreduction() {
-        return nfadbreduction;
-    }
-
-    public void setNfadbreduction(String nfadbreduction) {
-        this.nfadbreduction = nfadbreduction;
-    }
-
-    public String getSilenceroutsidediameter() {
-        return silenceroutsidediameter;
-    }
-
-    public void setSilenceroutsidediameter(String silenceroutsidediameter) {
-        this.silenceroutsidediameter = silenceroutsidediameter;
-    }
-
-    public String getNfaform3Caliber() {
-        return nfaform3Caliber;
-    }
-
-    public void setNfaform3Caliber(String nfaform3Caliber) {
-        this.nfaform3Caliber = nfaform3Caliber;
-    }
-
-    public String getOpticmagnification() {
-        return opticmagnification;
-    }
-
-    public void setOpticmagnification(String opticmagnification) {
-        this.opticmagnification = opticmagnification;
-    }
-
-    public String getMaintubesize() {
-        return maintubesize;
-    }
-
-    public void setMaintubesize(String maintubesize) {
-        this.maintubesize = maintubesize;
-    }
-
-    public String getAdjustableobjective() {
-        return adjustableobjective;
-    }
-
-    public void setAdjustableobjective(String adjustableobjective) {
-        this.adjustableobjective = adjustableobjective;
-    }
-
-    public String getObjectivesize() {
-        return objectivesize;
-    }
-
-    public void setObjectivesize(String objectivesize) {
-        this.objectivesize = objectivesize;
-    }
-
-    public String getOpticadjustments() {
-        return opticadjustments;
-    }
-
-    public void setOpticadjustments(String opticadjustments) {
-        this.opticadjustments = opticadjustments;
-    }
-
-    public String getIlluminatedreticle() {
-        return illuminatedreticle;
-    }
-
-    public void setIlluminatedreticle(String illuminatedreticle) {
-        this.illuminatedreticle = illuminatedreticle;
-    }
-
-    public String getReticle() {
-        return reticle;
-    }
-
-    public void setReticle(String reticle) {
-        this.reticle = reticle;
-    }
-
-    public String getExclusive() {
-        return exclusive;
-    }
-
-    public void setExclusive(String exclusive) {
-        this.exclusive = exclusive;
-    }
-
-    public String getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(String quantity) {
-        this.quantity = quantity;
-    }
-
-    public String getAllocated() {
-        return allocated;
-    }
-
-    public void setAllocated(String allocated) {
-        this.allocated = allocated;
-    }
-
-    public String getOnsale() {
-        return onsale;
-    }
-
-    public void setOnsale(String onsale) {
-        this.onsale = onsale;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public Double getCurrentprice() {
-        return currentprice;
-    }
-
-    public void setCurrentprice(Double currentprice) {
-        this.currentprice = currentprice;
-    }
-
-    public Double getRetailmap() {
-        return retailmap;
-    }
-
-    public void setRetailmap(Double retailmap) {
-        this.retailmap = retailmap;
-    }
-
-    public String getFflrequired() {
-        return fflrequired;
-    }
-
-    public void setFflrequired(String fflrequired) {
-        this.fflrequired = fflrequired;
-    }
-
-    public String getSotrequired() {
-        return sotrequired;
-    }
-
-    public void setSotrequired(String sotrequired) {
-        this.sotrequired = sotrequired;
-    }
-
-    public String getExclusivetype() {
-        return exclusivetype;
-    }
-
-    public void setExclusivetype(String exclusivetype) {
-        this.exclusivetype = exclusivetype;
-    }
-
-    public String getScopecoverincluded() {
-        return scopecoverincluded;
-    }
-
-    public void setScopecoverincluded(String scopecoverincluded) {
-        this.scopecoverincluded = scopecoverincluded;
-    }
-
-    public String getSpecial() {
-        return special;
-    }
-
-    public void setSpecial(String special) {
-        this.special = special;
-    }
-
-    public String getSightstype() {
-        return sightstype;
-    }
-
-    public void setSightstype(String sightstype) {
-        this.sightstype = sightstype;
-    }
-
-    public String getCaseField() {
-        return caseField;
-    }
-
-    public void setCaseField(String caseField) {
-        this.caseField = caseField;
-    }
-
-    public String getChoke() {
-        return choke;
-    }
-
-    public void setChoke(String choke) {
-        this.choke = choke;
-    }
-
-    public String getDbreduction() {
-        return dbreduction;
-    }
-
-    public void setDbreduction(String dbreduction) {
-        this.dbreduction = dbreduction;
-    }
-
-    public String getFamily() {
-        return family;
-    }
-
-    public void setFamily(String family) {
-        this.family = family;
-    }
-
-    public String getFinishtype() {
-        return finishtype;
-    }
-
-    public void setFinishtype(String finishtype) {
-        this.finishtype = finishtype;
-    }
-
-    public String getFrame() {
-        return frame;
-    }
-
-    public void setFrame(String frame) {
-        this.frame = frame;
-    }
-
-    public String getGriptype() {
-        return griptype;
-    }
-
-    public void setGriptype(String griptype) {
-        this.griptype = griptype;
-    }
-
-    public String getHandgunslidematerial() {
-        return handgunslidematerial;
-    }
-
-    public void setHandgunslidematerial(String handgunslidematerial) {
-        this.handgunslidematerial = handgunslidematerial;
-    }
-
-    public String getCountryoforigin() {
-        return countryoforigin;
-    }
-
-    public void setCountryoforigin(String countryoforigin) {
-        this.countryoforigin = countryoforigin;
-    }
-
-    public String getItemlength() {
-        return itemlength;
-    }
-
-    public void setItemlength(String itemlength) {
-        this.itemlength = itemlength;
-    }
-
-    public String getItemwidth() {
-        return itemwidth;
-    }
-
-    public void setItemwidth(String itemwidth) {
-        this.itemwidth = itemwidth;
-    }
-
-    public String getItemheight() {
-        return itemheight;
-    }
-
-    public void setItemheight(String itemheight) {
-        this.itemheight = itemheight;
-    }
-
-    public Double getPackagelength() {
-        return packagelength;
-    }
-
-    public void setPackagelength(Double packagelength) {
-        this.packagelength = packagelength;
-    }
-
-    public Double getPackagewidth() {
-        return packagewidth;
-    }
-
-    public void setPackagewidth(Double packagewidth) {
-        this.packagewidth = packagewidth;
-    }
-
-    public Double getPackageheight() {
-        return packageheight;
-    }
-
-    public void setPackageheight(Double packageheight) {
-        this.packageheight = packageheight;
-    }
-
-    public String getItemgroup() {
-        return itemgroup;
-    }
-
-    public void setItemgroup(String itemgroup) {
-        this.itemgroup = itemgroup;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/Manufacturer.java

@@ -1,85 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@Entity
-@Table(name = "manufacturer")
-public class Manufacturer {
-    @Id
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "name", nullable = false, length = 100)
-    private String name;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
-    private UUID uuid;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/Merchant.java

@@ -8,6 +8,7 @@ import java.time.OffsetDateTime;
 @Entity
 @Table(name = "merchants")
 public class Merchant {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
@@ -22,9 +23,18 @@ public class Merchant {
     @Column(name = "feed_url", nullable = false, length = Integer.MAX_VALUE)
     private String feedUrl;
 
+    @Column(name = "offer_feed_url")
+    private String offerFeedUrl;
+
+    @Column(name = "last_full_import_at")
+    private OffsetDateTime lastFullImportAt;
+
+    @Column(name = "last_offer_sync_at")
+    private OffsetDateTime lastOfferSyncAt;
+
     @ColumnDefault("true")
     @Column(name = "is_active", nullable = false)
-    private Boolean isActive = false;
+    private Boolean isActive = true;
 
     @ColumnDefault("now()")
     @Column(name = "created_at", nullable = false)
@@ -34,6 +44,10 @@ public class Merchant {
     @Column(name = "updated_at", nullable = false)
     private OffsetDateTime updatedAt;
 
+    // -----------------------
+    // GETTERS & SETTERS
+    // -----------------------
+
     public Integer getId() {
         return id;
     }
@@ -66,12 +80,36 @@ public class Merchant {
         this.feedUrl = feedUrl;
     }
 
+    public String getOfferFeedUrl() {
+        return offerFeedUrl;
+    }
+
+    public void setOfferFeedUrl(String offerFeedUrl) {
+        this.offerFeedUrl = offerFeedUrl;
+    }
+
+    public OffsetDateTime getLastFullImportAt() {
+        return lastFullImportAt;
+    }
+
+    public void setLastFullImportAt(OffsetDateTime lastFullImportAt) {
+        this.lastFullImportAt = lastFullImportAt;
+    }
+
+    public OffsetDateTime getLastOfferSyncAt() {
+        return lastOfferSyncAt;
+    }
+
+    public void setLastOfferSyncAt(OffsetDateTime lastOfferSyncAt) {
+        this.lastOfferSyncAt = lastOfferSyncAt;
+    }
+
     public Boolean getIsActive() {
         return isActive;
     }
 
-    public void setIsActive(Boolean isActive) {
-        this.isActive = isActive;
+    public void setIsActive(Boolean active) {
+        this.isActive = active;
     }
 
     public OffsetDateTime getCreatedAt() {
@@ -89,5 +127,4 @@ public class Merchant {
     public void setUpdatedAt(OffsetDateTime updatedAt) {
         this.updatedAt = updatedAt;
     }
-
 }

src/main/java/group/goforward/ballistic/model/MerchantCategoryMap.java

@@ -1,41 +1,80 @@
 package group.goforward.ballistic.model;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
 
 @Entity
 @Table(name = "merchant_category_map")
 public class MerchantCategoryMap {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
     private Integer id;
 
+    @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name = "merchant_id", nullable = false)
     private Merchant merchant;
 
-    @Column(name = "raw_category", nullable = false, length = 255)
+    @NotNull
+    @Column(name = "raw_category", nullable = false, length = Integer.MAX_VALUE)
     private String rawCategory;
 
-    // NEW FIELDS
-    @Column(name = "platform")
-    private String platform;            // e.g. "AR-15", "AR-10"
+    @Column(name = "canonical_part_role", length = Integer.MAX_VALUE)
+    private String canonicalPartRole;
 
-    @Column(name = "part_role")
-    private String partRole;            // e.g. "barrel", "handguard"
+    @Column(name = "confidence", precision = 5, scale = 2)
+    private BigDecimal confidence;
 
+    @Column(name = "notes", length = Integer.MAX_VALUE)
+    private String notes;
+
+    @NotNull
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @NotNull
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    @Size(max = 255)
     @Column(name = "canonical_category")
-    private String canonicalCategory;   // e.g. "Rifle Barrels"
+    private String canonicalCategory;
 
+    @NotNull
+    @ColumnDefault("true")
     @Column(name = "enabled", nullable = false)
-    private boolean enabled = true;
+    private Boolean enabled = false;
 
-    // --- getters & setters ---
+    @Size(max = 100)
+    @Column(name = "platform", length = 100)
+    private String platform;
+
+    @Size(max = 100)
+    @Column(name = "part_role", length = 100)
+    private String partRole;
+
+    @Column(name = "deleted_at")
+    private OffsetDateTime deletedAt;
 
     public Integer getId() {
         return id;
     }
 
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
     public Merchant getMerchant() {
         return merchant;
     }
@@ -52,6 +91,62 @@ public class MerchantCategoryMap {
         this.rawCategory = rawCategory;
     }
 
+    public String getCanonicalPartRole() {
+        return canonicalPartRole;
+    }
+
+    public void setCanonicalPartRole(String canonicalPartRole) {
+        this.canonicalPartRole = canonicalPartRole;
+    }
+
+    public BigDecimal getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(BigDecimal confidence) {
+        this.confidence = confidence;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public String getCanonicalCategory() {
+        return canonicalCategory;
+    }
+
+    public void setCanonicalCategory(String canonicalCategory) {
+        this.canonicalCategory = canonicalCategory;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
     public String getPlatform() {
         return platform;
     }
@@ -68,19 +163,12 @@ public class MerchantCategoryMap {
         this.partRole = partRole;
     }
 
-    public String getCanonicalCategory() {
-        return canonicalCategory;
+    public OffsetDateTime getDeletedAt() {
+        return deletedAt;
     }
 
-    public void setCanonicalCategory(String canonicalCategory) {
-        this.canonicalCategory = canonicalCategory;
+    public void setDeletedAt(OffsetDateTime deletedAt) {
+        this.deletedAt = deletedAt;
     }
 
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
 }

src/main/java/group/goforward/ballistic/model/MerchantCategoryMapping.java

@@ -0,0 +1,105 @@
+package group.goforward.ballistic.model;
+
+import jakarta.persistence.*;
+import java.time.OffsetDateTime;
+
+import group.goforward.ballistic.model.ProductConfiguration;
+
+@Entity
+@Table(
+    name = "merchant_category_mappings",
+    uniqueConstraints = @UniqueConstraint(
+        name = "uq_merchant_category",
+        columnNames = { "merchant_id", "raw_category" }
+    )
+)
+public class MerchantCategoryMapping {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY) // SERIAL
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "merchant_id", nullable = false)
+    private Merchant merchant;
+
+    @Column(name = "raw_category", nullable = false, length = 512)
+    private String rawCategory;
+
+    @Column(name = "mapped_part_role", length = 128)
+    private String mappedPartRole; // e.g. "upper-receiver", "barrel"
+
+    @Column(name = "mapped_configuration")
+    @Enumerated(EnumType.STRING)
+    private ProductConfiguration mappedConfiguration;
+
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt = OffsetDateTime.now();
+
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt = OffsetDateTime.now();
+
+    @PreUpdate
+    public void onUpdate() {
+        this.updatedAt = OffsetDateTime.now();
+    }
+
+    // getters & setters
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Merchant getMerchant() {
+        return merchant;
+    }
+
+    public void setMerchant(Merchant merchant) {
+        this.merchant = merchant;
+    }
+
+    public String getRawCategory() {
+        return rawCategory;
+    }
+
+    public void setRawCategory(String rawCategory) {
+        this.rawCategory = rawCategory;
+    }
+
+    public String getMappedPartRole() {
+        return mappedPartRole;
+    }
+
+    public void setMappedPartRole(String mappedPartRole) {
+        this.mappedPartRole = mappedPartRole;
+    }
+
+    public ProductConfiguration getMappedConfiguration() {
+        return mappedConfiguration;
+    }
+
+    public void setMappedConfiguration(ProductConfiguration mappedConfiguration) {
+        this.mappedConfiguration = mappedConfiguration;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+}

src/main/java/group/goforward/ballistic/model/PartCategory.java

@@ -1,24 +1,49 @@
 package group.goforward.ballistic.model;
 
 import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.time.OffsetDateTime;
+import java.util.UUID;
 
 @Entity
 @Table(name = "part_categories")
 public class PartCategory {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
     private Integer id;
 
-    @Column(name = "slug", nullable = false, length = Integer.MAX_VALUE)
+    @Column(name = "slug", nullable = false, unique = true)
     private String slug;
 
-    @Column(name = "name", nullable = false, length = Integer.MAX_VALUE)
+    @Column(name = "name", nullable = false)
     private String name;
 
-    @Column(name = "description", length = Integer.MAX_VALUE)
+    @Column(name = "description")
     private String description;
 
+    @ColumnDefault("gen_random_uuid()")
+    @Column(name = "uuid", nullable = false)
+    private UUID uuid;
+
+    @Column(name = "group_name")
+    private String groupName;
+
+    @Column(name = "sort_order")
+    private Integer sortOrder;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    // --- Getters & Setters ---
+
     public Integer getId() {
         return id;
     }
@@ -51,4 +76,43 @@ public class PartCategory {
         this.description = description;
     }
 
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public Integer getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(Integer sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
 }

src/main/java/group/goforward/ballistic/model/PartRoleCategoryMapping.java

@@ -0,0 +1,56 @@
+package group.goforward.ballistic.model;
+
+import jakarta.persistence.*;
+import java.time.OffsetDateTime;
+
+@Entity
+@Table(name = "part_role_category_mappings",
+       uniqueConstraints = @UniqueConstraint(columnNames = {"platform", "part_role"}))
+public class PartRoleCategoryMapping {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "platform", nullable = false)
+    private String platform;
+
+    @Column(name = "part_role", nullable = false)
+    private String partRole;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "category_slug", referencedColumnName = "slug", nullable = false)
+    private PartCategory category;
+
+    @Column(name = "notes")
+    private String notes;
+
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    // getters/setters…
+
+    public Integer getId() { return id; }
+    public void setId(Integer id) { this.id = id; }
+
+    public String getPlatform() { return platform; }
+    public void setPlatform(String platform) { this.platform = platform; }
+
+    public String getPartRole() { return partRole; }
+    public void setPartRole(String partRole) { this.partRole = partRole; }
+
+    public PartCategory getCategory() { return category; }
+    public void setCategory(PartCategory category) { this.category = category; }
+
+    public String getNotes() { return notes; }
+    public void setNotes(String notes) { this.notes = notes; }
+
+    public OffsetDateTime getCreatedAt() { return createdAt; }
+    public void setCreatedAt(OffsetDateTime createdAt) { this.createdAt = createdAt; }
+
+    public OffsetDateTime getUpdatedAt() { return updatedAt; }
+    public void setUpdatedAt(OffsetDateTime updatedAt) { this.updatedAt = updatedAt; }
+}

src/main/java/group/goforward/ballistic/model/PartRoleMapping.java

@@ -0,0 +1,65 @@
+package group.goforward.ballistic.model;
+
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = "part_role_mappings")
+public class PartRoleMapping {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(nullable = false)
+    private String platform;   // e.g. "AR-15"
+
+    @Column(name = "part_role", nullable = false)
+    private String partRole;   // e.g. "UPPER", "BARREL", etc.
+
+    @ManyToOne(optional = false)
+    @JoinColumn(name = "part_category_id")
+    private PartCategory partCategory;
+
+    @Column(columnDefinition = "text")
+    private String notes;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public String getPartRole() {
+        return partRole;
+    }
+
+    public void setPartRole(String partRole) {
+        this.partRole = partRole;
+    }
+
+    public PartCategory getPartCategory() {
+        return partCategory;
+    }
+
+    public void setPartCategory(PartCategory partCategory) {
+        this.partCategory = partCategory;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+}

src/main/java/group/goforward/ballistic/model/PasswordResetToken.java

@@ -1,47 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-import java.time.OffsetDateTime;
-
-@Entity
-@Table(name = "password_reset_tokens")
-public class PasswordResetToken {
-    @Id
-    @Column(name = "id", nullable = false, length = 40)
-    private String id;
-
-    @Column(name = "user_id", nullable = false, length = 21)
-    private String userId;
-
-    @Column(name = "expires_at", nullable = false)
-    private OffsetDateTime expiresAt;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public OffsetDateTime getExpiresAt() {
-        return expiresAt;
-    }
-
-    public void setExpiresAt(OffsetDateTime expiresAt) {
-        this.expiresAt = expiresAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/Platform.java

@@ -0,0 +1,84 @@
+package group.goforward.ballistic.model;
+
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.time.OffsetDateTime;
+
+@Entity
+@Table(name = "platforms")
+public class Platform {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @NotNull
+    @Column(name = "key", nullable = false, length = Integer.MAX_VALUE)
+    private String key;
+
+    @NotNull
+    @Column(name = "label", nullable = false, length = Integer.MAX_VALUE)
+    private String label;
+
+    @ColumnDefault("CURRENT_TIMESTAMP")
+    @Column(name = "created_at")
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("CURRENT_TIMESTAMP")
+    @Column(name = "updated_at")
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at")
+    private OffsetDateTime deletedAt;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public OffsetDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(OffsetDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+}

src/main/java/group/goforward/ballistic/model/Post.java

@@ -1,116 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-
-@Entity
-@Table(name = "posts")
-public class Post {
-    @Id
-    @Column(name = "id", nullable = false, length = 15)
-    private String id;
-
-    @Column(name = "user_id", nullable = false)
-    private String userId;
-
-    @Column(name = "title", nullable = false)
-    private String title;
-
-    @Column(name = "excerpt", nullable = false)
-    private String excerpt;
-
-    @Column(name = "content", nullable = false, length = Integer.MAX_VALUE)
-    private String content;
-
-    @ColumnDefault("'draft'")
-    @Column(name = "status", nullable = false, length = 10)
-    private String status;
-
-    @Column(name = "tags")
-    private String tags;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "updated_at")
-    private Instant updatedAt;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getExcerpt() {
-        return excerpt;
-    }
-
-    public void setExcerpt(String excerpt) {
-        this.excerpt = excerpt;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/Product.java

@@ -3,9 +3,36 @@ package group.goforward.ballistic.model;
 import jakarta.persistence.*;
 import java.time.Instant;
 import java.util.UUID;
+import java.math.BigDecimal;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.Set;
+import java.util.HashSet;
+
+import group.goforward.ballistic.model.ProductOffer;
+import group.goforward.ballistic.model.ProductConfiguration;
 
 @Entity
 @Table(name = "products")
+@NamedQuery(name="Products.findByPlatformWithBrand", query= "" +
+    "SELECT p FROM Product p" +
+    " JOIN FETCH p.brand b" +
+    " WHERE p.platform = :platform" +
+    " AND p.deletedAt IS NULL")
+
+@NamedQuery(name="Product.findByPlatformAndPartRoleInWithBrand", query= "" +
+    "SELECT p FROM Product p JOIN FETCH p.brand b" +
+    " WHERE p.platform = :platform" +
+    " AND p.partRole IN :roles" +
+    " AND p.deletedAt IS NULL")
+
+@NamedQuery(name="Product.findProductsbyBrandByOffers", query="" +
+        " SELECT DISTINCT p FROM Product p" +
+        " LEFT JOIN FETCH p.brand b" +
+        " LEFT JOIN FETCH p.offers o" +
+        " WHERE p.platform = :platform" +
+        " AND p.deletedAt IS NULL")
+
 public class Product {
 
     @Id
@@ -38,6 +65,10 @@ public class Product {
     @Column(name = "part_role")
     private String partRole;
 
+    @Column(name = "configuration")
+    @Enumerated(EnumType.STRING)
+    private ProductConfiguration configuration;
+
     @Column(name = "short_description")
     private String shortDescription;
 
@@ -59,6 +90,20 @@ public class Product {
     @Column(name = "raw_category_key")
     private String rawCategoryKey;
 
+    @Column(name = "platform_locked", nullable = false)
+    private Boolean platformLocked = false;
+
+    @OneToMany(mappedBy = "product", fetch = FetchType.LAZY)
+    private Set<ProductOffer> offers = new HashSet<>();
+
+    public Set<ProductOffer> getOffers() {
+        return offers;
+    }
+
+    public void setOffers(Set<ProductOffer> offers) {
+        this.offers = offers;
+    }
+
     // --- lifecycle hooks ---
 
     @PrePersist
@@ -209,4 +254,57 @@ public class Product {
     public void setDeletedAt(Instant deletedAt) {
         this.deletedAt = deletedAt;
     }
+
+    public Boolean getPlatformLocked() {
+        return platformLocked;
+    }
+
+    public void setPlatformLocked(Boolean platformLocked) {
+        this.platformLocked = platformLocked;
+    }
+    
+    public ProductConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(ProductConfiguration configuration) {
+        this.configuration = configuration;
+    }
+    // Convenience: best offer price for Gunbuilder
+public BigDecimal getBestOfferPrice() {
+    if (offers == null || offers.isEmpty()) {
+        return BigDecimal.ZERO;
+    }
+
+    return offers.stream()
+            // pick sale_price if present, otherwise retail_price
+            .map(offer -> {
+                if (offer.getSalePrice() != null) {
+                    return offer.getSalePrice();
+                }
+                return offer.getRetailPrice();
+            })
+            .filter(Objects::nonNull)
+            .min(BigDecimal::compareTo)
+            .orElse(BigDecimal.ZERO);
+}
+
+    // Convenience: URL for the best-priced offer
+    public String getBestOfferBuyUrl() {
+        if (offers == null || offers.isEmpty()) {
+            return null;
+        }
+
+        return offers.stream()
+                .sorted(Comparator.comparing(offer -> {
+                    if (offer.getSalePrice() != null) {
+                        return offer.getSalePrice();
+                    }
+                    return offer.getRetailPrice();
+                }, Comparator.nullsLast(BigDecimal::compareTo)))
+                .map(ProductOffer::getAffiliateUrl)
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElse(null);
+    }
 }

src/main/java/group/goforward/ballistic/model/ProductCategory.java

@@ -1,93 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.*;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-
-@Entity
-@Table(name = "product_categories")
-public class ProductCategory {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "name", nullable = false, length = 100)
-    private String name;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent_category_id")
-    private ProductCategory parentCategory;
-
-    @Column(name = "type", length = 50)
-    private String type;
-
-    @Column(name = "sort_order")
-    private Integer sortOrder;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at")
-    private Instant createdAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at")
-    private Instant updatedAt;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ProductCategory getParentCategory() {
-        return parentCategory;
-    }
-
-    public void setParentCategory(ProductCategory parentCategory) {
-        this.parentCategory = parentCategory;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getSortOrder() {
-        return sortOrder;
-    }
-
-    public void setSortOrder(Integer sortOrder) {
-        this.sortOrder = sortOrder;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/ProductConfiguration.java

@@ -0,0 +1,10 @@
+package group.goforward.ballistic.model;
+
+public enum ProductConfiguration {
+    STRIPPED,   // bare receiver / component
+    ASSEMBLED,  // built up but not fully complete
+    BARRELED,   // upper + barrel + gas system, no BCG/CH
+    COMPLETE,   // full assembly ready to run
+    KIT,        // collection of parts (LPK, trigger kits, etc.)
+    OTHER       // fallback / unknown
+}

src/main/java/group/goforward/ballistic/model/ProductFeed.java

@@ -1,107 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@Entity
-@Table(name = "product_feeds")
-public class ProductFeed {
-    @Id
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "reseller_id", nullable = false)
-    private Integer resellerId;
-
-    @Column(name = "feed_url", nullable = false)
-    private String feedUrl;
-
-    @Column(name = "last_update")
-    private Instant lastUpdate;
-
-    @ColumnDefault("now()")
-    @Column(name = "updated_at", nullable = false)
-    private Instant updatedAt;
-
-    @ColumnDefault("now()")
-    @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
-
-    @Column(name = "deleted_at")
-    private Instant deletedAt;
-
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
-    private UUID uuid;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getResellerId() {
-        return resellerId;
-    }
-
-    public void setResellerId(Integer resellerId) {
-        this.resellerId = resellerId;
-    }
-
-    public String getFeedUrl() {
-        return feedUrl;
-    }
-
-    public void setFeedUrl(String feedUrl) {
-        this.feedUrl = feedUrl;
-    }
-
-    public Instant getLastUpdate() {
-        return lastUpdate;
-    }
-
-    public void setLastUpdate(Instant lastUpdate) {
-        this.lastUpdate = lastUpdate;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getDeletedAt() {
-        return deletedAt;
-    }
-
-    public void setDeletedAt(Instant deletedAt) {
-        this.deletedAt = deletedAt;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/ProductOffer.java

@@ -7,11 +7,11 @@ import org.hibernate.annotations.OnDeleteAction;
 
 import java.math.BigDecimal;
 import java.time.OffsetDateTime;
-import java.util.UUID;
 
 @Entity
 @Table(name = "product_offers")
 public class ProductOffer {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
@@ -26,16 +26,16 @@ public class ProductOffer {
     @JoinColumn(name = "merchant_id", nullable = false)
     private Merchant merchant;
 
-    @Column(name = "avantlink_product_id", nullable = false, length = Integer.MAX_VALUE)
+    @Column(name = "avantlink_product_id", nullable = false)
     private String avantlinkProductId;
 
-    @Column(name = "sku", length = Integer.MAX_VALUE)
+    @Column(name = "sku")
     private String sku;
 
-    @Column(name = "upc", length = Integer.MAX_VALUE)
+    @Column(name = "upc")
     private String upc;
 
-    @Column(name = "buy_url", nullable = false, length = Integer.MAX_VALUE)
+    @Column(name = "buy_url", nullable = false)
     private String buyUrl;
 
     @Column(name = "price", nullable = false, precision = 10, scale = 2)
@@ -45,7 +45,7 @@ public class ProductOffer {
     private BigDecimal originalPrice;
 
     @ColumnDefault("'USD'")
-    @Column(name = "currency", nullable = false, length = Integer.MAX_VALUE)
+    @Column(name = "currency", nullable = false)
     private String currency;
 
     @ColumnDefault("true")
@@ -60,6 +60,10 @@ public class ProductOffer {
     @Column(name = "first_seen_at", nullable = false)
     private OffsetDateTime firstSeenAt;
 
+    // -----------------------------------------------------
+    // Getters & setters
+    // -----------------------------------------------------
+
     public Integer getId() {
         return id;
     }
@@ -164,14 +168,26 @@ public class ProductOffer {
         this.firstSeenAt = firstSeenAt;
     }
 
+    // -----------------------------------------------------
+    // Helper Methods (used by Product entity)
+    // -----------------------------------------------------
+
+    public BigDecimal getSalePrice() {
+        return price;
+    }
+
+    public BigDecimal getRetailPrice() {
+        return originalPrice != null ? originalPrice : price;
+    }
+
+    public String getAffiliateUrl() {
+        return buyUrl;
+    }
+
     public BigDecimal getEffectivePrice() {
-        // Prefer a true sale price when it's lower than the original
         if (price != null && originalPrice != null && price.compareTo(originalPrice) < 0) {
             return price;
         }
-    
-        // Otherwise, use whatever is available
         return price != null ? price : originalPrice;
     }
-
 }

src/main/java/group/goforward/ballistic/model/Psa.java

@@ -1,357 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-@Entity
-@Table(name = "psa")
-public class Psa {
-    @Id
-    @Column(name = "id", nullable = false)
-    private Integer id;
-
-    @Column(name = "\"SKU\"", length = 50)
-    private String sku;
-
-    @Column(name = "\"MANUFACTURER_ID\"", length = 50)
-    private String manufacturerId;
-
-    @Column(name = "\"BRAND_NAME\"", length = 50)
-    private String brandName;
-
-    @Column(name = "\"PRODUCT_NAME\"")
-    private String productName;
-
-    @Column(name = "\"LONG_DESCRIPTION\"", length = Integer.MAX_VALUE)
-    private String longDescription;
-
-    @Column(name = "\"SHORT_DESCRIPTION\"", length = 50)
-    private String shortDescription;
-
-    @Column(name = "\"DEPARTMENT\"", length = 50)
-    private String department;
-
-    @Column(name = "\"CATEGORY\"", length = 50)
-    private String category;
-
-    @Column(name = "\"SUBCATEGORY\"", length = 50)
-    private String subcategory;
-
-    @Column(name = "\"THUMB_URL\"", length = 50)
-    private String thumbUrl;
-
-    @Column(name = "\"IMAGE_URL\"", length = 50)
-    private String imageUrl;
-
-    @Column(name = "\"BUY_LINK\"", length = 128)
-    private String buyLink;
-
-    @Column(name = "\"KEYWORDS\"", length = 50)
-    private String keywords;
-
-    @Column(name = "\"REVIEWS\"", length = 50)
-    private String reviews;
-
-    @Column(name = "\"RETAIL_PRICE\"")
-    private Float retailPrice;
-
-    @Column(name = "\"SALE_PRICE\"")
-    private Float salePrice;
-
-    @Column(name = "\"BRAND_PAGE_LINK\"", length = 50)
-    private String brandPageLink;
-
-   /* @Column(name = "\"BRAND_LOGO_IMAGE\"", length = 50)
-    private String brandLogoImage;*/
-
-    @Column(name = "\"PRODUCT_PAGE_VIEW_TRACKING\"", length = 256)
-    private String productPageViewTracking;
-
-    @Column(name = "\"PARENT_GROUP_ID\"", length = 50)
-    private String parentGroupId;
-
-    @Column(name = "\"FINELINE\"", length = 50)
-    private String fineline;
-
-    @Column(name = "\"SUPERFINELINE\"", length = 200)
-    private String superfineline;
-
-    @Column(name = "\"MODELNUMBER\"", length = 50)
-    private String modelnumber;
-
-    @Column(name = "\"CALIBER\"", length = 200)
-    private String caliber;
-
-    @Column(name = "\"UPC\"", length = 100)
-    private String upc;
-
-    @Column(name = "\"MEDIUM_IMAGE_URL\"", length = 50)
-    private String mediumImageUrl;
-
-    @Column(name = "\"PRODUCT_CONTENT_WIDGET\"", length = 256)
-    private String productContentWidget;
-
-    @Column(name = "\"GOOGLE_CATEGORIZATION\"", length = 50)
-    private String googleCategorization;
-
-    @Column(name = "\"ITEM_BASED_COMMISSION\"", length = 50)
-    private String itemBasedCommission;
-
-    @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
-    private String uuid;
-
-   public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    public String getManufacturerId() {
-        return manufacturerId;
-    }
-
-    public void setManufacturerId(String manufacturerId) {
-        this.manufacturerId = manufacturerId;
-    }
-
-    public String getBrandName() {
-        return brandName;
-    }
-
-    public void setBrandName(String brandName) {
-        this.brandName = brandName;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    public void setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getSubcategory() {
-        return subcategory;
-    }
-
-    public void setSubcategory(String subcategory) {
-        this.subcategory = subcategory;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-
-    public String getBuyLink() {
-        return buyLink;
-    }
-
-    public void setBuyLink(String buyLink) {
-        this.buyLink = buyLink;
-    }
-
-    public String getKeywords() {
-        return keywords;
-    }
-
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-    public String getReviews() {
-        return reviews;
-    }
-
-    public void setReviews(String reviews) {
-        this.reviews = reviews;
-    }
-
-    public Float getRetailPrice() {
-        return retailPrice;
-    }
-
-    public void setRetailPrice(Float retailPrice) {
-        this.retailPrice = retailPrice;
-    }
-
-    public Float getSalePrice() {
-        return salePrice;
-    }
-
-    public void setSalePrice(Float salePrice) {
-        this.salePrice = salePrice;
-    }
-
-    public String getBrandPageLink() {
-        return brandPageLink;
-    }
-
-    public void setBrandPageLink(String brandPageLink) {
-        this.brandPageLink = brandPageLink;
-    }
-/*
-
-    public String getBrandLogoImage() {
-        return brandLogoImage;
-    }
-
-    public void setBrandLogoImage(String brandLogoImage) {
-        this.brandLogoImage = brandLogoImage;
-    }
-*/
-
-    public String getProductPageViewTracking() {
-        return productPageViewTracking;
-    }
-
-    public void setProductPageViewTracking(String productPageViewTracking) {
-        this.productPageViewTracking = productPageViewTracking;
-    }
-
-    public String getParentGroupId() {
-        return parentGroupId;
-    }
-
-    public void setParentGroupId(String parentGroupId) {
-        this.parentGroupId = parentGroupId;
-    }
-
-    public String getFineline() {
-        return fineline;
-    }
-
-    public void setFineline(String fineline) {
-        this.fineline = fineline;
-    }
-
-    public String getSuperfineline() {
-        return superfineline;
-    }
-
-    public void setSuperfineline(String superfineline) {
-        this.superfineline = superfineline;
-    }
-
-    public String getModelnumber() {
-        return modelnumber;
-    }
-
-    public void setModelnumber(String modelnumber) {
-        this.modelnumber = modelnumber;
-    }
-
-    public String getCaliber() {
-        return caliber;
-    }
-
-    public void setCaliber(String caliber) {
-        this.caliber = caliber;
-    }
-
-    public String getUpc() {
-        return upc;
-    }
-
-    public void setUpc(String upc) {
-        this.upc = upc;
-    }
-
-    public String getMediumImageUrl() {
-        return mediumImageUrl;
-    }
-
-    public void setMediumImageUrl(String mediumImageUrl) {
-        this.mediumImageUrl = mediumImageUrl;
-    }
-
-    public String getProductContentWidget() {
-        return productContentWidget;
-    }
-
-    public void setProductContentWidget(String productContentWidget) {
-        this.productContentWidget = productContentWidget;
-    }
-
-    public String getGoogleCategorization() {
-        return googleCategorization;
-    }
-
-    public void setGoogleCategorization(String googleCategorization) {
-        this.googleCategorization = googleCategorization;
-    }
-
-    public String getItemBasedCommission() {
-        return itemBasedCommission;
-    }
-
-    public void setItemBasedCommission(String itemBasedCommission) {
-        this.itemBasedCommission = itemBasedCommission;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/PsaOld.java

@@ -1,23 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name = "psa_old")
-public class PsaOld {
-    @Id
-    @Column(name = "\"SKU\"", length = 50)
-    private String sku;
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/Session.java

@@ -1,73 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import org.hibernate.annotations.ColumnDefault;
-
-import java.time.Instant;
-import java.time.OffsetDateTime;
-
-@Entity
-@Table(name = "sessions")
-public class Session {
-    @Id
-    @Column(name = "id", nullable = false)
-    private String id;
-
-    @Column(name = "user_id", nullable = false, length = 21)
-    private String userId;
-
-    @Column(name = "expires_at", nullable = false)
-    private OffsetDateTime expiresAt;
-
-    @ColumnDefault("CURRENT_TIMESTAMP")
-    @Column(name = "created_at")
-    private Instant createdAt;
-
-    @ColumnDefault("CURRENT_TIMESTAMP")
-    @Column(name = "updated_at")
-    private Instant updatedAt;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public OffsetDateTime getExpiresAt() {
-        return expiresAt;
-    }
-
-    public void setExpiresAt(OffsetDateTime expiresAt) {
-        this.expiresAt = expiresAt;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/User.java

@@ -1,236 +1,91 @@
 package group.goforward.ballistic.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 import org.hibernate.annotations.ColumnDefault;
 
-import java.time.Instant;
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
 
 @Entity
 @Table(name = "users")
 public class User {
+
     @Id
-    @Column(name = "id", nullable = false, length = 21)
-    private String id;
-
-    @Column(name = "name", length = Integer.MAX_VALUE)
-    private String name;
-
-    @Column(name = "username", length = 50)
-    private String username;
-
-    @Column(name = "email", nullable = false)
-    private String email;
-
-    @Column(name = "first_name", length = 50)
-    private String firstName;
-
-    @Column(name = "last_name", length = 50)
-    private String lastName;
-
-    @Column(name = "full_name", length = 50)
-    private String fullName;
-
-    @Column(name = "profile_picture")
-    private String profilePicture;
-
-    @Column(name = "image", length = Integer.MAX_VALUE)
-    private String image;
-
-    @Column(name = "date_of_birth")
-    private LocalDate dateOfBirth;
-
-    @Column(name = "phone_number", length = 20)
-    private String phoneNumber;
-
-    @ColumnDefault("CURRENT_TIMESTAMP")
-    @Column(name = "created_at")
-    private Instant createdAt;
-
-    @ColumnDefault("CURRENT_TIMESTAMP")
-    @Column(name = "updated_at")
-    private Instant updatedAt;
-
-    @ColumnDefault("false")
-    @Column(name = "is_admin")
-    private Boolean isAdmin;
-
-    @Column(name = "last_login")
-    private Instant lastLogin;
-
-    @ColumnDefault("false")
-    @Column(name = "email_verified", nullable = false)
-    private Boolean emailVerified = false;
-
-    @ColumnDefault("'public'")
-    @Column(name = "build_privacy_setting", length = Integer.MAX_VALUE)
-    private String buildPrivacySetting;
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
 
+    @NotNull
     @ColumnDefault("gen_random_uuid()")
-    @Column(name = "uuid")
+    @Column(name = "uuid", nullable = false)
     private UUID uuid;
 
-    @Column(name = "discord_id")
-    private String discordId;
+    @NotNull
+    @Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
+    private String email;
 
-    @Column(name = "hashed_password")
-    private String hashedPassword;
+    @NotNull
+    @Column(name = "password_hash", nullable = false, length = Integer.MAX_VALUE)
+    private String passwordHash;
 
-    @Column(name = "avatar")
-    private String avatar;
+    @Column(name = "display_name", length = Integer.MAX_VALUE)
+    private String displayName;
 
-    @Column(name = "stripe_subscription_id", length = 191)
-    private String stripeSubscriptionId;
+    @NotNull
+    @ColumnDefault("'USER'")
+    @Column(name = "role", nullable = false, length = Integer.MAX_VALUE)
+    private String role;
 
-    @Column(name = "stripe_price_id", length = 191)
-    private String stripePriceId;
+    @NotNull
+    @ColumnDefault("true")
+    @Column(name = "is_active", nullable = false)
+    private boolean isActive = true;
 
-    @Column(name = "stripe_customer_id", length = 191)
-    private String stripeCustomerId;
+    @NotNull
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
 
-    @Column(name = "stripe_current_period_end")
-    private Instant stripeCurrentPeriodEnd;
+    @NotNull
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
 
-    public String getId() {
+    @Column(name = "deleted_at")
+    private OffsetDateTime deletedAt;
+
+    // NEW FIELDS
+
+    @Column(name = "email_verified_at")
+    private OffsetDateTime emailVerifiedAt;
+
+    @Column(name = "verification_token", length = Integer.MAX_VALUE)
+    private String verificationToken;
+
+    @Column(name = "reset_password_token", length = Integer.MAX_VALUE)
+    private String resetPasswordToken;
+
+    @Column(name = "reset_password_expires_at")
+    private OffsetDateTime resetPasswordExpiresAt;
+
+    @Column(name = "last_login_at")
+    private OffsetDateTime lastLoginAt;
+
+    @ColumnDefault("0")
+    @Column(name = "login_count", nullable = false)
+    private Integer loginCount = 0;
+
+    // --- Getters / setters ---
+
+    public Integer getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public void setFullName(String fullName) {
-        this.fullName = fullName;
-    }
-
-    public String getProfilePicture() {
-        return profilePicture;
-    }
-
-    public void setProfilePicture(String profilePicture) {
-        this.profilePicture = profilePicture;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public LocalDate getDateOfBirth() {
-        return dateOfBirth;
-    }
-
-    public void setDateOfBirth(LocalDate dateOfBirth) {
-        this.dateOfBirth = dateOfBirth;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Boolean getIsAdmin() {
-        return isAdmin;
-    }
-
-    public void setIsAdmin(Boolean isAdmin) {
-        this.isAdmin = isAdmin;
-    }
-
-    public Instant getLastLogin() {
-        return lastLogin;
-    }
-
-    public void setLastLogin(Instant lastLogin) {
-        this.lastLogin = lastLogin;
-    }
-
-    public Boolean getEmailVerified() {
-        return emailVerified;
-    }
-
-    public void setEmailVerified(Boolean emailVerified) {
-        this.emailVerified = emailVerified;
-    }
-
-    public String getBuildPrivacySetting() {
-        return buildPrivacySetting;
-    }
-
-    public void setBuildPrivacySetting(String buildPrivacySetting) {
-        this.buildPrivacySetting = buildPrivacySetting;
-    }
-
     public UUID getUuid() {
         return uuid;
     }
@@ -239,60 +94,129 @@ public class User {
         this.uuid = uuid;
     }
 
-    public String getDiscordId() {
-        return discordId;
+    public String getEmail() {
+        return email;
     }
 
-    public void setDiscordId(String discordId) {
-        this.discordId = discordId;
+    public void setEmail(String email) {
+        this.email = email;
     }
 
-    public String getHashedPassword() {
-        return hashedPassword;
+    public String getPasswordHash() {
+        return passwordHash;
     }
 
-    public void setHashedPassword(String hashedPassword) {
-        this.hashedPassword = hashedPassword;
+    public void setPasswordHash(String passwordHash) {
+        this.passwordHash = passwordHash;
     }
 
-    public String getAvatar() {
-        return avatar;
+    public String getDisplayName() {
+        return displayName;
     }
 
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
     }
 
-    public String getStripeSubscriptionId() {
-        return stripeSubscriptionId;
+    public String getRole() {
+        return role;
     }
 
-    public void setStripeSubscriptionId(String stripeSubscriptionId) {
-        this.stripeSubscriptionId = stripeSubscriptionId;
+    public void setRole(String role) {
+        this.role = role;
     }
 
-    public String getStripePriceId() {
-        return stripePriceId;
+    public boolean getIsActive() {
+        return isActive;
     }
 
-    public void setStripePriceId(String stripePriceId) {
-        this.stripePriceId = stripePriceId;
+    public void setIsActive(boolean active) {
+        isActive = active;
     }
 
-    public String getStripeCustomerId() {
-        return stripeCustomerId;
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
     }
 
-    public void setStripeCustomerId(String stripeCustomerId) {
-        this.stripeCustomerId = stripeCustomerId;
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
     }
 
-    public Instant getStripeCurrentPeriodEnd() {
-        return stripeCurrentPeriodEnd;
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
     }
 
-    public void setStripeCurrentPeriodEnd(Instant stripeCurrentPeriodEnd) {
-        this.stripeCurrentPeriodEnd = stripeCurrentPeriodEnd;
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
     }
 
+    public OffsetDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(OffsetDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+    public OffsetDateTime getEmailVerifiedAt() {
+        return emailVerifiedAt;
+    }
+
+    public void setEmailVerifiedAt(OffsetDateTime emailVerifiedAt) {
+        this.emailVerifiedAt = emailVerifiedAt;
+    }
+
+    public String getVerificationToken() {
+        return verificationToken;
+    }
+
+    public void setVerificationToken(String verificationToken) {
+        this.verificationToken = verificationToken;
+    }
+
+    public String getResetPasswordToken() {
+        return resetPasswordToken;
+    }
+
+    public void setResetPasswordToken(String resetPasswordToken) {
+        this.resetPasswordToken = resetPasswordToken;
+    }
+
+    public OffsetDateTime getResetPasswordExpiresAt() {
+        return resetPasswordExpiresAt;
+    }
+
+    public void setResetPasswordExpiresAt(OffsetDateTime resetPasswordExpiresAt) {
+        this.resetPasswordExpiresAt = resetPasswordExpiresAt;
+    }
+
+    public OffsetDateTime getLastLoginAt() {
+        return lastLoginAt;
+    }
+
+    public void setLastLoginAt(OffsetDateTime lastLoginAt) {
+        this.lastLoginAt = lastLoginAt;
+    }
+
+    public Integer getLoginCount() {
+        return loginCount;
+    }
+
+    public void setLoginCount(Integer loginCount) {
+        this.loginCount = loginCount;
+    }
+
+    // convenience helpers
+
+    @Transient
+    public boolean isEmailVerified() {
+        return emailVerifiedAt != null;
+    }
+
+    public void incrementLoginCount() {
+        if (loginCount == null) {
+            loginCount = 0;
+        }
+        loginCount++;
+    }
 }

src/main/java/group/goforward/ballistic/model/VerificationToken.java

@@ -1,47 +0,0 @@
-package group.goforward.ballistic.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-
-import java.time.Instant;
-
-@Entity
-@Table(name = "\"verificationTokens\"")
-public class VerificationToken {
-    @Id
-    @Column(name = "identifier", nullable = false, length = Integer.MAX_VALUE)
-    private String identifier;
-
-    @Column(name = "token", nullable = false, length = Integer.MAX_VALUE)
-    private String token;
-
-    @Column(name = "expires", nullable = false)
-    private Instant expires;
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public Instant getExpires() {
-        return expires;
-    }
-
-    public void setExpires(Instant expires) {
-        this.expires = expires;
-    }
-
-}

src/main/java/group/goforward/ballistic/model/package-info.java

@@ -0,0 +1 @@
+package group.goforward.ballistic.model;

src/main/java/group/goforward/ballistic/repos/AccountRepository.java

@@ -1,5 +1,6 @@
-package group.goforward.ballistic.model;
+package group.goforward.ballistic.repos;
 
+import group.goforward.ballistic.model.Account;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;

src/main/java/group/goforward/ballistic/repos/CategoryMappingRepository.java

@@ -1,7 +1,22 @@
 package group.goforward.ballistic.repos;
 
-import group.goforward.ballistic.model.AffiliateCategoryMap;
+import group.goforward.ballistic.model.CategoryMapping;
+import group.goforward.ballistic.model.Merchant;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
-public interface CategoryMappingRepository extends JpaRepository<AffiliateCategoryMap, Integer> {
+import java.util.List;
+
+public interface CategoryMappingRepository extends JpaRepository<CategoryMapping, Integer> {
+
+    // All mappings for a merchant, ordered nicely
+    List<CategoryMapping> findByMerchantIdOrderByRawCategoryPathAsc(Integer merchantId);
+
+    // Merchants that actually have mappings (for the dropdown)
+    @Query("""
+        select distinct cm.merchant
+        from CategoryMapping cm
+        order by cm.merchant.name asc
+    """)
+    List<Merchant> findDistinctMerchantsWithMappings();
 }

src/main/java/group/goforward/ballistic/repos/MerchantCategoryMapRepository.java

@@ -1,12 +0,0 @@
-package group.goforward.ballistic.repos;
-
-import group.goforward.ballistic.model.Merchant;
-import group.goforward.ballistic.model.MerchantCategoryMap;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.Optional;
-
-public interface MerchantCategoryMapRepository extends JpaRepository<MerchantCategoryMap, Integer> {
-
-    Optional<MerchantCategoryMap> findByMerchantAndRawCategoryIgnoreCase(Merchant merchant, String rawCategory);
-}

src/main/java/group/goforward/ballistic/repos/MerchantCategoryMappingRepository.java

@@ -0,0 +1,17 @@
+package group.goforward.ballistic.repos;
+
+import group.goforward.ballistic.model.MerchantCategoryMapping;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MerchantCategoryMappingRepository
+        extends JpaRepository<MerchantCategoryMapping, Integer> {
+
+    Optional<MerchantCategoryMapping> findByMerchantIdAndRawCategoryIgnoreCase(
+            Integer merchantId,
+            String rawCategory
+    );
+
+    List<MerchantCategoryMapping> findByMerchantIdOrderByRawCategoryAsc(Integer merchantId);
+}

src/main/java/group/goforward/ballistic/repos/PartCategoryRepository.java

@@ -2,8 +2,13 @@ package group.goforward.ballistic.repos;
 
 import group.goforward.ballistic.model.PartCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
 import java.util.Optional;
 
 public interface PartCategoryRepository extends JpaRepository<PartCategory, Integer> {
+
     Optional<PartCategory> findBySlug(String slug);
+
+    List<PartCategory> findAllByOrderByGroupNameAscSortOrderAscNameAsc();
 }

src/main/java/group/goforward/ballistic/repos/PartRoleCategoryMappingRepository.java

@@ -0,0 +1,14 @@
+package group.goforward.ballistic.repos;
+
+import group.goforward.ballistic.model.PartRoleCategoryMapping;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface PartRoleCategoryMappingRepository extends JpaRepository<PartRoleCategoryMapping, Integer> {
+
+    List<PartRoleCategoryMapping> findAllByPlatformOrderByPartRoleAsc(String platform);
+
+    Optional<PartRoleCategoryMapping> findByPlatformAndPartRole(String platform, String partRole);
+}

src/main/java/group/goforward/ballistic/repos/PartRoleMappingRepository.java

@@ -0,0 +1,12 @@
+package group.goforward.ballistic.repos;
+
+import group.goforward.ballistic.model.PartRoleMapping;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface PartRoleMappingRepository extends JpaRepository<PartRoleMapping, Integer> {
+
+    // List mappings for a platform, ordered nicely for the UI
+    List<PartRoleMapping> findByPlatformOrderByPartRoleAsc(String platform);
+}

src/main/java/group/goforward/ballistic/repos/ProductOfferRepository.java

@@ -5,8 +5,18 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 public interface ProductOfferRepository extends JpaRepository<ProductOffer, Integer> {
 
+    List<ProductOffer> findByProductId(Integer productId);
+
+    // Used by the /api/products/gunbuilder endpoint
     List<ProductOffer> findByProductIdIn(Collection<Integer> productIds);
+
+    // Unique offer lookup for importer upsert
+    Optional<ProductOffer> findByMerchantIdAndAvantlinkProductId(
+            Integer merchantId,
+            String avantlinkProductId
+    );
 }

src/main/java/group/goforward/ballistic/repos/ProductRepository.java

@@ -1,27 +1,65 @@
 package group.goforward.ballistic.repos;
 
-import group.goforward.ballistic.model.Product;
 import group.goforward.ballistic.model.Brand;
+import group.goforward.ballistic.model.Product;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
-import java.util.Optional;
-import java.util.UUID;
 import java.util.List;
-import java.util.Collection;
 
 public interface ProductRepository extends JpaRepository<Product, Integer> {
 
-    Optional<Product> findByUuid(UUID uuid);
-
-    boolean existsBySlug(String slug);
+    // -------------------------------------------------
+    // Used by MerchantFeedImportServiceImpl
+    // -------------------------------------------------
 
     List<Product> findAllByBrandAndMpn(Brand brand, String mpn);
 
     List<Product> findAllByBrandAndUpc(Brand brand, String upc);
 
-    // All products for a given platform (e.g. "AR-15")
-    List<Product> findByPlatform(String platform);
+    boolean existsBySlug(String slug);
 
-    // Products filtered by platform + part roles (e.g. upper-receiver, barrel, etc.)
-    List<Product> findByPlatformAndPartRoleIn(String platform, Collection<String> partRoles);
+    // -------------------------------------------------
+    // Used by ProductController for platform views
+    // -------------------------------------------------
+
+    @Query("""
+           SELECT p
+           FROM Product p
+           JOIN FETCH p.brand b
+           WHERE p.platform = :platform
+             AND p.deletedAt IS NULL
+           """)
+    List<Product> findByPlatformWithBrand(@Param("platform") String platform);
+
+@Query(name="Products.findByPlatformWithBrand")
+List<Product> findByPlatformWithBrandNQ(@Param("platform") String platform);
+
+    @Query("""
+            SELECT p
+            FROM Product p
+            JOIN FETCH p.brand b
+            WHERE p.platform = :platform
+              AND p.partRole IN :roles
+              AND p.deletedAt IS NULL
+            """)
+    List<Product> findByPlatformAndPartRoleInWithBrand(
+            @Param("platform") String platform,
+            @Param("roles") List<String> roles
+    );
+
+    // -------------------------------------------------
+    // Used by Gunbuilder service (if you wired this)
+    // -------------------------------------------------
+
+    @Query("""
+           SELECT DISTINCT p
+           FROM Product p
+           LEFT JOIN FETCH p.brand b
+           LEFT JOIN FETCH p.offers o
+           WHERE p.platform = :platform
+             AND p.deletedAt IS NULL
+           """)
+    List<Product> findSomethingForGunbuilder(@Param("platform") String platform);
 }

src/main/java/group/goforward/ballistic/repos/PsaRepository.java

@@ -1,7 +0,0 @@
-package group.goforward.ballistic.repos;
-import group.goforward.ballistic.model.Psa;
-import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.UUID;
-
-public interface PsaRepository extends JpaRepository<Psa, UUID> {
-}

src/main/java/group/goforward/ballistic/repos/UserRepository.java

@@ -2,10 +2,15 @@ package group.goforward.ballistic.repos;
 
 import group.goforward.ballistic.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+
 import java.util.Optional;
 import java.util.UUID;
 
 public interface UserRepository extends JpaRepository<User, Integer> {
-    Optional<User> findByEmail(String email);
+
+    Optional<User> findByEmailIgnoreCaseAndDeletedAtIsNull(String email);
+
+    boolean existsByEmailIgnoreCaseAndDeletedAtIsNull(String email);
+
     Optional<User> findByUuid(UUID uuid);
 }

src/main/java/group/goforward/ballistic/repos/package-info.java

@@ -0,0 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Repository for the ballistic -Builder application.
+ * This package includes Repository for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Sean Strawsburg
+ * @version 1.1
+ */
+package group.goforward.ballistic.repos;

src/main/java/group/goforward/ballistic/security/CustomUserDetails.java

@@ -0,0 +1,59 @@
+package group.goforward.ballistic.security;
+
+import group.goforward.ballistic.model.User;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.List;
+
+public class CustomUserDetails implements UserDetails {
+
+    private final User user;
+    private final List<GrantedAuthority> authorities;
+
+    public CustomUserDetails(User user) {
+        this.user = user;
+        this.authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole()));
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return authorities;
+    }
+
+    @Override
+    public String getPassword() {
+        return user.getPasswordHash();
+    }
+
+    @Override
+    public String getUsername() {
+        return user.getEmail();
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return user.getDeletedAt() == null;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return user.getIsActive();
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return user.getDeletedAt() == null;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return user.getIsActive() && user.getDeletedAt() == null;
+    }
+}

src/main/java/group/goforward/ballistic/security/CustomUserDetailsService.java

@@ -0,0 +1,25 @@
+package group.goforward.ballistic.security;
+
+import group.goforward.ballistic.model.User;
+import group.goforward.ballistic.repos.UserRepository;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CustomUserDetailsService implements UserDetailsService {
+
+    private final UserRepository users;
+
+    public CustomUserDetailsService(UserRepository users) {
+        this.users = users;
+    }
+
+    @Override
+    public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
+        User user = users.findByEmailIgnoreCaseAndDeletedAtIsNull(email)
+                .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+        return new CustomUserDetails(user);
+    }
+}

src/main/java/group/goforward/ballistic/security/JwtAuthenticationEntryPoint.java

@@ -0,0 +1,26 @@
+package group.goforward.ballistic.security;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+@Component
+public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
+
+    @Override
+    public void commence(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AuthenticationException authException
+    ) throws IOException, ServletException {
+        // Simple JSON 401 response
+        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        response.setContentType("application/json");
+        response.getWriter().write("{\"error\":\"Unauthorized\"}");
+    }
+}

src/main/java/group/goforward/ballistic/security/JwtAuthenticationFilter.java

@@ -0,0 +1,80 @@
+package group.goforward.ballistic.security;
+
+import group.goforward.ballistic.model.User;
+import group.goforward.ballistic.repos.UserRepository;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.util.UUID;
+
+@Component
+public class JwtAuthenticationFilter extends OncePerRequestFilter {
+
+    private final JwtService jwtService;
+    private final UserRepository userRepository;
+
+    public JwtAuthenticationFilter(JwtService jwtService, UserRepository userRepository) {
+        this.jwtService = jwtService;
+        this.userRepository = userRepository;
+    }
+
+    @Override
+    protected void doFilterInternal(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            FilterChain filterChain
+    ) throws ServletException, IOException {
+
+        String authHeader = request.getHeader("Authorization");
+
+        if (!StringUtils.hasText(authHeader) || !authHeader.startsWith("Bearer ")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        String token = authHeader.substring(7);
+
+        if (!jwtService.isTokenValid(token)) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        UUID userUuid = jwtService.extractUserUuid(token);
+
+        if (userUuid == null || SecurityContextHolder.getContext().getAuthentication() != null) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        User user = userRepository.findByUuid(userUuid)
+                .orElse(null);
+
+        if (user == null || !user.getIsActive()) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        CustomUserDetails userDetails = new CustomUserDetails(user);
+
+        UsernamePasswordAuthenticationToken authToken =
+                new UsernamePasswordAuthenticationToken(
+                        userDetails,
+                        null,
+                        userDetails.getAuthorities()
+                );
+        authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+
+        SecurityContextHolder.getContext().setAuthentication(authToken);
+
+        filterChain.doFilter(request, response);
+    }
+}

src/main/java/group/goforward/ballistic/security/JwtService.java

@@ -0,0 +1,71 @@
+package group.goforward.ballistic.security;
+
+import group.goforward.ballistic.model.User;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.security.Key;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+public class JwtService {
+
+    private final Key key;
+    private final long accessTokenMinutes;
+
+    public JwtService(
+            @Value("${security.jwt.secret}") String secret,
+            @Value("${security.jwt.access-token-minutes:60}") long accessTokenMinutes
+    ) {
+        this.key = Keys.hmacShaKeyFor(secret.getBytes());
+        this.accessTokenMinutes = accessTokenMinutes;
+    }
+
+    public String generateToken(User user) {
+        Instant now = Instant.now();
+        Instant expiry = now.plus(accessTokenMinutes, ChronoUnit.MINUTES);
+
+        return Jwts.builder()
+                .setSubject(user.getUuid().toString())
+                .setIssuedAt(Date.from(now))
+                .setExpiration(Date.from(expiry))
+                .addClaims(Map.of(
+                        "email", user.getEmail(),
+                        "role", user.getRole(),
+                        "displayName", user.getDisplayName()
+                ))
+                .signWith(key, SignatureAlgorithm.HS256)
+                .compact();
+    }
+
+    public UUID extractUserUuid(String token) {
+        Claims claims = parseClaims(token);
+        return UUID.fromString(claims.getSubject());
+    }
+
+    public boolean isTokenValid(String token) {
+        try {
+            parseClaims(token);
+            return true;
+        } catch (JwtException | IllegalArgumentException ex) {
+            return false;
+        }
+    }
+
+    private Claims parseClaims(String token) {
+        return Jwts.parserBuilder()
+                .setSigningKey(key)
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+}

src/main/java/group/goforward/ballistic/seed/MerchantCategoryMapSeeder.java

@@ -1,179 +0,0 @@
-package group.goforward.ballistic.seed;
-
-import group.goforward.ballistic.model.Merchant;
-import group.goforward.ballistic.model.MerchantCategoryMap;
-import group.goforward.ballistic.repos.MerchantCategoryMapRepository;
-import group.goforward.ballistic.repos.MerchantRepository;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MerchantCategoryMapSeeder {
-
-    @Bean
-    public CommandLineRunner seedMerchantCategoryMaps(MerchantRepository merchantRepository,
-                                                      MerchantCategoryMapRepository mapRepository) {
-        return args -> {
-            // --- Guard: only seed if table is (mostly) empty ---
-            long existing = mapRepository.count();
-            if (existing > 0) {
-                System.out.println("CategoryMapSeeder: found " + existing + " existing mappings, skipping seeding.");
-                return;
-            }
-
-            System.out.println("CategoryMapSeeder: seeding initial MerchantCategoryMap rows...");
-
-            // Adjust merchant names if they differ in your DB
-            seedAeroPrecision(merchantRepository, mapRepository);
-            seedBrownells(merchantRepository, mapRepository);
-            seedPSA(merchantRepository, mapRepository);
-
-            System.out.println("CategoryMapSeeder: seeding complete.");
-        };
-    }
-
-    // ---------------------------------------------------------------------
-    // AERO PRECISION
-    // ---------------------------------------------------------------------
-
-    private void seedAeroPrecision(MerchantRepository merchantRepository,
-                                   MerchantCategoryMapRepository mapRepository) {
-
-        merchantRepository.findByNameIgnoreCase("Aero Precision").ifPresent(merchant -> {
-
-            // Keys come from Department | Category | SubCategory combos
-            upsert(merchant, "Charging Handles",
-                    "AR-15", "charging-handle", "Charging Handles", true, mapRepository);
-
-            upsert(merchant, "Shop All Barrels",
-                    null, "barrel", "Rifle Barrels", true, mapRepository);
-
-            upsert(merchant, "Lower Parts Kits",
-                    "AR-15", "lower-parts-kit", "Lower Parts Kits", true, mapRepository);
-
-            upsert(merchant, "Handguards",
-                    "AR-15", "handguard", "Handguards & Rails", true, mapRepository);
-
-            upsert(merchant, "Upper Receivers",
-                    "AR-15", "upper-receiver", "Upper Receivers", true, mapRepository);
-
-            // Platform-only hints (let your existing heuristics decide part_role)
-            upsert(merchant, ".308 Winchester",
-                    "AR-10", null, "AR-10 / .308 Parts", true, mapRepository);
-
-            upsert(merchant, "6.5 Creedmoor",
-                    "AR-10", null, "6.5 Creedmoor Parts", true, mapRepository);
-
-            upsert(merchant, "5.56 Nato / .223 Wylde",
-                    "AR-15", null, "5.56 / .223 Wylde Parts", true, mapRepository);
-        });
-    }
-
-    // ---------------------------------------------------------------------
-    // BROWNELLS
-    // ---------------------------------------------------------------------
-
-    private void seedBrownells(MerchantRepository merchantRepository,
-                               MerchantCategoryMapRepository mapRepository) {
-
-        merchantRepository.findByNameIgnoreCase("Brownells").ifPresent(merchant -> {
-
-            upsert(merchant, "Rifle Parts | Receiver Parts | Receivers",
-                    null, "receiver", "Rifle Receivers", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Barrel Parts | Rifle Barrels",
-                    null, "barrel", "Rifle Barrels", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Stock Parts | Rifle Stocks",
-                    null, "stock", "Rifle Stocks", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Muzzle Devices | Compensators & Muzzle Brakes",
-                    null, "muzzle-device", "Muzzle Devices", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Trigger Parts | Triggers",
-                    null, "trigger", "Triggers", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Receiver Parts | Magazine Parts",
-                    null, "magazine", "Magazine & Mag Parts", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Sights | Front Sights",
-                    null, "sight", "Iron Sights", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Sights | Rear Sights",
-                    null, "sight", "Iron Sights", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Receiver Parts | Buffer Tube Parts",
-                    null, "buffer-tube", "Buffer Tubes & Parts", true, mapRepository);
-
-            upsert(merchant, "Rifle Parts | Stock Parts | Buttstocks",
-                    null, "stock", "Buttstocks", true, mapRepository);
-        });
-    }
-
-    // ---------------------------------------------------------------------
-    // PALMETTO STATE ARMORY (PSA)
-    // ---------------------------------------------------------------------
-
-    private void seedPSA(MerchantRepository merchantRepository,
-                         MerchantCategoryMapRepository mapRepository) {
-
-        merchantRepository.findByNameIgnoreCase("Palmetto State Armory").ifPresent(merchant -> {
-
-            upsert(merchant, "AR-15 Parts | Upper Parts | Stripped Uppers",
-                    "AR-15", "upper-receiver", "AR-15 Stripped Uppers", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Upper Parts | Complete Uppers",
-                    "AR-15", "complete-upper", "AR-15 Complete Uppers", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Barrel Parts | Barrels",
-                    "AR-15", "barrel", "AR-15 Barrels", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Lower Parts | Stripped Lowers",
-                    "AR-15", "lower-receiver", "AR-15 Stripped Lowers", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Handguard Parts | Handguards",
-                    "AR-15", "handguard", "AR-15 Handguards", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Bolt Carrier Groups | Bolt Carrier Groups",
-                    "AR-15", "bcg", "AR-15 BCGs", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Trigger Parts | Triggers",
-                    "AR-15", "trigger", "AR-15 Triggers", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Stock Parts | Stocks",
-                    "AR-15", "stock", "AR-15 Stocks", true, mapRepository);
-
-            upsert(merchant, "AR-15 Parts | Muzzle Devices | Muzzle Devices",
-                    "AR-15", "muzzle-device", "AR-15 Muzzle Devices", true, mapRepository);
-        });
-    }
-
-    // ---------------------------------------------------------------------
-    // Helper
-    // ---------------------------------------------------------------------
-
-    private void upsert(Merchant merchant,
-                        String rawCategory,
-                        String platform,
-                        String partRole,
-                        String canonicalCategory,
-                        boolean enabled,
-                        MerchantCategoryMapRepository mapRepository) {
-
-        MerchantCategoryMap map = mapRepository
-                .findByMerchantAndRawCategoryIgnoreCase(merchant, rawCategory)
-                .orElseGet(MerchantCategoryMap::new);
-
-        map.setMerchant(merchant);
-        map.setRawCategory(rawCategory);
-
-        // These fields are optional – null means “let heuristics or defaults handle it”
-        map.setPlatform(platform);
-        map.setPartRole(partRole);
-        map.setCanonicalCategory(canonicalCategory);
-        map.setEnabled(enabled);
-
-        mapRepository.save(map);
-    }
-}

src/main/java/group/goforward/ballistic/service/PsaService.java

@@ -1,36 +0,0 @@
-package group.goforward.ballistic.service;
-import group.goforward.ballistic.model.Psa;
-import group.goforward.ballistic.repos.PsaRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-@Service
-public class PsaService {
-
-    private final PsaRepository psaRepository;
-
-    @Autowired
-    public PsaService(PsaRepository psaRepository) {
-        this.psaRepository = psaRepository;
-    }
-
-    public List<Psa> findAll() {
-        return psaRepository.findAll();
-    }
-
-    public Optional<Psa> findById(UUID id) {
-        return psaRepository.findById(id);
-    }
-
-    public Psa save(Psa psa) {
-        return psaRepository.save(psa);
-    }
-
-    public void deleteById(UUID id) {
-        psaRepository.deleteById(id);
-    }
-}

src/main/java/group/goforward/ballistic/services/BrandService.java

@@ -0,0 +1,16 @@
+package group.goforward.ballistic.services;
+
+import group.goforward.ballistic.model.Brand;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface BrandService {
+
+    List<Brand> findAll();
+
+    Optional<Brand> findById(Integer id);
+
+    Brand save(Brand item);
+    void deleteById(Integer id);
+}

src/main/java/group/goforward/ballistic/services/GunbuilderProductService.java

@@ -0,0 +1,57 @@
+package group.goforward.ballistic.services;
+
+import group.goforward.ballistic.model.PartCategory;
+import group.goforward.ballistic.model.Product;
+import group.goforward.ballistic.repos.ProductRepository;
+import group.goforward.ballistic.web.dto.GunbuilderProductDto;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class GunbuilderProductService {
+
+    private final ProductRepository productRepository;
+    private final PartCategoryResolverService partCategoryResolverService;
+
+    public GunbuilderProductService(
+            ProductRepository productRepository,
+            PartCategoryResolverService partCategoryResolverService
+    ) {
+        this.productRepository = productRepository;
+        this.partCategoryResolverService = partCategoryResolverService;
+    }
+
+    public List<GunbuilderProductDto> listGunbuilderProducts(String platform) {
+
+        List<Product> products = productRepository.findSomethingForGunbuilder(platform);
+
+        return products.stream()
+                .map(p -> {
+                    var maybeCategory = partCategoryResolverService
+                            .resolveForPlatformAndPartRole(platform, p.getPartRole());
+
+                    if (maybeCategory.isEmpty()) {
+                        // you can also log here
+                        return null;
+                    }
+
+                    PartCategory cat = maybeCategory.get();
+
+                    return new GunbuilderProductDto(
+                            p.getId(),
+                            p.getName(),
+                            p.getBrand().getName(),
+                            platform,
+                            p.getPartRole(),
+                            p.getBestOfferPrice(),
+                            p.getMainImageUrl(),
+                            p.getBestOfferBuyUrl(),
+                            cat.getSlug(),
+                            cat.getGroupName()
+                    );
+                })
+                .filter(dto -> dto != null)
+                .toList();
+    }
+}

src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java

@@ -0,0 +1,96 @@
+package group.goforward.ballistic.services;
+
+import group.goforward.ballistic.model.Merchant;
+import group.goforward.ballistic.model.MerchantCategoryMapping;
+import group.goforward.ballistic.model.ProductConfiguration;
+import group.goforward.ballistic.repos.MerchantCategoryMappingRepository;
+import jakarta.transaction.Transactional;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MerchantCategoryMappingService {
+
+    private final MerchantCategoryMappingRepository mappingRepository;
+
+    public MerchantCategoryMappingService(MerchantCategoryMappingRepository mappingRepository) {
+        this.mappingRepository = mappingRepository;
+    }
+
+    public List<MerchantCategoryMapping> findByMerchant(Integer merchantId) {
+        return mappingRepository.findByMerchantIdOrderByRawCategoryAsc(merchantId);
+    }
+
+    /**
+     * Resolve (or create) a mapping row for this merchant + raw category.
+     * - If it exists, returns it (with whatever mappedPartRole / mappedConfiguration are set).
+     * - If it doesn't exist, creates a placeholder row with null mappings and returns it.
+     *
+     * The importer can then:
+     *   - skip rows where mappedPartRole is still null
+     *   - use mappedConfiguration if present
+     */
+    @Transactional
+    public MerchantCategoryMapping resolveMapping(Merchant merchant, String rawCategory) {
+        if (rawCategory == null || rawCategory.isBlank()) {
+            return null;
+        }
+
+        String trimmed = rawCategory.trim();
+
+        return mappingRepository
+                .findByMerchantIdAndRawCategoryIgnoreCase(merchant.getId(), trimmed)
+                .orElseGet(() -> {
+                    MerchantCategoryMapping mapping = new MerchantCategoryMapping();
+                    mapping.setMerchant(merchant);
+                    mapping.setRawCategory(trimmed);
+                    mapping.setMappedPartRole(null);
+                    mapping.setMappedConfiguration(null);
+                    return mappingRepository.save(mapping);
+                });
+    }
+
+    /**
+     * Upsert mapping (admin UI).
+     */
+    @Transactional
+    public MerchantCategoryMapping upsertMapping(
+            Merchant merchant,
+            String rawCategory,
+            String mappedPartRole,
+            ProductConfiguration mappedConfiguration
+    ) {
+        String trimmed = rawCategory.trim();
+
+        MerchantCategoryMapping mapping = mappingRepository
+                .findByMerchantIdAndRawCategoryIgnoreCase(merchant.getId(), trimmed)
+                .orElseGet(() -> {
+                    MerchantCategoryMapping m = new MerchantCategoryMapping();
+                    m.setMerchant(merchant);
+                    m.setRawCategory(trimmed);
+                    return m;
+                });
+
+        mapping.setMappedPartRole(
+                (mappedPartRole == null || mappedPartRole.isBlank()) ? null : mappedPartRole.trim()
+        );
+
+        mapping.setMappedConfiguration(mappedConfiguration);
+
+        return mappingRepository.save(mapping);
+    }
+    /**
+     * Backwards-compatible overload for existing callers (e.g. controller)
+     * that don’t care about productConfiguration yet.
+     */
+    @Transactional
+    public MerchantCategoryMapping upsertMapping(
+            Merchant merchant,
+            String rawCategory,
+            String mappedPartRole
+    ) {
+        // Delegate to the new method with `null` configuration
+        return upsertMapping(merchant, rawCategory, mappedPartRole, null);
+    }
+}

src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java

@@ -0,0 +1,14 @@
+package group.goforward.ballistic.services;
+
+public interface MerchantFeedImportService {
+
+    /**
+     * Full product + offer import for a given merchant.
+     */
+    void importMerchantFeed(Integer merchantId);
+
+    /**
+     * Offers-only sync (price / stock) for a given merchant.
+     */
+    void syncOffersOnly(Integer merchantId);
+}

src/main/java/group/goforward/ballistic/services/PartCategoryResolverService.java

@@ -0,0 +1,41 @@
+package group.goforward.ballistic.services;
+
+import group.goforward.ballistic.model.PartCategory;
+import group.goforward.ballistic.repos.PartCategoryRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class PartCategoryResolverService {
+
+    private final PartCategoryRepository partCategoryRepository;
+
+    public PartCategoryResolverService(PartCategoryRepository partCategoryRepository) {
+        this.partCategoryRepository = partCategoryRepository;
+    }
+
+    /**
+     * Resolve the canonical PartCategory for a given platform + partRole.
+     *
+     * For now we keep it simple:
+     * - We treat partRole as the slug (e.g. "barrel", "upper", "trigger").
+     * - Normalize to lower-kebab (spaces -> dashes, lowercased).
+     * - Look up by slug in part_categories.
+     *
+     * Later, if we want per-merchant / per-platform overrides using category_mappings,
+     * we can extend this method without changing callers.
+     */
+    public Optional<PartCategory> resolveForPlatformAndPartRole(String platform, String partRole) {
+        if (partRole == null || partRole.isBlank()) {
+            return Optional.empty();
+        }
+
+        String normalizedSlug = partRole
+                .trim()
+                .toLowerCase()
+                .replace(" ", "-");
+
+        return partCategoryRepository.findBySlug(normalizedSlug);
+    }
+}

src/main/java/group/goforward/ballistic/services/StatesService.java

@@ -1,4 +1,4 @@
-package group.goforward.ballistic.service;
+package group.goforward.ballistic.services;
 
 import group.goforward.ballistic.model.State;
 

src/main/java/group/goforward/ballistic/services/UsersService.java

@@ -0,0 +1,16 @@
+package group.goforward.ballistic.services;
+
+import group.goforward.ballistic.model.User;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface UsersService {
+
+    List<User> findAll();
+
+    Optional<User> findById(Integer id);
+
+    User save(User item);
+    void deleteById(Integer id);
+}

src/main/java/group/goforward/ballistic/services/impl/BrandServiceImpl.java

@@ -0,0 +1,38 @@
+package group.goforward.ballistic.services.impl;
+
+
+import group.goforward.ballistic.model.Brand;
+import group.goforward.ballistic.repos.BrandRepository;
+import group.goforward.ballistic.services.BrandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class BrandServiceImpl implements BrandService {
+
+    @Autowired
+    private BrandRepository repo;
+
+    @Override
+    public List<Brand> findAll() {
+        return repo.findAll();
+    }
+
+    @Override
+    public Optional<Brand> findById(Integer id) {
+        return repo.findById(id);
+    }
+
+    @Override
+    public Brand save(Brand item) {
+        return null;
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        deleteById(id);
+    }
+}

src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java

@@ -0,0 +1,660 @@
+package group.goforward.ballistic.services.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Reader;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import org.springframework.cache.annotation.CacheEvict;
+
+import group.goforward.ballistic.imports.MerchantFeedRow;
+import group.goforward.ballistic.services.MerchantFeedImportService;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import group.goforward.ballistic.model.Brand;
+import group.goforward.ballistic.model.Merchant;
+import group.goforward.ballistic.model.Product;
+import group.goforward.ballistic.repos.BrandRepository;
+import group.goforward.ballistic.repos.MerchantRepository;
+import group.goforward.ballistic.repos.ProductRepository;
+import group.goforward.ballistic.services.MerchantCategoryMappingService;
+import group.goforward.ballistic.model.MerchantCategoryMapping;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import group.goforward.ballistic.repos.ProductOfferRepository;
+import group.goforward.ballistic.model.ProductOffer;
+
+import java.time.OffsetDateTime;
+
+@Service
+@Transactional
+public class MerchantFeedImportServiceImpl implements MerchantFeedImportService {
+    private static final Logger log = LoggerFactory.getLogger(MerchantFeedImportServiceImpl.class);
+
+    private final MerchantRepository merchantRepository;
+    private final BrandRepository brandRepository;
+    private final ProductRepository productRepository;
+    private final MerchantCategoryMappingService merchantCategoryMappingService;
+    private final ProductOfferRepository productOfferRepository;
+
+    public MerchantFeedImportServiceImpl(MerchantRepository merchantRepository,
+                                         BrandRepository brandRepository,
+                                         ProductRepository productRepository,
+                                         MerchantCategoryMappingService merchantCategoryMappingService,
+                                         ProductOfferRepository productOfferRepository) {
+        this.merchantRepository = merchantRepository;
+        this.brandRepository = brandRepository;
+        this.productRepository = productRepository;
+        this.merchantCategoryMappingService = merchantCategoryMappingService;
+        this.productOfferRepository = productOfferRepository;
+    }
+
+    @Override
+    @CacheEvict(value = "gunbuilderProducts", allEntries = true)
+    public void importMerchantFeed(Integer merchantId) {
+        log.info("Starting full import for merchantId={}", merchantId);
+
+        Merchant merchant = merchantRepository.findById(merchantId)
+                .orElseThrow(() -> new IllegalArgumentException("Merchant not found: " + merchantId));
+
+        // Read all rows from the merchant feed
+        List<MerchantFeedRow> rows = readFeedRowsForMerchant(merchant);
+        log.info("Read {} feed rows for merchant={}", rows.size(), merchant.getName());
+
+        for (MerchantFeedRow row : rows) {
+            Brand brand = resolveBrand(row);
+            Product p = upsertProduct(merchant, brand, row);
+            log.debug("Upserted product id={}, name={}, slug={}, platform={}, partRole={}, merchant={}",
+                    p.getId(), p.getName(), p.getSlug(), p.getPlatform(), p.getPartRole(), merchant.getName());
+        }
+    }
+
+    // ---------------------------------------------------------------------
+    //  Upsert logic
+    // ---------------------------------------------------------------------
+
+    private Product upsertProduct(Merchant merchant, Brand brand, MerchantFeedRow row) {
+        log.debug("Upserting product for brand={}, sku={}, name={}", brand.getName(), row.sku(), row.productName());
+
+        String mpn = trimOrNull(row.manufacturerId());
+        String upc = trimOrNull(row.sku()); // placeholder until real UPC field
+
+        List<Product> candidates = Collections.emptyList();
+
+        if (mpn != null) {
+            candidates = productRepository.findAllByBrandAndMpn(brand, mpn);
+        }
+        if ((candidates == null || candidates.isEmpty()) && upc != null) {
+            candidates = productRepository.findAllByBrandAndUpc(brand, upc);
+        }
+
+        Product p;
+        boolean isNew = (candidates == null || candidates.isEmpty());
+
+        if (isNew) {
+            p = new Product();
+            p.setBrand(brand);
+        } else {
+            if (candidates.size() > 1) {
+                log.warn("Multiple existing products found for brand={}, mpn={}, upc={}. Using first match id={}",
+                        brand.getName(), mpn, upc, candidates.get(0).getId());
+            }
+            p = candidates.get(0);
+        }
+
+        updateProductFromRow(p, merchant, row, isNew);
+
+        // Save the product first
+        Product saved = productRepository.save(p);
+
+        // Then upsert the offer for this row
+        upsertOfferFromRow(saved, merchant, row);
+
+        return saved;
+    }
+    private List<Map<String, String>> fetchFeedRows(String feedUrl) {
+        log.info("Reading offer feed from {}", feedUrl);
+
+        List<Map<String, String>> rows = new ArrayList<>();
+
+        try (Reader reader = (feedUrl.startsWith("http://") || feedUrl.startsWith("https://"))
+                ? new InputStreamReader(new URL(feedUrl).openStream(), StandardCharsets.UTF_8)
+                : java.nio.file.Files.newBufferedReader(java.nio.file.Paths.get(feedUrl), StandardCharsets.UTF_8);
+             CSVParser parser = CSVFormat.DEFAULT
+                     .withFirstRecordAsHeader()
+                     .withIgnoreSurroundingSpaces()
+                     .withTrim()
+                     .parse(reader)) {
+
+            // capture header names from the CSV
+            List<String> headers = new ArrayList<>(parser.getHeaderMap().keySet());
+
+            for (CSVRecord rec : parser) {
+                Map<String, String> row = new HashMap<>();
+                for (String header : headers) {
+                    row.put(header, rec.get(header));
+                }
+                rows.add(row);
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException("Failed to read offer feed from " + feedUrl, ex);
+        }
+
+        log.info("Parsed {} offer rows from offer feed {}", rows.size(), feedUrl);
+        return rows;
+    }
+    
+    private void updateProductFromRow(Product p, Merchant merchant, MerchantFeedRow row, boolean isNew) {
+        // ---------- NAME ----------
+        String name = coalesce(
+                trimOrNull(row.productName()),
+                trimOrNull(row.shortDescription()),
+                trimOrNull(row.longDescription()),
+                trimOrNull(row.sku())
+        );
+        if (name == null) {
+            name = "Unknown Product";
+        }
+        p.setName(name);
+
+        // ---------- SLUG ----------
+        if (isNew || p.getSlug() == null || p.getSlug().isBlank()) {
+            String baseForSlug = coalesce(
+                    trimOrNull(name),
+                    trimOrNull(row.sku())
+            );
+            if (baseForSlug == null) {
+                baseForSlug = "product-" + System.currentTimeMillis();
+            }
+
+            String slug = baseForSlug
+                    .toLowerCase()
+                    .replaceAll("[^a-z0-9]+", "-")
+                    .replaceAll("(^-|-$)", "");
+            if (slug.isBlank()) {
+                slug = "product-" + System.currentTimeMillis();
+            }
+
+            String uniqueSlug = generateUniqueSlug(slug);
+            p.setSlug(uniqueSlug);
+        }
+
+        // ---------- DESCRIPTIONS ----------
+        p.setShortDescription(trimOrNull(row.shortDescription()));
+        p.setDescription(trimOrNull(row.longDescription()));
+
+        // ---------- IMAGE ----------
+        String mainImage = coalesce(
+                trimOrNull(row.imageUrl()),
+                trimOrNull(row.mediumImageUrl()),
+                trimOrNull(row.thumbUrl())
+        );
+        p.setMainImageUrl(mainImage);
+
+        // ---------- IDENTIFIERS ----------
+        String mpn = coalesce(
+                trimOrNull(row.manufacturerId()),
+                trimOrNull(row.sku())
+        );
+        p.setMpn(mpn);
+
+        // UPC placeholder
+        p.setUpc(null);
+
+        // ---------- PLATFORM ----------
+        if (isNew || !Boolean.TRUE.equals(p.getPlatformLocked())) {
+            String platform = inferPlatform(row);
+            p.setPlatform(platform != null ? platform : "AR-15");
+        }
+
+        // ---------- RAW CATEGORY KEY (for debugging / analytics) ----------
+        String rawCategoryKey = buildRawCategoryKey(row);
+        p.setRawCategoryKey(rawCategoryKey);
+
+        // ---------- PART ROLE (via category mapping, with keyword fallback) ----------
+        String partRole = null;
+
+        if (rawCategoryKey != null) {
+            // Ask the mapping service for (or to create) a mapping row
+            MerchantCategoryMapping mapping =
+                    merchantCategoryMappingService.resolveMapping(merchant, rawCategoryKey);
+
+            if (mapping != null && mapping.getMappedPartRole() != null && !mapping.getMappedPartRole().isBlank()) {
+                partRole = mapping.getMappedPartRole().trim();
+            }
+        }
+
+        // Fallback: keyword-based inference if we still don't have a mapped partRole
+        if (partRole == null || partRole.isBlank()) {
+            partRole = inferPartRole(row);
+        }
+
+        if (partRole == null || partRole.isBlank()) {
+            partRole = "unknown";
+        }
+
+        p.setPartRole(partRole);
+    }
+    private void upsertOfferFromRow(Product product, Merchant merchant, MerchantFeedRow row) {
+        // For now, we’ll use SKU as the "avantlinkProductId" placeholder.
+        // If/when you have a real AvantLink product_id in the feed, switch to that.
+        String avantlinkProductId = trimOrNull(row.sku());
+        if (avantlinkProductId == null) {
+            // If there's truly no SKU, bail out – we can't match this offer reliably.
+            log.debug("Skipping offer row with no SKU for product id={}", product.getId());
+            return;
+        }
+
+        // Idempotent upsert: look for an existing offer for this merchant + AvantLink product id
+        ProductOffer offer = productOfferRepository
+                .findByMerchantIdAndAvantlinkProductId(merchant.getId(), avantlinkProductId)
+                .orElseGet(ProductOffer::new);
+
+        // If this is a brand‑new offer, initialize key fields
+        if (offer.getId() == null) {
+            offer.setMerchant(merchant);
+            offer.setProduct(product);
+            offer.setAvantlinkProductId(avantlinkProductId);
+            offer.setFirstSeenAt(OffsetDateTime.now());
+        } else {
+            // Make sure associations stay in sync if anything changed
+            offer.setMerchant(merchant);
+            offer.setProduct(product);
+        }
+
+        // Identifiers
+        offer.setSku(trimOrNull(row.sku()));
+        // No real UPC in this feed yet – leave null for now
+        offer.setUpc(null);
+
+        // Buy URL
+        offer.setBuyUrl(trimOrNull(row.buyLink()));
+
+        // Prices from feed
+        BigDecimal retail = row.retailPrice(); // parsed as BigDecimal in readFeedRowsForMerchant
+        BigDecimal sale   = row.salePrice();
+
+        BigDecimal effectivePrice;
+        BigDecimal originalPrice;
+
+        // Prefer sale price if it exists and is less than or equal to retail
+        if (sale != null && (retail == null || sale.compareTo(retail) <= 0)) {
+            effectivePrice = sale;
+            originalPrice = (retail != null ? retail : sale);
+        } else {
+            // Otherwise fall back to retail or whatever is present
+            effectivePrice = (retail != null ? retail : sale);
+            originalPrice = (retail != null ? retail : sale);
+        }
+
+        offer.setPrice(effectivePrice);
+        offer.setOriginalPrice(originalPrice);
+
+        // Currency + stock
+        offer.setCurrency("USD");
+        // We don't have a real stock flag in this CSV, so assume in-stock for now
+        offer.setInStock(Boolean.TRUE);
+
+        // Update "last seen" on every import pass
+        offer.setLastSeenAt(OffsetDateTime.now());
+
+        productOfferRepository.save(offer);
+    }
+
+
+    // ---------------------------------------------------------------------
+    //  Feed reading + brand resolution
+    // ---------------------------------------------------------------------
+
+    /**
+     * Open a Reader for either an HTTP(S) URL or a local file path.
+     */
+    private Reader openFeedReader(String feedUrl) throws java.io.IOException {
+        if (feedUrl.startsWith("http://") || feedUrl.startsWith("https://")) {
+            return new InputStreamReader(new URL(feedUrl).openStream(), StandardCharsets.UTF_8);
+        } else {
+            return java.nio.file.Files.newBufferedReader(
+                    java.nio.file.Paths.get(feedUrl),
+                    StandardCharsets.UTF_8
+            );
+        }
+    }
+
+    /**
+     * Try a few common delimiters (tab, comma, semicolon) and pick the one
+     * that yields the expected AvantLink-style header set.
+     */
+    private CSVFormat detectCsvFormat(String feedUrl) throws Exception {
+        char[] delimiters = new char[]{'\t', ',', ';'};
+        java.util.List<String> requiredHeaders =
+                java.util.Arrays.asList("SKU", "Manufacturer Id", "Brand Name", "Product Name");
+
+        Exception lastException = null;
+
+        for (char delimiter : delimiters) {
+            try (Reader reader = openFeedReader(feedUrl);
+                 CSVParser parser = CSVFormat.DEFAULT.builder()
+                         .setDelimiter(delimiter)
+                         .setHeader()
+                         .setSkipHeaderRecord(true)
+                         .setIgnoreSurroundingSpaces(true)
+                         .setTrim(true)
+                         .build()
+                         .parse(reader)) {
+
+                Map<String, Integer> headerMap = parser.getHeaderMap();
+                if (headerMap != null && headerMap.keySet().containsAll(requiredHeaders)) {
+                    log.info("Detected delimiter '{}' for feed {}", (delimiter == '\t' ? "\\t" : String.valueOf(delimiter)), feedUrl);
+
+                    return CSVFormat.DEFAULT.builder()
+                            .setDelimiter(delimiter)
+                            .setHeader()
+                            .setSkipHeaderRecord(true)
+                            .setIgnoreSurroundingSpaces(true)
+                            .setTrim(true)
+                            .build();
+                } else if (headerMap != null) {
+                    log.debug("Delimiter '{}' produced headers {} for feed {}", (delimiter == '\t' ? "\\t" : String.valueOf(delimiter)), headerMap.keySet(), feedUrl);
+                }
+            } catch (Exception ex) {
+                lastException = ex;
+                log.warn("Error probing delimiter '{}' for {}: {}", delimiter, feedUrl, ex.getMessage());
+            }
+        }
+
+        if (lastException != null) {
+            throw lastException;
+        }
+        throw new RuntimeException("Could not auto-detect delimiter for feed: " + feedUrl);
+    }
+
+    private List<MerchantFeedRow> readFeedRowsForMerchant(Merchant merchant) {
+        String rawFeedUrl = merchant.getFeedUrl();
+        if (rawFeedUrl == null || rawFeedUrl.isBlank()) {
+            throw new IllegalStateException("Merchant " + merchant.getName() + " has no feed_url configured");
+        }
+
+        String feedUrl = rawFeedUrl.trim();
+        log.info("Reading product feed for merchant={} from {}", merchant.getName(), feedUrl);
+
+        List<MerchantFeedRow> rows = new ArrayList<>();
+
+        try {
+            // Auto-detect delimiter (TSV/CSV/semicolon) based on header row
+            CSVFormat format = detectCsvFormat(feedUrl);
+
+            try (Reader reader = openFeedReader(feedUrl);
+                 CSVParser parser = new CSVParser(reader, format)) {
+
+                log.debug("Detected feed headers for merchant {}: {}", merchant.getName(), parser.getHeaderMap().keySet());
+
+                for (CSVRecord rec : parser) {
+                    MerchantFeedRow row = new MerchantFeedRow(
+                            getCsvValue(rec, "SKU"),
+                            getCsvValue(rec, "Manufacturer Id"),
+                            getCsvValue(rec, "Brand Name"),
+                            getCsvValue(rec, "Product Name"),
+                            getCsvValue(rec, "Long Description"),
+                            getCsvValue(rec, "Short Description"),
+                            getCsvValue(rec, "Department"),
+                            getCsvValue(rec, "Category"),
+                            getCsvValue(rec, "SubCategory"),
+                            getCsvValue(rec, "Thumb URL"),
+                            getCsvValue(rec, "Image URL"),
+                            getCsvValue(rec, "Buy Link"),
+                            getCsvValue(rec, "Keywords"),
+                            getCsvValue(rec, "Reviews"),
+                            parseBigDecimal(getCsvValue(rec, "Retail Price")),
+                            parseBigDecimal(getCsvValue(rec, "Sale Price")),
+                            getCsvValue(rec, "Brand Page Link"),
+                            getCsvValue(rec, "Brand Logo Image"),
+                            getCsvValue(rec, "Product Page View Tracking"),
+                            null,
+                            getCsvValue(rec, "Medium Image URL"),
+                            getCsvValue(rec, "Product Content Widget"),
+                            getCsvValue(rec, "Google Categorization"),
+                            getCsvValue(rec, "Item Based Commission")
+                    );
+
+                    rows.add(row);
+                }
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException("Failed to read feed for merchant "
+                    + merchant.getName() + " from " + feedUrl, ex);
+        }
+
+        log.info("Parsed {} product rows for merchant={}", rows.size(), merchant.getName());
+        return rows;
+    }
+
+    private Brand resolveBrand(MerchantFeedRow row) {
+        String rawBrand = trimOrNull(row.brandName());
+        final String brandName = (rawBrand != null) ? rawBrand : "Aero Precision";
+    
+        return brandRepository.findByNameIgnoreCase(brandName)
+                .orElseGet(() -> {
+                    Brand b = new Brand();
+                    b.setName(brandName);
+                    return brandRepository.save(b);
+                });
+    }
+
+    private String getCol(String[] cols, int index) {
+        return (index >= 0 && index < cols.length) ? cols[index] : null;
+    }
+
+    private BigDecimal parseBigDecimal(String raw) {
+        if (raw == null) return null;
+        String trimmed = raw.trim();
+        if (trimmed.isEmpty()) return null;
+        try {
+            return new BigDecimal(trimmed);
+        } catch (NumberFormatException ex) {
+            log.debug("Skipping invalid numeric value '{}'", raw);
+            return null;
+        }
+    }
+
+    /**
+     * Safely get a column value by header name. If the record is "short"
+     * (fewer values than headers) or the header is missing, return null
+     * instead of throwing IllegalArgumentException.
+     */
+    private String getCsvValue(CSVRecord rec, String header) {
+        if (rec == null || header == null) {
+            return null;
+        }
+        if (!rec.isMapped(header)) {
+            // Header not present at all
+            return null;
+        }
+        try {
+            return rec.get(header);
+        } catch (IllegalArgumentException ex) {
+            log.debug("Short CSV record #{} missing column '{}', treating as null", rec.getRecordNumber(), header);
+            return null;
+        }
+    }
+
+    // ---------------------------------------------------------------------
+    //  Misc helpers
+    // ---------------------------------------------------------------------
+
+    private String trimOrNull(String value) {
+        if (value == null) return null;
+        String trimmed = value.trim();
+        return trimmed.isEmpty() ? null : trimmed;
+    }
+
+    private String coalesce(String... values) {
+        if (values == null) return null;
+        for (String v : values) {
+            if (v != null && !v.isBlank()) {
+                return v;
+            }
+        }
+        return null;
+    }
+
+    private String generateUniqueSlug(String baseSlug) {
+        String candidate = baseSlug;
+        int suffix = 1;
+        while (productRepository.existsBySlug(candidate)) {
+            candidate = baseSlug + "-" + suffix;
+            suffix++;
+        }
+        return candidate;
+    }
+
+    private String buildRawCategoryKey(MerchantFeedRow row) {
+        String dept = trimOrNull(row.department());
+        String cat = trimOrNull(row.category());
+        String sub = trimOrNull(row.subCategory());
+
+        java.util.List<String> parts = new java.util.ArrayList<>();
+        if (dept != null) parts.add(dept);
+        if (cat != null) parts.add(cat);
+        if (sub != null) parts.add(sub);
+
+        if (parts.isEmpty()) {
+            return null;
+        }
+
+        return String.join(" > ", parts);
+    }
+
+    private String inferPlatform(MerchantFeedRow row) {
+        String department = coalesce(trimOrNull(row.department()), trimOrNull(row.category()));
+        if (department == null) return null;
+
+        String lower = department.toLowerCase();
+        if (lower.contains("ar-15") || lower.contains("ar15")) return "AR-15";
+        if (lower.contains("ar-10") || lower.contains("ar10")) return "AR-10";
+        if (lower.contains("ak-47") || lower.contains("ak47")) return "AK-47";
+
+        return "AR-15";
+    }
+
+    private String inferPartRole(MerchantFeedRow row) {
+        String cat = coalesce(
+                trimOrNull(row.subCategory()),
+                trimOrNull(row.category())
+        );
+        if (cat == null) return null;
+
+        String lower = cat.toLowerCase();
+
+        if (lower.contains("handguard") || lower.contains("rail")) {
+            return "handguard";
+        }
+        if (lower.contains("barrel")) {
+            return "barrel";
+        }
+        if (lower.contains("upper")) {
+            return "upper-receiver";
+        }
+        if (lower.contains("lower")) {
+            return "lower-receiver";
+        }
+        if (lower.contains("magazine") || lower.contains("mag")) {
+            return "magazine";
+        }
+        if (lower.contains("stock") || lower.contains("buttstock")) {
+            return "stock";
+        }
+        if (lower.contains("grip")) {
+            return "grip";
+        }
+
+        return "unknown";
+    }
+    @CacheEvict(value = "gunbuilderProducts", allEntries = true)
+    public void syncOffersOnly(Integer merchantId) {
+        log.info("Starting offers-only sync for merchantId={}", merchantId);
+        Merchant merchant = merchantRepository.findById(merchantId)
+            .orElseThrow(() -> new RuntimeException("Merchant not found"));
+
+        if (Boolean.FALSE.equals(merchant.getIsActive())) {
+            return;
+        }
+
+        String feedUrl = merchant.getOfferFeedUrl() != null
+                ? merchant.getOfferFeedUrl()
+                : merchant.getFeedUrl();
+
+        if (feedUrl == null) {
+            throw new RuntimeException("No offer feed URL configured for merchant " + merchantId);
+        }
+
+        List<Map<String, String>> rows = fetchFeedRows(feedUrl);
+
+        for (Map<String, String> row : rows) {
+            upsertOfferOnlyFromRow(merchant, row);
+        }
+
+        merchant.setLastOfferSyncAt(OffsetDateTime.now());
+        merchantRepository.save(merchant);
+        log.info("Completed offers-only sync for merchantId={} ({} rows processed)", merchantId, rows.size());
+    }
+
+    private void upsertOfferOnlyFromRow(Merchant merchant, Map<String, String> row) {
+        // For the offer-only sync, we key offers by the same identifier we used when creating them.
+        // In the current AvantLink-style feed, that is the SKU column.
+        String avantlinkProductId = trimOrNull(row.get("SKU"));
+        if (avantlinkProductId == null || avantlinkProductId.isBlank()) {
+            return;
+        }
+
+        // Find existing offer
+        ProductOffer offer = productOfferRepository
+            .findByMerchantIdAndAvantlinkProductId(merchant.getId(), avantlinkProductId)
+            .orElse(null);
+
+        if (offer == null) {
+            // This is a *sync* pass, not full ETL – if we don't already have an offer, skip.
+            return;
+        }
+
+        // Parse price fields (column names match the main product feed)
+        BigDecimal price = parseBigDecimal(row.get("Sale Price"));
+        BigDecimal originalPrice = parseBigDecimal(row.get("Retail Price"));
+
+        // Update only *offer* fields – do not touch Product
+        offer.setPrice(price);
+        offer.setOriginalPrice(originalPrice);
+        offer.setInStock(parseInStock(row));
+
+        // Prefer a fresh Buy Link from the feed if present, otherwise keep existing
+        String newBuyUrl = trimOrNull(row.get("Buy Link"));
+        offer.setBuyUrl(coalesce(newBuyUrl, offer.getBuyUrl()));
+
+        offer.setLastSeenAt(OffsetDateTime.now());
+
+        productOfferRepository.save(offer);
+    }
+    private Boolean parseInStock(Map<String, String> row) {
+        String inStock = trimOrNull(row.get("In Stock"));
+        if (inStock == null) return Boolean.FALSE;
+    
+        String lower = inStock.toLowerCase();
+        if (lower.contains("true") || lower.contains("yes") || lower.contains("1")) {
+            return Boolean.TRUE;
+        }
+        if (lower.contains("false") || lower.contains("no") || lower.contains("0")) {
+            return Boolean.FALSE;
+        }
+    
+        return Boolean.FALSE;
+    }
+}

src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java

@@ -1,9 +1,9 @@
-package group.goforward.ballistic.service.impl;
+package group.goforward.ballistic.services.impl;
 
 
 import group.goforward.ballistic.model.State;
 import group.goforward.ballistic.repos.StateRepository;
-import group.goforward.ballistic.service.StatesService;
+import group.goforward.ballistic.services.StatesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/group/goforward/ballistic/services/impl/UsersServiceImpl.java

@@ -0,0 +1,37 @@
+package group.goforward.ballistic.services.impl;
+
+import group.goforward.ballistic.model.User;
+import group.goforward.ballistic.repos.UserRepository;
+import group.goforward.ballistic.services.UsersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class UsersServiceImpl implements UsersService {
+
+    @Autowired
+    private UserRepository repo;
+
+    @Override
+    public List<User> findAll() {
+        return repo.findAll();
+    }
+
+    @Override
+    public Optional<User> findById(Integer id) {
+        return repo.findById(id);
+    }
+
+    @Override
+    public User save(User item) {
+        return null;
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        deleteById(id);
+    }
+}

src/main/java/group/goforward/ballistic/services/impl/package-info.java

@@ -0,0 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Services implementations for the ballistic -Builder application.
+ * This package includes Services implementations  for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Don Strawsburg
+ * @version 1.1
+ */
+package group.goforward.ballistic.services.impl;