Compare commits
45 Commits
aa032c0140
...
not-workin
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f73924572 | |||
| 8edc4af645 | |||
| e1409d218b | |||
| 0c92f8b394 | |||
| 66de93a315 | |||
| b337db03c4 | |||
| 8c6c1e10b3 | |||
| eac3006512 | |||
| b26b582baf | |||
| 875c6ffd2d | |||
| 579ac3fcb6 | |||
| efa1371ffa | |||
| ab7f263aca | |||
| 49bae8e186 | |||
| e2872c730c | |||
| 86266b31ee | |||
| 5d0fb5fe6d | |||
| 91af8f4f9c | |||
| a96c28fb39 | |||
| 9b24ca529c | |||
| 6216d9a723 | |||
| 4aa3f6adf1 | |||
| 7baad738f5 | |||
| 9feceb9b3c | |||
| 304ed942b8 | |||
| 881bd87392 | |||
| 3a5e4e3427 | |||
| 8c82470401 | |||
| ef6a5278a7 | |||
| bb276b6504 | |||
| e351f2c05f | |||
| 165e12f216 | |||
| 475bfcc6fb | |||
| becb15da73 | |||
| 4d559901eb | |||
| 06a036810a | |||
| 0b29aebfcf | |||
| 961109b04c | |||
| b5bd68ed10 | |||
| 56fb504062 | |||
| f165d191be | |||
| e1d9823b51 | |||
| f829ccef4a | |||
| 59e881c3f4 | |||
| f5aa0f298e |
@@ -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,8 @@ 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: Run Tests with Gradle
|
||||
run: |
|
||||
@@ -28,55 +27,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: Resolve Chrome binary
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if command -v chromium >/dev/null 2>&1; then
|
||||
CHROME_PATH="$(command -v chromium)"
|
||||
elif command -v chromium-browser >/dev/null 2>&1; then
|
||||
CHROME_PATH="$(command -v chromium-browser)"
|
||||
elif command -v google-chrome >/dev/null 2>&1; then
|
||||
CHROME_PATH="$(command -v google-chrome)"
|
||||
else
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends chromium
|
||||
CHROME_PATH="$(command -v chromium)"
|
||||
fi
|
||||
|
||||
echo "CHROME_BIN=$CHROME_PATH" >> "$GITHUB_ENV"
|
||||
echo "Using CHROME_BIN=$CHROME_PATH"
|
||||
|
||||
- name: Install frontend dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
cd frontend
|
||||
npm ci --no-audit --no-fund --prefer-offline
|
||||
|
||||
- name: Run frontend tests (headless)
|
||||
shell: bash
|
||||
env:
|
||||
CI: "true"
|
||||
run: |
|
||||
cd frontend
|
||||
echo "Karma CHROME_BIN=$CHROME_BIN"
|
||||
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
|
||||
@@ -125,18 +77,6 @@ jobs:
|
||||
docker build -t "$FRONTEND_IMAGE" ./frontend
|
||||
docker push "$FRONTEND_IMAGE"
|
||||
|
||||
- name: Cleanup Docker on runner (prevent vdisk growth)
|
||||
if: always()
|
||||
shell: bash
|
||||
run: |
|
||||
set +e
|
||||
|
||||
# Keep recent artifacts, drop old local residue from CI builds.
|
||||
docker container prune -f --filter "until=168h" || true
|
||||
docker image prune -a -f --filter "until=168h" || true
|
||||
docker builder prune -a -f --filter "until=168h" || true
|
||||
docker network prune -f --filter "until=168h" || true
|
||||
|
||||
deploy:
|
||||
needs: build-and-push
|
||||
runs-on: ubuntu-latest
|
||||
@@ -166,33 +106,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 }}"
|
||||
@@ -207,31 +146,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
|
||||
if [[ -n "${{ secrets.OPENAI_API_KEY }}" ]]; then
|
||||
printf 'OPENAI_API_KEY="%s"\n' "${{ secrets.OPENAI_API_KEY }}" >> /tmp/full_env.env
|
||||
fi
|
||||
|
||||
# 4. Debug: print content (for debug purposes)
|
||||
echo "Preparing to send env file with variables:"
|
||||
grep -Ev "PASSWORD|SECRET|KEY|TOKEN" /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,185 +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: Resolve Chrome binary
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if command -v chromium >/dev/null 2>&1; then
|
||||
CHROME_PATH="$(command -v chromium)"
|
||||
elif command -v chromium-browser >/dev/null 2>&1; then
|
||||
CHROME_PATH="$(command -v chromium-browser)"
|
||||
elif command -v google-chrome >/dev/null 2>&1; then
|
||||
CHROME_PATH="$(command -v google-chrome)"
|
||||
else
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends chromium
|
||||
CHROME_PATH="$(command -v chromium)"
|
||||
fi
|
||||
|
||||
echo "CHROME_BIN=$CHROME_PATH" >> "$GITHUB_ENV"
|
||||
echo "Using CHROME_BIN=$CHROME_PATH"
|
||||
|
||||
- name: Install frontend dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
cd frontend
|
||||
npm ci --no-audit --no-fund --prefer-offline
|
||||
|
||||
- name: Run frontend tests (headless)
|
||||
shell: bash
|
||||
env:
|
||||
CI: "true"
|
||||
run: |
|
||||
cd frontend
|
||||
echo "Karma CHROME_BIN=$CHROME_BIN"
|
||||
npm run test -- --watch=false --browsers=ChromeHeadlessNoSandbox
|
||||
14
.gitignore
vendored
14
.gitignore
vendored
@@ -41,17 +41,3 @@ target/
|
||||
build/
|
||||
.gradle/
|
||||
.mvn/
|
||||
|
||||
./storage_orders
|
||||
./storage_quotes
|
||||
./storage_requests
|
||||
./storage_media
|
||||
./storage_shop
|
||||
storage_orders
|
||||
storage_quotes
|
||||
storage_requests
|
||||
storage_media
|
||||
storage_shop
|
||||
|
||||
# Qodana local reports/artifacts
|
||||
backend/.qodana/
|
||||
|
||||
55
README.md
55
README.md
@@ -11,7 +11,7 @@ Un'applicazione Full Stack (Angular + Spring Boot) per calcolare preventivi di s
|
||||
|
||||
## Stack Tecnologico
|
||||
|
||||
- **Backend**: Java 21, Spring Boot 3.4, PostgreSQL.
|
||||
- **Backend**: Java 21, Spring Boot 3.4, PostgreSQL, Flyway.
|
||||
- **Frontend**: Angular 19, Angular Material, Three.js.
|
||||
- **Slicer**: OrcaSlicer (invocato via CLI).
|
||||
|
||||
@@ -21,20 +21,14 @@ Un'applicazione Full Stack (Angular + Spring Boot) per calcolare preventivi di s
|
||||
* **Node.js 22** e **npm** installati.
|
||||
* **PostgreSQL** attivo.
|
||||
* **OrcaSlicer** installato sul sistema.
|
||||
* **FFmpeg** installato sul sistema o presente nell'immagine Docker del backend.
|
||||
|
||||
## Avvio Rapido
|
||||
|
||||
### 1. Database
|
||||
Crea un database PostgreSQL chiamato `printcalc`. Lo schema viene gestito dal progetto tramite configurazione JPA/SQL del repository.
|
||||
Crea un database PostgreSQL chiamato `printcalc`. Le tabelle verranno create automaticamente al primo avvio tramite Flyway.
|
||||
|
||||
### 2. Backend
|
||||
Configura il percorso di OrcaSlicer in `backend/src/main/resources/application.properties` o tramite la variabile d'ambiente `SLICER_PATH`. Per il media service pubblico puoi configurare anche:
|
||||
|
||||
- `MEDIA_STORAGE_ROOT` per la root `storage_media` usata dal backend (`original/`, `public/`, `private/`)
|
||||
- `SHOP_STORAGE_ROOT` per la root `storage_shop` usata dal backend per i modelli dei prodotti shop
|
||||
- `MEDIA_FFMPEG_PATH` per il binario `ffmpeg` (nel deploy Docker default: `/usr/local/bin/ffmpeg-media`)
|
||||
- `MEDIA_UPLOAD_MAX_FILE_SIZE_BYTES` per il limite per asset immagine
|
||||
Configura il percorso di OrcaSlicer in `backend/src/main/resources/application.properties` o tramite la variabile d'ambiente `SLICER_PATH`.
|
||||
|
||||
```bash
|
||||
cd backend
|
||||
@@ -63,54 +57,11 @@ I prezzi non sono più gestiti tramite variabili d'ambiente fisse ma tramite tab
|
||||
* `/backend`: API Spring Boot.
|
||||
* `/frontend`: Applicazione Angular.
|
||||
* `/backend/profiles`: Contiene i file di configurazione per OrcaSlicer.
|
||||
* `/storage_media`: Originali e varianti media pubbliche/private su filesystem.
|
||||
* `/storage_shop`: Modelli e file prodotti dello shop.
|
||||
|
||||
## Media pubblici
|
||||
|
||||
Il backend salva sempre l'originale in `storage_media/original/` e precomputa le varianti pubbliche in `storage_media/public/`. La cartella `storage_media/private/` è predisposta per asset non pubblici.
|
||||
|
||||
Nel deploy Docker i volumi attesi sono `/mnt/cache/appdata/print-calculator/${ENV}/storage_media:/app/storage_media` e `/mnt/cache/appdata/print-calculator/${ENV}/storage_shop:/app/storage_shop`.
|
||||
|
||||
Nginx non deve passare dal backend per i file pubblici. Configurazione attesa:
|
||||
|
||||
```nginx
|
||||
location /media/ {
|
||||
alias /mnt/cache/appdata/print-calculator/${ENV}/storage_media/public/;
|
||||
}
|
||||
```
|
||||
|
||||
Usage key iniziali previste per frontend:
|
||||
|
||||
- `HOME_SECTION / shop-gallery`
|
||||
- `HOME_SECTION / founders-gallery`
|
||||
- `HOME_SECTION / capability-prototyping`
|
||||
- `HOME_SECTION / capability-custom-parts`
|
||||
- `HOME_SECTION / capability-small-series`
|
||||
- `HOME_SECTION / capability-cad`
|
||||
- `ABOUT_MEMBER / joe`
|
||||
- `ABOUT_MEMBER / matteo`
|
||||
- riservati per estensioni future: `SHOP_PRODUCT`, `SHOP_CATEGORY`, `SHOP_GALLERY`
|
||||
|
||||
Operativamente:
|
||||
|
||||
- carica i file dal media admin endpoint del backend
|
||||
- associa ogni asset con `POST /api/admin/media/usages`
|
||||
- per `ABOUT_MEMBER` imposta `isPrimary=true` sulla foto principale del membro
|
||||
- home e about leggono da `GET /api/public/media/usages?usageType=...&usageKey=...`
|
||||
- il frontend usa `<picture>` e preferisce AVIF/WEBP con fallback JPEG, senza usare l'originale
|
||||
- nel back-office frontend la gestione operativa della home passa dalla pagina `admin/home-media`
|
||||
|
||||
## 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).
|
||||
|
||||
### FFmpeg e media pubblici
|
||||
Verifica che `MEDIA_FFMPEG_PATH` punti a un `ffmpeg` con supporto JPEG, WebP e AVIF (encoder + muxer AVIF). Nel container backend il default è `/usr/local/bin/ffmpeg-media`: usa `/usr/bin/ffmpeg` se già compatibile, altrimenti installa un fallback statico con supporto AVIF. Se gli URL media restituiti dalle API admin non sono raggiungibili, controlla che `APP_FRONTEND_BASE_URL` punti al dominio corretto, che `location /media/` sia esposto da Nginx e che il volume `storage_media` sia montato correttamente.
|
||||
|
||||
### Database connection
|
||||
Verifica le credenziali in `application.properties`. Se usi Docker, puoi passare `DB_URL`, `DB_USERNAME` e `DB_PASSWORD` come variabili d'ambiente.
|
||||
|
||||
### Deploy e traduzioni OpenAI
|
||||
Nel deploy Gitea la chiave OpenAI deve stare nel secret `OPENAI_API_KEY`. La pipeline la aggiunge al file `.env` dell'ambiente durante il deploy e il container backend la riceve come variabile runtime. I file `deploy/envs/*.env` restano per i valori specifici di `dev/int/prod`.
|
||||
|
||||
@@ -10,92 +10,36 @@ RUN ./gradlew bootJar -x test --no-daemon
|
||||
|
||||
# Stage 2: Runtime Environment
|
||||
FROM eclipse-temurin:21-jre-jammy
|
||||
ARG ORCA_VERSION=2.3.1
|
||||
ARG ORCA_DOWNLOAD_URL
|
||||
ARG FFMPEG_STATIC_URL=https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
|
||||
|
||||
# Install system dependencies for OrcaSlicer and media processing.
|
||||
# Prefer system ffmpeg; if AVIF support is incomplete, install a static ffmpeg fallback.
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
ffmpeg \
|
||||
# Install system dependencies for OrcaSlicer
|
||||
RUN apt-get update && apt-get install -y \
|
||||
wget \
|
||||
xz-utils \
|
||||
ca-certificates \
|
||||
assimp-utils \
|
||||
p7zip-full \
|
||||
libgl1 \
|
||||
libglib2.0-0 \
|
||||
libgtk-3-0 \
|
||||
libdbus-1-3 \
|
||||
libwebkit2gtk-4.0-37; \
|
||||
check_ffmpeg_support() { \
|
||||
ffmpeg_bin="$1"; \
|
||||
"$ffmpeg_bin" -hide_banner -encoders > /tmp/ffmpeg-encoders.txt 2>&1 || return 1; \
|
||||
"$ffmpeg_bin" -hide_banner -muxers > /tmp/ffmpeg-muxers.txt 2>&1 || return 1; \
|
||||
grep -Eq '[[:space:]]mjpeg[[:space:]]' /tmp/ffmpeg-encoders.txt || return 1; \
|
||||
grep -Eq '[[:space:]](libwebp|webp)[[:space:]]' /tmp/ffmpeg-encoders.txt || return 1; \
|
||||
grep -Eq '[[:space:]](libaom-av1|librav1e|libsvtav1)[[:space:]]' /tmp/ffmpeg-encoders.txt || return 1; \
|
||||
grep -Eq '[[:space:]]avif([[:space:]]|,|$)' /tmp/ffmpeg-muxers.txt || return 1; \
|
||||
return 0; \
|
||||
}; \
|
||||
if check_ffmpeg_support /usr/bin/ffmpeg; then \
|
||||
ln -sf /usr/bin/ffmpeg /usr/local/bin/ffmpeg-media; \
|
||||
else \
|
||||
echo "System ffmpeg lacks AVIF support, installing static fallback from ${FFMPEG_STATIC_URL}"; \
|
||||
wget -q "${FFMPEG_STATIC_URL}" -O /tmp/ffmpeg-static.tar.xz; \
|
||||
tar -xJf /tmp/ffmpeg-static.tar.xz -C /tmp; \
|
||||
FFMPEG_STATIC_BIN="$(find /tmp -maxdepth 2 -type f -name ffmpeg | head -n 1)"; \
|
||||
test -n "${FFMPEG_STATIC_BIN}"; \
|
||||
install -m 0755 "${FFMPEG_STATIC_BIN}" /usr/local/bin/ffmpeg-media; \
|
||||
check_ffmpeg_support /usr/local/bin/ffmpeg-media; \
|
||||
fi; \
|
||||
rm -f /tmp/ffmpeg-muxers.txt; \
|
||||
rm -f /tmp/ffmpeg-encoders.txt; \
|
||||
rm -f /tmp/ffmpeg-static.tar.xz; \
|
||||
rm -rf /tmp/ffmpeg-*-amd64-static; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
libwebkit2gtk-4.0-37 \
|
||||
libx11-xcb1 \
|
||||
libxcb-dri3-0 \
|
||||
libxtst6 \
|
||||
libnss3 \
|
||||
libatk-bridge2.0-0 \
|
||||
libxss1 \
|
||||
libasound2 \
|
||||
libgbm1 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install OrcaSlicer
|
||||
WORKDIR /opt
|
||||
RUN set -eux; \
|
||||
ORCA_URL="${ORCA_DOWNLOAD_URL:-}"; \
|
||||
if [ -n "${ORCA_URL}" ]; then \
|
||||
wget -q "${ORCA_URL}" -O OrcaSlicer.AppImage; \
|
||||
else \
|
||||
CANDIDATES="\
|
||||
https://github.com/OrcaSlicer/OrcaSlicer/releases/download/v${ORCA_VERSION}/OrcaSlicer_Linux_AppImage_Ubuntu2204_V${ORCA_VERSION}.AppImage \
|
||||
https://github.com/SoftFever/OrcaSlicer/releases/download/v${ORCA_VERSION}/OrcaSlicer_Linux_AppImage_Ubuntu2204_V${ORCA_VERSION}.AppImage \
|
||||
https://github.com/SoftFever/OrcaSlicer/releases/download/v2.2.0/OrcaSlicer_Linux_V2.2.0.AppImage"; \
|
||||
ok=0; \
|
||||
for url in $CANDIDATES; do \
|
||||
if wget -q --spider "$url"; then \
|
||||
echo "Using OrcaSlicer URL: $url"; \
|
||||
wget -q "$url" -O OrcaSlicer.AppImage; \
|
||||
ok=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
if [ "$ok" -ne 1 ]; then \
|
||||
echo "Failed to find OrcaSlicer AppImage for version ${ORCA_VERSION}" >&2; \
|
||||
echo "Tried URLs:" >&2; \
|
||||
for url in $CANDIDATES; do echo " - $url" >&2; done; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi \
|
||||
&& chmod +x OrcaSlicer.AppImage \
|
||||
&& rm -rf /opt/orcaslicer /opt/squashfs-root \
|
||||
&& ./OrcaSlicer.AppImage --appimage-extract >/dev/null \
|
||||
&& mv /opt/squashfs-root /opt/orcaslicer \
|
||||
RUN wget -q https://github.com/SoftFever/OrcaSlicer/releases/download/v2.2.0/OrcaSlicer_Linux_V2.2.0.AppImage -O OrcaSlicer.AppImage \
|
||||
&& 7z x OrcaSlicer.AppImage -o/opt/orcaslicer \
|
||||
&& chmod -R +x /opt/orcaslicer \
|
||||
&& rm OrcaSlicer.AppImage
|
||||
|
||||
ENV PATH="/opt/orcaslicer/usr/bin:${PATH}"
|
||||
# Set Slicer Path env variable for Java app
|
||||
ENV SLICER_PATH="/opt/orcaslicer/AppRun"
|
||||
ENV ASSIMP_PATH="assimp"
|
||||
# Use ffmpeg selected at image build time (system or static fallback) for media generation.
|
||||
ENV MEDIA_FFMPEG_PATH="/usr/local/bin/ffmpeg-media"
|
||||
|
||||
WORKDIR /app
|
||||
# Copy JAR from build stage
|
||||
|
||||
@@ -24,15 +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'
|
||||
@@ -41,17 +37,6 @@ dependencies {
|
||||
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'
|
||||
implementation 'org.jsoup:jsoup:1.18.3'
|
||||
implementation platform('org.lwjgl:lwjgl-bom:3.3.4')
|
||||
implementation 'org.lwjgl:lwjgl'
|
||||
implementation 'org.lwjgl:lwjgl-assimp'
|
||||
runtimeOnly 'org.lwjgl:lwjgl::natives-linux'
|
||||
runtimeOnly 'org.lwjgl:lwjgl::natives-macos'
|
||||
runtimeOnly 'org.lwjgl:lwjgl::natives-macos-arm64'
|
||||
runtimeOnly 'org.lwjgl:lwjgl-assimp::natives-linux'
|
||||
runtimeOnly 'org.lwjgl:lwjgl-assimp::natives-macos'
|
||||
runtimeOnly 'org.lwjgl:lwjgl-assimp::natives-macos-arm64'
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,76 +1,15 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# In container default to the ffmpeg selected during image build.
|
||||
if [ -z "${MEDIA_FFMPEG_PATH:-}" ]; then
|
||||
MEDIA_FFMPEG_PATH="/usr/local/bin/ffmpeg-media"
|
||||
fi
|
||||
export MEDIA_FFMPEG_PATH
|
||||
|
||||
validate_ffmpeg_support() {
|
||||
ffmpeg_bin="$1"
|
||||
if ! command -v "$ffmpeg_bin" >/dev/null 2>&1; then
|
||||
echo "ERROR: FFmpeg executable not found: ${ffmpeg_bin}" >&2
|
||||
exit 11
|
||||
fi
|
||||
|
||||
encoders="$(mktemp)"
|
||||
muxers="$(mktemp)"
|
||||
trap 'rm -f "$encoders" "$muxers"' EXIT
|
||||
|
||||
"$ffmpeg_bin" -hide_banner -encoders > "$encoders" 2>&1 || {
|
||||
echo "ERROR: Unable to inspect FFmpeg encoders from ${ffmpeg_bin}" >&2
|
||||
cat "$encoders" >&2
|
||||
exit 12
|
||||
}
|
||||
"$ffmpeg_bin" -hide_banner -muxers > "$muxers" 2>&1 || {
|
||||
echo "ERROR: Unable to inspect FFmpeg muxers from ${ffmpeg_bin}" >&2
|
||||
cat "$muxers" >&2
|
||||
exit 13
|
||||
}
|
||||
|
||||
grep -Eq '[[:space:]]mjpeg[[:space:]]' "$encoders" || {
|
||||
echo "ERROR: FFmpeg '${ffmpeg_bin}' missing JPEG encoder (mjpeg)." >&2
|
||||
exit 14
|
||||
}
|
||||
grep -Eq '[[:space:]](libwebp|webp)[[:space:]]' "$encoders" || {
|
||||
echo "ERROR: FFmpeg '${ffmpeg_bin}' missing WebP encoder." >&2
|
||||
exit 15
|
||||
}
|
||||
grep -Eq '[[:space:]](libaom-av1|librav1e|libsvtav1)[[:space:]]' "$encoders" || {
|
||||
echo "ERROR: FFmpeg '${ffmpeg_bin}' missing AVIF-capable encoder." >&2
|
||||
exit 16
|
||||
}
|
||||
grep -Eq '[[:space:]]avif([[:space:]]|,|$)' "$muxers" || {
|
||||
echo "ERROR: FFmpeg '${ffmpeg_bin}' missing AVIF muxer." >&2
|
||||
exit 17
|
||||
}
|
||||
}
|
||||
|
||||
validate_ffmpeg_support "$MEDIA_FFMPEG_PATH"
|
||||
|
||||
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 "MEDIA_FFMPEG_PATH: $MEDIA_FFMPEG_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 with explicit properties from env
|
||||
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
|
||||
--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,13 @@ 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.scheduling.annotation.EnableScheduling;
|
||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||
|
||||
@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class})
|
||||
@SpringBootApplication
|
||||
@EnableTransactionManagement
|
||||
@EnableScheduling
|
||||
@EnableAsync
|
||||
public class BackendApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
package com.printcalculator.config;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
@Service
|
||||
public class AllowedOriginService {
|
||||
|
||||
private final List<String> allowedOrigins;
|
||||
|
||||
public AllowedOriginService(
|
||||
@Value("${app.frontend.base-url:http://localhost:4200}") String frontendBaseUrl,
|
||||
@Value("${app.cors.additional-allowed-origins:}") String additionalAllowedOrigins
|
||||
) {
|
||||
LinkedHashSet<String> configuredOrigins = new LinkedHashSet<>();
|
||||
addConfiguredOrigin(configuredOrigins, frontendBaseUrl, "app.frontend.base-url");
|
||||
|
||||
for (String rawOrigin : additionalAllowedOrigins.split(",")) {
|
||||
addConfiguredOrigin(configuredOrigins, rawOrigin, "app.cors.additional-allowed-origins");
|
||||
}
|
||||
|
||||
if (configuredOrigins.isEmpty()) {
|
||||
throw new IllegalStateException("At least one allowed origin must be configured.");
|
||||
}
|
||||
this.allowedOrigins = List.copyOf(configuredOrigins);
|
||||
}
|
||||
|
||||
public List<String> getAllowedOrigins() {
|
||||
return allowedOrigins;
|
||||
}
|
||||
|
||||
public boolean isAllowed(String rawOriginOrUrl) {
|
||||
String normalizedOrigin = normalizeRequestOrigin(rawOriginOrUrl);
|
||||
return normalizedOrigin != null && allowedOrigins.contains(normalizedOrigin);
|
||||
}
|
||||
|
||||
private void addConfiguredOrigin(Set<String> configuredOrigins, String rawOriginOrUrl, String propertyName) {
|
||||
if (rawOriginOrUrl == null || rawOriginOrUrl.isBlank()) {
|
||||
return;
|
||||
}
|
||||
|
||||
String normalizedOrigin = normalizeRequestOrigin(rawOriginOrUrl);
|
||||
if (normalizedOrigin == null) {
|
||||
throw new IllegalStateException(propertyName + " must contain absolute http(s) URLs.");
|
||||
}
|
||||
configuredOrigins.add(normalizedOrigin);
|
||||
}
|
||||
|
||||
private String normalizeRequestOrigin(String rawOriginOrUrl) {
|
||||
if (rawOriginOrUrl == null || rawOriginOrUrl.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
URI uri = URI.create(rawOriginOrUrl.trim());
|
||||
String scheme = uri.getScheme();
|
||||
String host = uri.getHost();
|
||||
if (scheme == null || host == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String normalizedScheme = scheme.toLowerCase(Locale.ROOT);
|
||||
if (!"http".equals(normalizedScheme) && !"https".equals(normalizedScheme)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String normalizedHost = host.toLowerCase(Locale.ROOT);
|
||||
int port = uri.getPort();
|
||||
if (isDefaultPort(normalizedScheme, port) || port < 0) {
|
||||
return normalizedScheme + "://" + normalizedHost;
|
||||
}
|
||||
return normalizedScheme + "://" + normalizedHost + ":" + port;
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isDefaultPort(String scheme, int port) {
|
||||
return ("http".equals(scheme) && port == 80)
|
||||
|| ("https".equals(scheme) && port == 443);
|
||||
}
|
||||
}
|
||||
@@ -1,27 +1,27 @@
|
||||
package com.printcalculator.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.CorsConfigurationSource;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
@Configuration
|
||||
public class CorsConfig {
|
||||
public class CorsConfig implements WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
public CorsConfigurationSource corsConfigurationSource(AllowedOriginService allowedOriginService) {
|
||||
CorsConfiguration configuration = new CorsConfiguration();
|
||||
configuration.setAllowedOrigins(allowedOriginService.getAllowedOrigins());
|
||||
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"));
|
||||
configuration.setAllowedHeaders(List.of("*"));
|
||||
configuration.setAllowCredentials(true);
|
||||
configuration.setMaxAge(3600L);
|
||||
|
||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||
source.registerCorsConfiguration("/**", configuration);
|
||||
return source;
|
||||
@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")
|
||||
.allowedHeaders("*")
|
||||
.allowCredentials(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
package com.printcalculator.config;
|
||||
|
||||
import com.printcalculator.security.AdminCsrfProtectionFilter;
|
||||
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,
|
||||
AdminCsrfProtectionFilter adminCsrfProtectionFilter,
|
||||
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(adminCsrfProtectionFilter, UsernamePasswordAuthenticationFilter.class)
|
||||
.addFilterAfter(adminSessionAuthenticationFilter, AdminCsrfProtectionFilter.class);
|
||||
|
||||
return http.build();
|
||||
}
|
||||
}
|
||||
@@ -1,21 +1,21 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.QuoteRequestDto;
|
||||
import com.printcalculator.entity.CustomQuoteRequest;
|
||||
import com.printcalculator.service.request.CustomQuoteRequestControllerService;
|
||||
import jakarta.validation.Valid;
|
||||
import com.printcalculator.entity.CustomQuoteRequestAttachment;
|
||||
import com.printcalculator.repository.CustomQuoteRequestAttachmentRepository;
|
||||
import com.printcalculator.repository.CustomQuoteRequestRepository;
|
||||
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.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestPart;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
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.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@@ -23,25 +23,98 @@ import java.util.UUID;
|
||||
@RequestMapping("/api/custom-quote-requests")
|
||||
public class CustomQuoteRequestController {
|
||||
|
||||
private final CustomQuoteRequestControllerService customQuoteRequestControllerService;
|
||||
private final CustomQuoteRequestRepository requestRepo;
|
||||
private final CustomQuoteRequestAttachmentRepository attachmentRepo;
|
||||
|
||||
public CustomQuoteRequestController(CustomQuoteRequestControllerService customQuoteRequestControllerService) {
|
||||
this.customQuoteRequestControllerService = customQuoteRequestControllerService;
|
||||
private final com.printcalculator.service.StorageService storageService;
|
||||
|
||||
public CustomQuoteRequestController(CustomQuoteRequestRepository requestRepo,
|
||||
CustomQuoteRequestAttachmentRepository attachmentRepo,
|
||||
com.printcalculator.service.StorageService storageService) {
|
||||
this.requestRepo = requestRepo;
|
||||
this.attachmentRepo = attachmentRepo;
|
||||
this.storageService = storageService;
|
||||
}
|
||||
|
||||
// 1. Create Custom Quote Request
|
||||
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
@Transactional
|
||||
public ResponseEntity<CustomQuoteRequest> createCustomQuoteRequest(
|
||||
@Valid @RequestPart("request") QuoteRequestDto requestDto,
|
||||
@RequestPart("request") com.printcalculator.dto.QuoteRequestDto requestDto,
|
||||
@RequestPart(value = "files", required = false) List<MultipartFile> files
|
||||
) throws IOException {
|
||||
return ResponseEntity.ok(customQuoteRequestControllerService.createCustomQuoteRequest(requestDto, files));
|
||||
|
||||
// 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
|
||||
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;
|
||||
|
||||
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 ext = getExtension(file.getOriginalFilename());
|
||||
String storedFilename = fileUuid.toString() + "." + ext;
|
||||
|
||||
// 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);
|
||||
|
||||
String relativePath = "quote-requests/" + request.getId() + "/attachments/" + attachment.getId() + "/" + storedFilename;
|
||||
attachment.setStoredRelativePath(relativePath);
|
||||
attachmentRepo.save(attachment);
|
||||
|
||||
// Save file to disk via StorageService
|
||||
storageService.store(file, Paths.get(relativePath));
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(request);
|
||||
}
|
||||
|
||||
// 2. Get Request
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<CustomQuoteRequest> getCustomQuoteRequest(@PathVariable UUID id) {
|
||||
return customQuoteRequestControllerService.getCustomQuoteRequest(id)
|
||||
return requestRepo.findById(id)
|
||||
.map(ResponseEntity::ok)
|
||||
.orElse(ResponseEntity.notFound().build());
|
||||
}
|
||||
|
||||
// Helper
|
||||
private String getExtension(String filename) {
|
||||
if (filename == null) return "dat";
|
||||
int i = filename.lastIndexOf('.');
|
||||
if (i > 0) {
|
||||
return filename.substring(i + 1);
|
||||
}
|
||||
return "dat";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,33 +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.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.MaterialOrcaProfileMapRepository;
|
||||
import com.printcalculator.repository.LayerHeightOptionRepository;
|
||||
import com.printcalculator.repository.NozzleOptionRepository;
|
||||
import com.printcalculator.repository.PrinterMachineRepository;
|
||||
import com.printcalculator.repository.PrinterMachineProfileRepository;
|
||||
import com.printcalculator.service.NozzleLayerHeightPolicyService;
|
||||
import com.printcalculator.service.OrcaProfileResolver;
|
||||
import com.printcalculator.service.ProfileManager;
|
||||
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.Comparator;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@@ -37,121 +22,90 @@ public class OptionsController {
|
||||
|
||||
private final FilamentMaterialTypeRepository materialRepo;
|
||||
private final FilamentVariantRepository variantRepo;
|
||||
private final LayerHeightOptionRepository layerHeightRepo;
|
||||
private final NozzleOptionRepository nozzleRepo;
|
||||
private final PrinterMachineRepository printerMachineRepo;
|
||||
private final PrinterMachineProfileRepository printerMachineProfileRepo;
|
||||
private final MaterialOrcaProfileMapRepository materialOrcaMapRepo;
|
||||
private final OrcaProfileResolver orcaProfileResolver;
|
||||
private final ProfileManager profileManager;
|
||||
private final NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService;
|
||||
|
||||
public OptionsController(FilamentMaterialTypeRepository materialRepo,
|
||||
FilamentVariantRepository variantRepo,
|
||||
NozzleOptionRepository nozzleRepo,
|
||||
PrinterMachineRepository printerMachineRepo,
|
||||
PrinterMachineProfileRepository printerMachineProfileRepo,
|
||||
MaterialOrcaProfileMapRepository materialOrcaMapRepo,
|
||||
OrcaProfileResolver orcaProfileResolver,
|
||||
ProfileManager profileManager,
|
||||
NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService) {
|
||||
LayerHeightOptionRepository layerHeightRepo,
|
||||
NozzleOptionRepository nozzleRepo) {
|
||||
this.materialRepo = materialRepo;
|
||||
this.variantRepo = variantRepo;
|
||||
this.layerHeightRepo = layerHeightRepo;
|
||||
this.nozzleRepo = nozzleRepo;
|
||||
this.printerMachineRepo = printerMachineRepo;
|
||||
this.printerMachineProfileRepo = printerMachineProfileRepo;
|
||||
this.materialOrcaMapRepo = materialOrcaMapRepo;
|
||||
this.orcaProfileResolver = orcaProfileResolver;
|
||||
this.profileManager = profileManager;
|
||||
this.nozzleLayerHeightPolicyService = nozzleLayerHeightPolicyService;
|
||||
}
|
||||
|
||||
@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(),
|
||||
v.getColorLabelIt(),
|
||||
v.getColorLabelEn(),
|
||||
v.getColorLabelDe(),
|
||||
v.getColorLabelFr(),
|
||||
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());
|
||||
|
||||
// Sort: PLA first, then PETG, then others alphabetically
|
||||
materialOptions.sort((a, b) -> {
|
||||
String codeA = a.code();
|
||||
String codeB = b.code();
|
||||
|
||||
if (codeA.equals("pla_basic")) return -1;
|
||||
if (codeB.equals("pla_basic")) return 1;
|
||||
|
||||
if (codeA.equals("petg_basic")) return -1;
|
||||
if (codeB.equals("petg_basic")) return 1;
|
||||
|
||||
return codeA.compareTo(codeB);
|
||||
});
|
||||
|
||||
// 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")
|
||||
);
|
||||
|
||||
PrinterMachine targetMachine = resolveMachine(printerMachineId);
|
||||
|
||||
Set<BigDecimal> supportedMachineNozzles = targetMachine != null
|
||||
? printerMachineProfileRepo.findByPrinterMachineAndIsActiveTrue(targetMachine).stream()
|
||||
.map(PrinterMachineProfile::getNozzleDiameterMm)
|
||||
.filter(v -> v != null)
|
||||
.map(nozzleLayerHeightPolicyService::normalizeNozzle)
|
||||
.collect(Collectors.toCollection(LinkedHashSet::new))
|
||||
: Set.of();
|
||||
|
||||
boolean restrictNozzlesByMachineProfile = !supportedMachineNozzles.isEmpty();
|
||||
// 4. Layer Heights
|
||||
List<OptionsResponse.LayerHeightOptionDTO> layers = layerHeightRepo.findAll().stream()
|
||||
.filter(l -> l.getIsActive())
|
||||
.sorted(Comparator.comparing(LayerHeightOption::getLayerHeightMm))
|
||||
.map(l -> new OptionsResponse.LayerHeightOptionDTO(
|
||||
l.getLayerHeightMm().doubleValue(),
|
||||
String.format("%.2f mm", l.getLayerHeightMm())
|
||||
))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 5. Nozzles
|
||||
List<OptionsResponse.NozzleOptionDTO> nozzles = nozzleRepo.findAll().stream()
|
||||
.filter(n -> Boolean.TRUE.equals(n.getIsActive()))
|
||||
.filter(n -> {
|
||||
if (!restrictNozzlesByMachineProfile) {
|
||||
return true;
|
||||
}
|
||||
BigDecimal normalized = nozzleLayerHeightPolicyService.normalizeNozzle(n.getNozzleDiameterMm());
|
||||
return normalized != null && supportedMachineNozzles.contains(normalized);
|
||||
})
|
||||
.filter(n -> n.getIsActive())
|
||||
.sorted(Comparator.comparing(NozzleOption::getNozzleDiameterMm))
|
||||
.map(n -> new OptionsResponse.NozzleOptionDTO(
|
||||
n.getNozzleDiameterMm().doubleValue(),
|
||||
@@ -160,207 +114,13 @@ public class OptionsController {
|
||||
? String.format(" (+ %.2f CHF)", n.getExtraNozzleChangeFeeChf())
|
||||
: " (Standard)")
|
||||
))
|
||||
.toList();
|
||||
.collect(Collectors.toList());
|
||||
|
||||
Map<BigDecimal, List<BigDecimal>> rulesByNozzle = nozzleLayerHeightPolicyService.getActiveRulesByNozzle();
|
||||
Set<BigDecimal> visibleNozzlesFromOptions = nozzles.stream()
|
||||
.map(OptionsResponse.NozzleOptionDTO::value)
|
||||
.map(BigDecimal::valueOf)
|
||||
.map(nozzleLayerHeightPolicyService::normalizeNozzle)
|
||||
.filter(v -> v != null)
|
||||
.collect(Collectors.toCollection(LinkedHashSet::new));
|
||||
|
||||
Map<BigDecimal, List<BigDecimal>> effectiveRulesByNozzle = new LinkedHashMap<>();
|
||||
for (BigDecimal nozzle : visibleNozzlesFromOptions) {
|
||||
List<BigDecimal> policyLayers = rulesByNozzle.getOrDefault(nozzle, List.of());
|
||||
List<BigDecimal> compatibleProcessLayers = resolveCompatibleProcessLayers(targetMachine, nozzle);
|
||||
List<BigDecimal> effective = mergePolicyAndProcessLayers(policyLayers, compatibleProcessLayers);
|
||||
if (!effective.isEmpty()) {
|
||||
effectiveRulesByNozzle.put(nozzle, effective);
|
||||
}
|
||||
}
|
||||
if (effectiveRulesByNozzle.isEmpty()) {
|
||||
for (BigDecimal nozzle : visibleNozzlesFromOptions) {
|
||||
List<BigDecimal> policyLayers = rulesByNozzle.getOrDefault(nozzle, List.of());
|
||||
if (!policyLayers.isEmpty()) {
|
||||
effectiveRulesByNozzle.put(nozzle, policyLayers);
|
||||
}
|
||||
}
|
||||
return ResponseEntity.ok(new OptionsResponse(materialOptions, qualities, patterns, layers, nozzles));
|
||||
}
|
||||
|
||||
Set<BigDecimal> visibleNozzles = new LinkedHashSet<>(effectiveRulesByNozzle.keySet());
|
||||
nozzles = nozzles.stream()
|
||||
.filter(option -> {
|
||||
BigDecimal normalized = nozzleLayerHeightPolicyService.normalizeNozzle(
|
||||
BigDecimal.valueOf(option.value())
|
||||
);
|
||||
return normalized != null && visibleNozzles.contains(normalized);
|
||||
})
|
||||
.toList();
|
||||
|
||||
BigDecimal selectedNozzle = nozzleLayerHeightPolicyService.resolveNozzle(
|
||||
nozzleDiameter != null ? BigDecimal.valueOf(nozzleDiameter) : null
|
||||
);
|
||||
if (!visibleNozzles.isEmpty() && !visibleNozzles.contains(selectedNozzle)) {
|
||||
selectedNozzle = visibleNozzles.iterator().next();
|
||||
}
|
||||
|
||||
List<OptionsResponse.LayerHeightOptionDTO> layers = toLayerDtos(
|
||||
effectiveRulesByNozzle.getOrDefault(selectedNozzle, List.of())
|
||||
);
|
||||
if (layers.isEmpty()) {
|
||||
if (!visibleNozzles.isEmpty()) {
|
||||
BigDecimal fallbackNozzle = visibleNozzles.iterator().next();
|
||||
layers = toLayerDtos(effectiveRulesByNozzle.getOrDefault(fallbackNozzle, List.of()));
|
||||
}
|
||||
if (layers.isEmpty()) {
|
||||
layers = rulesByNozzle.values().stream().findFirst().map(this::toLayerDtos).orElse(List.of());
|
||||
}
|
||||
}
|
||||
|
||||
List<OptionsResponse.NozzleLayerHeightOptionsDTO> layerHeightsByNozzle = effectiveRulesByNozzle.entrySet().stream()
|
||||
.map(entry -> new OptionsResponse.NozzleLayerHeightOptionsDTO(
|
||||
entry.getKey().doubleValue(),
|
||||
toLayerDtos(entry.getValue())
|
||||
))
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(new OptionsResponse(
|
||||
materialOptions,
|
||||
qualities,
|
||||
patterns,
|
||||
layers,
|
||||
nozzles,
|
||||
layerHeightsByNozzle
|
||||
));
|
||||
}
|
||||
|
||||
private Set<Long> resolveCompatibleMaterialTypeIds(Long printerMachineId, Double nozzleDiameter) {
|
||||
PrinterMachine machine = resolveMachine(printerMachineId);
|
||||
if (machine == null) {
|
||||
return Set.of();
|
||||
}
|
||||
|
||||
BigDecimal nozzle = nozzleLayerHeightPolicyService.resolveNozzle(
|
||||
nozzleDiameter != null ? BigDecimal.valueOf(nozzleDiameter) : null
|
||||
);
|
||||
|
||||
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 PrinterMachine resolveMachine(Long printerMachineId) {
|
||||
PrinterMachine machine = null;
|
||||
if (printerMachineId != null) {
|
||||
machine = printerMachineRepo.findById(printerMachineId).orElse(null);
|
||||
}
|
||||
if (machine == null) {
|
||||
machine = printerMachineRepo.findFirstByIsActiveTrue().orElse(null);
|
||||
}
|
||||
return machine;
|
||||
}
|
||||
|
||||
private List<OptionsResponse.LayerHeightOptionDTO> toLayerDtos(List<BigDecimal> layers) {
|
||||
return layers.stream()
|
||||
.sorted(Comparator.naturalOrder())
|
||||
.map(layer -> new OptionsResponse.LayerHeightOptionDTO(
|
||||
layer.doubleValue(),
|
||||
String.format("%.2f mm", layer)
|
||||
))
|
||||
.toList();
|
||||
}
|
||||
|
||||
private List<BigDecimal> resolveCompatibleProcessLayers(PrinterMachine machine, BigDecimal nozzle) {
|
||||
if (machine == null || nozzle == null) {
|
||||
return List.of();
|
||||
}
|
||||
PrinterMachineProfile profile = orcaProfileResolver.resolveMachineProfile(machine, nozzle).orElse(null);
|
||||
if (profile == null || profile.getOrcaMachineProfileName() == null) {
|
||||
return List.of();
|
||||
}
|
||||
return profileManager.findCompatibleProcessLayers(profile.getOrcaMachineProfileName());
|
||||
}
|
||||
|
||||
private List<BigDecimal> mergePolicyAndProcessLayers(List<BigDecimal> policyLayers,
|
||||
List<BigDecimal> processLayers) {
|
||||
if ((processLayers == null || processLayers.isEmpty())
|
||||
&& (policyLayers == null || policyLayers.isEmpty())) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
if (processLayers == null || processLayers.isEmpty()) {
|
||||
return policyLayers != null ? policyLayers : List.of();
|
||||
}
|
||||
|
||||
if (policyLayers == null || policyLayers.isEmpty()) {
|
||||
return processLayers;
|
||||
}
|
||||
|
||||
Set<BigDecimal> allowedByPolicy = policyLayers.stream()
|
||||
.map(nozzleLayerHeightPolicyService::normalizeLayer)
|
||||
.filter(v -> v != null)
|
||||
.collect(Collectors.toCollection(LinkedHashSet::new));
|
||||
|
||||
List<BigDecimal> intersection = processLayers.stream()
|
||||
.map(nozzleLayerHeightPolicyService::normalizeLayer)
|
||||
.filter(v -> v != null && allowedByPolicy.contains(v))
|
||||
.collect(Collectors.toCollection(ArrayList::new));
|
||||
|
||||
if (!intersection.isEmpty()) {
|
||||
return intersection;
|
||||
}
|
||||
|
||||
return processLayers.stream()
|
||||
.map(nozzleLayerHeightPolicyService::normalizeLayer)
|
||||
.filter(v -> v != null)
|
||||
.collect(Collectors.toCollection(ArrayList::new));
|
||||
}
|
||||
|
||||
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";
|
||||
@@ -374,6 +134,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,42 +1,77 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.CreateOrderRequest;
|
||||
import com.printcalculator.dto.OrderDto;
|
||||
import com.printcalculator.service.order.OrderControllerService;
|
||||
import jakarta.validation.Valid;
|
||||
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.QrBillService;
|
||||
import com.printcalculator.service.StorageService;
|
||||
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.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/orders")
|
||||
public class OrderController {
|
||||
|
||||
private final OrderControllerService orderControllerService;
|
||||
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;
|
||||
|
||||
public OrderController(OrderControllerService orderControllerService) {
|
||||
this.orderControllerService = orderControllerService;
|
||||
|
||||
public OrderController(OrderService orderService,
|
||||
OrderRepository orderRepo,
|
||||
OrderItemRepository orderItemRepo,
|
||||
QuoteSessionRepository quoteSessionRepo,
|
||||
QuoteLineItemRepository quoteLineItemRepo,
|
||||
CustomerRepository customerRepo,
|
||||
StorageService storageService,
|
||||
InvoicePdfRenderingService invoiceService,
|
||||
QrBillService qrBillService) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
// 1. Create Order from Quote
|
||||
@PostMapping("/from-quote/{quoteSessionId}")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> createOrderFromQuote(
|
||||
@PathVariable UUID quoteSessionId,
|
||||
@Valid @RequestBody CreateOrderRequest request
|
||||
@RequestBody com.printcalculator.dto.CreateOrderRequest request
|
||||
) {
|
||||
return ResponseEntity.ok(orderControllerService.createOrderFromQuote(quoteSessionId, 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)
|
||||
@@ -46,56 +81,178 @@ public class OrderController {
|
||||
@PathVariable UUID orderItemId,
|
||||
@RequestParam("file") MultipartFile file
|
||||
) throws IOException {
|
||||
boolean uploaded = orderControllerService.uploadOrderItemFile(orderId, orderItemId, file);
|
||||
if (!uploaded) {
|
||||
|
||||
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();
|
||||
if (relativePath == null || relativePath.equals("PENDING")) {
|
||||
String ext = getExtension(file.getOriginalFilename());
|
||||
String storedFilename = UUID.randomUUID().toString() + "." + ext;
|
||||
relativePath = "orders/" + orderId + "/3d-files/" + orderItemId + "/" + storedFilename;
|
||||
item.setStoredRelativePath(relativePath);
|
||||
item.setStoredFilename(storedFilename);
|
||||
}
|
||||
|
||||
storageService.store(file, Paths.get(relativePath));
|
||||
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 orderControllerService.getOrder(orderId)
|
||||
.map(ResponseEntity::ok)
|
||||
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
|
||||
) {
|
||||
return orderControllerService.reportPayment(orderId, payload.get("method"))
|
||||
.map(ResponseEntity::ok)
|
||||
.orElse(ResponseEntity.notFound().build());
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/confirmation")
|
||||
public ResponseEntity<byte[]> getConfirmation(@PathVariable UUID orderId) {
|
||||
return orderControllerService.getConfirmation(orderId);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/invoice")
|
||||
public ResponseEntity<byte[]> getInvoice(@PathVariable UUID orderId) {
|
||||
return ResponseEntity.notFound().build();
|
||||
Order order = orderRepo.findById(orderId)
|
||||
.orElseThrow(() -> new RuntimeException("Order not found"));
|
||||
|
||||
List<OrderItem> items = orderItemRepo.findByOrder_Id(orderId);
|
||||
|
||||
Map<String, Object> vars = new HashMap<>();
|
||||
vars.put("sellerDisplayName", "3D Fab Switzerland");
|
||||
vars.put("sellerAddressLine1", "Sede Ticino, Svizzera");
|
||||
vars.put("sellerAddressLine2", "Sede Bienne, Svizzera");
|
||||
vars.put("sellerEmail", "info@3dfab.ch");
|
||||
|
||||
vars.put("invoiceNumber", "INV-" + order.getId().toString().substring(0, 8).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());
|
||||
|
||||
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", "Pagamento entro 7 giorni via Bonifico o TWINT. Grazie.");
|
||||
|
||||
String qrBillSvg = new String(qrBillService.generateQrBillSvg(order), java.nio.charset.StandardCharsets.UTF_8);
|
||||
|
||||
// Strip XML declaration and DOCTYPE if present, as they validity break the embedding HTML page
|
||||
if (qrBillSvg.contains("<?xml")) {
|
||||
int svgStartIndex = qrBillSvg.indexOf("<svg");
|
||||
if (svgStartIndex != -1) {
|
||||
qrBillSvg = qrBillSvg.substring(svgStartIndex);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/twint")
|
||||
public ResponseEntity<Map<String, String>> getTwintPayment(@PathVariable UUID orderId) {
|
||||
return orderControllerService.getTwintPayment(orderId);
|
||||
byte[] pdf = invoiceService.generateInvoicePdfBytesFromTemplate(vars, qrBillSvg);
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.header("Content-Disposition", "attachment; filename=\"invoice-" + orderId + ".pdf\"")
|
||||
.contentType(MediaType.APPLICATION_PDF)
|
||||
.body(pdf);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/twint/open")
|
||||
public ResponseEntity<Void> openTwintPayment(@PathVariable UUID orderId) {
|
||||
return orderControllerService.openTwintPayment(orderId);
|
||||
private String getExtension(String filename) {
|
||||
if (filename == null) return "stl";
|
||||
int i = filename.lastIndexOf('.');
|
||||
if (i > 0) {
|
||||
return filename.substring(i + 1);
|
||||
}
|
||||
return "stl";
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/twint/qr")
|
||||
public ResponseEntity<byte[]> getTwintQr(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestParam(defaultValue = "320") int size
|
||||
) {
|
||||
return orderControllerService.getTwintQr(orderId, size);
|
||||
private OrderDto convertToDto(Order order, List<OrderItem> items) {
|
||||
OrderDto dto = new OrderDto();
|
||||
dto.setId(order.getId());
|
||||
dto.setStatus(order.getStatus());
|
||||
dto.setCustomerEmail(order.getCustomerEmail());
|
||||
dto.setCustomerPhone(order.getCustomerPhone());
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.PublicMediaUsageDto;
|
||||
import com.printcalculator.service.media.PublicMediaQueryService;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/public/media")
|
||||
@Transactional(readOnly = true)
|
||||
public class PublicMediaController {
|
||||
|
||||
private final PublicMediaQueryService publicMediaQueryService;
|
||||
|
||||
public PublicMediaController(PublicMediaQueryService publicMediaQueryService) {
|
||||
this.publicMediaQueryService = publicMediaQueryService;
|
||||
}
|
||||
|
||||
@GetMapping("/usages")
|
||||
public ResponseEntity<List<PublicMediaUsageDto>> getUsageMedia(@RequestParam String usageType,
|
||||
@RequestParam String usageKey,
|
||||
@RequestParam(required = false) String lang) {
|
||||
return ResponseEntity.ok(publicMediaQueryService.getUsageMedia(usageType, usageKey, lang));
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.ShopCategoryDetailDto;
|
||||
import com.printcalculator.dto.ShopCategoryTreeDto;
|
||||
import com.printcalculator.dto.ShopProductCatalogResponseDto;
|
||||
import com.printcalculator.dto.ShopProductDetailDto;
|
||||
import com.printcalculator.service.shop.PublicShopCatalogService;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
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.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/shop")
|
||||
@Transactional(readOnly = true)
|
||||
public class PublicShopController {
|
||||
private final PublicShopCatalogService publicShopCatalogService;
|
||||
|
||||
public PublicShopController(PublicShopCatalogService publicShopCatalogService) {
|
||||
this.publicShopCatalogService = publicShopCatalogService;
|
||||
}
|
||||
|
||||
@GetMapping("/categories")
|
||||
public ResponseEntity<List<ShopCategoryTreeDto>> getCategories(@RequestParam(required = false) String lang) {
|
||||
return ResponseEntity.ok(publicShopCatalogService.getCategories(lang));
|
||||
}
|
||||
|
||||
@GetMapping("/categories/{slug}")
|
||||
public ResponseEntity<ShopCategoryDetailDto> getCategory(@PathVariable String slug,
|
||||
@RequestParam(required = false) String lang) {
|
||||
return ResponseEntity.ok(publicShopCatalogService.getCategory(slug, lang));
|
||||
}
|
||||
|
||||
@GetMapping("/products")
|
||||
public ResponseEntity<ShopProductCatalogResponseDto> getProducts(
|
||||
@RequestParam(required = false) String categorySlug,
|
||||
@RequestParam(required = false) Boolean featured,
|
||||
@RequestParam(required = false) String lang
|
||||
) {
|
||||
return ResponseEntity.ok(publicShopCatalogService.getProductCatalog(categorySlug, featured, lang));
|
||||
}
|
||||
|
||||
@GetMapping("/products/{slug}")
|
||||
public ResponseEntity<ShopProductDetailDto> getProduct(@PathVariable String slug,
|
||||
@RequestParam(required = false) String lang) {
|
||||
return ResponseEntity.ok(publicShopCatalogService.getProduct(slug, lang));
|
||||
}
|
||||
|
||||
@GetMapping("/products/{slug}/model")
|
||||
public ResponseEntity<Resource> getProductModel(@PathVariable String slug) throws IOException {
|
||||
PublicShopCatalogService.ProductModelDownload model = publicShopCatalogService.getProductModelDownload(slug);
|
||||
Resource resource = new UrlResource(model.path().toUri());
|
||||
MediaType contentType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
if (model.mimeType() != null && !model.mimeType().isBlank()) {
|
||||
try {
|
||||
contentType = MediaType.parseMediaType(model.mimeType());
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
contentType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(contentType)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + model.filename() + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
}
|
||||
@@ -1,51 +1,47 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.entity.PrinterMachine;
|
||||
import com.printcalculator.exception.ModelTooLargeException;
|
||||
import com.printcalculator.model.PrintStats;
|
||||
import com.printcalculator.model.QuoteResult;
|
||||
import com.printcalculator.model.StlBounds;
|
||||
import com.printcalculator.repository.PrinterMachineRepository;
|
||||
import com.printcalculator.service.NozzleLayerHeightPolicyService;
|
||||
import com.printcalculator.service.QuoteCalculator;
|
||||
import com.printcalculator.service.ProfileManager;
|
||||
import com.printcalculator.service.SlicerService;
|
||||
import com.printcalculator.service.storage.ClamAVService;
|
||||
import com.printcalculator.service.StlService;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
@RestController
|
||||
public class QuoteController {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(QuoteController.class.getName());
|
||||
|
||||
private final SlicerService slicerService;
|
||||
private final StlService stlService;
|
||||
private final QuoteCalculator quoteCalculator;
|
||||
private final PrinterMachineRepository machineRepo;
|
||||
private final ClamAVService clamAVService;
|
||||
private final NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService;
|
||||
private final ProfileManager profileManager;
|
||||
|
||||
// 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,
|
||||
ClamAVService clamAVService,
|
||||
NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService) {
|
||||
public QuoteController(SlicerService slicerService, StlService stlService, QuoteCalculator quoteCalculator, PrinterMachineRepository machineRepo, ProfileManager profileManager) {
|
||||
this.slicerService = slicerService;
|
||||
this.stlService = stlService;
|
||||
this.quoteCalculator = quoteCalculator;
|
||||
this.machineRepo = machineRepo;
|
||||
this.clamAVService = clamAVService;
|
||||
this.nozzleLayerHeightPolicyService = nozzleLayerHeightPolicyService;
|
||||
this.profileManager = profileManager;
|
||||
}
|
||||
|
||||
@PostMapping("/api/quote")
|
||||
@@ -59,7 +55,7 @@ public class QuoteController {
|
||||
@RequestParam(value = "infill_pattern", required = false) String infillPattern,
|
||||
@RequestParam(value = "layer_height", required = false) Double layerHeight,
|
||||
@RequestParam(value = "nozzle_diameter", required = false) Double nozzleDiameter,
|
||||
@RequestParam(value = "support_enabled", required = false) Boolean supportEnabled
|
||||
@RequestParam(value = "support_enabled", required = false, defaultValue = "false") Boolean supportEnabled
|
||||
) throws IOException {
|
||||
|
||||
// ... process selection logic ...
|
||||
@@ -82,33 +78,24 @@ public class QuoteController {
|
||||
if (infillPattern != null && !infillPattern.isEmpty()) {
|
||||
processOverrides.put("sparse_infill_pattern", infillPattern);
|
||||
}
|
||||
BigDecimal normalizedNozzle = nozzleLayerHeightPolicyService.resolveNozzle(
|
||||
nozzleDiameter != null ? BigDecimal.valueOf(nozzleDiameter) : null
|
||||
);
|
||||
if (layerHeight != null) {
|
||||
BigDecimal normalizedLayer = nozzleLayerHeightPolicyService.normalizeLayer(BigDecimal.valueOf(layerHeight));
|
||||
if (!nozzleLayerHeightPolicyService.isAllowed(normalizedNozzle, normalizedLayer)) {
|
||||
throw new ResponseStatusException(
|
||||
BAD_REQUEST,
|
||||
"Layer height " + normalizedLayer.stripTrailingZeros().toPlainString()
|
||||
+ " is not allowed for nozzle " + normalizedNozzle.stripTrailingZeros().toPlainString()
|
||||
+ ". Allowed: " + nozzleLayerHeightPolicyService.allowedLayersLabel(normalizedNozzle)
|
||||
);
|
||||
}
|
||||
processOverrides.put("layer_height", normalizedLayer.stripTrailingZeros().toPlainString());
|
||||
processOverrides.put("layer_height", String.valueOf(layerHeight));
|
||||
}
|
||||
if (supportEnabled != null) {
|
||||
processOverrides.put("enable_support", supportEnabled ? "1" : "0");
|
||||
if (supportEnabled) {
|
||||
processOverrides.put("support_threshold_angle", "45");
|
||||
}
|
||||
}
|
||||
|
||||
if (nozzleDiameter != null) {
|
||||
machineOverrides.put("nozzle_diameter", normalizedNozzle.stripTrailingZeros().toPlainString());
|
||||
machineOverrides.put("nozzle_diameter", String.valueOf(nozzleDiameter));
|
||||
// Also need to ensure the printer profile is compatible or just override?
|
||||
// Usually nozzle diameter changes require a different printer profile or deep overrides.
|
||||
// For now, we trust the override key works on the base profile.
|
||||
}
|
||||
|
||||
return processRequest(file, filament, actualProcess, machineOverrides, processOverrides);
|
||||
return processRequest(file, filament, actualProcess, machineOverrides, processOverrides, nozzleDiameter);
|
||||
}
|
||||
|
||||
@PostMapping("/calculate/stl")
|
||||
@@ -116,21 +103,16 @@ public class QuoteController {
|
||||
@RequestParam("file") MultipartFile file
|
||||
) throws IOException {
|
||||
// Legacy endpoint uses defaults
|
||||
return processRequest(file, DEFAULT_FILAMENT, DEFAULT_PROCESS, null, null);
|
||||
return processRequest(file, DEFAULT_FILAMENT, DEFAULT_PROCESS, null, null, null);
|
||||
}
|
||||
|
||||
private ResponseEntity<QuoteResult> processRequest(MultipartFile file, String filament, String process,
|
||||
Map<String, String> machineOverrides,
|
||||
Map<String, String> processOverrides) throws IOException {
|
||||
Map<String, String> processOverrides,
|
||||
Double nozzleDiameter) throws IOException {
|
||||
if (file.isEmpty()) {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
if (!isSupportedInputFile(file)) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Unsupported file type. Allowed: stl, 3mf");
|
||||
}
|
||||
|
||||
// Scan for virus
|
||||
clamAVService.scan(file.getInputStream());
|
||||
|
||||
// Fetch Default Active Machine
|
||||
PrinterMachine machine = machineRepo.findFirstByIsActiveTrue()
|
||||
@@ -138,33 +120,74 @@ public class QuoteController {
|
||||
|
||||
// Save uploaded file temporarily
|
||||
Path tempInput = Files.createTempFile("upload_", "_" + file.getOriginalFilename());
|
||||
com.printcalculator.model.StlShiftResult shift = null;
|
||||
try {
|
||||
file.transferTo(tempInput.toFile());
|
||||
|
||||
String slicerMachineProfile = "bambu_a1"; // TODO: Add to PrinterMachine entity
|
||||
// Use profile from machine or fallback
|
||||
String slicerMachineProfile = machine.getSlicerMachineProfile();
|
||||
if (slicerMachineProfile == null || slicerMachineProfile.isEmpty()) {
|
||||
slicerMachineProfile = "bambu_a1";
|
||||
}
|
||||
slicerMachineProfile = profileManager.resolveMachineProfileName(slicerMachineProfile, nozzleDiameter);
|
||||
|
||||
PrintStats stats = slicerService.slice(tempInput.toFile(), slicerMachineProfile, filament, process, machineOverrides, processOverrides);
|
||||
// Validate model size against machine volume
|
||||
StlBounds bounds = validateModelSize(tempInput.toFile(), machine);
|
||||
|
||||
// Auto-center if needed
|
||||
shift = stlService.shiftToFitIfNeeded(
|
||||
tempInput.toFile(),
|
||||
bounds,
|
||||
machine.getBuildVolumeXMm(),
|
||||
machine.getBuildVolumeYMm(),
|
||||
machine.getBuildVolumeZMm()
|
||||
);
|
||||
java.io.File sliceInput = shift.shifted() ? shift.shiftedPath().toFile() : tempInput.toFile();
|
||||
if (shift.shifted()) {
|
||||
logger.info(String.format("Auto-centered STL by offset (mm): x=%.3f y=%.3f z=%.3f",
|
||||
shift.offsetX(), shift.offsetY(), shift.offsetZ()));
|
||||
}
|
||||
|
||||
PrintStats stats = slicerService.slice(sliceInput, slicerMachineProfile, filament, process, machineOverrides, processOverrides);
|
||||
|
||||
// Calculate Quote (Pass machine display name for pricing lookup)
|
||||
QuoteResult result = quoteCalculator.calculate(stats, machine.getPrinterDisplayName(), filament);
|
||||
|
||||
return ResponseEntity.ok(result);
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return ResponseEntity.internalServerError().build();
|
||||
} finally {
|
||||
Files.deleteIfExists(tempInput);
|
||||
if (shift != null && shift.shifted()) {
|
||||
try {
|
||||
Files.deleteIfExists(shift.shiftedPath());
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isSupportedInputFile(MultipartFile file) {
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
if (originalFilename == null || originalFilename.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
private StlBounds validateModelSize(java.io.File stlFile, PrinterMachine machine) throws IOException {
|
||||
StlBounds bounds = stlService.readBounds(stlFile);
|
||||
double x = bounds.sizeX();
|
||||
double y = bounds.sizeY();
|
||||
double z = bounds.sizeZ();
|
||||
|
||||
String normalized = originalFilename.toLowerCase(Locale.ROOT);
|
||||
return normalized.endsWith(".stl") || normalized.endsWith(".3mf");
|
||||
int bx = machine.getBuildVolumeXMm();
|
||||
int by = machine.getBuildVolumeYMm();
|
||||
int bz = machine.getBuildVolumeZMm();
|
||||
|
||||
logger.info(String.format(
|
||||
"STL bounds (mm): min(%.3f,%.3f,%.3f) max(%.3f,%.3f,%.3f) size(%.3f,%.3f,%.3f) bed(%d,%d,%d)",
|
||||
bounds.minX(), bounds.minY(), bounds.minZ(),
|
||||
bounds.maxX(), bounds.maxY(), bounds.maxZ(),
|
||||
x, y, z, bx, by, bz
|
||||
));
|
||||
|
||||
double eps = 0.01;
|
||||
boolean fits = (x <= bx + eps && y <= by + eps && z <= bz + eps)
|
||||
|| (y <= bx + eps && x <= by + eps && z <= bz + eps);
|
||||
|
||||
if (!fits) {
|
||||
throw new ModelTooLargeException(x, y, z, bx, by, bz);
|
||||
}
|
||||
return bounds;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,123 +1,385 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.PrintSettingsDto;
|
||||
import com.printcalculator.entity.PrinterMachine;
|
||||
import com.printcalculator.entity.QuoteLineItem;
|
||||
import com.printcalculator.entity.QuoteSession;
|
||||
import com.printcalculator.exception.ModelTooLargeException;
|
||||
import com.printcalculator.model.PrintStats;
|
||||
import com.printcalculator.model.QuoteResult;
|
||||
import com.printcalculator.model.StlBounds;
|
||||
import com.printcalculator.repository.PrinterMachineRepository;
|
||||
import com.printcalculator.repository.QuoteLineItemRepository;
|
||||
import com.printcalculator.repository.QuoteSessionRepository;
|
||||
import com.printcalculator.service.QuoteCalculator;
|
||||
import com.printcalculator.service.QuoteSessionTotalsService;
|
||||
import com.printcalculator.service.quote.QuoteSessionItemService;
|
||||
import com.printcalculator.service.quote.QuoteSessionResponseAssembler;
|
||||
import com.printcalculator.service.quote.QuoteStorageService;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import com.printcalculator.service.ProfileManager;
|
||||
import com.printcalculator.service.SlicerService;
|
||||
import com.printcalculator.service.StlService;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/quote-sessions")
|
||||
|
||||
public class QuoteSessionController {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(QuoteSessionController.class.getName());
|
||||
|
||||
private final QuoteSessionRepository sessionRepo;
|
||||
private final QuoteLineItemRepository lineItemRepo;
|
||||
private final SlicerService slicerService;
|
||||
private final StlService stlService;
|
||||
private final QuoteCalculator quoteCalculator;
|
||||
private final ProfileManager profileManager;
|
||||
private final PrinterMachineRepository machineRepo;
|
||||
private final com.printcalculator.repository.PricingPolicyRepository pricingRepo;
|
||||
private final QuoteSessionTotalsService quoteSessionTotalsService;
|
||||
private final QuoteSessionItemService quoteSessionItemService;
|
||||
private final QuoteStorageService quoteStorageService;
|
||||
private final QuoteSessionResponseAssembler quoteSessionResponseAssembler;
|
||||
private final com.printcalculator.service.StorageService storageService;
|
||||
|
||||
// Defaults
|
||||
private static final String DEFAULT_FILAMENT = "pla_basic";
|
||||
private static final String DEFAULT_PROCESS = "standard";
|
||||
|
||||
public QuoteSessionController(QuoteSessionRepository sessionRepo,
|
||||
QuoteLineItemRepository lineItemRepo,
|
||||
SlicerService slicerService,
|
||||
StlService stlService,
|
||||
QuoteCalculator quoteCalculator,
|
||||
ProfileManager profileManager,
|
||||
PrinterMachineRepository machineRepo,
|
||||
com.printcalculator.repository.PricingPolicyRepository pricingRepo,
|
||||
QuoteSessionTotalsService quoteSessionTotalsService,
|
||||
QuoteSessionItemService quoteSessionItemService,
|
||||
QuoteStorageService quoteStorageService,
|
||||
QuoteSessionResponseAssembler quoteSessionResponseAssembler) {
|
||||
com.printcalculator.service.StorageService storageService) {
|
||||
this.sessionRepo = sessionRepo;
|
||||
this.lineItemRepo = lineItemRepo;
|
||||
this.slicerService = slicerService;
|
||||
this.stlService = stlService;
|
||||
this.quoteCalculator = quoteCalculator;
|
||||
this.profileManager = profileManager;
|
||||
this.machineRepo = machineRepo;
|
||||
this.pricingRepo = pricingRepo;
|
||||
this.quoteSessionTotalsService = quoteSessionTotalsService;
|
||||
this.quoteSessionItemService = quoteSessionItemService;
|
||||
this.quoteStorageService = quoteStorageService;
|
||||
this.quoteSessionResponseAssembler = quoteSessionResponseAssembler;
|
||||
this.storageService = storageService;
|
||||
}
|
||||
|
||||
// 1. Start a new empty session
|
||||
@PostMapping(value = "")
|
||||
@Transactional
|
||||
public ResponseEntity<QuoteSession> createSession() {
|
||||
QuoteSession session = new QuoteSession();
|
||||
session.setStatus("ACTIVE");
|
||||
session.setSessionType("PRINT_QUOTE");
|
||||
session.setPricingVersion("v1");
|
||||
session.setMaterialCode("PLA");
|
||||
// Default material/settings will be set when items are added or updated?
|
||||
// For now set safe defaults
|
||||
session.setMaterialCode("pla_basic");
|
||||
session.setSupportsEnabled(false);
|
||||
session.setCreatedAt(OffsetDateTime.now());
|
||||
session.setExpiresAt(OffsetDateTime.now().plusDays(30));
|
||||
|
||||
var policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
|
||||
session.setSetupCostChf(quoteCalculator.calculateSessionSetupFee(policy));
|
||||
session.setSetupCostChf(policy != null ? policy.getFixedJobFeeChf() : BigDecimal.ZERO);
|
||||
|
||||
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") PrintSettingsDto settings,
|
||||
@RequestPart("file") MultipartFile file) throws IOException {
|
||||
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 = quoteSessionItemService.addItemToSession(session, file, settings);
|
||||
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");
|
||||
|
||||
// 1. Define Persistent Storage Path
|
||||
// Structure: quotes/{sessionId}/{uuid}.{ext} (inside storage root)
|
||||
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
String ext = originalFilename != null && originalFilename.contains(".")
|
||||
? originalFilename.substring(originalFilename.lastIndexOf("."))
|
||||
: ".stl";
|
||||
|
||||
String storedFilename = UUID.randomUUID() + ext;
|
||||
Path relativePath = Paths.get("quotes", session.getId().toString(), storedFilename);
|
||||
|
||||
// Save file
|
||||
storageService.store(file, relativePath);
|
||||
|
||||
// Resolve absolute path for slicing and storage usage
|
||||
Path persistentPath = storageService.loadAsResource(relativePath).getFile().toPath();
|
||||
|
||||
com.printcalculator.model.StlShiftResult shift = null;
|
||||
try {
|
||||
// Apply Basic/Advanced Logic
|
||||
applyPrintSettings(settings);
|
||||
|
||||
// REAL SLICING
|
||||
// 1. Pick Machine (default to first active or specific)
|
||||
PrinterMachine machine = machineRepo.findFirstByIsActiveTrue()
|
||||
.orElseThrow(() -> new RuntimeException("No active printer found"));
|
||||
|
||||
// 2. Validate model size against machine volume
|
||||
StlBounds bounds = validateModelSize(persistentPath.toFile(), machine);
|
||||
|
||||
// 2b. Auto-center if needed (keeps the stored STL unchanged)
|
||||
shift = stlService.shiftToFitIfNeeded(
|
||||
persistentPath.toFile(),
|
||||
bounds,
|
||||
machine.getBuildVolumeXMm(),
|
||||
machine.getBuildVolumeYMm(),
|
||||
machine.getBuildVolumeZMm()
|
||||
);
|
||||
java.io.File sliceInput = shift.shifted() ? shift.shiftedPath().toFile() : persistentPath.toFile();
|
||||
if (shift.shifted()) {
|
||||
logger.info(String.format("Auto-centered STL by offset (mm): x=%.3f y=%.3f z=%.3f",
|
||||
shift.offsetX(), shift.offsetY(), shift.offsetZ()));
|
||||
}
|
||||
|
||||
// 3. Pick Profiles
|
||||
String machineProfile = machine.getSlicerMachineProfile();
|
||||
if (machineProfile == null || machineProfile.isBlank()) {
|
||||
machineProfile = machine.getPrinterDisplayName(); // e.g. "Bambu Lab A1 0.4 nozzle"
|
||||
}
|
||||
if (machineProfile == null || machineProfile.isBlank()) {
|
||||
machineProfile = "bambu_a1"; // final fallback (alias handled in ProfileManager)
|
||||
}
|
||||
machineProfile = profileManager.resolveMachineProfileName(machineProfile, settings.getNozzleDiameter());
|
||||
|
||||
String filamentProfile = "Generic " + (settings.getMaterial() != null ? settings.getMaterial().toUpperCase() : "PLA");
|
||||
// Mapping: "pla_basic" -> "Generic PLA", "petg_basic" -> "Generic PETG"
|
||||
if (settings.getMaterial() != null) {
|
||||
if (settings.getMaterial().toLowerCase().contains("pla")) filamentProfile = "Generic PLA";
|
||||
else if (settings.getMaterial().toLowerCase().contains("petg")) filamentProfile = "Generic PETG";
|
||||
else if (settings.getMaterial().toLowerCase().contains("tpu")) filamentProfile = "Generic TPU";
|
||||
else if (settings.getMaterial().toLowerCase().contains("abs")) filamentProfile = "Generic ABS";
|
||||
|
||||
// Update Session Material
|
||||
session.setMaterialCode(settings.getMaterial());
|
||||
} else {
|
||||
// Fallback if null?
|
||||
session.setMaterialCode("pla_basic");
|
||||
}
|
||||
|
||||
// Update Session Settings for Persistence
|
||||
if (settings.getNozzleDiameter() != null) session.setNozzleDiameterMm(BigDecimal.valueOf(settings.getNozzleDiameter()));
|
||||
if (settings.getLayerHeight() != null) session.setLayerHeightMm(BigDecimal.valueOf(settings.getLayerHeight()));
|
||||
if (settings.getInfillDensity() != null) session.setInfillPercent(settings.getInfillDensity().intValue());
|
||||
if (settings.getInfillPattern() != null) session.setInfillPattern(settings.getInfillPattern());
|
||||
if (settings.getSupportsEnabled() != null) session.setSupportsEnabled(settings.getSupportsEnabled());
|
||||
if (settings.getNotes() != null) session.setNotes(settings.getNotes());
|
||||
|
||||
// Save session updates
|
||||
sessionRepo.save(session);
|
||||
|
||||
String processProfile = "0.20mm Standard @BBL A1";
|
||||
// Mapping quality to process
|
||||
// "standard" -> "0.20mm Standard @BBL A1"
|
||||
// "draft" -> "0.28mm Extra Draft @BBL A1"
|
||||
// "high" -> "0.12mm Fine @BBL A1" (approx names, need to be exact for Orca)
|
||||
// Let's use robust defaults or simple overrides
|
||||
if (settings.getLayerHeight() != null) {
|
||||
if (settings.getLayerHeight() >= 0.28) processProfile = "0.28mm Extra Draft @BBL A1";
|
||||
else if (settings.getLayerHeight() <= 0.12) processProfile = "0.12mm Fine @BBL A1";
|
||||
}
|
||||
|
||||
// Build overrides map from settings
|
||||
// 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());
|
||||
if (settings.getSupportsEnabled() != null) {
|
||||
processOverrides.put("enable_support", settings.getSupportsEnabled() ? "1" : "0");
|
||||
// If enabled, use a more permissive threshold (45 deg) by default
|
||||
// to avoid expensive supports on things that don't strictly need them
|
||||
if (settings.getSupportsEnabled()) {
|
||||
processOverrides.put("support_threshold_angle", "45");
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, String> machineOverrides = new HashMap<>();
|
||||
if (settings.getNozzleDiameter() != null) {
|
||||
machineOverrides.put("nozzle_diameter", String.valueOf(settings.getNozzleDiameter()));
|
||||
}
|
||||
|
||||
// 4. Slice (Use persistent path)
|
||||
PrintStats stats = slicerService.slice(
|
||||
sliceInput,
|
||||
machineProfile,
|
||||
filamentProfile,
|
||||
processProfile,
|
||||
machineOverrides, // machine overrides
|
||||
processOverrides
|
||||
);
|
||||
|
||||
// 5. Calculate Quote
|
||||
QuoteResult result = quoteCalculator.calculate(stats, machine.getPrinterDisplayName(), filamentProfile);
|
||||
|
||||
// 6. Create Line Item
|
||||
QuoteLineItem item = new QuoteLineItem();
|
||||
item.setQuoteSession(session);
|
||||
item.setOriginalFilename(file.getOriginalFilename());
|
||||
item.setStoredPath(persistentPath.toString()); // SAVE PATH
|
||||
item.setQuantity(1);
|
||||
item.setColorCode(settings.getColor() != null ? settings.getColor() : "#FFFFFF");
|
||||
item.setStatus("READY"); // or CALCULATED
|
||||
|
||||
item.setPrintTimeSeconds((int) stats.getPrintTimeSeconds());
|
||||
item.setMaterialGrams(BigDecimal.valueOf(stats.getFilamentWeightGrams()));
|
||||
item.setUnitPriceChf(BigDecimal.valueOf(result.getTotalPrice()));
|
||||
|
||||
// Store breakdown
|
||||
Map<String, Object> breakdown = new HashMap<>();
|
||||
breakdown.put("machine_cost", result.getTotalPrice() - result.getSetupCost()); // Approximation?
|
||||
// Better: QuoteResult could expose detailed breakdown. For now just storing what we have.
|
||||
breakdown.put("setup_fee", result.getSetupCost());
|
||||
item.setPricingBreakdown(breakdown);
|
||||
|
||||
// Dimensions from STL
|
||||
item.setBoundingBoxXMm(BigDecimal.valueOf(bounds.sizeX()));
|
||||
item.setBoundingBoxYMm(BigDecimal.valueOf(bounds.sizeY()));
|
||||
item.setBoundingBoxZMm(BigDecimal.valueOf(bounds.sizeZ()));
|
||||
|
||||
item.setCreatedAt(OffsetDateTime.now());
|
||||
item.setUpdatedAt(OffsetDateTime.now());
|
||||
|
||||
return lineItemRepo.save(item);
|
||||
|
||||
} catch (Exception e) {
|
||||
// Cleanup if failed
|
||||
try {
|
||||
storageService.delete(Paths.get("quotes", session.getId().toString(), storedFilename));
|
||||
} catch (Exception ignored) {}
|
||||
throw e;
|
||||
} finally {
|
||||
if (shift != null && shift.shifted()) {
|
||||
try {
|
||||
Files.deleteIfExists(shift.shiftedPath());
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private StlBounds validateModelSize(java.io.File stlFile, PrinterMachine machine) throws IOException {
|
||||
StlBounds bounds = stlService.readBounds(stlFile);
|
||||
double x = bounds.sizeX();
|
||||
double y = bounds.sizeY();
|
||||
double z = bounds.sizeZ();
|
||||
|
||||
int bx = machine.getBuildVolumeXMm();
|
||||
int by = machine.getBuildVolumeYMm();
|
||||
int bz = machine.getBuildVolumeZMm();
|
||||
|
||||
logger.info(String.format(
|
||||
"STL bounds (mm): min(%.3f,%.3f,%.3f) max(%.3f,%.3f,%.3f) size(%.3f,%.3f,%.3f) bed(%d,%d,%d)",
|
||||
bounds.minX(), bounds.minY(), bounds.minZ(),
|
||||
bounds.maxX(), bounds.maxY(), bounds.maxZ(),
|
||||
x, y, z, bx, by, bz
|
||||
));
|
||||
|
||||
double eps = 0.01;
|
||||
boolean fits = (x <= bx + eps && y <= by + eps && z <= bz + eps)
|
||||
|| (y <= bx + eps && x <= by + eps && z <= bz + eps);
|
||||
|
||||
if (!fits) {
|
||||
throw new ModelTooLargeException(x, y, z, bx, by, bz);
|
||||
}
|
||||
return bounds;
|
||||
}
|
||||
|
||||
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");
|
||||
if (settings.getNozzleDiameter() == null) settings.setNozzleDiameter(0.4);
|
||||
break;
|
||||
case "high":
|
||||
settings.setLayerHeight(0.12);
|
||||
settings.setInfillDensity(20.0);
|
||||
settings.setInfillPattern("gyroid");
|
||||
if (settings.getNozzleDiameter() == null) settings.setNozzleDiameter(0.4);
|
||||
break;
|
||||
case "standard":
|
||||
default:
|
||||
settings.setLayerHeight(0.20);
|
||||
settings.setInfillDensity(20.0);
|
||||
settings.setInfillPattern("grid");
|
||||
if (settings.getNozzleDiameter() == null) settings.setNozzleDiameter(0.4);
|
||||
break;
|
||||
}
|
||||
if (settings.getSupportsEnabled() == null) settings.setSupportsEnabled(false);
|
||||
} 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");
|
||||
if (settings.getNozzleDiameter() == null) settings.setNozzleDiameter(0.4);
|
||||
if (settings.getSupportsEnabled() == null) settings.setSupportsEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Update Line Item
|
||||
@PatchMapping("/line-items/{lineItemId}")
|
||||
@Transactional
|
||||
public ResponseEntity<QuoteLineItem> updateLineItem(@PathVariable UUID lineItemId,
|
||||
@RequestBody Map<String, Object> updates) {
|
||||
public ResponseEntity<QuoteLineItem> updateLineItem(
|
||||
@PathVariable UUID lineItemId,
|
||||
@RequestBody Map<String, Object> updates
|
||||
) {
|
||||
QuoteLineItem item = lineItemRepo.findById(lineItemId)
|
||||
.orElseThrow(() -> new RuntimeException("Item not found"));
|
||||
|
||||
QuoteSession session = item.getQuoteSession();
|
||||
if ("CONVERTED".equals(session.getStatus())) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Cannot modify a converted session");
|
||||
}
|
||||
|
||||
if (updates.containsKey("quantity")) {
|
||||
item.setQuantity(parsePositiveQuantity(updates.get("quantity")));
|
||||
item.setQuantity((Integer) updates.get("quantity"));
|
||||
}
|
||||
if (updates.containsKey("color_code")) {
|
||||
Object colorValue = updates.get("color_code");
|
||||
if (colorValue != null) {
|
||||
item.setColorCode(String.valueOf(colorValue));
|
||||
}
|
||||
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) {
|
||||
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"));
|
||||
|
||||
@@ -129,22 +391,39 @@ public class QuoteSessionController {
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
// 5. Get Session (Session + Items + Total)
|
||||
@GetMapping("/{id}")
|
||||
@Transactional(readOnly = true)
|
||||
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);
|
||||
QuoteSessionTotalsService.QuoteSessionTotals totals = quoteSessionTotalsService.compute(session, items);
|
||||
return ResponseEntity.ok(quoteSessionResponseAssembler.assemble(session, items, totals));
|
||||
|
||||
// Calculate Totals
|
||||
BigDecimal itemsTotal = BigDecimal.ZERO;
|
||||
for (QuoteLineItem item : items) {
|
||||
BigDecimal lineTotal = item.getUnitPriceChf().multiply(BigDecimal.valueOf(item.getQuantity()));
|
||||
itemsTotal = itemsTotal.add(lineTotal);
|
||||
}
|
||||
|
||||
BigDecimal setupFee = session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO;
|
||||
BigDecimal grandTotal = itemsTotal.add(setupFee);
|
||||
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("session", session);
|
||||
response.put("items", items);
|
||||
response.put("itemsTotalChf", itemsTotal);
|
||||
response.put("grandTotalChf", grandTotal);
|
||||
|
||||
return ResponseEntity.ok(response);
|
||||
}
|
||||
|
||||
// 6. Download Line Item Content
|
||||
@GetMapping(value = "/{sessionId}/line-items/{lineItemId}/content")
|
||||
public ResponseEntity<Resource> downloadLineItemContent(@PathVariable UUID sessionId,
|
||||
@PathVariable UUID lineItemId,
|
||||
@RequestParam(name = "preview", required = false, defaultValue = "false") boolean preview)
|
||||
throws IOException {
|
||||
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"));
|
||||
|
||||
@@ -152,93 +431,38 @@ public class QuoteSessionController {
|
||||
return ResponseEntity.badRequest().build();
|
||||
}
|
||||
|
||||
String targetStoredPath = item.getStoredPath();
|
||||
if (preview) {
|
||||
String convertedPath = quoteStorageService.extractConvertedStoredPath(item);
|
||||
if (convertedPath != null && !convertedPath.isBlank()) {
|
||||
targetStoredPath = convertedPath;
|
||||
}
|
||||
}
|
||||
|
||||
if (targetStoredPath == null) {
|
||||
if (item.getStoredPath() == null) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
java.nio.file.Path path = quoteStorageService.resolveStoredQuotePath(targetStoredPath, sessionId);
|
||||
if (path == null || !java.nio.file.Files.exists(path)) {
|
||||
Path path = Paths.get(item.getStoredPath());
|
||||
// Since storedPath is absolute, we can't directly use loadAsResource with it unless we resolve relative.
|
||||
// But loadAsResource expects relative path?
|
||||
// Actually FileSystemStorageService.loadAsResource uses rootLocation.resolve(path).
|
||||
// If path is absolute, resolve might fail or behave weirdly.
|
||||
// But wait, we stored absolute path in DB: item.setStoredPath(persistentPath.toString());
|
||||
// If we want to use storageService.loadAsResource, we need the relative path.
|
||||
// Or we just access the file directly if we trust the absolute path.
|
||||
// But we want to use StorageService abstraction.
|
||||
|
||||
// Option 1: Reconstruct relative path.
|
||||
// We know structure: quotes/{sessionId}/{filename}...
|
||||
// But filename is UUID+ext. We don't have storedFilename in QuoteLineItem easily?
|
||||
// QuoteLineItem doesn't seem to have storedFilename field, only storedPath.
|
||||
|
||||
// If we trust the file is on disk, we can use UrlResource directly here as before,
|
||||
// relying on the fact that storedPath is the absolute path to the file.
|
||||
// But we should verify it exists.
|
||||
|
||||
if (!Files.exists(path)) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
Resource resource = new UrlResource(path.toUri());
|
||||
String downloadName = preview ? path.getFileName().toString() : item.getOriginalFilename();
|
||||
org.springframework.core.io.Resource resource = new org.springframework.core.io.UrlResource(path.toUri());
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.APPLICATION_OCTET_STREAM)
|
||||
.header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + downloadName + "\"")
|
||||
.header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + item.getOriginalFilename() + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/{sessionId}/line-items/{lineItemId}/stl-preview")
|
||||
public ResponseEntity<Resource> downloadLineItemStlPreview(@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 (!"stl".equals(quoteStorageService.getSafeExtension(item.getOriginalFilename(), ""))) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
String targetStoredPath = item.getStoredPath();
|
||||
if (targetStoredPath == null || targetStoredPath.isBlank()) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
java.nio.file.Path path = quoteStorageService.resolveStoredQuotePath(targetStoredPath, sessionId);
|
||||
if (path == null || !java.nio.file.Files.exists(path)) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
if (!"stl".equals(quoteStorageService.getSafeExtension(path.getFileName().toString(), ""))) {
|
||||
return ResponseEntity.notFound().build();
|
||||
}
|
||||
|
||||
Resource resource = new UrlResource(path.toUri());
|
||||
String downloadName = path.getFileName().toString();
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.parseMediaType("model/stl"))
|
||||
.header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + downloadName + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
|
||||
private int parsePositiveQuantity(Object raw) {
|
||||
if (raw == null) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Quantity is required");
|
||||
}
|
||||
|
||||
int quantity;
|
||||
if (raw instanceof Number number) {
|
||||
double numericValue = number.doubleValue();
|
||||
if (!Double.isFinite(numericValue)) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Quantity must be a finite number");
|
||||
}
|
||||
quantity = (int) Math.floor(numericValue);
|
||||
} else {
|
||||
try {
|
||||
quantity = Integer.parseInt(String.valueOf(raw).trim());
|
||||
} catch (NumberFormatException ex) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Quantity must be an integer");
|
||||
}
|
||||
}
|
||||
|
||||
if (quantity < 1) {
|
||||
throw new ResponseStatusException(BAD_REQUEST, "Quantity must be >= 1");
|
||||
}
|
||||
return quantity;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.dto.ShopCartAddItemRequest;
|
||||
import com.printcalculator.dto.ShopCartUpdateItemRequest;
|
||||
import com.printcalculator.service.shop.ShopCartCookieService;
|
||||
import com.printcalculator.service.shop.ShopCartService;
|
||||
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.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.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.UUID;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/shop/cart")
|
||||
public class ShopCartController {
|
||||
private final ShopCartService shopCartService;
|
||||
private final ShopCartCookieService shopCartCookieService;
|
||||
|
||||
public ShopCartController(ShopCartService shopCartService, ShopCartCookieService shopCartCookieService) {
|
||||
this.shopCartService = shopCartService;
|
||||
this.shopCartCookieService = shopCartCookieService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<?> getCart(HttpServletRequest request, HttpServletResponse response) {
|
||||
ShopCartService.CartResult result = shopCartService.loadCart(request);
|
||||
applyCookie(response, result);
|
||||
return ResponseEntity.ok(result.response());
|
||||
}
|
||||
|
||||
@PostMapping("/items")
|
||||
public ResponseEntity<?> addItem(HttpServletRequest request,
|
||||
HttpServletResponse response,
|
||||
@Valid @RequestBody ShopCartAddItemRequest payload) {
|
||||
ShopCartService.CartResult result = shopCartService.addItem(request, payload);
|
||||
applyCookie(response, result);
|
||||
return ResponseEntity.ok(result.response());
|
||||
}
|
||||
|
||||
@PatchMapping("/items/{lineItemId}")
|
||||
public ResponseEntity<?> updateItem(HttpServletRequest request,
|
||||
HttpServletResponse response,
|
||||
@PathVariable UUID lineItemId,
|
||||
@Valid @RequestBody ShopCartUpdateItemRequest payload) {
|
||||
ShopCartService.CartResult result = shopCartService.updateItem(request, lineItemId, payload);
|
||||
applyCookie(response, result);
|
||||
return ResponseEntity.ok(result.response());
|
||||
}
|
||||
|
||||
@DeleteMapping("/items/{lineItemId}")
|
||||
public ResponseEntity<?> removeItem(HttpServletRequest request,
|
||||
HttpServletResponse response,
|
||||
@PathVariable UUID lineItemId) {
|
||||
ShopCartService.CartResult result = shopCartService.removeItem(request, lineItemId);
|
||||
applyCookie(response, result);
|
||||
return ResponseEntity.ok(result.response());
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
public ResponseEntity<?> clearCart(HttpServletRequest request, HttpServletResponse response) {
|
||||
ShopCartService.CartResult result = shopCartService.clearCart(request);
|
||||
applyCookie(response, result);
|
||||
return ResponseEntity.ok(result.response());
|
||||
}
|
||||
|
||||
private void applyCookie(HttpServletResponse response, ShopCartService.CartResult result) {
|
||||
if (result.clearCookie()) {
|
||||
response.addHeader(HttpHeaders.SET_COOKIE, shopCartCookieService.buildClearCookie().toString());
|
||||
return;
|
||||
}
|
||||
if (result.sessionId() != null) {
|
||||
response.addHeader(HttpHeaders.SET_COOKIE, shopCartCookieService.buildSessionCookie(result.sessionId()).toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package com.printcalculator.controller;
|
||||
|
||||
import com.printcalculator.service.shop.ShopSitemapService;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.CacheControl;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
@RestController
|
||||
public class SitemapController {
|
||||
private final ShopSitemapService shopSitemapService;
|
||||
private final long cacheSeconds;
|
||||
|
||||
public SitemapController(
|
||||
ShopSitemapService shopSitemapService,
|
||||
@Value("${app.sitemap.shop.cache-seconds:3600}") long cacheSeconds
|
||||
) {
|
||||
this.shopSitemapService = shopSitemapService;
|
||||
this.cacheSeconds = Math.max(cacheSeconds, 0L);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/api/sitemap-shop.xml", produces = MediaType.APPLICATION_XML_VALUE)
|
||||
public ResponseEntity<String> getShopSitemap() {
|
||||
CacheControl cacheControl = cacheSeconds > 0
|
||||
? CacheControl.maxAge(Duration.ofSeconds(cacheSeconds)).cachePublic()
|
||||
: CacheControl.noCache();
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(MediaType.parseMediaType("application/xml;charset=UTF-8"))
|
||||
.cacheControl(cacheControl)
|
||||
.body(shopSitemapService.getShopSitemapXml());
|
||||
}
|
||||
}
|
||||
@@ -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,82 +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.service.admin.AdminFilamentControllerService;
|
||||
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.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/filaments")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminFilamentController {
|
||||
|
||||
private final AdminFilamentControllerService adminFilamentControllerService;
|
||||
|
||||
public AdminFilamentController(AdminFilamentControllerService adminFilamentControllerService) {
|
||||
this.adminFilamentControllerService = adminFilamentControllerService;
|
||||
}
|
||||
|
||||
@GetMapping("/materials")
|
||||
public ResponseEntity<List<AdminFilamentMaterialTypeDto>> getMaterials() {
|
||||
return ResponseEntity.ok(adminFilamentControllerService.getMaterials());
|
||||
}
|
||||
|
||||
@GetMapping("/variants")
|
||||
public ResponseEntity<List<AdminFilamentVariantDto>> getVariants() {
|
||||
return ResponseEntity.ok(adminFilamentControllerService.getVariants());
|
||||
}
|
||||
|
||||
@PostMapping("/materials")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentMaterialTypeDto> createMaterial(
|
||||
@RequestBody AdminUpsertFilamentMaterialTypeRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminFilamentControllerService.createMaterial(payload));
|
||||
}
|
||||
|
||||
@PutMapping("/materials/{materialTypeId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentMaterialTypeDto> updateMaterial(
|
||||
@PathVariable Long materialTypeId,
|
||||
@RequestBody AdminUpsertFilamentMaterialTypeRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminFilamentControllerService.updateMaterial(materialTypeId, payload));
|
||||
}
|
||||
|
||||
@PostMapping("/variants")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentVariantDto> createVariant(
|
||||
@RequestBody AdminUpsertFilamentVariantRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminFilamentControllerService.createVariant(payload));
|
||||
}
|
||||
|
||||
@PutMapping("/variants/{variantId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminFilamentVariantDto> updateVariant(
|
||||
@PathVariable Long variantId,
|
||||
@RequestBody AdminUpsertFilamentVariantRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminFilamentControllerService.updateVariant(variantId, payload));
|
||||
}
|
||||
|
||||
@DeleteMapping("/variants/{variantId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteVariant(@PathVariable Long variantId) {
|
||||
adminFilamentControllerService.deleteVariant(variantId);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminCreateMediaUsageRequest;
|
||||
import com.printcalculator.dto.AdminMediaAssetDto;
|
||||
import com.printcalculator.dto.AdminMediaUsageDto;
|
||||
import com.printcalculator.dto.AdminUpdateMediaAssetRequest;
|
||||
import com.printcalculator.dto.AdminUpdateMediaUsageRequest;
|
||||
import com.printcalculator.service.admin.AdminMediaControllerService;
|
||||
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.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/media")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminMediaController {
|
||||
|
||||
private final AdminMediaControllerService adminMediaControllerService;
|
||||
|
||||
public AdminMediaController(AdminMediaControllerService adminMediaControllerService) {
|
||||
this.adminMediaControllerService = adminMediaControllerService;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/assets", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
@Transactional
|
||||
public ResponseEntity<AdminMediaAssetDto> uploadAsset(@RequestParam("file") MultipartFile file,
|
||||
@RequestParam(value = "title", required = false) String title,
|
||||
@RequestParam(value = "altText", required = false) String altText,
|
||||
@RequestParam(value = "visibility", required = false) String visibility) {
|
||||
return ResponseEntity.ok(adminMediaControllerService.uploadAsset(file, title, altText, visibility));
|
||||
}
|
||||
|
||||
@GetMapping("/assets")
|
||||
public ResponseEntity<List<AdminMediaAssetDto>> listAssets() {
|
||||
return ResponseEntity.ok(adminMediaControllerService.listAssets());
|
||||
}
|
||||
|
||||
@GetMapping("/assets/{mediaAssetId}")
|
||||
public ResponseEntity<AdminMediaAssetDto> getAsset(@PathVariable UUID mediaAssetId) {
|
||||
return ResponseEntity.ok(adminMediaControllerService.getAsset(mediaAssetId));
|
||||
}
|
||||
|
||||
@GetMapping("/usages")
|
||||
public ResponseEntity<List<AdminMediaUsageDto>> getUsages(@RequestParam String usageType,
|
||||
@RequestParam String usageKey,
|
||||
@RequestParam(required = false) UUID ownerId) {
|
||||
return ResponseEntity.ok(adminMediaControllerService.getUsages(usageType, usageKey, ownerId));
|
||||
}
|
||||
|
||||
@PatchMapping("/assets/{mediaAssetId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminMediaAssetDto> updateAsset(@PathVariable UUID mediaAssetId,
|
||||
@RequestBody AdminUpdateMediaAssetRequest payload) {
|
||||
return ResponseEntity.ok(adminMediaControllerService.updateAsset(mediaAssetId, payload));
|
||||
}
|
||||
|
||||
@PostMapping("/usages")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminMediaUsageDto> createUsage(@RequestBody AdminCreateMediaUsageRequest payload) {
|
||||
return ResponseEntity.ok(adminMediaControllerService.createUsage(payload));
|
||||
}
|
||||
|
||||
@PatchMapping("/usages/{mediaUsageId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminMediaUsageDto> updateUsage(@PathVariable UUID mediaUsageId,
|
||||
@RequestBody AdminUpdateMediaUsageRequest payload) {
|
||||
return ResponseEntity.ok(adminMediaControllerService.updateUsage(mediaUsageId, payload));
|
||||
}
|
||||
|
||||
@DeleteMapping("/usages/{mediaUsageId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteUsage(@PathVariable UUID mediaUsageId) {
|
||||
adminMediaControllerService.deleteUsage(mediaUsageId);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminCadInvoiceCreateRequest;
|
||||
import com.printcalculator.dto.AdminCadInvoiceDto;
|
||||
import com.printcalculator.dto.AdminContactRequestDetailDto;
|
||||
import com.printcalculator.dto.AdminContactRequestDto;
|
||||
import com.printcalculator.dto.AdminFilamentStockDto;
|
||||
import com.printcalculator.dto.AdminQuoteSessionDto;
|
||||
import com.printcalculator.dto.AdminUpdateContactRequestStatusRequest;
|
||||
import com.printcalculator.service.admin.AdminOperationsControllerService;
|
||||
import org.springframework.core.io.Resource;
|
||||
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.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.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminOperationsController {
|
||||
|
||||
private final AdminOperationsControllerService adminOperationsControllerService;
|
||||
|
||||
public AdminOperationsController(AdminOperationsControllerService adminOperationsControllerService) {
|
||||
this.adminOperationsControllerService = adminOperationsControllerService;
|
||||
}
|
||||
|
||||
@GetMapping("/filament-stock")
|
||||
public ResponseEntity<List<AdminFilamentStockDto>> getFilamentStock() {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.getFilamentStock());
|
||||
}
|
||||
|
||||
@GetMapping("/contact-requests")
|
||||
public ResponseEntity<List<AdminContactRequestDto>> getContactRequests() {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.getContactRequests());
|
||||
}
|
||||
|
||||
@GetMapping("/contact-requests/{requestId}")
|
||||
public ResponseEntity<AdminContactRequestDetailDto> getContactRequestDetail(@PathVariable UUID requestId) {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.getContactRequestDetail(requestId));
|
||||
}
|
||||
|
||||
@PatchMapping("/contact-requests/{requestId}/status")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminContactRequestDetailDto> updateContactRequestStatus(
|
||||
@PathVariable UUID requestId,
|
||||
@RequestBody AdminUpdateContactRequestStatusRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.updateContactRequestStatus(requestId, payload));
|
||||
}
|
||||
|
||||
@GetMapping("/contact-requests/{requestId}/attachments/{attachmentId}/file")
|
||||
public ResponseEntity<Resource> downloadContactRequestAttachment(
|
||||
@PathVariable UUID requestId,
|
||||
@PathVariable UUID attachmentId
|
||||
) {
|
||||
return adminOperationsControllerService.downloadContactRequestAttachment(requestId, attachmentId);
|
||||
}
|
||||
|
||||
@GetMapping("/sessions")
|
||||
public ResponseEntity<List<AdminQuoteSessionDto>> getQuoteSessions() {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.getQuoteSessions());
|
||||
}
|
||||
|
||||
@GetMapping("/cad-invoices")
|
||||
public ResponseEntity<List<AdminCadInvoiceDto>> getCadInvoices() {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.getCadInvoices());
|
||||
}
|
||||
|
||||
@PostMapping("/cad-invoices")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminCadInvoiceDto> createOrUpdateCadInvoice(
|
||||
@RequestBody AdminCadInvoiceCreateRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminOperationsControllerService.createOrUpdateCadInvoice(payload));
|
||||
}
|
||||
|
||||
@DeleteMapping("/sessions/{sessionId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteQuoteSession(@PathVariable UUID sessionId) {
|
||||
adminOperationsControllerService.deleteQuoteSession(sessionId);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminOrderStatusUpdateRequest;
|
||||
import com.printcalculator.dto.OrderDto;
|
||||
import com.printcalculator.service.order.AdminOrderControllerService;
|
||||
import org.springframework.core.io.Resource;
|
||||
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 java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/orders")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminOrderController {
|
||||
|
||||
private final AdminOrderControllerService adminOrderControllerService;
|
||||
|
||||
public AdminOrderController(AdminOrderControllerService adminOrderControllerService) {
|
||||
this.adminOrderControllerService = adminOrderControllerService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<OrderDto>> listOrders() {
|
||||
return ResponseEntity.ok(adminOrderControllerService.listOrders());
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}")
|
||||
public ResponseEntity<OrderDto> getOrder(@PathVariable UUID orderId) {
|
||||
return ResponseEntity.ok(adminOrderControllerService.getOrder(orderId));
|
||||
}
|
||||
|
||||
@PostMapping("/{orderId}/payments/confirm")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> updatePaymentMethod(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestBody(required = false) Map<String, String> payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminOrderControllerService.updatePaymentMethod(orderId, payload));
|
||||
}
|
||||
|
||||
@PostMapping("/{orderId}/status")
|
||||
@Transactional
|
||||
public ResponseEntity<OrderDto> updateOrderStatus(
|
||||
@PathVariable UUID orderId,
|
||||
@RequestBody AdminOrderStatusUpdateRequest payload
|
||||
) {
|
||||
return ResponseEntity.ok(adminOrderControllerService.updateOrderStatus(orderId, payload));
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/items/{orderItemId}/file")
|
||||
public ResponseEntity<Resource> downloadOrderItemFile(
|
||||
@PathVariable UUID orderId,
|
||||
@PathVariable UUID orderItemId
|
||||
) {
|
||||
return adminOrderControllerService.downloadOrderItemFile(orderId, orderItemId);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/documents/confirmation")
|
||||
public ResponseEntity<byte[]> downloadOrderConfirmation(@PathVariable UUID orderId) {
|
||||
return adminOrderControllerService.downloadOrderConfirmation(orderId);
|
||||
}
|
||||
|
||||
@GetMapping("/{orderId}/documents/invoice")
|
||||
public ResponseEntity<byte[]> downloadOrderInvoice(@PathVariable UUID orderId) {
|
||||
return adminOrderControllerService.downloadOrderInvoice(orderId);
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminShopCategoryDto;
|
||||
import com.printcalculator.dto.AdminUpsertShopCategoryRequest;
|
||||
import com.printcalculator.service.admin.AdminShopCategoryControllerService;
|
||||
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.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/shop/categories")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminShopCategoryController {
|
||||
private final AdminShopCategoryControllerService adminShopCategoryControllerService;
|
||||
|
||||
public AdminShopCategoryController(AdminShopCategoryControllerService adminShopCategoryControllerService) {
|
||||
this.adminShopCategoryControllerService = adminShopCategoryControllerService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<AdminShopCategoryDto>> getCategories() {
|
||||
return ResponseEntity.ok(adminShopCategoryControllerService.getCategories());
|
||||
}
|
||||
|
||||
@GetMapping("/tree")
|
||||
public ResponseEntity<List<AdminShopCategoryDto>> getCategoryTree() {
|
||||
return ResponseEntity.ok(adminShopCategoryControllerService.getCategoryTree());
|
||||
}
|
||||
|
||||
@GetMapping("/{categoryId}")
|
||||
public ResponseEntity<AdminShopCategoryDto> getCategory(@PathVariable UUID categoryId) {
|
||||
return ResponseEntity.ok(adminShopCategoryControllerService.getCategory(categoryId));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Transactional
|
||||
public ResponseEntity<AdminShopCategoryDto> createCategory(@RequestBody AdminUpsertShopCategoryRequest payload) {
|
||||
return ResponseEntity.ok(adminShopCategoryControllerService.createCategory(payload));
|
||||
}
|
||||
|
||||
@PutMapping("/{categoryId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminShopCategoryDto> updateCategory(@PathVariable UUID categoryId,
|
||||
@RequestBody AdminUpsertShopCategoryRequest payload) {
|
||||
return ResponseEntity.ok(adminShopCategoryControllerService.updateCategory(categoryId, payload));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{categoryId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteCategory(@PathVariable UUID categoryId) {
|
||||
adminShopCategoryControllerService.deleteCategory(categoryId);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
package com.printcalculator.controller.admin;
|
||||
|
||||
import com.printcalculator.dto.AdminShopProductDto;
|
||||
import com.printcalculator.dto.AdminTranslateShopProductRequest;
|
||||
import com.printcalculator.dto.AdminTranslateShopProductResponse;
|
||||
import com.printcalculator.dto.AdminUpsertShopProductRequest;
|
||||
import com.printcalculator.service.admin.AdminShopProductControllerService;
|
||||
import com.printcalculator.service.admin.AdminShopProductTranslationService;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
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.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/admin/shop/products")
|
||||
@Transactional(readOnly = true)
|
||||
public class AdminShopProductController {
|
||||
private final AdminShopProductControllerService adminShopProductControllerService;
|
||||
private final AdminShopProductTranslationService adminShopProductTranslationService;
|
||||
|
||||
public AdminShopProductController(AdminShopProductControllerService adminShopProductControllerService,
|
||||
AdminShopProductTranslationService adminShopProductTranslationService) {
|
||||
this.adminShopProductControllerService = adminShopProductControllerService;
|
||||
this.adminShopProductTranslationService = adminShopProductTranslationService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<AdminShopProductDto>> getProducts() {
|
||||
return ResponseEntity.ok(adminShopProductControllerService.getProducts());
|
||||
}
|
||||
|
||||
@GetMapping("/{productId}")
|
||||
public ResponseEntity<AdminShopProductDto> getProduct(@PathVariable UUID productId) {
|
||||
return ResponseEntity.ok(adminShopProductControllerService.getProduct(productId));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Transactional
|
||||
public ResponseEntity<AdminShopProductDto> createProduct(@RequestBody AdminUpsertShopProductRequest payload) {
|
||||
return ResponseEntity.ok(adminShopProductControllerService.createProduct(payload));
|
||||
}
|
||||
|
||||
@PostMapping("/translate")
|
||||
public ResponseEntity<AdminTranslateShopProductResponse> translateProduct(@RequestBody AdminTranslateShopProductRequest payload) {
|
||||
return ResponseEntity.ok(adminShopProductTranslationService.translateProduct(payload));
|
||||
}
|
||||
|
||||
@PutMapping("/{productId}")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminShopProductDto> updateProduct(@PathVariable UUID productId,
|
||||
@RequestBody AdminUpsertShopProductRequest payload) {
|
||||
return ResponseEntity.ok(adminShopProductControllerService.updateProduct(productId, payload));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{productId}")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteProduct(@PathVariable UUID productId) {
|
||||
adminShopProductControllerService.deleteProduct(productId);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
@PostMapping("/{productId}/model")
|
||||
@Transactional
|
||||
public ResponseEntity<AdminShopProductDto> uploadProductModel(@PathVariable UUID productId,
|
||||
@RequestParam("file") MultipartFile file) throws IOException {
|
||||
return ResponseEntity.ok(adminShopProductControllerService.uploadProductModel(productId, file));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{productId}/model")
|
||||
@Transactional
|
||||
public ResponseEntity<Void> deleteProductModel(@PathVariable UUID productId) {
|
||||
adminShopProductControllerService.deleteProductModel(productId);
|
||||
return ResponseEntity.noContent().build();
|
||||
}
|
||||
|
||||
@GetMapping("/{productId}/model")
|
||||
public ResponseEntity<Resource> getProductModel(@PathVariable UUID productId) throws IOException {
|
||||
AdminShopProductControllerService.ProductModelDownload model = adminShopProductControllerService.getProductModel(productId);
|
||||
Resource resource = new UrlResource(model.path().toUri());
|
||||
MediaType contentType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
if (model.mimeType() != null && !model.mimeType().isBlank()) {
|
||||
try {
|
||||
contentType = MediaType.parseMediaType(model.mimeType());
|
||||
} catch (IllegalArgumentException ignored) {
|
||||
contentType = MediaType.APPLICATION_OCTET_STREAM;
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.contentType(contentType)
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + model.filename() + "\"")
|
||||
.body(resource);
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminCadInvoiceCreateRequest {
|
||||
private UUID sessionId;
|
||||
private UUID sourceRequestId;
|
||||
private BigDecimal cadHours;
|
||||
private BigDecimal cadHourlyRateChf;
|
||||
private String notes;
|
||||
|
||||
public UUID getSessionId() {
|
||||
return sessionId;
|
||||
}
|
||||
|
||||
public void setSessionId(UUID sessionId) {
|
||||
this.sessionId = sessionId;
|
||||
}
|
||||
|
||||
public UUID getSourceRequestId() {
|
||||
return sourceRequestId;
|
||||
}
|
||||
|
||||
public void setSourceRequestId(UUID sourceRequestId) {
|
||||
this.sourceRequestId = sourceRequestId;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHours() {
|
||||
return cadHours;
|
||||
}
|
||||
|
||||
public void setCadHours(BigDecimal cadHours) {
|
||||
this.cadHours = cadHours;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHourlyRateChf() {
|
||||
return cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
|
||||
this.cadHourlyRateChf = cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public String getNotes() {
|
||||
return notes;
|
||||
}
|
||||
|
||||
public void setNotes(String notes) {
|
||||
this.notes = notes;
|
||||
}
|
||||
}
|
||||
@@ -1,143 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminCadInvoiceDto {
|
||||
private UUID sessionId;
|
||||
private String sessionStatus;
|
||||
private UUID sourceRequestId;
|
||||
private BigDecimal cadHours;
|
||||
private BigDecimal cadHourlyRateChf;
|
||||
private BigDecimal cadTotalChf;
|
||||
private BigDecimal printItemsTotalChf;
|
||||
private BigDecimal setupCostChf;
|
||||
private BigDecimal shippingCostChf;
|
||||
private BigDecimal grandTotalChf;
|
||||
private UUID convertedOrderId;
|
||||
private String convertedOrderStatus;
|
||||
private String checkoutPath;
|
||||
private String notes;
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public UUID getSessionId() {
|
||||
return sessionId;
|
||||
}
|
||||
|
||||
public void setSessionId(UUID sessionId) {
|
||||
this.sessionId = sessionId;
|
||||
}
|
||||
|
||||
public String getSessionStatus() {
|
||||
return sessionStatus;
|
||||
}
|
||||
|
||||
public void setSessionStatus(String sessionStatus) {
|
||||
this.sessionStatus = sessionStatus;
|
||||
}
|
||||
|
||||
public UUID getSourceRequestId() {
|
||||
return sourceRequestId;
|
||||
}
|
||||
|
||||
public void setSourceRequestId(UUID sourceRequestId) {
|
||||
this.sourceRequestId = sourceRequestId;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHours() {
|
||||
return cadHours;
|
||||
}
|
||||
|
||||
public void setCadHours(BigDecimal cadHours) {
|
||||
this.cadHours = cadHours;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHourlyRateChf() {
|
||||
return cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
|
||||
this.cadHourlyRateChf = cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public BigDecimal getCadTotalChf() {
|
||||
return cadTotalChf;
|
||||
}
|
||||
|
||||
public void setCadTotalChf(BigDecimal cadTotalChf) {
|
||||
this.cadTotalChf = cadTotalChf;
|
||||
}
|
||||
|
||||
public BigDecimal getPrintItemsTotalChf() {
|
||||
return printItemsTotalChf;
|
||||
}
|
||||
|
||||
public void setPrintItemsTotalChf(BigDecimal printItemsTotalChf) {
|
||||
this.printItemsTotalChf = printItemsTotalChf;
|
||||
}
|
||||
|
||||
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 getGrandTotalChf() {
|
||||
return grandTotalChf;
|
||||
}
|
||||
|
||||
public void setGrandTotalChf(BigDecimal grandTotalChf) {
|
||||
this.grandTotalChf = grandTotalChf;
|
||||
}
|
||||
|
||||
public UUID getConvertedOrderId() {
|
||||
return convertedOrderId;
|
||||
}
|
||||
|
||||
public void setConvertedOrderId(UUID convertedOrderId) {
|
||||
this.convertedOrderId = convertedOrderId;
|
||||
}
|
||||
|
||||
public String getConvertedOrderStatus() {
|
||||
return convertedOrderStatus;
|
||||
}
|
||||
|
||||
public void setConvertedOrderStatus(String convertedOrderStatus) {
|
||||
this.convertedOrderStatus = convertedOrderStatus;
|
||||
}
|
||||
|
||||
public String getCheckoutPath() {
|
||||
return checkoutPath;
|
||||
}
|
||||
|
||||
public void setCheckoutPath(String checkoutPath) {
|
||||
this.checkoutPath = checkoutPath;
|
||||
}
|
||||
|
||||
public String getNotes() {
|
||||
return notes;
|
||||
}
|
||||
|
||||
public void setNotes(String notes) {
|
||||
this.notes = notes;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -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,79 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.Map;
|
||||
|
||||
public class AdminCreateMediaUsageRequest {
|
||||
private String usageType;
|
||||
private String usageKey;
|
||||
private UUID ownerId;
|
||||
private UUID mediaAssetId;
|
||||
private Integer sortOrder;
|
||||
private Boolean isPrimary;
|
||||
private Boolean isActive;
|
||||
private Map<String, MediaTextTranslationDto> translations;
|
||||
|
||||
public String getUsageType() {
|
||||
return usageType;
|
||||
}
|
||||
|
||||
public void setUsageType(String usageType) {
|
||||
this.usageType = usageType;
|
||||
}
|
||||
|
||||
public String getUsageKey() {
|
||||
return usageKey;
|
||||
}
|
||||
|
||||
public void setUsageKey(String usageKey) {
|
||||
this.usageKey = usageKey;
|
||||
}
|
||||
|
||||
public UUID getOwnerId() {
|
||||
return ownerId;
|
||||
}
|
||||
|
||||
public void setOwnerId(UUID ownerId) {
|
||||
this.ownerId = ownerId;
|
||||
}
|
||||
|
||||
public UUID getMediaAssetId() {
|
||||
return mediaAssetId;
|
||||
}
|
||||
|
||||
public void setMediaAssetId(UUID mediaAssetId) {
|
||||
this.mediaAssetId = mediaAssetId;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Boolean getIsPrimary() {
|
||||
return isPrimary;
|
||||
}
|
||||
|
||||
public void setIsPrimary(Boolean primary) {
|
||||
isPrimary = primary;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Map<String, MediaTextTranslationDto> getTranslations() {
|
||||
return translations;
|
||||
}
|
||||
|
||||
public void setTranslations(Map<String, MediaTextTranslationDto> translations) {
|
||||
this.translations = translations;
|
||||
}
|
||||
}
|
||||
@@ -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,223 +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 colorLabelIt;
|
||||
private String colorLabelEn;
|
||||
private String colorLabelDe;
|
||||
private String colorLabelFr;
|
||||
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 getColorLabelIt() {
|
||||
return colorLabelIt;
|
||||
}
|
||||
|
||||
public void setColorLabelIt(String colorLabelIt) {
|
||||
this.colorLabelIt = colorLabelIt;
|
||||
}
|
||||
|
||||
public String getColorLabelEn() {
|
||||
return colorLabelEn;
|
||||
}
|
||||
|
||||
public void setColorLabelEn(String colorLabelEn) {
|
||||
this.colorLabelEn = colorLabelEn;
|
||||
}
|
||||
|
||||
public String getColorLabelDe() {
|
||||
return colorLabelDe;
|
||||
}
|
||||
|
||||
public void setColorLabelDe(String colorLabelDe) {
|
||||
this.colorLabelDe = colorLabelDe;
|
||||
}
|
||||
|
||||
public String getColorLabelFr() {
|
||||
return colorLabelFr;
|
||||
}
|
||||
|
||||
public void setColorLabelFr(String colorLabelFr) {
|
||||
this.colorLabelFr = colorLabelFr;
|
||||
}
|
||||
|
||||
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,153 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminMediaAssetDto {
|
||||
private UUID id;
|
||||
private String originalFilename;
|
||||
private String storageKey;
|
||||
private String mimeType;
|
||||
private Long fileSizeBytes;
|
||||
private String sha256Hex;
|
||||
private Integer widthPx;
|
||||
private Integer heightPx;
|
||||
private String status;
|
||||
private String visibility;
|
||||
private String title;
|
||||
private String altText;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime updatedAt;
|
||||
private List<AdminMediaVariantDto> variants = new ArrayList<>();
|
||||
private List<AdminMediaUsageDto> usages = new ArrayList<>();
|
||||
|
||||
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 getStorageKey() {
|
||||
return storageKey;
|
||||
}
|
||||
|
||||
public void setStorageKey(String storageKey) {
|
||||
this.storageKey = storageKey;
|
||||
}
|
||||
|
||||
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 String getSha256Hex() {
|
||||
return sha256Hex;
|
||||
}
|
||||
|
||||
public void setSha256Hex(String sha256Hex) {
|
||||
this.sha256Hex = sha256Hex;
|
||||
}
|
||||
|
||||
public Integer getWidthPx() {
|
||||
return widthPx;
|
||||
}
|
||||
|
||||
public void setWidthPx(Integer widthPx) {
|
||||
this.widthPx = widthPx;
|
||||
}
|
||||
|
||||
public Integer getHeightPx() {
|
||||
return heightPx;
|
||||
}
|
||||
|
||||
public void setHeightPx(Integer heightPx) {
|
||||
this.heightPx = heightPx;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getVisibility() {
|
||||
return visibility;
|
||||
}
|
||||
|
||||
public void setVisibility(String visibility) {
|
||||
this.visibility = visibility;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getAltText() {
|
||||
return altText;
|
||||
}
|
||||
|
||||
public void setAltText(String altText) {
|
||||
this.altText = altText;
|
||||
}
|
||||
|
||||
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<AdminMediaVariantDto> getVariants() {
|
||||
return variants;
|
||||
}
|
||||
|
||||
public void setVariants(List<AdminMediaVariantDto> variants) {
|
||||
this.variants = variants;
|
||||
}
|
||||
|
||||
public List<AdminMediaUsageDto> getUsages() {
|
||||
return usages;
|
||||
}
|
||||
|
||||
public void setUsages(List<AdminMediaUsageDto> usages) {
|
||||
this.usages = usages;
|
||||
}
|
||||
}
|
||||
@@ -1,98 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminMediaUsageDto {
|
||||
private UUID id;
|
||||
private String usageType;
|
||||
private String usageKey;
|
||||
private UUID ownerId;
|
||||
private UUID mediaAssetId;
|
||||
private Integer sortOrder;
|
||||
private Boolean isPrimary;
|
||||
private Boolean isActive;
|
||||
private Map<String, MediaTextTranslationDto> translations;
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getUsageType() {
|
||||
return usageType;
|
||||
}
|
||||
|
||||
public void setUsageType(String usageType) {
|
||||
this.usageType = usageType;
|
||||
}
|
||||
|
||||
public String getUsageKey() {
|
||||
return usageKey;
|
||||
}
|
||||
|
||||
public void setUsageKey(String usageKey) {
|
||||
this.usageKey = usageKey;
|
||||
}
|
||||
|
||||
public UUID getOwnerId() {
|
||||
return ownerId;
|
||||
}
|
||||
|
||||
public void setOwnerId(UUID ownerId) {
|
||||
this.ownerId = ownerId;
|
||||
}
|
||||
|
||||
public UUID getMediaAssetId() {
|
||||
return mediaAssetId;
|
||||
}
|
||||
|
||||
public void setMediaAssetId(UUID mediaAssetId) {
|
||||
this.mediaAssetId = mediaAssetId;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Boolean getIsPrimary() {
|
||||
return isPrimary;
|
||||
}
|
||||
|
||||
public void setIsPrimary(Boolean primary) {
|
||||
isPrimary = primary;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Map<String, MediaTextTranslationDto> getTranslations() {
|
||||
return translations;
|
||||
}
|
||||
|
||||
public void setTranslations(Map<String, MediaTextTranslationDto> translations) {
|
||||
this.translations = translations;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -1,106 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminMediaVariantDto {
|
||||
private UUID id;
|
||||
private String variantName;
|
||||
private String format;
|
||||
private String storageKey;
|
||||
private String mimeType;
|
||||
private Integer widthPx;
|
||||
private Integer heightPx;
|
||||
private Long fileSizeBytes;
|
||||
private Boolean isGenerated;
|
||||
private String publicUrl;
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getVariantName() {
|
||||
return variantName;
|
||||
}
|
||||
|
||||
public void setVariantName(String variantName) {
|
||||
this.variantName = variantName;
|
||||
}
|
||||
|
||||
public String getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
public void setFormat(String format) {
|
||||
this.format = format;
|
||||
}
|
||||
|
||||
public String getStorageKey() {
|
||||
return storageKey;
|
||||
}
|
||||
|
||||
public void setStorageKey(String storageKey) {
|
||||
this.storageKey = storageKey;
|
||||
}
|
||||
|
||||
public String getMimeType() {
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
public void setMimeType(String mimeType) {
|
||||
this.mimeType = mimeType;
|
||||
}
|
||||
|
||||
public Integer getWidthPx() {
|
||||
return widthPx;
|
||||
}
|
||||
|
||||
public void setWidthPx(Integer widthPx) {
|
||||
this.widthPx = widthPx;
|
||||
}
|
||||
|
||||
public Integer getHeightPx() {
|
||||
return heightPx;
|
||||
}
|
||||
|
||||
public void setHeightPx(Integer heightPx) {
|
||||
this.heightPx = heightPx;
|
||||
}
|
||||
|
||||
public Long getFileSizeBytes() {
|
||||
return fileSizeBytes;
|
||||
}
|
||||
|
||||
public void setFileSizeBytes(Long fileSizeBytes) {
|
||||
this.fileSizeBytes = fileSizeBytes;
|
||||
}
|
||||
|
||||
public Boolean getIsGenerated() {
|
||||
return isGenerated;
|
||||
}
|
||||
|
||||
public void setIsGenerated(Boolean generated) {
|
||||
isGenerated = generated;
|
||||
}
|
||||
|
||||
public String getPublicUrl() {
|
||||
return publicUrl;
|
||||
}
|
||||
|
||||
public void setPublicUrl(String publicUrl) {
|
||||
this.publicUrl = publicUrl;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -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,107 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminQuoteSessionDto {
|
||||
private UUID id;
|
||||
private String status;
|
||||
private String sessionType;
|
||||
private String materialCode;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime expiresAt;
|
||||
private UUID convertedOrderId;
|
||||
private UUID sourceRequestId;
|
||||
private BigDecimal cadHours;
|
||||
private BigDecimal cadHourlyRateChf;
|
||||
private BigDecimal cadTotalChf;
|
||||
|
||||
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 getSessionType() {
|
||||
return sessionType;
|
||||
}
|
||||
|
||||
public void setSessionType(String sessionType) {
|
||||
this.sessionType = sessionType;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public UUID getSourceRequestId() {
|
||||
return sourceRequestId;
|
||||
}
|
||||
|
||||
public void setSourceRequestId(UUID sourceRequestId) {
|
||||
this.sourceRequestId = sourceRequestId;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHours() {
|
||||
return cadHours;
|
||||
}
|
||||
|
||||
public void setCadHours(BigDecimal cadHours) {
|
||||
this.cadHours = cadHours;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHourlyRateChf() {
|
||||
return cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
|
||||
this.cadHourlyRateChf = cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public BigDecimal getCadTotalChf() {
|
||||
return cadTotalChf;
|
||||
}
|
||||
|
||||
public void setCadTotalChf(BigDecimal cadTotalChf) {
|
||||
this.cadTotalChf = cadTotalChf;
|
||||
}
|
||||
}
|
||||
@@ -1,359 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminShopCategoryDto {
|
||||
private UUID id;
|
||||
private UUID parentCategoryId;
|
||||
private String parentCategoryName;
|
||||
private String slug;
|
||||
private String name;
|
||||
private String nameIt;
|
||||
private String nameEn;
|
||||
private String nameDe;
|
||||
private String nameFr;
|
||||
private String description;
|
||||
private String descriptionIt;
|
||||
private String descriptionEn;
|
||||
private String descriptionDe;
|
||||
private String descriptionFr;
|
||||
private String seoTitle;
|
||||
private String seoTitleIt;
|
||||
private String seoTitleEn;
|
||||
private String seoTitleDe;
|
||||
private String seoTitleFr;
|
||||
private String seoDescription;
|
||||
private String seoDescriptionIt;
|
||||
private String seoDescriptionEn;
|
||||
private String seoDescriptionDe;
|
||||
private String seoDescriptionFr;
|
||||
private String ogTitle;
|
||||
private String ogDescription;
|
||||
private Boolean indexable;
|
||||
private Boolean isActive;
|
||||
private Integer sortOrder;
|
||||
private Integer depth;
|
||||
private Integer childCount;
|
||||
private Integer directProductCount;
|
||||
private Integer descendantProductCount;
|
||||
private String mediaUsageType;
|
||||
private String mediaUsageKey;
|
||||
private List<AdminShopCategoryRefDto> breadcrumbs;
|
||||
private List<AdminShopCategoryDto> children;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public UUID getParentCategoryId() {
|
||||
return parentCategoryId;
|
||||
}
|
||||
|
||||
public void setParentCategoryId(UUID parentCategoryId) {
|
||||
this.parentCategoryId = parentCategoryId;
|
||||
}
|
||||
|
||||
public String getParentCategoryName() {
|
||||
return parentCategoryName;
|
||||
}
|
||||
|
||||
public void setParentCategoryName(String parentCategoryName) {
|
||||
this.parentCategoryName = parentCategoryName;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getNameIt() {
|
||||
return nameIt;
|
||||
}
|
||||
|
||||
public void setNameIt(String nameIt) {
|
||||
this.nameIt = nameIt;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getNameDe() {
|
||||
return nameDe;
|
||||
}
|
||||
|
||||
public void setNameDe(String nameDe) {
|
||||
this.nameDe = nameDe;
|
||||
}
|
||||
|
||||
public String getNameFr() {
|
||||
return nameFr;
|
||||
}
|
||||
|
||||
public void setNameFr(String nameFr) {
|
||||
this.nameFr = nameFr;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescriptionIt() {
|
||||
return descriptionIt;
|
||||
}
|
||||
|
||||
public void setDescriptionIt(String descriptionIt) {
|
||||
this.descriptionIt = descriptionIt;
|
||||
}
|
||||
|
||||
public String getDescriptionEn() {
|
||||
return descriptionEn;
|
||||
}
|
||||
|
||||
public void setDescriptionEn(String descriptionEn) {
|
||||
this.descriptionEn = descriptionEn;
|
||||
}
|
||||
|
||||
public String getDescriptionDe() {
|
||||
return descriptionDe;
|
||||
}
|
||||
|
||||
public void setDescriptionDe(String descriptionDe) {
|
||||
this.descriptionDe = descriptionDe;
|
||||
}
|
||||
|
||||
public String getDescriptionFr() {
|
||||
return descriptionFr;
|
||||
}
|
||||
|
||||
public void setDescriptionFr(String descriptionFr) {
|
||||
this.descriptionFr = descriptionFr;
|
||||
}
|
||||
|
||||
public String getSeoTitle() {
|
||||
return seoTitle;
|
||||
}
|
||||
|
||||
public void setSeoTitle(String seoTitle) {
|
||||
this.seoTitle = seoTitle;
|
||||
}
|
||||
|
||||
public String getSeoTitleIt() {
|
||||
return seoTitleIt;
|
||||
}
|
||||
|
||||
public void setSeoTitleIt(String seoTitleIt) {
|
||||
this.seoTitleIt = seoTitleIt;
|
||||
}
|
||||
|
||||
public String getSeoTitleEn() {
|
||||
return seoTitleEn;
|
||||
}
|
||||
|
||||
public void setSeoTitleEn(String seoTitleEn) {
|
||||
this.seoTitleEn = seoTitleEn;
|
||||
}
|
||||
|
||||
public String getSeoTitleDe() {
|
||||
return seoTitleDe;
|
||||
}
|
||||
|
||||
public void setSeoTitleDe(String seoTitleDe) {
|
||||
this.seoTitleDe = seoTitleDe;
|
||||
}
|
||||
|
||||
public String getSeoTitleFr() {
|
||||
return seoTitleFr;
|
||||
}
|
||||
|
||||
public void setSeoTitleFr(String seoTitleFr) {
|
||||
this.seoTitleFr = seoTitleFr;
|
||||
}
|
||||
|
||||
public String getSeoDescription() {
|
||||
return seoDescription;
|
||||
}
|
||||
|
||||
public void setSeoDescription(String seoDescription) {
|
||||
this.seoDescription = seoDescription;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionIt() {
|
||||
return seoDescriptionIt;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionIt(String seoDescriptionIt) {
|
||||
this.seoDescriptionIt = seoDescriptionIt;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionEn() {
|
||||
return seoDescriptionEn;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionEn(String seoDescriptionEn) {
|
||||
this.seoDescriptionEn = seoDescriptionEn;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionDe() {
|
||||
return seoDescriptionDe;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionDe(String seoDescriptionDe) {
|
||||
this.seoDescriptionDe = seoDescriptionDe;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionFr() {
|
||||
return seoDescriptionFr;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionFr(String seoDescriptionFr) {
|
||||
this.seoDescriptionFr = seoDescriptionFr;
|
||||
}
|
||||
|
||||
public String getOgTitle() {
|
||||
return ogTitle;
|
||||
}
|
||||
|
||||
public void setOgTitle(String ogTitle) {
|
||||
this.ogTitle = ogTitle;
|
||||
}
|
||||
|
||||
public String getOgDescription() {
|
||||
return ogDescription;
|
||||
}
|
||||
|
||||
public void setOgDescription(String ogDescription) {
|
||||
this.ogDescription = ogDescription;
|
||||
}
|
||||
|
||||
public Boolean getIndexable() {
|
||||
return indexable;
|
||||
}
|
||||
|
||||
public void setIndexable(Boolean indexable) {
|
||||
this.indexable = indexable;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Integer getDepth() {
|
||||
return depth;
|
||||
}
|
||||
|
||||
public void setDepth(Integer depth) {
|
||||
this.depth = depth;
|
||||
}
|
||||
|
||||
public Integer getChildCount() {
|
||||
return childCount;
|
||||
}
|
||||
|
||||
public void setChildCount(Integer childCount) {
|
||||
this.childCount = childCount;
|
||||
}
|
||||
|
||||
public Integer getDirectProductCount() {
|
||||
return directProductCount;
|
||||
}
|
||||
|
||||
public void setDirectProductCount(Integer directProductCount) {
|
||||
this.directProductCount = directProductCount;
|
||||
}
|
||||
|
||||
public Integer getDescendantProductCount() {
|
||||
return descendantProductCount;
|
||||
}
|
||||
|
||||
public void setDescendantProductCount(Integer descendantProductCount) {
|
||||
this.descendantProductCount = descendantProductCount;
|
||||
}
|
||||
|
||||
public String getMediaUsageType() {
|
||||
return mediaUsageType;
|
||||
}
|
||||
|
||||
public void setMediaUsageType(String mediaUsageType) {
|
||||
this.mediaUsageType = mediaUsageType;
|
||||
}
|
||||
|
||||
public String getMediaUsageKey() {
|
||||
return mediaUsageKey;
|
||||
}
|
||||
|
||||
public void setMediaUsageKey(String mediaUsageKey) {
|
||||
this.mediaUsageKey = mediaUsageKey;
|
||||
}
|
||||
|
||||
public List<AdminShopCategoryRefDto> getBreadcrumbs() {
|
||||
return breadcrumbs;
|
||||
}
|
||||
|
||||
public void setBreadcrumbs(List<AdminShopCategoryRefDto> breadcrumbs) {
|
||||
this.breadcrumbs = breadcrumbs;
|
||||
}
|
||||
|
||||
public List<AdminShopCategoryDto> getChildren() {
|
||||
return children;
|
||||
}
|
||||
|
||||
public void setChildren(List<AdminShopCategoryDto> children) {
|
||||
this.children = children;
|
||||
}
|
||||
|
||||
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,33 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminShopCategoryRefDto {
|
||||
private UUID id;
|
||||
private String slug;
|
||||
private String name;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
@@ -1,441 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminShopProductDto {
|
||||
private UUID id;
|
||||
private UUID categoryId;
|
||||
private String categoryName;
|
||||
private String categorySlug;
|
||||
private String slug;
|
||||
private String name;
|
||||
private String nameIt;
|
||||
private String nameEn;
|
||||
private String nameDe;
|
||||
private String nameFr;
|
||||
private String excerpt;
|
||||
private String excerptIt;
|
||||
private String excerptEn;
|
||||
private String excerptDe;
|
||||
private String excerptFr;
|
||||
private String description;
|
||||
private String descriptionIt;
|
||||
private String descriptionEn;
|
||||
private String descriptionDe;
|
||||
private String descriptionFr;
|
||||
private String seoTitle;
|
||||
private String seoTitleIt;
|
||||
private String seoTitleEn;
|
||||
private String seoTitleDe;
|
||||
private String seoTitleFr;
|
||||
private String seoDescription;
|
||||
private String seoDescriptionIt;
|
||||
private String seoDescriptionEn;
|
||||
private String seoDescriptionDe;
|
||||
private String seoDescriptionFr;
|
||||
private String ogTitle;
|
||||
private String ogDescription;
|
||||
private Boolean indexable;
|
||||
private Boolean isFeatured;
|
||||
private Boolean isActive;
|
||||
private Integer sortOrder;
|
||||
private Integer variantCount;
|
||||
private Integer activeVariantCount;
|
||||
private BigDecimal priceFromChf;
|
||||
private BigDecimal priceToChf;
|
||||
private String mediaUsageType;
|
||||
private String mediaUsageKey;
|
||||
private List<AdminMediaUsageDto> mediaUsages;
|
||||
private List<PublicMediaUsageDto> images;
|
||||
private ShopProductModelDto model3d;
|
||||
private List<AdminShopProductVariantDto> variants;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public UUID getCategoryId() {
|
||||
return categoryId;
|
||||
}
|
||||
|
||||
public void setCategoryId(UUID categoryId) {
|
||||
this.categoryId = categoryId;
|
||||
}
|
||||
|
||||
public String getCategoryName() {
|
||||
return categoryName;
|
||||
}
|
||||
|
||||
public void setCategoryName(String categoryName) {
|
||||
this.categoryName = categoryName;
|
||||
}
|
||||
|
||||
public String getCategorySlug() {
|
||||
return categorySlug;
|
||||
}
|
||||
|
||||
public void setCategorySlug(String categorySlug) {
|
||||
this.categorySlug = categorySlug;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getNameIt() {
|
||||
return nameIt;
|
||||
}
|
||||
|
||||
public void setNameIt(String nameIt) {
|
||||
this.nameIt = nameIt;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getNameDe() {
|
||||
return nameDe;
|
||||
}
|
||||
|
||||
public void setNameDe(String nameDe) {
|
||||
this.nameDe = nameDe;
|
||||
}
|
||||
|
||||
public String getNameFr() {
|
||||
return nameFr;
|
||||
}
|
||||
|
||||
public void setNameFr(String nameFr) {
|
||||
this.nameFr = nameFr;
|
||||
}
|
||||
|
||||
public String getExcerpt() {
|
||||
return excerpt;
|
||||
}
|
||||
|
||||
public void setExcerpt(String excerpt) {
|
||||
this.excerpt = excerpt;
|
||||
}
|
||||
|
||||
public String getExcerptIt() {
|
||||
return excerptIt;
|
||||
}
|
||||
|
||||
public void setExcerptIt(String excerptIt) {
|
||||
this.excerptIt = excerptIt;
|
||||
}
|
||||
|
||||
public String getExcerptEn() {
|
||||
return excerptEn;
|
||||
}
|
||||
|
||||
public void setExcerptEn(String excerptEn) {
|
||||
this.excerptEn = excerptEn;
|
||||
}
|
||||
|
||||
public String getExcerptDe() {
|
||||
return excerptDe;
|
||||
}
|
||||
|
||||
public void setExcerptDe(String excerptDe) {
|
||||
this.excerptDe = excerptDe;
|
||||
}
|
||||
|
||||
public String getExcerptFr() {
|
||||
return excerptFr;
|
||||
}
|
||||
|
||||
public void setExcerptFr(String excerptFr) {
|
||||
this.excerptFr = excerptFr;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescriptionIt() {
|
||||
return descriptionIt;
|
||||
}
|
||||
|
||||
public void setDescriptionIt(String descriptionIt) {
|
||||
this.descriptionIt = descriptionIt;
|
||||
}
|
||||
|
||||
public String getDescriptionEn() {
|
||||
return descriptionEn;
|
||||
}
|
||||
|
||||
public void setDescriptionEn(String descriptionEn) {
|
||||
this.descriptionEn = descriptionEn;
|
||||
}
|
||||
|
||||
public String getDescriptionDe() {
|
||||
return descriptionDe;
|
||||
}
|
||||
|
||||
public void setDescriptionDe(String descriptionDe) {
|
||||
this.descriptionDe = descriptionDe;
|
||||
}
|
||||
|
||||
public String getDescriptionFr() {
|
||||
return descriptionFr;
|
||||
}
|
||||
|
||||
public void setDescriptionFr(String descriptionFr) {
|
||||
this.descriptionFr = descriptionFr;
|
||||
}
|
||||
|
||||
public String getSeoTitle() {
|
||||
return seoTitle;
|
||||
}
|
||||
|
||||
public void setSeoTitle(String seoTitle) {
|
||||
this.seoTitle = seoTitle;
|
||||
}
|
||||
|
||||
public String getSeoTitleIt() {
|
||||
return seoTitleIt;
|
||||
}
|
||||
|
||||
public void setSeoTitleIt(String seoTitleIt) {
|
||||
this.seoTitleIt = seoTitleIt;
|
||||
}
|
||||
|
||||
public String getSeoTitleEn() {
|
||||
return seoTitleEn;
|
||||
}
|
||||
|
||||
public void setSeoTitleEn(String seoTitleEn) {
|
||||
this.seoTitleEn = seoTitleEn;
|
||||
}
|
||||
|
||||
public String getSeoTitleDe() {
|
||||
return seoTitleDe;
|
||||
}
|
||||
|
||||
public void setSeoTitleDe(String seoTitleDe) {
|
||||
this.seoTitleDe = seoTitleDe;
|
||||
}
|
||||
|
||||
public String getSeoTitleFr() {
|
||||
return seoTitleFr;
|
||||
}
|
||||
|
||||
public void setSeoTitleFr(String seoTitleFr) {
|
||||
this.seoTitleFr = seoTitleFr;
|
||||
}
|
||||
|
||||
public String getSeoDescription() {
|
||||
return seoDescription;
|
||||
}
|
||||
|
||||
public void setSeoDescription(String seoDescription) {
|
||||
this.seoDescription = seoDescription;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionIt() {
|
||||
return seoDescriptionIt;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionIt(String seoDescriptionIt) {
|
||||
this.seoDescriptionIt = seoDescriptionIt;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionEn() {
|
||||
return seoDescriptionEn;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionEn(String seoDescriptionEn) {
|
||||
this.seoDescriptionEn = seoDescriptionEn;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionDe() {
|
||||
return seoDescriptionDe;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionDe(String seoDescriptionDe) {
|
||||
this.seoDescriptionDe = seoDescriptionDe;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionFr() {
|
||||
return seoDescriptionFr;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionFr(String seoDescriptionFr) {
|
||||
this.seoDescriptionFr = seoDescriptionFr;
|
||||
}
|
||||
|
||||
public String getOgTitle() {
|
||||
return ogTitle;
|
||||
}
|
||||
|
||||
public void setOgTitle(String ogTitle) {
|
||||
this.ogTitle = ogTitle;
|
||||
}
|
||||
|
||||
public String getOgDescription() {
|
||||
return ogDescription;
|
||||
}
|
||||
|
||||
public void setOgDescription(String ogDescription) {
|
||||
this.ogDescription = ogDescription;
|
||||
}
|
||||
|
||||
public Boolean getIndexable() {
|
||||
return indexable;
|
||||
}
|
||||
|
||||
public void setIndexable(Boolean indexable) {
|
||||
this.indexable = indexable;
|
||||
}
|
||||
|
||||
public Boolean getIsFeatured() {
|
||||
return isFeatured;
|
||||
}
|
||||
|
||||
public void setIsFeatured(Boolean featured) {
|
||||
isFeatured = featured;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Integer getVariantCount() {
|
||||
return variantCount;
|
||||
}
|
||||
|
||||
public void setVariantCount(Integer variantCount) {
|
||||
this.variantCount = variantCount;
|
||||
}
|
||||
|
||||
public Integer getActiveVariantCount() {
|
||||
return activeVariantCount;
|
||||
}
|
||||
|
||||
public void setActiveVariantCount(Integer activeVariantCount) {
|
||||
this.activeVariantCount = activeVariantCount;
|
||||
}
|
||||
|
||||
public BigDecimal getPriceFromChf() {
|
||||
return priceFromChf;
|
||||
}
|
||||
|
||||
public void setPriceFromChf(BigDecimal priceFromChf) {
|
||||
this.priceFromChf = priceFromChf;
|
||||
}
|
||||
|
||||
public BigDecimal getPriceToChf() {
|
||||
return priceToChf;
|
||||
}
|
||||
|
||||
public void setPriceToChf(BigDecimal priceToChf) {
|
||||
this.priceToChf = priceToChf;
|
||||
}
|
||||
|
||||
public String getMediaUsageType() {
|
||||
return mediaUsageType;
|
||||
}
|
||||
|
||||
public void setMediaUsageType(String mediaUsageType) {
|
||||
this.mediaUsageType = mediaUsageType;
|
||||
}
|
||||
|
||||
public String getMediaUsageKey() {
|
||||
return mediaUsageKey;
|
||||
}
|
||||
|
||||
public void setMediaUsageKey(String mediaUsageKey) {
|
||||
this.mediaUsageKey = mediaUsageKey;
|
||||
}
|
||||
|
||||
public List<AdminMediaUsageDto> getMediaUsages() {
|
||||
return mediaUsages;
|
||||
}
|
||||
|
||||
public void setMediaUsages(List<AdminMediaUsageDto> mediaUsages) {
|
||||
this.mediaUsages = mediaUsages;
|
||||
}
|
||||
|
||||
public List<PublicMediaUsageDto> getImages() {
|
||||
return images;
|
||||
}
|
||||
|
||||
public void setImages(List<PublicMediaUsageDto> images) {
|
||||
this.images = images;
|
||||
}
|
||||
|
||||
public ShopProductModelDto getModel3d() {
|
||||
return model3d;
|
||||
}
|
||||
|
||||
public void setModel3d(ShopProductModelDto model3d) {
|
||||
this.model3d = model3d;
|
||||
}
|
||||
|
||||
public List<AdminShopProductVariantDto> getVariants() {
|
||||
return variants;
|
||||
}
|
||||
|
||||
public void setVariants(List<AdminShopProductVariantDto> variants) {
|
||||
this.variants = variants;
|
||||
}
|
||||
|
||||
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,152 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminShopProductVariantDto {
|
||||
private UUID id;
|
||||
private String sku;
|
||||
private String variantLabel;
|
||||
private String colorName;
|
||||
private String colorLabelIt;
|
||||
private String colorLabelEn;
|
||||
private String colorLabelDe;
|
||||
private String colorLabelFr;
|
||||
private String colorHex;
|
||||
private String internalMaterialCode;
|
||||
private BigDecimal priceChf;
|
||||
private Boolean isDefault;
|
||||
private Boolean isActive;
|
||||
private Integer sortOrder;
|
||||
private OffsetDateTime createdAt;
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getSku() {
|
||||
return sku;
|
||||
}
|
||||
|
||||
public void setSku(String sku) {
|
||||
this.sku = sku;
|
||||
}
|
||||
|
||||
public String getVariantLabel() {
|
||||
return variantLabel;
|
||||
}
|
||||
|
||||
public void setVariantLabel(String variantLabel) {
|
||||
this.variantLabel = variantLabel;
|
||||
}
|
||||
|
||||
public String getColorName() {
|
||||
return colorName;
|
||||
}
|
||||
|
||||
public void setColorName(String colorName) {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorLabelIt() {
|
||||
return colorLabelIt;
|
||||
}
|
||||
|
||||
public void setColorLabelIt(String colorLabelIt) {
|
||||
this.colorLabelIt = colorLabelIt;
|
||||
}
|
||||
|
||||
public String getColorLabelEn() {
|
||||
return colorLabelEn;
|
||||
}
|
||||
|
||||
public void setColorLabelEn(String colorLabelEn) {
|
||||
this.colorLabelEn = colorLabelEn;
|
||||
}
|
||||
|
||||
public String getColorLabelDe() {
|
||||
return colorLabelDe;
|
||||
}
|
||||
|
||||
public void setColorLabelDe(String colorLabelDe) {
|
||||
this.colorLabelDe = colorLabelDe;
|
||||
}
|
||||
|
||||
public String getColorLabelFr() {
|
||||
return colorLabelFr;
|
||||
}
|
||||
|
||||
public void setColorLabelFr(String colorLabelFr) {
|
||||
this.colorLabelFr = colorLabelFr;
|
||||
}
|
||||
|
||||
public String getColorHex() {
|
||||
return colorHex;
|
||||
}
|
||||
|
||||
public void setColorHex(String colorHex) {
|
||||
this.colorHex = colorHex;
|
||||
}
|
||||
|
||||
public String getInternalMaterialCode() {
|
||||
return internalMaterialCode;
|
||||
}
|
||||
|
||||
public void setInternalMaterialCode(String internalMaterialCode) {
|
||||
this.internalMaterialCode = internalMaterialCode;
|
||||
}
|
||||
|
||||
public BigDecimal getPriceChf() {
|
||||
return priceChf;
|
||||
}
|
||||
|
||||
public void setPriceChf(BigDecimal priceChf) {
|
||||
this.priceChf = priceChf;
|
||||
}
|
||||
|
||||
public Boolean getIsDefault() {
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
public void setIsDefault(Boolean aDefault) {
|
||||
isDefault = aDefault;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getUpdatedAt() {
|
||||
return updatedAt;
|
||||
}
|
||||
|
||||
public void setUpdatedAt(OffsetDateTime updatedAt) {
|
||||
this.updatedAt = updatedAt;
|
||||
}
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminTranslateShopProductRequest {
|
||||
private UUID categoryId;
|
||||
private String sourceLanguage;
|
||||
private Boolean overwriteExisting;
|
||||
private List<String> materialCodes;
|
||||
private Map<String, String> names;
|
||||
private Map<String, String> excerpts;
|
||||
private Map<String, String> descriptions;
|
||||
private Map<String, String> seoTitles;
|
||||
private Map<String, String> seoDescriptions;
|
||||
|
||||
public UUID getCategoryId() {
|
||||
return categoryId;
|
||||
}
|
||||
|
||||
public void setCategoryId(UUID categoryId) {
|
||||
this.categoryId = categoryId;
|
||||
}
|
||||
|
||||
public String getSourceLanguage() {
|
||||
return sourceLanguage;
|
||||
}
|
||||
|
||||
public void setSourceLanguage(String sourceLanguage) {
|
||||
this.sourceLanguage = sourceLanguage;
|
||||
}
|
||||
|
||||
public Boolean getOverwriteExisting() {
|
||||
return overwriteExisting;
|
||||
}
|
||||
|
||||
public void setOverwriteExisting(Boolean overwriteExisting) {
|
||||
this.overwriteExisting = overwriteExisting;
|
||||
}
|
||||
|
||||
public List<String> getMaterialCodes() {
|
||||
return materialCodes;
|
||||
}
|
||||
|
||||
public void setMaterialCodes(List<String> materialCodes) {
|
||||
this.materialCodes = materialCodes;
|
||||
}
|
||||
|
||||
public Map<String, String> getNames() {
|
||||
return names;
|
||||
}
|
||||
|
||||
public void setNames(Map<String, String> names) {
|
||||
this.names = names;
|
||||
}
|
||||
|
||||
public Map<String, String> getExcerpts() {
|
||||
return excerpts;
|
||||
}
|
||||
|
||||
public void setExcerpts(Map<String, String> excerpts) {
|
||||
this.excerpts = excerpts;
|
||||
}
|
||||
|
||||
public Map<String, String> getDescriptions() {
|
||||
return descriptions;
|
||||
}
|
||||
|
||||
public void setDescriptions(Map<String, String> descriptions) {
|
||||
this.descriptions = descriptions;
|
||||
}
|
||||
|
||||
public Map<String, String> getSeoTitles() {
|
||||
return seoTitles;
|
||||
}
|
||||
|
||||
public void setSeoTitles(Map<String, String> seoTitles) {
|
||||
this.seoTitles = seoTitles;
|
||||
}
|
||||
|
||||
public Map<String, String> getSeoDescriptions() {
|
||||
return seoDescriptions;
|
||||
}
|
||||
|
||||
public void setSeoDescriptions(Map<String, String> seoDescriptions) {
|
||||
this.seoDescriptions = seoDescriptions;
|
||||
}
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class AdminTranslateShopProductResponse {
|
||||
private String sourceLanguage;
|
||||
private List<String> targetLanguages;
|
||||
private Map<String, String> names;
|
||||
private Map<String, String> excerpts;
|
||||
private Map<String, String> descriptions;
|
||||
private Map<String, String> seoTitles;
|
||||
private Map<String, String> seoDescriptions;
|
||||
|
||||
public String getSourceLanguage() {
|
||||
return sourceLanguage;
|
||||
}
|
||||
|
||||
public void setSourceLanguage(String sourceLanguage) {
|
||||
this.sourceLanguage = sourceLanguage;
|
||||
}
|
||||
|
||||
public List<String> getTargetLanguages() {
|
||||
return targetLanguages;
|
||||
}
|
||||
|
||||
public void setTargetLanguages(List<String> targetLanguages) {
|
||||
this.targetLanguages = targetLanguages;
|
||||
}
|
||||
|
||||
public Map<String, String> getNames() {
|
||||
return names;
|
||||
}
|
||||
|
||||
public void setNames(Map<String, String> names) {
|
||||
this.names = names;
|
||||
}
|
||||
|
||||
public Map<String, String> getExcerpts() {
|
||||
return excerpts;
|
||||
}
|
||||
|
||||
public void setExcerpts(Map<String, String> excerpts) {
|
||||
this.excerpts = excerpts;
|
||||
}
|
||||
|
||||
public Map<String, String> getDescriptions() {
|
||||
return descriptions;
|
||||
}
|
||||
|
||||
public void setDescriptions(Map<String, String> descriptions) {
|
||||
this.descriptions = descriptions;
|
||||
}
|
||||
|
||||
public Map<String, String> getSeoTitles() {
|
||||
return seoTitles;
|
||||
}
|
||||
|
||||
public void setSeoTitles(Map<String, String> seoTitles) {
|
||||
this.seoTitles = seoTitles;
|
||||
}
|
||||
|
||||
public Map<String, String> getSeoDescriptions() {
|
||||
return seoDescriptions;
|
||||
}
|
||||
|
||||
public void setSeoDescriptions(Map<String, String> seoDescriptions) {
|
||||
this.seoDescriptions = seoDescriptions;
|
||||
}
|
||||
}
|
||||
@@ -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 AdminUpdateMediaAssetRequest {
|
||||
private String title;
|
||||
private String altText;
|
||||
private String visibility;
|
||||
private String status;
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getAltText() {
|
||||
return altText;
|
||||
}
|
||||
|
||||
public void setAltText(String altText) {
|
||||
this.altText = altText;
|
||||
}
|
||||
|
||||
public String getVisibility() {
|
||||
return visibility;
|
||||
}
|
||||
|
||||
public void setVisibility(String visibility) {
|
||||
this.visibility = visibility;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.Map;
|
||||
|
||||
public class AdminUpdateMediaUsageRequest {
|
||||
private String usageType;
|
||||
private String usageKey;
|
||||
private UUID ownerId;
|
||||
private UUID mediaAssetId;
|
||||
private Integer sortOrder;
|
||||
private Boolean isPrimary;
|
||||
private Boolean isActive;
|
||||
private Map<String, MediaTextTranslationDto> translations;
|
||||
|
||||
public String getUsageType() {
|
||||
return usageType;
|
||||
}
|
||||
|
||||
public void setUsageType(String usageType) {
|
||||
this.usageType = usageType;
|
||||
}
|
||||
|
||||
public String getUsageKey() {
|
||||
return usageKey;
|
||||
}
|
||||
|
||||
public void setUsageKey(String usageKey) {
|
||||
this.usageKey = usageKey;
|
||||
}
|
||||
|
||||
public UUID getOwnerId() {
|
||||
return ownerId;
|
||||
}
|
||||
|
||||
public void setOwnerId(UUID ownerId) {
|
||||
this.ownerId = ownerId;
|
||||
}
|
||||
|
||||
public UUID getMediaAssetId() {
|
||||
return mediaAssetId;
|
||||
}
|
||||
|
||||
public void setMediaAssetId(UUID mediaAssetId) {
|
||||
this.mediaAssetId = mediaAssetId;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Boolean getIsPrimary() {
|
||||
return isPrimary;
|
||||
}
|
||||
|
||||
public void setIsPrimary(Boolean primary) {
|
||||
isPrimary = primary;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Map<String, MediaTextTranslationDto> getTranslations() {
|
||||
return translations;
|
||||
}
|
||||
|
||||
public void setTranslations(Map<String, MediaTextTranslationDto> translations) {
|
||||
this.translations = translations;
|
||||
}
|
||||
}
|
||||
@@ -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,150 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public class AdminUpsertFilamentVariantRequest {
|
||||
private Long materialTypeId;
|
||||
private String variantDisplayName;
|
||||
private String colorName;
|
||||
private String colorLabelIt;
|
||||
private String colorLabelEn;
|
||||
private String colorLabelDe;
|
||||
private String colorLabelFr;
|
||||
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 getColorLabelIt() {
|
||||
return colorLabelIt;
|
||||
}
|
||||
|
||||
public void setColorLabelIt(String colorLabelIt) {
|
||||
this.colorLabelIt = colorLabelIt;
|
||||
}
|
||||
|
||||
public String getColorLabelEn() {
|
||||
return colorLabelEn;
|
||||
}
|
||||
|
||||
public void setColorLabelEn(String colorLabelEn) {
|
||||
this.colorLabelEn = colorLabelEn;
|
||||
}
|
||||
|
||||
public String getColorLabelDe() {
|
||||
return colorLabelDe;
|
||||
}
|
||||
|
||||
public void setColorLabelDe(String colorLabelDe) {
|
||||
this.colorLabelDe = colorLabelDe;
|
||||
}
|
||||
|
||||
public String getColorLabelFr() {
|
||||
return colorLabelFr;
|
||||
}
|
||||
|
||||
public void setColorLabelFr(String colorLabelFr) {
|
||||
this.colorLabelFr = colorLabelFr;
|
||||
}
|
||||
|
||||
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,249 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminUpsertShopCategoryRequest {
|
||||
private UUID parentCategoryId;
|
||||
private String slug;
|
||||
private String name;
|
||||
private String nameIt;
|
||||
private String nameEn;
|
||||
private String nameDe;
|
||||
private String nameFr;
|
||||
private String description;
|
||||
private String descriptionIt;
|
||||
private String descriptionEn;
|
||||
private String descriptionDe;
|
||||
private String descriptionFr;
|
||||
private String seoTitle;
|
||||
private String seoTitleIt;
|
||||
private String seoTitleEn;
|
||||
private String seoTitleDe;
|
||||
private String seoTitleFr;
|
||||
private String seoDescription;
|
||||
private String seoDescriptionIt;
|
||||
private String seoDescriptionEn;
|
||||
private String seoDescriptionDe;
|
||||
private String seoDescriptionFr;
|
||||
private String ogTitle;
|
||||
private String ogDescription;
|
||||
private Boolean indexable;
|
||||
private Boolean isActive;
|
||||
private Integer sortOrder;
|
||||
|
||||
public UUID getParentCategoryId() {
|
||||
return parentCategoryId;
|
||||
}
|
||||
|
||||
public void setParentCategoryId(UUID parentCategoryId) {
|
||||
this.parentCategoryId = parentCategoryId;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getNameIt() {
|
||||
return nameIt;
|
||||
}
|
||||
|
||||
public void setNameIt(String nameIt) {
|
||||
this.nameIt = nameIt;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getNameDe() {
|
||||
return nameDe;
|
||||
}
|
||||
|
||||
public void setNameDe(String nameDe) {
|
||||
this.nameDe = nameDe;
|
||||
}
|
||||
|
||||
public String getNameFr() {
|
||||
return nameFr;
|
||||
}
|
||||
|
||||
public void setNameFr(String nameFr) {
|
||||
this.nameFr = nameFr;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescriptionIt() {
|
||||
return descriptionIt;
|
||||
}
|
||||
|
||||
public void setDescriptionIt(String descriptionIt) {
|
||||
this.descriptionIt = descriptionIt;
|
||||
}
|
||||
|
||||
public String getDescriptionEn() {
|
||||
return descriptionEn;
|
||||
}
|
||||
|
||||
public void setDescriptionEn(String descriptionEn) {
|
||||
this.descriptionEn = descriptionEn;
|
||||
}
|
||||
|
||||
public String getDescriptionDe() {
|
||||
return descriptionDe;
|
||||
}
|
||||
|
||||
public void setDescriptionDe(String descriptionDe) {
|
||||
this.descriptionDe = descriptionDe;
|
||||
}
|
||||
|
||||
public String getDescriptionFr() {
|
||||
return descriptionFr;
|
||||
}
|
||||
|
||||
public void setDescriptionFr(String descriptionFr) {
|
||||
this.descriptionFr = descriptionFr;
|
||||
}
|
||||
|
||||
public String getSeoTitle() {
|
||||
return seoTitle;
|
||||
}
|
||||
|
||||
public void setSeoTitle(String seoTitle) {
|
||||
this.seoTitle = seoTitle;
|
||||
}
|
||||
|
||||
public String getSeoTitleIt() {
|
||||
return seoTitleIt;
|
||||
}
|
||||
|
||||
public void setSeoTitleIt(String seoTitleIt) {
|
||||
this.seoTitleIt = seoTitleIt;
|
||||
}
|
||||
|
||||
public String getSeoTitleEn() {
|
||||
return seoTitleEn;
|
||||
}
|
||||
|
||||
public void setSeoTitleEn(String seoTitleEn) {
|
||||
this.seoTitleEn = seoTitleEn;
|
||||
}
|
||||
|
||||
public String getSeoTitleDe() {
|
||||
return seoTitleDe;
|
||||
}
|
||||
|
||||
public void setSeoTitleDe(String seoTitleDe) {
|
||||
this.seoTitleDe = seoTitleDe;
|
||||
}
|
||||
|
||||
public String getSeoTitleFr() {
|
||||
return seoTitleFr;
|
||||
}
|
||||
|
||||
public void setSeoTitleFr(String seoTitleFr) {
|
||||
this.seoTitleFr = seoTitleFr;
|
||||
}
|
||||
|
||||
public String getSeoDescription() {
|
||||
return seoDescription;
|
||||
}
|
||||
|
||||
public void setSeoDescription(String seoDescription) {
|
||||
this.seoDescription = seoDescription;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionIt() {
|
||||
return seoDescriptionIt;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionIt(String seoDescriptionIt) {
|
||||
this.seoDescriptionIt = seoDescriptionIt;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionEn() {
|
||||
return seoDescriptionEn;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionEn(String seoDescriptionEn) {
|
||||
this.seoDescriptionEn = seoDescriptionEn;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionDe() {
|
||||
return seoDescriptionDe;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionDe(String seoDescriptionDe) {
|
||||
this.seoDescriptionDe = seoDescriptionDe;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionFr() {
|
||||
return seoDescriptionFr;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionFr(String seoDescriptionFr) {
|
||||
this.seoDescriptionFr = seoDescriptionFr;
|
||||
}
|
||||
|
||||
public String getOgTitle() {
|
||||
return ogTitle;
|
||||
}
|
||||
|
||||
public void setOgTitle(String ogTitle) {
|
||||
this.ogTitle = ogTitle;
|
||||
}
|
||||
|
||||
public String getOgDescription() {
|
||||
return ogDescription;
|
||||
}
|
||||
|
||||
public void setOgDescription(String ogDescription) {
|
||||
this.ogDescription = ogDescription;
|
||||
}
|
||||
|
||||
public Boolean getIndexable() {
|
||||
return indexable;
|
||||
}
|
||||
|
||||
public void setIndexable(Boolean indexable) {
|
||||
this.indexable = indexable;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
}
|
||||
@@ -1,313 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminUpsertShopProductRequest {
|
||||
private UUID categoryId;
|
||||
private String slug;
|
||||
private String name;
|
||||
private String nameIt;
|
||||
private String nameEn;
|
||||
private String nameDe;
|
||||
private String nameFr;
|
||||
private String excerpt;
|
||||
private String excerptIt;
|
||||
private String excerptEn;
|
||||
private String excerptDe;
|
||||
private String excerptFr;
|
||||
private String description;
|
||||
private String descriptionIt;
|
||||
private String descriptionEn;
|
||||
private String descriptionDe;
|
||||
private String descriptionFr;
|
||||
private String seoTitle;
|
||||
private String seoTitleIt;
|
||||
private String seoTitleEn;
|
||||
private String seoTitleDe;
|
||||
private String seoTitleFr;
|
||||
private String seoDescription;
|
||||
private String seoDescriptionIt;
|
||||
private String seoDescriptionEn;
|
||||
private String seoDescriptionDe;
|
||||
private String seoDescriptionFr;
|
||||
private String ogTitle;
|
||||
private String ogDescription;
|
||||
private Boolean indexable;
|
||||
private Boolean isFeatured;
|
||||
private Boolean isActive;
|
||||
private Integer sortOrder;
|
||||
private List<AdminUpsertShopProductVariantRequest> variants;
|
||||
|
||||
public UUID getCategoryId() {
|
||||
return categoryId;
|
||||
}
|
||||
|
||||
public void setCategoryId(UUID categoryId) {
|
||||
this.categoryId = categoryId;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getNameIt() {
|
||||
return nameIt;
|
||||
}
|
||||
|
||||
public void setNameIt(String nameIt) {
|
||||
this.nameIt = nameIt;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getNameDe() {
|
||||
return nameDe;
|
||||
}
|
||||
|
||||
public void setNameDe(String nameDe) {
|
||||
this.nameDe = nameDe;
|
||||
}
|
||||
|
||||
public String getNameFr() {
|
||||
return nameFr;
|
||||
}
|
||||
|
||||
public void setNameFr(String nameFr) {
|
||||
this.nameFr = nameFr;
|
||||
}
|
||||
|
||||
public String getExcerpt() {
|
||||
return excerpt;
|
||||
}
|
||||
|
||||
public void setExcerpt(String excerpt) {
|
||||
this.excerpt = excerpt;
|
||||
}
|
||||
|
||||
public String getExcerptIt() {
|
||||
return excerptIt;
|
||||
}
|
||||
|
||||
public void setExcerptIt(String excerptIt) {
|
||||
this.excerptIt = excerptIt;
|
||||
}
|
||||
|
||||
public String getExcerptEn() {
|
||||
return excerptEn;
|
||||
}
|
||||
|
||||
public void setExcerptEn(String excerptEn) {
|
||||
this.excerptEn = excerptEn;
|
||||
}
|
||||
|
||||
public String getExcerptDe() {
|
||||
return excerptDe;
|
||||
}
|
||||
|
||||
public void setExcerptDe(String excerptDe) {
|
||||
this.excerptDe = excerptDe;
|
||||
}
|
||||
|
||||
public String getExcerptFr() {
|
||||
return excerptFr;
|
||||
}
|
||||
|
||||
public void setExcerptFr(String excerptFr) {
|
||||
this.excerptFr = excerptFr;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescriptionIt() {
|
||||
return descriptionIt;
|
||||
}
|
||||
|
||||
public void setDescriptionIt(String descriptionIt) {
|
||||
this.descriptionIt = descriptionIt;
|
||||
}
|
||||
|
||||
public String getDescriptionEn() {
|
||||
return descriptionEn;
|
||||
}
|
||||
|
||||
public void setDescriptionEn(String descriptionEn) {
|
||||
this.descriptionEn = descriptionEn;
|
||||
}
|
||||
|
||||
public String getDescriptionDe() {
|
||||
return descriptionDe;
|
||||
}
|
||||
|
||||
public void setDescriptionDe(String descriptionDe) {
|
||||
this.descriptionDe = descriptionDe;
|
||||
}
|
||||
|
||||
public String getDescriptionFr() {
|
||||
return descriptionFr;
|
||||
}
|
||||
|
||||
public void setDescriptionFr(String descriptionFr) {
|
||||
this.descriptionFr = descriptionFr;
|
||||
}
|
||||
|
||||
public String getSeoTitle() {
|
||||
return seoTitle;
|
||||
}
|
||||
|
||||
public void setSeoTitle(String seoTitle) {
|
||||
this.seoTitle = seoTitle;
|
||||
}
|
||||
|
||||
public String getSeoTitleIt() {
|
||||
return seoTitleIt;
|
||||
}
|
||||
|
||||
public void setSeoTitleIt(String seoTitleIt) {
|
||||
this.seoTitleIt = seoTitleIt;
|
||||
}
|
||||
|
||||
public String getSeoTitleEn() {
|
||||
return seoTitleEn;
|
||||
}
|
||||
|
||||
public void setSeoTitleEn(String seoTitleEn) {
|
||||
this.seoTitleEn = seoTitleEn;
|
||||
}
|
||||
|
||||
public String getSeoTitleDe() {
|
||||
return seoTitleDe;
|
||||
}
|
||||
|
||||
public void setSeoTitleDe(String seoTitleDe) {
|
||||
this.seoTitleDe = seoTitleDe;
|
||||
}
|
||||
|
||||
public String getSeoTitleFr() {
|
||||
return seoTitleFr;
|
||||
}
|
||||
|
||||
public void setSeoTitleFr(String seoTitleFr) {
|
||||
this.seoTitleFr = seoTitleFr;
|
||||
}
|
||||
|
||||
public String getSeoDescription() {
|
||||
return seoDescription;
|
||||
}
|
||||
|
||||
public void setSeoDescription(String seoDescription) {
|
||||
this.seoDescription = seoDescription;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionIt() {
|
||||
return seoDescriptionIt;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionIt(String seoDescriptionIt) {
|
||||
this.seoDescriptionIt = seoDescriptionIt;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionEn() {
|
||||
return seoDescriptionEn;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionEn(String seoDescriptionEn) {
|
||||
this.seoDescriptionEn = seoDescriptionEn;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionDe() {
|
||||
return seoDescriptionDe;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionDe(String seoDescriptionDe) {
|
||||
this.seoDescriptionDe = seoDescriptionDe;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionFr() {
|
||||
return seoDescriptionFr;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionFr(String seoDescriptionFr) {
|
||||
this.seoDescriptionFr = seoDescriptionFr;
|
||||
}
|
||||
|
||||
public String getOgTitle() {
|
||||
return ogTitle;
|
||||
}
|
||||
|
||||
public void setOgTitle(String ogTitle) {
|
||||
this.ogTitle = ogTitle;
|
||||
}
|
||||
|
||||
public String getOgDescription() {
|
||||
return ogDescription;
|
||||
}
|
||||
|
||||
public void setOgDescription(String ogDescription) {
|
||||
this.ogDescription = ogDescription;
|
||||
}
|
||||
|
||||
public Boolean getIndexable() {
|
||||
return indexable;
|
||||
}
|
||||
|
||||
public void setIndexable(Boolean indexable) {
|
||||
this.indexable = indexable;
|
||||
}
|
||||
|
||||
public Boolean getIsFeatured() {
|
||||
return isFeatured;
|
||||
}
|
||||
|
||||
public void setIsFeatured(Boolean featured) {
|
||||
isFeatured = featured;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public List<AdminUpsertShopProductVariantRequest> getVariants() {
|
||||
return variants;
|
||||
}
|
||||
|
||||
public void setVariants(List<AdminUpsertShopProductVariantRequest> variants) {
|
||||
this.variants = variants;
|
||||
}
|
||||
}
|
||||
@@ -1,133 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AdminUpsertShopProductVariantRequest {
|
||||
private UUID id;
|
||||
private String sku;
|
||||
private String variantLabel;
|
||||
private String colorName;
|
||||
private String colorLabelIt;
|
||||
private String colorLabelEn;
|
||||
private String colorLabelDe;
|
||||
private String colorLabelFr;
|
||||
private String colorHex;
|
||||
private String internalMaterialCode;
|
||||
private BigDecimal priceChf;
|
||||
private Boolean isDefault;
|
||||
private Boolean isActive;
|
||||
private Integer sortOrder;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getSku() {
|
||||
return sku;
|
||||
}
|
||||
|
||||
public void setSku(String sku) {
|
||||
this.sku = sku;
|
||||
}
|
||||
|
||||
public String getVariantLabel() {
|
||||
return variantLabel;
|
||||
}
|
||||
|
||||
public void setVariantLabel(String variantLabel) {
|
||||
this.variantLabel = variantLabel;
|
||||
}
|
||||
|
||||
public String getColorName() {
|
||||
return colorName;
|
||||
}
|
||||
|
||||
public void setColorName(String colorName) {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorLabelIt() {
|
||||
return colorLabelIt;
|
||||
}
|
||||
|
||||
public void setColorLabelIt(String colorLabelIt) {
|
||||
this.colorLabelIt = colorLabelIt;
|
||||
}
|
||||
|
||||
public String getColorLabelEn() {
|
||||
return colorLabelEn;
|
||||
}
|
||||
|
||||
public void setColorLabelEn(String colorLabelEn) {
|
||||
this.colorLabelEn = colorLabelEn;
|
||||
}
|
||||
|
||||
public String getColorLabelDe() {
|
||||
return colorLabelDe;
|
||||
}
|
||||
|
||||
public void setColorLabelDe(String colorLabelDe) {
|
||||
this.colorLabelDe = colorLabelDe;
|
||||
}
|
||||
|
||||
public String getColorLabelFr() {
|
||||
return colorLabelFr;
|
||||
}
|
||||
|
||||
public void setColorLabelFr(String colorLabelFr) {
|
||||
this.colorLabelFr = colorLabelFr;
|
||||
}
|
||||
|
||||
public String getColorHex() {
|
||||
return colorHex;
|
||||
}
|
||||
|
||||
public void setColorHex(String colorHex) {
|
||||
this.colorHex = colorHex;
|
||||
}
|
||||
|
||||
public String getInternalMaterialCode() {
|
||||
return internalMaterialCode;
|
||||
}
|
||||
|
||||
public void setInternalMaterialCode(String internalMaterialCode) {
|
||||
this.internalMaterialCode = internalMaterialCode;
|
||||
}
|
||||
|
||||
public BigDecimal getPriceChf() {
|
||||
return priceChf;
|
||||
}
|
||||
|
||||
public void setPriceChf(BigDecimal priceChf) {
|
||||
this.priceChf = priceChf;
|
||||
}
|
||||
|
||||
public Boolean getIsDefault() {
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
public void setIsDefault(Boolean aDefault) {
|
||||
isDefault = aDefault;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,11 @@
|
||||
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,22 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
public class MediaTextTranslationDto {
|
||||
private String title;
|
||||
private String altText;
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getAltText() {
|
||||
return altText;
|
||||
}
|
||||
|
||||
public void setAltText(String altText) {
|
||||
this.altText = altText;
|
||||
}
|
||||
}
|
||||
@@ -7,27 +7,12 @@ public record OptionsResponse(
|
||||
List<QualityOption> qualities,
|
||||
List<InfillPatternOption> infillPatterns,
|
||||
List<LayerHeightOptionDTO> layerHeights,
|
||||
List<NozzleOptionDTO> nozzleDiameters,
|
||||
List<NozzleLayerHeightOptionsDTO> layerHeightsByNozzle
|
||||
List<NozzleOptionDTO> nozzleDiameters
|
||||
) {
|
||||
public record MaterialOption(String code, String label, List<VariantOption> variants) {}
|
||||
public record VariantOption(
|
||||
Long id,
|
||||
String name,
|
||||
String colorName,
|
||||
String colorLabelIt,
|
||||
String colorLabelEn,
|
||||
String colorLabelDe,
|
||||
String colorLabelFr,
|
||||
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) {}
|
||||
public record NozzleOptionDTO(double value, String label) {}
|
||||
public record NozzleLayerHeightOptionsDTO(double nozzleDiameter, List<LayerHeightOptionDTO> layerHeights) {}
|
||||
}
|
||||
|
||||
@@ -7,14 +7,9 @@ import java.util.UUID;
|
||||
|
||||
public class OrderDto {
|
||||
private UUID id;
|
||||
private String orderNumber;
|
||||
private String sourceType;
|
||||
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;
|
||||
@@ -24,49 +19,23 @@ public class OrderDto {
|
||||
private BigDecimal shippingCostChf;
|
||||
private BigDecimal discountChf;
|
||||
private BigDecimal subtotalChf;
|
||||
private Boolean isCadOrder;
|
||||
private UUID sourceRequestId;
|
||||
private BigDecimal cadHours;
|
||||
private BigDecimal cadHourlyRateChf;
|
||||
private BigDecimal cadTotalChf;
|
||||
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 getSourceType() { return sourceType; }
|
||||
public void setSourceType(String sourceType) { this.sourceType = sourceType; }
|
||||
|
||||
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; }
|
||||
|
||||
@@ -94,45 +63,12 @@ public class OrderDto {
|
||||
public BigDecimal getSubtotalChf() { return subtotalChf; }
|
||||
public void setSubtotalChf(BigDecimal subtotalChf) { this.subtotalChf = subtotalChf; }
|
||||
|
||||
public Boolean getIsCadOrder() { return isCadOrder; }
|
||||
public void setIsCadOrder(Boolean isCadOrder) { this.isCadOrder = isCadOrder; }
|
||||
|
||||
public UUID getSourceRequestId() { return sourceRequestId; }
|
||||
public void setSourceRequestId(UUID sourceRequestId) { this.sourceRequestId = sourceRequestId; }
|
||||
|
||||
public BigDecimal getCadHours() { return cadHours; }
|
||||
public void setCadHours(BigDecimal cadHours) { this.cadHours = cadHours; }
|
||||
|
||||
public BigDecimal getCadHourlyRateChf() { return cadHourlyRateChf; }
|
||||
public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) { this.cadHourlyRateChf = cadHourlyRateChf; }
|
||||
|
||||
public BigDecimal getCadTotalChf() { return cadTotalChf; }
|
||||
public void setCadTotalChf(BigDecimal cadTotalChf) { this.cadTotalChf = cadTotalChf; }
|
||||
|
||||
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; }
|
||||
}
|
||||
|
||||
@@ -5,36 +5,9 @@ import java.util.UUID;
|
||||
|
||||
public class OrderItemDto {
|
||||
private UUID id;
|
||||
private String itemType;
|
||||
private String originalFilename;
|
||||
private String displayName;
|
||||
private String materialCode;
|
||||
private String colorCode;
|
||||
private Long filamentVariantId;
|
||||
private UUID shopProductId;
|
||||
private UUID shopProductVariantId;
|
||||
private String shopProductSlug;
|
||||
private String shopProductName;
|
||||
private String shopVariantLabel;
|
||||
private String shopVariantColorName;
|
||||
private String shopVariantColorLabelIt;
|
||||
private String shopVariantColorLabelEn;
|
||||
private String shopVariantColorLabelDe;
|
||||
private String shopVariantColorLabelFr;
|
||||
private String shopVariantColorHex;
|
||||
private String filamentVariantDisplayName;
|
||||
private String filamentColorName;
|
||||
private String filamentColorLabelIt;
|
||||
private String filamentColorLabelEn;
|
||||
private String filamentColorLabelDe;
|
||||
private String filamentColorLabelFr;
|
||||
private String filamentColorHex;
|
||||
private String quality;
|
||||
private BigDecimal nozzleDiameterMm;
|
||||
private BigDecimal layerHeightMm;
|
||||
private Integer infillPercent;
|
||||
private String infillPattern;
|
||||
private Boolean supportsEnabled;
|
||||
private Integer quantity;
|
||||
private Integer printTimeSeconds;
|
||||
private BigDecimal materialGrams;
|
||||
@@ -45,96 +18,15 @@ public class OrderItemDto {
|
||||
public UUID getId() { return id; }
|
||||
public void setId(UUID id) { this.id = id; }
|
||||
|
||||
public String getItemType() { return itemType; }
|
||||
public void setItemType(String itemType) { this.itemType = itemType; }
|
||||
|
||||
public String getOriginalFilename() { return originalFilename; }
|
||||
public void setOriginalFilename(String originalFilename) { this.originalFilename = originalFilename; }
|
||||
|
||||
public String getDisplayName() { return displayName; }
|
||||
public void setDisplayName(String displayName) { this.displayName = displayName; }
|
||||
|
||||
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 Long getFilamentVariantId() { return filamentVariantId; }
|
||||
public void setFilamentVariantId(Long filamentVariantId) { this.filamentVariantId = filamentVariantId; }
|
||||
|
||||
public UUID getShopProductId() { return shopProductId; }
|
||||
public void setShopProductId(UUID shopProductId) { this.shopProductId = shopProductId; }
|
||||
|
||||
public UUID getShopProductVariantId() { return shopProductVariantId; }
|
||||
public void setShopProductVariantId(UUID shopProductVariantId) { this.shopProductVariantId = shopProductVariantId; }
|
||||
|
||||
public String getShopProductSlug() { return shopProductSlug; }
|
||||
public void setShopProductSlug(String shopProductSlug) { this.shopProductSlug = shopProductSlug; }
|
||||
|
||||
public String getShopProductName() { return shopProductName; }
|
||||
public void setShopProductName(String shopProductName) { this.shopProductName = shopProductName; }
|
||||
|
||||
public String getShopVariantLabel() { return shopVariantLabel; }
|
||||
public void setShopVariantLabel(String shopVariantLabel) { this.shopVariantLabel = shopVariantLabel; }
|
||||
|
||||
public String getShopVariantColorName() { return shopVariantColorName; }
|
||||
public void setShopVariantColorName(String shopVariantColorName) { this.shopVariantColorName = shopVariantColorName; }
|
||||
|
||||
public String getShopVariantColorLabelIt() { return shopVariantColorLabelIt; }
|
||||
public void setShopVariantColorLabelIt(String shopVariantColorLabelIt) { this.shopVariantColorLabelIt = shopVariantColorLabelIt; }
|
||||
|
||||
public String getShopVariantColorLabelEn() { return shopVariantColorLabelEn; }
|
||||
public void setShopVariantColorLabelEn(String shopVariantColorLabelEn) { this.shopVariantColorLabelEn = shopVariantColorLabelEn; }
|
||||
|
||||
public String getShopVariantColorLabelDe() { return shopVariantColorLabelDe; }
|
||||
public void setShopVariantColorLabelDe(String shopVariantColorLabelDe) { this.shopVariantColorLabelDe = shopVariantColorLabelDe; }
|
||||
|
||||
public String getShopVariantColorLabelFr() { return shopVariantColorLabelFr; }
|
||||
public void setShopVariantColorLabelFr(String shopVariantColorLabelFr) { this.shopVariantColorLabelFr = shopVariantColorLabelFr; }
|
||||
|
||||
public String getShopVariantColorHex() { return shopVariantColorHex; }
|
||||
public void setShopVariantColorHex(String shopVariantColorHex) { this.shopVariantColorHex = shopVariantColorHex; }
|
||||
|
||||
public String getFilamentVariantDisplayName() { return filamentVariantDisplayName; }
|
||||
public void setFilamentVariantDisplayName(String filamentVariantDisplayName) { this.filamentVariantDisplayName = filamentVariantDisplayName; }
|
||||
|
||||
public String getFilamentColorName() { return filamentColorName; }
|
||||
public void setFilamentColorName(String filamentColorName) { this.filamentColorName = filamentColorName; }
|
||||
|
||||
public String getFilamentColorLabelIt() { return filamentColorLabelIt; }
|
||||
public void setFilamentColorLabelIt(String filamentColorLabelIt) { this.filamentColorLabelIt = filamentColorLabelIt; }
|
||||
|
||||
public String getFilamentColorLabelEn() { return filamentColorLabelEn; }
|
||||
public void setFilamentColorLabelEn(String filamentColorLabelEn) { this.filamentColorLabelEn = filamentColorLabelEn; }
|
||||
|
||||
public String getFilamentColorLabelDe() { return filamentColorLabelDe; }
|
||||
public void setFilamentColorLabelDe(String filamentColorLabelDe) { this.filamentColorLabelDe = filamentColorLabelDe; }
|
||||
|
||||
public String getFilamentColorLabelFr() { return filamentColorLabelFr; }
|
||||
public void setFilamentColorLabelFr(String filamentColorLabelFr) { this.filamentColorLabelFr = filamentColorLabelFr; }
|
||||
|
||||
public String getFilamentColorHex() { return filamentColorHex; }
|
||||
public void setFilamentColorHex(String filamentColorHex) { this.filamentColorHex = filamentColorHex; }
|
||||
|
||||
public String getQuality() { return quality; }
|
||||
public void setQuality(String quality) { this.quality = quality; }
|
||||
|
||||
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 Integer getInfillPercent() { return infillPercent; }
|
||||
public void setInfillPercent(Integer infillPercent) { this.infillPercent = infillPercent; }
|
||||
|
||||
public String getInfillPattern() { return infillPattern; }
|
||||
public void setInfillPattern(String infillPattern) { this.infillPattern = infillPattern; }
|
||||
|
||||
public Boolean getSupportsEnabled() { return supportsEnabled; }
|
||||
public void setSupportsEnabled(Boolean supportsEnabled) { this.supportsEnabled = supportsEnabled; }
|
||||
|
||||
public Integer getQuantity() { return quantity; }
|
||||
public void setQuantity(Integer quantity) { this.quantity = quantity; }
|
||||
|
||||
|
||||
@@ -1,157 +1,24 @@
|
||||
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 material; // e.g. "PLA", "PETG"
|
||||
private String color; // e.g. "White", "#FFFFFF"
|
||||
private Integer quantity;
|
||||
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 Boolean supportsEnabled = true;
|
||||
private Double nozzleDiameter;
|
||||
private String notes;
|
||||
|
||||
// Dimensions
|
||||
private Double boundingBoxX;
|
||||
private Double boundingBoxY;
|
||||
private Double boundingBoxZ;
|
||||
|
||||
public String getComplexityMode() {
|
||||
return complexityMode;
|
||||
}
|
||||
|
||||
public void setComplexityMode(String complexityMode) {
|
||||
this.complexityMode = complexityMode;
|
||||
}
|
||||
|
||||
public String getMaterial() {
|
||||
return material;
|
||||
}
|
||||
|
||||
public void setMaterial(String material) {
|
||||
this.material = material;
|
||||
}
|
||||
|
||||
public String getColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
public void setColor(String color) {
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
public Long getFilamentVariantId() {
|
||||
return filamentVariantId;
|
||||
}
|
||||
|
||||
public void setFilamentVariantId(Long filamentVariantId) {
|
||||
this.filamentVariantId = filamentVariantId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public Long getPrinterMachineId() {
|
||||
return printerMachineId;
|
||||
}
|
||||
|
||||
public void setPrinterMachineId(Long printerMachineId) {
|
||||
this.printerMachineId = printerMachineId;
|
||||
}
|
||||
|
||||
public String getQuality() {
|
||||
return quality;
|
||||
}
|
||||
|
||||
public void setQuality(String quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
public Double getNozzleDiameter() {
|
||||
return nozzleDiameter;
|
||||
}
|
||||
|
||||
public void setNozzleDiameter(Double nozzleDiameter) {
|
||||
this.nozzleDiameter = nozzleDiameter;
|
||||
}
|
||||
|
||||
public Double getLayerHeight() {
|
||||
return layerHeight;
|
||||
}
|
||||
|
||||
public void setLayerHeight(Double layerHeight) {
|
||||
this.layerHeight = layerHeight;
|
||||
}
|
||||
|
||||
public Double getInfillDensity() {
|
||||
return infillDensity;
|
||||
}
|
||||
|
||||
public void setInfillDensity(Double infillDensity) {
|
||||
this.infillDensity = infillDensity;
|
||||
}
|
||||
|
||||
public String getInfillPattern() {
|
||||
return infillPattern;
|
||||
}
|
||||
|
||||
public void setInfillPattern(String infillPattern) {
|
||||
this.infillPattern = infillPattern;
|
||||
}
|
||||
|
||||
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 Double getBoundingBoxX() {
|
||||
return boundingBoxX;
|
||||
}
|
||||
|
||||
public void setBoundingBoxX(Double boundingBoxX) {
|
||||
this.boundingBoxX = boundingBoxX;
|
||||
}
|
||||
|
||||
public Double getBoundingBoxY() {
|
||||
return boundingBoxY;
|
||||
}
|
||||
|
||||
public void setBoundingBoxY(Double boundingBoxY) {
|
||||
this.boundingBoxY = boundingBoxY;
|
||||
}
|
||||
|
||||
public Double getBoundingBoxZ() {
|
||||
return boundingBoxZ;
|
||||
}
|
||||
|
||||
public void setBoundingBoxZ(Double boundingBoxZ) {
|
||||
this.boundingBoxZ = boundingBoxZ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class PublicMediaUsageDto {
|
||||
private UUID mediaAssetId;
|
||||
private String title;
|
||||
private String altText;
|
||||
private String usageType;
|
||||
private String usageKey;
|
||||
private Integer sortOrder;
|
||||
private Boolean isPrimary;
|
||||
private PublicMediaVariantDto thumb;
|
||||
private PublicMediaVariantDto card;
|
||||
private PublicMediaVariantDto hero;
|
||||
|
||||
public UUID getMediaAssetId() {
|
||||
return mediaAssetId;
|
||||
}
|
||||
|
||||
public void setMediaAssetId(UUID mediaAssetId) {
|
||||
this.mediaAssetId = mediaAssetId;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getAltText() {
|
||||
return altText;
|
||||
}
|
||||
|
||||
public void setAltText(String altText) {
|
||||
this.altText = altText;
|
||||
}
|
||||
|
||||
public String getUsageType() {
|
||||
return usageType;
|
||||
}
|
||||
|
||||
public void setUsageType(String usageType) {
|
||||
this.usageType = usageType;
|
||||
}
|
||||
|
||||
public String getUsageKey() {
|
||||
return usageKey;
|
||||
}
|
||||
|
||||
public void setUsageKey(String usageKey) {
|
||||
this.usageKey = usageKey;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Boolean getIsPrimary() {
|
||||
return isPrimary;
|
||||
}
|
||||
|
||||
public void setIsPrimary(Boolean primary) {
|
||||
isPrimary = primary;
|
||||
}
|
||||
|
||||
public PublicMediaVariantDto getThumb() {
|
||||
return thumb;
|
||||
}
|
||||
|
||||
public void setThumb(PublicMediaVariantDto thumb) {
|
||||
this.thumb = thumb;
|
||||
}
|
||||
|
||||
public PublicMediaVariantDto getCard() {
|
||||
return card;
|
||||
}
|
||||
|
||||
public void setCard(PublicMediaVariantDto card) {
|
||||
this.card = card;
|
||||
}
|
||||
|
||||
public PublicMediaVariantDto getHero() {
|
||||
return hero;
|
||||
}
|
||||
|
||||
public void setHero(PublicMediaVariantDto hero) {
|
||||
this.hero = hero;
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
public class PublicMediaVariantDto {
|
||||
private String avifUrl;
|
||||
private String webpUrl;
|
||||
private String jpegUrl;
|
||||
|
||||
public String getAvifUrl() {
|
||||
return avifUrl;
|
||||
}
|
||||
|
||||
public void setAvifUrl(String avifUrl) {
|
||||
this.avifUrl = avifUrl;
|
||||
}
|
||||
|
||||
public String getWebpUrl() {
|
||||
return webpUrl;
|
||||
}
|
||||
|
||||
public void setWebpUrl(String webpUrl) {
|
||||
this.webpUrl = webpUrl;
|
||||
}
|
||||
|
||||
public String getJpegUrl() {
|
||||
return jpegUrl;
|
||||
}
|
||||
|
||||
public void setJpegUrl(String jpegUrl) {
|
||||
this.jpegUrl = jpegUrl;
|
||||
}
|
||||
}
|
||||
@@ -1,23 +1,15 @@
|
||||
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 language; // "it" | "en" | "de" | "fr"
|
||||
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,30 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class ShopCartAddItemRequest {
|
||||
@NotNull
|
||||
private UUID shopProductVariantId;
|
||||
|
||||
@Min(1)
|
||||
private Integer quantity = 1;
|
||||
|
||||
public UUID getShopProductVariantId() {
|
||||
return shopProductVariantId;
|
||||
}
|
||||
|
||||
public void setShopProductVariantId(UUID shopProductVariantId) {
|
||||
this.shopProductVariantId = shopProductVariantId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
public class ShopCartUpdateItemRequest {
|
||||
@NotNull
|
||||
@Min(1)
|
||||
private Integer quantity;
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShopCategoryDetailDto(
|
||||
UUID id,
|
||||
String slug,
|
||||
String name,
|
||||
String description,
|
||||
String seoTitle,
|
||||
String seoDescription,
|
||||
String ogTitle,
|
||||
String ogDescription,
|
||||
Boolean indexable,
|
||||
Integer sortOrder,
|
||||
Integer productCount,
|
||||
List<ShopCategoryRefDto> breadcrumbs,
|
||||
PublicMediaUsageDto primaryImage,
|
||||
List<PublicMediaUsageDto> images,
|
||||
List<ShopCategoryTreeDto> children
|
||||
) {
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShopCategoryRefDto(
|
||||
UUID id,
|
||||
String slug,
|
||||
String name
|
||||
) {
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShopCategoryTreeDto(
|
||||
UUID id,
|
||||
UUID parentCategoryId,
|
||||
String slug,
|
||||
String name,
|
||||
String description,
|
||||
String seoTitle,
|
||||
String seoDescription,
|
||||
String ogTitle,
|
||||
String ogDescription,
|
||||
Boolean indexable,
|
||||
Integer sortOrder,
|
||||
Integer productCount,
|
||||
PublicMediaUsageDto primaryImage,
|
||||
List<ShopCategoryTreeDto> children
|
||||
) {
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public record ShopProductCatalogResponseDto(
|
||||
String categorySlug,
|
||||
Boolean featuredOnly,
|
||||
ShopCategoryDetailDto category,
|
||||
List<ShopProductSummaryDto> products
|
||||
) {
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShopProductDetailDto(
|
||||
UUID id,
|
||||
String slug,
|
||||
String name,
|
||||
String excerpt,
|
||||
String description,
|
||||
String seoTitle,
|
||||
String seoDescription,
|
||||
String ogTitle,
|
||||
String ogDescription,
|
||||
Boolean indexable,
|
||||
Boolean isFeatured,
|
||||
Integer sortOrder,
|
||||
ShopCategoryRefDto category,
|
||||
List<ShopCategoryRefDto> breadcrumbs,
|
||||
BigDecimal priceFromChf,
|
||||
BigDecimal priceToChf,
|
||||
ShopProductVariantOptionDto defaultVariant,
|
||||
List<ShopProductVariantOptionDto> variants,
|
||||
PublicMediaUsageDto primaryImage,
|
||||
List<PublicMediaUsageDto> images,
|
||||
ShopProductModelDto model3d,
|
||||
String publicPath,
|
||||
Map<String, String> localizedPaths
|
||||
) {
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
public record ShopProductModelDto(
|
||||
String url,
|
||||
String originalFilename,
|
||||
String mimeType,
|
||||
Long fileSizeBytes,
|
||||
BigDecimal boundingBoxXMm,
|
||||
BigDecimal boundingBoxYMm,
|
||||
BigDecimal boundingBoxZMm
|
||||
) {
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShopProductSummaryDto(
|
||||
UUID id,
|
||||
String slug,
|
||||
String name,
|
||||
String excerpt,
|
||||
Boolean isFeatured,
|
||||
Integer sortOrder,
|
||||
ShopCategoryRefDto category,
|
||||
BigDecimal priceFromChf,
|
||||
BigDecimal priceToChf,
|
||||
ShopProductVariantOptionDto defaultVariant,
|
||||
PublicMediaUsageDto primaryImage,
|
||||
ShopProductModelDto model3d,
|
||||
String publicPath,
|
||||
Map<String, String> localizedPaths
|
||||
) {
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.printcalculator.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShopProductVariantOptionDto(
|
||||
UUID id,
|
||||
String sku,
|
||||
String variantLabel,
|
||||
String colorName,
|
||||
String colorLabel,
|
||||
String colorHex,
|
||||
BigDecimal priceChf,
|
||||
Boolean isDefault
|
||||
) {
|
||||
}
|
||||
@@ -24,28 +24,6 @@ public class FilamentVariant {
|
||||
@Column(name = "color_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String colorName;
|
||||
|
||||
@Column(name = "color_label_it", length = Integer.MAX_VALUE)
|
||||
private String colorLabelIt;
|
||||
|
||||
@Column(name = "color_label_en", length = Integer.MAX_VALUE)
|
||||
private String colorLabelEn;
|
||||
|
||||
@Column(name = "color_label_de", length = Integer.MAX_VALUE)
|
||||
private String colorLabelDe;
|
||||
|
||||
@Column(name = "color_label_fr", length = Integer.MAX_VALUE)
|
||||
private String colorLabelFr;
|
||||
|
||||
@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;
|
||||
@@ -105,62 +83,6 @@ public class FilamentVariant {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorLabelIt() {
|
||||
return colorLabelIt;
|
||||
}
|
||||
|
||||
public void setColorLabelIt(String colorLabelIt) {
|
||||
this.colorLabelIt = colorLabelIt;
|
||||
}
|
||||
|
||||
public String getColorLabelEn() {
|
||||
return colorLabelEn;
|
||||
}
|
||||
|
||||
public void setColorLabelEn(String colorLabelEn) {
|
||||
this.colorLabelEn = colorLabelEn;
|
||||
}
|
||||
|
||||
public String getColorLabelDe() {
|
||||
return colorLabelDe;
|
||||
}
|
||||
|
||||
public void setColorLabelDe(String colorLabelDe) {
|
||||
this.colorLabelDe = colorLabelDe;
|
||||
}
|
||||
|
||||
public String getColorLabelFr() {
|
||||
return colorLabelFr;
|
||||
}
|
||||
|
||||
public void setColorLabelFr(String colorLabelFr) {
|
||||
this.colorLabelFr = colorLabelFr;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -217,60 +139,4 @@ public class FilamentVariant {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public String getColorLabelForLanguage(String language) {
|
||||
return resolveLocalizedValue(
|
||||
language,
|
||||
colorName,
|
||||
colorLabelIt,
|
||||
colorLabelEn,
|
||||
colorLabelDe,
|
||||
colorLabelFr
|
||||
);
|
||||
}
|
||||
|
||||
private String resolveLocalizedValue(String language,
|
||||
String fallback,
|
||||
String valueIt,
|
||||
String valueEn,
|
||||
String valueDe,
|
||||
String valueFr) {
|
||||
String normalizedLanguage = normalizeLanguage(language);
|
||||
String preferred = switch (normalizedLanguage) {
|
||||
case "it" -> valueIt;
|
||||
case "en" -> valueEn;
|
||||
case "de" -> valueDe;
|
||||
case "fr" -> valueFr;
|
||||
default -> null;
|
||||
};
|
||||
String resolved = firstNonBlank(preferred, fallback);
|
||||
if (resolved != null) {
|
||||
return resolved;
|
||||
}
|
||||
return firstNonBlank(valueIt, valueEn, valueDe, valueFr);
|
||||
}
|
||||
|
||||
private String normalizeLanguage(String language) {
|
||||
if (language == null) {
|
||||
return "";
|
||||
}
|
||||
String normalized = language.trim().toLowerCase();
|
||||
int separatorIndex = normalized.indexOf('-');
|
||||
if (separatorIndex > 0) {
|
||||
normalized = normalized.substring(0, separatorIndex);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String firstNonBlank(String... values) {
|
||||
if (values == null) {
|
||||
return null;
|
||||
}
|
||||
for (String value : values) {
|
||||
if (value != null && !value.isBlank()) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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,177 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.Table;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "media_asset", indexes = {
|
||||
@Index(name = "ix_media_asset_status_visibility_created_at", columnList = "status, visibility, created_at")
|
||||
})
|
||||
public class MediaAsset {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "media_asset_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String originalFilename;
|
||||
|
||||
@Column(name = "storage_key", nullable = false, length = Integer.MAX_VALUE, unique = true)
|
||||
private String storageKey;
|
||||
|
||||
@Column(name = "mime_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String mimeType;
|
||||
|
||||
@Column(name = "file_size_bytes", nullable = false)
|
||||
private Long fileSizeBytes;
|
||||
|
||||
@Column(name = "sha256_hex", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String sha256Hex;
|
||||
|
||||
@Column(name = "width_px")
|
||||
private Integer widthPx;
|
||||
|
||||
@Column(name = "height_px")
|
||||
private Integer heightPx;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@Column(name = "visibility", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String visibility;
|
||||
|
||||
@Column(name = "title", length = Integer.MAX_VALUE)
|
||||
private String title;
|
||||
|
||||
@Column(name = "alt_text", length = Integer.MAX_VALUE)
|
||||
private String altText;
|
||||
|
||||
@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 getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
|
||||
public void setOriginalFilename(String originalFilename) {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public String getStorageKey() {
|
||||
return storageKey;
|
||||
}
|
||||
|
||||
public void setStorageKey(String storageKey) {
|
||||
this.storageKey = storageKey;
|
||||
}
|
||||
|
||||
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 String getSha256Hex() {
|
||||
return sha256Hex;
|
||||
}
|
||||
|
||||
public void setSha256Hex(String sha256Hex) {
|
||||
this.sha256Hex = sha256Hex;
|
||||
}
|
||||
|
||||
public Integer getWidthPx() {
|
||||
return widthPx;
|
||||
}
|
||||
|
||||
public void setWidthPx(Integer widthPx) {
|
||||
this.widthPx = widthPx;
|
||||
}
|
||||
|
||||
public Integer getHeightPx() {
|
||||
return heightPx;
|
||||
}
|
||||
|
||||
public void setHeightPx(Integer heightPx) {
|
||||
this.heightPx = heightPx;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getVisibility() {
|
||||
return visibility;
|
||||
}
|
||||
|
||||
public void setVisibility(String visibility) {
|
||||
this.visibility = visibility;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getAltText() {
|
||||
return altText;
|
||||
}
|
||||
|
||||
public void setAltText(String altText) {
|
||||
this.altText = altText;
|
||||
}
|
||||
|
||||
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,273 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
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 = "media_usage", indexes = {
|
||||
@Index(name = "ix_media_usage_scope", columnList = "usage_type, usage_key, is_active, sort_order")
|
||||
})
|
||||
public class MediaUsage {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "media_usage_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@Column(name = "usage_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String usageType;
|
||||
|
||||
@Column(name = "usage_key", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String usageKey;
|
||||
|
||||
@Column(name = "owner_id")
|
||||
private UUID ownerId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@OnDelete(action = OnDeleteAction.CASCADE)
|
||||
@JoinColumn(name = "media_asset_id", nullable = false)
|
||||
private MediaAsset mediaAsset;
|
||||
|
||||
@ColumnDefault("0")
|
||||
@Column(name = "sort_order", nullable = false)
|
||||
private Integer sortOrder;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "is_primary", nullable = false)
|
||||
private Boolean isPrimary;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
@Column(name = "title_it", length = Integer.MAX_VALUE)
|
||||
private String titleIt;
|
||||
|
||||
@Column(name = "title_en", length = Integer.MAX_VALUE)
|
||||
private String titleEn;
|
||||
|
||||
@Column(name = "title_de", length = Integer.MAX_VALUE)
|
||||
private String titleDe;
|
||||
|
||||
@Column(name = "title_fr", length = Integer.MAX_VALUE)
|
||||
private String titleFr;
|
||||
|
||||
@Column(name = "alt_text_it", length = Integer.MAX_VALUE)
|
||||
private String altTextIt;
|
||||
|
||||
@Column(name = "alt_text_en", length = Integer.MAX_VALUE)
|
||||
private String altTextEn;
|
||||
|
||||
@Column(name = "alt_text_de", length = Integer.MAX_VALUE)
|
||||
private String altTextDe;
|
||||
|
||||
@Column(name = "alt_text_fr", length = Integer.MAX_VALUE)
|
||||
private String altTextFr;
|
||||
|
||||
@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 String getUsageType() {
|
||||
return usageType;
|
||||
}
|
||||
|
||||
public void setUsageType(String usageType) {
|
||||
this.usageType = usageType;
|
||||
}
|
||||
|
||||
public String getUsageKey() {
|
||||
return usageKey;
|
||||
}
|
||||
|
||||
public void setUsageKey(String usageKey) {
|
||||
this.usageKey = usageKey;
|
||||
}
|
||||
|
||||
public UUID getOwnerId() {
|
||||
return ownerId;
|
||||
}
|
||||
|
||||
public void setOwnerId(UUID ownerId) {
|
||||
this.ownerId = ownerId;
|
||||
}
|
||||
|
||||
public MediaAsset getMediaAsset() {
|
||||
return mediaAsset;
|
||||
}
|
||||
|
||||
public void setMediaAsset(MediaAsset mediaAsset) {
|
||||
this.mediaAsset = mediaAsset;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public Boolean getIsPrimary() {
|
||||
return isPrimary;
|
||||
}
|
||||
|
||||
public void setIsPrimary(Boolean primary) {
|
||||
isPrimary = primary;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public String getTitleIt() {
|
||||
return titleIt;
|
||||
}
|
||||
|
||||
public void setTitleIt(String titleIt) {
|
||||
this.titleIt = titleIt;
|
||||
}
|
||||
|
||||
public String getTitleEn() {
|
||||
return titleEn;
|
||||
}
|
||||
|
||||
public void setTitleEn(String titleEn) {
|
||||
this.titleEn = titleEn;
|
||||
}
|
||||
|
||||
public String getTitleDe() {
|
||||
return titleDe;
|
||||
}
|
||||
|
||||
public void setTitleDe(String titleDe) {
|
||||
this.titleDe = titleDe;
|
||||
}
|
||||
|
||||
public String getTitleFr() {
|
||||
return titleFr;
|
||||
}
|
||||
|
||||
public void setTitleFr(String titleFr) {
|
||||
this.titleFr = titleFr;
|
||||
}
|
||||
|
||||
public String getAltTextIt() {
|
||||
return altTextIt;
|
||||
}
|
||||
|
||||
public void setAltTextIt(String altTextIt) {
|
||||
this.altTextIt = altTextIt;
|
||||
}
|
||||
|
||||
public String getAltTextEn() {
|
||||
return altTextEn;
|
||||
}
|
||||
|
||||
public void setAltTextEn(String altTextEn) {
|
||||
this.altTextEn = altTextEn;
|
||||
}
|
||||
|
||||
public String getAltTextDe() {
|
||||
return altTextDe;
|
||||
}
|
||||
|
||||
public void setAltTextDe(String altTextDe) {
|
||||
this.altTextDe = altTextDe;
|
||||
}
|
||||
|
||||
public String getAltTextFr() {
|
||||
return altTextFr;
|
||||
}
|
||||
|
||||
public void setAltTextFr(String altTextFr) {
|
||||
this.altTextFr = altTextFr;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public String getTitleForLanguage(String language) {
|
||||
if (language == null) {
|
||||
return null;
|
||||
}
|
||||
return switch (language.trim().toLowerCase()) {
|
||||
case "it" -> titleIt;
|
||||
case "en" -> titleEn;
|
||||
case "de" -> titleDe;
|
||||
case "fr" -> titleFr;
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
public void setTitleForLanguage(String language, String value) {
|
||||
if (language == null) {
|
||||
return;
|
||||
}
|
||||
switch (language.trim().toLowerCase()) {
|
||||
case "it" -> titleIt = value;
|
||||
case "en" -> titleEn = value;
|
||||
case "de" -> titleDe = value;
|
||||
case "fr" -> titleFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getAltTextForLanguage(String language) {
|
||||
if (language == null) {
|
||||
return null;
|
||||
}
|
||||
return switch (language.trim().toLowerCase()) {
|
||||
case "it" -> altTextIt;
|
||||
case "en" -> altTextEn;
|
||||
case "de" -> altTextDe;
|
||||
case "fr" -> altTextFr;
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
public void setAltTextForLanguage(String language, String value) {
|
||||
if (language == null) {
|
||||
return;
|
||||
}
|
||||
switch (language.trim().toLowerCase()) {
|
||||
case "it" -> altTextIt = value;
|
||||
case "en" -> altTextEn = value;
|
||||
case "de" -> altTextDe = value;
|
||||
case "fr" -> altTextFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,154 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.persistence.UniqueConstraint;
|
||||
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 = "media_variant", indexes = {
|
||||
@Index(name = "ix_media_variant_asset", columnList = "media_asset_id")
|
||||
}, uniqueConstraints = {
|
||||
@UniqueConstraint(name = "uq_media_variant_asset_name_format", columnNames = {"media_asset_id", "variant_name", "format"})
|
||||
})
|
||||
public class MediaVariant {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "media_variant_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@OnDelete(action = OnDeleteAction.CASCADE)
|
||||
@JoinColumn(name = "media_asset_id", nullable = false)
|
||||
private MediaAsset mediaAsset;
|
||||
|
||||
@Column(name = "variant_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String variantName;
|
||||
|
||||
@Column(name = "format", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String format;
|
||||
|
||||
@Column(name = "storage_key", nullable = false, length = Integer.MAX_VALUE, unique = true)
|
||||
private String storageKey;
|
||||
|
||||
@Column(name = "mime_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String mimeType;
|
||||
|
||||
@Column(name = "width_px", nullable = false)
|
||||
private Integer widthPx;
|
||||
|
||||
@Column(name = "height_px", nullable = false)
|
||||
private Integer heightPx;
|
||||
|
||||
@Column(name = "file_size_bytes", nullable = false)
|
||||
private Long fileSizeBytes;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_generated", nullable = false)
|
||||
private Boolean isGenerated;
|
||||
|
||||
@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 MediaAsset getMediaAsset() {
|
||||
return mediaAsset;
|
||||
}
|
||||
|
||||
public void setMediaAsset(MediaAsset mediaAsset) {
|
||||
this.mediaAsset = mediaAsset;
|
||||
}
|
||||
|
||||
public String getVariantName() {
|
||||
return variantName;
|
||||
}
|
||||
|
||||
public void setVariantName(String variantName) {
|
||||
this.variantName = variantName;
|
||||
}
|
||||
|
||||
public String getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
public void setFormat(String format) {
|
||||
this.format = format;
|
||||
}
|
||||
|
||||
public String getStorageKey() {
|
||||
return storageKey;
|
||||
}
|
||||
|
||||
public void setStorageKey(String storageKey) {
|
||||
this.storageKey = storageKey;
|
||||
}
|
||||
|
||||
public String getMimeType() {
|
||||
return mimeType;
|
||||
}
|
||||
|
||||
public void setMimeType(String mimeType) {
|
||||
this.mimeType = mimeType;
|
||||
}
|
||||
|
||||
public Integer getWidthPx() {
|
||||
return widthPx;
|
||||
}
|
||||
|
||||
public void setWidthPx(Integer widthPx) {
|
||||
this.widthPx = widthPx;
|
||||
}
|
||||
|
||||
public Integer getHeightPx() {
|
||||
return heightPx;
|
||||
}
|
||||
|
||||
public void setHeightPx(Integer heightPx) {
|
||||
this.heightPx = heightPx;
|
||||
}
|
||||
|
||||
public Long getFileSizeBytes() {
|
||||
return fileSizeBytes;
|
||||
}
|
||||
|
||||
public void setFileSizeBytes(Long fileSizeBytes) {
|
||||
this.fileSizeBytes = fileSizeBytes;
|
||||
}
|
||||
|
||||
public Boolean getIsGenerated() {
|
||||
return isGenerated;
|
||||
}
|
||||
|
||||
public void setIsGenerated(Boolean generated) {
|
||||
isGenerated = generated;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Entity
|
||||
@Table(
|
||||
name = "nozzle_layer_height_option",
|
||||
uniqueConstraints = @UniqueConstraint(
|
||||
name = "ux_nozzle_layer_height_option_nozzle_layer",
|
||||
columnNames = {"nozzle_diameter_mm", "layer_height_mm"}
|
||||
)
|
||||
)
|
||||
public class NozzleLayerHeightOption {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "nozzle_layer_height_option_id", nullable = false)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "nozzle_diameter_mm", nullable = false, precision = 4, scale = 2)
|
||||
private BigDecimal nozzleDiameterMm;
|
||||
|
||||
@Column(name = "layer_height_mm", nullable = false, precision = 5, scale = 3)
|
||||
private BigDecimal layerHeightMm;
|
||||
|
||||
@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 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 Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean isActive) {
|
||||
this.isActive = isActive;
|
||||
}
|
||||
}
|
||||
@@ -20,10 +20,6 @@ public class Order {
|
||||
@JoinColumn(name = "source_quote_session_id")
|
||||
private QuoteSession sourceQuoteSession;
|
||||
|
||||
@ColumnDefault("'CALCULATOR'")
|
||||
@Column(name = "source_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String sourceType;
|
||||
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@@ -99,10 +95,6 @@ public class Order {
|
||||
@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;
|
||||
@@ -123,23 +115,6 @@ public class Order {
|
||||
@Column(name = "subtotal_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal subtotalChf;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "is_cad_order", nullable = false)
|
||||
private Boolean isCadOrder;
|
||||
|
||||
@Column(name = "source_request_id")
|
||||
private UUID sourceRequestId;
|
||||
|
||||
@Column(name = "cad_hours", precision = 10, scale = 2)
|
||||
private BigDecimal cadHours;
|
||||
|
||||
@Column(name = "cad_hourly_rate_chf", precision = 10, scale = 2)
|
||||
private BigDecimal cadHourlyRateChf;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "cad_total_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal cadTotalChf;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "total_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal totalChf;
|
||||
@@ -155,34 +130,6 @@ public class Order {
|
||||
@Column(name = "paid_at")
|
||||
private OffsetDateTime paidAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
OffsetDateTime now = OffsetDateTime.now();
|
||||
if (createdAt == null) {
|
||||
createdAt = now;
|
||||
}
|
||||
if (updatedAt == null) {
|
||||
updatedAt = now;
|
||||
}
|
||||
if (shippingSameAsBilling == null) {
|
||||
shippingSameAsBilling = true;
|
||||
}
|
||||
if (sourceType == null || sourceType.isBlank()) {
|
||||
sourceType = "CALCULATOR";
|
||||
}
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
private void onUpdate() {
|
||||
updatedAt = OffsetDateTime.now();
|
||||
if (shippingSameAsBilling == null) {
|
||||
shippingSameAsBilling = true;
|
||||
}
|
||||
if (sourceType == null || sourceType.isBlank()) {
|
||||
sourceType = "CALCULATOR";
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -191,16 +138,6 @@ public class Order {
|
||||
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;
|
||||
}
|
||||
@@ -209,14 +146,6 @@ public class Order {
|
||||
this.sourceQuoteSession = sourceQuoteSession;
|
||||
}
|
||||
|
||||
public String getSourceType() {
|
||||
return sourceType;
|
||||
}
|
||||
|
||||
public void setSourceType(String sourceType) {
|
||||
this.sourceType = sourceType;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
@@ -417,14 +346,6 @@ public class Order {
|
||||
this.currency = currency;
|
||||
}
|
||||
|
||||
public String getPreferredLanguage() {
|
||||
return preferredLanguage;
|
||||
}
|
||||
|
||||
public void setPreferredLanguage(String preferredLanguage) {
|
||||
this.preferredLanguage = preferredLanguage;
|
||||
}
|
||||
|
||||
public BigDecimal getSetupCostChf() {
|
||||
return setupCostChf;
|
||||
}
|
||||
@@ -457,46 +378,6 @@ public class Order {
|
||||
this.subtotalChf = subtotalChf;
|
||||
}
|
||||
|
||||
public Boolean getIsCadOrder() {
|
||||
return isCadOrder;
|
||||
}
|
||||
|
||||
public void setIsCadOrder(Boolean isCadOrder) {
|
||||
this.isCadOrder = isCadOrder;
|
||||
}
|
||||
|
||||
public UUID getSourceRequestId() {
|
||||
return sourceRequestId;
|
||||
}
|
||||
|
||||
public void setSourceRequestId(UUID sourceRequestId) {
|
||||
this.sourceRequestId = sourceRequestId;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHours() {
|
||||
return cadHours;
|
||||
}
|
||||
|
||||
public void setCadHours(BigDecimal cadHours) {
|
||||
this.cadHours = cadHours;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHourlyRateChf() {
|
||||
return cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
|
||||
this.cadHourlyRateChf = cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public BigDecimal getCadTotalChf() {
|
||||
return cadTotalChf;
|
||||
}
|
||||
|
||||
public void setCadTotalChf(BigDecimal cadTotalChf) {
|
||||
this.cadTotalChf = cadTotalChf;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalChf() {
|
||||
return totalChf;
|
||||
}
|
||||
@@ -529,4 +410,5 @@ public class Order {
|
||||
this.paidAt = paidAt;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -23,16 +23,9 @@ public class OrderItem {
|
||||
@JoinColumn(name = "order_id", nullable = false)
|
||||
private Order order;
|
||||
|
||||
@ColumnDefault("'PRINT_FILE'")
|
||||
@Column(name = "item_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String itemType;
|
||||
|
||||
@Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String originalFilename;
|
||||
|
||||
@Column(name = "display_name", length = Integer.MAX_VALUE)
|
||||
private String displayName;
|
||||
|
||||
@Column(name = "stored_relative_path", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String storedRelativePath;
|
||||
|
||||
@@ -51,51 +44,6 @@ public class OrderItem {
|
||||
@Column(name = "material_code", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String materialCode;
|
||||
|
||||
@Column(name = "quality", length = Integer.MAX_VALUE)
|
||||
private String quality;
|
||||
|
||||
@Column(name = "nozzle_diameter_mm", precision = 4, scale = 2)
|
||||
private BigDecimal nozzleDiameterMm;
|
||||
|
||||
@Column(name = "layer_height_mm", precision = 5, scale = 3)
|
||||
private BigDecimal layerHeightMm;
|
||||
|
||||
@Column(name = "infill_percent")
|
||||
private Integer infillPercent;
|
||||
|
||||
@Column(name = "infill_pattern", length = Integer.MAX_VALUE)
|
||||
private String infillPattern;
|
||||
|
||||
@Column(name = "supports_enabled")
|
||||
private Boolean supportsEnabled;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "filament_variant_id")
|
||||
private FilamentVariant filamentVariant;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "shop_product_id")
|
||||
private ShopProduct shopProduct;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "shop_product_variant_id")
|
||||
private ShopProductVariant shopProductVariant;
|
||||
|
||||
@Column(name = "shop_product_slug", length = Integer.MAX_VALUE)
|
||||
private String shopProductSlug;
|
||||
|
||||
@Column(name = "shop_product_name", length = Integer.MAX_VALUE)
|
||||
private String shopProductName;
|
||||
|
||||
@Column(name = "shop_variant_label", length = Integer.MAX_VALUE)
|
||||
private String shopVariantLabel;
|
||||
|
||||
@Column(name = "shop_variant_color_name", length = Integer.MAX_VALUE)
|
||||
private String shopVariantColorName;
|
||||
|
||||
@Column(name = "shop_variant_color_hex", length = Integer.MAX_VALUE)
|
||||
private String shopVariantColorHex;
|
||||
|
||||
@Column(name = "color_code", length = Integer.MAX_VALUE)
|
||||
private String colorCode;
|
||||
|
||||
@@ -109,15 +57,6 @@ public class OrderItem {
|
||||
@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;
|
||||
|
||||
@@ -128,24 +67,6 @@ public class OrderItem {
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
if (createdAt == null) {
|
||||
createdAt = OffsetDateTime.now();
|
||||
}
|
||||
if (quantity == null) {
|
||||
quantity = 1;
|
||||
}
|
||||
if (itemType == null || itemType.isBlank()) {
|
||||
itemType = "PRINT_FILE";
|
||||
}
|
||||
if ((displayName == null || displayName.isBlank()) && originalFilename != null && !originalFilename.isBlank()) {
|
||||
displayName = originalFilename;
|
||||
} else if ((displayName == null || displayName.isBlank()) && shopProductName != null && !shopProductName.isBlank()) {
|
||||
displayName = shopProductName;
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -162,14 +83,6 @@ public class OrderItem {
|
||||
this.order = order;
|
||||
}
|
||||
|
||||
public String getItemType() {
|
||||
return itemType;
|
||||
}
|
||||
|
||||
public void setItemType(String itemType) {
|
||||
this.itemType = itemType;
|
||||
}
|
||||
|
||||
public String getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
@@ -178,14 +91,6 @@ public class OrderItem {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public String getDisplayName() {
|
||||
return displayName;
|
||||
}
|
||||
|
||||
public void setDisplayName(String displayName) {
|
||||
this.displayName = displayName;
|
||||
}
|
||||
|
||||
public String getStoredRelativePath() {
|
||||
return storedRelativePath;
|
||||
}
|
||||
@@ -234,118 +139,6 @@ public class OrderItem {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getQuality() {
|
||||
return quality;
|
||||
}
|
||||
|
||||
public void setQuality(String quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
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 Integer getInfillPercent() {
|
||||
return infillPercent;
|
||||
}
|
||||
|
||||
public void setInfillPercent(Integer infillPercent) {
|
||||
this.infillPercent = infillPercent;
|
||||
}
|
||||
|
||||
public String getInfillPattern() {
|
||||
return infillPattern;
|
||||
}
|
||||
|
||||
public void setInfillPattern(String infillPattern) {
|
||||
this.infillPattern = infillPattern;
|
||||
}
|
||||
|
||||
public Boolean getSupportsEnabled() {
|
||||
return supportsEnabled;
|
||||
}
|
||||
|
||||
public void setSupportsEnabled(Boolean supportsEnabled) {
|
||||
this.supportsEnabled = supportsEnabled;
|
||||
}
|
||||
|
||||
public FilamentVariant getFilamentVariant() {
|
||||
return filamentVariant;
|
||||
}
|
||||
|
||||
public void setFilamentVariant(FilamentVariant filamentVariant) {
|
||||
this.filamentVariant = filamentVariant;
|
||||
}
|
||||
|
||||
public ShopProduct getShopProduct() {
|
||||
return shopProduct;
|
||||
}
|
||||
|
||||
public void setShopProduct(ShopProduct shopProduct) {
|
||||
this.shopProduct = shopProduct;
|
||||
}
|
||||
|
||||
public ShopProductVariant getShopProductVariant() {
|
||||
return shopProductVariant;
|
||||
}
|
||||
|
||||
public void setShopProductVariant(ShopProductVariant shopProductVariant) {
|
||||
this.shopProductVariant = shopProductVariant;
|
||||
}
|
||||
|
||||
public String getShopProductSlug() {
|
||||
return shopProductSlug;
|
||||
}
|
||||
|
||||
public void setShopProductSlug(String shopProductSlug) {
|
||||
this.shopProductSlug = shopProductSlug;
|
||||
}
|
||||
|
||||
public String getShopProductName() {
|
||||
return shopProductName;
|
||||
}
|
||||
|
||||
public void setShopProductName(String shopProductName) {
|
||||
this.shopProductName = shopProductName;
|
||||
}
|
||||
|
||||
public String getShopVariantLabel() {
|
||||
return shopVariantLabel;
|
||||
}
|
||||
|
||||
public void setShopVariantLabel(String shopVariantLabel) {
|
||||
this.shopVariantLabel = shopVariantLabel;
|
||||
}
|
||||
|
||||
public String getShopVariantColorName() {
|
||||
return shopVariantColorName;
|
||||
}
|
||||
|
||||
public void setShopVariantColorName(String shopVariantColorName) {
|
||||
this.shopVariantColorName = shopVariantColorName;
|
||||
}
|
||||
|
||||
public String getShopVariantColorHex() {
|
||||
return shopVariantColorHex;
|
||||
}
|
||||
|
||||
public void setShopVariantColorHex(String shopVariantColorHex) {
|
||||
this.shopVariantColorHex = shopVariantColorHex;
|
||||
}
|
||||
|
||||
public String getColorCode() {
|
||||
return colorCode;
|
||||
}
|
||||
@@ -378,30 +171,6 @@ public class OrderItem {
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -52,9 +52,6 @@ public class Payment {
|
||||
@Column(name = "initiated_at", nullable = false)
|
||||
private OffsetDateTime initiatedAt;
|
||||
|
||||
@Column(name = "reported_at")
|
||||
private OffsetDateTime reportedAt;
|
||||
|
||||
@Column(name = "received_at")
|
||||
private OffsetDateTime receivedAt;
|
||||
|
||||
@@ -138,14 +135,6 @@ public class Payment {
|
||||
this.initiatedAt = initiatedAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getReportedAt() {
|
||||
return reportedAt;
|
||||
}
|
||||
|
||||
public void setReportedAt(OffsetDateTime reportedAt) {
|
||||
this.reportedAt = reportedAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getReceivedAt() {
|
||||
return receivedAt;
|
||||
}
|
||||
|
||||
@@ -41,6 +41,9 @@ public class PrinterMachine {
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@Column(name = "slicer_machine_profile")
|
||||
private String slicerMachineProfile;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -57,6 +60,14 @@ public class PrinterMachine {
|
||||
this.printerDisplayName = printerDisplayName;
|
||||
}
|
||||
|
||||
public String getSlicerMachineProfile() {
|
||||
return slicerMachineProfile;
|
||||
}
|
||||
|
||||
public void setSlicerMachineProfile(String slicerMachineProfile) {
|
||||
this.slicerMachineProfile = slicerMachineProfile;
|
||||
}
|
||||
|
||||
public Integer getBuildVolumeXMm() {
|
||||
return buildVolumeXMm;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -30,16 +30,9 @@ public class QuoteLineItem {
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@ColumnDefault("'PRINT_FILE'")
|
||||
@Column(name = "line_item_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String lineItemType;
|
||||
|
||||
@Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String originalFilename;
|
||||
|
||||
@Column(name = "display_name", length = Integer.MAX_VALUE)
|
||||
private String displayName;
|
||||
|
||||
@ColumnDefault("1")
|
||||
@Column(name = "quantity", nullable = false)
|
||||
private Integer quantity;
|
||||
@@ -47,57 +40,6 @@ public class QuoteLineItem {
|
||||
@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;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "shop_product_id")
|
||||
@com.fasterxml.jackson.annotation.JsonIgnore
|
||||
private ShopProduct shopProduct;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "shop_product_variant_id")
|
||||
@com.fasterxml.jackson.annotation.JsonIgnore
|
||||
private ShopProductVariant shopProductVariant;
|
||||
|
||||
@Column(name = "shop_product_slug", length = Integer.MAX_VALUE)
|
||||
private String shopProductSlug;
|
||||
|
||||
@Column(name = "shop_product_name", length = Integer.MAX_VALUE)
|
||||
private String shopProductName;
|
||||
|
||||
@Column(name = "shop_variant_label", length = Integer.MAX_VALUE)
|
||||
private String shopVariantLabel;
|
||||
|
||||
@Column(name = "shop_variant_color_name", length = Integer.MAX_VALUE)
|
||||
private String shopVariantColorName;
|
||||
|
||||
@Column(name = "shop_variant_color_hex", length = Integer.MAX_VALUE)
|
||||
private String shopVariantColorHex;
|
||||
|
||||
@Column(name = "material_code", length = Integer.MAX_VALUE)
|
||||
private String materialCode;
|
||||
|
||||
@Column(name = "quality", length = Integer.MAX_VALUE)
|
||||
private String quality;
|
||||
|
||||
@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_percent")
|
||||
private Integer infillPercent;
|
||||
|
||||
@Column(name = "infill_pattern", length = Integer.MAX_VALUE)
|
||||
private String infillPattern;
|
||||
|
||||
@Column(name = "supports_enabled")
|
||||
private Boolean supportsEnabled;
|
||||
|
||||
@Column(name = "bounding_box_x_mm", precision = 10, scale = 3)
|
||||
private BigDecimal boundingBoxXMm;
|
||||
|
||||
@@ -134,41 +76,6 @@ public class QuoteLineItem {
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
OffsetDateTime now = OffsetDateTime.now();
|
||||
if (createdAt == null) {
|
||||
createdAt = now;
|
||||
}
|
||||
if (updatedAt == null) {
|
||||
updatedAt = now;
|
||||
}
|
||||
if (quantity == null) {
|
||||
quantity = 1;
|
||||
}
|
||||
if (lineItemType == null || lineItemType.isBlank()) {
|
||||
lineItemType = "PRINT_FILE";
|
||||
}
|
||||
if ((displayName == null || displayName.isBlank()) && originalFilename != null && !originalFilename.isBlank()) {
|
||||
displayName = originalFilename;
|
||||
} else if ((displayName == null || displayName.isBlank()) && shopProductName != null && !shopProductName.isBlank()) {
|
||||
displayName = shopProductName;
|
||||
}
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
private void onUpdate() {
|
||||
updatedAt = OffsetDateTime.now();
|
||||
if (lineItemType == null || lineItemType.isBlank()) {
|
||||
lineItemType = "PRINT_FILE";
|
||||
}
|
||||
if ((displayName == null || displayName.isBlank()) && originalFilename != null && !originalFilename.isBlank()) {
|
||||
displayName = originalFilename;
|
||||
} else if ((displayName == null || displayName.isBlank()) && shopProductName != null && !shopProductName.isBlank()) {
|
||||
displayName = shopProductName;
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -193,14 +100,6 @@ public class QuoteLineItem {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getLineItemType() {
|
||||
return lineItemType;
|
||||
}
|
||||
|
||||
public void setLineItemType(String lineItemType) {
|
||||
this.lineItemType = lineItemType;
|
||||
}
|
||||
|
||||
public String getOriginalFilename() {
|
||||
return originalFilename;
|
||||
}
|
||||
@@ -209,14 +108,6 @@ public class QuoteLineItem {
|
||||
this.originalFilename = originalFilename;
|
||||
}
|
||||
|
||||
public String getDisplayName() {
|
||||
return displayName;
|
||||
}
|
||||
|
||||
public void setDisplayName(String displayName) {
|
||||
this.displayName = displayName;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
@@ -233,126 +124,6 @@ public class QuoteLineItem {
|
||||
this.colorCode = colorCode;
|
||||
}
|
||||
|
||||
public FilamentVariant getFilamentVariant() {
|
||||
return filamentVariant;
|
||||
}
|
||||
|
||||
public void setFilamentVariant(FilamentVariant filamentVariant) {
|
||||
this.filamentVariant = filamentVariant;
|
||||
}
|
||||
|
||||
public ShopProduct getShopProduct() {
|
||||
return shopProduct;
|
||||
}
|
||||
|
||||
public void setShopProduct(ShopProduct shopProduct) {
|
||||
this.shopProduct = shopProduct;
|
||||
}
|
||||
|
||||
public ShopProductVariant getShopProductVariant() {
|
||||
return shopProductVariant;
|
||||
}
|
||||
|
||||
public void setShopProductVariant(ShopProductVariant shopProductVariant) {
|
||||
this.shopProductVariant = shopProductVariant;
|
||||
}
|
||||
|
||||
public String getShopProductSlug() {
|
||||
return shopProductSlug;
|
||||
}
|
||||
|
||||
public void setShopProductSlug(String shopProductSlug) {
|
||||
this.shopProductSlug = shopProductSlug;
|
||||
}
|
||||
|
||||
public String getShopProductName() {
|
||||
return shopProductName;
|
||||
}
|
||||
|
||||
public void setShopProductName(String shopProductName) {
|
||||
this.shopProductName = shopProductName;
|
||||
}
|
||||
|
||||
public String getShopVariantLabel() {
|
||||
return shopVariantLabel;
|
||||
}
|
||||
|
||||
public void setShopVariantLabel(String shopVariantLabel) {
|
||||
this.shopVariantLabel = shopVariantLabel;
|
||||
}
|
||||
|
||||
public String getShopVariantColorName() {
|
||||
return shopVariantColorName;
|
||||
}
|
||||
|
||||
public void setShopVariantColorName(String shopVariantColorName) {
|
||||
this.shopVariantColorName = shopVariantColorName;
|
||||
}
|
||||
|
||||
public String getShopVariantColorHex() {
|
||||
return shopVariantColorHex;
|
||||
}
|
||||
|
||||
public void setShopVariantColorHex(String shopVariantColorHex) {
|
||||
this.shopVariantColorHex = shopVariantColorHex;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getQuality() {
|
||||
return quality;
|
||||
}
|
||||
|
||||
public void setQuality(String quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
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 Integer getInfillPercent() {
|
||||
return infillPercent;
|
||||
}
|
||||
|
||||
public void setInfillPercent(Integer infillPercent) {
|
||||
this.infillPercent = infillPercent;
|
||||
}
|
||||
|
||||
public String getInfillPattern() {
|
||||
return infillPattern;
|
||||
}
|
||||
|
||||
public void setInfillPattern(String infillPattern) {
|
||||
this.infillPattern = infillPattern;
|
||||
}
|
||||
|
||||
public Boolean getSupportsEnabled() {
|
||||
return supportsEnabled;
|
||||
}
|
||||
|
||||
public void setSupportsEnabled(Boolean supportsEnabled) {
|
||||
this.supportsEnabled = supportsEnabled;
|
||||
}
|
||||
|
||||
public BigDecimal getBoundingBoxXMm() {
|
||||
return boundingBoxXMm;
|
||||
}
|
||||
|
||||
@@ -22,10 +22,6 @@ public class QuoteSession {
|
||||
@Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String status;
|
||||
|
||||
@ColumnDefault("'PRINT_QUOTE'")
|
||||
@Column(name = "session_type", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String sessionType;
|
||||
|
||||
@Column(name = "pricing_version", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String pricingVersion;
|
||||
|
||||
@@ -65,28 +61,6 @@ public class QuoteSession {
|
||||
@Column(name = "converted_order_id")
|
||||
private UUID convertedOrderId;
|
||||
|
||||
@Column(name = "source_request_id")
|
||||
private UUID sourceRequestId;
|
||||
|
||||
@Column(name = "cad_hours", precision = 10, scale = 2)
|
||||
private BigDecimal cadHours;
|
||||
|
||||
@Column(name = "cad_hourly_rate_chf", precision = 10, scale = 2)
|
||||
private BigDecimal cadHourlyRateChf;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
if (sessionType == null || sessionType.isBlank()) {
|
||||
sessionType = "PRINT_QUOTE";
|
||||
}
|
||||
if (supportsEnabled == null) {
|
||||
supportsEnabled = false;
|
||||
}
|
||||
if (createdAt == null) {
|
||||
createdAt = OffsetDateTime.now();
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -103,14 +77,6 @@ public class QuoteSession {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getSessionType() {
|
||||
return sessionType;
|
||||
}
|
||||
|
||||
public void setSessionType(String sessionType) {
|
||||
this.sessionType = sessionType;
|
||||
}
|
||||
|
||||
public String getPricingVersion() {
|
||||
return pricingVersion;
|
||||
}
|
||||
@@ -207,28 +173,4 @@ public class QuoteSession {
|
||||
this.convertedOrderId = convertedOrderId;
|
||||
}
|
||||
|
||||
public UUID getSourceRequestId() {
|
||||
return sourceRequestId;
|
||||
}
|
||||
|
||||
public void setSourceRequestId(UUID sourceRequestId) {
|
||||
this.sourceRequestId = sourceRequestId;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHours() {
|
||||
return cadHours;
|
||||
}
|
||||
|
||||
public void setCadHours(BigDecimal cadHours) {
|
||||
this.cadHours = cadHours;
|
||||
}
|
||||
|
||||
public BigDecimal getCadHourlyRateChf() {
|
||||
return cadHourlyRateChf;
|
||||
}
|
||||
|
||||
public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
|
||||
this.cadHourlyRateChf = cadHourlyRateChf;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,505 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.PrePersist;
|
||||
import jakarta.persistence.PreUpdate;
|
||||
import jakarta.persistence.Table;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "shop_category", indexes = {
|
||||
@Index(name = "ix_shop_category_parent_sort", columnList = "parent_category_id, sort_order"),
|
||||
@Index(name = "ix_shop_category_active_sort", columnList = "is_active, sort_order")
|
||||
})
|
||||
public class ShopCategory {
|
||||
public static final List<String> SUPPORTED_LANGUAGES = List.of("it", "en", "de", "fr");
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "shop_category_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "parent_category_id")
|
||||
private ShopCategory parentCategory;
|
||||
|
||||
@Column(name = "slug", nullable = false, unique = true, length = Integer.MAX_VALUE)
|
||||
private String slug;
|
||||
|
||||
@Column(name = "name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String name;
|
||||
|
||||
@Column(name = "name_it", length = Integer.MAX_VALUE)
|
||||
private String nameIt;
|
||||
|
||||
@Column(name = "name_en", length = Integer.MAX_VALUE)
|
||||
private String nameEn;
|
||||
|
||||
@Column(name = "name_de", length = Integer.MAX_VALUE)
|
||||
private String nameDe;
|
||||
|
||||
@Column(name = "name_fr", length = Integer.MAX_VALUE)
|
||||
private String nameFr;
|
||||
|
||||
@Column(name = "description", length = Integer.MAX_VALUE)
|
||||
private String description;
|
||||
|
||||
@Column(name = "description_it", length = Integer.MAX_VALUE)
|
||||
private String descriptionIt;
|
||||
|
||||
@Column(name = "description_en", length = Integer.MAX_VALUE)
|
||||
private String descriptionEn;
|
||||
|
||||
@Column(name = "description_de", length = Integer.MAX_VALUE)
|
||||
private String descriptionDe;
|
||||
|
||||
@Column(name = "description_fr", length = Integer.MAX_VALUE)
|
||||
private String descriptionFr;
|
||||
|
||||
@Column(name = "seo_title", length = Integer.MAX_VALUE)
|
||||
private String seoTitle;
|
||||
|
||||
@Column(name = "seo_title_it", length = Integer.MAX_VALUE)
|
||||
private String seoTitleIt;
|
||||
|
||||
@Column(name = "seo_title_en", length = Integer.MAX_VALUE)
|
||||
private String seoTitleEn;
|
||||
|
||||
@Column(name = "seo_title_de", length = Integer.MAX_VALUE)
|
||||
private String seoTitleDe;
|
||||
|
||||
@Column(name = "seo_title_fr", length = Integer.MAX_VALUE)
|
||||
private String seoTitleFr;
|
||||
|
||||
@Column(name = "seo_description", length = Integer.MAX_VALUE)
|
||||
private String seoDescription;
|
||||
|
||||
@Column(name = "seo_description_it", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionIt;
|
||||
|
||||
@Column(name = "seo_description_en", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionEn;
|
||||
|
||||
@Column(name = "seo_description_de", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionDe;
|
||||
|
||||
@Column(name = "seo_description_fr", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionFr;
|
||||
|
||||
@Column(name = "og_title", length = Integer.MAX_VALUE)
|
||||
private String ogTitle;
|
||||
|
||||
@Column(name = "og_description", length = Integer.MAX_VALUE)
|
||||
private String ogDescription;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "indexable", nullable = false)
|
||||
private Boolean indexable;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
@ColumnDefault("0")
|
||||
@Column(name = "sort_order", nullable = false)
|
||||
private Integer sortOrder;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
OffsetDateTime now = OffsetDateTime.now();
|
||||
if (createdAt == null) {
|
||||
createdAt = now;
|
||||
}
|
||||
if (updatedAt == null) {
|
||||
updatedAt = now;
|
||||
}
|
||||
if (indexable == null) {
|
||||
indexable = true;
|
||||
}
|
||||
if (isActive == null) {
|
||||
isActive = true;
|
||||
}
|
||||
if (sortOrder == null) {
|
||||
sortOrder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
private void onUpdate() {
|
||||
updatedAt = OffsetDateTime.now();
|
||||
if (indexable == null) {
|
||||
indexable = true;
|
||||
}
|
||||
if (isActive == null) {
|
||||
isActive = true;
|
||||
}
|
||||
if (sortOrder == null) {
|
||||
sortOrder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public ShopCategory getParentCategory() {
|
||||
return parentCategory;
|
||||
}
|
||||
|
||||
public void setParentCategory(ShopCategory parentCategory) {
|
||||
this.parentCategory = parentCategory;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getNameIt() {
|
||||
return nameIt;
|
||||
}
|
||||
|
||||
public void setNameIt(String nameIt) {
|
||||
this.nameIt = nameIt;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getNameDe() {
|
||||
return nameDe;
|
||||
}
|
||||
|
||||
public void setNameDe(String nameDe) {
|
||||
this.nameDe = nameDe;
|
||||
}
|
||||
|
||||
public String getNameFr() {
|
||||
return nameFr;
|
||||
}
|
||||
|
||||
public void setNameFr(String nameFr) {
|
||||
this.nameFr = nameFr;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescriptionIt() {
|
||||
return descriptionIt;
|
||||
}
|
||||
|
||||
public void setDescriptionIt(String descriptionIt) {
|
||||
this.descriptionIt = descriptionIt;
|
||||
}
|
||||
|
||||
public String getDescriptionEn() {
|
||||
return descriptionEn;
|
||||
}
|
||||
|
||||
public void setDescriptionEn(String descriptionEn) {
|
||||
this.descriptionEn = descriptionEn;
|
||||
}
|
||||
|
||||
public String getDescriptionDe() {
|
||||
return descriptionDe;
|
||||
}
|
||||
|
||||
public void setDescriptionDe(String descriptionDe) {
|
||||
this.descriptionDe = descriptionDe;
|
||||
}
|
||||
|
||||
public String getDescriptionFr() {
|
||||
return descriptionFr;
|
||||
}
|
||||
|
||||
public void setDescriptionFr(String descriptionFr) {
|
||||
this.descriptionFr = descriptionFr;
|
||||
}
|
||||
|
||||
public String getSeoTitle() {
|
||||
return seoTitle;
|
||||
}
|
||||
|
||||
public void setSeoTitle(String seoTitle) {
|
||||
this.seoTitle = seoTitle;
|
||||
}
|
||||
|
||||
public String getSeoTitleIt() {
|
||||
return seoTitleIt;
|
||||
}
|
||||
|
||||
public void setSeoTitleIt(String seoTitleIt) {
|
||||
this.seoTitleIt = seoTitleIt;
|
||||
}
|
||||
|
||||
public String getSeoTitleEn() {
|
||||
return seoTitleEn;
|
||||
}
|
||||
|
||||
public void setSeoTitleEn(String seoTitleEn) {
|
||||
this.seoTitleEn = seoTitleEn;
|
||||
}
|
||||
|
||||
public String getSeoTitleDe() {
|
||||
return seoTitleDe;
|
||||
}
|
||||
|
||||
public void setSeoTitleDe(String seoTitleDe) {
|
||||
this.seoTitleDe = seoTitleDe;
|
||||
}
|
||||
|
||||
public String getSeoTitleFr() {
|
||||
return seoTitleFr;
|
||||
}
|
||||
|
||||
public void setSeoTitleFr(String seoTitleFr) {
|
||||
this.seoTitleFr = seoTitleFr;
|
||||
}
|
||||
|
||||
public String getSeoDescription() {
|
||||
return seoDescription;
|
||||
}
|
||||
|
||||
public void setSeoDescription(String seoDescription) {
|
||||
this.seoDescription = seoDescription;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionIt() {
|
||||
return seoDescriptionIt;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionIt(String seoDescriptionIt) {
|
||||
this.seoDescriptionIt = seoDescriptionIt;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionEn() {
|
||||
return seoDescriptionEn;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionEn(String seoDescriptionEn) {
|
||||
this.seoDescriptionEn = seoDescriptionEn;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionDe() {
|
||||
return seoDescriptionDe;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionDe(String seoDescriptionDe) {
|
||||
this.seoDescriptionDe = seoDescriptionDe;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionFr() {
|
||||
return seoDescriptionFr;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionFr(String seoDescriptionFr) {
|
||||
this.seoDescriptionFr = seoDescriptionFr;
|
||||
}
|
||||
|
||||
public String getOgTitle() {
|
||||
return ogTitle;
|
||||
}
|
||||
|
||||
public void setOgTitle(String ogTitle) {
|
||||
this.ogTitle = ogTitle;
|
||||
}
|
||||
|
||||
public String getOgDescription() {
|
||||
return ogDescription;
|
||||
}
|
||||
|
||||
public void setOgDescription(String ogDescription) {
|
||||
this.ogDescription = ogDescription;
|
||||
}
|
||||
|
||||
public Boolean getIndexable() {
|
||||
return indexable;
|
||||
}
|
||||
|
||||
public void setIndexable(Boolean indexable) {
|
||||
this.indexable = indexable;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getUpdatedAt() {
|
||||
return updatedAt;
|
||||
}
|
||||
|
||||
public void setUpdatedAt(OffsetDateTime updatedAt) {
|
||||
this.updatedAt = updatedAt;
|
||||
}
|
||||
|
||||
public String getNameForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, name, nameIt, nameEn, nameDe, nameFr);
|
||||
}
|
||||
|
||||
public void setNameForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> nameIt = value;
|
||||
case "en" -> nameEn = value;
|
||||
case "de" -> nameDe = value;
|
||||
case "fr" -> nameFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getDescriptionForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, description, descriptionIt, descriptionEn, descriptionDe, descriptionFr);
|
||||
}
|
||||
|
||||
public void setDescriptionForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> descriptionIt = value;
|
||||
case "en" -> descriptionEn = value;
|
||||
case "de" -> descriptionDe = value;
|
||||
case "fr" -> descriptionFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getSeoTitleForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, seoTitle, seoTitleIt, seoTitleEn, seoTitleDe, seoTitleFr);
|
||||
}
|
||||
|
||||
public void setSeoTitleForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> seoTitleIt = value;
|
||||
case "en" -> seoTitleEn = value;
|
||||
case "de" -> seoTitleDe = value;
|
||||
case "fr" -> seoTitleFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getSeoDescriptionForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, seoDescription, seoDescriptionIt, seoDescriptionEn, seoDescriptionDe, seoDescriptionFr);
|
||||
}
|
||||
|
||||
public void setSeoDescriptionForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> seoDescriptionIt = value;
|
||||
case "en" -> seoDescriptionEn = value;
|
||||
case "de" -> seoDescriptionDe = value;
|
||||
case "fr" -> seoDescriptionFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private String resolveLocalizedValue(String language,
|
||||
String fallback,
|
||||
String valueIt,
|
||||
String valueEn,
|
||||
String valueDe,
|
||||
String valueFr) {
|
||||
String normalizedLanguage = normalizeLanguage(language);
|
||||
String preferred = switch (normalizedLanguage) {
|
||||
case "it" -> valueIt;
|
||||
case "en" -> valueEn;
|
||||
case "de" -> valueDe;
|
||||
case "fr" -> valueFr;
|
||||
default -> null;
|
||||
};
|
||||
String resolved = firstNonBlank(preferred, fallback);
|
||||
if (resolved != null) {
|
||||
return resolved;
|
||||
}
|
||||
return firstNonBlank(valueIt, valueEn, valueDe, valueFr);
|
||||
}
|
||||
|
||||
private String normalizeLanguage(String language) {
|
||||
if (language == null) {
|
||||
return "";
|
||||
}
|
||||
String normalized = language.trim().toLowerCase();
|
||||
int separatorIndex = normalized.indexOf('-');
|
||||
if (separatorIndex > 0) {
|
||||
normalized = normalized.substring(0, separatorIndex);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String firstNonBlank(String... values) {
|
||||
if (values == null) {
|
||||
return null;
|
||||
}
|
||||
for (String value : values) {
|
||||
if (value != null && !value.isBlank()) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,593 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.PrePersist;
|
||||
import jakarta.persistence.PreUpdate;
|
||||
import jakarta.persistence.Table;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "shop_product", indexes = {
|
||||
@Index(name = "ix_shop_product_category_active_sort", columnList = "shop_category_id, is_active, sort_order"),
|
||||
@Index(name = "ix_shop_product_featured_sort", columnList = "is_featured, is_active, sort_order")
|
||||
})
|
||||
public class ShopProduct {
|
||||
public static final List<String> SUPPORTED_LANGUAGES = List.of("it", "en", "de", "fr");
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "shop_product_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "shop_category_id", nullable = false)
|
||||
private ShopCategory category;
|
||||
|
||||
@Column(name = "slug", nullable = false, unique = true, length = Integer.MAX_VALUE)
|
||||
private String slug;
|
||||
|
||||
@Column(name = "name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String name;
|
||||
|
||||
@Column(name = "name_it", length = Integer.MAX_VALUE)
|
||||
private String nameIt;
|
||||
|
||||
@Column(name = "name_en", length = Integer.MAX_VALUE)
|
||||
private String nameEn;
|
||||
|
||||
@Column(name = "name_de", length = Integer.MAX_VALUE)
|
||||
private String nameDe;
|
||||
|
||||
@Column(name = "name_fr", length = Integer.MAX_VALUE)
|
||||
private String nameFr;
|
||||
|
||||
@Column(name = "excerpt", length = Integer.MAX_VALUE)
|
||||
private String excerpt;
|
||||
|
||||
@Column(name = "excerpt_it", length = Integer.MAX_VALUE)
|
||||
private String excerptIt;
|
||||
|
||||
@Column(name = "excerpt_en", length = Integer.MAX_VALUE)
|
||||
private String excerptEn;
|
||||
|
||||
@Column(name = "excerpt_de", length = Integer.MAX_VALUE)
|
||||
private String excerptDe;
|
||||
|
||||
@Column(name = "excerpt_fr", length = Integer.MAX_VALUE)
|
||||
private String excerptFr;
|
||||
|
||||
@Column(name = "description", length = Integer.MAX_VALUE)
|
||||
private String description;
|
||||
|
||||
@Column(name = "description_it", length = Integer.MAX_VALUE)
|
||||
private String descriptionIt;
|
||||
|
||||
@Column(name = "description_en", length = Integer.MAX_VALUE)
|
||||
private String descriptionEn;
|
||||
|
||||
@Column(name = "description_de", length = Integer.MAX_VALUE)
|
||||
private String descriptionDe;
|
||||
|
||||
@Column(name = "description_fr", length = Integer.MAX_VALUE)
|
||||
private String descriptionFr;
|
||||
|
||||
@Column(name = "seo_title", length = Integer.MAX_VALUE)
|
||||
private String seoTitle;
|
||||
|
||||
@Column(name = "seo_title_it", length = Integer.MAX_VALUE)
|
||||
private String seoTitleIt;
|
||||
|
||||
@Column(name = "seo_title_en", length = Integer.MAX_VALUE)
|
||||
private String seoTitleEn;
|
||||
|
||||
@Column(name = "seo_title_de", length = Integer.MAX_VALUE)
|
||||
private String seoTitleDe;
|
||||
|
||||
@Column(name = "seo_title_fr", length = Integer.MAX_VALUE)
|
||||
private String seoTitleFr;
|
||||
|
||||
@Column(name = "seo_description", length = Integer.MAX_VALUE)
|
||||
private String seoDescription;
|
||||
|
||||
@Column(name = "seo_description_it", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionIt;
|
||||
|
||||
@Column(name = "seo_description_en", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionEn;
|
||||
|
||||
@Column(name = "seo_description_de", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionDe;
|
||||
|
||||
@Column(name = "seo_description_fr", length = Integer.MAX_VALUE)
|
||||
private String seoDescriptionFr;
|
||||
|
||||
@Column(name = "og_title", length = Integer.MAX_VALUE)
|
||||
private String ogTitle;
|
||||
|
||||
@Column(name = "og_description", length = Integer.MAX_VALUE)
|
||||
private String ogDescription;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "indexable", nullable = false)
|
||||
private Boolean indexable;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "is_featured", nullable = false)
|
||||
private Boolean isFeatured;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
@ColumnDefault("0")
|
||||
@Column(name = "sort_order", nullable = false)
|
||||
private Integer sortOrder;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
OffsetDateTime now = OffsetDateTime.now();
|
||||
if (createdAt == null) {
|
||||
createdAt = now;
|
||||
}
|
||||
if (updatedAt == null) {
|
||||
updatedAt = now;
|
||||
}
|
||||
if (indexable == null) {
|
||||
indexable = true;
|
||||
}
|
||||
if (isFeatured == null) {
|
||||
isFeatured = false;
|
||||
}
|
||||
if (isActive == null) {
|
||||
isActive = true;
|
||||
}
|
||||
if (sortOrder == null) {
|
||||
sortOrder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
private void onUpdate() {
|
||||
updatedAt = OffsetDateTime.now();
|
||||
if (indexable == null) {
|
||||
indexable = true;
|
||||
}
|
||||
if (isFeatured == null) {
|
||||
isFeatured = false;
|
||||
}
|
||||
if (isActive == null) {
|
||||
isActive = true;
|
||||
}
|
||||
if (sortOrder == null) {
|
||||
sortOrder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public ShopCategory getCategory() {
|
||||
return category;
|
||||
}
|
||||
|
||||
public void setCategory(ShopCategory category) {
|
||||
this.category = category;
|
||||
}
|
||||
|
||||
public String getSlug() {
|
||||
return slug;
|
||||
}
|
||||
|
||||
public void setSlug(String slug) {
|
||||
this.slug = slug;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getNameIt() {
|
||||
return nameIt;
|
||||
}
|
||||
|
||||
public void setNameIt(String nameIt) {
|
||||
this.nameIt = nameIt;
|
||||
}
|
||||
|
||||
public String getNameEn() {
|
||||
return nameEn;
|
||||
}
|
||||
|
||||
public void setNameEn(String nameEn) {
|
||||
this.nameEn = nameEn;
|
||||
}
|
||||
|
||||
public String getNameDe() {
|
||||
return nameDe;
|
||||
}
|
||||
|
||||
public void setNameDe(String nameDe) {
|
||||
this.nameDe = nameDe;
|
||||
}
|
||||
|
||||
public String getNameFr() {
|
||||
return nameFr;
|
||||
}
|
||||
|
||||
public void setNameFr(String nameFr) {
|
||||
this.nameFr = nameFr;
|
||||
}
|
||||
|
||||
public String getExcerpt() {
|
||||
return excerpt;
|
||||
}
|
||||
|
||||
public void setExcerpt(String excerpt) {
|
||||
this.excerpt = excerpt;
|
||||
}
|
||||
|
||||
public String getExcerptIt() {
|
||||
return excerptIt;
|
||||
}
|
||||
|
||||
public void setExcerptIt(String excerptIt) {
|
||||
this.excerptIt = excerptIt;
|
||||
}
|
||||
|
||||
public String getExcerptEn() {
|
||||
return excerptEn;
|
||||
}
|
||||
|
||||
public void setExcerptEn(String excerptEn) {
|
||||
this.excerptEn = excerptEn;
|
||||
}
|
||||
|
||||
public String getExcerptDe() {
|
||||
return excerptDe;
|
||||
}
|
||||
|
||||
public void setExcerptDe(String excerptDe) {
|
||||
this.excerptDe = excerptDe;
|
||||
}
|
||||
|
||||
public String getExcerptFr() {
|
||||
return excerptFr;
|
||||
}
|
||||
|
||||
public void setExcerptFr(String excerptFr) {
|
||||
this.excerptFr = excerptFr;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescriptionIt() {
|
||||
return descriptionIt;
|
||||
}
|
||||
|
||||
public void setDescriptionIt(String descriptionIt) {
|
||||
this.descriptionIt = descriptionIt;
|
||||
}
|
||||
|
||||
public String getDescriptionEn() {
|
||||
return descriptionEn;
|
||||
}
|
||||
|
||||
public void setDescriptionEn(String descriptionEn) {
|
||||
this.descriptionEn = descriptionEn;
|
||||
}
|
||||
|
||||
public String getDescriptionDe() {
|
||||
return descriptionDe;
|
||||
}
|
||||
|
||||
public void setDescriptionDe(String descriptionDe) {
|
||||
this.descriptionDe = descriptionDe;
|
||||
}
|
||||
|
||||
public String getDescriptionFr() {
|
||||
return descriptionFr;
|
||||
}
|
||||
|
||||
public void setDescriptionFr(String descriptionFr) {
|
||||
this.descriptionFr = descriptionFr;
|
||||
}
|
||||
|
||||
public String getSeoTitle() {
|
||||
return seoTitle;
|
||||
}
|
||||
|
||||
public void setSeoTitle(String seoTitle) {
|
||||
this.seoTitle = seoTitle;
|
||||
}
|
||||
|
||||
public String getSeoDescription() {
|
||||
return seoDescription;
|
||||
}
|
||||
|
||||
public void setSeoDescription(String seoDescription) {
|
||||
this.seoDescription = seoDescription;
|
||||
}
|
||||
|
||||
public String getSeoTitleIt() {
|
||||
return seoTitleIt;
|
||||
}
|
||||
|
||||
public void setSeoTitleIt(String seoTitleIt) {
|
||||
this.seoTitleIt = seoTitleIt;
|
||||
}
|
||||
|
||||
public String getSeoTitleEn() {
|
||||
return seoTitleEn;
|
||||
}
|
||||
|
||||
public void setSeoTitleEn(String seoTitleEn) {
|
||||
this.seoTitleEn = seoTitleEn;
|
||||
}
|
||||
|
||||
public String getSeoTitleDe() {
|
||||
return seoTitleDe;
|
||||
}
|
||||
|
||||
public void setSeoTitleDe(String seoTitleDe) {
|
||||
this.seoTitleDe = seoTitleDe;
|
||||
}
|
||||
|
||||
public String getSeoTitleFr() {
|
||||
return seoTitleFr;
|
||||
}
|
||||
|
||||
public void setSeoTitleFr(String seoTitleFr) {
|
||||
this.seoTitleFr = seoTitleFr;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionIt() {
|
||||
return seoDescriptionIt;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionIt(String seoDescriptionIt) {
|
||||
this.seoDescriptionIt = seoDescriptionIt;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionEn() {
|
||||
return seoDescriptionEn;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionEn(String seoDescriptionEn) {
|
||||
this.seoDescriptionEn = seoDescriptionEn;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionDe() {
|
||||
return seoDescriptionDe;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionDe(String seoDescriptionDe) {
|
||||
this.seoDescriptionDe = seoDescriptionDe;
|
||||
}
|
||||
|
||||
public String getSeoDescriptionFr() {
|
||||
return seoDescriptionFr;
|
||||
}
|
||||
|
||||
public void setSeoDescriptionFr(String seoDescriptionFr) {
|
||||
this.seoDescriptionFr = seoDescriptionFr;
|
||||
}
|
||||
|
||||
public String getOgTitle() {
|
||||
return ogTitle;
|
||||
}
|
||||
|
||||
public void setOgTitle(String ogTitle) {
|
||||
this.ogTitle = ogTitle;
|
||||
}
|
||||
|
||||
public String getOgDescription() {
|
||||
return ogDescription;
|
||||
}
|
||||
|
||||
public void setOgDescription(String ogDescription) {
|
||||
this.ogDescription = ogDescription;
|
||||
}
|
||||
|
||||
public Boolean getIndexable() {
|
||||
return indexable;
|
||||
}
|
||||
|
||||
public void setIndexable(Boolean indexable) {
|
||||
this.indexable = indexable;
|
||||
}
|
||||
|
||||
public Boolean getIsFeatured() {
|
||||
return isFeatured;
|
||||
}
|
||||
|
||||
public void setIsFeatured(Boolean featured) {
|
||||
isFeatured = featured;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getUpdatedAt() {
|
||||
return updatedAt;
|
||||
}
|
||||
|
||||
public void setUpdatedAt(OffsetDateTime updatedAt) {
|
||||
this.updatedAt = updatedAt;
|
||||
}
|
||||
|
||||
public String getNameForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, name, nameIt, nameEn, nameDe, nameFr);
|
||||
}
|
||||
|
||||
public void setNameForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> nameIt = value;
|
||||
case "en" -> nameEn = value;
|
||||
case "de" -> nameDe = value;
|
||||
case "fr" -> nameFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getExcerptForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, excerpt, excerptIt, excerptEn, excerptDe, excerptFr);
|
||||
}
|
||||
|
||||
public void setExcerptForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> excerptIt = value;
|
||||
case "en" -> excerptEn = value;
|
||||
case "de" -> excerptDe = value;
|
||||
case "fr" -> excerptFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getDescriptionForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, description, descriptionIt, descriptionEn, descriptionDe, descriptionFr);
|
||||
}
|
||||
|
||||
public void setDescriptionForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> descriptionIt = value;
|
||||
case "en" -> descriptionEn = value;
|
||||
case "de" -> descriptionDe = value;
|
||||
case "fr" -> descriptionFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getSeoTitleForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, seoTitle, seoTitleIt, seoTitleEn, seoTitleDe, seoTitleFr);
|
||||
}
|
||||
|
||||
public void setSeoTitleForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> seoTitleIt = value;
|
||||
case "en" -> seoTitleEn = value;
|
||||
case "de" -> seoTitleDe = value;
|
||||
case "fr" -> seoTitleFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getSeoDescriptionForLanguage(String language) {
|
||||
return resolveLocalizedValue(language, seoDescription, seoDescriptionIt, seoDescriptionEn, seoDescriptionDe, seoDescriptionFr);
|
||||
}
|
||||
|
||||
public void setSeoDescriptionForLanguage(String language, String value) {
|
||||
switch (normalizeLanguage(language)) {
|
||||
case "it" -> seoDescriptionIt = value;
|
||||
case "en" -> seoDescriptionEn = value;
|
||||
case "de" -> seoDescriptionDe = value;
|
||||
case "fr" -> seoDescriptionFr = value;
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private String resolveLocalizedValue(String language,
|
||||
String fallback,
|
||||
String valueIt,
|
||||
String valueEn,
|
||||
String valueDe,
|
||||
String valueFr) {
|
||||
String normalizedLanguage = normalizeLanguage(language);
|
||||
String preferred = switch (normalizedLanguage) {
|
||||
case "it" -> valueIt;
|
||||
case "en" -> valueEn;
|
||||
case "de" -> valueDe;
|
||||
case "fr" -> valueFr;
|
||||
default -> null;
|
||||
};
|
||||
String resolved = firstNonBlank(preferred, fallback);
|
||||
if (resolved != null) {
|
||||
return resolved;
|
||||
}
|
||||
return firstNonBlank(valueIt, valueEn, valueDe, valueFr);
|
||||
}
|
||||
|
||||
private String normalizeLanguage(String language) {
|
||||
if (language == null) {
|
||||
return "";
|
||||
}
|
||||
String normalized = language.trim().toLowerCase();
|
||||
int separatorIndex = normalized.indexOf('-');
|
||||
if (separatorIndex > 0) {
|
||||
normalized = normalized.substring(0, separatorIndex);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String firstNonBlank(String... values) {
|
||||
if (values == null) {
|
||||
return null;
|
||||
}
|
||||
for (String value : values) {
|
||||
if (value != null && !value.isBlank()) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,189 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.PrePersist;
|
||||
import jakarta.persistence.PreUpdate;
|
||||
import jakarta.persistence.Table;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "shop_product_model_asset", indexes = {
|
||||
@Index(name = "ix_shop_product_model_asset_product", columnList = "shop_product_id")
|
||||
})
|
||||
public class ShopProductModelAsset {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "shop_product_model_asset_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "shop_product_id", nullable = false, unique = true)
|
||||
private ShopProduct product;
|
||||
|
||||
@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 = "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;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
OffsetDateTime now = OffsetDateTime.now();
|
||||
if (createdAt == null) {
|
||||
createdAt = now;
|
||||
}
|
||||
if (updatedAt == null) {
|
||||
updatedAt = now;
|
||||
}
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
private void onUpdate() {
|
||||
updatedAt = OffsetDateTime.now();
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public ShopProduct getProduct() {
|
||||
return product;
|
||||
}
|
||||
|
||||
public void setProduct(ShopProduct product) {
|
||||
this.product = product;
|
||||
}
|
||||
|
||||
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 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 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,318 +0,0 @@
|
||||
package com.printcalculator.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Index;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.PrePersist;
|
||||
import jakarta.persistence.PreUpdate;
|
||||
import jakarta.persistence.Table;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "shop_product_variant", indexes = {
|
||||
@Index(name = "ix_shop_product_variant_product_active_sort", columnList = "shop_product_id, is_active, sort_order"),
|
||||
@Index(name = "ix_shop_product_variant_sku", columnList = "sku")
|
||||
})
|
||||
public class ShopProductVariant {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@Column(name = "shop_product_variant_id", nullable = false)
|
||||
private UUID id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "shop_product_id", nullable = false)
|
||||
private ShopProduct product;
|
||||
|
||||
@Column(name = "sku", unique = true, length = Integer.MAX_VALUE)
|
||||
private String sku;
|
||||
|
||||
@Column(name = "variant_label", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String variantLabel;
|
||||
|
||||
@Column(name = "color_name", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String colorName;
|
||||
|
||||
@Column(name = "color_label_it", length = Integer.MAX_VALUE)
|
||||
private String colorLabelIt;
|
||||
|
||||
@Column(name = "color_label_en", length = Integer.MAX_VALUE)
|
||||
private String colorLabelEn;
|
||||
|
||||
@Column(name = "color_label_de", length = Integer.MAX_VALUE)
|
||||
private String colorLabelDe;
|
||||
|
||||
@Column(name = "color_label_fr", length = Integer.MAX_VALUE)
|
||||
private String colorLabelFr;
|
||||
|
||||
@Column(name = "color_hex", length = Integer.MAX_VALUE)
|
||||
private String colorHex;
|
||||
|
||||
@Column(name = "internal_material_code", nullable = false, length = Integer.MAX_VALUE)
|
||||
private String internalMaterialCode;
|
||||
|
||||
@ColumnDefault("0.00")
|
||||
@Column(name = "price_chf", nullable = false, precision = 12, scale = 2)
|
||||
private BigDecimal priceChf;
|
||||
|
||||
@ColumnDefault("false")
|
||||
@Column(name = "is_default", nullable = false)
|
||||
private Boolean isDefault;
|
||||
|
||||
@ColumnDefault("true")
|
||||
@Column(name = "is_active", nullable = false)
|
||||
private Boolean isActive;
|
||||
|
||||
@ColumnDefault("0")
|
||||
@Column(name = "sort_order", nullable = false)
|
||||
private Integer sortOrder;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_at", nullable = false)
|
||||
private OffsetDateTime createdAt;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
@PrePersist
|
||||
private void onCreate() {
|
||||
OffsetDateTime now = OffsetDateTime.now();
|
||||
if (createdAt == null) {
|
||||
createdAt = now;
|
||||
}
|
||||
if (updatedAt == null) {
|
||||
updatedAt = now;
|
||||
}
|
||||
if (priceChf == null) {
|
||||
priceChf = BigDecimal.ZERO;
|
||||
}
|
||||
if (isDefault == null) {
|
||||
isDefault = false;
|
||||
}
|
||||
if (isActive == null) {
|
||||
isActive = true;
|
||||
}
|
||||
if (sortOrder == null) {
|
||||
sortOrder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@PreUpdate
|
||||
private void onUpdate() {
|
||||
updatedAt = OffsetDateTime.now();
|
||||
if (priceChf == null) {
|
||||
priceChf = BigDecimal.ZERO;
|
||||
}
|
||||
if (isDefault == null) {
|
||||
isDefault = false;
|
||||
}
|
||||
if (isActive == null) {
|
||||
isActive = true;
|
||||
}
|
||||
if (sortOrder == null) {
|
||||
sortOrder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public ShopProduct getProduct() {
|
||||
return product;
|
||||
}
|
||||
|
||||
public void setProduct(ShopProduct product) {
|
||||
this.product = product;
|
||||
}
|
||||
|
||||
public String getSku() {
|
||||
return sku;
|
||||
}
|
||||
|
||||
public void setSku(String sku) {
|
||||
this.sku = sku;
|
||||
}
|
||||
|
||||
public String getVariantLabel() {
|
||||
return variantLabel;
|
||||
}
|
||||
|
||||
public void setVariantLabel(String variantLabel) {
|
||||
this.variantLabel = variantLabel;
|
||||
}
|
||||
|
||||
public String getColorName() {
|
||||
return colorName;
|
||||
}
|
||||
|
||||
public void setColorName(String colorName) {
|
||||
this.colorName = colorName;
|
||||
}
|
||||
|
||||
public String getColorLabelIt() {
|
||||
return colorLabelIt;
|
||||
}
|
||||
|
||||
public void setColorLabelIt(String colorLabelIt) {
|
||||
this.colorLabelIt = colorLabelIt;
|
||||
}
|
||||
|
||||
public String getColorLabelEn() {
|
||||
return colorLabelEn;
|
||||
}
|
||||
|
||||
public void setColorLabelEn(String colorLabelEn) {
|
||||
this.colorLabelEn = colorLabelEn;
|
||||
}
|
||||
|
||||
public String getColorLabelDe() {
|
||||
return colorLabelDe;
|
||||
}
|
||||
|
||||
public void setColorLabelDe(String colorLabelDe) {
|
||||
this.colorLabelDe = colorLabelDe;
|
||||
}
|
||||
|
||||
public String getColorLabelFr() {
|
||||
return colorLabelFr;
|
||||
}
|
||||
|
||||
public void setColorLabelFr(String colorLabelFr) {
|
||||
this.colorLabelFr = colorLabelFr;
|
||||
}
|
||||
|
||||
public String getColorHex() {
|
||||
return colorHex;
|
||||
}
|
||||
|
||||
public void setColorHex(String colorHex) {
|
||||
this.colorHex = colorHex;
|
||||
}
|
||||
|
||||
public String getInternalMaterialCode() {
|
||||
return internalMaterialCode;
|
||||
}
|
||||
|
||||
public void setInternalMaterialCode(String internalMaterialCode) {
|
||||
this.internalMaterialCode = internalMaterialCode;
|
||||
}
|
||||
|
||||
public BigDecimal getPriceChf() {
|
||||
return priceChf;
|
||||
}
|
||||
|
||||
public void setPriceChf(BigDecimal priceChf) {
|
||||
this.priceChf = priceChf;
|
||||
}
|
||||
|
||||
public Boolean getIsDefault() {
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
public void setIsDefault(Boolean aDefault) {
|
||||
isDefault = aDefault;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean active) {
|
||||
isActive = active;
|
||||
}
|
||||
|
||||
public Integer getSortOrder() {
|
||||
return sortOrder;
|
||||
}
|
||||
|
||||
public void setSortOrder(Integer sortOrder) {
|
||||
this.sortOrder = sortOrder;
|
||||
}
|
||||
|
||||
public OffsetDateTime getCreatedAt() {
|
||||
return createdAt;
|
||||
}
|
||||
|
||||
public void setCreatedAt(OffsetDateTime createdAt) {
|
||||
this.createdAt = createdAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getUpdatedAt() {
|
||||
return updatedAt;
|
||||
}
|
||||
|
||||
public void setUpdatedAt(OffsetDateTime updatedAt) {
|
||||
this.updatedAt = updatedAt;
|
||||
}
|
||||
|
||||
public String getColorLabelForLanguage(String language) {
|
||||
return resolveLocalizedValue(
|
||||
language,
|
||||
colorName,
|
||||
colorLabelIt,
|
||||
colorLabelEn,
|
||||
colorLabelDe,
|
||||
colorLabelFr
|
||||
);
|
||||
}
|
||||
|
||||
private String resolveLocalizedValue(String language,
|
||||
String fallback,
|
||||
String valueIt,
|
||||
String valueEn,
|
||||
String valueDe,
|
||||
String valueFr) {
|
||||
String normalizedLanguage = normalizeLanguage(language);
|
||||
String preferred = switch (normalizedLanguage) {
|
||||
case "it" -> valueIt;
|
||||
case "en" -> valueEn;
|
||||
case "de" -> valueDe;
|
||||
case "fr" -> valueFr;
|
||||
default -> null;
|
||||
};
|
||||
String resolved = firstNonBlank(preferred, fallback);
|
||||
if (resolved != null) {
|
||||
return resolved;
|
||||
}
|
||||
return firstNonBlank(valueIt, valueEn, valueDe, valueFr);
|
||||
}
|
||||
|
||||
private String normalizeLanguage(String language) {
|
||||
if (language == null) {
|
||||
return "";
|
||||
}
|
||||
String normalized = language.trim().toLowerCase();
|
||||
int separatorIndex = normalized.indexOf('-');
|
||||
if (separatorIndex > 0) {
|
||||
normalized = normalized.substring(0, separatorIndex);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private String firstNonBlank(String... values) {
|
||||
if (values == null) {
|
||||
return null;
|
||||
}
|
||||
for (String value : values) {
|
||||
if (value != null && !value.isBlank()) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -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,16 +0,0 @@
|
||||
package com.printcalculator.event;
|
||||
|
||||
import com.printcalculator.entity.Order;
|
||||
import lombok.Getter;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
|
||||
@Getter
|
||||
public class OrderShippedEvent extends ApplicationEvent {
|
||||
|
||||
private final Order order;
|
||||
|
||||
public OrderShippedEvent(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,587 +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.OrderShippedEvent;
|
||||
import com.printcalculator.event.PaymentConfirmedEvent;
|
||||
import com.printcalculator.event.PaymentReportedEvent;
|
||||
import com.printcalculator.repository.OrderItemRepository;
|
||||
import com.printcalculator.service.payment.InvoicePdfRenderingService;
|
||||
import com.printcalculator.service.payment.QrBillService;
|
||||
import com.printcalculator.service.storage.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);
|
||||
}
|
||||
}
|
||||
|
||||
@Async
|
||||
@EventListener
|
||||
public void handleOrderShippedEvent(OrderShippedEvent event) {
|
||||
Order order = event.getOrder();
|
||||
log.info("Processing OrderShippedEvent for order id: {}", order.getId());
|
||||
|
||||
try {
|
||||
sendOrderShippedEmail(order);
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to send order shipped 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 sendOrderShippedEmail(Order order) {
|
||||
String language = resolveLanguage(order.getPreferredLanguage());
|
||||
String orderNumber = getDisplayOrderNumber(order);
|
||||
|
||||
Map<String, Object> templateData = buildBaseTemplateData(order, language);
|
||||
String subject = applyOrderShippedTexts(templateData, language, orderNumber);
|
||||
|
||||
emailNotificationService.sendEmail(
|
||||
order.getCustomer().getEmail(),
|
||||
subject,
|
||||
"order-shipped",
|
||||
templateData
|
||||
);
|
||||
}
|
||||
|
||||
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("logoUrl", buildLogoUrl());
|
||||
templateData.put("currentYear", Year.now().getValue());
|
||||
return templateData;
|
||||
}
|
||||
|
||||
private String buildLogoUrl() {
|
||||
return frontendBaseUrl.replaceAll("/+$", "") + "/assets/images/brand-logo-yellow.svg";
|
||||
}
|
||||
|
||||
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 applyOrderShippedTexts(Map<String, Object> templateData, String language, String orderNumber) {
|
||||
return switch (language) {
|
||||
case "en" -> {
|
||||
templateData.put("emailTitle", "Order Shipped");
|
||||
templateData.put("headlineText", "Your order #" + orderNumber + " has been shipped");
|
||||
templateData.put("greetingText", "Hi " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Good news: your package has left our workshop and is on its way.");
|
||||
templateData.put("statusText", "Current status: Shipped.");
|
||||
templateData.put("orderDetailsCtaText", "View order status");
|
||||
templateData.put("supportText", "If you need assistance, reply to this email.");
|
||||
templateData.put("footerText", "Automated message from 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Order number");
|
||||
templateData.put("labelTotal", "Total");
|
||||
yield "Your order has been shipped (Order #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
case "de" -> {
|
||||
templateData.put("emailTitle", "Bestellung versandt");
|
||||
templateData.put("headlineText", "Ihre Bestellung #" + orderNumber + " wurde versandt");
|
||||
templateData.put("greetingText", "Hallo " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Gute Nachricht: Ihr Paket hat unsere Werkstatt verlassen und ist unterwegs.");
|
||||
templateData.put("statusText", "Aktueller Status: Versandt.");
|
||||
templateData.put("orderDetailsCtaText", "Bestellstatus ansehen");
|
||||
templateData.put("supportText", "Wenn Sie Hilfe benoetigen, antworten Sie auf diese E-Mail.");
|
||||
templateData.put("footerText", "Automatische Nachricht von 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Bestellnummer");
|
||||
templateData.put("labelTotal", "Gesamtbetrag");
|
||||
yield "Ihre Bestellung wurde versandt (Bestellung #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
case "fr" -> {
|
||||
templateData.put("emailTitle", "Commande expediee");
|
||||
templateData.put("headlineText", "Votre commande #" + orderNumber + " a ete expediee");
|
||||
templateData.put("greetingText", "Bonjour " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Bonne nouvelle: votre colis a quitte notre atelier et est en route.");
|
||||
templateData.put("statusText", "Statut actuel: Expediee.");
|
||||
templateData.put("orderDetailsCtaText", "Voir le statut de la commande");
|
||||
templateData.put("supportText", "Si vous avez besoin d'aide, repondez a cet email.");
|
||||
templateData.put("footerText", "Message automatique de 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Numero de commande");
|
||||
templateData.put("labelTotal", "Total");
|
||||
yield "Votre commande a ete expediee (Commande #" + orderNumber + ") - 3D-Fab";
|
||||
}
|
||||
default -> {
|
||||
templateData.put("emailTitle", "Ordine spedito");
|
||||
templateData.put("headlineText", "Il tuo ordine #" + orderNumber + " e' stato spedito");
|
||||
templateData.put("greetingText", "Ciao " + templateData.get("customerName") + ",");
|
||||
templateData.put("introText", "Buone notizie: il tuo pacco e' partito dal nostro laboratorio ed e' in viaggio.");
|
||||
templateData.put("statusText", "Stato attuale: spedito.");
|
||||
templateData.put("orderDetailsCtaText", "Visualizza stato ordine");
|
||||
templateData.put("supportText", "Se hai bisogno di assistenza, rispondi a questa email.");
|
||||
templateData.put("footerText", "Messaggio automatico di 3D-Fab.");
|
||||
templateData.put("labelOrderNumber", "Numero ordine");
|
||||
templateData.put("labelTotal", "Totale");
|
||||
yield "Il tuo ordine e' stato spedito (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;
|
||||
};
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user