Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4f4e3def35 | |||
| a219825b28 | |||
| 150563a8f5 | |||
| 53e141f8ad |
@@ -1,11 +1,11 @@
|
||||
name: Build and Deploy
|
||||
name: Build, Test and Deploy
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main, int, dev]
|
||||
|
||||
concurrency:
|
||||
group: print-calculator-deploy-${{ gitea.ref }}
|
||||
group: print-calculator-${{ gitea.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
@@ -18,9 +18,18 @@ jobs:
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: "21"
|
||||
distribution: "temurin"
|
||||
cache: gradle
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
|
||||
- name: Cache Gradle
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches
|
||||
~/.gradle/wrapper
|
||||
key: gradle-${{ runner.os }}-${{ hashFiles('backend/gradle/wrapper/gradle-wrapper.properties', 'backend/**/*.gradle*', 'backend/gradle.properties') }}
|
||||
restore-keys: |
|
||||
gradle-${{ runner.os }}-
|
||||
|
||||
- name: Run Tests with Gradle
|
||||
run: |
|
||||
@@ -28,42 +37,8 @@ jobs:
|
||||
chmod +x gradlew
|
||||
./gradlew test
|
||||
|
||||
test-frontend:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node 22
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "22"
|
||||
cache: "npm"
|
||||
cache-dependency-path: "frontend/package-lock.json"
|
||||
|
||||
- name: Install Chromium
|
||||
shell: bash
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends chromium
|
||||
|
||||
- name: Install frontend dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
cd frontend
|
||||
npm ci --no-audit --no-fund
|
||||
|
||||
- name: Run frontend tests (headless)
|
||||
shell: bash
|
||||
env:
|
||||
CHROME_BIN: /usr/bin/chromium
|
||||
CI: "true"
|
||||
run: |
|
||||
cd frontend
|
||||
npm run test -- --watch=false --browsers=ChromeHeadlessNoSandbox
|
||||
|
||||
build-and-push:
|
||||
needs: [test-backend, test-frontend]
|
||||
needs: test-backend
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -141,33 +116,32 @@ jobs:
|
||||
mkdir -p ~/.ssh
|
||||
chmod 700 ~/.ssh
|
||||
|
||||
# 1) Prende il secret base64 e rimuove spazi/newline/CR
|
||||
printf '%s' "${{ secrets.SSH_PRIVATE_KEY_B64 }}" | tr -d '\r\n\t ' > /tmp/key.b64
|
||||
|
||||
# 2) (debug sicuro) stampa solo la lunghezza della base64
|
||||
echo "b64_len=$(wc -c < /tmp/key.b64)"
|
||||
|
||||
# 3) Decodifica in chiave privata
|
||||
base64 -d /tmp/key.b64 > ~/.ssh/id_ed25519
|
||||
|
||||
# 4) Rimuove eventuali CRLF dentro la chiave (se proviene da Windows)
|
||||
tr -d '\r' < ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.clean
|
||||
mv ~/.ssh/id_ed25519.clean ~/.ssh/id_ed25519
|
||||
chmod 600 ~/.ssh/id_ed25519
|
||||
|
||||
# 5) Validazione: se fallisce qui, la chiave NON è valida/corrotta
|
||||
ssh-keygen -y -f ~/.ssh/id_ed25519 >/dev/null
|
||||
|
||||
ssh-keyscan -H "${{ secrets.SERVER_HOST }}" >> ~/.ssh/known_hosts 2>/dev/null
|
||||
|
||||
- name: Write env and compose to server
|
||||
- name: Write env to server
|
||||
shell: bash
|
||||
run: |
|
||||
if [[ "${{ gitea.ref }}" == "refs/heads/main" ]]; then
|
||||
DEPLOY_TAG="prod"
|
||||
elif [[ "${{ gitea.ref }}" == "refs/heads/int" ]]; then
|
||||
DEPLOY_TAG="int"
|
||||
else
|
||||
DEPLOY_TAG="dev"
|
||||
fi
|
||||
DEPLOY_OWNER=$(echo '${{ gitea.repository_owner }}' | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
# 1. Start with the static env file content
|
||||
cat "deploy/envs/${{ env.ENV }}.env" > /tmp/full_env.env
|
||||
|
||||
# 2. Determine DB credentials
|
||||
if [[ "${{ env.ENV }}" == "prod" ]]; then
|
||||
DB_URL="${{ secrets.DB_URL_PROD }}"
|
||||
DB_USER="${{ secrets.DB_USERNAME_PROD }}"
|
||||
@@ -182,28 +156,25 @@ jobs:
|
||||
DB_PASS="${{ secrets.DB_PASSWORD_DEV }}"
|
||||
fi
|
||||
|
||||
printf '\nDB_URL="%s"\nDB_USERNAME="%s"\nDB_PASSWORD="%s"\n' \
|
||||
# 3. Append DB credentials
|
||||
printf '\nDB_URL=%s\nDB_USERNAME=%s\nDB_PASSWORD=%s\n' \
|
||||
"$DB_URL" "$DB_USER" "$DB_PASS" >> /tmp/full_env.env
|
||||
|
||||
printf 'REGISTRY_URL="%s"\nREPO_OWNER="%s"\nTAG="%s"\n' \
|
||||
"${{ secrets.REGISTRY_URL }}" "$DEPLOY_OWNER" "$DEPLOY_TAG" >> /tmp/full_env.env
|
||||
|
||||
ADMIN_TTL="${{ secrets.ADMIN_SESSION_TTL_MINUTES }}"
|
||||
ADMIN_TTL="${ADMIN_TTL:-480}"
|
||||
printf 'ADMIN_PASSWORD="%s"\nADMIN_SESSION_SECRET="%s"\nADMIN_SESSION_TTL_MINUTES="%s"\n' \
|
||||
"${{ secrets.ADMIN_PASSWORD }}" "${{ secrets.ADMIN_SESSION_SECRET }}" "$ADMIN_TTL" >> /tmp/full_env.env
|
||||
|
||||
# 4. Debug: print content (for debug purposes)
|
||||
echo "Preparing to send env file with variables:"
|
||||
grep -Ev "PASSWORD|SECRET" /tmp/full_env.env || true
|
||||
grep -v "PASSWORD" /tmp/full_env.env || true
|
||||
|
||||
# 5. Send to server
|
||||
ssh -i ~/.ssh/id_ed25519 -o BatchMode=yes "${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}" \
|
||||
"setenv ${{ env.ENV }}" < /tmp/full_env.env
|
||||
|
||||
ssh -i ~/.ssh/id_ed25519 -o BatchMode=yes "${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}" \
|
||||
"setcompose ${{ env.ENV }}" < docker-compose.deploy.yml
|
||||
|
||||
|
||||
- name: Trigger deploy on Unraid (forced command key)
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# Aggiungiamo le opzioni di verbosità se dovesse fallire ancora,
|
||||
# e assicuriamoci che l'input sia pulito
|
||||
ssh -i ~/.ssh/id_ed25519 -o BatchMode=yes "${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}" "deploy ${{ env.ENV }}"
|
||||
@@ -1,172 +0,0 @@
|
||||
name: PR Checks
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main, int, dev]
|
||||
|
||||
concurrency:
|
||||
group: print-calculator-pr-${{ gitea.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
prettier-autofix:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Node 22
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "22"
|
||||
|
||||
- name: Apply formatting with Prettier
|
||||
shell: bash
|
||||
run: |
|
||||
npx --yes prettier@3.6.2 --write \
|
||||
"frontend/src/**/*.{ts,html,scss,css,json}" \
|
||||
".gitea/workflows/*.{yml,yaml}"
|
||||
|
||||
- name: Commit and push formatting changes
|
||||
shell: bash
|
||||
run: |
|
||||
if git diff --quiet; then
|
||||
echo "No formatting changes to commit."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ! command -v jq >/dev/null 2>&1; then
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends jq
|
||||
fi
|
||||
|
||||
EVENT_FILE="${GITHUB_EVENT_PATH:-}"
|
||||
if [[ -z "$EVENT_FILE" || ! -f "$EVENT_FILE" ]]; then
|
||||
echo "Event payload not found, skipping auto-push."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
HEAD_REPO="$(jq -r '.pull_request.head.repo.full_name // empty' "$EVENT_FILE")"
|
||||
BASE_REPO="$(jq -r '.repository.full_name // empty' "$EVENT_FILE")"
|
||||
PR_BRANCH="$(jq -r '.pull_request.head.ref // empty' "$EVENT_FILE")"
|
||||
|
||||
if [[ -z "$PR_BRANCH" ]]; then
|
||||
echo "PR branch not found in event payload, skipping auto-push."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ -n "$HEAD_REPO" && -n "$BASE_REPO" && "$HEAD_REPO" != "$BASE_REPO" ]]; then
|
||||
echo "PR from fork ($HEAD_REPO), skipping auto-push."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git config user.name "printcalc-ci"
|
||||
git config user.email "ci@printcalculator.local"
|
||||
|
||||
git add frontend/src .gitea/workflows
|
||||
git commit -m "style: apply prettier formatting"
|
||||
git push origin "HEAD:${PR_BRANCH}"
|
||||
|
||||
security-sast:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Install Python and Semgrep
|
||||
shell: bash
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends python3 python3-pip
|
||||
python3 -m pip install --upgrade pip
|
||||
python3 -m pip install semgrep
|
||||
|
||||
- name: Run Semgrep (SAST)
|
||||
shell: bash
|
||||
run: |
|
||||
semgrep --version
|
||||
semgrep --config auto --error \
|
||||
--exclude frontend/node_modules \
|
||||
--exclude backend/build \
|
||||
backend/src frontend/src
|
||||
|
||||
- name: Install Gitleaks
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VERSION="8.24.2"
|
||||
curl -sSL "https://github.com/gitleaks/gitleaks/releases/download/v${VERSION}/gitleaks_${VERSION}_linux_x64.tar.gz" \
|
||||
-o /tmp/gitleaks.tar.gz
|
||||
tar -xzf /tmp/gitleaks.tar.gz -C /tmp
|
||||
install -m 0755 /tmp/gitleaks /usr/local/bin/gitleaks
|
||||
gitleaks version
|
||||
|
||||
- name: Run Gitleaks (secrets scan)
|
||||
shell: bash
|
||||
run: |
|
||||
set +e
|
||||
gitleaks detect --source . --no-git --redact --exit-code 1 \
|
||||
--report-format json --report-path /tmp/gitleaks-report.json
|
||||
rc=$?
|
||||
if [[ $rc -ne 0 ]]; then
|
||||
echo "Gitleaks findings:"
|
||||
cat /tmp/gitleaks-report.json
|
||||
fi
|
||||
exit $rc
|
||||
|
||||
test-backend:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: "21"
|
||||
distribution: "temurin"
|
||||
cache: gradle
|
||||
|
||||
- name: Run Tests with Gradle
|
||||
run: |
|
||||
cd backend
|
||||
chmod +x gradlew
|
||||
./gradlew test
|
||||
|
||||
test-frontend:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node 22
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "22"
|
||||
cache: "npm"
|
||||
cache-dependency-path: "frontend/package-lock.json"
|
||||
|
||||
- name: Install Chromium
|
||||
shell: bash
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends chromium
|
||||
|
||||
- name: Install frontend dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
cd frontend
|
||||
npm ci --no-audit --no-fund
|
||||
|
||||
- name: Run frontend tests (headless)
|
||||
shell: bash
|
||||
env:
|
||||
CHROME_BIN: /usr/bin/chromium
|
||||
CI: "true"
|
||||
run: |
|
||||
cd frontend
|
||||
npm run test -- --watch=false --browsers=ChromeHeadlessNoSandbox
|
||||
8
.gitignore
vendored
8
.gitignore
vendored
@@ -41,11 +41,3 @@ target/
|
||||
build/
|
||||
.gradle/
|
||||
.mvn/
|
||||
|
||||
./storage_orders
|
||||
./storage_quotes
|
||||
storage_orders
|
||||
storage_quotes
|
||||
|
||||
# Qodana local reports/artifacts
|
||||
backend/.qodana/
|
||||
|
||||
47
GEMINI.md
47
GEMINI.md
@@ -4,42 +4,39 @@ Questo file serve a dare contesto all'AI (Antigravity/Gemini) sulla struttura e
|
||||
|
||||
## Project Overview
|
||||
**Nome**: Print Calculator
|
||||
**Scopo**: Calcolare costi e tempi di stampa 3D da file STL in modo preciso tramite slicing reale.
|
||||
**Scopo**: Calcolare costi e tempi di stampa 3D da file STL.
|
||||
**Stack**:
|
||||
- **Backend**: Java 21 (Spring Boot 3.4), PostgreSQL, Flyway.
|
||||
- **Frontend**: Angular 19 (TypeScript), Angular Material, Three.js per visualizzazione 3D.
|
||||
- **Backend**: Python (FastAPI), libreria `trimesh` per analisi geometrica.
|
||||
- **Frontend**: Angular 19 (TypeScript).
|
||||
|
||||
## Architecture
|
||||
|
||||
### Backend (`/backend`)
|
||||
- **`BackendApplication.java`**: Entrypoint dell'applicazione Spring Boot.
|
||||
- **`controller/`**: Espone le API REST per l'upload e il calcolo dei preventivi.
|
||||
- **`service/SlicerService.java`**: Wrappa l'eseguibile di **OrcaSlicer** per effettuare lo slicing reale del modello.
|
||||
- Gestisce i profili di stampa (Macchina, Processo, Filamento) caricati da file JSON.
|
||||
- Crea configurazioni on-the-fly e invoca OrcaSlicer in modalità headless.
|
||||
- **`service/GCodeParser.java`**: Analizza il G-Code generato per estrarre tempo di stampa e peso del materiale dai metadati del file.
|
||||
- **`service/QuoteCalculator.java`**: Calcola il prezzo finale basandosi su politiche di prezzo salvate nel database.
|
||||
- Gestisce costi macchina a scaglioni (tiered pricing).
|
||||
- Calcola costi energetici basati sulla potenza della stampante e costo del kWh.
|
||||
- Applica markup percentuali e fee fissi per job.
|
||||
- **`main.py`**: Entrypoint dell'applicazione FastAPI.
|
||||
- Definisce l'API `POST /calculate/stl`.
|
||||
- Gestisce l'upload del file, invoca lo slicer e restituisce il preventivo.
|
||||
- Configura CORS per permettere chiamate dal frontend.
|
||||
- **`slicer.py`**: Wrappa l'eseguibile di **OrcaSlicer** per effettuare lo slicing reale del modello.
|
||||
- Gestisce i profili di stampa (Macchina, Processo, Filamento).
|
||||
- Crea configurazioni on-the-fly per supportare mesh di grandi dimensioni.
|
||||
- **`calculator.py`**: Analizza il G-Code generato.
|
||||
- `GCodeParser`: Estrae tempo di stampa e materiale usato dai metadati del G-Code.
|
||||
- `QuoteCalculator`: Applica i costi (orari, energia, materiale) per generare il prezzo finale.
|
||||
|
||||
### Frontend (`/frontend`)
|
||||
- Applicazione Angular 19 con architettura modulare (core, features, shared).
|
||||
- **Three.js**: Utilizzato per il rendering dei file STL caricati dall'utente.
|
||||
- **Angular Material**: Per l'interfaccia utente.
|
||||
- **ngx-translate**: Per il supporto multilingua.
|
||||
- Applicazione Angular standard.
|
||||
- Usa Angular Material.
|
||||
- Service per upload STL e visualizzazione preventivo.
|
||||
|
||||
## Key Concepts
|
||||
- **Real Slicing**: Il backend esegue un vero slicing usando OrcaSlicer. Questo garantisce stime di tempo e materiale estremamente precise.
|
||||
- **Database-Driven Pricing**: A differenza di versioni precedenti, il calcolo del preventivo è ora guidato da entità DB (`PricingPolicy`, `PrinterMachine`, `FilamentVariant`).
|
||||
- **G-Code Metadata**: L'applicazione legge direttamene i commenti generati dallo slicer nel G-Code (es. `; estimated printing time`, `; filament used [g]`).
|
||||
- **Real Slicing**: Il backend esegue un vero slicing usando OrcaSlicer in modalità headless. Questo garantisce stime di tempo e materiale estremamente precise, identiche a quelle che si otterrebbero preparando il file per la stampa.
|
||||
- **G-Code Parsing**: Invece di stimare geometricamente, l'applicazione legge direttamene i commenti generati dallo slicer nel G-Code (es. `estimated printing time`, `filament used`).
|
||||
|
||||
## Development Notes
|
||||
- **Backend**: Richiede JDK 21. Si avvia con `./gradlew bootRun`.
|
||||
- **Database**: Richiede PostgreSQL. Le migrazioni sono gestite da Flyway.
|
||||
- **Frontend**: Richiede Node.js 22. Si avvia con `npm start`.
|
||||
- **OrcaSlicer**: Deve essere installato sul sistema e il percorso configurato in `application.properties` o tramite variabile d'ambiente `SLICER_PATH`.
|
||||
- Per eseguire il backend serve `uvicorn`.
|
||||
- Il frontend richiede `npm install` al primo avvio.
|
||||
- Le configurazioni di stampa (layer height, wall thickness, infill) sono attualmente hardcoded o con valori di default nel backend, ma potrebbero essere esposte come parametri API in futuro.
|
||||
|
||||
## AI Agent Rules
|
||||
- **No Inline Code**: Tutti i componenti Angular DEVONO usare file separati per HTML (`templateUrl`) e SCSS (`styleUrl`). È vietato usare `template` o `styles` inline nel decoratore `@Component`.
|
||||
- **Spring Boot Conventions**: Seguire i pattern standard di Spring Boot (Service-Repository-Controller).
|
||||
|
||||
|
||||
93
README.md
93
README.md
@@ -1,67 +1,70 @@
|
||||
# Print Calculator (OrcaSlicer Edition)
|
||||
|
||||
Un'applicazione Full Stack (Angular + Spring Boot) per calcolare preventivi di stampa 3D precisi utilizzando **OrcaSlicer** in modalità headless.
|
||||
Un'applicazione Full Stack (Angular + Python/FastAPI) per calcolare preventivi di stampa 3D precisi utilizzando **OrcaSlicer** in modalità headless.
|
||||
|
||||
## Funzionalità
|
||||
|
||||
* **Slicing Reale**: Usa il motore di OrcaSlicer per stimare tempo e materiale, garantendo la massima precisione.
|
||||
* **Preventivazione Database-Driven**: Calcolo basato su politiche di prezzo configurabili nel database (costo materiale, ammortamento macchina a scaglioni, energia e markup).
|
||||
* **Visualizzazione 3D**: Anteprima del file STL caricato tramite Three.js.
|
||||
* **Multi-Profilo**: Supporto per diverse stampanti, materiali e profili di processo.
|
||||
|
||||
## Stack Tecnologico
|
||||
|
||||
- **Backend**: Java 21, Spring Boot 3.4, PostgreSQL, Flyway.
|
||||
- **Frontend**: Angular 19, Angular Material, Three.js.
|
||||
- **Slicer**: OrcaSlicer (invocato via CLI).
|
||||
* **Slicing Reale**: Usa il motore di OrcaSlicer per stimare tempo e materiale, non semplici approssimazioni geometriche.
|
||||
* **Preventivazione Completa**: Calcola costo materiale, ammortamento macchina, energia e ricarico.
|
||||
* **Configurabile**: Prezzi e parametri macchina modificabili via variabili d'ambiente.
|
||||
* **Docker Ready**: Tutto containerizzato per un facile deployment.
|
||||
|
||||
## Prerequisiti
|
||||
|
||||
* **Java 21** installato.
|
||||
* **Node.js 22** e **npm** installati.
|
||||
* **PostgreSQL** attivo.
|
||||
* **OrcaSlicer** installato sul sistema.
|
||||
* Docker Desktop & Docker Compose installati.
|
||||
|
||||
## Avvio Rapido
|
||||
|
||||
### 1. Database
|
||||
Crea un database PostgreSQL chiamato `printcalc`. Le tabelle verranno create automaticamente al primo avvio tramite Flyway.
|
||||
1. Clona il repository.
|
||||
2. Esegui lo script di avvio o docker-compose:
|
||||
```bash
|
||||
docker-compose up --build
|
||||
```
|
||||
*Nota: La prima build impiegherà alcuni minuti per scaricare OrcaSlicer (~200MB) e compilare il Frontend.*
|
||||
|
||||
### 2. Backend
|
||||
Configura il percorso di OrcaSlicer in `backend/src/main/resources/application.properties` o tramite la variabile d'ambiente `SLICER_PATH`.
|
||||
3. Accedi all'applicazione:
|
||||
* **Frontend**: [http://localhost](http://localhost)
|
||||
* **API Docs**: [http://localhost:8000/docs](http://localhost:8000/docs)
|
||||
|
||||
## Configurazione Prezzi
|
||||
|
||||
Puoi modificare i prezzi nel file `docker-compose.yml` (sezione `environment` del servizio backend):
|
||||
|
||||
* `FILAMENT_COST_PER_KG`: Costo filamento al kg (es. 25.0).
|
||||
* `MACHINE_COST_PER_HOUR`: Costo orario macchina (ammortamento/manutenzione).
|
||||
* `ENERGY_COST_PER_KWH`: Costo energia elettrica.
|
||||
* `MARKUP_PERCENT`: Margine di profitto percentuale (es. 20 = +20%).
|
||||
|
||||
## Struttura del Progetto
|
||||
|
||||
* `/backend`: API Python FastAPI. Include Dockerfile che scarica OrcaSlicer AppImage.
|
||||
* `/frontend`: Applicazione Angular 19+ con Material Design.
|
||||
* `/backend/profiles`: Contiene i profili di slicing (.ini). Attualmente configurato per una stima generica simil-Bambu Lab A1.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Errore Download OrcaSlicer
|
||||
Se la build del backend fallisce durante il download di `OrcaSlicer.AppImage`, verifica la tua connessione internet o aggiorna l'URL nel `backend/Dockerfile`.
|
||||
|
||||
### Slicing Fallito (Costo 0 o Errore)
|
||||
Se l'API ritorna errore o valori nulli:
|
||||
1. Controlla che il file STL sia valido (manifold).
|
||||
2. Controlla i log del backend: `docker logs print-calculator-backend`.
|
||||
|
||||
## Sviluppo Locale (Senza Docker)
|
||||
|
||||
**Backend**:
|
||||
Richiede Linux (o WSL2) per eseguire l'AppImage di OrcaSlicer.
|
||||
```bash
|
||||
cd backend
|
||||
./gradlew bootRun
|
||||
pip install -r requirements.txt
|
||||
# Assicurati di avere OrcaSlicer installato e nel PATH o aggiorna SLICER_PATH in slicer.py
|
||||
uvicorn main:app --reload
|
||||
```
|
||||
|
||||
### 3. Frontend
|
||||
**Frontend**:
|
||||
```bash
|
||||
cd frontend
|
||||
npm install
|
||||
npm start
|
||||
```
|
||||
|
||||
Accedi a [http://localhost:4200](http://localhost:4200).
|
||||
|
||||
## Configurazione Prezzi
|
||||
|
||||
I prezzi non sono più gestiti tramite variabili d'ambiente fisse ma tramite tabelle nel database:
|
||||
- `pricing_policy`: Definisce markup, fee fissi e costi elettrici.
|
||||
- `pricing_policy_machine_hour_tier`: Definisce i costi orari delle macchine in base alla durata della stampa.
|
||||
- `printer_machine`: Anagrafica stampanti e consumi energetici.
|
||||
- `filament_material_type` / `filament_variant`: Listino prezzi materiali.
|
||||
|
||||
## Struttura del Progetto
|
||||
|
||||
* `/backend`: API Spring Boot.
|
||||
* `/frontend`: Applicazione Angular.
|
||||
* `/backend/profiles`: Contiene i file di configurazione per OrcaSlicer.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Percorso OrcaSlicer
|
||||
Assicurati che `slicer.path` punti al binario corretto. Su macOS è solitamente `/Applications/OrcaSlicer.app/Contents/MacOS/OrcaSlicer`. Su Linux è il percorso all'AppImage (estratta o meno).
|
||||
|
||||
### Database connection
|
||||
Verifica le credenziali in `application.properties`. Se usi Docker, puoi passare `DB_URL`, `DB_USERNAME` e `DB_PASSWORD` come variabili d'ambiente.
|
||||
|
||||
@@ -24,27 +24,11 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||
implementation 'xyz.capybara:clamav-client:2.1.2'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-actuator'
|
||||
runtimeOnly 'org.postgresql:postgresql'
|
||||
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
testImplementation 'org.springframework.security:spring-security-test'
|
||||
testRuntimeOnly 'com.h2database:h2'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
compileOnly 'org.projectlombok:lombok'
|
||||
annotationProcessor 'org.projectlombok:lombok'
|
||||
implementation 'io.github.openhtmltopdf:openhtmltopdf-pdfbox:1.1.37'
|
||||
implementation 'io.github.openhtmltopdf:openhtmltopdf-svg-support:1.1.37'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
||||
implementation 'net.codecrete.qrbill:qrbill-generator:3.4.0'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-mail'
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
tasks.named('test') {
|
||||
|
||||
@@ -3,23 +3,13 @@ echo "----------------------------------------------------------------"
|
||||
echo "Starting Backend Application"
|
||||
echo "DB_URL: $DB_URL"
|
||||
echo "DB_USERNAME: $DB_USERNAME"
|
||||
echo "SPRING_DATASOURCE_URL: $SPRING_DATASOURCE_URL"
|
||||
echo "SLICER_PATH: $SLICER_PATH"
|
||||
echo "--- ALL ENV VARS ---"
|
||||
env
|
||||
echo "----------------------------------------------------------------"
|
||||
|
||||
# Determine which environment variables to use for database connection
|
||||
# This allows compatibility with different docker-compose configurations
|
||||
FINAL_DB_URL="${DB_URL:-$SPRING_DATASOURCE_URL}"
|
||||
FINAL_DB_USER="${DB_USERNAME:-$SPRING_DATASOURCE_USERNAME}"
|
||||
FINAL_DB_PASS="${DB_PASSWORD:-$SPRING_DATASOURCE_PASSWORD}"
|
||||
|
||||
if [ -n "$FINAL_DB_URL" ]; then
|
||||
echo "Using database URL: $FINAL_DB_URL"
|
||||
exec java -jar app.jar \
|
||||
--spring.datasource.url="${FINAL_DB_URL}" \
|
||||
--spring.datasource.username="${FINAL_DB_USER}" \
|
||||
--spring.datasource.password="${FINAL_DB_PASS}"
|
||||
else
|
||||
echo "No database URL specified in environment, relying on application.properties defaults."
|
||||
exec java -jar app.jar
|
||||
fi
|
||||
# Exec java with explicit properties from env
|
||||
exec java -jar app.jar \
|
||||
--spring.datasource.url="${DB_URL}" \
|
||||
--spring.datasource.username="${DB_USERNAME}" \
|
||||
--spring.datasource.password="${DB_PASSWORD}"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,48 +0,0 @@
|
||||
#-------------------------------------------------------------------------------#
|
||||
# Qodana analysis is configured by qodana.yaml file #
|
||||
# https://www.jetbrains.com/help/qodana/qodana-yaml.html #
|
||||
#-------------------------------------------------------------------------------#
|
||||
|
||||
#################################################################################
|
||||
# WARNING: Do not store sensitive information in this file, #
|
||||
# as its contents will be included in the Qodana report. #
|
||||
#################################################################################
|
||||
version: "1.0"
|
||||
|
||||
#Specify inspection profile for code analysis
|
||||
profile:
|
||||
name: qodana.starter
|
||||
|
||||
#Enable inspections
|
||||
#include:
|
||||
# - name: <SomeEnabledInspectionId>
|
||||
|
||||
#Disable inspections
|
||||
#exclude:
|
||||
# - name: <SomeDisabledInspectionId>
|
||||
# paths:
|
||||
# - <path/where/not/run/inspection>
|
||||
|
||||
projectJDK: "21" #(Applied in CI/CD pipeline)
|
||||
|
||||
#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
|
||||
#bootstrap: sh ./prepare-qodana.sh
|
||||
|
||||
#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
|
||||
#plugins:
|
||||
# - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
|
||||
|
||||
# Quality gate. Will fail the CI/CD pipeline if any condition is not met
|
||||
# severityThresholds - configures maximum thresholds for different problem severities
|
||||
# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
|
||||
# Code Coverage is available in Ultimate and Ultimate Plus plans
|
||||
#failureConditions:
|
||||
# severityThresholds:
|
||||
# any: 15
|
||||
# critical: 5
|
||||
# testCoverageThresholds:
|
||||
# fresh: 70
|
||||
# total: 50
|
||||
|
||||
#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
|
||||
linter: jetbrains/qodana-jvm:2025.3
|
||||
@@ -2,15 +2,8 @@ package com.printcalculator;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
import org.springframework.scheduling.annotation.EnableAsync;
|
||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||
|
||||
@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class})
|
||||
@EnableTransactionManagement
|
||||
@EnableScheduling
|
||||
@EnableAsync
|
||||
@SpringBootApplication
|
||||
public class BackendApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -11,16 +11,8 @@ public class CorsConfig implements WebMvcConfigurer {
|
||||
@Override
|
||||
public void addCorsMappings(CorsRegistry registry) {
|
||||
registry.addMapping("/**")
|
||||
.allowedOrigins(
|
||||
"http://localhost",
|
||||
"http://localhost:4200",
|
||||
"http://localhost:80",
|
||||
"http://127.0.0.1",
|
||||
"https://dev.3d-fab.ch",
|
||||
"https://int.3d-fab.ch",
|
||||
"https://3d-fab.ch"
|
||||
)
|
||||
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
|
||||
.allowedOrigins("http://localhost", "http://localhost:4200", "http://localhost:80", "http://127.0.0.1")
|
||||
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
|
||||
.allowedHeaders("*")
|
||||
.allowCredentials(true);
|
||||
}
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
package com.printcalculator.config;
|
||||
|
||||
import com.printcalculator.security.AdminSessionAuthenticationFilter;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.security.config.Customizer;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
|
||||
import org.springframework.security.config.http.SessionCreationPolicy;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
|
||||
|
||||
@Configuration
|
||||
public class SecurityConfig {
|
||||
|
||||
@Bean
|
||||
public SecurityFilterChain securityFilterChain(
|
||||
HttpSecurity http,
|
||||
AdminSessionAuthenticationFilter adminSessionAuthenticationFilter
|
||||
) throws Exception {
|
||||
http
|
||||
.csrf(AbstractHttpConfigurer::disable)
|
||||
.cors(Customizer.withDefaults())
|
||||
.sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
|
||||
.httpBasic(AbstractHttpConfigurer::disable)
|
||||
.formLogin(AbstractHttpConfigurer::disable)
|
||||
.logout(AbstractHttpConfigurer::disable)
|
||||
.authorizeHttpRequests(auth -> auth
|
||||
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
|
||||
.requestMatchers("/actuator/health", "/actuator/health/**").permitAll()
|
||||
.requestMatchers("/actuator/**").denyAll()
|
||||
.requestMatchers("/api/admin/auth/login").permitAll()
|
||||
.requestMatchers("/api/admin/**").authenticated()
|
||||
.anyRequest().permitAll()
|
||||
)
|
||||
.exceptionHandling(ex -> ex.authenticationEntryPoint((request, response, authException) -> {
|
||||
response.setStatus(401);
|
||||
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
|
||||
response.getWriter().write("{\"error\":\"UNAUTHORIZED\"}");
|
||||
}))
|
||||
.addFilterBefore(adminSessionAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
|
||||
|
||||
return http.build();
|
||||
}
|
||||
}
|
||||
@@ -1,267 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.QuoteRequestDto;
|
||||
import com.printcalculator.entity.CustomQuoteRequest;
|
||||
import com.printcalculator.entity.CustomQuoteRequestAttachment;
|
||||
import com.printcalculator.repository.CustomQuoteRequestAttachmentRepository;
|
||||
import com.printcalculator.repository.CustomQuoteRequestRepository;
|
||||
import com.printcalculator.service.ClamAVService;
|
||||
import com.printcalculator.service.email.EmailNotificationService;
|
||||
import jakarta.validation.Valid;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.InvalidPathException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.Year;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/custom-quote-requests")
|
||||
public class CustomQuoteRequestController {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(CustomQuoteRequestController.class);
|
||||
private final CustomQuoteRequestRepository requestRepo;
|
||||
private final CustomQuoteRequestAttachmentRepository attachmentRepo;
|
||||
private final ClamAVService clamAVService;
|
||||
private final EmailNotificationService emailNotificationService;
|
||||
|
||||
@Value("${app.mail.contact-request.admin.enabled:true}")
|
||||
private boolean contactRequestAdminMailEnabled;
|
||||
|
||||
@Value("${app.mail.contact-request.admin.address:infog@3d-fab.ch}")
|
||||
private String contactRequestAdminMailAddress;
|
||||
|
||||
// TODO: Inject Storage Service
|
||||
private static final Path STORAGE_ROOT = Paths.get("storage_requests").toAbsolutePath().normalize();
|
||||
private static final Pattern SAFE_EXTENSION_PATTERN = Pattern.compile("^[a-z0-9]{1,10}$");
|
||||
private static final Set<String> FORBIDDEN_COMPRESSED_EXTENSIONS = Set.of(
|
||||
"zip", "rar", "7z", "tar", "gz", "tgz", "bz2", "tbz2", "xz", "txz", "zst"
|
||||
);
|
||||
private static final Set<String> FORBIDDEN_COMPRESSED_MIME_TYPES = Set.of(
|
||||
"application/zip",
|
||||
"application/x-zip-compressed",
|
||||
"application/x-rar-compressed",
|
||||
"application/vnd.rar",
|
||||
"application/x-7z-compressed",
|
||||
"application/gzip",
|
||||
"application/x-gzip",
|
||||
"application/x-tar",
|
||||
"application/x-bzip2",
|
||||
"application/x-xz",
|
||||
"application/zstd",
|
||||
"application/x-zstd"
|
||||
);
|
||||
|
||||
public CustomQuoteRequestController(CustomQuoteRequestRepository requestRepo,
|
||||
CustomQuoteRequestAttachmentRepository attachmentRepo,
|
||||
ClamAVService clamAVService,
|
||||
EmailNotificationService emailNotificationService) {
|
||||
this.requestRepo = requestRepo;
|
||||
this.attachmentRepo = attachmentRepo;
|
||||
this.clamAVService = clamAVService;
|
||||
this.emailNotificationService = emailNotificationService;
|
||||
}
|
||||
|
||||
// 1. Create Custom Quote Request
|
||||
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
@Transactional
|
||||
public ResponseEntity<CustomQuoteRequest> createCustomQuoteRequest(
|
||||
@Valid @RequestPart("request") QuoteRequestDto requestDto,
|
||||
@RequestPart(value = "files", required = false) List<MultipartFile> files
|
||||
) throws IOException {
|
||||
if (!requestDto.isAcceptTerms() || !requestDto.isAcceptPrivacy()) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.BAD_REQUEST,
|
||||
"Accettazione Termini e Privacy obbligatoria."
|
||||
);
|
||||
}
|
||||
|
||||
// 1. Create Request
|
||||
CustomQuoteRequest request = new CustomQuoteRequest();
|
||||
request.setRequestType(requestDto.getRequestType());
|
||||
request.setCustomerType(requestDto.getCustomerType());
|
||||
request.setEmail(requestDto.getEmail());
|
||||
request.setPhone(requestDto.getPhone());
|
||||
request.setName(requestDto.getName());
|
||||
request.setCompanyName(requestDto.getCompanyName());
|
||||
request.setContactPerson(requestDto.getContactPerson());
|
||||
request.setMessage(requestDto.getMessage());
|
||||
request.setStatus("PENDING");
|
||||
request.setCreatedAt(OffsetDateTime.now());
|
||||
request.setUpdatedAt(OffsetDateTime.now());
|
||||
|
||||
request = requestRepo.save(request);
|
||||
|
||||
// 2. Handle Attachments
|
||||
int attachmentsCount = 0;
|
||||
if (files != null && !files.isEmpty()) {
|
||||
if (files.size() > 15) {
|
||||
throw new IOException("Too many files. Max 15 allowed.");
|
||||
}
|
||||
|
||||
for (MultipartFile file : files) {
|
||||
if (file.isEmpty()) continue;
|
||||
|
||||
if (isCompressedFile(file)) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.BAD_REQUEST,
|
||||
"Compressed files are not allowed."
|
||||
);
|
||||
}
|
||||
|
||||
// Scan for virus
|
||||
clamAVService.scan(file.getInputStream());
|
||||
|
||||
CustomQuoteRequestAttachment attachment = new CustomQuoteRequestAttachment();
|
||||
attachment.setRequest(request);
|
||||
attachment.setOriginalFilename(file.getOriginalFilename());
|
||||
attachment.setMimeType(file.getContentType());
|
||||
attachment.setFileSizeBytes(file.getSize());
|
||||
attachment.setCreatedAt(OffsetDateTime.now());
|
||||
|
||||
// Generate path
|
||||
UUID fileUuid = UUID.randomUUID();
|
||||
String storedFilename = fileUuid + ".upload";
|
||||
|
||||
// Note: We don't have attachment ID yet.
|
||||
// We'll save attachment first to get ID.
|
||||
attachment.setStoredFilename(storedFilename);
|
||||
attachment.setStoredRelativePath("PENDING");
|
||||
|
||||
attachment = attachmentRepo.save(attachment);
|
||||
|
||||
Path relativePath = Path.of(
|
||||
"quote-requests",
|
||||
request.getId().toString(),
|
||||
"attachments",
|
||||
attachment.getId().toString(),
|
||||
storedFilename
|
||||
);
|
||||
attachment.setStoredRelativePath(relativePath.toString());
|
||||
attachmentRepo.save(attachment);
|
||||
|
||||
// Save file to disk
|
||||
Path absolutePath = resolveWithinStorageRoot(relativePath);
|
||||
Files.createDirectories(absolutePath.getParent());
|
||||
try (InputStream inputStream = file.getInputStream()) {
|
||||
Files.copy(inputStream, absolutePath, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
attachmentsCount++;
|
||||
}
|
||||
}
|
||||
|
||||
sendAdminContactRequestNotification(request, attachmentsCount);
|
||||
|
||||
return ResponseEntity.ok(request);
|
||||
}
|
||||
|
||||
// 2. Get Request
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<CustomQuoteRequest> getCustomQuoteRequest(@PathVariable UUID id) {
|
||||
return requestRepo.findById(id)
|
||||
.map(ResponseEntity::ok)
|
||||
.orElse(ResponseEntity.notFound().build());
|
||||
}
|
||||
|
||||
// Helper
|
||||
private String getExtension(String filename) {
|
||||
if (filename == null) return "dat";
|
||||
String cleaned = StringUtils.cleanPath(filename);
|
||||
if (cleaned.contains("..")) {
|
||||
return "dat";
|
||||
}
|
||||
int i = cleaned.lastIndexOf('.');
|
||||
if (i > 0 && i < cleaned.length() - 1) {
|
||||
String ext = cleaned.substring(i + 1).toLowerCase(Locale.ROOT);
|
||||
if (SAFE_EXTENSION_PATTERN.matcher(ext).matches()) {
|
||||
return ext;
|
||||
}
|
||||
}
|
||||
return "dat";
|
||||
}
|
||||
|
||||
private boolean isCompressedFile(MultipartFile file) {
|
||||
String ext = getExtension(file.getOriginalFilename());
|
||||
if (FORBIDDEN_COMPRESSED_EXTENSIONS.contains(ext)) {
|
||||
return true;
|
||||
}
|
||||
String mime = file.getContentType();
|
||||
return mime != null && FORBIDDEN_COMPRESSED_MIME_TYPES.contains(mime.toLowerCase());
|
||||
}
|
||||
|
||||
private Path resolveWithinStorageRoot(Path relativePath) {
|
||||
try {
|
||||
Path normalizedRelative = relativePath.normalize();
|
||||
if (normalizedRelative.isAbsolute()) {
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid attachment path");
|
||||
}
|
||||
Path absolutePath = STORAGE_ROOT.resolve(normalizedRelative).normalize();
|
||||
if (!absolutePath.startsWith(STORAGE_ROOT)) {
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid attachment path");
|
||||
}
|
||||
return absolutePath;
|
||||
} catch (InvalidPathException e) {
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid attachment path");
|
||||
}
|
||||
}
|
||||
|
||||
private void sendAdminContactRequestNotification(CustomQuoteRequest request, int attachmentsCount) {
|
||||
if (!contactRequestAdminMailEnabled) {
|
||||
return;
|
||||
}
|
||||
if (contactRequestAdminMailAddress == null || contactRequestAdminMailAddress.isBlank()) {
|
||||
logger.warn("Contact request admin notification enabled but no admin address configured.");
|
||||
return;
|
||||
}
|
||||
|
||||
Map<String, Object> templateData = new HashMap<>();
|
||||
templateData.put("requestId", request.getId());
|
||||
templateData.put("createdAt", request.getCreatedAt());
|
||||
templateData.put("requestType", safeValue(request.getRequestType()));
|
||||
templateData.put("customerType", safeValue(request.getCustomerType()));
|
||||
templateData.put("name", safeValue(request.getName()));
|
||||
templateData.put("companyName", safeValue(request.getCompanyName()));
|
||||
templateData.put("contactPerson", safeValue(request.getContactPerson()));
|
||||
templateData.put("email", safeValue(request.getEmail()));
|
||||
templateData.put("phone", safeValue(request.getPhone()));
|
||||
templateData.put("message", safeValue(request.getMessage()));
|
||||
templateData.put("attachmentsCount", attachmentsCount);
|
||||
templateData.put("currentYear", Year.now().getValue());
|
||||
|
||||
emailNotificationService.sendEmail(
|
||||
contactRequestAdminMailAddress,
|
||||
"Nuova richiesta di contatto #" + request.getId(),
|
||||
"contact-request-admin",
|
||||
templateData
|
||||
);
|
||||
}
|
||||
|
||||
private String safeValue(String value) {
|
||||
if (value == null || value.isBlank()) {
|
||||
return "-";
|
||||
}
|
||||
return value;
|
||||
}
|
||||
}
|
||||
@@ -3,28 +3,18 @@ package com.printcalculator.controller;
|
||||
import com.printcalculator.dto.OptionsResponse;
|
||||
import com.printcalculator.entity.FilamentMaterialType;
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import com.printcalculator.entity.LayerHeightOption;
|
||||
import com.printcalculator.entity.MaterialOrcaProfileMap;
|
||||
import com.printcalculator.entity.NozzleOption;
|
||||
import com.printcalculator.entity.PrinterMachine;
|
||||
import com.printcalculator.entity.PrinterMachineProfile;
|
||||
import com.printcalculator.entity.*; // This line replaces specific entity imports
|
||||
import com.printcalculator.repository.FilamentMaterialTypeRepository;
|
||||
import com.printcalculator.repository.FilamentVariantRepository;
|
||||
import com.printcalculator.repository.LayerHeightOptionRepository;
|
||||
import com.printcalculator.repository.MaterialOrcaProfileMapRepository;
|
||||
import com.printcalculator.repository.NozzleOptionRepository;
|
||||
import com.printcalculator.repository.PrinterMachineRepository;
|
||||
import com.printcalculator.service.OrcaProfileResolver;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@@ -34,99 +24,74 @@ public class OptionsController {
|
||||
private final FilamentVariantRepository variantRepo;
|
||||
private final LayerHeightOptionRepository layerHeightRepo;
|
||||
private final NozzleOptionRepository nozzleRepo;
|
||||
private final PrinterMachineRepository printerMachineRepo;
|
||||
private final MaterialOrcaProfileMapRepository materialOrcaMapRepo;
|
||||
private final OrcaProfileResolver orcaProfileResolver;
|
||||
|
||||
public OptionsController(FilamentMaterialTypeRepository materialRepo,
|
||||
FilamentVariantRepository variantRepo,
|
||||
LayerHeightOptionRepository layerHeightRepo,
|
||||
NozzleOptionRepository nozzleRepo,
|
||||
PrinterMachineRepository printerMachineRepo,
|
||||
MaterialOrcaProfileMapRepository materialOrcaMapRepo,
|
||||
OrcaProfileResolver orcaProfileResolver) {
|
||||
NozzleOptionRepository nozzleRepo) {
|
||||
this.materialRepo = materialRepo;
|
||||
this.variantRepo = variantRepo;
|
||||
this.layerHeightRepo = layerHeightRepo;
|
||||
this.nozzleRepo = nozzleRepo;
|
||||
this.printerMachineRepo = printerMachineRepo;
|
||||
this.materialOrcaMapRepo = materialOrcaMapRepo;
|
||||
this.orcaProfileResolver = orcaProfileResolver;
|
||||
}
|
||||
|
||||
@GetMapping("/api/calculator/options")
|
||||
@Transactional(readOnly = true)
|
||||
public ResponseEntity<OptionsResponse> getOptions(
|
||||
@RequestParam(value = "printerMachineId", required = false) Long printerMachineId,
|
||||
@RequestParam(value = "nozzleDiameter", required = false) Double nozzleDiameter
|
||||
) {
|
||||
public ResponseEntity<OptionsResponse> getOptions() {
|
||||
// 1. Materials & Variants
|
||||
List<FilamentMaterialType> types = materialRepo.findAll();
|
||||
List<FilamentVariant> allVariants = variantRepo.findByIsActiveTrue().stream()
|
||||
.sorted(Comparator
|
||||
.comparing((FilamentVariant v) -> safeMaterialCode(v.getFilamentMaterialType()), String.CASE_INSENSITIVE_ORDER)
|
||||
.thenComparing(v -> safeString(v.getVariantDisplayName()), String.CASE_INSENSITIVE_ORDER))
|
||||
.toList();
|
||||
|
||||
Set<Long> compatibleMaterialTypeIds = resolveCompatibleMaterialTypeIds(printerMachineId, nozzleDiameter);
|
||||
List<FilamentVariant> allVariants = variantRepo.findAll();
|
||||
|
||||
List<OptionsResponse.MaterialOption> materialOptions = types.stream()
|
||||
.sorted(Comparator.comparing(t -> safeString(t.getMaterialCode()), String.CASE_INSENSITIVE_ORDER))
|
||||
.map(type -> {
|
||||
if (!compatibleMaterialTypeIds.isEmpty() && !compatibleMaterialTypeIds.contains(type.getId())) {
|
||||
return null;
|
||||
}
|
||||
|
||||
List<OptionsResponse.VariantOption> variants = allVariants.stream()
|
||||
.filter(v -> v.getFilamentMaterialType() != null
|
||||
&& v.getFilamentMaterialType().getId().equals(type.getId()))
|
||||
.filter(v -> v.getFilamentMaterialType().getId().equals(type.getId()) && v.getIsActive())
|
||||
.map(v -> new OptionsResponse.VariantOption(
|
||||
v.getId(),
|
||||
v.getVariantDisplayName(),
|
||||
v.getColorName(),
|
||||
resolveHexColor(v),
|
||||
v.getFinishType() != null ? v.getFinishType() : "GLOSSY",
|
||||
v.getStockSpools() != null ? v.getStockSpools().doubleValue() : 0d,
|
||||
toStockFilamentGrams(v),
|
||||
v.getStockSpools() == null || v.getStockSpools().doubleValue() <= 0
|
||||
getColorHex(v.getColorName()), // Need helper or store hex in DB
|
||||
v.getStockSpools().doubleValue() <= 0
|
||||
))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (variants.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
// Only include material if it has active variants
|
||||
if (variants.isEmpty()) return null;
|
||||
|
||||
return new OptionsResponse.MaterialOption(
|
||||
type.getMaterialCode(),
|
||||
type.getMaterialCode() + (Boolean.TRUE.equals(type.getIsFlexible()) ? " (Flexible)" : " (Standard)"),
|
||||
type.getMaterialCode() + (type.getIsFlexible() ? " (Flexible)" : " (Standard)"),
|
||||
variants
|
||||
);
|
||||
})
|
||||
.filter(m -> m != null)
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 2. Qualities (Static as per user request)
|
||||
List<OptionsResponse.QualityOption> qualities = List.of(
|
||||
new OptionsResponse.QualityOption("draft", "Draft"),
|
||||
new OptionsResponse.QualityOption("standard", "Standard"),
|
||||
new OptionsResponse.QualityOption("extra_fine", "High Definition")
|
||||
);
|
||||
|
||||
// 3. Infill Patterns (Static as per user request)
|
||||
List<OptionsResponse.InfillPatternOption> patterns = List.of(
|
||||
new OptionsResponse.InfillPatternOption("grid", "Grid"),
|
||||
new OptionsResponse.InfillPatternOption("gyroid", "Gyroid"),
|
||||
new OptionsResponse.InfillPatternOption("cubic", "Cubic")
|
||||
);
|
||||
|
||||
// 4. Layer Heights
|
||||
List<OptionsResponse.LayerHeightOptionDTO> layers = layerHeightRepo.findAll().stream()
|
||||
.filter(l -> Boolean.TRUE.equals(l.getIsActive()))
|
||||
.filter(l -> l.getIsActive())
|
||||
.sorted(Comparator.comparing(LayerHeightOption::getLayerHeightMm))
|
||||
.map(l -> new OptionsResponse.LayerHeightOptionDTO(
|
||||
l.getLayerHeightMm().doubleValue(),
|
||||
String.format("%.2f mm", l.getLayerHeightMm())
|
||||
))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 5. Nozzles
|
||||
List<OptionsResponse.NozzleOptionDTO> nozzles = nozzleRepo.findAll().stream()
|
||||
.filter(n -> Boolean.TRUE.equals(n.getIsActive()))
|
||||
.filter(n -> n.getIsActive())
|
||||
.sorted(Comparator.comparing(NozzleOption::getNozzleDiameterMm))
|
||||
.map(n -> new OptionsResponse.NozzleOptionDTO(
|
||||
n.getNozzleDiameterMm().doubleValue(),
|
||||
@@ -135,76 +100,13 @@ public class OptionsController {
|
||||
? String.format(" (+ %.2f CHF)", n.getExtraNozzleChangeFeeChf())
|
||||
: " (Standard)")
|
||||
))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return ResponseEntity.ok(new OptionsResponse(materialOptions, qualities, patterns, layers, nozzles));
|
||||
}
|
||||
|
||||
private Set<Long> resolveCompatibleMaterialTypeIds(Long printerMachineId, Double nozzleDiameter) {
|
||||
PrinterMachine machine = null;
|
||||
if (printerMachineId != null) {
|
||||
machine = printerMachineRepo.findById(printerMachineId).orElse(null);
|
||||
}
|
||||
if (machine == null) {
|
||||
machine = printerMachineRepo.findFirstByIsActiveTrue().orElse(null);
|
||||
}
|
||||
if (machine == null) {
|
||||
return Set.of();
|
||||
}
|
||||
|
||||
BigDecimal nozzle = nozzleDiameter != null
|
||||
? BigDecimal.valueOf(nozzleDiameter)
|
||||
: BigDecimal.valueOf(0.40);
|
||||
|
||||
PrinterMachineProfile machineProfile = orcaProfileResolver
|
||||
.resolveMachineProfile(machine, nozzle)
|
||||
.orElse(null);
|
||||
|
||||
if (machineProfile == null) {
|
||||
return Set.of();
|
||||
}
|
||||
|
||||
List<MaterialOrcaProfileMap> maps = materialOrcaMapRepo.findByPrinterMachineProfileAndIsActiveTrue(machineProfile);
|
||||
return maps.stream()
|
||||
.map(MaterialOrcaProfileMap::getFilamentMaterialType)
|
||||
.filter(m -> m != null && m.getId() != null)
|
||||
.map(FilamentMaterialType::getId)
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
private String resolveHexColor(FilamentVariant variant) {
|
||||
if (variant.getColorHex() != null && !variant.getColorHex().isBlank()) {
|
||||
return variant.getColorHex();
|
||||
}
|
||||
return getColorHex(variant.getColorName());
|
||||
}
|
||||
|
||||
private double toStockFilamentGrams(FilamentVariant variant) {
|
||||
if (variant.getStockSpools() == null || variant.getSpoolNetKg() == null) {
|
||||
return 0d;
|
||||
}
|
||||
return variant.getStockSpools()
|
||||
.multiply(variant.getSpoolNetKg())
|
||||
.multiply(BigDecimal.valueOf(1000))
|
||||
.doubleValue();
|
||||
}
|
||||
|
||||
private String safeMaterialCode(FilamentMaterialType type) {
|
||||
if (type == null || type.getMaterialCode() == null) {
|
||||
return "";
|
||||
}
|
||||
return type.getMaterialCode();
|
||||
}
|
||||
|
||||
private String safeString(String value) {
|
||||
return value == null ? "" : value;
|
||||
}
|
||||
|
||||
// Temporary helper for legacy values where color hex is not yet set in DB
|
||||
// Temporary helper until we add hex to DB
|
||||
private String getColorHex(String colorName) {
|
||||
if (colorName == null) {
|
||||
return "#9e9e9e";
|
||||
}
|
||||
String lower = colorName.toLowerCase();
|
||||
if (lower.contains("black") || lower.contains("nero")) return "#1a1a1a";
|
||||
if (lower.contains("white") || lower.contains("bianco")) return "#f5f5f5";
|
||||
@@ -218,6 +120,6 @@ public class OptionsController {
|
||||
}
|
||||
if (lower.contains("purple") || lower.contains("viola")) return "#7b1fa2";
|
||||
if (lower.contains("yellow") || lower.contains("giallo")) return "#fbc02d";
|
||||
return "#9e9e9e";
|
||||
return "#9e9e9e"; // Default grey
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,360 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.*;
|
||||
import com.printcalculator.entity.*;
|
||||
import com.printcalculator.repository.*;
|
||||
import com.printcalculator.service.InvoicePdfRenderingService;
|
||||
import com.printcalculator.service.OrderService;
|
||||
import com.printcalculator.service.PaymentService;
|
||||
import com.printcalculator.service.QrBillService;
|
||||
import com.printcalculator.service.StorageService;
|
||||
import com.printcalculator.service.TwintPaymentService;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.nio.file.InvalidPathException;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.Base64;
|
||||
import java.util.stream.Collectors;
|
||||
import java.net.URI;
|
||||
import java.util.Locale;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/orders")
|
||||
public class OrderController {
|
||||
private static final Pattern SAFE_EXTENSION_PATTERN = Pattern.compile("^[a-z0-9]{1,10}$");
|
||||
|
||||
private final OrderService orderService;
|
||||
private final OrderRepository orderRepo;
|
||||
private final OrderItemRepository orderItemRepo;
|
||||
private final QuoteSessionRepository quoteSessionRepo;
|
||||
private final QuoteLineItemRepository quoteLineItemRepo;
|
||||
private final CustomerRepository customerRepo;
|
||||
private final StorageService storageService;
|
||||
private final InvoicePdfRenderingService invoiceService;
|
||||
private final QrBillService qrBillService;
|
||||
private final TwintPaymentService twintPaymentService;
|
||||
private final PaymentService paymentService;
|
||||
private final PaymentRepository paymentRepo;
|
||||
|
||||
|
||||
public OrderController(OrderService orderService,
|
||||
OrderRepository orderRepo,
|
||||
OrderItemRepository orderItemRepo,
|
||||
QuoteSessionRepository quoteSessionRepo,
|
||||
QuoteLineItemRepository quoteLineItemRepo,
|
||||
CustomerRepository customerRepo,
|
||||
StorageService storageService,
|
||||
InvoicePdfRenderingService invoiceService,
|
||||
QrBillService qrBillService,
|
||||
TwintPaymentService twintPaymentService,
|
||||
PaymentService paymentService,
|
||||
PaymentRepository paymentRepo) {
|
||||
this.orderService = orderService;
|
||||
this.orderRepo = orderRepo;
|
||||
this.orderItemRepo = orderItemRepo;
|
||||
this.quoteSessionRepo = quoteSessionRepo;
|
||||
this.quoteLineItemRepo = quoteLineItemRepo;
|
||||
this.customerRepo = customerRepo;
|
||||
this.storageService = storageService;
|
||||
this.invoiceService = invoiceService;
|
||||
this.qrBillService = qrBillService;
|
||||
this.twintPaymentService = twintPaymentService;
|
||||
this.paymentService = paymentService;
|
||||
this.paymentRepo = paymentRepo;
|
||||
}
|
||||
|
||||
|
||||
// 1. Create Order from Quote
|
||||
@PostMapping("/from-quote/{quoteSessionId}")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> createOrderFromQuote(
|
||||
@PathVariable UUID quoteSessionId,
|
||||
@Valid @RequestBody com.printcalculator.dto.CreateOrderRequest request
|
||||
) {
|
||||
Order order = orderService.createOrderFromQuote(quoteSessionId, request);
|
||||
List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
|
||||
return ResponseEntity.ok(convertToDto(order, items));
|
||||
}
|
||||
|
||||
@PostMapping(value = "/{orderId}/items/{orderItemId}/file", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
@Transactional
|
||||
public ResponseEntity<Void> uploadOrderItemFile(
|
||||
@PathVariable UUID orderId,
|
||||
@PathVariable UUID orderItemId,
|
||||
@RequestParam("file") MultipartFile file
|
||||
) throws IOException {
|
||||
|
||||
OrderItem item = orderItemRepo.findById(orderItemId)
|
||||
.orElseThrow(() -> new RuntimeException("OrderItem not found"));
|
||||
|
||||
if (!item.getOrder().getId().equals(orderId)) {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
|
||||
String relativePath = item.getStoredRelativePath();
|
||||
Path destinationRelativePath;
|
||||
if (relativePath == null || relativePath.equals("PENDING")) {
|
||||
String ext = getExtension(file.getOriginalFilename());
|
||||
String storedFilename = UUID.randomUUID() + "." + ext;
|
||||
destinationRelativePath = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString(), storedFilename);
|
||||
item.setStoredRelativePath(destinationRelativePath.toString());
|
||||
item.setStoredFilename(storedFilename);
|
||||
} else {
|
||||
destinationRelativePath = resolveOrderItemRelativePath(relativePath, orderId, orderItemId);
|
||||
if (destinationRelativePath == null) {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
}
|
||||
|
||||
storageService.store(file, destinationRelativePath);
|
||||
item.setFileSizeBytes(file.getSize());
|
||||
item.setMimeType(file.getContentType());
|
||||
orderItemRepo.save(item);
|
||||
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}")
|
||||
public ResponseEntity<OrderDto> getOrder(@PathVariable UUID orderId) {
|
||||
return orderRepo.findById(orderId)
|
||||
.map(o -> {
|
||||
List<OrderItem> items = orderItemRepo.findByOrder_Id(o.getId());
|
||||
return ResponseEntity.ok(convertToDto(o, items));
|
||||
})
|
||||
.orElse(ResponseEntity.notFound().build());
|
||||
}
|
||||
|
||||
@PostMapping("/{orderId}/payments/report")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> reportPayment(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestBody Map<String, String> payload
|
||||
) {
|
||||
String method = payload.get("method");
|
||||
paymentService.reportPayment(orderId, method);
|
||||
return getOrder(orderId);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/confirmation")
|
||||
public ResponseEntity<byte[]> getConfirmation(@PathVariable UUID orderId) {
|
||||
return generateDocument(orderId, true);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/invoice")
|
||||
public ResponseEntity<byte[]> getInvoice(@PathVariable UUID orderId) {
|
||||
// Paid invoices are sent by email after back-office payment confirmation.
|
||||
// The public endpoint must not expose a "paid" invoice download.
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
private ResponseEntity<byte[]> generateDocument(UUID orderId, boolean isConfirmation) {
|
||||
Order order = orderRepo.findById(orderId)
|
||||
.orElseThrow(() -> new RuntimeException("Order not found"));
|
||||
|
||||
if (isConfirmation) {
|
||||
Path relativePath = buildConfirmationPdfRelativePath(order);
|
||||
try {
|
||||
byte[] existingPdf = storageService.loadAsResource(relativePath).getInputStream().readAllBytes();
|
||||
return ResponseEntity.ok()
|
||||
.header("Content-Disposition", "attachment; filename=\"confirmation-" + getDisplayOrderNumber(order) + ".pdf\"")
|
||||
.contentType(MediaType.APPLICATION_PDF)
|
||||
.body(existingPdf);
|
||||
} catch (Exception ignored) {
|
||||
// Fallback to on-the-fly generation if the stored file is missing or unreadable.
|
||||
}
|
||||
}
|
||||
|
||||
List<OrderItem> items = orderItemRepo.findByOrder_Id(orderId);
|
||||
Payment payment = paymentRepo.findByOrder_Id(orderId).orElse(null);
|
||||
|
||||
byte[] pdf = invoiceService.generateDocumentPdf(order, items, isConfirmation, qrBillService, payment);
|
||||
String typePrefix = isConfirmation ? "confirmation-" : "invoice-";
|
||||
String truncatedUuid = order.getId().toString().substring(0, 8);
|
||||
return ResponseEntity.ok()
|
||||
.header("Content-Disposition", "attachment; filename=\"" + typePrefix + truncatedUuid + ".pdf\"")
|
||||
.contentType(MediaType.APPLICATION_PDF)
|
||||
.body(pdf);
|
||||
}
|
||||
|
||||
private Path buildConfirmationPdfRelativePath(Order order) {
|
||||
return Path.of(
|
||||
"orders",
|
||||
order.getId().toString(),
|
||||
"documents",
|
||||
"confirmation-" + getDisplayOrderNumber(order) + ".pdf"
|
||||
);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/twint")
|
||||
public ResponseEntity<Map<String, String>> getTwintPayment(@PathVariable UUID orderId) {
|
||||
Order order = orderRepo.findById(orderId).orElse(null);
|
||||
if (order == null) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
byte[] qrPng = twintPaymentService.generateQrPng(order, 360);
|
||||
String qrDataUri = "data:image/png;base64," + Base64.getEncoder().encodeToString(qrPng);
|
||||
|
||||
Map<String, String> data = new HashMap<>();
|
||||
data.put("paymentUrl", twintPaymentService.getTwintPaymentUrl(order));
|
||||
data.put("openUrl", "/api/orders/" + orderId + "/twint/open");
|
||||
data.put("qrImageUrl", "/api/orders/" + orderId + "/twint/qr");
|
||||
data.put("qrImageDataUri", qrDataUri);
|
||||
return ResponseEntity.ok(data);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/twint/open")
|
||||
public ResponseEntity<Void> openTwintPayment(@PathVariable UUID orderId) {
|
||||
Order order = orderRepo.findById(orderId).orElse(null);
|
||||
if (order == null) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
return ResponseEntity.status(302)
|
||||
.location(URI.create(twintPaymentService.getTwintPaymentUrl(order)))
|
||||
.build();
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/twint/qr")
|
||||
public ResponseEntity<byte[]> getTwintQr(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestParam(defaultValue = "320") int size
|
||||
) {
|
||||
Order order = orderRepo.findById(orderId).orElse(null);
|
||||
if (order == null) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
int normalizedSize = Math.max(200, Math.min(size, 600));
|
||||
byte[] png = twintPaymentService.generateQrPng(order, normalizedSize);
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.IMAGE_PNG)
|
||||
.body(png);
|
||||
}
|
||||
|
||||
private String getExtension(String filename) {
|
||||
if (filename == null) return "stl";
|
||||
String cleaned = StringUtils.cleanPath(filename);
|
||||
if (cleaned.contains("..")) {
|
||||
return "stl";
|
||||
}
|
||||
int i = cleaned.lastIndexOf('.');
|
||||
if (i > 0 && i < cleaned.length() - 1) {
|
||||
String ext = cleaned.substring(i + 1).toLowerCase(Locale.ROOT);
|
||||
if (SAFE_EXTENSION_PATTERN.matcher(ext).matches()) {
|
||||
return ext;
|
||||
}
|
||||
}
|
||||
return "stl";
|
||||
}
|
||||
|
||||
private Path resolveOrderItemRelativePath(String storedRelativePath, UUID orderId, UUID orderItemId) {
|
||||
try {
|
||||
Path candidate = Path.of(storedRelativePath).normalize();
|
||||
if (candidate.isAbsolute()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Path expectedPrefix = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString());
|
||||
if (!candidate.startsWith(expectedPrefix)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return candidate;
|
||||
} catch (InvalidPathException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private OrderDto convertToDto(Order order, List<OrderItem> items) {
|
||||
OrderDto dto = new OrderDto();
|
||||
dto.setId(order.getId());
|
||||
dto.setOrderNumber(getDisplayOrderNumber(order));
|
||||
dto.setStatus(order.getStatus());
|
||||
|
||||
paymentRepo.findByOrder_Id(order.getId()).ifPresent(p -> {
|
||||
dto.setPaymentStatus(p.getStatus());
|
||||
dto.setPaymentMethod(p.getMethod());
|
||||
});
|
||||
|
||||
dto.setCustomerEmail(order.getCustomerEmail());
|
||||
dto.setCustomerPhone(order.getCustomerPhone());
|
||||
dto.setPreferredLanguage(order.getPreferredLanguage());
|
||||
dto.setBillingCustomerType(order.getBillingCustomerType());
|
||||
dto.setCurrency(order.getCurrency());
|
||||
dto.setSetupCostChf(order.getSetupCostChf());
|
||||
dto.setShippingCostChf(order.getShippingCostChf());
|
||||
dto.setDiscountChf(order.getDiscountChf());
|
||||
dto.setSubtotalChf(order.getSubtotalChf());
|
||||
dto.setTotalChf(order.getTotalChf());
|
||||
dto.setCreatedAt(order.getCreatedAt());
|
||||
dto.setShippingSameAsBilling(order.getShippingSameAsBilling());
|
||||
|
||||
AddressDto billing = new AddressDto();
|
||||
billing.setFirstName(order.getBillingFirstName());
|
||||
billing.setLastName(order.getBillingLastName());
|
||||
billing.setCompanyName(order.getBillingCompanyName());
|
||||
billing.setContactPerson(order.getBillingContactPerson());
|
||||
billing.setAddressLine1(order.getBillingAddressLine1());
|
||||
billing.setAddressLine2(order.getBillingAddressLine2());
|
||||
billing.setZip(order.getBillingZip());
|
||||
billing.setCity(order.getBillingCity());
|
||||
billing.setCountryCode(order.getBillingCountryCode());
|
||||
dto.setBillingAddress(billing);
|
||||
|
||||
if (!order.getShippingSameAsBilling()) {
|
||||
AddressDto shipping = new AddressDto();
|
||||
shipping.setFirstName(order.getShippingFirstName());
|
||||
shipping.setLastName(order.getShippingLastName());
|
||||
shipping.setCompanyName(order.getShippingCompanyName());
|
||||
shipping.setContactPerson(order.getShippingContactPerson());
|
||||
shipping.setAddressLine1(order.getShippingAddressLine1());
|
||||
shipping.setAddressLine2(order.getShippingAddressLine2());
|
||||
shipping.setZip(order.getShippingZip());
|
||||
shipping.setCity(order.getShippingCity());
|
||||
shipping.setCountryCode(order.getShippingCountryCode());
|
||||
dto.setShippingAddress(shipping);
|
||||
}
|
||||
|
||||
List<OrderItemDto> itemDtos = items.stream().map(i -> {
|
||||
OrderItemDto idto = new OrderItemDto();
|
||||
idto.setId(i.getId());
|
||||
idto.setOriginalFilename(i.getOriginalFilename());
|
||||
idto.setMaterialCode(i.getMaterialCode());
|
||||
idto.setColorCode(i.getColorCode());
|
||||
idto.setQuantity(i.getQuantity());
|
||||
idto.setPrintTimeSeconds(i.getPrintTimeSeconds());
|
||||
idto.setMaterialGrams(i.getMaterialGrams());
|
||||
idto.setUnitPriceChf(i.getUnitPriceChf());
|
||||
idto.setLineTotalChf(i.getLineTotalChf());
|
||||
return idto;
|
||||
}).collect(Collectors.toList());
|
||||
dto.setItems(itemDtos);
|
||||
|
||||
return dto;
|
||||
}
|
||||
|
||||
private String getDisplayOrderNumber(Order order) {
|
||||
String orderNumber = order.getOrderNumber();
|
||||
if (orderNumber != null && !orderNumber.isBlank()) {
|
||||
return orderNumber;
|
||||
}
|
||||
return order.getId() != null ? order.getId().toString() : "unknown";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,17 +22,15 @@ public class QuoteController {
|
||||
private final SlicerService slicerService;
|
||||
private final QuoteCalculator quoteCalculator;
|
||||
private final PrinterMachineRepository machineRepo;
|
||||
private final com.printcalculator.service.ClamAVService clamAVService;
|
||||
|
||||
// Defaults (using aliases defined in ProfileManager)
|
||||
private static final String DEFAULT_FILAMENT = "pla_basic";
|
||||
private static final String DEFAULT_PROCESS = "standard";
|
||||
|
||||
public QuoteController(SlicerService slicerService, QuoteCalculator quoteCalculator, PrinterMachineRepository machineRepo, com.printcalculator.service.ClamAVService clamAVService) {
|
||||
public QuoteController(SlicerService slicerService, QuoteCalculator quoteCalculator, PrinterMachineRepository machineRepo) {
|
||||
this.slicerService = slicerService;
|
||||
this.quoteCalculator = quoteCalculator;
|
||||
this.machineRepo = machineRepo;
|
||||
this.clamAVService = clamAVService;
|
||||
}
|
||||
|
||||
@PostMapping("/api/quote")
|
||||
@@ -101,9 +99,6 @@ public class QuoteController {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
|
||||
// Scan for virus
|
||||
clamAVService.scan(file.getInputStream());
|
||||
|
||||
// Fetch Default Active Machine
|
||||
PrinterMachine machine = machineRepo.findFirstByIsActiveTrue()
|
||||
.orElseThrow(() -> new IOException("No active printer found in database"));
|
||||
|
||||
@@ -1,534 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.entity.FilamentMaterialType;
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import com.printcalculator.entity.PrinterMachine;
|
||||
import com.printcalculator.entity.QuoteLineItem;
|
||||
import com.printcalculator.entity.QuoteSession;
|
||||
import com.printcalculator.model.ModelDimensions;
|
||||
import com.printcalculator.model.PrintStats;
|
||||
import com.printcalculator.model.QuoteResult;
|
||||
import com.printcalculator.repository.FilamentMaterialTypeRepository;
|
||||
import com.printcalculator.repository.FilamentVariantRepository;
|
||||
import com.printcalculator.repository.PrinterMachineRepository;
|
||||
import com.printcalculator.repository.QuoteLineItemRepository;
|
||||
import com.printcalculator.repository.QuoteSessionRepository;
|
||||
import com.printcalculator.service.OrcaProfileResolver;
|
||||
import com.printcalculator.service.QuoteCalculator;
|
||||
import com.printcalculator.service.SlicerService;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.InvalidPathException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.Optional;
|
||||
import java.util.Locale;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/quote-sessions")
|
||||
|
||||
public class QuoteSessionController {
|
||||
private static final Path QUOTE_STORAGE_ROOT = Paths.get("storage_quotes").toAbsolutePath().normalize();
|
||||
|
||||
private final QuoteSessionRepository sessionRepo;
|
||||
private final QuoteLineItemRepository lineItemRepo;
|
||||
private final SlicerService slicerService;
|
||||
private final QuoteCalculator quoteCalculator;
|
||||
private final PrinterMachineRepository machineRepo;
|
||||
private final FilamentMaterialTypeRepository materialRepo;
|
||||
private final FilamentVariantRepository variantRepo;
|
||||
private final OrcaProfileResolver orcaProfileResolver;
|
||||
private final com.printcalculator.repository.PricingPolicyRepository pricingRepo;
|
||||
private final com.printcalculator.service.ClamAVService clamAVService;
|
||||
|
||||
public QuoteSessionController(QuoteSessionRepository sessionRepo,
|
||||
QuoteLineItemRepository lineItemRepo,
|
||||
SlicerService slicerService,
|
||||
QuoteCalculator quoteCalculator,
|
||||
PrinterMachineRepository machineRepo,
|
||||
FilamentMaterialTypeRepository materialRepo,
|
||||
FilamentVariantRepository variantRepo,
|
||||
OrcaProfileResolver orcaProfileResolver,
|
||||
com.printcalculator.repository.PricingPolicyRepository pricingRepo,
|
||||
com.printcalculator.service.ClamAVService clamAVService) {
|
||||
this.sessionRepo = sessionRepo;
|
||||
this.lineItemRepo = lineItemRepo;
|
||||
this.slicerService = slicerService;
|
||||
this.quoteCalculator = quoteCalculator;
|
||||
this.machineRepo = machineRepo;
|
||||
this.materialRepo = materialRepo;
|
||||
this.variantRepo = variantRepo;
|
||||
this.orcaProfileResolver = orcaProfileResolver;
|
||||
this.pricingRepo = pricingRepo;
|
||||
this.clamAVService = clamAVService;
|
||||
}
|
||||
|
||||
// 1. Start a new empty session
|
||||
@PostMapping(value = "")
|
||||
@Transactional
|
||||
public ResponseEntity<QuoteSession> createSession() {
|
||||
QuoteSession session = new QuoteSession();
|
||||
session.setStatus("ACTIVE");
|
||||
session.setPricingVersion("v1");
|
||||
// Default material/settings will be set when items are added or updated?
|
||||
// For now set safe defaults
|
||||
session.setMaterialCode("PLA");
|
||||
session.setSupportsEnabled(false);
|
||||
session.setCreatedAt(OffsetDateTime.now());
|
||||
session.setExpiresAt(OffsetDateTime.now().plusDays(30));
|
||||
|
||||
var policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
|
||||
session.setSetupCostChf(quoteCalculator.calculateSessionSetupFee(policy));
|
||||
|
||||
session = sessionRepo.save(session);
|
||||
return ResponseEntity.ok(session);
|
||||
}
|
||||
|
||||
// 2. Add item to existing session
|
||||
@PostMapping(value = "/{id}/line-items", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
@Transactional
|
||||
public ResponseEntity<QuoteLineItem> addItemToExistingSession(
|
||||
@PathVariable UUID id,
|
||||
@RequestPart("settings") com.printcalculator.dto.PrintSettingsDto settings,
|
||||
@RequestPart("file") MultipartFile file
|
||||
) throws IOException {
|
||||
QuoteSession session = sessionRepo.findById(id)
|
||||
.orElseThrow(() -> new RuntimeException("Session not found"));
|
||||
|
||||
QuoteLineItem item = addItemToSession(session, file, settings);
|
||||
return ResponseEntity.ok(item);
|
||||
}
|
||||
|
||||
// Helper to add item
|
||||
private QuoteLineItem addItemToSession(QuoteSession session, MultipartFile file, com.printcalculator.dto.PrintSettingsDto settings) throws IOException {
|
||||
if (file.isEmpty()) throw new IOException("File is empty");
|
||||
|
||||
// Scan for virus
|
||||
clamAVService.scan(file.getInputStream());
|
||||
|
||||
// 1. Define Persistent Storage Path
|
||||
// Structure: storage_quotes/{sessionId}/{uuid}.{ext}
|
||||
Path sessionStorageDir = QUOTE_STORAGE_ROOT.resolve(session.getId().toString()).normalize();
|
||||
if (!sessionStorageDir.startsWith(QUOTE_STORAGE_ROOT)) {
|
||||
throw new IOException("Invalid quote session storage path");
|
||||
}
|
||||
Files.createDirectories(sessionStorageDir);
|
||||
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
String ext = getSafeExtension(originalFilename, "stl");
|
||||
String storedFilename = UUID.randomUUID() + "." + ext;
|
||||
Path persistentPath = sessionStorageDir.resolve(storedFilename).normalize();
|
||||
if (!persistentPath.startsWith(sessionStorageDir)) {
|
||||
throw new IOException("Invalid quote line-item storage path");
|
||||
}
|
||||
|
||||
// Save file
|
||||
try (InputStream inputStream = file.getInputStream()) {
|
||||
Files.copy(inputStream, persistentPath, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
|
||||
try {
|
||||
// Apply Basic/Advanced Logic
|
||||
applyPrintSettings(settings);
|
||||
|
||||
BigDecimal nozzleDiameter = BigDecimal.valueOf(settings.getNozzleDiameter() != null ? settings.getNozzleDiameter() : 0.4);
|
||||
|
||||
// Pick machine (selected machine if provided, otherwise first active)
|
||||
PrinterMachine machine = resolvePrinterMachine(settings.getPrinterMachineId());
|
||||
|
||||
// Resolve selected filament variant
|
||||
FilamentVariant selectedVariant = resolveFilamentVariant(settings);
|
||||
|
||||
// Update session global settings from the most recent item added
|
||||
session.setMaterialCode(selectedVariant.getFilamentMaterialType().getMaterialCode());
|
||||
session.setNozzleDiameterMm(nozzleDiameter);
|
||||
session.setLayerHeightMm(BigDecimal.valueOf(settings.getLayerHeight() != null ? settings.getLayerHeight() : 0.2));
|
||||
session.setInfillPattern(settings.getInfillPattern());
|
||||
session.setInfillPercent(settings.getInfillDensity() != null ? settings.getInfillDensity().intValue() : 20);
|
||||
session.setSupportsEnabled(settings.getSupportsEnabled() != null ? settings.getSupportsEnabled() : false);
|
||||
sessionRepo.save(session);
|
||||
|
||||
OrcaProfileResolver.ResolvedProfiles profiles = orcaProfileResolver.resolve(machine, nozzleDiameter, selectedVariant);
|
||||
String machineProfile = profiles.machineProfileName();
|
||||
String filamentProfile = profiles.filamentProfileName();
|
||||
|
||||
String processProfile = "standard";
|
||||
if (settings.getLayerHeight() != null) {
|
||||
if (settings.getLayerHeight() >= 0.28) processProfile = "draft";
|
||||
else if (settings.getLayerHeight() <= 0.12) processProfile = "extra_fine";
|
||||
}
|
||||
|
||||
// Build overrides map from settings
|
||||
Map<String, String> processOverrides = new HashMap<>();
|
||||
if (settings.getLayerHeight() != null) processOverrides.put("layer_height", String.valueOf(settings.getLayerHeight()));
|
||||
if (settings.getInfillDensity() != null) processOverrides.put("sparse_infill_density", settings.getInfillDensity() + "%");
|
||||
if (settings.getInfillPattern() != null) processOverrides.put("sparse_infill_pattern", settings.getInfillPattern());
|
||||
|
||||
// 3. Slice (Use persistent path)
|
||||
PrintStats stats = slicerService.slice(
|
||||
persistentPath.toFile(),
|
||||
machineProfile,
|
||||
filamentProfile,
|
||||
processProfile,
|
||||
null, // machine overrides
|
||||
processOverrides
|
||||
);
|
||||
|
||||
Optional<ModelDimensions> modelDimensions = slicerService.inspectModelDimensions(persistentPath.toFile());
|
||||
|
||||
// 4. Calculate Quote
|
||||
QuoteResult result = quoteCalculator.calculate(stats, machine.getPrinterDisplayName(), selectedVariant);
|
||||
|
||||
// 5. Create Line Item
|
||||
QuoteLineItem item = new QuoteLineItem();
|
||||
item.setQuoteSession(session);
|
||||
item.setOriginalFilename(file.getOriginalFilename());
|
||||
item.setStoredPath(QUOTE_STORAGE_ROOT.relativize(persistentPath).toString()); // SAVE PATH (relative to root)
|
||||
item.setQuantity(1);
|
||||
item.setColorCode(selectedVariant.getColorName());
|
||||
item.setFilamentVariant(selectedVariant);
|
||||
item.setStatus("READY"); // or CALCULATED
|
||||
|
||||
item.setPrintTimeSeconds((int) stats.printTimeSeconds());
|
||||
item.setMaterialGrams(BigDecimal.valueOf(stats.filamentWeightGrams()));
|
||||
item.setUnitPriceChf(BigDecimal.valueOf(result.getTotalPrice()));
|
||||
|
||||
// Store breakdown
|
||||
Map<String, Object> breakdown = new HashMap<>();
|
||||
breakdown.put("machine_cost", result.getTotalPrice()); // Excludes setup fee which is at session level
|
||||
breakdown.put("setup_fee", 0);
|
||||
item.setPricingBreakdown(breakdown);
|
||||
|
||||
// Dimensions for shipping/package checks are computed server-side from the uploaded model.
|
||||
item.setBoundingBoxXMm(modelDimensions
|
||||
.map(dim -> BigDecimal.valueOf(dim.xMm()))
|
||||
.orElseGet(() -> settings.getBoundingBoxX() != null ? BigDecimal.valueOf(settings.getBoundingBoxX()) : BigDecimal.ZERO));
|
||||
item.setBoundingBoxYMm(modelDimensions
|
||||
.map(dim -> BigDecimal.valueOf(dim.yMm()))
|
||||
.orElseGet(() -> settings.getBoundingBoxY() != null ? BigDecimal.valueOf(settings.getBoundingBoxY()) : BigDecimal.ZERO));
|
||||
item.setBoundingBoxZMm(modelDimensions
|
||||
.map(dim -> BigDecimal.valueOf(dim.zMm()))
|
||||
.orElseGet(() -> settings.getBoundingBoxZ() != null ? BigDecimal.valueOf(settings.getBoundingBoxZ()) : BigDecimal.ZERO));
|
||||
|
||||
item.setCreatedAt(OffsetDateTime.now());
|
||||
item.setUpdatedAt(OffsetDateTime.now());
|
||||
|
||||
return lineItemRepo.save(item);
|
||||
|
||||
} catch (Exception e) {
|
||||
// Cleanup if failed
|
||||
Files.deleteIfExists(persistentPath);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
private void applyPrintSettings(com.printcalculator.dto.PrintSettingsDto settings) {
|
||||
if ("BASIC".equalsIgnoreCase(settings.getComplexityMode())) {
|
||||
// Set defaults based on Quality
|
||||
String quality = settings.getQuality() != null ? settings.getQuality().toLowerCase() : "standard";
|
||||
|
||||
switch (quality) {
|
||||
case "draft":
|
||||
settings.setLayerHeight(0.28);
|
||||
settings.setInfillDensity(15.0);
|
||||
settings.setInfillPattern("grid");
|
||||
break;
|
||||
case "high":
|
||||
settings.setLayerHeight(0.12);
|
||||
settings.setInfillDensity(20.0);
|
||||
settings.setInfillPattern("gyroid");
|
||||
break;
|
||||
case "standard":
|
||||
default:
|
||||
settings.setLayerHeight(0.20);
|
||||
settings.setInfillDensity(15.0);
|
||||
settings.setInfillPattern("grid");
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// ADVANCED Mode: Use values from Frontend, set defaults if missing
|
||||
if (settings.getLayerHeight() == null) settings.setLayerHeight(0.20);
|
||||
if (settings.getInfillDensity() == null) settings.setInfillDensity(20.0);
|
||||
if (settings.getInfillPattern() == null) settings.setInfillPattern("grid");
|
||||
}
|
||||
}
|
||||
|
||||
private PrinterMachine resolvePrinterMachine(Long printerMachineId) {
|
||||
if (printerMachineId != null) {
|
||||
PrinterMachine selected = machineRepo.findById(printerMachineId)
|
||||
.orElseThrow(() -> new RuntimeException("Printer machine not found: " + printerMachineId));
|
||||
if (!Boolean.TRUE.equals(selected.getIsActive())) {
|
||||
throw new RuntimeException("Selected printer machine is not active");
|
||||
}
|
||||
return selected;
|
||||
}
|
||||
|
||||
return machineRepo.findFirstByIsActiveTrue()
|
||||
.orElseThrow(() -> new RuntimeException("No active printer found"));
|
||||
}
|
||||
|
||||
private FilamentVariant resolveFilamentVariant(com.printcalculator.dto.PrintSettingsDto settings) {
|
||||
if (settings.getFilamentVariantId() != null) {
|
||||
FilamentVariant variant = variantRepo.findById(settings.getFilamentVariantId())
|
||||
.orElseThrow(() -> new RuntimeException("Filament variant not found: " + settings.getFilamentVariantId()));
|
||||
if (!Boolean.TRUE.equals(variant.getIsActive())) {
|
||||
throw new RuntimeException("Selected filament variant is not active");
|
||||
}
|
||||
return variant;
|
||||
}
|
||||
|
||||
String requestedMaterialCode = normalizeRequestedMaterialCode(settings.getMaterial());
|
||||
|
||||
FilamentMaterialType materialType = materialRepo.findByMaterialCode(requestedMaterialCode)
|
||||
.orElseGet(() -> materialRepo.findByMaterialCode("PLA")
|
||||
.orElseThrow(() -> new RuntimeException("Fallback material PLA not configured")));
|
||||
|
||||
String requestedColor = settings.getColor() != null ? settings.getColor().trim() : null;
|
||||
if (requestedColor != null && !requestedColor.isBlank()) {
|
||||
Optional<FilamentVariant> byColor = variantRepo.findByFilamentMaterialTypeAndColorName(materialType, requestedColor);
|
||||
if (byColor.isPresent() && Boolean.TRUE.equals(byColor.get().getIsActive())) {
|
||||
return byColor.get();
|
||||
}
|
||||
}
|
||||
|
||||
return variantRepo.findFirstByFilamentMaterialTypeAndIsActiveTrue(materialType)
|
||||
.orElseThrow(() -> new RuntimeException("No active variant for material: " + requestedMaterialCode));
|
||||
}
|
||||
|
||||
private String normalizeRequestedMaterialCode(String value) {
|
||||
if (value == null || value.isBlank()) {
|
||||
return "PLA";
|
||||
}
|
||||
|
||||
return value.trim()
|
||||
.toUpperCase(Locale.ROOT)
|
||||
.replace('_', ' ')
|
||||
.replace('-', ' ')
|
||||
.replaceAll("\\s+", " ");
|
||||
}
|
||||
|
||||
// 3. Update Line Item
|
||||
@PatchMapping("/line-items/{lineItemId}")
|
||||
@Transactional
|
||||
public ResponseEntity<QuoteLineItem> updateLineItem(
|
||||
@PathVariable UUID lineItemId,
|
||||
@RequestBody Map<String, Object> updates
|
||||
) {
|
||||
QuoteLineItem item = lineItemRepo.findById(lineItemId)
|
||||
.orElseThrow(() -> new RuntimeException("Item not found"));
|
||||
|
||||
if (updates.containsKey("quantity")) {
|
||||
item.setQuantity((Integer) updates.get("quantity"));
|
||||
}
|
||||
if (updates.containsKey("color_code")) {
|
||||
item.setColorCode((String) updates.get("color_code"));
|
||||
}
|
||||
|
||||
// Recalculate price if needed?
|
||||
// For now, unit price is fixed in mock. Total is calculated on GET.
|
||||
|
||||
item.setUpdatedAt(OffsetDateTime.now());
|
||||
return ResponseEntity.ok(lineItemRepo.save(item));
|
||||
}
|
||||
|
||||
// 4. Delete Line Item
|
||||
@DeleteMapping("/{sessionId}/line-items/{lineItemId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteLineItem(
|
||||
@PathVariable UUID sessionId,
|
||||
@PathVariable UUID lineItemId
|
||||
) {
|
||||
// Verify item belongs to session?
|
||||
QuoteLineItem item = lineItemRepo.findById(lineItemId)
|
||||
.orElseThrow(() -> new RuntimeException("Item not found"));
|
||||
|
||||
if (!item.getQuoteSession().getId().equals(sessionId)) {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
|
||||
lineItemRepo.delete(item);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
// 5. Get Session (Session + Items + Total)
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<Map<String, Object>> getQuoteSession(@PathVariable UUID id) {
|
||||
QuoteSession session = sessionRepo.findById(id)
|
||||
.orElseThrow(() -> new RuntimeException("Session not found"));
|
||||
|
||||
List<QuoteLineItem> items = lineItemRepo.findByQuoteSessionId(id);
|
||||
|
||||
// Calculate Totals and global session hours
|
||||
BigDecimal itemsTotal = BigDecimal.ZERO;
|
||||
BigDecimal totalSeconds = BigDecimal.ZERO;
|
||||
|
||||
for (QuoteLineItem item : items) {
|
||||
BigDecimal lineTotal = item.getUnitPriceChf().multiply(BigDecimal.valueOf(item.getQuantity()));
|
||||
itemsTotal = itemsTotal.add(lineTotal);
|
||||
|
||||
if (item.getPrintTimeSeconds() != null) {
|
||||
totalSeconds = totalSeconds.add(BigDecimal.valueOf(item.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(item.getQuantity())));
|
||||
}
|
||||
}
|
||||
|
||||
BigDecimal totalHours = totalSeconds.divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
|
||||
com.printcalculator.entity.PricingPolicy policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
|
||||
BigDecimal globalMachineCost = quoteCalculator.calculateSessionMachineCost(policy, totalHours);
|
||||
|
||||
itemsTotal = itemsTotal.add(globalMachineCost);
|
||||
|
||||
// Map items to DTO to embed distributed machine cost
|
||||
List<Map<String, Object>> itemsDto = new ArrayList<>();
|
||||
for (QuoteLineItem item : items) {
|
||||
Map<String, Object> dto = new HashMap<>();
|
||||
dto.put("id", item.getId());
|
||||
dto.put("originalFilename", item.getOriginalFilename());
|
||||
dto.put("quantity", item.getQuantity());
|
||||
dto.put("printTimeSeconds", item.getPrintTimeSeconds());
|
||||
dto.put("materialGrams", item.getMaterialGrams());
|
||||
dto.put("colorCode", item.getColorCode());
|
||||
dto.put("filamentVariantId", item.getFilamentVariant() != null ? item.getFilamentVariant().getId() : null);
|
||||
dto.put("status", item.getStatus());
|
||||
|
||||
BigDecimal unitPrice = item.getUnitPriceChf();
|
||||
if (totalSeconds.compareTo(BigDecimal.ZERO) > 0 && item.getPrintTimeSeconds() != null) {
|
||||
BigDecimal itemSeconds = BigDecimal.valueOf(item.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(item.getQuantity()));
|
||||
BigDecimal share = itemSeconds.divide(totalSeconds, 8, RoundingMode.HALF_UP);
|
||||
BigDecimal itemMachineCost = globalMachineCost.multiply(share);
|
||||
BigDecimal unitMachineCost = itemMachineCost.divide(BigDecimal.valueOf(item.getQuantity()), 2, RoundingMode.HALF_UP);
|
||||
unitPrice = unitPrice.add(unitMachineCost);
|
||||
}
|
||||
dto.put("unitPriceChf", unitPrice);
|
||||
itemsDto.add(dto);
|
||||
}
|
||||
|
||||
BigDecimal setupFee = session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO;
|
||||
|
||||
// Calculate shipping cost based on dimensions
|
||||
boolean exceedsBaseSize = false;
|
||||
for (QuoteLineItem item : items) {
|
||||
BigDecimal x = item.getBoundingBoxXMm() != null ? item.getBoundingBoxXMm() : BigDecimal.ZERO;
|
||||
BigDecimal y = item.getBoundingBoxYMm() != null ? item.getBoundingBoxYMm() : BigDecimal.ZERO;
|
||||
BigDecimal z = item.getBoundingBoxZMm() != null ? item.getBoundingBoxZMm() : BigDecimal.ZERO;
|
||||
|
||||
BigDecimal[] dims = {x, y, z};
|
||||
java.util.Arrays.sort(dims);
|
||||
|
||||
if (dims[2].compareTo(BigDecimal.valueOf(250.0)) > 0 ||
|
||||
dims[1].compareTo(BigDecimal.valueOf(176.0)) > 0 ||
|
||||
dims[0].compareTo(BigDecimal.valueOf(20.0)) > 0) {
|
||||
exceedsBaseSize = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
int totalQuantity = items.stream()
|
||||
.mapToInt(i -> i.getQuantity() != null ? i.getQuantity() : 1)
|
||||
.sum();
|
||||
|
||||
BigDecimal shippingCostChf;
|
||||
if (exceedsBaseSize) {
|
||||
shippingCostChf = totalQuantity > 5 ? BigDecimal.valueOf(9.00) : BigDecimal.valueOf(4.00);
|
||||
} else {
|
||||
shippingCostChf = BigDecimal.valueOf(2.00);
|
||||
}
|
||||
|
||||
BigDecimal grandTotal = itemsTotal.add(setupFee).add(shippingCostChf);
|
||||
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("session", session);
|
||||
response.put("items", itemsDto);
|
||||
response.put("itemsTotalChf", itemsTotal); // Includes the base cost of all items + the global tiered machine cost
|
||||
response.put("shippingCostChf", shippingCostChf);
|
||||
response.put("globalMachineCostChf", globalMachineCost); // Provide it so frontend knows how much it was (optional now)
|
||||
response.put("grandTotalChf", grandTotal);
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
// 6. Download Line Item Content
|
||||
@GetMapping(value = "/{sessionId}/line-items/{lineItemId}/content")
|
||||
public ResponseEntity<org.springframework.core.io.Resource> downloadLineItemContent(
|
||||
@PathVariable UUID sessionId,
|
||||
@PathVariable UUID lineItemId
|
||||
) throws IOException {
|
||||
QuoteLineItem item = lineItemRepo.findById(lineItemId)
|
||||
.orElseThrow(() -> new RuntimeException("Item not found"));
|
||||
|
||||
if (!item.getQuoteSession().getId().equals(sessionId)) {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
|
||||
if (item.getStoredPath() == null) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
Path path = resolveStoredQuotePath(item.getStoredPath(), sessionId);
|
||||
if (path == null || !Files.exists(path)) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
org.springframework.core.io.Resource resource = new UrlResource(path.toUri());
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + item.getOriginalFilename() + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
private String getSafeExtension(String filename, String fallback) {
|
||||
if (filename == null) {
|
||||
return fallback;
|
||||
}
|
||||
String cleaned = StringUtils.cleanPath(filename);
|
||||
if (cleaned.contains("..")) {
|
||||
return fallback;
|
||||
}
|
||||
int index = cleaned.lastIndexOf('.');
|
||||
if (index <= 0 || index >= cleaned.length() - 1) {
|
||||
return fallback;
|
||||
}
|
||||
String ext = cleaned.substring(index + 1).toLowerCase(Locale.ROOT);
|
||||
return switch (ext) {
|
||||
case "stl" -> "stl";
|
||||
case "3mf" -> "3mf";
|
||||
case "step", "stp" -> "step";
|
||||
default -> fallback;
|
||||
};
|
||||
}
|
||||
|
||||
private Path resolveStoredQuotePath(String storedPath, UUID expectedSessionId) {
|
||||
if (storedPath == null || storedPath.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
Path raw = Path.of(storedPath).normalize();
|
||||
Path resolved = raw.isAbsolute() ? raw : QUOTE_STORAGE_ROOT.resolve(raw).normalize();
|
||||
Path expectedSessionRoot = QUOTE_STORAGE_ROOT.resolve(expectedSessionId.toString()).normalize();
|
||||
if (!resolved.startsWith(expectedSessionRoot)) {
|
||||
return null;
|
||||
}
|
||||
return resolved;
|
||||
} catch (InvalidPathException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminLoginRequest;
|
||||
import com.printcalculator.security.AdminLoginThrottleService;
|
||||
import com.printcalculator.security.AdminSessionService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.OptionalLong;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/auth")
|
||||
public class AdminAuthController {
|
||||
|
||||
private final AdminSessionService adminSessionService;
|
||||
private final AdminLoginThrottleService adminLoginThrottleService;
|
||||
|
||||
public AdminAuthController(
|
||||
AdminSessionService adminSessionService,
|
||||
AdminLoginThrottleService adminLoginThrottleService
|
||||
) {
|
||||
this.adminSessionService = adminSessionService;
|
||||
this.adminLoginThrottleService = adminLoginThrottleService;
|
||||
}
|
||||
|
||||
@PostMapping("/login")
|
||||
public ResponseEntity<Map<String, Object>> login(
|
||||
@Valid @RequestBody AdminLoginRequest request,
|
||||
HttpServletRequest httpRequest,
|
||||
HttpServletResponse response
|
||||
) {
|
||||
String clientKey = adminLoginThrottleService.resolveClientKey(httpRequest);
|
||||
OptionalLong remainingLock = adminLoginThrottleService.getRemainingLockSeconds(clientKey);
|
||||
if (remainingLock.isPresent()) {
|
||||
long retryAfter = remainingLock.getAsLong();
|
||||
return ResponseEntity.status(429)
|
||||
.header(HttpHeaders.RETRY_AFTER, String.valueOf(retryAfter))
|
||||
.body(Map.of(
|
||||
"authenticated", false,
|
||||
"retryAfterSeconds", retryAfter
|
||||
));
|
||||
}
|
||||
|
||||
if (!adminSessionService.isPasswordValid(request.getPassword())) {
|
||||
long retryAfter = adminLoginThrottleService.registerFailure(clientKey);
|
||||
return ResponseEntity.status(401)
|
||||
.header(HttpHeaders.RETRY_AFTER, String.valueOf(retryAfter))
|
||||
.body(Map.of(
|
||||
"authenticated", false,
|
||||
"retryAfterSeconds", retryAfter
|
||||
));
|
||||
}
|
||||
|
||||
adminLoginThrottleService.reset(clientKey);
|
||||
String token = adminSessionService.createSessionToken();
|
||||
response.addHeader(HttpHeaders.SET_COOKIE, adminSessionService.buildLoginCookie(token).toString());
|
||||
|
||||
return ResponseEntity.ok(Map.of(
|
||||
"authenticated", true,
|
||||
"expiresInMinutes", adminSessionService.getSessionTtlMinutes()
|
||||
));
|
||||
}
|
||||
|
||||
@PostMapping("/logout")
|
||||
public ResponseEntity<Map<String, Object>> logout(HttpServletResponse response) {
|
||||
response.addHeader(HttpHeaders.SET_COOKIE, adminSessionService.buildLogoutCookie().toString());
|
||||
return ResponseEntity.ok(Map.of("authenticated", false));
|
||||
}
|
||||
|
||||
@GetMapping("/me")
|
||||
public ResponseEntity<Map<String, Object>> me() {
|
||||
return ResponseEntity.ok(Map.of("authenticated", true));
|
||||
}
|
||||
}
|
||||
@@ -1,355 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminFilamentMaterialTypeDto;
|
||||
import com.printcalculator.dto.AdminFilamentVariantDto;
|
||||
import com.printcalculator.dto.AdminUpsertFilamentMaterialTypeRequest;
|
||||
import com.printcalculator.dto.AdminUpsertFilamentVariantRequest;
|
||||
import com.printcalculator.entity.FilamentMaterialType;
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import com.printcalculator.repository.FilamentMaterialTypeRepository;
|
||||
import com.printcalculator.repository.FilamentVariantRepository;
|
||||
import com.printcalculator.repository.OrderItemRepository;
|
||||
import com.printcalculator.repository.QuoteLineItemRepository;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||
import static org.springframework.http.HttpStatus.CONFLICT;
|
||||
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/filaments")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminFilamentController {
|
||||
private static final BigDecimal MAX_NUMERIC_6_3 = new BigDecimal("999.999");
|
||||
private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("^#[0-9A-Fa-f]{6}$");
|
||||
private static final Set<String> ALLOWED_FINISH_TYPES = Set.of(
|
||||
"GLOSSY", "MATTE", "MARBLE", "SILK", "TRANSLUCENT", "SPECIAL"
|
||||
);
|
||||
|
||||
private final FilamentMaterialTypeRepository materialRepo;
|
||||
private final FilamentVariantRepository variantRepo;
|
||||
private final QuoteLineItemRepository quoteLineItemRepo;
|
||||
private final OrderItemRepository orderItemRepo;
|
||||
|
||||
public AdminFilamentController(
|
||||
FilamentMaterialTypeRepository materialRepo,
|
||||
FilamentVariantRepository variantRepo,
|
||||
QuoteLineItemRepository quoteLineItemRepo,
|
||||
OrderItemRepository orderItemRepo
|
||||
) {
|
||||
this.materialRepo = materialRepo;
|
||||
this.variantRepo = variantRepo;
|
||||
this.quoteLineItemRepo = quoteLineItemRepo;
|
||||
this.orderItemRepo = orderItemRepo;
|
||||
}
|
||||
|
||||
@GetMapping("/materials")
|
||||
public ResponseEntity<List<AdminFilamentMaterialTypeDto>> getMaterials() {
|
||||
List<AdminFilamentMaterialTypeDto> response = materialRepo.findAll().stream()
|
||||
.sorted(Comparator.comparing(FilamentMaterialType::getMaterialCode, String.CASE_INSENSITIVE_ORDER))
|
||||
.map(this::toMaterialDto)
|
||||
.toList();
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@GetMapping("/variants")
|
||||
public ResponseEntity<List<AdminFilamentVariantDto>> getVariants() {
|
||||
List<AdminFilamentVariantDto> response = variantRepo.findAll().stream()
|
||||
.sorted(Comparator
|
||||
.comparing((FilamentVariant v) -> {
|
||||
FilamentMaterialType type = v.getFilamentMaterialType();
|
||||
return type != null && type.getMaterialCode() != null ? type.getMaterialCode() : "";
|
||||
}, String.CASE_INSENSITIVE_ORDER)
|
||||
.thenComparing(v -> v.getVariantDisplayName() != null ? v.getVariantDisplayName() : "", String.CASE_INSENSITIVE_ORDER))
|
||||
.map(this::toVariantDto)
|
||||
.toList();
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@PostMapping("/materials")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentMaterialTypeDto> createMaterial(
|
||||
@RequestBody AdminUpsertFilamentMaterialTypeRequest payload
|
||||
) {
|
||||
String materialCode = normalizeAndValidateMaterialCode(payload);
|
||||
ensureMaterialCodeAvailable(materialCode, null);
|
||||
|
||||
FilamentMaterialType material = new FilamentMaterialType();
|
||||
applyMaterialPayload(material, payload, materialCode);
|
||||
FilamentMaterialType saved = materialRepo.save(material);
|
||||
return ResponseEntity.ok(toMaterialDto(saved));
|
||||
}
|
||||
|
||||
@PutMapping("/materials/{materialTypeId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentMaterialTypeDto> updateMaterial(
|
||||
@PathVariable Long materialTypeId,
|
||||
@RequestBody AdminUpsertFilamentMaterialTypeRequest payload
|
||||
) {
|
||||
FilamentMaterialType material = materialRepo.findById(materialTypeId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Filament material not found"));
|
||||
|
||||
String materialCode = normalizeAndValidateMaterialCode(payload);
|
||||
ensureMaterialCodeAvailable(materialCode, materialTypeId);
|
||||
|
||||
applyMaterialPayload(material, payload, materialCode);
|
||||
FilamentMaterialType saved = materialRepo.save(material);
|
||||
return ResponseEntity.ok(toMaterialDto(saved));
|
||||
}
|
||||
|
||||
@PostMapping("/variants")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentVariantDto> createVariant(
|
||||
@RequestBody AdminUpsertFilamentVariantRequest payload
|
||||
) {
|
||||
FilamentMaterialType material = validateAndResolveMaterial(payload);
|
||||
String normalizedDisplayName = normalizeAndValidateVariantDisplayName(payload.getVariantDisplayName());
|
||||
String normalizedColorName = normalizeAndValidateColorName(payload.getColorName());
|
||||
validateNumericPayload(payload);
|
||||
ensureVariantDisplayNameAvailable(material, normalizedDisplayName, null);
|
||||
|
||||
FilamentVariant variant = new FilamentVariant();
|
||||
variant.setCreatedAt(OffsetDateTime.now());
|
||||
applyVariantPayload(variant, payload, material, normalizedDisplayName, normalizedColorName);
|
||||
FilamentVariant saved = variantRepo.save(variant);
|
||||
return ResponseEntity.ok(toVariantDto(saved));
|
||||
}
|
||||
|
||||
@PutMapping("/variants/{variantId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentVariantDto> updateVariant(
|
||||
@PathVariable Long variantId,
|
||||
@RequestBody AdminUpsertFilamentVariantRequest payload
|
||||
) {
|
||||
FilamentVariant variant = variantRepo.findById(variantId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Filament variant not found"));
|
||||
|
||||
FilamentMaterialType material = validateAndResolveMaterial(payload);
|
||||
String normalizedDisplayName = normalizeAndValidateVariantDisplayName(payload.getVariantDisplayName());
|
||||
String normalizedColorName = normalizeAndValidateColorName(payload.getColorName());
|
||||
validateNumericPayload(payload);
|
||||
ensureVariantDisplayNameAvailable(material, normalizedDisplayName, variantId);
|
||||
|
||||
applyVariantPayload(variant, payload, material, normalizedDisplayName, normalizedColorName);
|
||||
FilamentVariant saved = variantRepo.save(variant);
|
||||
return ResponseEntity.ok(toVariantDto(saved));
|
||||
}
|
||||
|
||||
@DeleteMapping("/variants/{variantId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteVariant(@PathVariable Long variantId) {
|
||||
FilamentVariant variant = variantRepo.findById(variantId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Filament variant not found"));
|
||||
|
||||
if (quoteLineItemRepo.existsByFilamentVariant_Id(variantId) || orderItemRepo.existsByFilamentVariant_Id(variantId)) {
|
||||
throw new ResponseStatusException(CONFLICT, "Variant is already used in quotes/orders and cannot be deleted");
|
||||
}
|
||||
|
||||
variantRepo.delete(variant);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
private void applyMaterialPayload(
|
||||
FilamentMaterialType material,
|
||||
AdminUpsertFilamentMaterialTypeRequest payload,
|
||||
String normalizedMaterialCode
|
||||
) {
|
||||
boolean isFlexible = payload != null && Boolean.TRUE.equals(payload.getIsFlexible());
|
||||
boolean isTechnical = payload != null && Boolean.TRUE.equals(payload.getIsTechnical());
|
||||
String technicalTypeLabel = payload != null && payload.getTechnicalTypeLabel() != null
|
||||
? payload.getTechnicalTypeLabel().trim()
|
||||
: null;
|
||||
|
||||
material.setMaterialCode(normalizedMaterialCode);
|
||||
material.setIsFlexible(isFlexible);
|
||||
material.setIsTechnical(isTechnical);
|
||||
material.setTechnicalTypeLabel(isTechnical && technicalTypeLabel != null && !technicalTypeLabel.isBlank()
|
||||
? technicalTypeLabel
|
||||
: null);
|
||||
}
|
||||
|
||||
private void applyVariantPayload(
|
||||
FilamentVariant variant,
|
||||
AdminUpsertFilamentVariantRequest payload,
|
||||
FilamentMaterialType material,
|
||||
String normalizedDisplayName,
|
||||
String normalizedColorName
|
||||
) {
|
||||
String normalizedColorHex = normalizeAndValidateColorHex(payload.getColorHex());
|
||||
String normalizedFinishType = normalizeAndValidateFinishType(payload.getFinishType(), payload.getIsMatte());
|
||||
String normalizedBrand = normalizeOptional(payload.getBrand());
|
||||
|
||||
variant.setFilamentMaterialType(material);
|
||||
variant.setVariantDisplayName(normalizedDisplayName);
|
||||
variant.setColorName(normalizedColorName);
|
||||
variant.setColorHex(normalizedColorHex);
|
||||
variant.setFinishType(normalizedFinishType);
|
||||
variant.setBrand(normalizedBrand);
|
||||
variant.setIsMatte(Boolean.TRUE.equals(payload.getIsMatte()) || "MATTE".equals(normalizedFinishType));
|
||||
variant.setIsSpecial(Boolean.TRUE.equals(payload.getIsSpecial()));
|
||||
variant.setCostChfPerKg(payload.getCostChfPerKg());
|
||||
variant.setStockSpools(payload.getStockSpools());
|
||||
variant.setSpoolNetKg(payload.getSpoolNetKg());
|
||||
variant.setIsActive(payload.getIsActive() == null || payload.getIsActive());
|
||||
}
|
||||
|
||||
private String normalizeAndValidateMaterialCode(AdminUpsertFilamentMaterialTypeRequest payload) {
|
||||
if (payload == null || payload.getMaterialCode() == null || payload.getMaterialCode().isBlank()) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Material code is required");
|
||||
}
|
||||
return payload.getMaterialCode().trim().toUpperCase();
|
||||
}
|
||||
|
||||
private String normalizeAndValidateVariantDisplayName(String value) {
|
||||
if (value == null || value.isBlank()) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Variant display name is required");
|
||||
}
|
||||
return value.trim();
|
||||
}
|
||||
|
||||
private String normalizeAndValidateColorName(String value) {
|
||||
if (value == null || value.isBlank()) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Color name is required");
|
||||
}
|
||||
return value.trim();
|
||||
}
|
||||
|
||||
private String normalizeAndValidateColorHex(String value) {
|
||||
if (value == null || value.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
String normalized = value.trim();
|
||||
if (!HEX_COLOR_PATTERN.matcher(normalized).matches()) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Color hex must be in format #RRGGBB");
|
||||
}
|
||||
return normalized.toUpperCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
private String normalizeAndValidateFinishType(String finishType, Boolean isMatte) {
|
||||
String normalized = finishType == null || finishType.isBlank()
|
||||
? (Boolean.TRUE.equals(isMatte) ? "MATTE" : "GLOSSY")
|
||||
: finishType.trim().toUpperCase(Locale.ROOT);
|
||||
if (!ALLOWED_FINISH_TYPES.contains(normalized)) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Invalid finish type");
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String normalizeOptional(String value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
String normalized = value.trim();
|
||||
return normalized.isBlank() ? null : normalized;
|
||||
}
|
||||
|
||||
private FilamentMaterialType validateAndResolveMaterial(AdminUpsertFilamentVariantRequest payload) {
|
||||
if (payload == null || payload.getMaterialTypeId() == null) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Material type id is required");
|
||||
}
|
||||
|
||||
return materialRepo.findById(payload.getMaterialTypeId())
|
||||
.orElseThrow(() -> new ResponseStatusException(BAD_REQUEST, "Material type not found"));
|
||||
}
|
||||
|
||||
private void validateNumericPayload(AdminUpsertFilamentVariantRequest payload) {
|
||||
if (payload.getCostChfPerKg() == null || payload.getCostChfPerKg().compareTo(BigDecimal.ZERO) < 0) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Cost CHF/kg must be >= 0");
|
||||
}
|
||||
validateNumeric63(payload.getStockSpools(), "Stock spools", true);
|
||||
validateNumeric63(payload.getSpoolNetKg(), "Spool net kg", false);
|
||||
}
|
||||
|
||||
private void validateNumeric63(BigDecimal value, String fieldName, boolean allowZero) {
|
||||
if (value == null) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, fieldName + " is required");
|
||||
}
|
||||
|
||||
if (allowZero) {
|
||||
if (value.compareTo(BigDecimal.ZERO) < 0) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, fieldName + " must be >= 0");
|
||||
}
|
||||
} else if (value.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, fieldName + " must be > 0");
|
||||
}
|
||||
|
||||
if (value.scale() > 3) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, fieldName + " must have at most 3 decimal places");
|
||||
}
|
||||
|
||||
if (value.compareTo(MAX_NUMERIC_6_3) > 0) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, fieldName + " must be <= 999.999");
|
||||
}
|
||||
}
|
||||
|
||||
private void ensureMaterialCodeAvailable(String materialCode, Long currentMaterialId) {
|
||||
materialRepo.findByMaterialCode(materialCode).ifPresent(existing -> {
|
||||
if (currentMaterialId == null || !existing.getId().equals(currentMaterialId)) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Material code already exists");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void ensureVariantDisplayNameAvailable(FilamentMaterialType material, String displayName, Long currentVariantId) {
|
||||
variantRepo.findByFilamentMaterialTypeAndVariantDisplayName(material, displayName).ifPresent(existing -> {
|
||||
if (currentVariantId == null || !existing.getId().equals(currentVariantId)) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Variant display name already exists for this material");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private AdminFilamentMaterialTypeDto toMaterialDto(FilamentMaterialType material) {
|
||||
AdminFilamentMaterialTypeDto dto = new AdminFilamentMaterialTypeDto();
|
||||
dto.setId(material.getId());
|
||||
dto.setMaterialCode(material.getMaterialCode());
|
||||
dto.setIsFlexible(material.getIsFlexible());
|
||||
dto.setIsTechnical(material.getIsTechnical());
|
||||
dto.setTechnicalTypeLabel(material.getTechnicalTypeLabel());
|
||||
return dto;
|
||||
}
|
||||
|
||||
private AdminFilamentVariantDto toVariantDto(FilamentVariant variant) {
|
||||
AdminFilamentVariantDto dto = new AdminFilamentVariantDto();
|
||||
dto.setId(variant.getId());
|
||||
|
||||
FilamentMaterialType material = variant.getFilamentMaterialType();
|
||||
if (material != null) {
|
||||
dto.setMaterialTypeId(material.getId());
|
||||
dto.setMaterialCode(material.getMaterialCode());
|
||||
dto.setMaterialIsFlexible(material.getIsFlexible());
|
||||
dto.setMaterialIsTechnical(material.getIsTechnical());
|
||||
dto.setMaterialTechnicalTypeLabel(material.getTechnicalTypeLabel());
|
||||
}
|
||||
|
||||
dto.setVariantDisplayName(variant.getVariantDisplayName());
|
||||
dto.setColorName(variant.getColorName());
|
||||
dto.setColorHex(variant.getColorHex());
|
||||
dto.setFinishType(variant.getFinishType());
|
||||
dto.setBrand(variant.getBrand());
|
||||
dto.setIsMatte(variant.getIsMatte());
|
||||
dto.setIsSpecial(variant.getIsSpecial());
|
||||
dto.setCostChfPerKg(variant.getCostChfPerKg());
|
||||
dto.setStockSpools(variant.getStockSpools());
|
||||
dto.setSpoolNetKg(variant.getSpoolNetKg());
|
||||
BigDecimal stockKg = BigDecimal.ZERO;
|
||||
if (variant.getStockSpools() != null && variant.getSpoolNetKg() != null) {
|
||||
stockKg = variant.getStockSpools().multiply(variant.getSpoolNetKg());
|
||||
}
|
||||
dto.setStockKg(stockKg);
|
||||
dto.setStockFilamentGrams(stockKg.multiply(BigDecimal.valueOf(1000)));
|
||||
dto.setIsActive(variant.getIsActive());
|
||||
dto.setCreatedAt(variant.getCreatedAt());
|
||||
return dto;
|
||||
}
|
||||
}
|
||||
@@ -1,372 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminContactRequestDto;
|
||||
import com.printcalculator.dto.AdminContactRequestAttachmentDto;
|
||||
import com.printcalculator.dto.AdminContactRequestDetailDto;
|
||||
import com.printcalculator.dto.AdminFilamentStockDto;
|
||||
import com.printcalculator.dto.AdminQuoteSessionDto;
|
||||
import com.printcalculator.dto.AdminUpdateContactRequestStatusRequest;
|
||||
import com.printcalculator.entity.CustomQuoteRequest;
|
||||
import com.printcalculator.entity.CustomQuoteRequestAttachment;
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import com.printcalculator.entity.FilamentVariantStockKg;
|
||||
import com.printcalculator.entity.QuoteSession;
|
||||
import com.printcalculator.repository.CustomQuoteRequestAttachmentRepository;
|
||||
import com.printcalculator.repository.CustomQuoteRequestRepository;
|
||||
import com.printcalculator.repository.FilamentVariantRepository;
|
||||
import com.printcalculator.repository.FilamentVariantStockKgRepository;
|
||||
import com.printcalculator.repository.OrderRepository;
|
||||
import com.printcalculator.repository.QuoteSessionRepository;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.http.ContentDisposition;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
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 org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UncheckedIOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.net.MalformedURLException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||
import static org.springframework.http.HttpStatus.CONFLICT;
|
||||
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
|
||||
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminOperationsController {
|
||||
private static final Logger logger = LoggerFactory.getLogger(AdminOperationsController.class);
|
||||
private static final Path CONTACT_ATTACHMENTS_ROOT = Paths.get("storage_requests").toAbsolutePath().normalize();
|
||||
private static final Set<String> CONTACT_REQUEST_ALLOWED_STATUSES = Set.of(
|
||||
"NEW", "PENDING", "IN_PROGRESS", "DONE", "CLOSED"
|
||||
);
|
||||
|
||||
private final FilamentVariantStockKgRepository filamentStockRepo;
|
||||
private final FilamentVariantRepository filamentVariantRepo;
|
||||
private final CustomQuoteRequestRepository customQuoteRequestRepo;
|
||||
private final CustomQuoteRequestAttachmentRepository customQuoteRequestAttachmentRepo;
|
||||
private final QuoteSessionRepository quoteSessionRepo;
|
||||
private final OrderRepository orderRepo;
|
||||
|
||||
public AdminOperationsController(
|
||||
FilamentVariantStockKgRepository filamentStockRepo,
|
||||
FilamentVariantRepository filamentVariantRepo,
|
||||
CustomQuoteRequestRepository customQuoteRequestRepo,
|
||||
CustomQuoteRequestAttachmentRepository customQuoteRequestAttachmentRepo,
|
||||
QuoteSessionRepository quoteSessionRepo,
|
||||
OrderRepository orderRepo
|
||||
) {
|
||||
this.filamentStockRepo = filamentStockRepo;
|
||||
this.filamentVariantRepo = filamentVariantRepo;
|
||||
this.customQuoteRequestRepo = customQuoteRequestRepo;
|
||||
this.customQuoteRequestAttachmentRepo = customQuoteRequestAttachmentRepo;
|
||||
this.quoteSessionRepo = quoteSessionRepo;
|
||||
this.orderRepo = orderRepo;
|
||||
}
|
||||
|
||||
@GetMapping("/filament-stock")
|
||||
public ResponseEntity<List<AdminFilamentStockDto>> getFilamentStock() {
|
||||
List<FilamentVariantStockKg> stocks = filamentStockRepo.findAll(Sort.by(Sort.Direction.ASC, "stockKg"));
|
||||
Set<Long> variantIds = stocks.stream()
|
||||
.map(FilamentVariantStockKg::getFilamentVariantId)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
Map<Long, FilamentVariant> variantsById;
|
||||
if (variantIds.isEmpty()) {
|
||||
variantsById = Collections.emptyMap();
|
||||
} else {
|
||||
variantsById = filamentVariantRepo.findAllById(variantIds).stream()
|
||||
.collect(Collectors.toMap(FilamentVariant::getId, variant -> variant));
|
||||
}
|
||||
|
||||
List<AdminFilamentStockDto> response = stocks.stream().map(stock -> {
|
||||
FilamentVariant variant = variantsById.get(stock.getFilamentVariantId());
|
||||
AdminFilamentStockDto dto = new AdminFilamentStockDto();
|
||||
dto.setFilamentVariantId(stock.getFilamentVariantId());
|
||||
dto.setStockSpools(stock.getStockSpools());
|
||||
dto.setSpoolNetKg(stock.getSpoolNetKg());
|
||||
dto.setStockKg(stock.getStockKg());
|
||||
BigDecimal grams = stock.getStockKg() != null
|
||||
? stock.getStockKg().multiply(BigDecimal.valueOf(1000))
|
||||
: BigDecimal.ZERO;
|
||||
dto.setStockFilamentGrams(grams);
|
||||
|
||||
if (variant != null) {
|
||||
dto.setMaterialCode(
|
||||
variant.getFilamentMaterialType() != null
|
||||
? variant.getFilamentMaterialType().getMaterialCode()
|
||||
: "UNKNOWN"
|
||||
);
|
||||
dto.setVariantDisplayName(variant.getVariantDisplayName());
|
||||
dto.setColorName(variant.getColorName());
|
||||
dto.setActive(variant.getIsActive());
|
||||
} else {
|
||||
dto.setMaterialCode("UNKNOWN");
|
||||
dto.setVariantDisplayName("Variant " + stock.getFilamentVariantId());
|
||||
dto.setColorName("-");
|
||||
dto.setActive(false);
|
||||
}
|
||||
|
||||
return dto;
|
||||
}).toList();
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@GetMapping("/contact-requests")
|
||||
public ResponseEntity<List<AdminContactRequestDto>> getContactRequests() {
|
||||
List<AdminContactRequestDto> response = customQuoteRequestRepo.findAll(
|
||||
Sort.by(Sort.Direction.DESC, "createdAt")
|
||||
)
|
||||
.stream()
|
||||
.map(this::toContactRequestDto)
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@GetMapping("/contact-requests/{requestId}")
|
||||
public ResponseEntity<AdminContactRequestDetailDto> getContactRequestDetail(@PathVariable UUID requestId) {
|
||||
CustomQuoteRequest request = customQuoteRequestRepo.findById(requestId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Contact request not found"));
|
||||
|
||||
List<AdminContactRequestAttachmentDto> attachments = customQuoteRequestAttachmentRepo
|
||||
.findByRequest_IdOrderByCreatedAtAsc(requestId)
|
||||
.stream()
|
||||
.map(this::toContactRequestAttachmentDto)
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(toContactRequestDetailDto(request, attachments));
|
||||
}
|
||||
|
||||
@PatchMapping("/contact-requests/{requestId}/status")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminContactRequestDetailDto> updateContactRequestStatus(
|
||||
@PathVariable UUID requestId,
|
||||
@RequestBody AdminUpdateContactRequestStatusRequest payload
|
||||
) {
|
||||
CustomQuoteRequest request = customQuoteRequestRepo.findById(requestId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Contact request not found"));
|
||||
|
||||
String requestedStatus = payload != null && payload.getStatus() != null
|
||||
? payload.getStatus().trim().toUpperCase(Locale.ROOT)
|
||||
: "";
|
||||
|
||||
if (!CONTACT_REQUEST_ALLOWED_STATUSES.contains(requestedStatus)) {
|
||||
throw new ResponseStatusException(
|
||||
BAD_REQUEST,
|
||||
"Invalid status. Allowed: " + String.join(", ", CONTACT_REQUEST_ALLOWED_STATUSES)
|
||||
);
|
||||
}
|
||||
|
||||
request.setStatus(requestedStatus);
|
||||
request.setUpdatedAt(OffsetDateTime.now());
|
||||
CustomQuoteRequest saved = customQuoteRequestRepo.save(request);
|
||||
|
||||
List<AdminContactRequestAttachmentDto> attachments = customQuoteRequestAttachmentRepo
|
||||
.findByRequest_IdOrderByCreatedAtAsc(requestId)
|
||||
.stream()
|
||||
.map(this::toContactRequestAttachmentDto)
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(toContactRequestDetailDto(saved, attachments));
|
||||
}
|
||||
|
||||
@GetMapping("/contact-requests/{requestId}/attachments/{attachmentId}/file")
|
||||
public ResponseEntity<Resource> downloadContactRequestAttachment(
|
||||
@PathVariable UUID requestId,
|
||||
@PathVariable UUID attachmentId
|
||||
) {
|
||||
CustomQuoteRequestAttachment attachment = customQuoteRequestAttachmentRepo.findById(attachmentId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Attachment not found"));
|
||||
|
||||
if (!attachment.getRequest().getId().equals(requestId)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment not found for request");
|
||||
}
|
||||
|
||||
String relativePath = attachment.getStoredRelativePath();
|
||||
if (relativePath == null || relativePath.isBlank() || "PENDING".equals(relativePath)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment file not available");
|
||||
}
|
||||
|
||||
String expectedPrefix = "quote-requests/" + requestId + "/attachments/" + attachmentId + "/";
|
||||
if (!relativePath.startsWith(expectedPrefix)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment file not available");
|
||||
}
|
||||
|
||||
Path filePath = CONTACT_ATTACHMENTS_ROOT.resolve(relativePath).normalize();
|
||||
if (!filePath.startsWith(CONTACT_ATTACHMENTS_ROOT)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment file not available");
|
||||
}
|
||||
|
||||
if (!Files.exists(filePath)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment file not available");
|
||||
}
|
||||
|
||||
try {
|
||||
Resource resource = new UrlResource(filePath.toUri());
|
||||
if (!resource.exists() || !resource.isReadable()) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment file not available");
|
||||
}
|
||||
|
||||
MediaType mediaType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
String mimeType = attachment.getMimeType();
|
||||
if (mimeType != null && !mimeType.isBlank()) {
|
||||
try {
|
||||
mediaType = MediaType.parseMediaType(mimeType);
|
||||
} catch (Exception ignored) {
|
||||
mediaType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
}
|
||||
}
|
||||
|
||||
String filename = attachment.getOriginalFilename();
|
||||
if (filename == null || filename.isBlank()) {
|
||||
filename = attachment.getStoredFilename() != null && !attachment.getStoredFilename().isBlank()
|
||||
? attachment.getStoredFilename()
|
||||
: "attachment-" + attachmentId;
|
||||
}
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(mediaType)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment()
|
||||
.filename(filename, StandardCharsets.UTF_8)
|
||||
.build()
|
||||
.toString())
|
||||
.body(resource);
|
||||
} catch (MalformedURLException e) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Attachment file not available");
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/sessions")
|
||||
public ResponseEntity<List<AdminQuoteSessionDto>> getQuoteSessions() {
|
||||
List<AdminQuoteSessionDto> response = quoteSessionRepo.findAll(
|
||||
Sort.by(Sort.Direction.DESC, "createdAt")
|
||||
)
|
||||
.stream()
|
||||
.map(this::toQuoteSessionDto)
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@DeleteMapping("/sessions/{sessionId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteQuoteSession(@PathVariable UUID sessionId) {
|
||||
QuoteSession session = quoteSessionRepo.findById(sessionId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Session not found"));
|
||||
|
||||
if (orderRepo.existsBySourceQuoteSession_Id(sessionId)) {
|
||||
throw new ResponseStatusException(CONFLICT, "Cannot delete session already linked to an order");
|
||||
}
|
||||
|
||||
deleteSessionFiles(sessionId);
|
||||
quoteSessionRepo.delete(session);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
private AdminContactRequestDto toContactRequestDto(CustomQuoteRequest request) {
|
||||
AdminContactRequestDto dto = new AdminContactRequestDto();
|
||||
dto.setId(request.getId());
|
||||
dto.setRequestType(request.getRequestType());
|
||||
dto.setCustomerType(request.getCustomerType());
|
||||
dto.setEmail(request.getEmail());
|
||||
dto.setPhone(request.getPhone());
|
||||
dto.setName(request.getName());
|
||||
dto.setCompanyName(request.getCompanyName());
|
||||
dto.setStatus(request.getStatus());
|
||||
dto.setCreatedAt(request.getCreatedAt());
|
||||
return dto;
|
||||
}
|
||||
|
||||
private AdminContactRequestAttachmentDto toContactRequestAttachmentDto(CustomQuoteRequestAttachment attachment) {
|
||||
AdminContactRequestAttachmentDto dto = new AdminContactRequestAttachmentDto();
|
||||
dto.setId(attachment.getId());
|
||||
dto.setOriginalFilename(attachment.getOriginalFilename());
|
||||
dto.setMimeType(attachment.getMimeType());
|
||||
dto.setFileSizeBytes(attachment.getFileSizeBytes());
|
||||
dto.setCreatedAt(attachment.getCreatedAt());
|
||||
return dto;
|
||||
}
|
||||
|
||||
private AdminContactRequestDetailDto toContactRequestDetailDto(
|
||||
CustomQuoteRequest request,
|
||||
List<AdminContactRequestAttachmentDto> attachments
|
||||
) {
|
||||
AdminContactRequestDetailDto dto = new AdminContactRequestDetailDto();
|
||||
dto.setId(request.getId());
|
||||
dto.setRequestType(request.getRequestType());
|
||||
dto.setCustomerType(request.getCustomerType());
|
||||
dto.setEmail(request.getEmail());
|
||||
dto.setPhone(request.getPhone());
|
||||
dto.setName(request.getName());
|
||||
dto.setCompanyName(request.getCompanyName());
|
||||
dto.setContactPerson(request.getContactPerson());
|
||||
dto.setMessage(request.getMessage());
|
||||
dto.setStatus(request.getStatus());
|
||||
dto.setCreatedAt(request.getCreatedAt());
|
||||
dto.setUpdatedAt(request.getUpdatedAt());
|
||||
dto.setAttachments(attachments);
|
||||
return dto;
|
||||
}
|
||||
|
||||
private AdminQuoteSessionDto toQuoteSessionDto(QuoteSession session) {
|
||||
AdminQuoteSessionDto dto = new AdminQuoteSessionDto();
|
||||
dto.setId(session.getId());
|
||||
dto.setStatus(session.getStatus());
|
||||
dto.setMaterialCode(session.getMaterialCode());
|
||||
dto.setCreatedAt(session.getCreatedAt());
|
||||
dto.setExpiresAt(session.getExpiresAt());
|
||||
dto.setConvertedOrderId(session.getConvertedOrderId());
|
||||
return dto;
|
||||
}
|
||||
|
||||
private void deleteSessionFiles(UUID sessionId) {
|
||||
Path sessionDir = Paths.get("storage_quotes", sessionId.toString());
|
||||
if (!Files.exists(sessionDir)) {
|
||||
return;
|
||||
}
|
||||
|
||||
try (Stream<Path> walk = Files.walk(sessionDir)) {
|
||||
walk.sorted(Comparator.reverseOrder()).forEach(path -> {
|
||||
try {
|
||||
Files.deleteIfExists(path);
|
||||
} catch (IOException e) {
|
||||
throw new UncheckedIOException(e);
|
||||
}
|
||||
});
|
||||
} catch (IOException | UncheckedIOException e) {
|
||||
logger.error("Failed to delete files for session {}", sessionId, e);
|
||||
throw new ResponseStatusException(INTERNAL_SERVER_ERROR, "Unable to delete session files");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,327 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AddressDto;
|
||||
import com.printcalculator.dto.AdminOrderStatusUpdateRequest;
|
||||
import com.printcalculator.dto.OrderDto;
|
||||
import com.printcalculator.dto.OrderItemDto;
|
||||
import com.printcalculator.entity.Order;
|
||||
import com.printcalculator.entity.OrderItem;
|
||||
import com.printcalculator.entity.Payment;
|
||||
import com.printcalculator.entity.QuoteSession;
|
||||
import com.printcalculator.repository.OrderItemRepository;
|
||||
import com.printcalculator.repository.OrderRepository;
|
||||
import com.printcalculator.repository.PaymentRepository;
|
||||
import com.printcalculator.service.InvoicePdfRenderingService;
|
||||
import com.printcalculator.service.PaymentService;
|
||||
import com.printcalculator.service.QrBillService;
|
||||
import com.printcalculator.service.StorageService;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.http.ContentDisposition;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.InvalidPathException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/orders")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminOrderController {
|
||||
private static final List<String> ALLOWED_ORDER_STATUSES = List.of(
|
||||
"PENDING_PAYMENT",
|
||||
"PAID",
|
||||
"IN_PRODUCTION",
|
||||
"SHIPPED",
|
||||
"COMPLETED",
|
||||
"CANCELLED"
|
||||
);
|
||||
|
||||
private final OrderRepository orderRepo;
|
||||
private final OrderItemRepository orderItemRepo;
|
||||
private final PaymentRepository paymentRepo;
|
||||
private final PaymentService paymentService;
|
||||
private final StorageService storageService;
|
||||
private final InvoicePdfRenderingService invoiceService;
|
||||
private final QrBillService qrBillService;
|
||||
|
||||
public AdminOrderController(
|
||||
OrderRepository orderRepo,
|
||||
OrderItemRepository orderItemRepo,
|
||||
PaymentRepository paymentRepo,
|
||||
PaymentService paymentService,
|
||||
StorageService storageService,
|
||||
InvoicePdfRenderingService invoiceService,
|
||||
QrBillService qrBillService
|
||||
) {
|
||||
this.orderRepo = orderRepo;
|
||||
this.orderItemRepo = orderItemRepo;
|
||||
this.paymentRepo = paymentRepo;
|
||||
this.paymentService = paymentService;
|
||||
this.storageService = storageService;
|
||||
this.invoiceService = invoiceService;
|
||||
this.qrBillService = qrBillService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<OrderDto>> listOrders() {
|
||||
List<OrderDto> response = orderRepo.findAllByOrderByCreatedAtDesc()
|
||||
.stream()
|
||||
.map(this::toOrderDto)
|
||||
.toList();
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}")
|
||||
public ResponseEntity<OrderDto> getOrder(@PathVariable UUID orderId) {
|
||||
return ResponseEntity.ok(toOrderDto(getOrderOrThrow(orderId)));
|
||||
}
|
||||
|
||||
@PostMapping("/{orderId}/payments/confirm")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> confirmPayment(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestBody(required = false) Map<String, String> payload
|
||||
) {
|
||||
getOrderOrThrow(orderId);
|
||||
String method = payload != null ? payload.get("method") : null;
|
||||
paymentService.confirmPayment(orderId, method);
|
||||
return ResponseEntity.ok(toOrderDto(getOrderOrThrow(orderId)));
|
||||
}
|
||||
|
||||
@PostMapping("/{orderId}/status")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> updateOrderStatus(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestBody AdminOrderStatusUpdateRequest payload
|
||||
) {
|
||||
if (payload == null || payload.getStatus() == null || payload.getStatus().isBlank()) {
|
||||
throw new ResponseStatusException(org.springframework.http.HttpStatus.BAD_REQUEST, "Status is required");
|
||||
}
|
||||
|
||||
Order order = getOrderOrThrow(orderId);
|
||||
String normalizedStatus = payload.getStatus().trim().toUpperCase(Locale.ROOT);
|
||||
if (!ALLOWED_ORDER_STATUSES.contains(normalizedStatus)) {
|
||||
throw new ResponseStatusException(
|
||||
BAD_REQUEST,
|
||||
"Invalid order status. Allowed values: " + String.join(", ", ALLOWED_ORDER_STATUSES)
|
||||
);
|
||||
}
|
||||
order.setStatus(normalizedStatus);
|
||||
orderRepo.save(order);
|
||||
|
||||
return ResponseEntity.ok(toOrderDto(order));
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/items/{orderItemId}/file")
|
||||
public ResponseEntity<Resource> downloadOrderItemFile(
|
||||
@PathVariable UUID orderId,
|
||||
@PathVariable UUID orderItemId
|
||||
) {
|
||||
OrderItem item = orderItemRepo.findById(orderItemId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Order item not found"));
|
||||
|
||||
if (!item.getOrder().getId().equals(orderId)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "Order item not found for order");
|
||||
}
|
||||
|
||||
String relativePath = item.getStoredRelativePath();
|
||||
if (relativePath == null || relativePath.isBlank() || "PENDING".equals(relativePath)) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "File not available");
|
||||
}
|
||||
Path safeRelativePath = resolveOrderItemRelativePath(relativePath, orderId, orderItemId);
|
||||
if (safeRelativePath == null) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "File not available");
|
||||
}
|
||||
|
||||
try {
|
||||
Resource resource = storageService.loadAsResource(safeRelativePath);
|
||||
MediaType contentType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
if (item.getMimeType() != null && !item.getMimeType().isBlank()) {
|
||||
try {
|
||||
contentType = MediaType.parseMediaType(item.getMimeType());
|
||||
} catch (Exception ignored) {
|
||||
contentType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
}
|
||||
}
|
||||
|
||||
String filename = item.getOriginalFilename() != null && !item.getOriginalFilename().isBlank()
|
||||
? item.getOriginalFilename()
|
||||
: "order-item-" + orderItemId;
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(contentType)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment()
|
||||
.filename(filename, StandardCharsets.UTF_8)
|
||||
.build()
|
||||
.toString())
|
||||
.body(resource);
|
||||
} catch (Exception e) {
|
||||
throw new ResponseStatusException(NOT_FOUND, "File not available");
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/documents/confirmation")
|
||||
public ResponseEntity<byte[]> downloadOrderConfirmation(@PathVariable UUID orderId) {
|
||||
return generateDocument(getOrderOrThrow(orderId), true);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/documents/invoice")
|
||||
public ResponseEntity<byte[]> downloadOrderInvoice(@PathVariable UUID orderId) {
|
||||
return generateDocument(getOrderOrThrow(orderId), false);
|
||||
}
|
||||
|
||||
private Order getOrderOrThrow(UUID orderId) {
|
||||
return orderRepo.findById(orderId)
|
||||
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Order not found"));
|
||||
}
|
||||
|
||||
private OrderDto toOrderDto(Order order) {
|
||||
List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
|
||||
OrderDto dto = new OrderDto();
|
||||
dto.setId(order.getId());
|
||||
dto.setOrderNumber(getDisplayOrderNumber(order));
|
||||
dto.setStatus(order.getStatus());
|
||||
|
||||
paymentRepo.findByOrder_Id(order.getId()).ifPresent(p -> {
|
||||
dto.setPaymentStatus(p.getStatus());
|
||||
dto.setPaymentMethod(p.getMethod());
|
||||
});
|
||||
|
||||
dto.setCustomerEmail(order.getCustomerEmail());
|
||||
dto.setCustomerPhone(order.getCustomerPhone());
|
||||
dto.setPreferredLanguage(order.getPreferredLanguage());
|
||||
dto.setBillingCustomerType(order.getBillingCustomerType());
|
||||
dto.setCurrency(order.getCurrency());
|
||||
dto.setSetupCostChf(order.getSetupCostChf());
|
||||
dto.setShippingCostChf(order.getShippingCostChf());
|
||||
dto.setDiscountChf(order.getDiscountChf());
|
||||
dto.setSubtotalChf(order.getSubtotalChf());
|
||||
dto.setTotalChf(order.getTotalChf());
|
||||
dto.setCreatedAt(order.getCreatedAt());
|
||||
dto.setShippingSameAsBilling(order.getShippingSameAsBilling());
|
||||
QuoteSession sourceSession = order.getSourceQuoteSession();
|
||||
if (sourceSession != null) {
|
||||
dto.setPrintMaterialCode(sourceSession.getMaterialCode());
|
||||
dto.setPrintNozzleDiameterMm(sourceSession.getNozzleDiameterMm());
|
||||
dto.setPrintLayerHeightMm(sourceSession.getLayerHeightMm());
|
||||
dto.setPrintInfillPattern(sourceSession.getInfillPattern());
|
||||
dto.setPrintInfillPercent(sourceSession.getInfillPercent());
|
||||
dto.setPrintSupportsEnabled(sourceSession.getSupportsEnabled());
|
||||
}
|
||||
|
||||
AddressDto billing = new AddressDto();
|
||||
billing.setFirstName(order.getBillingFirstName());
|
||||
billing.setLastName(order.getBillingLastName());
|
||||
billing.setCompanyName(order.getBillingCompanyName());
|
||||
billing.setContactPerson(order.getBillingContactPerson());
|
||||
billing.setAddressLine1(order.getBillingAddressLine1());
|
||||
billing.setAddressLine2(order.getBillingAddressLine2());
|
||||
billing.setZip(order.getBillingZip());
|
||||
billing.setCity(order.getBillingCity());
|
||||
billing.setCountryCode(order.getBillingCountryCode());
|
||||
dto.setBillingAddress(billing);
|
||||
|
||||
if (!Boolean.TRUE.equals(order.getShippingSameAsBilling())) {
|
||||
AddressDto shipping = new AddressDto();
|
||||
shipping.setFirstName(order.getShippingFirstName());
|
||||
shipping.setLastName(order.getShippingLastName());
|
||||
shipping.setCompanyName(order.getShippingCompanyName());
|
||||
shipping.setContactPerson(order.getShippingContactPerson());
|
||||
shipping.setAddressLine1(order.getShippingAddressLine1());
|
||||
shipping.setAddressLine2(order.getShippingAddressLine2());
|
||||
shipping.setZip(order.getShippingZip());
|
||||
shipping.setCity(order.getShippingCity());
|
||||
shipping.setCountryCode(order.getShippingCountryCode());
|
||||
dto.setShippingAddress(shipping);
|
||||
}
|
||||
|
||||
List<OrderItemDto> itemDtos = items.stream().map(i -> {
|
||||
OrderItemDto idto = new OrderItemDto();
|
||||
idto.setId(i.getId());
|
||||
idto.setOriginalFilename(i.getOriginalFilename());
|
||||
idto.setMaterialCode(i.getMaterialCode());
|
||||
idto.setColorCode(i.getColorCode());
|
||||
idto.setQuantity(i.getQuantity());
|
||||
idto.setPrintTimeSeconds(i.getPrintTimeSeconds());
|
||||
idto.setMaterialGrams(i.getMaterialGrams());
|
||||
idto.setUnitPriceChf(i.getUnitPriceChf());
|
||||
idto.setLineTotalChf(i.getLineTotalChf());
|
||||
return idto;
|
||||
}).toList();
|
||||
dto.setItems(itemDtos);
|
||||
|
||||
return dto;
|
||||
}
|
||||
|
||||
private String getDisplayOrderNumber(Order order) {
|
||||
String orderNumber = order.getOrderNumber();
|
||||
if (orderNumber != null && !orderNumber.isBlank()) {
|
||||
return orderNumber;
|
||||
}
|
||||
return order.getId() != null ? order.getId().toString() : "unknown";
|
||||
}
|
||||
|
||||
private ResponseEntity<byte[]> generateDocument(Order order, boolean isConfirmation) {
|
||||
String displayOrderNumber = getDisplayOrderNumber(order);
|
||||
if (isConfirmation) {
|
||||
Path relativePath = buildConfirmationPdfRelativePath(order.getId(), displayOrderNumber);
|
||||
try {
|
||||
byte[] existingPdf = storageService.loadAsResource(relativePath).getInputStream().readAllBytes();
|
||||
return ResponseEntity.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"confirmation-" + displayOrderNumber + ".pdf\"")
|
||||
.contentType(MediaType.APPLICATION_PDF)
|
||||
.body(existingPdf);
|
||||
} catch (Exception ignored) {
|
||||
// fallback to generated confirmation document
|
||||
}
|
||||
}
|
||||
|
||||
List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
|
||||
Payment payment = paymentRepo.findByOrder_Id(order.getId()).orElse(null);
|
||||
byte[] pdf = invoiceService.generateDocumentPdf(order, items, isConfirmation, qrBillService, payment);
|
||||
|
||||
String prefix = isConfirmation ? "confirmation-" : "invoice-";
|
||||
return ResponseEntity.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + prefix + displayOrderNumber + ".pdf\"")
|
||||
.contentType(MediaType.APPLICATION_PDF)
|
||||
.body(pdf);
|
||||
}
|
||||
|
||||
private Path resolveOrderItemRelativePath(String storedRelativePath, UUID orderId, UUID orderItemId) {
|
||||
try {
|
||||
Path candidate = Path.of(storedRelativePath).normalize();
|
||||
if (candidate.isAbsolute()) {
|
||||
return null;
|
||||
}
|
||||
Path expectedPrefix = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString());
|
||||
if (!candidate.startsWith(expectedPrefix)) {
|
||||
return null;
|
||||
}
|
||||
return candidate;
|
||||
} catch (InvalidPathException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private Path buildConfirmationPdfRelativePath(UUID orderId, String orderNumber) {
|
||||
return Path.of("orders", orderId.toString(), "documents", "confirmation-" + orderNumber + ".pdf");
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AddressDto {
|
||||
private String firstName;
|
||||
private String lastName;
|
||||
private String companyName;
|
||||
private String contactPerson;
|
||||
private String addressLine1;
|
||||
private String addressLine2;
|
||||
private String zip;
|
||||
private String city;
|
||||
private String countryCode;
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminContactRequestAttachmentDto {
|
||||
private UUID id;
|
||||
private String originalFilename;
|
||||
private String mimeType;
|
||||
private Long fileSizeBytes;
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
|
||||
public void setOriginalFilename(String originalFilename) {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public String getMimeType() {
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
public void setMimeType(String mimeType) {
|
||||
this.mimeType = mimeType;
|
||||
}
|
||||
|
||||
public Long getFileSizeBytes() {
|
||||
return fileSizeBytes;
|
||||
}
|
||||
|
||||
public void setFileSizeBytes(Long fileSizeBytes) {
|
||||
this.fileSizeBytes = fileSizeBytes;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -1,125 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminContactRequestDetailDto {
|
||||
private UUID id;
|
||||
private String requestType;
|
||||
private String customerType;
|
||||
private String email;
|
||||
private String phone;
|
||||
private String name;
|
||||
private String companyName;
|
||||
private String contactPerson;
|
||||
private String message;
|
||||
private String status;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime updatedAt;
|
||||
private List<AdminContactRequestAttachmentDto> attachments;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getRequestType() {
|
||||
return requestType;
|
||||
}
|
||||
|
||||
public void setRequestType(String requestType) {
|
||||
this.requestType = requestType;
|
||||
}
|
||||
|
||||
public String getCustomerType() {
|
||||
return customerType;
|
||||
}
|
||||
|
||||
public void setCustomerType(String customerType) {
|
||||
this.customerType = customerType;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(String phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getCompanyName() {
|
||||
return companyName;
|
||||
}
|
||||
|
||||
public void setCompanyName(String companyName) {
|
||||
this.companyName = companyName;
|
||||
}
|
||||
|
||||
public String getContactPerson() {
|
||||
return contactPerson;
|
||||
}
|
||||
|
||||
public void setContactPerson(String contactPerson) {
|
||||
this.contactPerson = contactPerson;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
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 List<AdminContactRequestAttachmentDto> getAttachments() {
|
||||
return attachments;
|
||||
}
|
||||
|
||||
public void setAttachments(List<AdminContactRequestAttachmentDto> attachments) {
|
||||
this.attachments = attachments;
|
||||
}
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminContactRequestDto {
|
||||
private UUID id;
|
||||
private String requestType;
|
||||
private String customerType;
|
||||
private String email;
|
||||
private String phone;
|
||||
private String name;
|
||||
private String companyName;
|
||||
private String status;
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getRequestType() {
|
||||
return requestType;
|
||||
}
|
||||
|
||||
public void setRequestType(String requestType) {
|
||||
this.requestType = requestType;
|
||||
}
|
||||
|
||||
public String getCustomerType() {
|
||||
return customerType;
|
||||
}
|
||||
|
||||
public void setCustomerType(String customerType) {
|
||||
this.customerType = customerType;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(String phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getCompanyName() {
|
||||
return companyName;
|
||||
}
|
||||
|
||||
public void setCompanyName(String companyName) {
|
||||
this.companyName = companyName;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
public class AdminFilamentMaterialTypeDto {
|
||||
private Long id;
|
||||
private String materialCode;
|
||||
private Boolean isFlexible;
|
||||
private Boolean isTechnical;
|
||||
private String technicalTypeLabel;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public Boolean getIsFlexible() {
|
||||
return isFlexible;
|
||||
}
|
||||
|
||||
public void setIsFlexible(Boolean isFlexible) {
|
||||
this.isFlexible = isFlexible;
|
||||
}
|
||||
|
||||
public Boolean getIsTechnical() {
|
||||
return isTechnical;
|
||||
}
|
||||
|
||||
public void setIsTechnical(Boolean isTechnical) {
|
||||
this.isTechnical = isTechnical;
|
||||
}
|
||||
|
||||
public String getTechnicalTypeLabel() {
|
||||
return technicalTypeLabel;
|
||||
}
|
||||
|
||||
public void setTechnicalTypeLabel(String technicalTypeLabel) {
|
||||
this.technicalTypeLabel = technicalTypeLabel;
|
||||
}
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class AdminFilamentStockDto {
|
||||
private Long filamentVariantId;
|
||||
private String materialCode;
|
||||
private String variantDisplayName;
|
||||
private String colorName;
|
||||
private BigDecimal stockSpools;
|
||||
private BigDecimal spoolNetKg;
|
||||
private BigDecimal stockKg;
|
||||
private BigDecimal stockFilamentGrams;
|
||||
private Boolean active;
|
||||
|
||||
public Long getFilamentVariantId() {
|
||||
return filamentVariantId;
|
||||
}
|
||||
|
||||
public void setFilamentVariantId(Long filamentVariantId) {
|
||||
this.filamentVariantId = filamentVariantId;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getVariantDisplayName() {
|
||||
return variantDisplayName;
|
||||
}
|
||||
|
||||
public void setVariantDisplayName(String variantDisplayName) {
|
||||
this.variantDisplayName = variantDisplayName;
|
||||
}
|
||||
|
||||
public String getColorName() {
|
||||
return colorName;
|
||||
}
|
||||
|
||||
public void setColorName(String colorName) {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public BigDecimal getStockSpools() {
|
||||
return stockSpools;
|
||||
}
|
||||
|
||||
public void setStockSpools(BigDecimal stockSpools) {
|
||||
this.stockSpools = stockSpools;
|
||||
}
|
||||
|
||||
public BigDecimal getSpoolNetKg() {
|
||||
return spoolNetKg;
|
||||
}
|
||||
|
||||
public void setSpoolNetKg(BigDecimal spoolNetKg) {
|
||||
this.spoolNetKg = spoolNetKg;
|
||||
}
|
||||
|
||||
public BigDecimal getStockKg() {
|
||||
return stockKg;
|
||||
}
|
||||
|
||||
public void setStockKg(BigDecimal stockKg) {
|
||||
this.stockKg = stockKg;
|
||||
}
|
||||
|
||||
public BigDecimal getStockFilamentGrams() {
|
||||
return stockFilamentGrams;
|
||||
}
|
||||
|
||||
public void setStockFilamentGrams(BigDecimal stockFilamentGrams) {
|
||||
this.stockFilamentGrams = stockFilamentGrams;
|
||||
}
|
||||
|
||||
public Boolean getActive() {
|
||||
return active;
|
||||
}
|
||||
|
||||
public void setActive(Boolean active) {
|
||||
this.active = active;
|
||||
}
|
||||
}
|
||||
@@ -1,187 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
public class AdminFilamentVariantDto {
|
||||
private Long id;
|
||||
private Long materialTypeId;
|
||||
private String materialCode;
|
||||
private Boolean materialIsFlexible;
|
||||
private Boolean materialIsTechnical;
|
||||
private String materialTechnicalTypeLabel;
|
||||
private String variantDisplayName;
|
||||
private String colorName;
|
||||
private String colorHex;
|
||||
private String finishType;
|
||||
private String brand;
|
||||
private Boolean isMatte;
|
||||
private Boolean isSpecial;
|
||||
private BigDecimal costChfPerKg;
|
||||
private BigDecimal stockSpools;
|
||||
private BigDecimal spoolNetKg;
|
||||
private BigDecimal stockKg;
|
||||
private BigDecimal stockFilamentGrams;
|
||||
private Boolean isActive;
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getMaterialTypeId() {
|
||||
return materialTypeId;
|
||||
}
|
||||
|
||||
public void setMaterialTypeId(Long materialTypeId) {
|
||||
this.materialTypeId = materialTypeId;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public Boolean getMaterialIsFlexible() {
|
||||
return materialIsFlexible;
|
||||
}
|
||||
|
||||
public void setMaterialIsFlexible(Boolean materialIsFlexible) {
|
||||
this.materialIsFlexible = materialIsFlexible;
|
||||
}
|
||||
|
||||
public Boolean getMaterialIsTechnical() {
|
||||
return materialIsTechnical;
|
||||
}
|
||||
|
||||
public void setMaterialIsTechnical(Boolean materialIsTechnical) {
|
||||
this.materialIsTechnical = materialIsTechnical;
|
||||
}
|
||||
|
||||
public String getMaterialTechnicalTypeLabel() {
|
||||
return materialTechnicalTypeLabel;
|
||||
}
|
||||
|
||||
public void setMaterialTechnicalTypeLabel(String materialTechnicalTypeLabel) {
|
||||
this.materialTechnicalTypeLabel = materialTechnicalTypeLabel;
|
||||
}
|
||||
|
||||
public String getVariantDisplayName() {
|
||||
return variantDisplayName;
|
||||
}
|
||||
|
||||
public void setVariantDisplayName(String variantDisplayName) {
|
||||
this.variantDisplayName = variantDisplayName;
|
||||
}
|
||||
|
||||
public String getColorName() {
|
||||
return colorName;
|
||||
}
|
||||
|
||||
public void setColorName(String colorName) {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorHex() {
|
||||
return colorHex;
|
||||
}
|
||||
|
||||
public void setColorHex(String colorHex) {
|
||||
this.colorHex = colorHex;
|
||||
}
|
||||
|
||||
public String getFinishType() {
|
||||
return finishType;
|
||||
}
|
||||
|
||||
public void setFinishType(String finishType) {
|
||||
this.finishType = finishType;
|
||||
}
|
||||
|
||||
public String getBrand() {
|
||||
return brand;
|
||||
}
|
||||
|
||||
public void setBrand(String brand) {
|
||||
this.brand = brand;
|
||||
}
|
||||
|
||||
public Boolean getIsMatte() {
|
||||
return isMatte;
|
||||
}
|
||||
|
||||
public void setIsMatte(Boolean isMatte) {
|
||||
this.isMatte = isMatte;
|
||||
}
|
||||
|
||||
public Boolean getIsSpecial() {
|
||||
return isSpecial;
|
||||
}
|
||||
|
||||
public void setIsSpecial(Boolean isSpecial) {
|
||||
this.isSpecial = isSpecial;
|
||||
}
|
||||
|
||||
public BigDecimal getCostChfPerKg() {
|
||||
return costChfPerKg;
|
||||
}
|
||||
|
||||
public void setCostChfPerKg(BigDecimal costChfPerKg) {
|
||||
this.costChfPerKg = costChfPerKg;
|
||||
}
|
||||
|
||||
public BigDecimal getStockSpools() {
|
||||
return stockSpools;
|
||||
}
|
||||
|
||||
public void setStockSpools(BigDecimal stockSpools) {
|
||||
this.stockSpools = stockSpools;
|
||||
}
|
||||
|
||||
public BigDecimal getSpoolNetKg() {
|
||||
return spoolNetKg;
|
||||
}
|
||||
|
||||
public void setSpoolNetKg(BigDecimal spoolNetKg) {
|
||||
this.spoolNetKg = spoolNetKg;
|
||||
}
|
||||
|
||||
public BigDecimal getStockKg() {
|
||||
return stockKg;
|
||||
}
|
||||
|
||||
public void setStockKg(BigDecimal stockKg) {
|
||||
this.stockKg = stockKg;
|
||||
}
|
||||
|
||||
public BigDecimal getStockFilamentGrams() {
|
||||
return stockFilamentGrams;
|
||||
}
|
||||
|
||||
public void setStockFilamentGrams(BigDecimal stockFilamentGrams) {
|
||||
this.stockFilamentGrams = stockFilamentGrams;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean isActive) {
|
||||
this.isActive = isActive;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
public class AdminLoginRequest {
|
||||
|
||||
@NotBlank
|
||||
private String password;
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
public class AdminOrderStatusUpdateRequest {
|
||||
private String status;
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminQuoteSessionDto {
|
||||
private UUID id;
|
||||
private String status;
|
||||
private String materialCode;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime expiresAt;
|
||||
private UUID convertedOrderId;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getExpiresAt() {
|
||||
return expiresAt;
|
||||
}
|
||||
|
||||
public void setExpiresAt(OffsetDateTime expiresAt) {
|
||||
this.expiresAt = expiresAt;
|
||||
}
|
||||
|
||||
public UUID getConvertedOrderId() {
|
||||
return convertedOrderId;
|
||||
}
|
||||
|
||||
public void setConvertedOrderId(UUID convertedOrderId) {
|
||||
this.convertedOrderId = convertedOrderId;
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
public class AdminUpdateContactRequestStatusRequest {
|
||||
private String status;
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
public class AdminUpsertFilamentMaterialTypeRequest {
|
||||
private String materialCode;
|
||||
private Boolean isFlexible;
|
||||
private Boolean isTechnical;
|
||||
private String technicalTypeLabel;
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public Boolean getIsFlexible() {
|
||||
return isFlexible;
|
||||
}
|
||||
|
||||
public void setIsFlexible(Boolean isFlexible) {
|
||||
this.isFlexible = isFlexible;
|
||||
}
|
||||
|
||||
public Boolean getIsTechnical() {
|
||||
return isTechnical;
|
||||
}
|
||||
|
||||
public void setIsTechnical(Boolean isTechnical) {
|
||||
this.isTechnical = isTechnical;
|
||||
}
|
||||
|
||||
public String getTechnicalTypeLabel() {
|
||||
return technicalTypeLabel;
|
||||
}
|
||||
|
||||
public void setTechnicalTypeLabel(String technicalTypeLabel) {
|
||||
this.technicalTypeLabel = technicalTypeLabel;
|
||||
}
|
||||
}
|
||||
@@ -1,114 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class AdminUpsertFilamentVariantRequest {
|
||||
private Long materialTypeId;
|
||||
private String variantDisplayName;
|
||||
private String colorName;
|
||||
private String colorHex;
|
||||
private String finishType;
|
||||
private String brand;
|
||||
private Boolean isMatte;
|
||||
private Boolean isSpecial;
|
||||
private BigDecimal costChfPerKg;
|
||||
private BigDecimal stockSpools;
|
||||
private BigDecimal spoolNetKg;
|
||||
private Boolean isActive;
|
||||
|
||||
public Long getMaterialTypeId() {
|
||||
return materialTypeId;
|
||||
}
|
||||
|
||||
public void setMaterialTypeId(Long materialTypeId) {
|
||||
this.materialTypeId = materialTypeId;
|
||||
}
|
||||
|
||||
public String getVariantDisplayName() {
|
||||
return variantDisplayName;
|
||||
}
|
||||
|
||||
public void setVariantDisplayName(String variantDisplayName) {
|
||||
this.variantDisplayName = variantDisplayName;
|
||||
}
|
||||
|
||||
public String getColorName() {
|
||||
return colorName;
|
||||
}
|
||||
|
||||
public void setColorName(String colorName) {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorHex() {
|
||||
return colorHex;
|
||||
}
|
||||
|
||||
public void setColorHex(String colorHex) {
|
||||
this.colorHex = colorHex;
|
||||
}
|
||||
|
||||
public String getFinishType() {
|
||||
return finishType;
|
||||
}
|
||||
|
||||
public void setFinishType(String finishType) {
|
||||
this.finishType = finishType;
|
||||
}
|
||||
|
||||
public String getBrand() {
|
||||
return brand;
|
||||
}
|
||||
|
||||
public void setBrand(String brand) {
|
||||
this.brand = brand;
|
||||
}
|
||||
|
||||
public Boolean getIsMatte() {
|
||||
return isMatte;
|
||||
}
|
||||
|
||||
public void setIsMatte(Boolean isMatte) {
|
||||
this.isMatte = isMatte;
|
||||
}
|
||||
|
||||
public Boolean getIsSpecial() {
|
||||
return isSpecial;
|
||||
}
|
||||
|
||||
public void setIsSpecial(Boolean isSpecial) {
|
||||
this.isSpecial = isSpecial;
|
||||
}
|
||||
|
||||
public BigDecimal getCostChfPerKg() {
|
||||
return costChfPerKg;
|
||||
}
|
||||
|
||||
public void setCostChfPerKg(BigDecimal costChfPerKg) {
|
||||
this.costChfPerKg = costChfPerKg;
|
||||
}
|
||||
|
||||
public BigDecimal getStockSpools() {
|
||||
return stockSpools;
|
||||
}
|
||||
|
||||
public void setStockSpools(BigDecimal stockSpools) {
|
||||
this.stockSpools = stockSpools;
|
||||
}
|
||||
|
||||
public BigDecimal getSpoolNetKg() {
|
||||
return spoolNetKg;
|
||||
}
|
||||
|
||||
public void setSpoolNetKg(BigDecimal spoolNetKg) {
|
||||
this.spoolNetKg = spoolNetKg;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean isActive) {
|
||||
this.isActive = isActive;
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import jakarta.validation.constraints.AssertTrue;
|
||||
|
||||
@Data
|
||||
public class CreateOrderRequest {
|
||||
private CustomerDto customer;
|
||||
private AddressDto billingAddress;
|
||||
private AddressDto shippingAddress;
|
||||
private String language;
|
||||
private boolean shippingSameAsBilling;
|
||||
|
||||
@AssertTrue(message = "L'accettazione dei Termini e Condizioni e obbligatoria.")
|
||||
private boolean acceptTerms;
|
||||
|
||||
@AssertTrue(message = "L'accettazione dell'Informativa Privacy e obbligatoria.")
|
||||
private boolean acceptPrivacy;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CustomerDto {
|
||||
private String email;
|
||||
private String phone;
|
||||
private String customerType; // "PRIVATE", "BUSINESS"
|
||||
}
|
||||
@@ -10,16 +10,7 @@ public record OptionsResponse(
|
||||
List<NozzleOptionDTO> nozzleDiameters
|
||||
) {
|
||||
public record MaterialOption(String code, String label, List<VariantOption> variants) {}
|
||||
public record VariantOption(
|
||||
Long id,
|
||||
String name,
|
||||
String colorName,
|
||||
String hexColor,
|
||||
String finishType,
|
||||
Double stockSpools,
|
||||
Double stockFilamentGrams,
|
||||
boolean isOutOfStock
|
||||
) {}
|
||||
public record VariantOption(String name, String colorName, String hexColor, boolean isOutOfStock) {}
|
||||
public record QualityOption(String id, String label) {}
|
||||
public record InfillPatternOption(String id, String label) {}
|
||||
public record LayerHeightOptionDTO(double value, String label) {}
|
||||
|
||||
@@ -1,114 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class OrderDto {
|
||||
private UUID id;
|
||||
private String orderNumber;
|
||||
private String status;
|
||||
private String paymentStatus;
|
||||
private String paymentMethod;
|
||||
private String customerEmail;
|
||||
private String customerPhone;
|
||||
private String preferredLanguage;
|
||||
private String billingCustomerType;
|
||||
private AddressDto billingAddress;
|
||||
private AddressDto shippingAddress;
|
||||
private Boolean shippingSameAsBilling;
|
||||
private String currency;
|
||||
private BigDecimal setupCostChf;
|
||||
private BigDecimal shippingCostChf;
|
||||
private BigDecimal discountChf;
|
||||
private BigDecimal subtotalChf;
|
||||
private BigDecimal totalChf;
|
||||
private OffsetDateTime createdAt;
|
||||
private String printMaterialCode;
|
||||
private BigDecimal printNozzleDiameterMm;
|
||||
private BigDecimal printLayerHeightMm;
|
||||
private String printInfillPattern;
|
||||
private Integer printInfillPercent;
|
||||
private Boolean printSupportsEnabled;
|
||||
private List<OrderItemDto> items;
|
||||
|
||||
// Getters and Setters
|
||||
public UUID getId() { return id; }
|
||||
public void setId(UUID id) { this.id = id; }
|
||||
|
||||
public String getOrderNumber() { return orderNumber; }
|
||||
public void setOrderNumber(String orderNumber) { this.orderNumber = orderNumber; }
|
||||
|
||||
public String getStatus() { return status; }
|
||||
public void setStatus(String status) { this.status = status; }
|
||||
|
||||
public String getPaymentStatus() { return paymentStatus; }
|
||||
public void setPaymentStatus(String paymentStatus) { this.paymentStatus = paymentStatus; }
|
||||
|
||||
public String getPaymentMethod() { return paymentMethod; }
|
||||
public void setPaymentMethod(String paymentMethod) { this.paymentMethod = paymentMethod; }
|
||||
|
||||
public String getCustomerEmail() { return customerEmail; }
|
||||
public void setCustomerEmail(String customerEmail) { this.customerEmail = customerEmail; }
|
||||
|
||||
public String getCustomerPhone() { return customerPhone; }
|
||||
public void setCustomerPhone(String customerPhone) { this.customerPhone = customerPhone; }
|
||||
|
||||
public String getPreferredLanguage() { return preferredLanguage; }
|
||||
public void setPreferredLanguage(String preferredLanguage) { this.preferredLanguage = preferredLanguage; }
|
||||
|
||||
public String getBillingCustomerType() { return billingCustomerType; }
|
||||
public void setBillingCustomerType(String billingCustomerType) { this.billingCustomerType = billingCustomerType; }
|
||||
|
||||
public AddressDto getBillingAddress() { return billingAddress; }
|
||||
public void setBillingAddress(AddressDto billingAddress) { this.billingAddress = billingAddress; }
|
||||
|
||||
public AddressDto getShippingAddress() { return shippingAddress; }
|
||||
public void setShippingAddress(AddressDto shippingAddress) { this.shippingAddress = shippingAddress; }
|
||||
|
||||
public Boolean getShippingSameAsBilling() { return shippingSameAsBilling; }
|
||||
public void setShippingSameAsBilling(Boolean shippingSameAsBilling) { this.shippingSameAsBilling = shippingSameAsBilling; }
|
||||
|
||||
public String getCurrency() { return currency; }
|
||||
public void setCurrency(String currency) { this.currency = currency; }
|
||||
|
||||
public BigDecimal getSetupCostChf() { return setupCostChf; }
|
||||
public void setSetupCostChf(BigDecimal setupCostChf) { this.setupCostChf = setupCostChf; }
|
||||
|
||||
public BigDecimal getShippingCostChf() { return shippingCostChf; }
|
||||
public void setShippingCostChf(BigDecimal shippingCostChf) { this.shippingCostChf = shippingCostChf; }
|
||||
|
||||
public BigDecimal getDiscountChf() { return discountChf; }
|
||||
public void setDiscountChf(BigDecimal discountChf) { this.discountChf = discountChf; }
|
||||
|
||||
public BigDecimal getSubtotalChf() { return subtotalChf; }
|
||||
public void setSubtotalChf(BigDecimal subtotalChf) { this.subtotalChf = subtotalChf; }
|
||||
|
||||
public BigDecimal getTotalChf() { return totalChf; }
|
||||
public void setTotalChf(BigDecimal totalChf) { this.totalChf = totalChf; }
|
||||
|
||||
public OffsetDateTime getCreatedAt() { return createdAt; }
|
||||
public void setCreatedAt(OffsetDateTime createdAt) { this.createdAt = createdAt; }
|
||||
|
||||
public String getPrintMaterialCode() { return printMaterialCode; }
|
||||
public void setPrintMaterialCode(String printMaterialCode) { this.printMaterialCode = printMaterialCode; }
|
||||
|
||||
public BigDecimal getPrintNozzleDiameterMm() { return printNozzleDiameterMm; }
|
||||
public void setPrintNozzleDiameterMm(BigDecimal printNozzleDiameterMm) { this.printNozzleDiameterMm = printNozzleDiameterMm; }
|
||||
|
||||
public BigDecimal getPrintLayerHeightMm() { return printLayerHeightMm; }
|
||||
public void setPrintLayerHeightMm(BigDecimal printLayerHeightMm) { this.printLayerHeightMm = printLayerHeightMm; }
|
||||
|
||||
public String getPrintInfillPattern() { return printInfillPattern; }
|
||||
public void setPrintInfillPattern(String printInfillPattern) { this.printInfillPattern = printInfillPattern; }
|
||||
|
||||
public Integer getPrintInfillPercent() { return printInfillPercent; }
|
||||
public void setPrintInfillPercent(Integer printInfillPercent) { this.printInfillPercent = printInfillPercent; }
|
||||
|
||||
public Boolean getPrintSupportsEnabled() { return printSupportsEnabled; }
|
||||
public void setPrintSupportsEnabled(Boolean printSupportsEnabled) { this.printSupportsEnabled = printSupportsEnabled; }
|
||||
|
||||
public List<OrderItemDto> getItems() { return items; }
|
||||
public void setItems(List<OrderItemDto> items) { this.items = items; }
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.UUID;
|
||||
|
||||
public class OrderItemDto {
|
||||
private UUID id;
|
||||
private String originalFilename;
|
||||
private String materialCode;
|
||||
private String colorCode;
|
||||
private Integer quantity;
|
||||
private Integer printTimeSeconds;
|
||||
private BigDecimal materialGrams;
|
||||
private BigDecimal unitPriceChf;
|
||||
private BigDecimal lineTotalChf;
|
||||
|
||||
// Getters and Setters
|
||||
public UUID getId() { return id; }
|
||||
public void setId(UUID id) { this.id = id; }
|
||||
|
||||
public String getOriginalFilename() { return originalFilename; }
|
||||
public void setOriginalFilename(String originalFilename) { this.originalFilename = originalFilename; }
|
||||
|
||||
public String getMaterialCode() { return materialCode; }
|
||||
public void setMaterialCode(String materialCode) { this.materialCode = materialCode; }
|
||||
|
||||
public String getColorCode() { return colorCode; }
|
||||
public void setColorCode(String colorCode) { this.colorCode = colorCode; }
|
||||
|
||||
public Integer getQuantity() { return quantity; }
|
||||
public void setQuantity(Integer quantity) { this.quantity = quantity; }
|
||||
|
||||
public Integer getPrintTimeSeconds() { return printTimeSeconds; }
|
||||
public void setPrintTimeSeconds(Integer printTimeSeconds) { this.printTimeSeconds = printTimeSeconds; }
|
||||
|
||||
public BigDecimal getMaterialGrams() { return materialGrams; }
|
||||
public void setMaterialGrams(BigDecimal materialGrams) { this.materialGrams = materialGrams; }
|
||||
|
||||
public BigDecimal getUnitPriceChf() { return unitPriceChf; }
|
||||
public void setUnitPriceChf(BigDecimal unitPriceChf) { this.unitPriceChf = unitPriceChf; }
|
||||
|
||||
public BigDecimal getLineTotalChf() { return lineTotalChf; }
|
||||
public void setLineTotalChf(BigDecimal lineTotalChf) { this.lineTotalChf = lineTotalChf; }
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PrintSettingsDto {
|
||||
// Mode: "BASIC" or "ADVANCED"
|
||||
private String complexityMode;
|
||||
|
||||
// Common
|
||||
private String material; // e.g. "PLA", "PLA TOUGH", "PETG"
|
||||
private String color; // e.g. "White", "#FFFFFF"
|
||||
private Long filamentVariantId;
|
||||
private Long printerMachineId;
|
||||
|
||||
// Basic Mode
|
||||
private String quality; // "draft", "standard", "high"
|
||||
|
||||
// Advanced Mode (Optional in Basic)
|
||||
private Double nozzleDiameter;
|
||||
private Double layerHeight;
|
||||
private Double infillDensity;
|
||||
private String infillPattern;
|
||||
private Boolean supportsEnabled;
|
||||
private String notes;
|
||||
|
||||
// Dimensions
|
||||
private Double boundingBoxX;
|
||||
private Double boundingBoxY;
|
||||
private Double boundingBoxZ;
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import jakarta.validation.constraints.AssertTrue;
|
||||
|
||||
@Data
|
||||
public class QuoteRequestDto {
|
||||
private String requestType; // "PRINT_SERVICE" or "DESIGN_SERVICE"
|
||||
private String customerType; // "PRIVATE" or "BUSINESS"
|
||||
private String email;
|
||||
private String phone;
|
||||
private String name;
|
||||
private String companyName;
|
||||
private String contactPerson;
|
||||
private String message;
|
||||
|
||||
@AssertTrue(message = "L'accettazione dei Termini e Condizioni e obbligatoria.")
|
||||
private boolean acceptTerms;
|
||||
|
||||
@AssertTrue(message = "L'accettazione dell'Informativa Privacy e obbligatoria.")
|
||||
private boolean acceptPrivacy;
|
||||
}
|
||||
@@ -1,149 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "custom_quote_requests", indexes = {@Index(name = "ix_custom_quote_requests_status",
|
||||
columnList = "status")})
|
||||
public class CustomQuoteRequest {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "request_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "request_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String requestType;
|
||||
|
||||
@Column(name = "customer_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String customerType;
|
||||
|
||||
@Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String email;
|
||||
|
||||
@Column(name = "phone", length = Integer.MAX_VALUE)
|
||||
private String phone;
|
||||
|
||||
@Column(name = "name", length = Integer.MAX_VALUE)
|
||||
private String name;
|
||||
|
||||
@Column(name = "company_name", length = Integer.MAX_VALUE)
|
||||
private String companyName;
|
||||
|
||||
@Column(name = "contact_person", length = Integer.MAX_VALUE)
|
||||
private String contactPerson;
|
||||
|
||||
@Column(name = "message", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String message;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getRequestType() {
|
||||
return requestType;
|
||||
}
|
||||
|
||||
public void setRequestType(String requestType) {
|
||||
this.requestType = requestType;
|
||||
}
|
||||
|
||||
public String getCustomerType() {
|
||||
return customerType;
|
||||
}
|
||||
|
||||
public void setCustomerType(String customerType) {
|
||||
this.customerType = customerType;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(String phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getCompanyName() {
|
||||
return companyName;
|
||||
}
|
||||
|
||||
public void setCompanyName(String companyName) {
|
||||
this.companyName = companyName;
|
||||
}
|
||||
|
||||
public String getContactPerson() {
|
||||
return contactPerson;
|
||||
}
|
||||
|
||||
public void setContactPerson(String contactPerson) {
|
||||
this.contactPerson = contactPerson;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
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 = "custom_quote_request_attachments", indexes = {@Index(name = "ix_custom_quote_attachments_request",
|
||||
columnList = "request_id")})
|
||||
public class CustomQuoteRequestAttachment {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "attachment_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@OnDelete(action = OnDeleteAction.CASCADE)
|
||||
@JoinColumn(name = "request_id", nullable = false)
|
||||
private CustomQuoteRequest request;
|
||||
|
||||
@Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String originalFilename;
|
||||
|
||||
@Column(name = "stored_relative_path", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String storedRelativePath;
|
||||
|
||||
@Column(name = "stored_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String storedFilename;
|
||||
|
||||
@Column(name = "file_size_bytes")
|
||||
private Long fileSizeBytes;
|
||||
|
||||
@Column(name = "mime_type", length = Integer.MAX_VALUE)
|
||||
private String mimeType;
|
||||
|
||||
@Column(name = "sha256_hex", length = Integer.MAX_VALUE)
|
||||
private String sha256Hex;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public CustomQuoteRequest getRequest() {
|
||||
return request;
|
||||
}
|
||||
|
||||
public void setRequest(CustomQuoteRequest request) {
|
||||
this.request = request;
|
||||
}
|
||||
|
||||
public String getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
|
||||
public void setOriginalFilename(String originalFilename) {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public String getStoredRelativePath() {
|
||||
return storedRelativePath;
|
||||
}
|
||||
|
||||
public void setStoredRelativePath(String storedRelativePath) {
|
||||
this.storedRelativePath = storedRelativePath;
|
||||
}
|
||||
|
||||
public String getStoredFilename() {
|
||||
return storedFilename;
|
||||
}
|
||||
|
||||
public void setStoredFilename(String storedFilename) {
|
||||
this.storedFilename = storedFilename;
|
||||
}
|
||||
|
||||
public Long getFileSizeBytes() {
|
||||
return fileSizeBytes;
|
||||
}
|
||||
|
||||
public void setFileSizeBytes(Long fileSizeBytes) {
|
||||
this.fileSizeBytes = fileSizeBytes;
|
||||
}
|
||||
|
||||
public String getMimeType() {
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
public void setMimeType(String mimeType) {
|
||||
this.mimeType = mimeType;
|
||||
}
|
||||
|
||||
public String getSha256Hex() {
|
||||
return sha256Hex;
|
||||
}
|
||||
|
||||
public void setSha256Hex(String sha256Hex) {
|
||||
this.sha256Hex = sha256Hex;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public void setCustomQuoteRequest(CustomQuoteRequest request) {
|
||||
}
|
||||
}
|
||||
@@ -1,126 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "customers")
|
||||
public class Customer {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "customer_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "customer_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String customerType;
|
||||
|
||||
@Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String email;
|
||||
|
||||
@Column(name = "phone", length = Integer.MAX_VALUE)
|
||||
private String phone;
|
||||
|
||||
@Column(name = "first_name", length = Integer.MAX_VALUE)
|
||||
private String firstName;
|
||||
|
||||
@Column(name = "last_name", length = Integer.MAX_VALUE)
|
||||
private String lastName;
|
||||
|
||||
@Column(name = "company_name", length = Integer.MAX_VALUE)
|
||||
private String companyName;
|
||||
|
||||
@Column(name = "contact_person", length = Integer.MAX_VALUE)
|
||||
private String contactPerson;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getCustomerType() {
|
||||
return customerType;
|
||||
}
|
||||
|
||||
public void setCustomerType(String customerType) {
|
||||
this.customerType = customerType;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public String getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(String phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
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 getCompanyName() {
|
||||
return companyName;
|
||||
}
|
||||
|
||||
public void setCompanyName(String companyName) {
|
||||
this.companyName = companyName;
|
||||
}
|
||||
|
||||
public String getContactPerson() {
|
||||
return contactPerson;
|
||||
}
|
||||
|
||||
public void setContactPerson(String contactPerson) {
|
||||
this.contactPerson = contactPerson;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -24,16 +24,6 @@ public class FilamentVariant {
|
||||
@Column(name = "color_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String colorName;
|
||||
|
||||
@Column(name = "color_hex", length = Integer.MAX_VALUE)
|
||||
private String colorHex;
|
||||
|
||||
@ColumnDefault("'GLOSSY'")
|
||||
@Column(name = "finish_type", length = Integer.MAX_VALUE)
|
||||
private String finishType;
|
||||
|
||||
@Column(name = "brand", length = Integer.MAX_VALUE)
|
||||
private String brand;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "is_matte", nullable = false)
|
||||
private Boolean isMatte;
|
||||
@@ -93,30 +83,6 @@ public class FilamentVariant {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorHex() {
|
||||
return colorHex;
|
||||
}
|
||||
|
||||
public void setColorHex(String colorHex) {
|
||||
this.colorHex = colorHex;
|
||||
}
|
||||
|
||||
public String getFinishType() {
|
||||
return finishType;
|
||||
}
|
||||
|
||||
public void setFinishType(String finishType) {
|
||||
this.finishType = finishType;
|
||||
}
|
||||
|
||||
public String getBrand() {
|
||||
return brand;
|
||||
}
|
||||
|
||||
public void setBrand(String brand) {
|
||||
this.brand = brand;
|
||||
}
|
||||
|
||||
public Boolean getIsMatte() {
|
||||
return isMatte;
|
||||
}
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
@Entity
|
||||
@Table(name = "filament_variant_orca_override", uniqueConstraints = {
|
||||
@UniqueConstraint(name = "ux_filament_variant_orca_override_variant_machine", columnNames = {
|
||||
"filament_variant_id", "printer_machine_profile_id"
|
||||
})
|
||||
})
|
||||
public class FilamentVariantOrcaOverride {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "filament_variant_orca_override_id", nullable = false)
|
||||
private Long id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "filament_variant_id", nullable = false)
|
||||
private FilamentVariant filamentVariant;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "printer_machine_profile_id", nullable = false)
|
||||
private PrinterMachineProfile printerMachineProfile;
|
||||
|
||||
@Column(name = "orca_filament_profile_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String orcaFilamentProfileName;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public FilamentVariant getFilamentVariant() {
|
||||
return filamentVariant;
|
||||
}
|
||||
|
||||
public void setFilamentVariant(FilamentVariant filamentVariant) {
|
||||
this.filamentVariant = filamentVariant;
|
||||
}
|
||||
|
||||
public PrinterMachineProfile getPrinterMachineProfile() {
|
||||
return printerMachineProfile;
|
||||
}
|
||||
|
||||
public void setPrinterMachineProfile(PrinterMachineProfile printerMachineProfile) {
|
||||
this.printerMachineProfile = printerMachineProfile;
|
||||
}
|
||||
|
||||
public String getOrcaFilamentProfileName() {
|
||||
return orcaFilamentProfileName;
|
||||
}
|
||||
|
||||
public void setOrcaFilamentProfileName(String orcaFilamentProfileName) {
|
||||
this.orcaFilamentProfileName = orcaFilamentProfileName;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean isActive) {
|
||||
this.isActive = isActive;
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
@Entity
|
||||
@Table(name = "material_orca_profile_map", uniqueConstraints = {
|
||||
@UniqueConstraint(name = "ux_material_orca_profile_map_machine_material", columnNames = {
|
||||
"printer_machine_profile_id", "filament_material_type_id"
|
||||
})
|
||||
})
|
||||
public class MaterialOrcaProfileMap {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "material_orca_profile_map_id", nullable = false)
|
||||
private Long id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "printer_machine_profile_id", nullable = false)
|
||||
private PrinterMachineProfile printerMachineProfile;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "filament_material_type_id", nullable = false)
|
||||
private FilamentMaterialType filamentMaterialType;
|
||||
|
||||
@Column(name = "orca_filament_profile_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String orcaFilamentProfileName;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public PrinterMachineProfile getPrinterMachineProfile() {
|
||||
return printerMachineProfile;
|
||||
}
|
||||
|
||||
public void setPrinterMachineProfile(PrinterMachineProfile printerMachineProfile) {
|
||||
this.printerMachineProfile = printerMachineProfile;
|
||||
}
|
||||
|
||||
public FilamentMaterialType getFilamentMaterialType() {
|
||||
return filamentMaterialType;
|
||||
}
|
||||
|
||||
public void setFilamentMaterialType(FilamentMaterialType filamentMaterialType) {
|
||||
this.filamentMaterialType = filamentMaterialType;
|
||||
}
|
||||
|
||||
public String getOrcaFilamentProfileName() {
|
||||
return orcaFilamentProfileName;
|
||||
}
|
||||
|
||||
public void setOrcaFilamentProfileName(String orcaFilamentProfileName) {
|
||||
this.orcaFilamentProfileName = orcaFilamentProfileName;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean isActive) {
|
||||
this.isActive = isActive;
|
||||
}
|
||||
}
|
||||
@@ -1,435 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "orders", indexes = {@Index(name = "ix_orders_status",
|
||||
columnList = "status")})
|
||||
public class Order {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "order_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "source_quote_session_id")
|
||||
private QuoteSession sourceQuoteSession;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "customer_id")
|
||||
private Customer customer;
|
||||
|
||||
@Column(name = "customer_email", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String customerEmail;
|
||||
|
||||
@Column(name = "customer_phone", length = Integer.MAX_VALUE)
|
||||
private String customerPhone;
|
||||
|
||||
@Column(name = "billing_customer_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String billingCustomerType;
|
||||
|
||||
@Column(name = "billing_first_name", length = Integer.MAX_VALUE)
|
||||
private String billingFirstName;
|
||||
|
||||
@Column(name = "billing_last_name", length = Integer.MAX_VALUE)
|
||||
private String billingLastName;
|
||||
|
||||
@Column(name = "billing_company_name", length = Integer.MAX_VALUE)
|
||||
private String billingCompanyName;
|
||||
|
||||
@Column(name = "billing_contact_person", length = Integer.MAX_VALUE)
|
||||
private String billingContactPerson;
|
||||
|
||||
@Column(name = "billing_address_line1", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String billingAddressLine1;
|
||||
|
||||
@Column(name = "billing_address_line2", length = Integer.MAX_VALUE)
|
||||
private String billingAddressLine2;
|
||||
|
||||
@Column(name = "billing_zip", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String billingZip;
|
||||
|
||||
@Column(name = "billing_city", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String billingCity;
|
||||
|
||||
@ColumnDefault("'CH'")
|
||||
@Column(name = "billing_country_code", nullable = false, length = 2)
|
||||
private String billingCountryCode;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "shipping_same_as_billing", nullable = false)
|
||||
private Boolean shippingSameAsBilling;
|
||||
|
||||
@Column(name = "shipping_first_name", length = Integer.MAX_VALUE)
|
||||
private String shippingFirstName;
|
||||
|
||||
@Column(name = "shipping_last_name", length = Integer.MAX_VALUE)
|
||||
private String shippingLastName;
|
||||
|
||||
@Column(name = "shipping_company_name", length = Integer.MAX_VALUE)
|
||||
private String shippingCompanyName;
|
||||
|
||||
@Column(name = "shipping_contact_person", length = Integer.MAX_VALUE)
|
||||
private String shippingContactPerson;
|
||||
|
||||
@Column(name = "shipping_address_line1", length = Integer.MAX_VALUE)
|
||||
private String shippingAddressLine1;
|
||||
|
||||
@Column(name = "shipping_address_line2", length = Integer.MAX_VALUE)
|
||||
private String shippingAddressLine2;
|
||||
|
||||
@Column(name = "shipping_zip", length = Integer.MAX_VALUE)
|
||||
private String shippingZip;
|
||||
|
||||
@Column(name = "shipping_city", length = Integer.MAX_VALUE)
|
||||
private String shippingCity;
|
||||
|
||||
@Column(name = "shipping_country_code", length = 2)
|
||||
private String shippingCountryCode;
|
||||
|
||||
@ColumnDefault("'it'")
|
||||
@Column(name = "preferred_language", length = 2)
|
||||
private String preferredLanguage;
|
||||
|
||||
@ColumnDefault("'CHF'")
|
||||
@Column(name = "currency", nullable = false, length = 3)
|
||||
private String currency;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "setup_cost_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal setupCostChf;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "shipping_cost_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal shippingCostChf;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "discount_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal discountChf;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "subtotal_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal subtotalChf;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "total_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal totalChf;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
@Column(name = "paid_at")
|
||||
private OffsetDateTime paidAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
@Transient
|
||||
public String getOrderNumber() {
|
||||
if (id == null) {
|
||||
return null;
|
||||
}
|
||||
String rawId = id.toString();
|
||||
int dashIndex = rawId.indexOf('-');
|
||||
return dashIndex > 0 ? rawId.substring(0, dashIndex) : rawId;
|
||||
}
|
||||
|
||||
public QuoteSession getSourceQuoteSession() {
|
||||
return sourceQuoteSession;
|
||||
}
|
||||
|
||||
public void setSourceQuoteSession(QuoteSession sourceQuoteSession) {
|
||||
this.sourceQuoteSession = sourceQuoteSession;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Customer getCustomer() {
|
||||
return customer;
|
||||
}
|
||||
|
||||
public void setCustomer(Customer customer) {
|
||||
this.customer = customer;
|
||||
}
|
||||
|
||||
public String getCustomerEmail() {
|
||||
return customerEmail;
|
||||
}
|
||||
|
||||
public void setCustomerEmail(String customerEmail) {
|
||||
this.customerEmail = customerEmail;
|
||||
}
|
||||
|
||||
public String getCustomerPhone() {
|
||||
return customerPhone;
|
||||
}
|
||||
|
||||
public void setCustomerPhone(String customerPhone) {
|
||||
this.customerPhone = customerPhone;
|
||||
}
|
||||
|
||||
public String getBillingCustomerType() {
|
||||
return billingCustomerType;
|
||||
}
|
||||
|
||||
public void setBillingCustomerType(String billingCustomerType) {
|
||||
this.billingCustomerType = billingCustomerType;
|
||||
}
|
||||
|
||||
public String getBillingFirstName() {
|
||||
return billingFirstName;
|
||||
}
|
||||
|
||||
public void setBillingFirstName(String billingFirstName) {
|
||||
this.billingFirstName = billingFirstName;
|
||||
}
|
||||
|
||||
public String getBillingLastName() {
|
||||
return billingLastName;
|
||||
}
|
||||
|
||||
public void setBillingLastName(String billingLastName) {
|
||||
this.billingLastName = billingLastName;
|
||||
}
|
||||
|
||||
public String getBillingCompanyName() {
|
||||
return billingCompanyName;
|
||||
}
|
||||
|
||||
public void setBillingCompanyName(String billingCompanyName) {
|
||||
this.billingCompanyName = billingCompanyName;
|
||||
}
|
||||
|
||||
public String getBillingContactPerson() {
|
||||
return billingContactPerson;
|
||||
}
|
||||
|
||||
public void setBillingContactPerson(String billingContactPerson) {
|
||||
this.billingContactPerson = billingContactPerson;
|
||||
}
|
||||
|
||||
public String getBillingAddressLine1() {
|
||||
return billingAddressLine1;
|
||||
}
|
||||
|
||||
public void setBillingAddressLine1(String billingAddressLine1) {
|
||||
this.billingAddressLine1 = billingAddressLine1;
|
||||
}
|
||||
|
||||
public String getBillingAddressLine2() {
|
||||
return billingAddressLine2;
|
||||
}
|
||||
|
||||
public void setBillingAddressLine2(String billingAddressLine2) {
|
||||
this.billingAddressLine2 = billingAddressLine2;
|
||||
}
|
||||
|
||||
public String getBillingZip() {
|
||||
return billingZip;
|
||||
}
|
||||
|
||||
public void setBillingZip(String billingZip) {
|
||||
this.billingZip = billingZip;
|
||||
}
|
||||
|
||||
public String getBillingCity() {
|
||||
return billingCity;
|
||||
}
|
||||
|
||||
public void setBillingCity(String billingCity) {
|
||||
this.billingCity = billingCity;
|
||||
}
|
||||
|
||||
public String getBillingCountryCode() {
|
||||
return billingCountryCode;
|
||||
}
|
||||
|
||||
public void setBillingCountryCode(String billingCountryCode) {
|
||||
this.billingCountryCode = billingCountryCode;
|
||||
}
|
||||
|
||||
public Boolean getShippingSameAsBilling() {
|
||||
return shippingSameAsBilling;
|
||||
}
|
||||
|
||||
public void setShippingSameAsBilling(Boolean shippingSameAsBilling) {
|
||||
this.shippingSameAsBilling = shippingSameAsBilling;
|
||||
}
|
||||
|
||||
public String getShippingFirstName() {
|
||||
return shippingFirstName;
|
||||
}
|
||||
|
||||
public void setShippingFirstName(String shippingFirstName) {
|
||||
this.shippingFirstName = shippingFirstName;
|
||||
}
|
||||
|
||||
public String getShippingLastName() {
|
||||
return shippingLastName;
|
||||
}
|
||||
|
||||
public void setShippingLastName(String shippingLastName) {
|
||||
this.shippingLastName = shippingLastName;
|
||||
}
|
||||
|
||||
public String getShippingCompanyName() {
|
||||
return shippingCompanyName;
|
||||
}
|
||||
|
||||
public void setShippingCompanyName(String shippingCompanyName) {
|
||||
this.shippingCompanyName = shippingCompanyName;
|
||||
}
|
||||
|
||||
public String getShippingContactPerson() {
|
||||
return shippingContactPerson;
|
||||
}
|
||||
|
||||
public void setShippingContactPerson(String shippingContactPerson) {
|
||||
this.shippingContactPerson = shippingContactPerson;
|
||||
}
|
||||
|
||||
public String getShippingAddressLine1() {
|
||||
return shippingAddressLine1;
|
||||
}
|
||||
|
||||
public void setShippingAddressLine1(String shippingAddressLine1) {
|
||||
this.shippingAddressLine1 = shippingAddressLine1;
|
||||
}
|
||||
|
||||
public String getShippingAddressLine2() {
|
||||
return shippingAddressLine2;
|
||||
}
|
||||
|
||||
public void setShippingAddressLine2(String shippingAddressLine2) {
|
||||
this.shippingAddressLine2 = shippingAddressLine2;
|
||||
}
|
||||
|
||||
public String getShippingZip() {
|
||||
return shippingZip;
|
||||
}
|
||||
|
||||
public void setShippingZip(String shippingZip) {
|
||||
this.shippingZip = shippingZip;
|
||||
}
|
||||
|
||||
public String getShippingCity() {
|
||||
return shippingCity;
|
||||
}
|
||||
|
||||
public void setShippingCity(String shippingCity) {
|
||||
this.shippingCity = shippingCity;
|
||||
}
|
||||
|
||||
public String getShippingCountryCode() {
|
||||
return shippingCountryCode;
|
||||
}
|
||||
|
||||
public void setShippingCountryCode(String shippingCountryCode) {
|
||||
this.shippingCountryCode = shippingCountryCode;
|
||||
}
|
||||
|
||||
public String getCurrency() {
|
||||
return currency;
|
||||
}
|
||||
|
||||
public void setCurrency(String currency) {
|
||||
this.currency = currency;
|
||||
}
|
||||
|
||||
public String getPreferredLanguage() {
|
||||
return preferredLanguage;
|
||||
}
|
||||
|
||||
public void setPreferredLanguage(String preferredLanguage) {
|
||||
this.preferredLanguage = preferredLanguage;
|
||||
}
|
||||
|
||||
public BigDecimal getSetupCostChf() {
|
||||
return setupCostChf;
|
||||
}
|
||||
|
||||
public void setSetupCostChf(BigDecimal setupCostChf) {
|
||||
this.setupCostChf = setupCostChf;
|
||||
}
|
||||
|
||||
public BigDecimal getShippingCostChf() {
|
||||
return shippingCostChf;
|
||||
}
|
||||
|
||||
public void setShippingCostChf(BigDecimal shippingCostChf) {
|
||||
this.shippingCostChf = shippingCostChf;
|
||||
}
|
||||
|
||||
public BigDecimal getDiscountChf() {
|
||||
return discountChf;
|
||||
}
|
||||
|
||||
public void setDiscountChf(BigDecimal discountChf) {
|
||||
this.discountChf = discountChf;
|
||||
}
|
||||
|
||||
public BigDecimal getSubtotalChf() {
|
||||
return subtotalChf;
|
||||
}
|
||||
|
||||
public void setSubtotalChf(BigDecimal subtotalChf) {
|
||||
this.subtotalChf = subtotalChf;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalChf() {
|
||||
return totalChf;
|
||||
}
|
||||
|
||||
public void setTotalChf(BigDecimal totalChf) {
|
||||
this.totalChf = totalChf;
|
||||
}
|
||||
|
||||
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 getPaidAt() {
|
||||
return paidAt;
|
||||
}
|
||||
|
||||
public void setPaidAt(OffsetDateTime paidAt) {
|
||||
this.paidAt = paidAt;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,253 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.OnDelete;
|
||||
import org.hibernate.annotations.OnDeleteAction;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "order_items", indexes = {@Index(name = "ix_order_items_order",
|
||||
columnList = "order_id")})
|
||||
public class OrderItem {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "order_item_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@OnDelete(action = OnDeleteAction.CASCADE)
|
||||
@JoinColumn(name = "order_id", nullable = false)
|
||||
private Order order;
|
||||
|
||||
@Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String originalFilename;
|
||||
|
||||
@Column(name = "stored_relative_path", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String storedRelativePath;
|
||||
|
||||
@Column(name = "stored_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String storedFilename;
|
||||
|
||||
@Column(name = "file_size_bytes")
|
||||
private Long fileSizeBytes;
|
||||
|
||||
@Column(name = "mime_type", length = Integer.MAX_VALUE)
|
||||
private String mimeType;
|
||||
|
||||
@Column(name = "sha256_hex", length = Integer.MAX_VALUE)
|
||||
private String sha256Hex;
|
||||
|
||||
@Column(name = "material_code", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String materialCode;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "filament_variant_id")
|
||||
private FilamentVariant filamentVariant;
|
||||
|
||||
@Column(name = "color_code", length = Integer.MAX_VALUE)
|
||||
private String colorCode;
|
||||
|
||||
@ColumnDefault("1")
|
||||
@Column(name = "quantity", nullable = false)
|
||||
private Integer quantity;
|
||||
|
||||
@Column(name = "print_time_seconds")
|
||||
private Integer printTimeSeconds;
|
||||
|
||||
@Column(name = "material_grams", precision = 12, scale = 2)
|
||||
private BigDecimal materialGrams;
|
||||
|
||||
@Column(name = "bounding_box_x_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxXMm;
|
||||
|
||||
@Column(name = "bounding_box_y_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxYMm;
|
||||
|
||||
@Column(name = "bounding_box_z_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxZMm;
|
||||
|
||||
@Column(name = "unit_price_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal unitPriceChf;
|
||||
|
||||
@Column(name = "line_total_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal lineTotalChf;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
if (createdAt == null) {
|
||||
createdAt = OffsetDateTime.now();
|
||||
}
|
||||
if (quantity == null) {
|
||||
quantity = 1;
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Order getOrder() {
|
||||
return order;
|
||||
}
|
||||
|
||||
public void setOrder(Order order) {
|
||||
this.order = order;
|
||||
}
|
||||
|
||||
public String getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
|
||||
public void setOriginalFilename(String originalFilename) {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public String getStoredRelativePath() {
|
||||
return storedRelativePath;
|
||||
}
|
||||
|
||||
public void setStoredRelativePath(String storedRelativePath) {
|
||||
this.storedRelativePath = storedRelativePath;
|
||||
}
|
||||
|
||||
public String getStoredFilename() {
|
||||
return storedFilename;
|
||||
}
|
||||
|
||||
public void setStoredFilename(String storedFilename) {
|
||||
this.storedFilename = storedFilename;
|
||||
}
|
||||
|
||||
public Long getFileSizeBytes() {
|
||||
return fileSizeBytes;
|
||||
}
|
||||
|
||||
public void setFileSizeBytes(Long fileSizeBytes) {
|
||||
this.fileSizeBytes = fileSizeBytes;
|
||||
}
|
||||
|
||||
public String getMimeType() {
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
public void setMimeType(String mimeType) {
|
||||
this.mimeType = mimeType;
|
||||
}
|
||||
|
||||
public String getSha256Hex() {
|
||||
return sha256Hex;
|
||||
}
|
||||
|
||||
public void setSha256Hex(String sha256Hex) {
|
||||
this.sha256Hex = sha256Hex;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public FilamentVariant getFilamentVariant() {
|
||||
return filamentVariant;
|
||||
}
|
||||
|
||||
public void setFilamentVariant(FilamentVariant filamentVariant) {
|
||||
this.filamentVariant = filamentVariant;
|
||||
}
|
||||
|
||||
public String getColorCode() {
|
||||
return colorCode;
|
||||
}
|
||||
|
||||
public void setColorCode(String colorCode) {
|
||||
this.colorCode = colorCode;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public Integer getPrintTimeSeconds() {
|
||||
return printTimeSeconds;
|
||||
}
|
||||
|
||||
public void setPrintTimeSeconds(Integer printTimeSeconds) {
|
||||
this.printTimeSeconds = printTimeSeconds;
|
||||
}
|
||||
|
||||
public BigDecimal getMaterialGrams() {
|
||||
return materialGrams;
|
||||
}
|
||||
|
||||
public void setMaterialGrams(BigDecimal materialGrams) {
|
||||
this.materialGrams = materialGrams;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxXMm() {
|
||||
return boundingBoxXMm;
|
||||
}
|
||||
|
||||
public void setBoundingBoxXMm(BigDecimal boundingBoxXMm) {
|
||||
this.boundingBoxXMm = boundingBoxXMm;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxYMm() {
|
||||
return boundingBoxYMm;
|
||||
}
|
||||
|
||||
public void setBoundingBoxYMm(BigDecimal boundingBoxYMm) {
|
||||
this.boundingBoxYMm = boundingBoxYMm;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxZMm() {
|
||||
return boundingBoxZMm;
|
||||
}
|
||||
|
||||
public void setBoundingBoxZMm(BigDecimal boundingBoxZMm) {
|
||||
this.boundingBoxZMm = boundingBoxZMm;
|
||||
}
|
||||
|
||||
public BigDecimal getUnitPriceChf() {
|
||||
return unitPriceChf;
|
||||
}
|
||||
|
||||
public void setUnitPriceChf(BigDecimal unitPriceChf) {
|
||||
this.unitPriceChf = unitPriceChf;
|
||||
}
|
||||
|
||||
public BigDecimal getLineTotalChf() {
|
||||
return lineTotalChf;
|
||||
}
|
||||
|
||||
public void setLineTotalChf(BigDecimal lineTotalChf) {
|
||||
this.lineTotalChf = lineTotalChf;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,157 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.OnDelete;
|
||||
import org.hibernate.annotations.OnDeleteAction;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "payments", indexes = {
|
||||
@Index(name = "ix_payments_order",
|
||||
columnList = "order_id"),
|
||||
@Index(name = "ix_payments_reference",
|
||||
columnList = "payment_reference")})
|
||||
public class Payment {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "payment_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@OnDelete(action = OnDeleteAction.CASCADE)
|
||||
@JoinColumn(name = "order_id", nullable = false)
|
||||
private Order order;
|
||||
|
||||
@Column(name = "method", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String method;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@ColumnDefault("'CHF'")
|
||||
@Column(name = "currency", nullable = false, length = 3)
|
||||
private String currency;
|
||||
|
||||
@Column(name = "amount_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal amountChf;
|
||||
|
||||
@Column(name = "payment_reference", length = Integer.MAX_VALUE)
|
||||
private String paymentReference;
|
||||
|
||||
@Column(name = "provider_transaction_id", length = Integer.MAX_VALUE)
|
||||
private String providerTransactionId;
|
||||
|
||||
@Column(name = "qr_payload", length = Integer.MAX_VALUE)
|
||||
private String qrPayload;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "initiated_at", nullable = false)
|
||||
private OffsetDateTime initiatedAt;
|
||||
|
||||
@Column(name = "reported_at")
|
||||
private OffsetDateTime reportedAt;
|
||||
|
||||
@Column(name = "received_at")
|
||||
private OffsetDateTime receivedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Order getOrder() {
|
||||
return order;
|
||||
}
|
||||
|
||||
public void setOrder(Order order) {
|
||||
this.order = order;
|
||||
}
|
||||
|
||||
public String getMethod() {
|
||||
return method;
|
||||
}
|
||||
|
||||
public void setMethod(String method) {
|
||||
this.method = method;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getCurrency() {
|
||||
return currency;
|
||||
}
|
||||
|
||||
public void setCurrency(String currency) {
|
||||
this.currency = currency;
|
||||
}
|
||||
|
||||
public BigDecimal getAmountChf() {
|
||||
return amountChf;
|
||||
}
|
||||
|
||||
public void setAmountChf(BigDecimal amountChf) {
|
||||
this.amountChf = amountChf;
|
||||
}
|
||||
|
||||
public String getPaymentReference() {
|
||||
return paymentReference;
|
||||
}
|
||||
|
||||
public void setPaymentReference(String paymentReference) {
|
||||
this.paymentReference = paymentReference;
|
||||
}
|
||||
|
||||
public String getProviderTransactionId() {
|
||||
return providerTransactionId;
|
||||
}
|
||||
|
||||
public void setProviderTransactionId(String providerTransactionId) {
|
||||
this.providerTransactionId = providerTransactionId;
|
||||
}
|
||||
|
||||
public String getQrPayload() {
|
||||
return qrPayload;
|
||||
}
|
||||
|
||||
public void setQrPayload(String qrPayload) {
|
||||
this.qrPayload = qrPayload;
|
||||
}
|
||||
|
||||
public OffsetDateTime getInitiatedAt() {
|
||||
return initiatedAt;
|
||||
}
|
||||
|
||||
public void setInitiatedAt(OffsetDateTime initiatedAt) {
|
||||
this.initiatedAt = initiatedAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getReportedAt() {
|
||||
return reportedAt;
|
||||
}
|
||||
|
||||
public void setReportedAt(OffsetDateTime reportedAt) {
|
||||
this.reportedAt = reportedAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getReceivedAt() {
|
||||
return receivedAt;
|
||||
}
|
||||
|
||||
public void setReceivedAt(OffsetDateTime receivedAt) {
|
||||
this.receivedAt = receivedAt;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Entity
|
||||
@Table(name = "printer_machine_profile", uniqueConstraints = {
|
||||
@UniqueConstraint(name = "ux_printer_machine_profile_machine_nozzle", columnNames = {
|
||||
"printer_machine_id", "nozzle_diameter_mm"
|
||||
})
|
||||
})
|
||||
public class PrinterMachineProfile {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "printer_machine_profile_id", nullable = false)
|
||||
private Long id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "printer_machine_id", nullable = false)
|
||||
private PrinterMachine printerMachine;
|
||||
|
||||
@Column(name = "nozzle_diameter_mm", nullable = false, precision = 4, scale = 2)
|
||||
private BigDecimal nozzleDiameterMm;
|
||||
|
||||
@Column(name = "orca_machine_profile_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String orcaMachineProfileName;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "is_default", nullable = false)
|
||||
private Boolean isDefault;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public PrinterMachine getPrinterMachine() {
|
||||
return printerMachine;
|
||||
}
|
||||
|
||||
public void setPrinterMachine(PrinterMachine printerMachine) {
|
||||
this.printerMachine = printerMachine;
|
||||
}
|
||||
|
||||
public BigDecimal getNozzleDiameterMm() {
|
||||
return nozzleDiameterMm;
|
||||
}
|
||||
|
||||
public void setNozzleDiameterMm(BigDecimal nozzleDiameterMm) {
|
||||
this.nozzleDiameterMm = nozzleDiameterMm;
|
||||
}
|
||||
|
||||
public String getOrcaMachineProfileName() {
|
||||
return orcaMachineProfileName;
|
||||
}
|
||||
|
||||
public void setOrcaMachineProfileName(String orcaMachineProfileName) {
|
||||
this.orcaMachineProfileName = orcaMachineProfileName;
|
||||
}
|
||||
|
||||
public Boolean getIsDefault() {
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
public void setIsDefault(Boolean isDefault) {
|
||||
this.isDefault = isDefault;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean isActive) {
|
||||
this.isActive = isActive;
|
||||
}
|
||||
}
|
||||
@@ -1,228 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.JdbcTypeCode;
|
||||
import org.hibernate.annotations.OnDelete;
|
||||
import org.hibernate.annotations.OnDeleteAction;
|
||||
import org.hibernate.type.SqlTypes;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "quote_line_items", indexes = {@Index(name = "ix_quote_line_items_session",
|
||||
columnList = "quote_session_id")})
|
||||
public class QuoteLineItem {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "quote_line_item_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@OnDelete(action = OnDeleteAction.CASCADE)
|
||||
@JoinColumn(name = "quote_session_id", nullable = false)
|
||||
@com.fasterxml.jackson.annotation.JsonIgnore
|
||||
private QuoteSession quoteSession;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String originalFilename;
|
||||
|
||||
@ColumnDefault("1")
|
||||
@Column(name = "quantity", nullable = false)
|
||||
private Integer quantity;
|
||||
|
||||
@Column(name = "color_code", length = Integer.MAX_VALUE)
|
||||
private String colorCode;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "filament_variant_id")
|
||||
@com.fasterxml.jackson.annotation.JsonIgnore
|
||||
private FilamentVariant filamentVariant;
|
||||
|
||||
@Column(name = "bounding_box_x_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxXMm;
|
||||
|
||||
@Column(name = "bounding_box_y_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxYMm;
|
||||
|
||||
@Column(name = "bounding_box_z_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxZMm;
|
||||
|
||||
@Column(name = "print_time_seconds")
|
||||
private Integer printTimeSeconds;
|
||||
|
||||
@Column(name = "material_grams", precision = 12, scale = 2)
|
||||
private BigDecimal materialGrams;
|
||||
|
||||
@Column(name = "unit_price_chf", precision = 12, scale = 2)
|
||||
private BigDecimal unitPriceChf;
|
||||
|
||||
@JdbcTypeCode(SqlTypes.JSON)
|
||||
@Column(name = "pricing_breakdown")
|
||||
private Map<String, Object> pricingBreakdown;
|
||||
|
||||
@Column(name = "error_message", length = Integer.MAX_VALUE)
|
||||
private String errorMessage;
|
||||
|
||||
@Column(name = "stored_path", length = Integer.MAX_VALUE)
|
||||
private String storedPath;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public QuoteSession getQuoteSession() {
|
||||
return quoteSession;
|
||||
}
|
||||
|
||||
public void setQuoteSession(QuoteSession quoteSession) {
|
||||
this.quoteSession = quoteSession;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
|
||||
public void setOriginalFilename(String originalFilename) {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getColorCode() {
|
||||
return colorCode;
|
||||
}
|
||||
|
||||
public void setColorCode(String colorCode) {
|
||||
this.colorCode = colorCode;
|
||||
}
|
||||
|
||||
public FilamentVariant getFilamentVariant() {
|
||||
return filamentVariant;
|
||||
}
|
||||
|
||||
public void setFilamentVariant(FilamentVariant filamentVariant) {
|
||||
this.filamentVariant = filamentVariant;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxXMm() {
|
||||
return boundingBoxXMm;
|
||||
}
|
||||
|
||||
public void setBoundingBoxXMm(BigDecimal boundingBoxXMm) {
|
||||
this.boundingBoxXMm = boundingBoxXMm;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxYMm() {
|
||||
return boundingBoxYMm;
|
||||
}
|
||||
|
||||
public void setBoundingBoxYMm(BigDecimal boundingBoxYMm) {
|
||||
this.boundingBoxYMm = boundingBoxYMm;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxZMm() {
|
||||
return boundingBoxZMm;
|
||||
}
|
||||
|
||||
public void setBoundingBoxZMm(BigDecimal boundingBoxZMm) {
|
||||
this.boundingBoxZMm = boundingBoxZMm;
|
||||
}
|
||||
|
||||
public Integer getPrintTimeSeconds() {
|
||||
return printTimeSeconds;
|
||||
}
|
||||
|
||||
public void setPrintTimeSeconds(Integer printTimeSeconds) {
|
||||
this.printTimeSeconds = printTimeSeconds;
|
||||
}
|
||||
|
||||
public BigDecimal getMaterialGrams() {
|
||||
return materialGrams;
|
||||
}
|
||||
|
||||
public void setMaterialGrams(BigDecimal materialGrams) {
|
||||
this.materialGrams = materialGrams;
|
||||
}
|
||||
|
||||
public BigDecimal getUnitPriceChf() {
|
||||
return unitPriceChf;
|
||||
}
|
||||
|
||||
public void setUnitPriceChf(BigDecimal unitPriceChf) {
|
||||
this.unitPriceChf = unitPriceChf;
|
||||
}
|
||||
|
||||
public Map<String, Object> getPricingBreakdown() {
|
||||
return pricingBreakdown;
|
||||
}
|
||||
|
||||
public void setPricingBreakdown(Map<String, Object> pricingBreakdown) {
|
||||
this.pricingBreakdown = pricingBreakdown;
|
||||
}
|
||||
|
||||
public String getErrorMessage() {
|
||||
return errorMessage;
|
||||
}
|
||||
|
||||
public void setErrorMessage(String errorMessage) {
|
||||
this.errorMessage = errorMessage;
|
||||
}
|
||||
|
||||
public String getStoredPath() {
|
||||
return storedPath;
|
||||
}
|
||||
|
||||
public void setStoredPath(String storedPath) {
|
||||
this.storedPath = storedPath;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,176 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "quote_sessions", indexes = {
|
||||
@Index(name = "ix_quote_sessions_status",
|
||||
columnList = "status"),
|
||||
@Index(name = "ix_quote_sessions_expires_at",
|
||||
columnList = "expires_at")})
|
||||
public class QuoteSession {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "quote_session_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@Column(name = "pricing_version", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String pricingVersion;
|
||||
|
||||
@Column(name = "material_code", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String materialCode;
|
||||
|
||||
@Column(name = "nozzle_diameter_mm", precision = 5, scale = 2)
|
||||
private BigDecimal nozzleDiameterMm;
|
||||
|
||||
@Column(name = "layer_height_mm", precision = 6, scale = 3)
|
||||
private BigDecimal layerHeightMm;
|
||||
|
||||
@Column(name = "infill_pattern", length = Integer.MAX_VALUE)
|
||||
private String infillPattern;
|
||||
|
||||
@Column(name = "infill_percent")
|
||||
private Integer infillPercent;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "supports_enabled", nullable = false)
|
||||
private Boolean supportsEnabled;
|
||||
|
||||
@Column(name = "notes", length = Integer.MAX_VALUE)
|
||||
private String notes;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "setup_cost_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal setupCostChf;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@Column(name = "expires_at", nullable = false)
|
||||
private OffsetDateTime expiresAt;
|
||||
|
||||
@Column(name = "converted_order_id")
|
||||
private UUID convertedOrderId;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getPricingVersion() {
|
||||
return pricingVersion;
|
||||
}
|
||||
|
||||
public void setPricingVersion(String pricingVersion) {
|
||||
this.pricingVersion = pricingVersion;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public BigDecimal getNozzleDiameterMm() {
|
||||
return nozzleDiameterMm;
|
||||
}
|
||||
|
||||
public void setNozzleDiameterMm(BigDecimal nozzleDiameterMm) {
|
||||
this.nozzleDiameterMm = nozzleDiameterMm;
|
||||
}
|
||||
|
||||
public BigDecimal getLayerHeightMm() {
|
||||
return layerHeightMm;
|
||||
}
|
||||
|
||||
public void setLayerHeightMm(BigDecimal layerHeightMm) {
|
||||
this.layerHeightMm = layerHeightMm;
|
||||
}
|
||||
|
||||
public String getInfillPattern() {
|
||||
return infillPattern;
|
||||
}
|
||||
|
||||
public void setInfillPattern(String infillPattern) {
|
||||
this.infillPattern = infillPattern;
|
||||
}
|
||||
|
||||
public Integer getInfillPercent() {
|
||||
return infillPercent;
|
||||
}
|
||||
|
||||
public void setInfillPercent(Integer infillPercent) {
|
||||
this.infillPercent = infillPercent;
|
||||
}
|
||||
|
||||
public Boolean getSupportsEnabled() {
|
||||
return supportsEnabled;
|
||||
}
|
||||
|
||||
public void setSupportsEnabled(Boolean supportsEnabled) {
|
||||
this.supportsEnabled = supportsEnabled;
|
||||
}
|
||||
|
||||
public String getNotes() {
|
||||
return notes;
|
||||
}
|
||||
|
||||
public void setNotes(String notes) {
|
||||
this.notes = notes;
|
||||
}
|
||||
|
||||
public BigDecimal getSetupCostChf() {
|
||||
return setupCostChf;
|
||||
}
|
||||
|
||||
public void setSetupCostChf(BigDecimal setupCostChf) {
|
||||
this.setupCostChf = setupCostChf;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getExpiresAt() {
|
||||
return expiresAt;
|
||||
}
|
||||
|
||||
public void setExpiresAt(OffsetDateTime expiresAt) {
|
||||
this.expiresAt = expiresAt;
|
||||
}
|
||||
|
||||
public UUID getConvertedOrderId() {
|
||||
return convertedOrderId;
|
||||
}
|
||||
|
||||
public void setConvertedOrderId(UUID convertedOrderId) {
|
||||
this.convertedOrderId = convertedOrderId;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.printcalculator.event;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import lombok.Getter;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
|
||||
@Getter
|
||||
public class OrderCreatedEvent extends ApplicationEvent {
|
||||
|
||||
private final Order order;
|
||||
|
||||
public OrderCreatedEvent(Object source, Order order) {
|
||||
super(source);
|
||||
this.order = order;
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package com.printcalculator.event;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import com.printcalculator.entity.Payment;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
|
||||
public class PaymentConfirmedEvent extends ApplicationEvent {
|
||||
private final Order order;
|
||||
private final Payment payment;
|
||||
|
||||
public PaymentConfirmedEvent(Object source, Order order, Payment payment) {
|
||||
super(source);
|
||||
this.order = order;
|
||||
this.payment = payment;
|
||||
}
|
||||
|
||||
public Order getOrder() {
|
||||
return order;
|
||||
}
|
||||
|
||||
public Payment getPayment() {
|
||||
return payment;
|
||||
}
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package com.printcalculator.event;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import com.printcalculator.entity.Payment;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
|
||||
public class PaymentReportedEvent extends ApplicationEvent {
|
||||
|
||||
private final Order order;
|
||||
private final Payment payment;
|
||||
|
||||
public PaymentReportedEvent(Object source, Order order, Payment payment) {
|
||||
super(source);
|
||||
this.order = order;
|
||||
this.payment = payment;
|
||||
}
|
||||
|
||||
public Order getOrder() {
|
||||
return order;
|
||||
}
|
||||
|
||||
public Payment getPayment() {
|
||||
return payment;
|
||||
}
|
||||
}
|
||||
@@ -1,496 +0,0 @@
|
||||
package com.printcalculator.event.listener;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import com.printcalculator.entity.OrderItem;
|
||||
import com.printcalculator.entity.Payment;
|
||||
import com.printcalculator.event.OrderCreatedEvent;
|
||||
import com.printcalculator.event.PaymentConfirmedEvent;
|
||||
import com.printcalculator.event.PaymentReportedEvent;
|
||||
import com.printcalculator.repository.OrderItemRepository;
|
||||
import com.printcalculator.service.InvoicePdfRenderingService;
|
||||
import com.printcalculator.service.QrBillService;
|
||||
import com.printcalculator.service.StorageService;
|
||||
import com.printcalculator.service.email.EmailNotificationService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.text.NumberFormat;
|
||||
import java.time.Year;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.time.format.FormatStyle;
|
||||
import java.util.Currency;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class OrderEmailListener {
|
||||
|
||||
private static final String DEFAULT_LANGUAGE = "it";
|
||||
|
||||
private final EmailNotificationService emailNotificationService;
|
||||
private final InvoicePdfRenderingService invoicePdfRenderingService;
|
||||
private final OrderItemRepository orderItemRepository;
|
||||
private final QrBillService qrBillService;
|
||||
private final StorageService storageService;
|
||||
|
||||
@Value("${app.mail.admin.enabled:true}")
|
||||
private boolean adminMailEnabled;
|
||||
|
||||
@Value("${app.mail.admin.address:}")
|
||||
private String adminMailAddress;
|
||||
|
||||
@Value("${app.frontend.base-url:http://localhost:4200}")
|
||||
private String frontendBaseUrl;
|
||||
|
||||
@Async
|
||||
@EventListener
|
||||
public void handleOrderCreatedEvent(OrderCreatedEvent event) {
|
||||
Order order = event.getOrder();
|
||||
log.info("Processing OrderCreatedEvent for order id: {}", order.getId());
|
||||
|
||||
try {
|
||||
sendCustomerConfirmationEmail(order);
|
||||
|
||||
if (adminMailEnabled && adminMailAddress != null && !adminMailAddress.isEmpty()) {
|
||||
sendAdminNotificationEmail(order);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to process email notifications for order id: {}", order.getId(), e);
|
||||
}
|
||||
}
|
||||
|
||||
@Async
|
||||
@EventListener
|
||||
public void handlePaymentReportedEvent(PaymentReportedEvent event) {
|
||||
Order order = event.getOrder();
|
||||
log.info("Processing PaymentReportedEvent for order id: {}", order.getId());
|
||||
|
||||
try {
|
||||
sendPaymentReportedEmail(order);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to send payment reported email for order id: {}", order.getId(), e);
|
||||
}
|
||||
}
|
||||
|
||||
@Async
|
||||
@EventListener
|
||||
public void handlePaymentConfirmedEvent(PaymentConfirmedEvent event) {
|
||||
Order order = event.getOrder();
|
||||
Payment payment = event.getPayment();
|
||||
log.info("Processing PaymentConfirmedEvent for order id: {}", order.getId());
|
||||
|
||||
try {
|
||||
sendPaidInvoiceEmail(order, payment);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to send paid invoice email for order id: {}", order.getId(), e);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendCustomerConfirmationEmail(Order order) {
|
||||
String language = resolveLanguage(order.getPreferredLanguage());
|
||||
String orderNumber = getDisplayOrderNumber(order);
|
||||
|
||||
Map<String, Object> templateData = buildBaseTemplateData(order, language);
|
||||
String subject = applyOrderConfirmationTexts(templateData, language, orderNumber);
|
||||
byte[] confirmationPdf = loadOrGenerateConfirmationPdf(order);
|
||||
|
||||
emailNotificationService.sendEmailWithAttachment(
|
||||
order.getCustomer().getEmail(),
|
||||
subject,
|
||||
"order-confirmation",
|
||||
templateData,
|
||||
buildConfirmationAttachmentName(language, orderNumber),
|
||||
confirmationPdf
|
||||
);
|
||||
}
|
||||
|
||||
private void sendPaymentReportedEmail(Order order) {
|
||||
String language = resolveLanguage(order.getPreferredLanguage());
|
||||
String orderNumber = getDisplayOrderNumber(order);
|
||||
|
||||
Map<String, Object> templateData = buildBaseTemplateData(order, language);
|
||||
String subject = applyPaymentReportedTexts(templateData, language, orderNumber);
|
||||
|
||||
emailNotificationService.sendEmail(
|
||||
order.getCustomer().getEmail(),
|
||||
subject,
|
||||
"payment-reported",
|
||||
templateData
|
||||
);
|
||||
}
|
||||
|
||||
private void sendPaidInvoiceEmail(Order order, Payment payment) {
|
||||
String language = resolveLanguage(order.getPreferredLanguage());
|
||||
String orderNumber = getDisplayOrderNumber(order);
|
||||
|
||||
Map<String, Object> templateData = buildBaseTemplateData(order, language);
|
||||
String subject = applyPaymentConfirmedTexts(templateData, language, orderNumber);
|
||||
|
||||
byte[] pdf = null;
|
||||
try {
|
||||
List<OrderItem> items = orderItemRepository.findByOrder_Id(order.getId());
|
||||
pdf = invoicePdfRenderingService.generateDocumentPdf(order, items, false, qrBillService, payment);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to generate PDF for paid invoice email: {}", e.getMessage(), e);
|
||||
}
|
||||
|
||||
emailNotificationService.sendEmailWithAttachment(
|
||||
order.getCustomer().getEmail(),
|
||||
subject,
|
||||
"payment-confirmed",
|
||||
templateData,
|
||||
buildPaidInvoiceAttachmentName(language, orderNumber),
|
||||
pdf
|
||||
);
|
||||
}
|
||||
|
||||
private void sendAdminNotificationEmail(Order order) {
|
||||
String orderNumber = getDisplayOrderNumber(order);
|
||||
Map<String, Object> templateData = buildBaseTemplateData(order, DEFAULT_LANGUAGE);
|
||||
templateData.put("customerName", buildCustomerFullName(order));
|
||||
|
||||
templateData.put("emailTitle", "Nuovo ordine ricevuto");
|
||||
templateData.put("headlineText", "Nuovo ordine #" + orderNumber);
|
||||
templateData.put("greetingText", "Ciao team,");
|
||||
templateData.put("introText", "Un nuovo ordine e' stato creato dal cliente.");
|
||||
templateData.put("detailsTitleText", "Dettagli ordine");
|
||||
templateData.put("labelOrderNumber", "Numero ordine");
|
||||
templateData.put("labelDate", "Data");
|
||||
templateData.put("labelTotal", "Totale");
|
||||
templateData.put("orderDetailsCtaText", "Apri dettaglio ordine");
|
||||
templateData.put("attachmentHintText", "La conferma cliente e il QR bill sono stati salvati nella cartella documenti dell'ordine.");
|
||||
templateData.put("supportText", "Controlla i dettagli e procedi con la gestione operativa.");
|
||||
templateData.put("footerText", "Notifica automatica sistema ordini.");
|
||||
|
||||
emailNotificationService.sendEmail(
|
||||
adminMailAddress,
|
||||
"Nuovo Ordine Ricevuto #" + orderNumber + " - " + buildCustomerFullName(order),
|
||||
"order-confirmation",
|
||||
templateData
|
||||
);
|
||||
}
|
||||
|
||||
private Map<String, Object> buildBaseTemplateData(Order order, String language) {
|
||||
Locale locale = localeForLanguage(language);
|
||||
NumberFormat currencyFormatter = NumberFormat.getCurrencyInstance(locale);
|
||||
currencyFormatter.setCurrency(Currency.getInstance("CHF"));
|
||||
|
||||
Map<String, Object> templateData = new HashMap<>();
|
||||
templateData.put("customerName", buildCustomerFirstName(order, language));
|
||||
templateData.put("orderId", order.getId());
|
||||
templateData.put("orderNumber", getDisplayOrderNumber(order));
|
||||
templateData.put("orderDetailsUrl", buildOrderDetailsUrl(order, language));
|
||||
templateData.put(
|
||||
"orderDate",
|
||||
order.getCreatedAt().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(locale))
|
||||
);
|
||||
templateData.put("totalCost", currencyFormatter.format(order.getTotalChf()));
|
||||
templateData.put("currentYear", Year.now().getValue());
|
||||
return templateData;
|
||||
}
|
||||
|
||||
private String applyOrderConfirmationTexts(Map<String, Object> templateData, String language, String orderNumber) {
|
||||
return switch (language) {
|
||||
case "en" -> {
|
||||
templateData.put("emailTitle", "Order Confirmation");
|
||||
templateData.put("headlineText", "Thank you for your order #" + orderNumber);
|
||||
templateData.put("greetingText", "Hi " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "We received your order and started processing it.");
|
||||
templateData.put("detailsTitleText", "Order details");
|
||||
templateData.put("labelOrderNumber", "Order number");
|
||||
templateData.put("labelDate", "Date");
|
||||
templateData.put("labelTotal", "Total");
|
||||
templateData.put("orderDetailsCtaText", "View order status");
|
||||
templateData.put("attachmentHintText", "Attached you can find the order confirmation PDF with the QR bill.");
|
||||
templateData.put("supportText", "If you have questions, reply to this email and we will help you.");
|
||||
templateData.put("footerText", "Automated message from 3D-Fab.");
|
||||
yield "Order Confirmation #" + orderNumber + " - 3D-Fab";
|
||||
}
|
||||
case "de" -> {
|
||||
templateData.put("emailTitle", "Bestellbestaetigung");
|
||||
templateData.put("headlineText", "Danke fuer Ihre Bestellung #" + orderNumber);
|
||||
templateData.put("greetingText", "Hallo " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Wir haben Ihre Bestellung erhalten und mit der Bearbeitung begonnen.");
|
||||
templateData.put("detailsTitleText", "Bestelldetails");
|
||||
templateData.put("labelOrderNumber", "Bestellnummer");
|
||||
templateData.put("labelDate", "Datum");
|
||||
templateData.put("labelTotal", "Gesamtbetrag");
|
||||
templateData.put("orderDetailsCtaText", "Bestellstatus ansehen");
|
||||
templateData.put("attachmentHintText", "Im Anhang finden Sie die Bestellbestaetigung mit QR-Rechnung.");
|
||||
templateData.put("supportText", "Bei Fragen antworten Sie einfach auf diese E-Mail.");
|
||||
templateData.put("footerText", "Automatische Nachricht von 3D-Fab.");
|
||||
yield "Bestellbestaetigung #" + orderNumber + " - 3D-Fab";
|
||||
}
|
||||
case "fr" -> {
|
||||
templateData.put("emailTitle", "Confirmation de commande");
|
||||
templateData.put("headlineText", "Merci pour votre commande #" + orderNumber);
|
||||
templateData.put("greetingText", "Bonjour " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Nous avons recu votre commande et commence son traitement.");
|
||||
templateData.put("detailsTitleText", "Details de commande");
|
||||
templateData.put("labelOrderNumber", "Numero de commande");
|
||||
templateData.put("labelDate", "Date");
|
||||
templateData.put("labelTotal", "Total");
|
||||
templateData.put("orderDetailsCtaText", "Voir le statut de la commande");
|
||||
templateData.put("attachmentHintText", "Vous trouverez en piece jointe la confirmation de commande avec la facture QR.");
|
||||
templateData.put("supportText", "Si vous avez des questions, repondez a cet email.");
|
||||
templateData.put("footerText", "Message automatique de 3D-Fab.");
|
||||
yield "Confirmation de commande #" + orderNumber + " - 3D-Fab";
|
||||
}
|
||||
default -> {
|
||||
templateData.put("emailTitle", "Conferma ordine");
|
||||
templateData.put("headlineText", "Grazie per il tuo ordine #" + orderNumber);
|
||||
templateData.put("greetingText", "Ciao " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Abbiamo ricevuto il tuo ordine e iniziato l'elaborazione.");
|
||||
templateData.put("detailsTitleText", "Dettagli ordine");
|
||||
templateData.put("labelOrderNumber", "Numero ordine");
|
||||
templateData.put("labelDate", "Data");
|
||||
templateData.put("labelTotal", "Totale");
|
||||
templateData.put("orderDetailsCtaText", "Visualizza stato ordine");
|
||||
templateData.put("attachmentHintText", "In allegato trovi la conferma ordine in PDF con QR bill.");
|
||||
templateData.put("supportText", "Se hai domande, rispondi a questa email e ti aiutiamo subito.");
|
||||
templateData.put("footerText", "Messaggio automatico di 3D-Fab.");
|
||||
yield "Conferma Ordine #" + orderNumber + " - 3D-Fab";
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private String applyPaymentReportedTexts(Map<String, Object> templateData, String language, String orderNumber) {
|
||||
return switch (language) {
|
||||
case "en" -> {
|
||||
templateData.put("emailTitle", "Payment Reported");
|
||||
templateData.put("headlineText", "Payment reported for order #" + orderNumber);
|
||||
templateData.put("greetingText", "Hi " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "We received your payment report and our team is now verifying it.");
|
||||
templateData.put("statusText", "Current status: Payment under verification.");
|
||||
templateData.put("orderDetailsCtaText", "Check order status");
|
||||
templateData.put("supportText", "You will receive another email as soon as the payment is confirmed.");
|
||||
templateData.put("footerText", "Automated message from 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Order number");
|
||||
templateData.put("labelTotal", "Total");
|
||||
yield "We are verifying your payment (Order #" + orderNumber + ")";
|
||||
}
|
||||
case "de" -> {
|
||||
templateData.put("emailTitle", "Zahlung gemeldet");
|
||||
templateData.put("headlineText", "Zahlung fuer Bestellung #" + orderNumber + " gemeldet");
|
||||
templateData.put("greetingText", "Hallo " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Wir haben Ihre Zahlungsmitteilung erhalten und pruefen sie aktuell.");
|
||||
templateData.put("statusText", "Aktueller Status: Zahlung in Pruefung.");
|
||||
templateData.put("orderDetailsCtaText", "Bestellstatus ansehen");
|
||||
templateData.put("supportText", "Sobald die Zahlung bestaetigt ist, erhalten Sie eine weitere E-Mail.");
|
||||
templateData.put("footerText", "Automatische Nachricht von 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Bestellnummer");
|
||||
templateData.put("labelTotal", "Gesamtbetrag");
|
||||
yield "Wir pruefen Ihre Zahlung (Bestellung #" + orderNumber + ")";
|
||||
}
|
||||
case "fr" -> {
|
||||
templateData.put("emailTitle", "Paiement signale");
|
||||
templateData.put("headlineText", "Paiement signale pour la commande #" + orderNumber);
|
||||
templateData.put("greetingText", "Bonjour " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Nous avons recu votre signalement de paiement et nous le verifions.");
|
||||
templateData.put("statusText", "Statut actuel: Paiement en verification.");
|
||||
templateData.put("orderDetailsCtaText", "Consulter le statut de la commande");
|
||||
templateData.put("supportText", "Vous recevrez un nouvel email des que le paiement sera confirme.");
|
||||
templateData.put("footerText", "Message automatique de 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Numero de commande");
|
||||
templateData.put("labelTotal", "Total");
|
||||
yield "Nous verifions votre paiement (Commande #" + orderNumber + ")";
|
||||
}
|
||||
default -> {
|
||||
templateData.put("emailTitle", "Pagamento segnalato");
|
||||
templateData.put("headlineText", "Pagamento segnalato per ordine #" + orderNumber);
|
||||
templateData.put("greetingText", "Ciao " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Abbiamo ricevuto la tua segnalazione di pagamento e la stiamo verificando.");
|
||||
templateData.put("statusText", "Stato attuale: pagamento in verifica.");
|
||||
templateData.put("orderDetailsCtaText", "Controlla lo stato ordine");
|
||||
templateData.put("supportText", "Riceverai una nuova email non appena il pagamento sara' confermato.");
|
||||
templateData.put("footerText", "Messaggio automatico di 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Numero ordine");
|
||||
templateData.put("labelTotal", "Totale");
|
||||
yield "Stiamo verificando il tuo pagamento (Ordine #" + orderNumber + ")";
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private String applyPaymentConfirmedTexts(Map<String, Object> templateData, String language, String orderNumber) {
|
||||
return switch (language) {
|
||||
case "en" -> {
|
||||
templateData.put("emailTitle", "Payment Confirmed");
|
||||
templateData.put("headlineText", "Payment confirmed for order #" + orderNumber);
|
||||
templateData.put("greetingText", "Hi " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Your payment has been confirmed and the order moved into production.");
|
||||
templateData.put("statusText", "Current status: In production.");
|
||||
templateData.put("attachmentHintText", "The paid invoice PDF is attached to this email.");
|
||||
templateData.put("orderDetailsCtaText", "View order status");
|
||||
templateData.put("supportText", "We will notify you again when the shipment is ready.");
|
||||
templateData.put("footerText", "Automated message from 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Order number");
|
||||
templateData.put("labelTotal", "Total");
|
||||
yield "Payment confirmed (Order #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
case "de" -> {
|
||||
templateData.put("emailTitle", "Zahlung bestaetigt");
|
||||
templateData.put("headlineText", "Zahlung fuer Bestellung #" + orderNumber + " bestaetigt");
|
||||
templateData.put("greetingText", "Hallo " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Ihre Zahlung wurde bestaetigt und die Bestellung ist jetzt in Produktion.");
|
||||
templateData.put("statusText", "Aktueller Status: In Produktion.");
|
||||
templateData.put("attachmentHintText", "Die bezahlte Rechnung als PDF ist dieser E-Mail beigefuegt.");
|
||||
templateData.put("orderDetailsCtaText", "Bestellstatus ansehen");
|
||||
templateData.put("supportText", "Wir informieren Sie erneut, sobald der Versand bereit ist.");
|
||||
templateData.put("footerText", "Automatische Nachricht von 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Bestellnummer");
|
||||
templateData.put("labelTotal", "Gesamtbetrag");
|
||||
yield "Zahlung bestaetigt (Bestellung #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
case "fr" -> {
|
||||
templateData.put("emailTitle", "Paiement confirme");
|
||||
templateData.put("headlineText", "Paiement confirme pour la commande #" + orderNumber);
|
||||
templateData.put("greetingText", "Bonjour " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Votre paiement est confirme et la commande est passe en production.");
|
||||
templateData.put("statusText", "Statut actuel: En production.");
|
||||
templateData.put("attachmentHintText", "La facture payee en PDF est jointe a cet email.");
|
||||
templateData.put("orderDetailsCtaText", "Voir le statut de la commande");
|
||||
templateData.put("supportText", "Nous vous informerons a nouveau des que l'expedition sera prete.");
|
||||
templateData.put("footerText", "Message automatique de 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Numero de commande");
|
||||
templateData.put("labelTotal", "Total");
|
||||
yield "Paiement confirme (Commande #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
default -> {
|
||||
templateData.put("emailTitle", "Pagamento confermato");
|
||||
templateData.put("headlineText", "Pagamento confermato per ordine #" + orderNumber);
|
||||
templateData.put("greetingText", "Ciao " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Il tuo pagamento e' stato confermato e l'ordine e' entrato in produzione.");
|
||||
templateData.put("statusText", "Stato attuale: in produzione.");
|
||||
templateData.put("attachmentHintText", "In allegato trovi la fattura saldata in PDF.");
|
||||
templateData.put("orderDetailsCtaText", "Visualizza stato ordine");
|
||||
templateData.put("supportText", "Ti aggiorneremo di nuovo quando la spedizione sara' pronta.");
|
||||
templateData.put("footerText", "Messaggio automatico di 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Numero ordine");
|
||||
templateData.put("labelTotal", "Totale");
|
||||
yield "Pagamento confermato (Ordine #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private String getDisplayOrderNumber(Order order) {
|
||||
String orderNumber = order.getOrderNumber();
|
||||
if (orderNumber != null && !orderNumber.isBlank()) {
|
||||
return orderNumber;
|
||||
}
|
||||
return order.getId() != null ? order.getId().toString() : "unknown";
|
||||
}
|
||||
|
||||
private String buildOrderDetailsUrl(Order order, String language) {
|
||||
String baseUrl = frontendBaseUrl == null ? "" : frontendBaseUrl.replaceAll("/+$", "");
|
||||
return baseUrl + "/" + language + "/co/" + order.getId();
|
||||
}
|
||||
|
||||
private String buildConfirmationAttachmentName(String language, String orderNumber) {
|
||||
return switch (language) {
|
||||
case "en" -> "Order-Confirmation-" + orderNumber + ".pdf";
|
||||
case "de" -> "Bestellbestaetigung-" + orderNumber + ".pdf";
|
||||
case "fr" -> "Confirmation-Commande-" + orderNumber + ".pdf";
|
||||
default -> "Conferma-Ordine-" + orderNumber + ".pdf";
|
||||
};
|
||||
}
|
||||
|
||||
private String buildPaidInvoiceAttachmentName(String language, String orderNumber) {
|
||||
return switch (language) {
|
||||
case "en" -> "Paid-Invoice-" + orderNumber + ".pdf";
|
||||
case "de" -> "Bezahlte-Rechnung-" + orderNumber + ".pdf";
|
||||
case "fr" -> "Facture-Payee-" + orderNumber + ".pdf";
|
||||
default -> "Fattura-Pagata-" + orderNumber + ".pdf";
|
||||
};
|
||||
}
|
||||
|
||||
private byte[] loadOrGenerateConfirmationPdf(Order order) {
|
||||
byte[] stored = loadStoredConfirmationPdf(order);
|
||||
if (stored != null) {
|
||||
return stored;
|
||||
}
|
||||
|
||||
try {
|
||||
List<OrderItem> items = orderItemRepository.findByOrder_Id(order.getId());
|
||||
return invoicePdfRenderingService.generateDocumentPdf(order, items, true, qrBillService, null);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to generate fallback confirmation PDF for order id: {}", order.getId(), e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] loadStoredConfirmationPdf(Order order) {
|
||||
String relativePath = buildConfirmationPdfRelativePath(order);
|
||||
try {
|
||||
return storageService.loadAsResource(Paths.get(relativePath)).getInputStream().readAllBytes();
|
||||
} catch (Exception e) {
|
||||
log.warn("Confirmation PDF not found for order id {} at {}", order.getId(), relativePath);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private String buildConfirmationPdfRelativePath(Order order) {
|
||||
return "orders/" + order.getId() + "/documents/confirmation-" + getDisplayOrderNumber(order) + ".pdf";
|
||||
}
|
||||
|
||||
private String buildCustomerFirstName(Order order, String language) {
|
||||
if (order.getCustomer() != null && order.getCustomer().getFirstName() != null && !order.getCustomer().getFirstName().isBlank()) {
|
||||
return order.getCustomer().getFirstName();
|
||||
}
|
||||
if (order.getBillingFirstName() != null && !order.getBillingFirstName().isBlank()) {
|
||||
return order.getBillingFirstName();
|
||||
}
|
||||
return switch (language) {
|
||||
case "en" -> "Customer";
|
||||
case "de" -> "Kunde";
|
||||
case "fr" -> "Client";
|
||||
default -> "Cliente";
|
||||
};
|
||||
}
|
||||
|
||||
private String buildCustomerFullName(Order order) {
|
||||
String firstName = order.getCustomer() != null ? order.getCustomer().getFirstName() : null;
|
||||
String lastName = order.getCustomer() != null ? order.getCustomer().getLastName() : null;
|
||||
if (firstName != null && !firstName.isBlank() && lastName != null && !lastName.isBlank()) {
|
||||
return firstName + " " + lastName;
|
||||
}
|
||||
if (order.getBillingFirstName() != null && !order.getBillingFirstName().isBlank()
|
||||
&& order.getBillingLastName() != null && !order.getBillingLastName().isBlank()) {
|
||||
return order.getBillingFirstName() + " " + order.getBillingLastName();
|
||||
}
|
||||
return "Cliente";
|
||||
}
|
||||
|
||||
private Locale localeForLanguage(String language) {
|
||||
return switch (language) {
|
||||
case "en" -> Locale.ENGLISH;
|
||||
case "de" -> Locale.GERMAN;
|
||||
case "fr" -> Locale.FRENCH;
|
||||
default -> Locale.ITALIAN;
|
||||
};
|
||||
}
|
||||
|
||||
private String resolveLanguage(String language) {
|
||||
if (language == null || language.isBlank()) {
|
||||
return DEFAULT_LANGUAGE;
|
||||
}
|
||||
|
||||
String normalized = language.trim().toLowerCase(Locale.ROOT);
|
||||
if (normalized.length() > 2) {
|
||||
normalized = normalized.substring(0, 2);
|
||||
}
|
||||
|
||||
return switch (normalized) {
|
||||
case "it", "en", "de", "fr" -> normalized;
|
||||
default -> DEFAULT_LANGUAGE;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package com.printcalculator.exception;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.FieldError;
|
||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||
import org.springframework.web.bind.annotation.ControllerAdvice;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.context.request.WebRequest;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@ControllerAdvice
|
||||
public class GlobalExceptionHandler {
|
||||
|
||||
@ExceptionHandler(VirusDetectedException.class)
|
||||
public ResponseEntity<Object> handleVirusDetectedException(
|
||||
VirusDetectedException ex, WebRequest request) {
|
||||
|
||||
Map<String, Object> body = new LinkedHashMap<>();
|
||||
body.put("timestamp", LocalDateTime.now());
|
||||
body.put("message", ex.getMessage());
|
||||
body.put("error", "Virus Detected");
|
||||
|
||||
return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
|
||||
@ExceptionHandler(MethodArgumentNotValidException.class)
|
||||
public ResponseEntity<Object> handleValidationException(
|
||||
MethodArgumentNotValidException ex, WebRequest request) {
|
||||
|
||||
List<String> details = new ArrayList<>();
|
||||
for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
|
||||
details.add(fieldError.getField() + ": " + fieldError.getDefaultMessage());
|
||||
}
|
||||
|
||||
Map<String, Object> body = new LinkedHashMap<>();
|
||||
body.put("timestamp", LocalDateTime.now());
|
||||
body.put("message", "Dati non validi.");
|
||||
body.put("error", "Validation Error");
|
||||
body.put("details", details);
|
||||
|
||||
return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
|
||||
@ExceptionHandler(IllegalArgumentException.class)
|
||||
public ResponseEntity<Object> handleIllegalArgumentException(
|
||||
IllegalArgumentException ex, WebRequest request) {
|
||||
|
||||
Map<String, Object> body = new LinkedHashMap<>();
|
||||
body.put("timestamp", LocalDateTime.now());
|
||||
body.put("message", ex.getMessage());
|
||||
body.put("error", "Bad Request");
|
||||
|
||||
return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package com.printcalculator.exception;
|
||||
|
||||
public class StorageException extends RuntimeException {
|
||||
|
||||
public StorageException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
public StorageException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package com.printcalculator.exception;
|
||||
|
||||
public class VirusDetectedException extends RuntimeException {
|
||||
public VirusDetectedException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package com.printcalculator.model;
|
||||
|
||||
public record ModelDimensions(
|
||||
double xMm,
|
||||
double yMm,
|
||||
double zMm
|
||||
) {}
|
||||
@@ -4,10 +4,13 @@ public class QuoteResult {
|
||||
private double totalPrice;
|
||||
private String currency;
|
||||
private PrintStats stats;
|
||||
public QuoteResult(double totalPrice, String currency, PrintStats stats) {
|
||||
private double setupCost;
|
||||
|
||||
public QuoteResult(double totalPrice, String currency, PrintStats stats, double setupCost) {
|
||||
this.totalPrice = totalPrice;
|
||||
this.currency = currency;
|
||||
this.stats = stats;
|
||||
this.setupCost = setupCost;
|
||||
}
|
||||
|
||||
public double getTotalPrice() {
|
||||
@@ -21,4 +24,8 @@ public class QuoteResult {
|
||||
public PrintStats getStats() {
|
||||
return stats;
|
||||
}
|
||||
|
||||
public double getSetupCost() {
|
||||
return setupCost;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.CustomQuoteRequestAttachment;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CustomQuoteRequestAttachmentRepository extends JpaRepository<CustomQuoteRequestAttachment, UUID> {
|
||||
List<CustomQuoteRequestAttachment> findByRequest_IdOrderByCreatedAtAsc(UUID requestId);
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.CustomQuoteRequest;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CustomQuoteRequestRepository extends JpaRepository<CustomQuoteRequest, UUID> {
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.Customer;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface CustomerRepository extends JpaRepository<Customer, UUID> {
|
||||
Optional<Customer> findByEmail(String email);
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import com.printcalculator.entity.FilamentVariantOrcaOverride;
|
||||
import com.printcalculator.entity.PrinterMachineProfile;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
public interface FilamentVariantOrcaOverrideRepository extends JpaRepository<FilamentVariantOrcaOverride, Long> {
|
||||
Optional<FilamentVariantOrcaOverride> findByFilamentVariantAndPrinterMachineProfileAndIsActiveTrue(
|
||||
FilamentVariant filamentVariant,
|
||||
PrinterMachineProfile printerMachineProfile
|
||||
);
|
||||
}
|
||||
@@ -2,18 +2,12 @@ package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.EntityGraph;
|
||||
|
||||
import com.printcalculator.entity.FilamentMaterialType;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface FilamentVariantRepository extends JpaRepository<FilamentVariant, Long> {
|
||||
@EntityGraph(attributePaths = {"filamentMaterialType"})
|
||||
List<FilamentVariant> findByIsActiveTrue();
|
||||
|
||||
// We try to match by color name if possible, or get first active
|
||||
Optional<FilamentVariant> findByFilamentMaterialTypeAndColorName(FilamentMaterialType type, String colorName);
|
||||
Optional<FilamentVariant> findByFilamentMaterialTypeAndVariantDisplayName(FilamentMaterialType type, String variantDisplayName);
|
||||
Optional<FilamentVariant> findFirstByFilamentMaterialTypeAndIsActiveTrue(FilamentMaterialType type);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.FilamentVariantStockKg;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface FilamentVariantStockKgRepository extends JpaRepository<FilamentVariantStockKg, Long> {
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.FilamentMaterialType;
|
||||
import com.printcalculator.entity.MaterialOrcaProfileMap;
|
||||
import com.printcalculator.entity.PrinterMachineProfile;
|
||||
import org.springframework.data.jpa.repository.EntityGraph;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface MaterialOrcaProfileMapRepository extends JpaRepository<MaterialOrcaProfileMap, Long> {
|
||||
Optional<MaterialOrcaProfileMap> findByPrinterMachineProfileAndFilamentMaterialTypeAndIsActiveTrue(
|
||||
PrinterMachineProfile printerMachineProfile,
|
||||
FilamentMaterialType filamentMaterialType
|
||||
);
|
||||
|
||||
@EntityGraph(attributePaths = {"filamentMaterialType"})
|
||||
List<MaterialOrcaProfileMap> findByPrinterMachineProfileAndIsActiveTrue(PrinterMachineProfile printerMachineProfile);
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.OrderItem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface OrderItemRepository extends JpaRepository<OrderItem, UUID> {
|
||||
List<OrderItem> findByOrder_Id(UUID orderId);
|
||||
boolean existsByFilamentVariant_Id(Long filamentVariantId);
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface OrderRepository extends JpaRepository<Order, UUID> {
|
||||
List<Order> findAllByOrderByCreatedAtDesc();
|
||||
|
||||
boolean existsBySourceQuoteSession_Id(UUID sourceQuoteSessionId);
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.Payment;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface PaymentRepository extends JpaRepository<Payment, UUID> {
|
||||
Optional<Payment> findByOrder_Id(UUID orderId);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.PrinterFleetCurrent;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface PrinterFleetCurrentRepository extends JpaRepository<PrinterFleetCurrent, Long> {
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.PrinterMachine;
|
||||
import com.printcalculator.entity.PrinterMachineProfile;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface PrinterMachineProfileRepository extends JpaRepository<PrinterMachineProfile, Long> {
|
||||
Optional<PrinterMachineProfile> findByPrinterMachineAndNozzleDiameterMmAndIsActiveTrue(PrinterMachine printerMachine, BigDecimal nozzleDiameterMm);
|
||||
Optional<PrinterMachineProfile> findFirstByPrinterMachineAndIsDefaultTrueAndIsActiveTrue(PrinterMachine printerMachine);
|
||||
List<PrinterMachineProfile> findByPrinterMachineAndIsActiveTrue(PrinterMachine printerMachine);
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.QuoteLineItem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface QuoteLineItemRepository extends JpaRepository<QuoteLineItem, UUID> {
|
||||
List<QuoteLineItem> findByQuoteSessionId(UUID quoteSessionId);
|
||||
boolean existsByFilamentVariant_Id(Long filamentVariantId);
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.printcalculator.repository;
|
||||
|
||||
import com.printcalculator.entity.QuoteSession;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface QuoteSessionRepository extends JpaRepository<QuoteSession, UUID> {
|
||||
List<QuoteSession> findByCreatedAtBefore(java.time.OffsetDateTime cutoff);
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
package com.printcalculator.security;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.OptionalLong;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
@Service
|
||||
public class AdminLoginThrottleService {
|
||||
|
||||
private static final long BASE_DELAY_SECONDS = 2L;
|
||||
private static final long MAX_DELAY_SECONDS = 3601L;
|
||||
|
||||
private final ConcurrentHashMap<String, LoginAttemptState> attemptsByClient = new ConcurrentHashMap<>();
|
||||
private final boolean trustProxyHeaders;
|
||||
|
||||
public AdminLoginThrottleService(
|
||||
@Value("${admin.auth.trust-proxy-headers:false}") boolean trustProxyHeaders
|
||||
) {
|
||||
this.trustProxyHeaders = trustProxyHeaders;
|
||||
}
|
||||
|
||||
public OptionalLong getRemainingLockSeconds(String clientKey) {
|
||||
LoginAttemptState state = attemptsByClient.get(clientKey);
|
||||
if (state == null) {
|
||||
return OptionalLong.empty();
|
||||
}
|
||||
|
||||
long now = Instant.now().getEpochSecond();
|
||||
long remaining = state.blockedUntilEpochSeconds - now;
|
||||
if (remaining <= 0) {
|
||||
attemptsByClient.remove(clientKey, state);
|
||||
return OptionalLong.empty();
|
||||
}
|
||||
|
||||
return OptionalLong.of(remaining);
|
||||
}
|
||||
|
||||
public long registerFailure(String clientKey) {
|
||||
long now = Instant.now().getEpochSecond();
|
||||
LoginAttemptState state = attemptsByClient.compute(clientKey, (key, current) -> {
|
||||
int nextFailures = current == null ? 1 : current.failures + 1;
|
||||
long delay = calculateDelaySeconds(nextFailures);
|
||||
return new LoginAttemptState(nextFailures, now + delay);
|
||||
});
|
||||
|
||||
return calculateDelaySeconds(state.failures);
|
||||
}
|
||||
|
||||
public void reset(String clientKey) {
|
||||
attemptsByClient.remove(clientKey);
|
||||
}
|
||||
|
||||
public String resolveClientKey(HttpServletRequest request) {
|
||||
if (trustProxyHeaders) {
|
||||
String forwardedFor = request.getHeader("X-Forwarded-For");
|
||||
if (forwardedFor != null && !forwardedFor.isBlank()) {
|
||||
String[] parts = forwardedFor.split(",");
|
||||
if (parts.length > 0 && !parts[0].trim().isEmpty()) {
|
||||
return parts[0].trim();
|
||||
}
|
||||
}
|
||||
|
||||
String realIp = request.getHeader("X-Real-IP");
|
||||
if (realIp != null && !realIp.isBlank()) {
|
||||
return realIp.trim();
|
||||
}
|
||||
}
|
||||
|
||||
String remoteAddress = request.getRemoteAddr();
|
||||
if (remoteAddress != null && !remoteAddress.isBlank()) {
|
||||
return remoteAddress.trim();
|
||||
}
|
||||
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
private long calculateDelaySeconds(int failures) {
|
||||
long delay = BASE_DELAY_SECONDS;
|
||||
for (int i = 1; i < failures; i++) {
|
||||
if (delay >= MAX_DELAY_SECONDS) {
|
||||
return MAX_DELAY_SECONDS;
|
||||
}
|
||||
delay *= 2;
|
||||
}
|
||||
return Math.min(delay, MAX_DELAY_SECONDS);
|
||||
}
|
||||
|
||||
private static class LoginAttemptState {
|
||||
private final int failures;
|
||||
private final long blockedUntilEpochSeconds;
|
||||
|
||||
private LoginAttemptState(int failures, long blockedUntilEpochSeconds) {
|
||||
this.failures = failures;
|
||||
this.blockedUntilEpochSeconds = blockedUntilEpochSeconds;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
package com.printcalculator.security;
|
||||
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.filter.OncePerRequestFilter;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.Optional;
|
||||
|
||||
@Component
|
||||
public class AdminSessionAuthenticationFilter extends OncePerRequestFilter {
|
||||
|
||||
private final AdminSessionService adminSessionService;
|
||||
|
||||
public AdminSessionAuthenticationFilter(AdminSessionService adminSessionService) {
|
||||
this.adminSessionService = adminSessionService;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean shouldNotFilter(HttpServletRequest request) {
|
||||
String path = resolvePath(request);
|
||||
if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
|
||||
return true;
|
||||
}
|
||||
if (!path.startsWith("/api/admin/")) {
|
||||
return true;
|
||||
}
|
||||
return "/api/admin/auth/login".equals(path);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doFilterInternal(
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response,
|
||||
FilterChain filterChain
|
||||
) throws ServletException, IOException {
|
||||
Optional<String> token = adminSessionService.extractTokenFromCookies(request);
|
||||
Optional<AdminSessionService.AdminSessionPayload> payload = token.flatMap(adminSessionService::validateSessionToken);
|
||||
|
||||
if (payload.isEmpty()) {
|
||||
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
||||
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
|
||||
response.getWriter().write("{\"error\":\"UNAUTHORIZED\"}");
|
||||
return;
|
||||
}
|
||||
|
||||
UsernamePasswordAuthenticationToken authentication = UsernamePasswordAuthenticationToken.authenticated(
|
||||
"admin",
|
||||
null,
|
||||
Collections.emptyList()
|
||||
);
|
||||
SecurityContextHolder.getContext().setAuthentication(authentication);
|
||||
filterChain.doFilter(request, response);
|
||||
}
|
||||
|
||||
private String resolvePath(HttpServletRequest request) {
|
||||
String path = request.getRequestURI();
|
||||
String contextPath = request.getContextPath();
|
||||
if (contextPath != null && !contextPath.isEmpty() && path.startsWith(contextPath)) {
|
||||
return path.substring(contextPath.length());
|
||||
}
|
||||
return path;
|
||||
}
|
||||
}
|
||||
@@ -1,203 +0,0 @@
|
||||
package com.printcalculator.security;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import jakarta.servlet.http.Cookie;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.ResponseCookie;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.crypto.Mac;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.Base64;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
public class AdminSessionService {
|
||||
|
||||
public static final String COOKIE_NAME = "admin_session";
|
||||
private static final String COOKIE_PATH = "/api/admin";
|
||||
private static final String HMAC_ALGORITHM = "HmacSHA256";
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
private final String adminPassword;
|
||||
private final byte[] sessionSecret;
|
||||
private final long sessionTtlMinutes;
|
||||
|
||||
public AdminSessionService(
|
||||
ObjectMapper objectMapper,
|
||||
@Value("${admin.password}") String adminPassword,
|
||||
@Value("${admin.session.secret}") String sessionSecret,
|
||||
@Value("${admin.session.ttl-minutes}") long sessionTtlMinutes
|
||||
) {
|
||||
this.objectMapper = objectMapper;
|
||||
this.adminPassword = adminPassword;
|
||||
this.sessionSecret = sessionSecret.getBytes(StandardCharsets.UTF_8);
|
||||
this.sessionTtlMinutes = sessionTtlMinutes;
|
||||
|
||||
validateConfiguration(adminPassword, sessionSecret, sessionTtlMinutes);
|
||||
}
|
||||
|
||||
public boolean isPasswordValid(String candidatePassword) {
|
||||
if (candidatePassword == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return MessageDigest.isEqual(
|
||||
adminPassword.getBytes(StandardCharsets.UTF_8),
|
||||
candidatePassword.getBytes(StandardCharsets.UTF_8)
|
||||
);
|
||||
}
|
||||
|
||||
public String createSessionToken() {
|
||||
Instant now = Instant.now();
|
||||
AdminSessionPayload payload = new AdminSessionPayload(
|
||||
now.getEpochSecond(),
|
||||
now.plus(Duration.ofMinutes(sessionTtlMinutes)).getEpochSecond(),
|
||||
UUID.randomUUID().toString()
|
||||
);
|
||||
|
||||
try {
|
||||
String payloadJson = objectMapper.writeValueAsString(payload);
|
||||
String encodedPayload = base64UrlEncode(payloadJson.getBytes(StandardCharsets.UTF_8));
|
||||
String signature = base64UrlEncode(sign(encodedPayload));
|
||||
return encodedPayload + "." + signature;
|
||||
} catch (JsonProcessingException e) {
|
||||
throw new IllegalStateException("Cannot create admin session token", e);
|
||||
}
|
||||
}
|
||||
|
||||
public Optional<AdminSessionPayload> validateSessionToken(String token) {
|
||||
if (token == null || token.isBlank()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
String[] parts = token.split("\\.");
|
||||
if (parts.length != 2) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
String encodedPayload = parts[0];
|
||||
String encodedSignature = parts[1];
|
||||
byte[] providedSignature;
|
||||
try {
|
||||
providedSignature = base64UrlDecode(encodedSignature);
|
||||
} catch (IllegalArgumentException e) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
byte[] expectedSignature = sign(encodedPayload);
|
||||
if (!MessageDigest.isEqual(expectedSignature, providedSignature)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
try {
|
||||
byte[] decodedPayload = base64UrlDecode(encodedPayload);
|
||||
AdminSessionPayload payload = objectMapper.readValue(decodedPayload, AdminSessionPayload.class);
|
||||
if (payload.exp <= Instant.now().getEpochSecond()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return Optional.of(payload);
|
||||
} catch (IllegalArgumentException | IOException e) {
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
public Optional<String> extractTokenFromCookies(HttpServletRequest request) {
|
||||
Cookie[] cookies = request.getCookies();
|
||||
if (cookies == null || cookies.length == 0) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
for (Cookie cookie : cookies) {
|
||||
if (COOKIE_NAME.equals(cookie.getName())) {
|
||||
return Optional.ofNullable(cookie.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
public ResponseCookie buildLoginCookie(String token) {
|
||||
return ResponseCookie.from(COOKIE_NAME, token)
|
||||
.path(COOKIE_PATH)
|
||||
.httpOnly(true)
|
||||
.secure(true)
|
||||
.sameSite("Strict")
|
||||
.maxAge(Duration.ofMinutes(sessionTtlMinutes))
|
||||
.build();
|
||||
}
|
||||
|
||||
public ResponseCookie buildLogoutCookie() {
|
||||
return ResponseCookie.from(COOKIE_NAME, "")
|
||||
.path(COOKIE_PATH)
|
||||
.httpOnly(true)
|
||||
.secure(true)
|
||||
.sameSite("Strict")
|
||||
.maxAge(Duration.ZERO)
|
||||
.build();
|
||||
}
|
||||
|
||||
public long getSessionTtlMinutes() {
|
||||
return sessionTtlMinutes;
|
||||
}
|
||||
|
||||
private byte[] sign(String encodedPayload) {
|
||||
try {
|
||||
Mac mac = Mac.getInstance(HMAC_ALGORITHM);
|
||||
mac.init(new SecretKeySpec(sessionSecret, HMAC_ALGORITHM));
|
||||
return mac.doFinal(encodedPayload.getBytes(StandardCharsets.UTF_8));
|
||||
} catch (Exception e) {
|
||||
throw new IllegalStateException("Cannot sign admin session token", e);
|
||||
}
|
||||
}
|
||||
|
||||
private String base64UrlEncode(byte[] data) {
|
||||
return Base64.getUrlEncoder().withoutPadding().encodeToString(data);
|
||||
}
|
||||
|
||||
private byte[] base64UrlDecode(String data) {
|
||||
return Base64.getUrlDecoder().decode(data);
|
||||
}
|
||||
|
||||
private void validateConfiguration(String password, String secret, long ttlMinutes) {
|
||||
if (password == null || password.isBlank()) {
|
||||
throw new IllegalStateException("ADMIN_PASSWORD must be configured and non-empty");
|
||||
}
|
||||
if (secret == null || secret.isBlank()) {
|
||||
throw new IllegalStateException("ADMIN_SESSION_SECRET must be configured and non-empty");
|
||||
}
|
||||
if (secret.length() < 32) {
|
||||
throw new IllegalStateException("ADMIN_SESSION_SECRET must be at least 32 characters long");
|
||||
}
|
||||
if (ttlMinutes <= 0) {
|
||||
throw new IllegalStateException("ADMIN_SESSION_TTL_MINUTES must be > 0");
|
||||
}
|
||||
}
|
||||
|
||||
public static class AdminSessionPayload {
|
||||
@JsonProperty("iat")
|
||||
public long iat;
|
||||
@JsonProperty("exp")
|
||||
public long exp;
|
||||
@JsonProperty("nonce")
|
||||
public String nonce;
|
||||
|
||||
public AdminSessionPayload() {
|
||||
}
|
||||
|
||||
public AdminSessionPayload(long iat, long exp, String nonce) {
|
||||
this.iat = iat;
|
||||
this.exp = exp;
|
||||
this.nonce = nonce;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.printcalculator.exception.VirusDetectedException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import xyz.capybara.clamav.ClamavClient;
|
||||
import xyz.capybara.clamav.commands.scan.result.ScanResult;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class ClamAVService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(ClamAVService.class);
|
||||
|
||||
private final ClamavClient clamavClient;
|
||||
private final boolean enabled;
|
||||
|
||||
public ClamAVService(
|
||||
@Value("${clamav.host:clamav}") String host,
|
||||
@Value("${clamav.port:3310}") int port,
|
||||
@Value("${clamav.enabled:true}") boolean enabled
|
||||
) {
|
||||
this.enabled = enabled;
|
||||
ClamavClient client = null;
|
||||
try {
|
||||
if (enabled) {
|
||||
logger.info("Initializing ClamAV client at {}:{}", host, port);
|
||||
client = new ClamavClient(host, port);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("Failed to initialize ClamAV client: " + e.getMessage());
|
||||
}
|
||||
this.clamavClient = client;
|
||||
}
|
||||
|
||||
public boolean scan(InputStream inputStream) {
|
||||
if (!enabled || clamavClient == null) {
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
ScanResult result = clamavClient.scan(inputStream);
|
||||
if (result instanceof ScanResult.OK) {
|
||||
return true;
|
||||
} else if (result instanceof ScanResult.VirusFound) {
|
||||
Map<String, Collection<String>> viruses = ((ScanResult.VirusFound) result).getFoundViruses();
|
||||
logger.warn("VIRUS DETECTED: {}", viruses);
|
||||
throw new VirusDetectedException("Virus detected in the uploaded file: " + viruses);
|
||||
} else {
|
||||
logger.warn("Unknown scan result: {}. Allowing file (FAIL-OPEN)", result);
|
||||
return true;
|
||||
}
|
||||
} catch (VirusDetectedException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
logger.error("Error scanning file with ClamAV. Allowing file (FAIL-OPEN)", e);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import com.printcalculator.exception.StorageException;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
|
||||
@Service
|
||||
public class FileSystemStorageService implements StorageService {
|
||||
|
||||
private final Path rootLocation;
|
||||
private final Path normalizedRootLocation;
|
||||
private final ClamAVService clamAVService;
|
||||
|
||||
public FileSystemStorageService(@Value("${storage.location:storage_orders}") String storageLocation, ClamAVService clamAVService) {
|
||||
this.rootLocation = Paths.get(storageLocation);
|
||||
this.normalizedRootLocation = this.rootLocation.toAbsolutePath().normalize();
|
||||
this.clamAVService = clamAVService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
try {
|
||||
Files.createDirectories(rootLocation);
|
||||
} catch (IOException e) {
|
||||
throw new StorageException("Could not initialize storage", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void store(MultipartFile file, Path destinationRelativePath) throws IOException {
|
||||
Path destinationFile = resolveInsideStorage(destinationRelativePath);
|
||||
|
||||
// 1. Salva prima il file su disco per evitare problemi di stream con file grandi
|
||||
Files.createDirectories(destinationFile.getParent());
|
||||
file.transferTo(destinationFile.toFile());
|
||||
|
||||
// 2. Scansiona il file appena salvato aprendo un nuovo stream
|
||||
try (InputStream inputStream = new FileInputStream(destinationFile.toFile())) {
|
||||
if (!clamAVService.scan(inputStream)) {
|
||||
// Se infetto, cancella il file e solleva eccezione
|
||||
Files.deleteIfExists(destinationFile);
|
||||
throw new StorageException("File rejected by antivirus scanner.");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if (e instanceof StorageException) throw e;
|
||||
// Se l'antivirus fallisce per motivi tecnici, lasciamo il file (fail-open come concordato)
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void store(Path source, Path destinationRelativePath) throws IOException {
|
||||
Path destinationFile = resolveInsideStorage(destinationRelativePath);
|
||||
Files.createDirectories(destinationFile.getParent());
|
||||
Files.copy(source, destinationFile, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(Path path) throws IOException {
|
||||
Path file = resolveInsideStorage(path);
|
||||
Files.deleteIfExists(file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Resource loadAsResource(Path path) throws IOException {
|
||||
try {
|
||||
Path file = resolveInsideStorage(path);
|
||||
Resource resource = new UrlResource(file.toUri());
|
||||
if (resource.exists() || resource.isReadable()) {
|
||||
return resource;
|
||||
} else {
|
||||
throw new StorageException("Could not read file: " + path);
|
||||
}
|
||||
} catch (MalformedURLException e) {
|
||||
throw new StorageException("Could not read file: " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
private Path resolveInsideStorage(Path relativePath) {
|
||||
if (relativePath == null) {
|
||||
throw new StorageException("Path is required.");
|
||||
}
|
||||
|
||||
Path normalizedRelative = relativePath.normalize();
|
||||
if (normalizedRelative.isAbsolute()) {
|
||||
throw new StorageException("Cannot access absolute paths.");
|
||||
}
|
||||
|
||||
Path resolved = normalizedRootLocation.resolve(normalizedRelative).normalize();
|
||||
if (!resolved.startsWith(normalizedRootLocation)) {
|
||||
throw new StorageException("Cannot access files outside storage root.");
|
||||
}
|
||||
return resolved;
|
||||
}
|
||||
}
|
||||
@@ -1,143 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
|
||||
import com.openhtmltopdf.svgsupport.BatikSVGDrawer;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.thymeleaf.TemplateEngine;
|
||||
import org.thymeleaf.context.Context;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.stream.Collectors;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import com.printcalculator.entity.OrderItem;
|
||||
import com.printcalculator.entity.Payment;
|
||||
|
||||
@Service
|
||||
public class InvoicePdfRenderingService {
|
||||
|
||||
private final TemplateEngine thymeleafTemplateEngine;
|
||||
|
||||
public InvoicePdfRenderingService(TemplateEngine thymeleafTemplateEngine) {
|
||||
this.thymeleafTemplateEngine = thymeleafTemplateEngine;
|
||||
}
|
||||
|
||||
public byte[] generateInvoicePdfBytesFromTemplate(Map<String, Object> invoiceTemplateVariables, String qrBillSvg) {
|
||||
try {
|
||||
Context thymeleafContextWithInvoiceData = new Context(Locale.ITALY);
|
||||
thymeleafContextWithInvoiceData.setVariables(invoiceTemplateVariables);
|
||||
thymeleafContextWithInvoiceData.setVariable("qrBillSvg", qrBillSvg);
|
||||
|
||||
String renderedInvoiceHtml = thymeleafTemplateEngine.process("invoice", thymeleafContextWithInvoiceData);
|
||||
|
||||
String classpathBaseUrlForHtmlResources = new ClassPathResource("templates/").getURL().toExternalForm();
|
||||
|
||||
ByteArrayOutputStream generatedPdfByteArrayOutputStream = new ByteArrayOutputStream();
|
||||
|
||||
PdfRendererBuilder openHtmlToPdfRendererBuilder = new PdfRendererBuilder();
|
||||
openHtmlToPdfRendererBuilder.useFastMode();
|
||||
openHtmlToPdfRendererBuilder.useSVGDrawer(new BatikSVGDrawer());
|
||||
openHtmlToPdfRendererBuilder.withHtmlContent(renderedInvoiceHtml, classpathBaseUrlForHtmlResources);
|
||||
openHtmlToPdfRendererBuilder.toStream(generatedPdfByteArrayOutputStream);
|
||||
openHtmlToPdfRendererBuilder.run();
|
||||
|
||||
return generatedPdfByteArrayOutputStream.toByteArray();
|
||||
} catch (Exception pdfGenerationException) {
|
||||
throw new IllegalStateException("PDF invoice generation failed", pdfGenerationException);
|
||||
}
|
||||
}
|
||||
|
||||
public byte[] generateDocumentPdf(Order order, List<OrderItem> items, boolean isConfirmation, QrBillService qrBillService, Payment payment) {
|
||||
Map<String, Object> vars = new HashMap<>();
|
||||
vars.put("isConfirmation", isConfirmation);
|
||||
vars.put("sellerDisplayName", "3D Fab Küng Caletti");
|
||||
vars.put("sellerAddressLine1", "Joe Küng e Matteo Caletti");
|
||||
vars.put("sellerAddressLine2", "Sede Bienne, Svizzera");
|
||||
vars.put("sellerEmail", "info@3dfab.ch");
|
||||
|
||||
String displayOrderNumber = order.getOrderNumber() != null && !order.getOrderNumber().isBlank()
|
||||
? order.getOrderNumber()
|
||||
: order.getId().toString();
|
||||
|
||||
vars.put("invoiceNumber", "INV-" + displayOrderNumber.toUpperCase());
|
||||
vars.put("invoiceDate", order.getCreatedAt().format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
vars.put("dueDate", order.getCreatedAt().plusDays(7).format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
|
||||
String buyerName = order.getBillingCustomerType().equals("BUSINESS")
|
||||
? order.getBillingCompanyName()
|
||||
: order.getBillingFirstName() + " " + order.getBillingLastName();
|
||||
vars.put("buyerDisplayName", buyerName);
|
||||
vars.put("buyerAddressLine1", order.getBillingAddressLine1());
|
||||
vars.put("buyerAddressLine2", order.getBillingZip() + " " + order.getBillingCity() + ", " + order.getBillingCountryCode());
|
||||
|
||||
// Setup Shipping Info
|
||||
if (order.getShippingAddressLine1() != null && !order.getShippingAddressLine1().isBlank()) {
|
||||
String shippingName = order.getShippingCompanyName() != null && !order.getShippingCompanyName().isBlank()
|
||||
? order.getShippingCompanyName()
|
||||
: order.getShippingFirstName() + " " + order.getShippingLastName();
|
||||
vars.put("shippingDisplayName", shippingName);
|
||||
vars.put("shippingAddressLine1", order.getShippingAddressLine1());
|
||||
vars.put("shippingAddressLine2", order.getShippingZip() + " " + order.getShippingCity() + ", " + order.getShippingCountryCode());
|
||||
}
|
||||
|
||||
List<Map<String, Object>> invoiceLineItems = items.stream().map(i -> {
|
||||
Map<String, Object> line = new HashMap<>();
|
||||
line.put("description", "Stampa 3D: " + i.getOriginalFilename());
|
||||
line.put("quantity", i.getQuantity());
|
||||
line.put("unitPriceFormatted", String.format("CHF %.2f", i.getUnitPriceChf()));
|
||||
line.put("lineTotalFormatted", String.format("CHF %.2f", i.getLineTotalChf()));
|
||||
return line;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
Map<String, Object> setupLine = new HashMap<>();
|
||||
setupLine.put("description", "Costo Setup");
|
||||
setupLine.put("quantity", 1);
|
||||
setupLine.put("unitPriceFormatted", String.format("CHF %.2f", order.getSetupCostChf()));
|
||||
setupLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getSetupCostChf()));
|
||||
invoiceLineItems.add(setupLine);
|
||||
|
||||
Map<String, Object> shippingLine = new HashMap<>();
|
||||
shippingLine.put("description", "Spedizione");
|
||||
shippingLine.put("quantity", 1);
|
||||
shippingLine.put("unitPriceFormatted", String.format("CHF %.2f", order.getShippingCostChf()));
|
||||
shippingLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getShippingCostChf()));
|
||||
invoiceLineItems.add(shippingLine);
|
||||
|
||||
vars.put("invoiceLineItems", invoiceLineItems);
|
||||
vars.put("subtotalFormatted", String.format("CHF %.2f", order.getSubtotalChf()));
|
||||
vars.put("grandTotalFormatted", String.format("CHF %.2f", order.getTotalChf()));
|
||||
vars.put("paymentTermsText", isConfirmation ? "Pagamento entro 7 giorni via Bonifico o TWINT. Grazie." : "Pagato. Grazie per l'acquisto.");
|
||||
|
||||
String paymentMethodText = "QR / Bonifico oppure TWINT";
|
||||
if (payment != null && payment.getMethod() != null) {
|
||||
paymentMethodText = switch (payment.getMethod().toUpperCase()) {
|
||||
case "TWINT" -> "TWINT";
|
||||
case "BANK_TRANSFER", "BONIFICO" -> "Bonifico Bancario";
|
||||
case "QR_BILL", "QR" -> "QR Bill";
|
||||
case "CASH" -> "Contanti";
|
||||
default -> payment.getMethod();
|
||||
};
|
||||
}
|
||||
vars.put("paymentMethodText", paymentMethodText);
|
||||
|
||||
String qrBillSvg = null;
|
||||
if (isConfirmation) {
|
||||
qrBillSvg = new String(qrBillService.generateQrBillSvg(order), java.nio.charset.StandardCharsets.UTF_8);
|
||||
|
||||
if (qrBillSvg.contains("<?xml")) {
|
||||
int svgStartIndex = qrBillSvg.indexOf("<svg");
|
||||
if (svgStartIndex != -1) {
|
||||
qrBillSvg = qrBillSvg.substring(svgStartIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return generateInvoicePdfBytesFromTemplate(vars, qrBillSvg);
|
||||
}
|
||||
}
|
||||
@@ -1,152 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.printcalculator.entity.FilamentMaterialType;
|
||||
import com.printcalculator.entity.FilamentVariant;
|
||||
import com.printcalculator.entity.FilamentVariantOrcaOverride;
|
||||
import com.printcalculator.entity.MaterialOrcaProfileMap;
|
||||
import com.printcalculator.entity.PrinterMachine;
|
||||
import com.printcalculator.entity.PrinterMachineProfile;
|
||||
import com.printcalculator.repository.FilamentVariantOrcaOverrideRepository;
|
||||
import com.printcalculator.repository.MaterialOrcaProfileMapRepository;
|
||||
import com.printcalculator.repository.PrinterMachineProfileRepository;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Optional;
|
||||
|
||||
@Service
|
||||
public class OrcaProfileResolver {
|
||||
|
||||
private final PrinterMachineProfileRepository machineProfileRepo;
|
||||
private final MaterialOrcaProfileMapRepository materialMapRepo;
|
||||
private final FilamentVariantOrcaOverrideRepository variantOverrideRepo;
|
||||
|
||||
public OrcaProfileResolver(
|
||||
PrinterMachineProfileRepository machineProfileRepo,
|
||||
MaterialOrcaProfileMapRepository materialMapRepo,
|
||||
FilamentVariantOrcaOverrideRepository variantOverrideRepo
|
||||
) {
|
||||
this.machineProfileRepo = machineProfileRepo;
|
||||
this.materialMapRepo = materialMapRepo;
|
||||
this.variantOverrideRepo = variantOverrideRepo;
|
||||
}
|
||||
|
||||
public ResolvedProfiles resolve(PrinterMachine printerMachine, BigDecimal nozzleDiameterMm, FilamentVariant variant) {
|
||||
Optional<PrinterMachineProfile> machineProfileOpt = resolveMachineProfile(printerMachine, nozzleDiameterMm);
|
||||
|
||||
String machineProfileName = machineProfileOpt
|
||||
.map(PrinterMachineProfile::getOrcaMachineProfileName)
|
||||
.orElseGet(() -> fallbackMachineProfile(printerMachine, nozzleDiameterMm));
|
||||
|
||||
String filamentProfileName = machineProfileOpt
|
||||
.map(machineProfile -> resolveFilamentProfileWithMachineProfile(machineProfile, variant)
|
||||
.orElseGet(() -> fallbackFilamentProfile(variant.getFilamentMaterialType())))
|
||||
.orElseGet(() -> fallbackFilamentProfile(variant.getFilamentMaterialType()));
|
||||
|
||||
return new ResolvedProfiles(machineProfileName, filamentProfileName, machineProfileOpt.orElse(null));
|
||||
}
|
||||
|
||||
public Optional<PrinterMachineProfile> resolveMachineProfile(PrinterMachine machine, BigDecimal nozzleDiameterMm) {
|
||||
if (machine == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
BigDecimal normalizedNozzle = normalizeNozzle(nozzleDiameterMm);
|
||||
if (normalizedNozzle != null) {
|
||||
Optional<PrinterMachineProfile> exact = machineProfileRepo
|
||||
.findByPrinterMachineAndNozzleDiameterMmAndIsActiveTrue(machine, normalizedNozzle);
|
||||
if (exact.isPresent()) {
|
||||
return exact;
|
||||
}
|
||||
}
|
||||
|
||||
Optional<PrinterMachineProfile> defaultProfile = machineProfileRepo
|
||||
.findFirstByPrinterMachineAndIsDefaultTrueAndIsActiveTrue(machine);
|
||||
if (defaultProfile.isPresent()) {
|
||||
return defaultProfile;
|
||||
}
|
||||
|
||||
return machineProfileRepo.findByPrinterMachineAndIsActiveTrue(machine)
|
||||
.stream()
|
||||
.findFirst();
|
||||
}
|
||||
|
||||
private Optional<String> resolveFilamentProfileWithMachineProfile(PrinterMachineProfile machineProfile, FilamentVariant variant) {
|
||||
if (machineProfile == null || variant == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
Optional<FilamentVariantOrcaOverride> override = variantOverrideRepo
|
||||
.findByFilamentVariantAndPrinterMachineProfileAndIsActiveTrue(variant, machineProfile);
|
||||
|
||||
if (override.isPresent()) {
|
||||
return Optional.ofNullable(override.get().getOrcaFilamentProfileName());
|
||||
}
|
||||
|
||||
Optional<MaterialOrcaProfileMap> map = materialMapRepo
|
||||
.findByPrinterMachineProfileAndFilamentMaterialTypeAndIsActiveTrue(
|
||||
machineProfile,
|
||||
variant.getFilamentMaterialType()
|
||||
);
|
||||
|
||||
return map.map(MaterialOrcaProfileMap::getOrcaFilamentProfileName);
|
||||
}
|
||||
|
||||
private String fallbackMachineProfile(PrinterMachine machine, BigDecimal nozzleDiameterMm) {
|
||||
if (machine == null || machine.getPrinterDisplayName() == null || machine.getPrinterDisplayName().isBlank()) {
|
||||
return "Bambu Lab A1 0.4 nozzle";
|
||||
}
|
||||
|
||||
String displayName = machine.getPrinterDisplayName();
|
||||
if (displayName.toLowerCase().contains("bambulab a1") || displayName.toLowerCase().contains("bambu lab a1")) {
|
||||
String nozzleForProfile = formatNozzleForProfileName(nozzleDiameterMm);
|
||||
if (nozzleForProfile == null) {
|
||||
return "Bambu Lab A1 0.4 nozzle";
|
||||
}
|
||||
return "Bambu Lab A1 " + nozzleForProfile + " nozzle";
|
||||
}
|
||||
|
||||
return displayName;
|
||||
}
|
||||
|
||||
private String fallbackFilamentProfile(FilamentMaterialType materialType) {
|
||||
String materialCode = materialType != null && materialType.getMaterialCode() != null
|
||||
? materialType.getMaterialCode().trim().toUpperCase()
|
||||
: "PLA";
|
||||
|
||||
return switch (materialCode) {
|
||||
case "PLA TOUGH" -> "Bambu PLA Tough @BBL A1";
|
||||
case "PETG" -> "Generic PETG";
|
||||
case "TPU" -> "Generic TPU";
|
||||
case "PC" -> "Generic PC";
|
||||
case "ABS" -> "Generic ABS";
|
||||
default -> "Generic PLA";
|
||||
};
|
||||
}
|
||||
|
||||
private BigDecimal normalizeNozzle(BigDecimal nozzleDiameterMm) {
|
||||
if (nozzleDiameterMm == null) {
|
||||
return null;
|
||||
}
|
||||
return nozzleDiameterMm.setScale(2, RoundingMode.HALF_UP);
|
||||
}
|
||||
|
||||
private String formatNozzleForProfileName(BigDecimal nozzleDiameterMm) {
|
||||
BigDecimal normalizedNozzle = normalizeNozzle(nozzleDiameterMm);
|
||||
if (normalizedNozzle == null) {
|
||||
return null;
|
||||
}
|
||||
BigDecimal stripped = normalizedNozzle.stripTrailingZeros();
|
||||
if (stripped.scale() < 0) {
|
||||
stripped = stripped.setScale(0);
|
||||
}
|
||||
return stripped.toPlainString();
|
||||
}
|
||||
|
||||
public record ResolvedProfiles(
|
||||
String machineProfileName,
|
||||
String filamentProfileName,
|
||||
PrinterMachineProfile machineProfile
|
||||
) {}
|
||||
}
|
||||
@@ -1,355 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.printcalculator.dto.CreateOrderRequest;
|
||||
import com.printcalculator.entity.*;
|
||||
import com.printcalculator.repository.CustomerRepository;
|
||||
import com.printcalculator.repository.OrderItemRepository;
|
||||
import com.printcalculator.repository.OrderRepository;
|
||||
import com.printcalculator.repository.QuoteLineItemRepository;
|
||||
import com.printcalculator.repository.QuoteSessionRepository;
|
||||
import com.printcalculator.repository.PricingPolicyRepository;
|
||||
import com.printcalculator.event.OrderCreatedEvent;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.*;
|
||||
|
||||
@Service
|
||||
public class OrderService {
|
||||
|
||||
private final OrderRepository orderRepo;
|
||||
private final OrderItemRepository orderItemRepo;
|
||||
private final QuoteSessionRepository quoteSessionRepo;
|
||||
private final QuoteLineItemRepository quoteLineItemRepo;
|
||||
private final CustomerRepository customerRepo;
|
||||
private final StorageService storageService;
|
||||
private final InvoicePdfRenderingService invoiceService;
|
||||
private final QrBillService qrBillService;
|
||||
private final ApplicationEventPublisher eventPublisher;
|
||||
private final PaymentService paymentService;
|
||||
private final QuoteCalculator quoteCalculator;
|
||||
private final PricingPolicyRepository pricingRepo;
|
||||
|
||||
public OrderService(OrderRepository orderRepo,
|
||||
OrderItemRepository orderItemRepo,
|
||||
QuoteSessionRepository quoteSessionRepo,
|
||||
QuoteLineItemRepository quoteLineItemRepo,
|
||||
CustomerRepository customerRepo,
|
||||
StorageService storageService,
|
||||
InvoicePdfRenderingService invoiceService,
|
||||
QrBillService qrBillService,
|
||||
ApplicationEventPublisher eventPublisher,
|
||||
PaymentService paymentService,
|
||||
QuoteCalculator quoteCalculator,
|
||||
PricingPolicyRepository pricingRepo) {
|
||||
this.orderRepo = orderRepo;
|
||||
this.orderItemRepo = orderItemRepo;
|
||||
this.quoteSessionRepo = quoteSessionRepo;
|
||||
this.quoteLineItemRepo = quoteLineItemRepo;
|
||||
this.customerRepo = customerRepo;
|
||||
this.storageService = storageService;
|
||||
this.invoiceService = invoiceService;
|
||||
this.qrBillService = qrBillService;
|
||||
this.eventPublisher = eventPublisher;
|
||||
this.paymentService = paymentService;
|
||||
this.quoteCalculator = quoteCalculator;
|
||||
this.pricingRepo = pricingRepo;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Order createOrderFromQuote(UUID quoteSessionId, CreateOrderRequest request) {
|
||||
if (!request.isAcceptTerms() || !request.isAcceptPrivacy()) {
|
||||
throw new IllegalArgumentException("Accettazione Termini e Privacy obbligatoria.");
|
||||
}
|
||||
|
||||
QuoteSession session = quoteSessionRepo.findById(quoteSessionId)
|
||||
.orElseThrow(() -> new RuntimeException("Quote Session not found"));
|
||||
|
||||
if (session.getConvertedOrderId() != null) {
|
||||
throw new IllegalStateException("Quote session already converted to order");
|
||||
}
|
||||
|
||||
Customer customer = customerRepo.findByEmail(request.getCustomer().getEmail())
|
||||
.orElseGet(() -> {
|
||||
Customer newC = new Customer();
|
||||
newC.setEmail(request.getCustomer().getEmail());
|
||||
newC.setCustomerType(request.getCustomer().getCustomerType());
|
||||
newC.setCreatedAt(OffsetDateTime.now());
|
||||
newC.setUpdatedAt(OffsetDateTime.now());
|
||||
return customerRepo.save(newC);
|
||||
});
|
||||
|
||||
customer.setPhone(request.getCustomer().getPhone());
|
||||
customer.setCustomerType(request.getCustomer().getCustomerType());
|
||||
|
||||
if (request.getBillingAddress() != null) {
|
||||
customer.setFirstName(request.getBillingAddress().getFirstName());
|
||||
customer.setLastName(request.getBillingAddress().getLastName());
|
||||
customer.setCompanyName(request.getBillingAddress().getCompanyName());
|
||||
customer.setContactPerson(request.getBillingAddress().getContactPerson());
|
||||
}
|
||||
|
||||
customer.setUpdatedAt(OffsetDateTime.now());
|
||||
customerRepo.save(customer);
|
||||
|
||||
Order order = new Order();
|
||||
order.setSourceQuoteSession(session);
|
||||
order.setCustomer(customer);
|
||||
order.setCustomerEmail(request.getCustomer().getEmail());
|
||||
order.setCustomerPhone(request.getCustomer().getPhone());
|
||||
order.setStatus("PENDING_PAYMENT");
|
||||
order.setCreatedAt(OffsetDateTime.now());
|
||||
order.setUpdatedAt(OffsetDateTime.now());
|
||||
order.setPreferredLanguage(normalizeLanguage(request.getLanguage()));
|
||||
order.setCurrency("CHF");
|
||||
|
||||
order.setBillingCustomerType(request.getCustomer().getCustomerType());
|
||||
if (request.getBillingAddress() != null) {
|
||||
order.setBillingFirstName(request.getBillingAddress().getFirstName());
|
||||
order.setBillingLastName(request.getBillingAddress().getLastName());
|
||||
order.setBillingCompanyName(request.getBillingAddress().getCompanyName());
|
||||
order.setBillingContactPerson(request.getBillingAddress().getContactPerson());
|
||||
order.setBillingAddressLine1(request.getBillingAddress().getAddressLine1());
|
||||
order.setBillingAddressLine2(request.getBillingAddress().getAddressLine2());
|
||||
order.setBillingZip(request.getBillingAddress().getZip());
|
||||
order.setBillingCity(request.getBillingAddress().getCity());
|
||||
order.setBillingCountryCode(request.getBillingAddress().getCountryCode() != null ? request.getBillingAddress().getCountryCode() : "CH");
|
||||
}
|
||||
|
||||
order.setShippingSameAsBilling(request.isShippingSameAsBilling());
|
||||
if (!request.isShippingSameAsBilling() && request.getShippingAddress() != null) {
|
||||
order.setShippingFirstName(request.getShippingAddress().getFirstName());
|
||||
order.setShippingLastName(request.getShippingAddress().getLastName());
|
||||
order.setShippingCompanyName(request.getShippingAddress().getCompanyName());
|
||||
order.setShippingContactPerson(request.getShippingAddress().getContactPerson());
|
||||
order.setShippingAddressLine1(request.getShippingAddress().getAddressLine1());
|
||||
order.setShippingAddressLine2(request.getShippingAddress().getAddressLine2());
|
||||
order.setShippingZip(request.getShippingAddress().getZip());
|
||||
order.setShippingCity(request.getShippingAddress().getCity());
|
||||
order.setShippingCountryCode(request.getShippingAddress().getCountryCode() != null ? request.getShippingAddress().getCountryCode() : "CH");
|
||||
} else {
|
||||
order.setShippingFirstName(order.getBillingFirstName());
|
||||
order.setShippingLastName(order.getBillingLastName());
|
||||
order.setShippingCompanyName(order.getBillingCompanyName());
|
||||
order.setShippingContactPerson(order.getBillingContactPerson());
|
||||
order.setShippingAddressLine1(order.getBillingAddressLine1());
|
||||
order.setShippingAddressLine2(order.getBillingAddressLine2());
|
||||
order.setShippingZip(order.getBillingZip());
|
||||
order.setShippingCity(order.getBillingCity());
|
||||
order.setShippingCountryCode(order.getBillingCountryCode());
|
||||
}
|
||||
|
||||
List<QuoteLineItem> quoteItems = quoteLineItemRepo.findByQuoteSessionId(quoteSessionId);
|
||||
|
||||
BigDecimal subtotal = BigDecimal.ZERO;
|
||||
order.setSubtotalChf(BigDecimal.ZERO);
|
||||
order.setTotalChf(BigDecimal.ZERO);
|
||||
order.setDiscountChf(BigDecimal.ZERO);
|
||||
order.setSetupCostChf(session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO);
|
||||
|
||||
// Calculate shipping cost based on dimensions before initial save
|
||||
boolean exceedsBaseSize = false;
|
||||
for (QuoteLineItem item : quoteItems) {
|
||||
BigDecimal x = item.getBoundingBoxXMm() != null ? item.getBoundingBoxXMm() : BigDecimal.ZERO;
|
||||
BigDecimal y = item.getBoundingBoxYMm() != null ? item.getBoundingBoxYMm() : BigDecimal.ZERO;
|
||||
BigDecimal z = item.getBoundingBoxZMm() != null ? item.getBoundingBoxZMm() : BigDecimal.ZERO;
|
||||
|
||||
BigDecimal[] dims = {x, y, z};
|
||||
java.util.Arrays.sort(dims);
|
||||
|
||||
if (dims[2].compareTo(BigDecimal.valueOf(250.0)) > 0 ||
|
||||
dims[1].compareTo(BigDecimal.valueOf(176.0)) > 0 ||
|
||||
dims[0].compareTo(BigDecimal.valueOf(20.0)) > 0) {
|
||||
exceedsBaseSize = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
int totalQuantity = quoteItems.stream()
|
||||
.mapToInt(i -> i.getQuantity() != null ? i.getQuantity() : 1)
|
||||
.sum();
|
||||
|
||||
if (exceedsBaseSize) {
|
||||
order.setShippingCostChf(totalQuantity > 5 ? BigDecimal.valueOf(9.00) : BigDecimal.valueOf(4.00));
|
||||
} else {
|
||||
order.setShippingCostChf(BigDecimal.valueOf(2.00));
|
||||
}
|
||||
|
||||
order = orderRepo.save(order);
|
||||
|
||||
List<OrderItem> savedItems = new ArrayList<>();
|
||||
|
||||
// Calculate global machine cost upfront
|
||||
BigDecimal totalSeconds = BigDecimal.ZERO;
|
||||
for (QuoteLineItem qItem : quoteItems) {
|
||||
if (qItem.getPrintTimeSeconds() != null) {
|
||||
totalSeconds = totalSeconds.add(BigDecimal.valueOf(qItem.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(qItem.getQuantity())));
|
||||
}
|
||||
}
|
||||
BigDecimal totalHours = totalSeconds.divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
|
||||
PricingPolicy policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
|
||||
BigDecimal globalMachineCost = quoteCalculator.calculateSessionMachineCost(policy, totalHours);
|
||||
|
||||
for (QuoteLineItem qItem : quoteItems) {
|
||||
OrderItem oItem = new OrderItem();
|
||||
oItem.setOrder(order);
|
||||
oItem.setOriginalFilename(qItem.getOriginalFilename());
|
||||
oItem.setQuantity(qItem.getQuantity());
|
||||
oItem.setColorCode(qItem.getColorCode());
|
||||
oItem.setFilamentVariant(qItem.getFilamentVariant());
|
||||
if (qItem.getFilamentVariant() != null
|
||||
&& qItem.getFilamentVariant().getFilamentMaterialType() != null
|
||||
&& qItem.getFilamentVariant().getFilamentMaterialType().getMaterialCode() != null) {
|
||||
oItem.setMaterialCode(qItem.getFilamentVariant().getFilamentMaterialType().getMaterialCode());
|
||||
} else {
|
||||
oItem.setMaterialCode(session.getMaterialCode());
|
||||
}
|
||||
|
||||
BigDecimal distributedUnitPrice = qItem.getUnitPriceChf();
|
||||
if (totalSeconds.compareTo(BigDecimal.ZERO) > 0 && qItem.getPrintTimeSeconds() != null) {
|
||||
BigDecimal itemSeconds = BigDecimal.valueOf(qItem.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(qItem.getQuantity()));
|
||||
BigDecimal share = itemSeconds.divide(totalSeconds, 8, RoundingMode.HALF_UP);
|
||||
BigDecimal itemMachineCost = globalMachineCost.multiply(share);
|
||||
BigDecimal unitMachineCost = itemMachineCost.divide(BigDecimal.valueOf(qItem.getQuantity()), 2, RoundingMode.HALF_UP);
|
||||
distributedUnitPrice = distributedUnitPrice.add(unitMachineCost);
|
||||
}
|
||||
|
||||
oItem.setUnitPriceChf(distributedUnitPrice);
|
||||
oItem.setLineTotalChf(distributedUnitPrice.multiply(BigDecimal.valueOf(qItem.getQuantity())));
|
||||
oItem.setPrintTimeSeconds(qItem.getPrintTimeSeconds());
|
||||
oItem.setMaterialGrams(qItem.getMaterialGrams());
|
||||
oItem.setBoundingBoxXMm(qItem.getBoundingBoxXMm());
|
||||
oItem.setBoundingBoxYMm(qItem.getBoundingBoxYMm());
|
||||
oItem.setBoundingBoxZMm(qItem.getBoundingBoxZMm());
|
||||
|
||||
UUID fileUuid = UUID.randomUUID();
|
||||
String ext = getExtension(qItem.getOriginalFilename());
|
||||
String storedFilename = fileUuid.toString() + "." + ext;
|
||||
|
||||
oItem.setStoredFilename(storedFilename);
|
||||
oItem.setStoredRelativePath("PENDING");
|
||||
oItem.setMimeType("application/octet-stream");
|
||||
oItem.setCreatedAt(OffsetDateTime.now());
|
||||
|
||||
oItem = orderItemRepo.save(oItem);
|
||||
|
||||
String relativePath = "orders/" + order.getId() + "/3d-files/" + oItem.getId() + "/" + storedFilename;
|
||||
oItem.setStoredRelativePath(relativePath);
|
||||
|
||||
if (qItem.getStoredPath() != null) {
|
||||
try {
|
||||
Path sourcePath = Paths.get(qItem.getStoredPath());
|
||||
if (Files.exists(sourcePath)) {
|
||||
storageService.store(sourcePath, Paths.get(relativePath));
|
||||
oItem.setFileSizeBytes(Files.size(sourcePath));
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
oItem = orderItemRepo.save(oItem);
|
||||
savedItems.add(oItem);
|
||||
subtotal = subtotal.add(oItem.getLineTotalChf());
|
||||
}
|
||||
|
||||
order.setSubtotalChf(subtotal);
|
||||
|
||||
BigDecimal total = subtotal.add(order.getSetupCostChf()).add(order.getShippingCostChf()).subtract(order.getDiscountChf() != null ? order.getDiscountChf() : BigDecimal.ZERO);
|
||||
order.setTotalChf(total);
|
||||
|
||||
session.setConvertedOrderId(order.getId());
|
||||
session.setStatus("CONVERTED");
|
||||
quoteSessionRepo.save(session);
|
||||
|
||||
// Generate Invoice and QR Bill
|
||||
generateAndSaveDocuments(order, savedItems);
|
||||
|
||||
Order savedOrder = orderRepo.save(order);
|
||||
|
||||
// ALWAYS initialize payment as PENDING
|
||||
paymentService.getOrCreatePaymentForOrder(savedOrder, "OTHER");
|
||||
|
||||
eventPublisher.publishEvent(new OrderCreatedEvent(this, savedOrder));
|
||||
|
||||
return savedOrder;
|
||||
}
|
||||
|
||||
private void generateAndSaveDocuments(Order order, List<OrderItem> items) {
|
||||
try {
|
||||
// 1. Generate and save the raw QR Bill for internal traceability.
|
||||
byte[] qrBillSvgBytes = qrBillService.generateQrBillSvg(order);
|
||||
saveFileBytes(qrBillSvgBytes, buildQrBillSvgRelativePath(order));
|
||||
|
||||
// 2. Generate and save the same confirmation PDF served by /api/orders/{id}/confirmation.
|
||||
byte[] confirmationPdfBytes = invoiceService.generateDocumentPdf(order, items, true, qrBillService, null);
|
||||
saveFileBytes(confirmationPdfBytes, buildConfirmationPdfRelativePath(order));
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
// Don't fail the order if document generation fails, but log it
|
||||
// TODO: Better error handling
|
||||
}
|
||||
}
|
||||
|
||||
private void saveFileBytes(byte[] content, String relativePath) {
|
||||
// Since StorageService takes paths, we might need to write to temp first or check if it supports bytes/streams
|
||||
// Simulating via temp file for now as StorageService.store takes a Path
|
||||
try {
|
||||
Path tempFile = Files.createTempFile("print-calc-upload", ".tmp");
|
||||
Files.write(tempFile, content);
|
||||
storageService.store(tempFile, Paths.get(relativePath));
|
||||
Files.delete(tempFile);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Failed to save file " + relativePath, e);
|
||||
}
|
||||
}
|
||||
|
||||
private String getExtension(String filename) {
|
||||
if (filename == null) return "stl";
|
||||
int i = filename.lastIndexOf('.');
|
||||
if (i > 0) {
|
||||
return filename.substring(i + 1);
|
||||
}
|
||||
return "stl";
|
||||
}
|
||||
|
||||
private String getDisplayOrderNumber(Order order) {
|
||||
String orderNumber = order.getOrderNumber();
|
||||
if (orderNumber != null && !orderNumber.isBlank()) {
|
||||
return orderNumber;
|
||||
}
|
||||
return order.getId() != null ? order.getId().toString() : "unknown";
|
||||
}
|
||||
|
||||
private String buildQrBillSvgRelativePath(Order order) {
|
||||
return "orders/" + order.getId() + "/documents/qr-bill.svg";
|
||||
}
|
||||
|
||||
private String buildConfirmationPdfRelativePath(Order order) {
|
||||
return "orders/" + order.getId() + "/documents/confirmation-" + getDisplayOrderNumber(order) + ".pdf";
|
||||
}
|
||||
|
||||
private String normalizeLanguage(String language) {
|
||||
if (language == null || language.isBlank()) {
|
||||
return "it";
|
||||
}
|
||||
|
||||
String normalized = language.trim().toLowerCase(Locale.ROOT);
|
||||
if (normalized.length() > 2) {
|
||||
normalized = normalized.substring(0, 2);
|
||||
}
|
||||
|
||||
return switch (normalized) {
|
||||
case "it", "en", "de", "fr" -> normalized;
|
||||
default -> "it";
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import com.printcalculator.entity.Payment;
|
||||
import com.printcalculator.event.PaymentReportedEvent;
|
||||
import com.printcalculator.event.PaymentConfirmedEvent;
|
||||
import com.printcalculator.repository.OrderRepository;
|
||||
import com.printcalculator.repository.PaymentRepository;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
@Service
|
||||
public class PaymentService {
|
||||
|
||||
private final PaymentRepository paymentRepo;
|
||||
private final OrderRepository orderRepo;
|
||||
private final ApplicationEventPublisher eventPublisher;
|
||||
|
||||
public PaymentService(PaymentRepository paymentRepo,
|
||||
OrderRepository orderRepo,
|
||||
ApplicationEventPublisher eventPublisher) {
|
||||
this.paymentRepo = paymentRepo;
|
||||
this.orderRepo = orderRepo;
|
||||
this.eventPublisher = eventPublisher;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Payment getOrCreatePaymentForOrder(Order order, String defaultMethod) {
|
||||
Optional<Payment> existing = paymentRepo.findByOrder_Id(order.getId());
|
||||
if (existing.isPresent()) {
|
||||
return existing.get();
|
||||
}
|
||||
|
||||
Payment payment = new Payment();
|
||||
payment.setOrder(order);
|
||||
// Default to "OTHER" always, as payment method should only be set by the admin explicitly
|
||||
payment.setMethod("OTHER");
|
||||
payment.setStatus("PENDING");
|
||||
payment.setCurrency(order.getCurrency() != null ? order.getCurrency() : "CHF");
|
||||
payment.setAmountChf(order.getTotalChf() != null ? order.getTotalChf() : BigDecimal.ZERO);
|
||||
payment.setInitiatedAt(OffsetDateTime.now());
|
||||
|
||||
return paymentRepo.save(payment);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Payment reportPayment(UUID orderId, String method) {
|
||||
Order order = orderRepo.findById(orderId)
|
||||
.orElseThrow(() -> new RuntimeException("Order not found with id " + orderId));
|
||||
|
||||
Payment payment = paymentRepo.findByOrder_Id(orderId)
|
||||
.orElseGet(() -> getOrCreatePaymentForOrder(order, "OTHER"));
|
||||
|
||||
if (!"PENDING".equals(payment.getStatus())) {
|
||||
throw new IllegalStateException("Payment is not in PENDING state. Current state: " + payment.getStatus());
|
||||
}
|
||||
|
||||
payment.setStatus("REPORTED");
|
||||
payment.setReportedAt(OffsetDateTime.now());
|
||||
|
||||
// We intentionally do not update the payment method here based on user input,
|
||||
// because the user cannot reliably determine the actual method without an integration.
|
||||
// It will be updated by the backoffice admin manually.
|
||||
|
||||
payment = paymentRepo.save(payment);
|
||||
|
||||
eventPublisher.publishEvent(new PaymentReportedEvent(this, order, payment));
|
||||
|
||||
return payment;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Payment confirmPayment(UUID orderId, String method) {
|
||||
Order order = orderRepo.findById(orderId)
|
||||
.orElseThrow(() -> new RuntimeException("Order not found with id " + orderId));
|
||||
|
||||
Payment payment = paymentRepo.findByOrder_Id(orderId)
|
||||
.orElseGet(() -> getOrCreatePaymentForOrder(order, method != null ? method : "OTHER"));
|
||||
|
||||
payment.setStatus("COMPLETED");
|
||||
if (method != null && !method.isBlank()) {
|
||||
payment.setMethod(method.toUpperCase());
|
||||
}
|
||||
payment.setReceivedAt(OffsetDateTime.now());
|
||||
payment = paymentRepo.save(payment);
|
||||
|
||||
order.setStatus("IN_PRODUCTION");
|
||||
order.setPaidAt(OffsetDateTime.now());
|
||||
orderRepo.save(order);
|
||||
|
||||
eventPublisher.publishEvent(new PaymentConfirmedEvent(this, order, payment));
|
||||
|
||||
return payment;
|
||||
}
|
||||
}
|
||||
@@ -10,23 +10,18 @@ import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.Optional;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Stream;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@Service
|
||||
public class ProfileManager {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(ProfileManager.class.getName());
|
||||
private final String profilesRoot;
|
||||
private final Path resolvedProfilesRoot;
|
||||
private final ObjectMapper mapper;
|
||||
|
||||
private final Map<String, String> profileAliases;
|
||||
@@ -36,8 +31,6 @@ public class ProfileManager {
|
||||
this.mapper = mapper;
|
||||
this.profileAliases = new HashMap<>();
|
||||
initializeAliases();
|
||||
this.resolvedProfilesRoot = resolveProfilesRoot(profilesRoot);
|
||||
logger.info("Profiles root configured as '" + this.profilesRoot + "', resolved to '" + this.resolvedProfilesRoot + "'");
|
||||
}
|
||||
|
||||
private void initializeAliases() {
|
||||
@@ -46,7 +39,6 @@ public class ProfileManager {
|
||||
|
||||
// Material Aliases
|
||||
profileAliases.put("pla_basic", "Bambu PLA Basic @BBL A1");
|
||||
profileAliases.put("pla_tough", "Bambu PLA Tough @BBL A1");
|
||||
profileAliases.put("petg_basic", "Bambu PETG Basic @BBL A1");
|
||||
profileAliases.put("tpu_95a", "Bambu TPU 95A @BBL A1");
|
||||
|
||||
@@ -62,82 +54,30 @@ public class ProfileManager {
|
||||
public ObjectNode getMergedProfile(String profileName, String type) throws IOException {
|
||||
Path profilePath = findProfileFile(profileName, type);
|
||||
if (profilePath == null) {
|
||||
throw new IOException("Profile not found: " + profileName + " (root=" + resolvedProfilesRoot + ")");
|
||||
throw new IOException("Profile not found: " + profileName);
|
||||
}
|
||||
logger.info("Resolved " + type + " profile '" + profileName + "' -> " + profilePath);
|
||||
return resolveInheritance(profilePath);
|
||||
}
|
||||
|
||||
private Path findProfileFile(String name, String type) {
|
||||
if (!Files.isDirectory(resolvedProfilesRoot)) {
|
||||
logger.severe("Profiles root does not exist or is not a directory: " + resolvedProfilesRoot);
|
||||
return null;
|
||||
}
|
||||
|
||||
// Check aliases first
|
||||
String resolvedName = profileAliases.getOrDefault(name, name);
|
||||
|
||||
// Look for name.json under the expected type directory first to avoid
|
||||
// collisions across vendors/profile families with same filename.
|
||||
String filename = toJsonFilename(resolvedName);
|
||||
// Simple search: look for name.json in the profiles_root recursively
|
||||
// Type could be "machine", "process", "filament" to narrow down, but for now global search
|
||||
String filename = resolvedName.endsWith(".json") ? resolvedName : resolvedName + ".json";
|
||||
|
||||
try (Stream<Path> stream = Files.walk(resolvedProfilesRoot)) {
|
||||
List<Path> candidates = stream
|
||||
try (Stream<Path> stream = Files.walk(Paths.get(profilesRoot))) {
|
||||
Optional<Path> found = stream
|
||||
.filter(p -> p.getFileName().toString().equals(filename))
|
||||
.sorted()
|
||||
.toList();
|
||||
|
||||
if (candidates.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (type != null && !type.isBlank() && !"any".equalsIgnoreCase(type)) {
|
||||
Optional<Path> typed = candidates.stream()
|
||||
.filter(p -> pathContainsSegment(p, type))
|
||||
.findFirst();
|
||||
if (typed.isPresent()) {
|
||||
return typed.get();
|
||||
}
|
||||
}
|
||||
|
||||
return candidates.get(0);
|
||||
return found.orElse(null);
|
||||
} catch (IOException e) {
|
||||
logger.severe("Error searching for profile: " + e.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private Path resolveProfilesRoot(String configuredRoot) {
|
||||
Set<Path> candidates = new LinkedHashSet<>();
|
||||
Path cwd = Paths.get("").toAbsolutePath().normalize();
|
||||
|
||||
if (configuredRoot != null && !configuredRoot.isBlank()) {
|
||||
Path configured = Paths.get(configuredRoot);
|
||||
candidates.add(configured.toAbsolutePath().normalize());
|
||||
if (!configured.isAbsolute()) {
|
||||
candidates.add(cwd.resolve(configuredRoot).normalize());
|
||||
}
|
||||
}
|
||||
|
||||
candidates.add(cwd.resolve("profiles").normalize());
|
||||
candidates.add(cwd.resolve("backend/profiles").normalize());
|
||||
candidates.add(Paths.get("/app/profiles").toAbsolutePath().normalize());
|
||||
|
||||
List<String> checkedPaths = new ArrayList<>();
|
||||
for (Path candidate : candidates) {
|
||||
checkedPaths.add(candidate.toString());
|
||||
if (Files.isDirectory(candidate)) {
|
||||
return candidate;
|
||||
}
|
||||
}
|
||||
|
||||
logger.warning("No profiles directory found. Checked: " + String.join(", ", checkedPaths));
|
||||
if (configuredRoot != null && !configuredRoot.isBlank()) {
|
||||
return Paths.get(configuredRoot).toAbsolutePath().normalize();
|
||||
}
|
||||
return cwd.resolve("profiles").normalize();
|
||||
}
|
||||
|
||||
private ObjectNode resolveInheritance(Path currentPath) throws IOException {
|
||||
// 1. Load current
|
||||
JsonNode currentNode = mapper.readTree(currentPath.toFile());
|
||||
@@ -145,20 +85,14 @@ public class ProfileManager {
|
||||
// 2. Check inherits
|
||||
if (currentNode.has("inherits")) {
|
||||
String parentName = currentNode.get("inherits").asText();
|
||||
// Try local directory first with explicit .json filename.
|
||||
String parentFilename = toJsonFilename(parentName);
|
||||
Path parentPath = currentPath.getParent().resolve(parentFilename);
|
||||
// Try to find parent in same directory or standard search
|
||||
Path parentPath = currentPath.getParent().resolve(parentName);
|
||||
if (!Files.exists(parentPath)) {
|
||||
// Fallback to the same profile type directory before global.
|
||||
String inferredType = inferTypeFromPath(currentPath);
|
||||
parentPath = findProfileFile(parentName, inferredType);
|
||||
}
|
||||
if (parentPath == null || !Files.exists(parentPath)) {
|
||||
// If not in same dir, search globally
|
||||
parentPath = findProfileFile(parentName, "any");
|
||||
}
|
||||
|
||||
if (parentPath != null && Files.exists(parentPath)) {
|
||||
logger.info("Resolved inherits '" + parentName + "' for " + currentPath + " -> " + parentPath);
|
||||
// Recursive call
|
||||
ObjectNode parentNode = resolveInheritance(parentPath);
|
||||
// Merge current into parent (child overrides parent)
|
||||
@@ -189,30 +123,4 @@ public class ProfileManager {
|
||||
mainNode.set(fieldName, jsonNode);
|
||||
}
|
||||
}
|
||||
|
||||
private String toJsonFilename(String name) {
|
||||
return name.endsWith(".json") ? name : name + ".json";
|
||||
}
|
||||
|
||||
private boolean pathContainsSegment(Path path, String segment) {
|
||||
String normalized = path.toString().replace('\\', '/');
|
||||
String needle = "/" + segment + "/";
|
||||
return normalized.contains(needle);
|
||||
}
|
||||
|
||||
private String inferTypeFromPath(Path path) {
|
||||
if (path == null) {
|
||||
return "any";
|
||||
}
|
||||
if (pathContainsSegment(path, "machine")) {
|
||||
return "machine";
|
||||
}
|
||||
if (pathContainsSegment(path, "process")) {
|
||||
return "process";
|
||||
}
|
||||
if (pathContainsSegment(path, "filament")) {
|
||||
return "filament";
|
||||
}
|
||||
return "any";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import net.codecrete.qrbill.generator.Bill;
|
||||
import net.codecrete.qrbill.generator.GraphicsFormat;
|
||||
import net.codecrete.qrbill.generator.QRBill;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Service
|
||||
public class QrBillService {
|
||||
|
||||
public byte[] generateQrBillSvg(Order order) {
|
||||
Bill bill = createBillFromOrder(order);
|
||||
return QRBill.generate(bill);
|
||||
}
|
||||
|
||||
public Bill createBillFromOrder(Order order) {
|
||||
Bill bill = new Bill();
|
||||
|
||||
// Creditor (Merchant)
|
||||
bill.setAccount("CH7409000000154821581"); // TODO: Configurable IBAN
|
||||
bill.setCreditor(createAddress(
|
||||
"Joe Küng",
|
||||
"Via G. Pioda 29a",
|
||||
"6710",
|
||||
"Biasca",
|
||||
"CH"
|
||||
));
|
||||
|
||||
// Debtor (Customer)
|
||||
String debtorName;
|
||||
if ("BUSINESS".equals(order.getBillingCustomerType())) {
|
||||
debtorName = order.getBillingCompanyName();
|
||||
} else {
|
||||
debtorName = order.getBillingFirstName() + " " + order.getBillingLastName();
|
||||
}
|
||||
|
||||
bill.setDebtor(createAddress(
|
||||
debtorName,
|
||||
order.getBillingAddressLine1(), // Assuming simple address for now. Splitting might be needed if street/house number are separate
|
||||
order.getBillingZip(),
|
||||
order.getBillingCity(),
|
||||
order.getBillingCountryCode()
|
||||
));
|
||||
|
||||
// Amount
|
||||
bill.setAmount(order.getTotalChf());
|
||||
bill.setCurrency("CHF");
|
||||
|
||||
bill.setUnstructuredMessage(order.getId().toString());
|
||||
|
||||
return bill;
|
||||
}
|
||||
|
||||
private net.codecrete.qrbill.generator.Address createAddress(String name, String street, String zip, String city, String country) {
|
||||
net.codecrete.qrbill.generator.Address address = new net.codecrete.qrbill.generator.Address();
|
||||
address.setName(name);
|
||||
address.setStreet(street);
|
||||
address.setPostalCode(zip);
|
||||
address.setTown(city);
|
||||
address.setCountryCode(country);
|
||||
return address;
|
||||
}
|
||||
}
|
||||
@@ -21,8 +21,6 @@ import java.util.List;
|
||||
|
||||
@Service
|
||||
public class QuoteCalculator {
|
||||
private static final BigDecimal SETUP_FEE_DOUBLE_THRESHOLD_CHF = BigDecimal.TEN;
|
||||
private static final BigDecimal SETUP_FEE_MULTIPLIER_BELOW_THRESHOLD = BigDecimal.valueOf(2);
|
||||
|
||||
private final PricingPolicyRepository pricingRepo;
|
||||
private final PricingPolicyMachineHourTierRepository tierRepo;
|
||||
@@ -62,70 +60,44 @@ public class QuoteCalculator {
|
||||
.orElseThrow(() -> new RuntimeException("No active printer found"));
|
||||
}
|
||||
|
||||
// 3. Fetch Filament Info
|
||||
// filamentProfileName might be "bambu_pla_basic_black" or "Generic PLA"
|
||||
// We try to extract material code (PLA, PETG)
|
||||
String materialCode = detectMaterialCode(filamentProfileName);
|
||||
FilamentMaterialType materialType = materialRepo.findByMaterialCode(materialCode)
|
||||
.orElseThrow(() -> new RuntimeException("Unknown material type: " + materialCode));
|
||||
|
||||
// Try to find specific variant (e.g. by color if we could parse it)
|
||||
// For now, get default/first active variant for this material
|
||||
FilamentVariant variant = variantRepo.findFirstByFilamentMaterialTypeAndIsActiveTrue(materialType)
|
||||
.orElseThrow(() -> new RuntimeException("No active variant for material: " + materialCode));
|
||||
|
||||
return calculate(stats, machine, policy, variant);
|
||||
}
|
||||
|
||||
public QuoteResult calculate(PrintStats stats, String machineName, FilamentVariant variant) {
|
||||
PricingPolicy policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
|
||||
if (policy == null) {
|
||||
throw new RuntimeException("No active pricing policy found");
|
||||
}
|
||||
// --- CALCULATIONS ---
|
||||
|
||||
PrinterMachine machine = machineRepo.findByPrinterDisplayName(machineName).orElse(null);
|
||||
if (machine == null) {
|
||||
machine = machineRepo.findFirstByIsActiveTrue()
|
||||
.orElseThrow(() -> new RuntimeException("No active printer found"));
|
||||
}
|
||||
|
||||
return calculate(stats, machine, policy, variant);
|
||||
}
|
||||
|
||||
private QuoteResult calculate(PrintStats stats, PrinterMachine machine, PricingPolicy policy, FilamentVariant variant) {
|
||||
BigDecimal weightKg = BigDecimal.valueOf(stats.filamentWeightGrams())
|
||||
.divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
|
||||
// Material Cost: (weight / 1000) * costPerKg
|
||||
BigDecimal weightKg = BigDecimal.valueOf(stats.filamentWeightGrams()).divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
|
||||
BigDecimal materialCost = weightKg.multiply(variant.getCostChfPerKg());
|
||||
|
||||
BigDecimal totalHours = BigDecimal.valueOf(stats.printTimeSeconds())
|
||||
.divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
|
||||
// Machine Cost: Tiered
|
||||
BigDecimal totalHours = BigDecimal.valueOf(stats.printTimeSeconds()).divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
|
||||
BigDecimal machineCost = calculateMachineCost(policy, totalHours);
|
||||
|
||||
BigDecimal kw = BigDecimal.valueOf(machine.getPowerWatts())
|
||||
.divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
|
||||
// Energy Cost: (watts / 1000) * hours * costPerKwh
|
||||
BigDecimal kw = BigDecimal.valueOf(machine.getPowerWatts()).divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
|
||||
BigDecimal kwh = kw.multiply(totalHours);
|
||||
BigDecimal energyCost = kwh.multiply(policy.getElectricityCostChfPerKwh());
|
||||
|
||||
BigDecimal subtotal = materialCost.add(energyCost);
|
||||
BigDecimal markupFactor = BigDecimal.ONE.add(
|
||||
policy.getMarkupPercent().divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)
|
||||
);
|
||||
subtotal = subtotal.multiply(markupFactor);
|
||||
// Subtotal (Costs + Fixed Fees)
|
||||
BigDecimal fixedFee = policy.getFixedJobFeeChf();
|
||||
BigDecimal subtotal = materialCost.add(machineCost).add(energyCost).add(fixedFee);
|
||||
|
||||
return new QuoteResult(subtotal.doubleValue(), "CHF", stats);
|
||||
}
|
||||
public BigDecimal calculateSessionMachineCost(PricingPolicy policy, BigDecimal hours) {
|
||||
BigDecimal rawCost = calculateMachineCost(policy, hours);
|
||||
// Markup
|
||||
// Markup is percentage (e.g. 20.0)
|
||||
BigDecimal markupFactor = BigDecimal.ONE.add(policy.getMarkupPercent().divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
|
||||
return rawCost.multiply(markupFactor).setScale(2, RoundingMode.HALF_UP);
|
||||
}
|
||||
BigDecimal totalPrice = subtotal.multiply(markupFactor).setScale(2, RoundingMode.HALF_UP);
|
||||
|
||||
public BigDecimal calculateSessionSetupFee(PricingPolicy policy) {
|
||||
if (policy == null || policy.getFixedJobFeeChf() == null) {
|
||||
return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
|
||||
}
|
||||
|
||||
BigDecimal baseSetupFee = policy.getFixedJobFeeChf();
|
||||
if (baseSetupFee.compareTo(SETUP_FEE_DOUBLE_THRESHOLD_CHF) < 0) {
|
||||
return baseSetupFee
|
||||
.multiply(SETUP_FEE_MULTIPLIER_BELOW_THRESHOLD)
|
||||
.setScale(2, RoundingMode.HALF_UP);
|
||||
}
|
||||
|
||||
return baseSetupFee.setScale(2, RoundingMode.HALF_UP);
|
||||
return new QuoteResult(totalPrice.doubleValue(), "CHF", stats, fixedFee.doubleValue());
|
||||
}
|
||||
|
||||
private BigDecimal calculateMachineCost(PricingPolicy policy, BigDecimal hours) {
|
||||
@@ -175,7 +147,6 @@ public class QuoteCalculator {
|
||||
|
||||
private String detectMaterialCode(String profileName) {
|
||||
String lower = profileName.toLowerCase();
|
||||
if (lower.contains("pla tough") || lower.contains("pla_tough")) return "PLA TOUGH";
|
||||
if (lower.contains("petg")) return "PETG";
|
||||
if (lower.contains("tpu")) return "TPU";
|
||||
if (lower.contains("abs")) return "ABS";
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import com.printcalculator.entity.QuoteSession;
|
||||
import com.printcalculator.repository.QuoteSessionRepository;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@Service
|
||||
public class SessionCleanupService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(SessionCleanupService.class);
|
||||
private final QuoteSessionRepository sessionRepository;
|
||||
|
||||
public SessionCleanupService(QuoteSessionRepository sessionRepository) {
|
||||
this.sessionRepository = sessionRepository;
|
||||
}
|
||||
|
||||
// Run every day at 3 AM
|
||||
@Scheduled(cron = "0 0 3 * * ?")
|
||||
@Transactional
|
||||
public void cleanupOldSessions() {
|
||||
logger.info("Starting session cleanup job...");
|
||||
|
||||
OffsetDateTime cutoff = OffsetDateTime.now().minusDays(15);
|
||||
List<QuoteSession> oldSessions = sessionRepository.findByCreatedAtBefore(cutoff);
|
||||
|
||||
int deletedCount = 0;
|
||||
for (QuoteSession session : oldSessions) {
|
||||
// We only delete sessions that are NOT ordered?
|
||||
// The user request was "delete old ones".
|
||||
// Safest is to check status if we had one.
|
||||
// QuoteSession entity has 'status' field.
|
||||
// Let's assume we delete 'PENDING' or similar, but maybe we just delete all old inputs?
|
||||
// "rimangono in memoria... cancella quelle vecchie di 7 giorni".
|
||||
// Implementation plan said: status != 'ORDERED'.
|
||||
|
||||
// User specified statuses: ACTIVE, EXPIRED, CONVERTED.
|
||||
// We should NOT delete sessions that have been converted to an order.
|
||||
if ("CONVERTED".equals(session.getStatus())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
try {
|
||||
// Delete ACTIVE or EXPIRED sessions older than 7 days
|
||||
deleteSessionFiles(session.getId().toString());
|
||||
sessionRepository.delete(session);
|
||||
deletedCount++;
|
||||
} catch (Exception e) {
|
||||
logger.error("Failed to cleanup session {}", session.getId(), e);
|
||||
}
|
||||
}
|
||||
|
||||
logger.info("Session cleanup job finished. Deleted {} sessions.", deletedCount);
|
||||
}
|
||||
|
||||
private void deleteSessionFiles(String sessionId) {
|
||||
Path sessionDir = Paths.get("storage_quotes", sessionId);
|
||||
if (Files.exists(sessionDir)) {
|
||||
try (Stream<Path> walk = Files.walk(sessionDir)) {
|
||||
walk.sorted(java.util.Comparator.reverseOrder())
|
||||
.map(Path::toFile)
|
||||
.forEach(java.io.File::delete);
|
||||
} catch (IOException e) {
|
||||
logger.error("Failed to delete directory: {}", sessionDir, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,6 @@ package com.printcalculator.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.printcalculator.model.ModelDimensions;
|
||||
import com.printcalculator.model.PrintStats;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -10,27 +9,19 @@ import org.springframework.stereotype.Service;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.InvalidPathException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Comparator;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@Service
|
||||
public class SlicerService {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(SlicerService.class.getName());
|
||||
private static final Pattern SIZE_X_PATTERN = Pattern.compile("(?m)^\\s*size_x\\s*=\\s*([-+]?\\d+(?:\\.\\d+)?)\\s*$");
|
||||
private static final Pattern SIZE_Y_PATTERN = Pattern.compile("(?m)^\\s*size_y\\s*=\\s*([-+]?\\d+(?:\\.\\d+)?)\\s*$");
|
||||
private static final Pattern SIZE_Z_PATTERN = Pattern.compile("(?m)^\\s*size_z\\s*=\\s*([-+]?\\d+(?:\\.\\d+)?)\\s*$");
|
||||
|
||||
private final String trustedSlicerPath;
|
||||
private final String slicerPath;
|
||||
private final ProfileManager profileManager;
|
||||
private final GCodeParser gCodeParser;
|
||||
private final ObjectMapper mapper;
|
||||
@@ -40,7 +31,7 @@ public class SlicerService {
|
||||
ProfileManager profileManager,
|
||||
GCodeParser gCodeParser,
|
||||
ObjectMapper mapper) {
|
||||
this.trustedSlicerPath = normalizeExecutablePath(slicerPath);
|
||||
this.slicerPath = slicerPath;
|
||||
this.profileManager = profileManager;
|
||||
this.gCodeParser = gCodeParser;
|
||||
this.mapper = mapper;
|
||||
@@ -53,12 +44,6 @@ public class SlicerService {
|
||||
ObjectNode filamentProfile = profileManager.getMergedProfile(filamentName, "filament");
|
||||
ObjectNode processProfile = profileManager.getMergedProfile(processName, "process");
|
||||
|
||||
logger.info("Slicer profiles: machine='" + machineName + "', filament='" + filamentName + "', process='" + processName + "'");
|
||||
logger.info("Machine limits: printable_area=" + machineProfile.path("printable_area")
|
||||
+ ", printable_height=" + machineProfile.path("printable_height")
|
||||
+ ", bed_exclude_area=" + machineProfile.path("bed_exclude_area")
|
||||
+ ", head_wrap_detect_zone=" + machineProfile.path("head_wrap_detect_zone"));
|
||||
|
||||
// Apply Overrides
|
||||
if (machineOverrides != null) {
|
||||
machineOverrides.forEach(machineProfile::put);
|
||||
@@ -78,69 +63,63 @@ public class SlicerService {
|
||||
mapper.writeValue(fFile, filamentProfile);
|
||||
mapper.writeValue(pFile, processProfile);
|
||||
|
||||
String basename = inputStl.getName();
|
||||
if (basename.toLowerCase().endsWith(".stl")) {
|
||||
basename = basename.substring(0, basename.length() - 4);
|
||||
}
|
||||
Path slicerLogPath = tempDir.resolve("orcaslicer.log");
|
||||
String machineProfilePath = requireSafeArgument(mFile.getAbsolutePath(), "machine profile path");
|
||||
String processProfilePath = requireSafeArgument(pFile.getAbsolutePath(), "process profile path");
|
||||
String filamentProfilePath = requireSafeArgument(fFile.getAbsolutePath(), "filament profile path");
|
||||
String outputDirPath = requireSafeArgument(tempDir.toAbsolutePath().toString(), "output directory path");
|
||||
String inputStlPath = requireSafeArgument(inputStl.getAbsolutePath(), "input STL path");
|
||||
// 3. Build Command
|
||||
// --load-settings "machine.json;process.json" --load-filaments "filament.json"
|
||||
List<String> command = new ArrayList<>();
|
||||
command.add(slicerPath);
|
||||
|
||||
// 3. Run slicer. Retry with arrange only for out-of-volume style failures.
|
||||
for (boolean useArrange : new boolean[]{false, true}) {
|
||||
// Build process arguments explicitly to avoid shell interpretation and command injection.
|
||||
ProcessBuilder pb = new ProcessBuilder();
|
||||
List<String> command = pb.command();
|
||||
command.add(trustedSlicerPath);
|
||||
// Load machine settings
|
||||
command.add("--load-settings");
|
||||
command.add(machineProfilePath);
|
||||
command.add(mFile.getAbsolutePath());
|
||||
|
||||
// Load process settings
|
||||
command.add("--load-settings");
|
||||
command.add(processProfilePath);
|
||||
command.add(pFile.getAbsolutePath());
|
||||
command.add("--load-filaments");
|
||||
command.add(filamentProfilePath);
|
||||
command.add(fFile.getAbsolutePath());
|
||||
command.add("--ensure-on-bed");
|
||||
if (useArrange) {
|
||||
command.add("--arrange");
|
||||
command.add("1");
|
||||
}
|
||||
command.add("1"); // force arrange
|
||||
command.add("--slice");
|
||||
command.add("0");
|
||||
command.add("0"); // slice plate 0
|
||||
command.add("--outputdir");
|
||||
command.add(outputDirPath);
|
||||
command.add(inputStlPath);
|
||||
command.add(tempDir.toAbsolutePath().toString());
|
||||
// Need to handle Mac structure for console if needed?
|
||||
// Usually the binary at Contents/MacOS/OrcaSlicer works fine as console app.
|
||||
|
||||
logger.info("Executing Slicer" + (useArrange ? " (retry with arrange)" : "") + ": " + String.join(" ", command));
|
||||
command.add(inputStl.getAbsolutePath());
|
||||
|
||||
Files.deleteIfExists(slicerLogPath);
|
||||
logger.info("Executing Slicer: " + String.join(" ", command));
|
||||
|
||||
// 4. Run Process
|
||||
ProcessBuilder pb = new ProcessBuilder(command);
|
||||
pb.directory(tempDir.toFile());
|
||||
pb.redirectErrorStream(true);
|
||||
pb.redirectOutput(slicerLogPath.toFile());
|
||||
// pb.inheritIO(); // Useful for debugging, but maybe capture instead?
|
||||
|
||||
Process process = pb.start();
|
||||
boolean finished = process.waitFor(5, TimeUnit.MINUTES);
|
||||
|
||||
if (!finished) {
|
||||
process.destroyForcibly();
|
||||
process.destroy();
|
||||
throw new IOException("Slicer timed out");
|
||||
}
|
||||
|
||||
if (process.exitValue() != 0) {
|
||||
String error = "";
|
||||
if (Files.exists(slicerLogPath)) {
|
||||
error = Files.readString(slicerLogPath, StandardCharsets.UTF_8);
|
||||
}
|
||||
if (!useArrange && isOutOfVolumeError(error)) {
|
||||
logger.warning("Slicer reported model out of printable area, retrying with arrange.");
|
||||
continue;
|
||||
}
|
||||
// Read stderr
|
||||
String error = new String(process.getErrorStream().readAllBytes());
|
||||
throw new IOException("Slicer failed with exit code " + process.exitValue() + ": " + error);
|
||||
}
|
||||
|
||||
// 5. Find Output GCode
|
||||
// Usually [basename].gcode or plate_1.gcode
|
||||
String basename = inputStl.getName();
|
||||
if (basename.toLowerCase().endsWith(".stl")) {
|
||||
basename = basename.substring(0, basename.length() - 4);
|
||||
}
|
||||
|
||||
File gcodeFile = tempDir.resolve(basename + ".gcode").toFile();
|
||||
if (!gcodeFile.exists()) {
|
||||
// Try plate_1.gcode fallback
|
||||
File alt = tempDir.resolve("plate_1.gcode").toFile();
|
||||
if (alt.exists()) {
|
||||
gcodeFile = alt;
|
||||
@@ -149,162 +128,19 @@ public class SlicerService {
|
||||
}
|
||||
}
|
||||
|
||||
// 6. Parse Results
|
||||
return gCodeParser.parse(gcodeFile);
|
||||
}
|
||||
|
||||
throw new IOException("Slicer failed after retry");
|
||||
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new IOException("Interrupted during slicing", e);
|
||||
} finally {
|
||||
deleteRecursively(tempDir);
|
||||
// Cleanup temp dir
|
||||
// In production we should delete, for debugging we might want to keep?
|
||||
// Let's delete for now on success.
|
||||
// recursiveDelete(tempDir);
|
||||
// Leaving it effectively "leaks" temp, but safer for persistent debugging?
|
||||
// Implementation detail: Use a utility to clean up.
|
||||
}
|
||||
}
|
||||
|
||||
public Optional<ModelDimensions> inspectModelDimensions(File inputModel) {
|
||||
Path tempDir = null;
|
||||
try {
|
||||
tempDir = Files.createTempDirectory("slicer_info_");
|
||||
Path infoLogPath = tempDir.resolve("orcaslicer-info.log");
|
||||
String inputModelPath = requireSafeArgument(inputModel.getAbsolutePath(), "input model path");
|
||||
|
||||
ProcessBuilder pb = new ProcessBuilder();
|
||||
List<String> infoCommand = pb.command();
|
||||
infoCommand.add(trustedSlicerPath);
|
||||
infoCommand.add("--info");
|
||||
infoCommand.add(inputModelPath);
|
||||
pb.directory(tempDir.toFile());
|
||||
pb.redirectErrorStream(true);
|
||||
pb.redirectOutput(infoLogPath.toFile());
|
||||
|
||||
Process process = pb.start();
|
||||
boolean finished = process.waitFor(2, TimeUnit.MINUTES);
|
||||
if (!finished) {
|
||||
process.destroyForcibly();
|
||||
logger.warning("Model info extraction timed out for " + inputModel.getName());
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
String output = Files.exists(infoLogPath)
|
||||
? Files.readString(infoLogPath, StandardCharsets.UTF_8)
|
||||
: "";
|
||||
|
||||
if (process.exitValue() != 0) {
|
||||
logger.warning("OrcaSlicer --info failed (exit " + process.exitValue() + ") for "
|
||||
+ inputModel.getName() + ": " + output);
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
Optional<ModelDimensions> parsed = parseModelDimensionsFromInfoOutput(output);
|
||||
if (parsed.isEmpty()) {
|
||||
logger.warning("Could not parse size_x/size_y/size_z from OrcaSlicer --info output for "
|
||||
+ inputModel.getName() + ": " + output);
|
||||
}
|
||||
return parsed;
|
||||
} catch (Exception e) {
|
||||
logger.warning("Failed to inspect model dimensions for " + inputModel.getName() + ": " + e.getMessage());
|
||||
return Optional.empty();
|
||||
} finally {
|
||||
if (tempDir != null) {
|
||||
deleteRecursively(tempDir);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static Optional<ModelDimensions> parseModelDimensionsFromInfoOutput(String output) {
|
||||
if (output == null || output.isBlank()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
Double x = extractDouble(SIZE_X_PATTERN, output);
|
||||
Double y = extractDouble(SIZE_Y_PATTERN, output);
|
||||
Double z = extractDouble(SIZE_Z_PATTERN, output);
|
||||
|
||||
if (x == null || y == null || z == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
if (x <= 0 || y <= 0 || z <= 0) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
return Optional.of(new ModelDimensions(x, y, z));
|
||||
}
|
||||
|
||||
private static Double extractDouble(Pattern pattern, String text) {
|
||||
Matcher matcher = pattern.matcher(text);
|
||||
if (!matcher.find()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return Double.parseDouble(matcher.group(1));
|
||||
} catch (NumberFormatException ignored) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteRecursively(Path path) {
|
||||
if (path == null || !Files.exists(path)) {
|
||||
return;
|
||||
}
|
||||
|
||||
try (var walk = Files.walk(path)) {
|
||||
walk.sorted(Comparator.reverseOrder()).forEach(p -> {
|
||||
try {
|
||||
Files.deleteIfExists(p);
|
||||
} catch (IOException e) {
|
||||
logger.warning("Failed to delete temp path " + p + ": " + e.getMessage());
|
||||
}
|
||||
});
|
||||
} catch (IOException e) {
|
||||
logger.warning("Failed to walk temp directory " + path + ": " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isOutOfVolumeError(String errorLog) {
|
||||
if (errorLog == null || errorLog.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
String normalized = errorLog.toLowerCase();
|
||||
return normalized.contains("nothing to be sliced")
|
||||
|| normalized.contains("no object is fully inside the print volume")
|
||||
|| normalized.contains("calc_exclude_triangles");
|
||||
}
|
||||
|
||||
private String normalizeExecutablePath(String configuredPath) {
|
||||
if (configuredPath == null || configuredPath.isBlank()) {
|
||||
throw new IllegalArgumentException("slicer.path is required");
|
||||
}
|
||||
if (containsControlChars(configuredPath)) {
|
||||
throw new IllegalArgumentException("slicer.path contains invalid control characters");
|
||||
}
|
||||
try {
|
||||
return Path.of(configuredPath.trim()).normalize().toString();
|
||||
} catch (InvalidPathException e) {
|
||||
throw new IllegalArgumentException("Invalid slicer.path: " + configuredPath, e);
|
||||
}
|
||||
}
|
||||
|
||||
private String requireSafeArgument(String value, String argName) throws IOException {
|
||||
if (value == null || value.isBlank()) {
|
||||
throw new IOException("Missing required argument: " + argName);
|
||||
}
|
||||
if (containsControlChars(value)) {
|
||||
throw new IOException("Invalid control characters in " + argName);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
private boolean containsControlChars(String value) {
|
||||
for (int i = 0; i < value.length(); i++) {
|
||||
char ch = value.charAt(i);
|
||||
if (ch == '\0' || ch == '\n' || ch == '\r') {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import java.nio.file.Path;
|
||||
import java.io.IOException;
|
||||
|
||||
public interface StorageService {
|
||||
void init();
|
||||
void store(MultipartFile file, Path destination) throws IOException;
|
||||
void store(Path source, Path destination) throws IOException;
|
||||
void delete(Path path) throws IOException;
|
||||
Resource loadAsResource(Path path) throws IOException;
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
package com.printcalculator.service;
|
||||
|
||||
import io.nayuki.qrcodegen.QrCode;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
@Service
|
||||
public class TwintPaymentService {
|
||||
|
||||
private final String twintPaymentUrl;
|
||||
|
||||
public TwintPaymentService(
|
||||
@Value("${payment.twint.url:}")
|
||||
String twintPaymentUrl
|
||||
) {
|
||||
this.twintPaymentUrl = twintPaymentUrl;
|
||||
}
|
||||
|
||||
public String getTwintPaymentUrl(com.printcalculator.entity.Order order) {
|
||||
if (twintPaymentUrl == null || twintPaymentUrl.isBlank()) {
|
||||
throw new IllegalStateException("TWINT_PAYMENT_URL is not configured");
|
||||
}
|
||||
|
||||
StringBuilder urlBuilder = new StringBuilder(twintPaymentUrl);
|
||||
|
||||
if (order != null) {
|
||||
if (order.getTotalChf() != null) {
|
||||
urlBuilder.append("&amount=").append(order.getTotalChf().toPlainString());
|
||||
}
|
||||
|
||||
String orderNumber = order.getOrderNumber();
|
||||
if (orderNumber == null && order.getId() != null) {
|
||||
orderNumber = order.getId().toString();
|
||||
}
|
||||
|
||||
if (orderNumber != null) {
|
||||
try {
|
||||
urlBuilder.append("&trxInfo=").append(order.getId());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return urlBuilder.toString();
|
||||
}
|
||||
|
||||
public byte[] generateQrPng(com.printcalculator.entity.Order order, int sizePx) {
|
||||
try {
|
||||
String url = getTwintPaymentUrl(order);
|
||||
// Use High Error Correction for financial QR codes
|
||||
QrCode qrCode = QrCode.encodeText(url, QrCode.Ecc.HIGH);
|
||||
|
||||
// Standard QR quiet zone is 4 modules
|
||||
int borderModules = 4;
|
||||
int fullModules = qrCode.size + borderModules * 2;
|
||||
int scale = Math.max(1, sizePx / fullModules);
|
||||
int imageSize = fullModules * scale;
|
||||
|
||||
BufferedImage image = new BufferedImage(imageSize, imageSize, BufferedImage.TYPE_INT_RGB);
|
||||
Graphics2D graphics = image.createGraphics();
|
||||
try {
|
||||
graphics.setColor(Color.WHITE);
|
||||
graphics.fillRect(0, 0, imageSize, imageSize);
|
||||
graphics.setColor(Color.BLACK);
|
||||
|
||||
for (int y = 0; y < qrCode.size; y++) {
|
||||
for (int x = 0; x < qrCode.size; x++) {
|
||||
if (qrCode.getModule(x, y)) {
|
||||
int px = (x + borderModules) * scale;
|
||||
int py = (y + borderModules) * scale;
|
||||
graphics.fillRect(px, py, scale, scale);
|
||||
}
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
graphics.dispose();
|
||||
}
|
||||
|
||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||
ImageIO.write(image, "png", outputStream);
|
||||
return outputStream.toByteArray();
|
||||
} catch (Exception ex) {
|
||||
throw new IllegalStateException("Unable to generate TWINT QR image.", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package com.printcalculator.service.email;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface EmailNotificationService {
|
||||
|
||||
/**
|
||||
* Sends an HTML email using a Thymeleaf template.
|
||||
*
|
||||
* @param to The recipient email address.
|
||||
* @param subject The subject of the email.
|
||||
* @param templateName The name of the Thymeleaf template (e.g., "order-confirmation").
|
||||
* @param contextData The data to populate the template with.
|
||||
*/
|
||||
void sendEmail(String to, String subject, String templateName, Map<String, Object> contextData);
|
||||
|
||||
/**
|
||||
* Sends an HTML email using a Thymeleaf template, with an optional attachment.
|
||||
*
|
||||
* @param to The recipient email address.
|
||||
* @param subject The subject of the email.
|
||||
* @param templateName The name of the Thymeleaf template (e.g., "order-confirmation").
|
||||
* @param contextData The data to populate the template with.
|
||||
* @param attachmentName The name for the attachment file.
|
||||
* @param attachmentData The raw bytes of the attachment.
|
||||
*/
|
||||
void sendEmailWithAttachment(String to, String subject, String templateName, Map<String, Object> contextData, String attachmentName, byte[] attachmentData);
|
||||
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package com.printcalculator.service.email;
|
||||
|
||||
import jakarta.mail.MessagingException;
|
||||
import jakarta.mail.internet.MimeMessage;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.mail.javamail.JavaMailSender;
|
||||
import org.springframework.mail.javamail.MimeMessageHelper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.thymeleaf.TemplateEngine;
|
||||
import org.thymeleaf.context.Context;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SmtpEmailNotificationService implements EmailNotificationService {
|
||||
|
||||
private final JavaMailSender emailSender;
|
||||
private final TemplateEngine templateEngine;
|
||||
|
||||
@Value("${app.mail.from}")
|
||||
private String fromAddress;
|
||||
|
||||
@Value("${app.mail.enabled:true}")
|
||||
private boolean mailEnabled;
|
||||
|
||||
@Override
|
||||
public void sendEmail(String to, String subject, String templateName, Map<String, Object> contextData) {
|
||||
sendEmailWithAttachment(to, subject, templateName, contextData, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendEmailWithAttachment(String to, String subject, String templateName, Map<String, Object> contextData, String attachmentName, byte[] attachmentData) {
|
||||
if (!mailEnabled) {
|
||||
log.info("Email sending disabled (app.mail.enabled=false). Skipping email to {}", to);
|
||||
return;
|
||||
}
|
||||
|
||||
log.info("Preparing to send email to {} with template {}", to, templateName);
|
||||
|
||||
try {
|
||||
Context context = new Context();
|
||||
context.setVariables(contextData);
|
||||
|
||||
String process = templateEngine.process("email/" + templateName, context);
|
||||
MimeMessage mimeMessage = emailSender.createMimeMessage();
|
||||
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
|
||||
|
||||
helper.setFrom(fromAddress);
|
||||
helper.setTo(to);
|
||||
helper.setSubject(subject);
|
||||
helper.setText(process, true); // true indicates HTML format
|
||||
|
||||
if (attachmentName != null && attachmentData != null) {
|
||||
helper.addAttachment(attachmentName, new ByteArrayResource(attachmentData));
|
||||
}
|
||||
|
||||
emailSender.send(mimeMessage);
|
||||
log.info("Email successfully sent to {}", to);
|
||||
|
||||
} catch (MessagingException e) {
|
||||
log.error("Failed to send email to {}", to, e);
|
||||
// Non blocco l'ordine se l'email fallisce, ma loggo l'errore adeguatamente.
|
||||
} catch (Exception e) {
|
||||
log.error("Unexpected error while sending email to {}", to, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
app.mail.enabled=false
|
||||
app.mail.admin.enabled=false
|
||||
app.mail.contact-request.admin.enabled=false
|
||||
|
||||
# Admin back-office local test credentials
|
||||
admin.password=local-admin-password
|
||||
admin.session.secret=local-session-secret-for-dev-only-000000000000000000000000
|
||||
admin.session.ttl-minutes=480
|
||||
@@ -4,10 +4,9 @@ server.port=8000
|
||||
# Database Configuration
|
||||
spring.datasource.url=${DB_URL:jdbc:postgresql://localhost:5432/printcalc}
|
||||
spring.datasource.username=${DB_USERNAME:printcalc}
|
||||
spring.datasource.password=${DB_PASSWORD:}
|
||||
spring.datasource.password=${DB_PASSWORD:printcalc_secret}
|
||||
spring.jpa.hibernate.ddl-auto=update
|
||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
||||
spring.jpa.open-in-view=false
|
||||
|
||||
|
||||
# Slicer Configuration
|
||||
@@ -19,37 +18,3 @@ profiles.root=${PROFILES_DIR:profiles}
|
||||
# File Upload Limits
|
||||
spring.servlet.multipart.max-file-size=200MB
|
||||
spring.servlet.multipart.max-request-size=200MB
|
||||
|
||||
# ClamAV Configuration
|
||||
clamav.host=${CLAMAV_HOST:clamav}
|
||||
clamav.port=${CLAMAV_PORT:3310}
|
||||
clamav.enabled=${CLAMAV_ENABLED:false}
|
||||
|
||||
# TWINT Configuration
|
||||
payment.twint.url=${TWINT_PAYMENT_URL:}
|
||||
|
||||
# Mail Configuration
|
||||
spring.mail.host=${MAIL_HOST:mail.infomaniak.com}
|
||||
spring.mail.port=${MAIL_PORT:587}
|
||||
spring.mail.username=${MAIL_USERNAME:info@3d-fab.ch}
|
||||
spring.mail.password=${MAIL_PASSWORD:}
|
||||
spring.mail.properties.mail.smtp.auth=${MAIL_SMTP_AUTH:false}
|
||||
spring.mail.properties.mail.smtp.starttls.enable=${MAIL_SMTP_STARTTLS:false}
|
||||
|
||||
# Application Mail Settings
|
||||
app.mail.enabled=${APP_MAIL_ENABLED:true}
|
||||
app.mail.from=${APP_MAIL_FROM:${MAIL_USERNAME:noreply@printcalculator.local}}
|
||||
app.mail.admin.enabled=${APP_MAIL_ADMIN_ENABLED:true}
|
||||
app.mail.admin.address=${APP_MAIL_ADMIN_ADDRESS:admin@printcalculator.local}
|
||||
app.mail.contact-request.admin.enabled=${APP_MAIL_CONTACT_REQUEST_ADMIN_ENABLED:true}
|
||||
app.mail.contact-request.admin.address=${APP_MAIL_CONTACT_REQUEST_ADMIN_ADDRESS:infog@3d-fab.ch}
|
||||
app.frontend.base-url=${APP_FRONTEND_BASE_URL:http://localhost:4200}
|
||||
|
||||
# Admin back-office authentication
|
||||
admin.password=${ADMIN_PASSWORD}
|
||||
admin.session.secret=${ADMIN_SESSION_SECRET}
|
||||
admin.session.ttl-minutes=${ADMIN_SESSION_TTL_MINUTES:480}
|
||||
admin.auth.trust-proxy-headers=${ADMIN_AUTH_TRUST_PROXY_HEADERS:false}
|
||||
|
||||
# Expose only liveness endpoint by default.
|
||||
management.endpoints.web.exposure.include=health
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Nuova richiesta di contatto</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
background-color: #f4f4f4;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 640px;
|
||||
margin: 20px auto;
|
||||
background-color: #ffffff;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin-top: 0;
|
||||
color: #222222;
|
||||
}
|
||||
|
||||
p {
|
||||
color: #444444;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
th,
|
||||
td {
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
border-bottom: 1px solid #eeeeee;
|
||||
padding: 10px 6px;
|
||||
color: #333333;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
th {
|
||||
width: 35%;
|
||||
color: #222222;
|
||||
background: #fafafa;
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 24px;
|
||||
font-size: 12px;
|
||||
color: #888888;
|
||||
border-top: 1px solid #eeeeee;
|
||||
padding-top: 12px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<h1>Nuova richiesta di contatto</h1>
|
||||
<p>E' stata ricevuta una nuova richiesta dal form contatti/su misura.</p>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th>ID richiesta</th>
|
||||
<td th:text="${requestId}">00000000-0000-0000-0000-000000000000</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Data</th>
|
||||
<td th:text="${createdAt}">2026-03-03T10:00:00Z</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Tipo richiesta</th>
|
||||
<td th:text="${requestType}">PRINT_SERVICE</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Tipo cliente</th>
|
||||
<td th:text="${customerType}">PRIVATE</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nome</th>
|
||||
<td th:text="${name}">Mario Rossi</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Azienda</th>
|
||||
<td th:text="${companyName}">3D Fab SA</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Contatto</th>
|
||||
<td th:text="${contactPerson}">Mario Rossi</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Email</th>
|
||||
<td th:text="${email}">cliente@example.com</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Telefono</th>
|
||||
<td th:text="${phone}">+41 00 000 00 00</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Messaggio</th>
|
||||
<td th:text="${message}">Testo richiesta cliente...</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Allegati</th>
|
||||
<td th:text="${attachmentsCount}">0</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div class="footer">
|
||||
<p>© <span th:text="${currentYear}">2026</span> 3D-Fab - notifica automatica.</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,110 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title th:text="${emailTitle}">Order Confirmation</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
background-color: #f4f4f4;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 600px;
|
||||
margin: 20px auto;
|
||||
background-color: #ffffff;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.header {
|
||||
text-align: center;
|
||||
border-bottom: 1px solid #eeeeee;
|
||||
padding-bottom: 20px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.content {
|
||||
color: #555555;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.order-details {
|
||||
background-color: #f9f9f9;
|
||||
padding: 15px;
|
||||
border-radius: 5px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.order-details th {
|
||||
text-align: left;
|
||||
padding-right: 20px;
|
||||
color: #333333;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.order-details td {
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
font-size: 0.9em;
|
||||
color: #999999;
|
||||
margin-top: 30px;
|
||||
border-top: 1px solid #eeeeee;
|
||||
padding-top: 20px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1 th:text="${headlineText}">Thank you for your order #00000000</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<p th:text="${greetingText}">Hi Customer,</p>
|
||||
<p th:text="${introText}">We received your order and started processing it.</p>
|
||||
|
||||
<div class="order-details">
|
||||
<p style="margin-top:0; font-weight: bold;" th:text="${detailsTitleText}">Order details</p>
|
||||
<table>
|
||||
<tr>
|
||||
<th th:text="${labelOrderNumber}">Order number</th>
|
||||
<td th:text="${orderNumber}">00000000</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th th:text="${labelDate}">Date</th>
|
||||
<td th:text="${orderDate}">Jan 1, 2026, 10:00:00 AM</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th th:text="${labelTotal}">Total</th>
|
||||
<td th:text="${totalCost}">CHF 0.00</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<span th:text="${orderDetailsCtaText}">View order status</span>:
|
||||
<a th:href="${orderDetailsUrl}" th:text="${orderDetailsUrl}">https://example.com/en/co/00000000-0000-0000-0000-000000000000</a>
|
||||
</p>
|
||||
|
||||
<p th:text="${attachmentHintText}">The order confirmation PDF is attached.</p>
|
||||
<p th:text="${supportText}">If you have questions, reply to this email.</p>
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<p>© <span th:text="${currentYear}">2026</span> 3D-Fab</p>
|
||||
<p th:text="${footerText}">Automated message.</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,111 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title th:text="${emailTitle}">Payment Confirmed</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
background-color: #f4f4f4;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 600px;
|
||||
margin: 20px auto;
|
||||
background-color: #ffffff;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.header {
|
||||
text-align: center;
|
||||
border-bottom: 1px solid #eeeeee;
|
||||
padding-bottom: 20px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.content {
|
||||
color: #555555;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.status-box {
|
||||
background-color: #e8f8ee;
|
||||
border: 1px solid #9fd4af;
|
||||
border-radius: 5px;
|
||||
padding: 12px;
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.order-box {
|
||||
background-color: #f9f9f9;
|
||||
border-radius: 5px;
|
||||
padding: 12px;
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.order-box th {
|
||||
text-align: left;
|
||||
padding-right: 18px;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
font-size: 0.9em;
|
||||
color: #999999;
|
||||
margin-top: 30px;
|
||||
border-top: 1px solid #eeeeee;
|
||||
padding-top: 20px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1 th:text="${headlineText}">Payment confirmed for order #00000000</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<p th:text="${greetingText}">Hi Customer,</p>
|
||||
<p th:text="${introText}">Your payment has been confirmed and your order is now in production.</p>
|
||||
|
||||
<div class="status-box">
|
||||
<strong th:text="${statusText}">Current status: In production.</strong>
|
||||
</div>
|
||||
|
||||
<div class="order-box">
|
||||
<table>
|
||||
<tr>
|
||||
<th th:text="${labelOrderNumber}">Order number</th>
|
||||
<td th:text="${orderNumber}">00000000</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th th:text="${labelTotal}">Total</th>
|
||||
<td th:text="${totalCost}">CHF 0.00</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p th:text="${attachmentHintText}">The paid invoice PDF is attached to this email.</p>
|
||||
<p>
|
||||
<span th:text="${orderDetailsCtaText}">View order status</span>:
|
||||
<a th:href="${orderDetailsUrl}" th:text="${orderDetailsUrl}">https://example.com/en/co/00000000-0000-0000-0000-000000000000</a>
|
||||
</p>
|
||||
<p th:text="${supportText}">We will notify you when shipment is ready.</p>
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<p>© <span th:text="${currentYear}">2026</span> 3D-Fab</p>
|
||||
<p th:text="${footerText}">Automated message.</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,110 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title th:text="${emailTitle}">Payment Reported</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
background-color: #f4f4f4;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 600px;
|
||||
margin: 20px auto;
|
||||
background-color: #ffffff;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.header {
|
||||
text-align: center;
|
||||
border-bottom: 1px solid #eeeeee;
|
||||
padding-bottom: 20px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.content {
|
||||
color: #555555;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.status-box {
|
||||
background-color: #fff9e8;
|
||||
border: 1px solid #f4d68a;
|
||||
border-radius: 5px;
|
||||
padding: 12px;
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.order-box {
|
||||
background-color: #f9f9f9;
|
||||
border-radius: 5px;
|
||||
padding: 12px;
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.order-box th {
|
||||
text-align: left;
|
||||
padding-right: 18px;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
font-size: 0.9em;
|
||||
color: #999999;
|
||||
margin-top: 30px;
|
||||
border-top: 1px solid #eeeeee;
|
||||
padding-top: 20px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1 th:text="${headlineText}">Payment reported for order #00000000</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<p th:text="${greetingText}">Hi Customer,</p>
|
||||
<p th:text="${introText}">We received your payment report and we are now verifying it.</p>
|
||||
|
||||
<div class="status-box">
|
||||
<strong th:text="${statusText}">Current status: Payment under verification.</strong>
|
||||
</div>
|
||||
|
||||
<div class="order-box">
|
||||
<table>
|
||||
<tr>
|
||||
<th th:text="${labelOrderNumber}">Order number</th>
|
||||
<td th:text="${orderNumber}">00000000</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th th:text="${labelTotal}">Total</th>
|
||||
<td th:text="${totalCost}">CHF 0.00</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<span th:text="${orderDetailsCtaText}">Check order status</span>:
|
||||
<a th:href="${orderDetailsUrl}" th:text="${orderDetailsUrl}">https://example.com/en/co/00000000-0000-0000-0000-000000000000</a>
|
||||
</p>
|
||||
<p th:text="${supportText}">You will receive another email once payment is confirmed.</p>
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<p>© <span th:text="${currentYear}">2026</span> 3D-Fab</p>
|
||||
<p th:text="${footerText}">Automated message.</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user