diff --git a/.forgejo/workflows/buildAndTest.yml b/.forgejo/workflows/buildAndTest.yml
index ea58d2fef..b9e6f17b2 100644
--- a/.forgejo/workflows/buildAndTest.yml
+++ b/.forgejo/workflows/buildAndTest.yml
@@ -31,6 +31,7 @@ jobs:
steps:
- name: Clone yavsc
run: |
+ set -e
cd /src
git clone https://forgejo.pschneider.fr/notazof/yavsc.git _src
cd _src
@@ -40,12 +41,23 @@ jobs:
fi
git submodule update --init --recursive
echo "✅ Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
-
+ - name: Secret scan
+ run: |
+ echo "🔍 Scanning for secrets..."
+ cd /src/_src && dotnet tool restore && dotnet picket git --verbose --redact --exit-code 1 --log-opts -n10 \
+ - name: Build
+ run: |
+ echo "🏗️ Building the solution..."
+ cd /src/_src && dotnet build --verbosity normal
+ - name: Install SkiaSharp native dependencies
+ run: |
+ echo "📦 Installing libfontconfig/libfreetype for SkiaSharp (Avalonia.Headless)..."
+ apt-get update && apt-get install -y --no-install-recommends \
+ libfontconfig1 libfreetype6 libexpat1 zlib1g libbz2-1.0 libpng16-16 libbrotli1 \
+ && rm -rf /var/lib/apt/lists/*
- name: Test
run: |
echo "🚀 Lancement des tests..."
cd /src/_src && dotnet test \
--verbosity normal \
- --filter="Category!=Platform-Android" \
- --logger "xunit;LogFileName=test-results.xml" \
- && echo "✅ Success !" || echo "❌ Fail ($?)!"
+ --filter="Category!=Platform-Android"
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index a72f92bd6..911fc831d 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -175,6 +175,12 @@ jobs:
run: |
cd /src/_src
dotnet restore
+ - name: Test
+ run: |
+ cd /src/_src && dotnet test \
+ --verbosity normal \
+ --filter="Category!=Platform-Android" \
+ --logger "xunit;LogFileName=test-results.xml"
- name: Build de PostIt.Android ARM64
run: |
@@ -200,6 +206,7 @@ jobs:
RELEASE_BODY: ${{ env.RELEASE_BODY }}
IS_PRERELEASE: ${{ env.IS_PRERELEASE }}
run: |
+ set -e
if [[ -z "$TAG" ]]; then
echo "::error::No tag resolved for the API call."
exit 1
diff --git a/.gitignore b/.gitignore
index b7813f604..056cf69d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ appsettings-*.*.json
generated/
*.tmp
+tmp/
DataDir/
*.tests.trx
diff --git a/.gitleaksignore b/.gitleaksignore
new file mode 100644
index 000000000..056cf69d2
--- /dev/null
+++ b/.gitleaksignore
@@ -0,0 +1,45 @@
+# Exclure uniquement les dossiers de sortie de compilation
+bin/
+obj/
+src/*/bin/
+src/*/obj/
+test/*/bin/
+test/*/obj/
+
+# Toolchain front (Node / esbuild)
+node_modules/
+build/
+package-lock.json
+
+# Exclure les caches lourds
+.git/
+.vs/
+
+.env
+
+.*.env
+
+*.csproj.lscache
+data/
+appsettings.*.json
+appsettings-*.*.json
+
+# Exception: the Testing-environment override for Yavsc.Org is a tracked
+# configuration source, not a secrets file. TestWebApplicationFactory
+# (Yavsc.Org.Tests) flips ASPNETCORE_ENVIRONMENT to "Testing" so
+# AddConfiguration("org") in Program.Main loads this file as the
+# last in the chain (it is optional). It overrides the connection
+# string and SMTP section for the in-memory test host and contains
+# no production secrets.
+!src/Yavsc.Org/appsettings-org.Testing.json
+
+generated/
+*.tmp
+tmp/
+DataDir/
+
+*.tests.trx
+*.tests.html
+
+*.log
+
diff --git a/.vscode/launch.json b/.vscode/launch.json
index dc8d3c68d..d5088f01d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,6 +4,22 @@
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
+ {
+ "name": "PostIt Desktop",
+ "type": "dotnet",
+ "request": "launch",
+ "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj"
+ },
+ {
+ "name": "PostIt Desktop local",
+ "type": "coreclr",
+ "request": "launch",
+ "program": "${workspaceFolder}/src/PostIt/PostIt.Desktop/bin/Debug/net10.0/PostIt.Desktop.dll",
+ "env": {
+ "POSTIT_SETTINGS_JSON": "/home/paul/Workspace/yavsc/src/PostIt/PostIt/postit-settings.json"
+ },
+ "preLaunchTask": "dotnet: build-postit-desktop"
+ },
{
"name": "Android Debug",
"type": "mono",
@@ -20,10 +36,10 @@
"port": 55555
},
{
- "name": "API",
+ "name": "Yavsc API",
"type": "dotnet",
"request": "launch",
- "projectPath": "${workspaceFolder}/src/Api/Api.csproj"
+ "projectPath": "${workspaceFolder}/src/Yavsc.Api/Yavsc.Api.csproj"
},
{
"name": "Yavsc Org",
@@ -37,12 +53,7 @@
"request": "launch",
"projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
},
- {
- "name": "PostIt Desktop",
- "type": "dotnet",
- "request": "launch",
- "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
- },
+
{
"name": "Test PostIt.Android launch (Xamarin.UITest)",
"type": "coreclr",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index fd46437ac..71384cd8c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -7,7 +7,7 @@
"fileLocation": ["relative", "${workspaceFolder}"],
"source": "dotnet",
"pattern": {
- "regexp": "^\\s+(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.+): (.*)$",
+ "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.*)$",
"file": 1,
"line": 2,
"column": 3,
@@ -47,7 +47,10 @@
"group": "build",
"isBuildCommand": true,
"isTestCommand": false,
- "isBackground": true
+ "isBackground": true,
+ "options": {
+ "cwd": "${workspaceFolder}"
+ }
},
{
"label": "test blogs backend",
@@ -63,6 +66,28 @@
"isDefault": false
}
},
+ {
+ "label": "test api backend (npgsql)",
+ "type": "process",
+ "problemMatcher": "$msCompile",
+ "command": "dotnet",
+ "args": [
+ "test",
+ "Yavsc.Api.Test.csproj",
+ "-v",
+ "minimal"
+ ],
+ "options": {
+ "cwd": "src/Yavsc.Api.Test",
+ "env": {
+ "YAVSC_API_TEST_DB_PROVIDER": "npgsql"
+ }
+ },
+ "group": {
+ "kind": "test",
+ "isDefault": false
+ }
+ },
{
"label": "build-webapi",
"type": "process",
@@ -76,6 +101,21 @@
"kind": "build"
},
"isBackground": true
+ },
+ {
+ "label": "dotnet: build-postit-desktop",
+ "type": "process",
+ "isBuildCommand": true,
+ "isTestCommand": false,
+ "isBackground": true,
+ "command": "dotnet",
+ "args": ["build", "/property:GenerateFullPaths=true"],
+ "options": {
+ "cwd": "src/PostIt/PostIt.Desktop"
+ },
+ "group": {
+ "kind": "build"
+ }
}
]
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec42b81bf..111c1491a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,116 @@
# Changelog
+## [1.0.8-rc14] - unstable
+
+### Added
+
+* [PostIt] Ajout d'un `BillingQueryDetailsPageViewModel` et de sa page associee pour afficher le detail d'une commande billing depuis l'historique.
+* [PostIt] Ajout d'un mode detail avec section metier (statut, date, description, motif, infos) et section technique repliable (code, client, provision, lieu, prestations).
+* [PostIt] Ajout d'un badge de statut enrichi (couleur + pictogramme) sur le detail d'une commande pour visualiser l'etat en un coup d'oeil.
+* [PostIt] Ajout d'un bloc d'actions rapide en tete du detail (`Retour`, `Ouvrir en edition`) pour eviter le scroll jusqu'au bas de page.
+* [PostIt] Ajout d'un style monospace sur les metadonnees techniques (code billing, client, provision, lieu, prestations) pour faciliter la lecture des identifiants et valeurs brutes.
+
+### Changed
+
+* [PostIt] Le bouton d'ouverture depuis la liste billing ouvre maintenant une page de detail dediee avant l'eventuelle edition.
+* [PostIt] Amelioration UX des pages billing: badges de statut colores, actions remontees en haut de page, et typographie monospace sur les metadonnees techniques.
+
+### Fixed
+
+* [Yavsc.Api] Correction d'un 500 sur le refresh du catalogue d'activites lorsque `Activity.Description` est `NULL` en base (nullabilite explicite + projection null-safe + gardes sur codes vides).
+* [Yavsc.Api] Correction des erreurs 400/500 sur les routes billing (`Rdv`, `Brush`, `MBrush`) en imposant `ClientId` depuis l'utilisateur authentifie et en ignorant les champs server-owned lors de la validation modele.
+* [Yavsc.Api] Correction du `PUT /api/v1/billing/Rdv/{id}`: mise a jour controlee de l'entite existante (et non remplacement brut du graphe JSON), ce qui supprime les `BadRequest` parasites.
+* [Yavsc.Api] Correction PostgreSQL `timestamptz` sur RDV: normalisation UTC de `EventDate` sur `POST/PUT /api/v1/billing/Rdv` pour eviter l'erreur `Cannot write DateTime with Kind=Local`.
+* [Yavsc.Api] Correction du flux FrontOffice accept/reject de query: sauvegarde avec contexte utilisateur et fallback d'injection pour `IBillingService` afin d'eviter les erreurs serveur en environnement de test.
+* [Yavsc.Blogs] Correction des `BadRequest` sur `POST/PUT /api/v1/blogspot` avec payload JSON (PostIt): les proprietes de navigation/serveur (`Author`, `Tags`, `Comments`, audit) ne bloquent plus la validation.
+* [Yavsc.Org] Correction du flux MVC de creation de commentaire: `SaveChangesAsync(userId)` est utilise pour renseigner les champs d'audit requis (`UserCreated`/`UserModified`).
+* [Yavsc.Api.Test] Stabilisation des fixtures de seed billing: remplissage des metadonnees d'audit (`UserCreated`, `UserModified`, dates) pour eviter les echecs SQLite `NOT NULL`.
+
+## [1.0.8-rc13] - unstable
+
+### Added
+
+* [PostIt] Integration d'un selecteur de lieu RDV base sur Mapsui (carte interactive dans le formulaire `Rdv`).
+* [PostIt] Ajout d'un marqueur de position et d'une action de recentrage sur la carte RDV.
+* [PostIt] Ajout d'un service de reverse geocoding pour suggerer une adresse a partir des coordonnees carte.
+* [PostIt] Cache et debounce des resolutions d'adresse RDV pour limiter les appels reseau et lisser l'UX.
+* [PostIt.Tests] Nouvelles non-regressions sur le panneau d'adresse suggeree RDV et le comportement de la carte.
+* [Yavsc.Abstract] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable.
+* [Yavsc.Server] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable.
+
+### Changed
+
+* [PostIt] Generalisation de la barre de statut d'action (severite explicite) sur pages principales, dialogues et formulaires billing.
+* [PostIt] Harmonisation des messages de statut utilisateur en francais.
+* [PostIt] Renforcement des gardes de navigation dans les flux de gestion des membres de cercle.
+* [PostIt] Le flux RDV conserve l'adresse saisie manuellement et propose l'adresse resolue comme suggestion explicite.
+* [PostIt] Le flux de geolocalisation RDV tolere les positions proches dans le cache de suggestion d'adresse.
+
+### Fixed
+
+* [PostIt.Desktop] Correction d'un crash au demarrage OIDC (`No authority specified`) via durcissement des valeurs par defaut de configuration d'authentification.
+* [PostIt] Correction de la persistance des settings: l'etat runtime de statut n'est plus serialize dans le JSON utilisateur.
+* [PostIt.Tests] Ajout d'un verrou de non-regression sur le premier chargement des settings.
+* [PostIt] Correction du binding de la date RDV: `DatePicker.SelectedDate` est aligne sur un proxy `DateTimeOffset?` (`EventDateSelection`).
+
+## [1.0.8-rc12] - unstable
+
+### Added
+
+* [PostIt] Nouveau helper d'image `ImageHelper` pour charger des bitmaps depuis les ressources et depuis le web.
+* [PostIt] Affichage de l'avatar XS dans la liste des performers d'activites, avec fallback visuel (initiale utilisateur).
+* [PostIt.Tests] Nouveaux tests autour des URLs avatar et de la source d'autorite.
+* [contrib] Ajout d'un `README.md` utilitaire pour les symboles/icones.
+
+### Changed
+
+* [PostIt] Les avatars ne sont plus relies en string sur `Image.Source`: ils sont telecharges et lies en `Bitmap`.
+* [Yavsc.Api.Client] `ActivityApiClient` accepte une base d'avatar dediee et construit les URLs avatar depuis l'autorite d'identification.
+* [PostIt] Les clients Activites/Billing utilisent maintenant `ApiUrl` en lecture dynamique: un changement via Parametres prend effet sans redemarrer l'application (apres sauvegarde et rafraichissement de la page).
+* [PostIt] Le header de `MainPage` n'utilise plus `ScrollViewer`; remplacement par une barre de commandes basee sur `WrapPanel`.
+* [PostIt] Alignement de la navigation blogs: renommage `PushMainPageAsync` -> `PushBlogsPageAsync` et ajustement de `HomePageViewModel`.
+
+### Fixed
+
+* [PostIt.Android] Correction d'un 404 sur la page Activites au premier lancement: la configuration embarquee pointait `ApiUrl` vers le host Blogs au lieu de l'API metier.
+* [PostIt] Correction du bouton Sauver de la page Parametres: binding vers `SaveCommand` pour persister correctement `ApiUrl`/`BlogsApiUrl`.
+
+## [1.0.8-rc11] - unstable
+
+### Added
+
+nothing
+
+### Changed
+
+* [Yavsc.Api.Test] Mise a jour de `Microsoft.EntityFrameworkCore.Sqlite` vers `10.0.11` afin de supprimer l'alerte NU1903 liee a `SQLitePCLRaw.lib.e_sqlite3` 2.1.11.
+* [Yavsc.Org] Nettoyage de la configuration NuGet pour le restore: suppression du fichier local `Directory.Packages.props` au profit du fichier racine centralise.
+* [Yavsc.Org] Suppression de references de packages redondantes dans le projet, sans impact fonctionnel attendu.
+
+### Fixed
+
+* [Yavsc.Api.Test] Le restore n'emet plus le warning de vulnerabilite `NU1903` sur `SQLitePCLRaw.lib.e_sqlite3`.
+* [Yavsc.Org] Suppression d'une vulnerabilite de severite elevee sur AutoMapper apres publication et consommation de la nouvelle version candidate de `HigginsSoft.IdentityServer8`.
+
+## [1.0.8-rc10] - unstable
+
+### Added
+
+* [PostIt] Une page d'historique des commandes billing permet maintenant d'ouvrir une commande existante.
+* [PostIt] Une vue "Demandes en cours" en lecture seule est disponible pour le performer, filtrée sur les statuts actifs (Inserted, Accepted, InProgress).
+* [Yavsc.Org] Nouvelles entités `Country` et `PerformerCodeInputValidation` pour piloter la validation du code entreprise performer par pays.
+
+### Changed
+
+* [PostIt] La page détail billing se préremplit depuis une commande existante (Rdv, Brush, MBrush) et passe en mode mise à jour.
+* [Yavsc.Org] Le formulaire `Manage/SetActivity` inclut désormais le pays d'exercice (`fr`, `en`, `pt`) et applique la regex associée au champ `SIREN`.
+* [Yavsc.Org] La vérification externe du numéro d'entreprise est conservée uniquement pour le pays `fr`.
+
+### Fixed
+
+* [PostIt] Le flux historique n'est plus limité à une simple liste: l'action d'ouverture charge la commande cible puis navigue vers la page détail.
+* [Yavsc.Org] Le champ `SIREN` n'est plus validé avec une règle unique indépendante du pays d'exercice.
+
## [1.0.8-rc9] - unstable
### Added
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd408c5c1..8aa0567d3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,6 +49,19 @@ Les tests sont répartis en :
item « Tests d'intégration smoke par BC ».
- `src/PostIt.Tests/` — tests unitaires du client desktop PostIt.
+## Onboarding assiste par agents IA
+
+Pour accelerer la prise en main du depot avec Copilot/Plan/Explore :
+
+- Parcours pas-a-pas : [doc/onboarding-agents.md](./doc/onboarding-agents.md)
+- Playbook d'usage des agents : [doc/agent-playbook.md](./doc/agent-playbook.md)
+- Matrice intentions -> agent -> preuves : [doc/agent-intent-matrix.md](./doc/agent-intent-matrix.md)
+
+Regle minimale en contribution assistee par agent :
+- expliciter l'impact architecture,
+- justifier le niveau de tests execute,
+- documenter les risques residuels.
+
## Le CHANGELOG.md
Le `CHANGELOG.md` est un document de changement de version
@@ -61,8 +74,8 @@ et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
À noter : la **parité du numéro de patch** porte une signification de canal :
-- **patch pair** (ex. `1.0.0`, `1.0.2`) → **stable**
-- **patch impair** (ex. `1.0.1`, `1.0.3`) → **preview**
+- **patch pair** (ex. `1.0.0`, `1.0.2`) → **preview**
+- **patch impair** (ex. `1.0.1`, `1.0.3`) → **stable**
- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
Cette convention est partagée avec le dépôt
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 7505c8512..f1be93f91 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,15 +1,31 @@
true
+ 8.1.0-pazofrc007
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,14 +33,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/Makefile b/Makefile
index 08f0461d2..d99fe5e5e 100644
--- a/Makefile
+++ b/Makefile
@@ -48,70 +48,4 @@ docker-build:
docker-run:
docker run -d -p 5000:5000 --name yavsc yavsc
-# Crée une branche release/ depuis main, met à jour les
-# `` des .csproj via dotnet-gitversion, et la
-# pousse sur origin.
-#
-# Usage : make release V=1.0.7-rc1
-#
-# Pré-requis : être sur main, working tree clean. La cible
-# vérifie les deux et refuse sinon — elle ne fait JAMAIS
-# de checkout automatique, c'est à l'opérateur de s'être
-# positionné sur la bonne branche au préalable (sinon le
-# bump pourrait partir sur une branche tierce par accident).
-#
-# Notes :
-# - Le nom de branche vient de l'argument V (ex: 1.0.7-rc1
-# donne release/1.0.7-rc1). C'est une étiquette d'intention,
-# pas la version assembly.
-# - La version dans les .csproj vient de GitVersion qui la
-# calcule depuis l'historique git (tag le plus proche +
-# nombre de commits). C'est la version assembly réelle.
-# - L'ordre (fetch → branche → bump → push) garantit qu'on
-# part d'un main synchro et qu'on ne pollue pas main avec
-# le bump (qui vit sur la branche release).
-# - Fail-fast si la branche existe déjà en local ou sur origin.
-release:
- @if [ -z "$(V)" ]; then \
- echo "Usage: make release V="; \
- echo " V : version semver (ex. 1.0.7-rc1) — sert à nommer la branche."; \
- exit 1; \
- fi
- @if [ -n "$$(git status --porcelain)" ]; then \
- echo "Working tree sale, refus de créer une branche release."; \
- git status --short; \
- exit 1; \
- fi
- @BRANCH="release/$(V)"; \
- if git show-ref --verify --quiet "refs/heads/$$BRANCH"; then \
- echo "La branche $$BRANCH existe déjà en local."; \
- echo " Pour la supprimer : git branch -D $$BRANCH"; \
- exit 1; \
- fi; \
- if git ls-remote --exit-code --heads origin "$$BRANCH" >/dev/null 2>&1; then \
- echo "La branche $$BRANCH existe déjà sur origin."; \
- exit 1; \
- fi; \
- echo "==> Fetch + vérification synchro main"; \
- git fetch origin main; \
- if ! git merge-base --is-ancestor origin/main HEAD; then \
- echo "main a avancé plus loin que HEAD. Fais :"; \
- echo " git pull --ff-only origin main"; \
- exit 1; \
- fi; \
- echo "==> Création de $$BRANCH depuis main"; \
- git checkout -b "$$BRANCH"; \
- echo "==> dotnet-gitversion /updateprojectfiles"; \
- dotnet-gitversion /updateprojectfiles; \
- echo "==> Commit du bump"; \
- git add .; \
- if git diff --cached --quiet; then \
- echo "Pas de changements à committer (gitversion n'a produit aucune diff)."; \
- else \
- git commit -m "chore(release): bump version via gitversion for $(V)"; \
- fi; \
- echo "==> Push de $$BRANCH sur origin"; \
- git push -u origin "$$BRANCH"; \
- echo "==> Terminé. Branche $$BRANCH live sur origin."
-
-.PHONY: test release
+.PHONY: test install docker-image docker-build docker-run
diff --git a/README.md b/README.md
index b132f3f20..549348f4a 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,10 @@ sous [`doc/`](./doc/). Voir l'[index de la documentation](./doc/README.md)
pour le sommaire complet. La racine de l'architecture est
[Architecture.md](./doc/Architecture.md).
+Pour une prise en main guidee avec agents IA:
+- parcours onboarding: [doc/onboarding-agents.md](./doc/onboarding-agents.md)
+- playbook d'usage: [doc/agent-playbook.md](./doc/agent-playbook.md)
+
# Construction et déploiement
diff --git a/ROADMAP.md b/ROADMAP.md
index 4c00e629c..364b98bda 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -68,7 +68,7 @@ Trois principes non négociables traversent tous les jalons :
>
> Chaque jalon a un **critère de sortie** vérifiable.
-### Jalon 0 — Fondations techniques *(en cours)*
+### Jalon 0 — Fondations techniques
> Cible : pouvoir parler du domaine sans se battre avec le runtime.
@@ -81,7 +81,7 @@ Trois principes non négociables traversent tous les jalons :
---
-### Jalon 1 — Prestation signée de bout en bout
+### Jalon 1 — Prestation signée de bout en bout *(en cours)*
> Cible : un projet client/fournisseur aboutit à un **devis signé par les deux parties**, traçable, avec notifications.
diff --git a/contrib/.env-sample b/contrib/.env-sample
new file mode 100644
index 000000000..fb01ede43
--- /dev/null
+++ b/contrib/.env-sample
@@ -0,0 +1,24 @@
+# parametres de déploiement au Makefile
+
+POSTGRES_HOST=localhost
+POSTGRES_PORT=5432
+POSTGRES_DB=yavsc
+POSTGRES_USER=yavsc
+POSTGRES_PASSWORD=
+
+HTTP_HOST=localhost
+
+Org_PORT=83
+Blogs_PORT=85
+Api_PORT=87
+
+PostIt_CLIENT_ID=postit
+
+ASPNETCORE_Smtp__Host="mercure.pschneider.fr"
+ASPNETCORE_Smtp__Port=465
+ASPNETCORE_Smtp__SenderName="Paul Schneider"
+ASPNETCORE_Smtp__SenderEmail="paul@pschneider.fr"
+ASPNETCORE_Smtp__UserName="paul"
+ASPNETCORE_Smtp__Password=""
+
+DESTDIR=/srv/www/yavsc
diff --git a/contrib/Makefile b/contrib/Makefile
index 151045db0..4e4ef4df6 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,4 +1,4 @@
-APP_PROJECT_NAMES=Org Blogs
+APP_PROJECT_NAMES=Org Blogs Api
SLNDIR=..
include $(SLNDIR)/.env
@@ -9,9 +9,11 @@ generated/:
generated/yavscOrg.service:
generated/yavscBlogs.service:
+generated/yavscApi.service:
generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
@cat template.service | APP_NAME="$*" \
+ DESTDIR="$(DESTDIR)" \
HTTP_HOST="$(HTTP_HOST)" \
HTTP_PORT="$*_$(HTTP_PORT)" \
BASEAPPDIR="$(BASEAPPDIR)" \
@@ -33,11 +35,12 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
@echo Created service file: $@
-copy-services: copy-service-Org copy-service-Blogs
+copy-services: copy-service-Org copy-service-Blogs copy-service-Api
copy-service-Org: /etc/systemd/system/yavscOrg.service
copy-service-Blogs: /etc/systemd/system/yavscBlogs.service
+copy-service-Api: /etc/systemd/system/yavscApi.service
-copy-binaries: build_publish_Org build_publish_Blogs stop-services
+copy-binaries: build_publish_Org build_publish_Blogs build_publish_Api stop-services
@for project in $(APP_PROJECT_NAMES); \
do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \
echo "$${project} -> $${LCAPI}" ; \
@@ -60,6 +63,8 @@ copy-binaries: build_publish_Org build_publish_Blogs stop-services
build_publish_%: clean_publish_dir_%
@ASPNETCORE_ENV=$(CONFIGURATION) dotnet publish $(SLNDIR)/src/Yavsc.$*/Yavsc.$*.csproj
+build_publish: build_publish_Org build_publish_Blogs build_publish_Api
+
clean_publish_dir_%:
@rm -rf $(SLNDIR)/src/Yavsc.$*/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish
@@ -84,12 +89,21 @@ stop-services:
$(SLNDIR)/src/Yavsc.Org/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
$(SLNDIR)/src/Yavsc.Blogs/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
+$(SLNDIR)/src/Yavsc.Api/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
showConfig:
@echo CONFIGURATION: $(CONFIGURATION)
@echo BASEAPPDIR: $(BASEAPPDIR)
+showApiLogs:
+ @sudo journalctl -u yavscApi.service -S "2 min ago" | tee yavscApi.log
+
+showOrgLogs:
+ @sudo journalctl -u yavscOrg.service -S "2 min ago" | tee yavscOrg.log
+
+showBlogsLogs:
+ @sudo journalctl -u yavscBlogs.service -S "2 min ago" | tee yavscBlogs.log
+
clean:
@rm -rf generated
-.PHONY: build_publish mep showConfig copy-service-Org copy-service-Blogs reinstall clean
diff --git a/doc/README.md b/doc/README.md
index 912a2e562..fb9bea943 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -18,6 +18,9 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
| [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
| [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
| [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
+| [onboarding-agents.md](onboarding-agents.md) | Parcours pas-à-pas pour prise en main agents IA + architecture + tests |
+| [agent-playbook.md](agent-playbook.md) | Playbook d'usage de Copilot, Plan, Explore avec scénarios et anti-patterns |
+| [agent-intent-matrix.md](agent-intent-matrix.md) | Matrice intentions développeur -> agent -> preuves attendues |
## Roadmap & design exploration
diff --git a/doc/agent-intent-matrix.md b/doc/agent-intent-matrix.md
new file mode 100644
index 000000000..975cd7b79
--- /dev/null
+++ b/doc/agent-intent-matrix.md
@@ -0,0 +1,20 @@
+# Matrice intentions -> agent -> preuves
+
+Cette matrice aide a choisir rapidement l'agent adapte et a exiger
+une sortie verifiable.
+
+| Intention developpeur | Agent principal | Entrees minimales | Sortie minimale attendue | Verification |
+|---|---|---|---|---|
+| Comprendre un BC avant changement | Explore | BC cible, profondeur, contrainte de perimetre | Composants, points d'entree, tests relies, risques | Lire les fichiers cites + confirmer tests proposes |
+| Decomposer une tache transverse | Plan | Objectif, contraintes, definition of done | Etapes ordonnees, dependances, criteres de verif | Verifier que chaque etape a une preuve observable |
+| Implementer une modif locale | Copilot | Fichier cible, comportement attendu, conventions | Patch minimal, justification courte | Build/test du projet impacte |
+| Ajouter un test smoke | Copilot (+Explore) | Route/endpoint, projet de test cible | Test + commande cible | Execution test cible |
+| Corriger une regression | Plan + Copilot | Symptome, zone suspecte, test attendu | Fix + test NonRegression | Test rouge avant, vert apres |
+| Diagnostiquer flux PostIt/OIDC | Explore + Plan | Flux, symptome, plateforme | Carte du flux + hypotheses testables | Verification manuelle + tests existants |
+
+## Regles d'arbitrage
+
+- Si l'intention est "comprendre": commencer par Explore.
+- Si l'intention est "orchestrer": commencer par Plan.
+- Si l'intention est "produire": utiliser Copilot apres cadrage.
+- Si une sortie n'inclut pas de preuve, elle est incomplete.
diff --git a/doc/agent-playbook.md b/doc/agent-playbook.md
new file mode 100644
index 000000000..ecc14f1d2
--- /dev/null
+++ b/doc/agent-playbook.md
@@ -0,0 +1,101 @@
+# Playbook d'usage des agents IA (Yavsc)
+
+Ce playbook normalise l'usage de Copilot, Plan et Explore dans le depot.
+Il privilegie des sorties verifiables: fichiers, commandes tests, risques.
+
+## Quand utiliser quel agent
+
+- Plan: quand la tache est ambigue, transverse ou risquee.
+- Explore: quand il faut cartographier rapidement des zones du code.
+- Copilot: quand les specifications sont claires et localisees.
+
+## Prompt type (base)
+
+Utiliser ce squelette avant toute tache non triviale:
+
+```text
+Contexte:
+Objectif:
+Contraintes:
+Verification:
+Sortie attendue:
+```
+
+## 4 scenarios de reference
+
+## 1) Explorer un bounded context
+
+Intention:
+- Comprendre ou implementer un changement dans un BC sans regression laterale.
+
+Prompt minimal:
+```text
+Explore le BC avec profondeur medium.
+Retour: composants touches, points d'entree, tests existants et risques.
+```
+
+Preuves attendues:
+- Carte des fichiers a modifier.
+- Test(s) smoke/mandatory proposes.
+
+## 2) Ajouter un smoke test
+
+Intention:
+- Couvrir rapidement un endpoint ou une route publique.
+
+Prompt minimal:
+```text
+Propose un smoke test pour dans le projet de test approprie.
+Respecte les conventions de doc/testing.md.
+```
+
+Preuves attendues:
+- Fichier test cree/modifie.
+- Commande precise pour executer le test cible.
+
+## 3) Corriger une regression backend API
+
+Intention:
+- Corriger un bug sans casser un flux voisin.
+
+Prompt minimal:
+```text
+Planifie puis implemente un fix de dans .
+Ajoute/ajuste un test NonRegression rouge puis vert.
+```
+
+Preuves attendues:
+- Explication cause racine.
+- Test non-regression associe.
+- Commande d'execution et resultat attendu.
+
+## 4) Tracer un flux PostIt/OIDC
+
+Intention:
+- Localiser une cassure d'authentification entre client et serveur.
+
+Prompt minimal:
+```text
+Cartographie le flux OIDC PostIt: entrypoints, callback, stockage token,
+refresh. Donne points de rupture probables et tests/verification proposes.
+```
+
+Preuves attendues:
+- Liste ordonnee des etapes du flux.
+- Fichiers critiques.
+- Hypotheses testables.
+
+## Anti-patterns a eviter
+
+- Prompt sans objectif verifiable.
+- Demande trop large sans perimetre de fichiers.
+- Validation basee uniquement sur "ca semble correct".
+- Pas de lien entre changement et niveau de test.
+
+## Gate PR minimale (agent-assiste)
+
+Avant validation:
+- Impact architecture explicite.
+- Rationale de choix agent explicite.
+- Test(s) executes et justifies.
+- Risques residuels documentes.
diff --git a/doc/onboarding-agents.md b/doc/onboarding-agents.md
new file mode 100644
index 000000000..14a727a17
--- /dev/null
+++ b/doc/onboarding-agents.md
@@ -0,0 +1,73 @@
+# Onboarding guide: agents IA + architecture + tests
+
+Ce guide est optimise pour accelerer la prise en main des agents IA
+(Copilot, Plan, Explore) dans Yavsc, avec une verification rapide
+par les tests.
+
+## Resultat attendu
+
+A la fin du parcours, un contributeur doit pouvoir:
+- Identifier les projets impactes par une modification.
+- Choisir l'agent adapte a l'intention de travail.
+- Produire une proposition de changement verifiable par les tests.
+
+## Parcours en 3 modules
+
+## Module A - Comprendre le terrain (30-45 min)
+
+Objectif: acquerir une lecture fiable de l'architecture.
+
+1. Lire [README.md](../README.md) puis [Architecture.md](Architecture.md).
+2. Lire [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md).
+3. Selon le domaine:
+ - Backend/API: [architecture/workflow-multi-parties.md](architecture/workflow-multi-parties.md)
+ - PostIt: [architecture/postit.md](architecture/postit.md) puis [architecture/postit-oidc.md](architecture/postit-oidc.md)
+
+Definition of done:
+- Expliquer en 5 phrases quelles couches sont touchees.
+- Citer le ou les points d'entree applicatifs a verifier.
+
+## Module B - Boucle tests rapide (20-30 min)
+
+Objectif: verifier rapidement sans lancer toute la suite.
+
+1. Lire [testing.md](testing.md).
+2. Lancer les smoke tests d'abord, puis mandatory selon le projet.
+3. N'elargir au test complet que si le scope depasse le BC touche.
+
+Definition of done:
+- Fournir la commande test executee.
+- Expliquer pourquoi ce niveau de test est suffisant.
+
+## Module C - Usage agentique en production (30-40 min)
+
+Objectif: utiliser les agents comme accelerateurs, pas comme boites noires.
+
+1. Plan: decomposer la tache en etapes verifiables.
+2. Explore: collecter le contexte code/doc precise.
+3. Copilot: implementer localement et verifier.
+
+Regles:
+- Toujours donner un contexte explicite (fichier, but, contrainte).
+- Demander des preuves observables (fichiers modifies, tests, risques).
+- Refuser toute sortie non verifiable.
+
+Definition of done:
+- Une tache simple est livree avec:
+ - Plan
+ - Changement local
+ - Preuve par test
+
+## Routine continue (sans echeance fixe)
+
+Rituels recommandes:
+- Hebdo: revue des prompts qui ont bien fonctionne.
+- Mensuel: mise a jour du present guide et du playbook.
+- A chaque incident: ajouter un anti-pattern dans le playbook.
+
+## Check-list de validation
+
+- Le changement indique son impact architecture.
+- Le choix de l'agent est justifie.
+- La preuve test est incluse.
+- Les risques residuels sont explicitement listes.
diff --git a/dotnet-tools.json b/dotnet-tools.json
index b0e38abda..1762a89de 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -1,5 +1,13 @@
{
"version": 1,
"isRoot": true,
- "tools": {}
+ "tools": {
+ "picket": {
+ "version": "0.2.12",
+ "commands": [
+ "picket"
+ ],
+ "rollForward": false
+ }
+ }
}
\ No newline at end of file
diff --git a/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props
index 4dd4b2889..2f27340e9 100644
--- a/src/PostIt/Directory.Packages.props
+++ b/src/PostIt/Directory.Packages.props
@@ -16,6 +16,8 @@
+
+
diff --git a/src/PostIt/PostIt.Android/Application.cs b/src/PostIt/PostIt.Android/Application.cs
index f5a7908dd..040b01ca3 100644
--- a/src/PostIt/PostIt.Android/Application.cs
+++ b/src/PostIt/PostIt.Android/Application.cs
@@ -1,4 +1,5 @@
using Android.App;
+using Android;
using Android.Runtime;
using Avalonia;
using Avalonia.Android;
@@ -9,6 +10,9 @@ using Avalonia.Controls;
using Avalonia.Styling;
using Yavsc.Api.Client;
+[assembly: UsesPermission(Manifest.Permission.AccessFineLocation)]
+[assembly: UsesPermission(Manifest.Permission.AccessCoarseLocation)]
+
namespace PostIt.Android
{
[Application]
diff --git a/src/PostIt/PostIt.Android/MainActivity.cs b/src/PostIt/PostIt.Android/MainActivity.cs
index ad8455ef0..549100804 100644
--- a/src/PostIt/PostIt.Android/MainActivity.cs
+++ b/src/PostIt/PostIt.Android/MainActivity.cs
@@ -57,6 +57,17 @@ public class MainActivity : AvaloniaMainActivity
}
+ public override void OnRequestPermissionsResult(int requestCode, string[]? permissions, Permission[]? grantResults)
+ {
+ if (PostIt.Android.Services.AndroidCurrentLocationProvider
+ .HandlePermissionResult(requestCode, grantResults))
+ {
+ return;
+ }
+
+ base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+ }
+
internal static class AndroidOidcCallbackSink
{
private static System.Threading.Tasks.TaskCompletionSource? _pending;
diff --git a/src/PostIt/PostIt.Android/PlatformBootstrap.cs b/src/PostIt/PostIt.Android/PlatformBootstrap.cs
index f208f9ce9..5b90267f0 100644
--- a/src/PostIt/PostIt.Android/PlatformBootstrap.cs
+++ b/src/PostIt/PostIt.Android/PlatformBootstrap.cs
@@ -14,11 +14,12 @@ internal static class PlatformBootstrap
{
internal static void InitPlatform()
{
-
Platform.CreateBrowser = () =>
{
var activity = MainActivity.Current;
return activity is null ? null : new AndroidSystemBrowser(activity);
};
+
+ Platform.TryGetCurrentLocationAsync = AndroidCurrentLocationProvider.TryGetCurrentLocationAsync;
}
}
diff --git a/src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs b/src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs
new file mode 100644
index 000000000..f710cacc7
--- /dev/null
+++ b/src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Android;
+using Android.App;
+using Android.Content.PM;
+using Android.Locations;
+using AndroidX.Core.App;
+using AndroidX.Core.Content;
+using PostIt.Services;
+
+namespace PostIt.Android.Services;
+
+internal static class AndroidCurrentLocationProvider
+{
+ public static async Task TryGetCurrentLocationAsync(CancellationToken cancellationToken)
+ {
+ var activity = MainActivity.Current;
+ if (activity is null)
+ {
+ return CurrentLocationResult.Unavailable("L'activité Android n'est pas encore prête.");
+ }
+
+ var permissionGranted = await LocationPermissionBroker.EnsureGrantedAsync(activity, cancellationToken).ConfigureAwait(false);
+ if (!permissionGranted)
+ {
+ return CurrentLocationResult.PermissionDenied();
+ }
+
+ var locationManager = activity.GetSystemService(global::Android.Content.Context.LocationService) as LocationManager;
+ if (locationManager is null)
+ {
+ return CurrentLocationResult.Unavailable("Le service de localisation Android est indisponible.");
+ }
+
+ var location = locationManager.GetProviders(enabledOnly: true)?
+ .Select(provider => locationManager.GetLastKnownLocation(provider))
+ .Where(candidate => candidate is not null)
+ .OrderByDescending(candidate => candidate!.Time)
+ .ThenBy(candidate => candidate!.Accuracy)
+ .FirstOrDefault();
+
+ if (location is null)
+ {
+ return CurrentLocationResult.Unavailable("Aucune position n'est disponible. Activez la localisation du système puis réessayez.");
+ }
+
+ return CurrentLocationResult.Success(location.Latitude, location.Longitude);
+ }
+
+ public static bool HandlePermissionResult(int requestCode, Permission[]? grantResults)
+ => LocationPermissionBroker.HandleResult(requestCode, grantResults);
+
+ private static class LocationPermissionBroker
+ {
+ private const int RequestCode = 4042;
+ private static readonly string[] RequestedPermissions =
+ {
+ Manifest.Permission.AccessFineLocation,
+ Manifest.Permission.AccessCoarseLocation,
+ };
+
+ private static readonly object SyncRoot = new();
+ private static TaskCompletionSource? _pendingRequest;
+
+ public static Task EnsureGrantedAsync(Activity activity, CancellationToken cancellationToken)
+ {
+ if (HasLocationPermission(activity))
+ {
+ return Task.FromResult(true);
+ }
+
+ lock (SyncRoot)
+ {
+ if (_pendingRequest is null)
+ {
+ _pendingRequest = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ ActivityCompat.RequestPermissions(activity, RequestedPermissions, RequestCode);
+ }
+
+ if (!cancellationToken.CanBeCanceled)
+ {
+ return _pendingRequest.Task;
+ }
+
+ return WaitAsync(_pendingRequest.Task, cancellationToken);
+ }
+ }
+
+ public static bool HandleResult(int requestCode, Permission[]? grantResults)
+ {
+ if (requestCode != RequestCode)
+ {
+ return false;
+ }
+
+ var granted = grantResults is { Length: > 0 } && grantResults.All(result => result == Permission.Granted);
+ TaskCompletionSource? pendingRequest;
+ lock (SyncRoot)
+ {
+ pendingRequest = _pendingRequest;
+ _pendingRequest = null;
+ }
+
+ pendingRequest?.TrySetResult(granted);
+ return true;
+ }
+
+ private static bool HasLocationPermission(Activity activity)
+ {
+ return ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessFineLocation) == Permission.Granted
+ || ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessCoarseLocation) == Permission.Granted;
+ }
+
+ private static async Task WaitAsync(Task task, CancellationToken cancellationToken)
+ {
+ using var registration = cancellationToken.Register(() =>
+ {
+ lock (SyncRoot)
+ {
+ _pendingRequest?.TrySetCanceled(cancellationToken);
+ _pendingRequest = null;
+ }
+ });
+
+ return await task.ConfigureAwait(false);
+ }
+ }
+}
diff --git a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
new file mode 100644
index 000000000..6cac39603
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
@@ -0,0 +1,173 @@
+using System.Net.Http;
+using PostIt.ViewModels;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+public class ActivitiesPageViewModelTests
+{
+ [Fact]
+ public void ActivityApiClient_uses_avatar_authority_when_provided()
+ {
+ var api = new StubActivityApi();
+ var client = new ActivityApiClient(
+ api,
+ "https://api.pschneider.fr/api/v1/",
+ "https://yavsc.pschneider.fr/");
+
+ var url = client.BuildAvatarXsUrl("paul");
+
+ Assert.Equal("https://yavsc.pschneider.fr/avatars/paul.xs.png", url);
+ }
+
+ [Fact]
+ public async Task ActivityApiClient_uses_business_absolute_paths()
+ {
+ var api = new StubActivityApi();
+ var client = new ActivityApiClient(api, "https://business.example/api/v1/");
+ var billingClient = new BillingApiClient(api, "https://business.example/api/v1/");
+
+ await client.GetCatalogAsync("brush", TestContext.Current.CancellationToken);
+ await client.GetUsersAsync("brush-pro", TestContext.Current.CancellationToken);
+ await billingClient.CreateAsync("Rdv", new { Foo = "Bar" }, TestContext.Current.CancellationToken);
+ await billingClient.GetQuerySummariesAsync("Rdv", TestContext.Current.CancellationToken);
+
+ Assert.Equal("https://business.example/api/v1/activity/catalog?parentCode=brush", api.Paths[0]);
+ Assert.Equal("https://business.example/api/v1/activity/brush-pro/users", api.Paths[1]);
+ Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[2]);
+ Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[3]);
+ }
+
+ [Fact]
+ public async Task ActivityApiClient_uses_updated_business_base_without_restart()
+ {
+ var api = new StubActivityApi();
+ var baseUrl = "https://business-a.example/api/v1/";
+ var client = new ActivityApiClient(api, () => baseUrl);
+
+ await client.GetCatalogAsync(ct: TestContext.Current.CancellationToken);
+
+ baseUrl = "https://business-b.example/api/v1/";
+ await client.GetUsersAsync("brush", TestContext.Current.CancellationToken);
+
+ Assert.Equal("https://business-a.example/api/v1/activity/catalog", api.Paths[0]);
+ Assert.Equal("https://business-b.example/api/v1/activity/brush/users", api.Paths[1]);
+ }
+
+ [Fact]
+ public async Task RefreshAsync_loads_first_activity_then_specialization_performers()
+ {
+ var api = new StubActivityApi();
+ var client = new ActivityApiClient(api, "https://business.example/api/v1/");
+ var billingClient = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm = new ActivitiesPageViewModel(client, billingClient);
+
+ await vm.RefreshAsync();
+
+ Assert.Equal("brush", vm.SelectedActivity?.Code);
+ Assert.Single(vm.Specializations);
+ Assert.Equal("brush", vm.CurrentActivity?.Code);
+ Assert.Single(vm.Performers);
+ Assert.Equal("Alice", vm.Performers[0].UserName);
+ Assert.Equal("https://business.example/avatars/Alice.xs.png", vm.Performers[0].AvatarXsUrl);
+ Assert.True(vm.Performers[0].HasPerformerProfile);
+ Assert.True(vm.Performers[0].IsPerformerActive);
+ Assert.Equal("Actif", vm.Performers[0].PerformerStatusBadgeLabel);
+ Assert.Equal("Pas d'autre activité", vm.Performers[0].ExtraActivityLabel);
+
+ await vm.ShowSpecializationAsync(vm.Specializations[0]);
+
+ Assert.Equal("brush-pro", vm.CurrentActivity?.Code);
+ Assert.Single(vm.Performers);
+ Assert.Equal("Bob", vm.Performers[0].UserName);
+ Assert.Equal("https://business.example/avatars/Bob.xs.png", vm.Performers[0].AvatarXsUrl);
+ Assert.True(vm.Performers[0].HasPerformerProfile);
+ Assert.False(vm.Performers[0].IsPerformerActive);
+ Assert.Equal("Inactif", vm.Performers[0].PerformerStatusBadgeLabel);
+ Assert.Equal("Autres spécialisations: 2", vm.Performers[0].ExtraActivityLabel);
+ Assert.Contains("brush pro", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+
+ await vm.ShowSpecializationAsync(null);
+
+ Assert.Equal("brush", vm.CurrentActivity?.Code);
+ Assert.Single(vm.Performers);
+ Assert.Equal("Alice", vm.Performers[0].UserName);
+ }
+
+ private sealed class StubActivityApi : IYavscApiClient
+ {
+ public HttpClient Http { get; } = new();
+ public List Paths { get; } = new();
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ Paths.Add(path);
+
+ if (typeof(T) == typeof(List))
+ {
+ var activities = new List
+ {
+ new()
+ {
+ Code = "brush",
+ Name = "Brush",
+ Description = "Coiffure à domicile",
+ PerformerCount = 1,
+ Forms = new List
+ {
+ new() { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" }
+ },
+ Children = new List
+ {
+ new()
+ {
+ Code = "brush-pro",
+ Name = "Brush Pro",
+ Description = "Spécialisation premium",
+ ParentCode = "brush",
+ PerformerCount = 1,
+ Forms = new List
+ {
+ new() { Id = 2, ActionName = "Rdv", Title = "Rendez-vous premium" }
+ }
+ }
+ }
+ }
+ };
+ return Task.FromResult((T)(object)activities);
+ }
+
+ if (typeof(T) == typeof(List))
+ {
+ var performers = path.EndsWith("brush-pro/users", StringComparison.Ordinal)
+ ? new List
+ {
+ new() { PerformerId = "pro-2", HasPerformerProfile = true, Active = false, UserName = "Bob", ActivityCode = "brush-pro", ActivityName = "Brush Pro", ExtraActivityCount = 2 }
+ }
+ : new List
+ {
+ new() { PerformerId = "pro-1", HasPerformerProfile = true, Active = true, UserName = "Alice", ActivityCode = "brush", ActivityName = "Brush", ExtraActivityCount = 0 }
+ };
+
+ return Task.FromResult((T)(object)performers);
+ }
+
+ return Task.FromResult(default(T)!);
+ }
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ Paths.Add(path);
+ return Task.CompletedTask;
+ }
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+ }
+}
diff --git a/src/PostIt/PostIt.Tests/BearerScopeTests.cs b/src/PostIt/PostIt.Tests/BearerScopeTests.cs
index c6bf7d56e..984483fc7 100644
--- a/src/PostIt/PostIt.Tests/BearerScopeTests.cs
+++ b/src/PostIt/PostIt.Tests/BearerScopeTests.cs
@@ -67,7 +67,7 @@ public class BearerScopeTests
Scopes = userScopes,
RedirectUri = "postit://callback",
},
- BusinessApiUrl = "https://example.invalid/api/v1/",
+ ApiUrl = "https://example.invalid/api/v1/",
};
var tokensPath = Path.Combine(
@@ -266,7 +266,7 @@ public class BearerScopeTests
// private HttpClient is independent, so we resolve the
// absolute URI ourselves from Settings.BusinessApiUrl —
// the same URL BlogApiClient would have set as BaseAddress.
- var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
+ var absolute = new Uri(new Uri(Settings.ApiUrl), path);
using var req = new HttpRequestMessage(method, absolute);
req.Headers.Authorization =
new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);
diff --git a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
new file mode 100644
index 000000000..34804b4cd
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
@@ -0,0 +1,363 @@
+using System.Text.Json;
+using PostIt.Helpers;
+using PostIt.Services;
+using PostIt.ViewModels;
+using PostIt.ViewModels.Commands;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Haircut;
+
+namespace PostIt.Tests;
+
+public class BillingCommandPageViewModelTests
+{
+ [Fact]
+ public async Task SubmitAsync_posts_rdv_payload_to_selected_billing_route()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+
+ vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+ vm!.Reason = "Point de cadrage";
+ vm!.Address = "1 rue du Test";
+ vm!.Latitude = 48.8566;
+ vm!.Longitude = 2.3522;
+ vm!.Consent = true;
+
+ await vm.SubmitCommand.ExecuteAsync(null);
+
+ Assert.Equal("https://business.example/api/v1/billing/Rdv", api.LastPath);
+ Assert.NotNull(api.LastBody);
+
+ using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+ Assert.Equal("dev", json.RootElement.GetProperty("ActivityCode").GetString());
+ Assert.Equal("perf-1", json.RootElement.GetProperty("PerformerId").GetString());
+ Assert.Equal("Point de cadrage", json.RootElement.GetProperty("Reason").GetString());
+ Assert.Equal((int)QueryStatus.Inserted, json.RootElement.GetProperty("Status").GetInt32());
+ }
+
+ [Fact]
+ public async Task SubmitAsync_refuses_unsupported_billing_code()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+
+ var vm =
+ new CommandFormSummary { Id = 13, ActionName = "Book", Title = "Réservation" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "book", Name = "Book" },
+ new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+ client);
+
+ Assert.Null(vm);
+ }
+
+ [Fact]
+ public async Task SubmitAsync_allows_missing_coordinates_and_omits_them_from_payload()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+ vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+ vm!.Reason = "Point de cadrage";
+ vm!.Address = "1 rue du Test";
+ vm!.Latitude = null;
+ vm!.Longitude = null;
+ vm!.Consent = true;
+
+ await vm.SubmitCommand.ExecuteAsync(null);
+
+ using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+ var location = json.RootElement.GetProperty("Location");
+ Assert.Equal("1 rue du Test", location.GetProperty("Address").GetString());
+ Assert.False(location.TryGetProperty("Latitude", out _));
+ Assert.False(location.TryGetProperty("Longitude", out _));
+ }
+
+ [Fact]
+ public async Task UseCurrentLocationAsync_prefills_coordinates_from_platform_provider()
+ {
+ var original = Platform.TryGetCurrentLocationAsync;
+ try
+ {
+ Platform.TryGetCurrentLocationAsync = _ => Task.FromResult(CurrentLocationResult.Success(48.8566, 2.3522));
+
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+
+ await vm!.UseCurrentLocationCommand.ExecuteAsync(null);
+
+ Assert.Equal(48.8566, vm!.Latitude);
+ Assert.Equal(2.3522, vm!.Longitude);
+ }
+ finally
+ {
+ Platform.TryGetCurrentLocationAsync = original;
+ }
+ }
+
+ [Fact]
+ public void ApplyLocationFromMap_sets_coordinates_and_updates_status()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+
+ vm!.Address = string.Empty;
+ vm.ApplyLocationFromMap(48.85661234, 2.35224567);
+
+ Assert.Equal(48.856612, vm.Latitude);
+ Assert.Equal(2.352246, vm.Longitude);
+ Assert.Contains("Position sélectionnée", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+ }
+
+ [Fact]
+ public void EventDateSelection_round_trips_with_EventDate_for_DatePicker_binding()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+
+ var selected = new DateTimeOffset(2026, 9, 7, 14, 30, 0, TimeSpan.FromHours(2));
+ vm!.EventDateSelection = selected;
+
+ Assert.Equal(selected.LocalDateTime, vm.EventDate);
+ Assert.Equal(vm.EventDate, vm.EventDateSelection!.Value.LocalDateTime);
+ }
+
+ [Fact]
+ public void ApplyResolvedAddress_populates_empty_address_directly()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+
+ vm!.Address = string.Empty;
+ vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
+
+ Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.Address);
+ Assert.False(vm.HasSuggestedAddress);
+ }
+
+ [Fact]
+ public void ApplyResolvedAddress_preserves_manual_address_and_exposes_suggestion()
+ {
+ var api = new RecordingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ client) as RdvViewModel;
+
+ vm!.Address = "Saisie manuelle";
+ vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
+
+ Assert.Equal("Saisie manuelle", vm.Address);
+ Assert.True(vm.HasSuggestedAddress);
+ Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.SuggestedAddress);
+
+ vm.ApplySuggestedAddressCommand.Execute(null);
+
+ Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.Address);
+ Assert.False(vm.HasSuggestedAddress);
+ }
+
+ [Fact]
+ public async Task InitializeAsync_loads_prestations_for_brush_and_submit_posts_selected_prestation()
+ {
+ var api = new RecordingApi
+ {
+ HairPrestations = new List
+ {
+ new() { Id = 10, Title = "Femme · Cheveux mi-longs", Details = "Coupe · Brushing" },
+ new() { Id = 11, Title = "Homme · Cheveux courts", Details = "Coupe · Coiffage" },
+ }
+ };
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "brush", Name = "Brush" },
+ new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+ client) as BrushViewModel;
+ vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+ vm!.Address = "1 rue du Test";
+ vm!.Latitude = 48.8566;
+ vm!.Longitude = 2.3522;
+ vm!.Consent = true;
+ vm!.AdditionalInfo = "Prévoir shampoing";
+
+ await vm.InitializeAsync();
+ vm.SelectedPrestation = vm.AvailablePrestations[1];
+ await vm.SubmitCommand.ExecuteAsync(null);
+
+ Assert.Equal("https://business.example/api/v1/billing/Brush", api.LastPath);
+ using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+ Assert.Equal(11, json.RootElement.GetProperty("PrestationId").GetInt32());
+ Assert.Equal("Prévoir shampoing", json.RootElement.GetProperty("AdditionalInfo").GetString());
+ }
+
+ [Fact]
+ public async Task InitializeAsync_loads_prestations_for_mbrush_and_submit_posts_selected_prestations()
+ {
+ var api = new RecordingApi
+ {
+ HairPrestations = new List
+ {
+ new() { Id = 21, Title = "Femme · Cheveux longs", Details = "Coupe · Couleur" },
+ new() { Id = 22, Title = "Enfant · Cheveux courts", Details = "Coupe · Sans technique" },
+ }
+ };
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 14, ActionName = "MBrush", Title = "Coupe groupée" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "mbrush", Name = "MBrush" },
+ new ActivityUserDisplayItem { PerformerId = "perf-3", UserName = "Cara" },
+ client) as MBrushViewModel;
+ vm!.EventDate = DateTime.Parse("2026-09-03 10:00");
+ vm!.Address = "2 rue du Test";
+ vm!.Latitude = 48.8567;
+ vm!.Longitude = 2.3523;
+ vm!.Consent = true;
+
+ await vm.InitializeAsync();
+ vm!.MultiPrestations[0].IsSelected = true;
+ vm!.MultiPrestations[1].IsSelected = true;
+ await vm!.SubmitCommand.ExecuteAsync(null);
+
+ Assert.Equal("https://business.example/api/v1/billing/MBrush", api.LastPath);
+ using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+ var prestations = json.RootElement.GetProperty("Prestations");
+ Assert.Equal(2, prestations.GetArrayLength());
+ Assert.Equal(21, prestations[0].GetProperty("PrestationId").GetInt32());
+ Assert.Equal(22, prestations[1].GetProperty("PrestationId").GetInt32());
+ }
+
+ [Fact]
+ public async Task InitializeAsync_with_existing_brush_query_prefills_and_submit_updates_query()
+ {
+ var api = new RecordingApi
+ {
+ HairPrestations = new List
+ {
+ new() { Id = 30, Title = "Femme · Cheveux longs", Details = "Coupe · Brushing" },
+ new() { Id = 31, Title = "Homme · Cheveux courts", Details = "Coupe" },
+ }
+ };
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm =
+ new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
+ .CreateCommandPageViewModel(
+ new ActivityInfo { Code = "brush", Name = "Brush" },
+ new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+ client) as BrushViewModel;
+ await vm!.InitializeAsync(new BillingQueryDetailsDto
+ {
+ Id = 77,
+ BillingCode = "Brush",
+ ActivityCode = "brush",
+ PerformerId = "perf-2",
+ ClientId = "cli-1",
+ EventDate = new DateTime(2026, 9, 2, 14, 30, 0, DateTimeKind.Utc),
+ Consent = true,
+ Status = QueryStatus.Accepted,
+ PrestationId = 30,
+ AdditionalInfo = "Ancienne note",
+ Location = new BillingLocationDto
+ {
+ Address = "1 rue du Test",
+ Latitude = 48.8566,
+ Longitude = 2.3522,
+ }
+ });
+
+ vm!.SelectedPrestation = vm!.AvailablePrestations[1];
+ vm!.AdditionalInfo = "Note mise à jour";
+ await vm!.SubmitCommand.ExecuteAsync(null);
+
+ Assert.Equal(HttpMethod.Put, api.LastMethod);
+ Assert.Equal("https://business.example/api/v1/billing/Brush/77", api.LastPath);
+ Assert.True(vm.IsEditingExisting);
+ Assert.Equal("Mettre à jour la commande", vm.SubmitLabel);
+
+ using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+ Assert.Equal(77, json.RootElement.GetProperty("Id").GetInt32());
+ Assert.Equal(31, json.RootElement.GetProperty("PrestationId").GetInt32());
+ Assert.Equal("Note mise à jour", json.RootElement.GetProperty("AdditionalInfo").GetString());
+ Assert.Equal((int)QueryStatus.Accepted, json.RootElement.GetProperty("Status").GetInt32());
+ }
+
+ private sealed class RecordingApi : IYavscApiClient
+ {
+ public HttpClient Http { get; } = new();
+ public HttpMethod? LastMethod { get; private set; }
+ public string? LastPath { get; private set; }
+ public object? LastBody { get; private set; }
+ public List? HairPrestations { get; init; }
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ LastMethod = method;
+ LastPath = path;
+ LastBody = body;
+ if (typeof(T) == typeof(List))
+ {
+ return Task.FromResult((T)(object)(HairPrestations ?? new List()));
+ }
+ return Task.FromResult(default(T)!);
+ }
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ LastMethod = method;
+ LastPath = path;
+ LastBody = body;
+ return Task.CompletedTask;
+ }
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+ }
+}
diff --git a/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs
new file mode 100644
index 000000000..e53139351
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs
@@ -0,0 +1,138 @@
+using System.Net.Http;
+using PostIt.ViewModels;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+public class BillingQueriesPageViewModelTests
+{
+ [Fact]
+ public async Task RefreshAsync_filters_queries_by_selected_activity_and_performer()
+ {
+ var api = new StubBillingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm = new BillingQueriesPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
+ client);
+
+ await vm.InitializeAsync();
+
+ Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths.Single());
+ Assert.Equal(3, vm.Queries.Count);
+ Assert.Contains(vm.Queries, q => q.Description == "Rendez-vous #1");
+ Assert.Contains("3 commande", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+ }
+
+ [Fact]
+ public async Task RefreshAsync_in_readonly_ongoing_mode_keeps_only_ongoing_statuses_and_disables_open()
+ {
+ var api = new StubBillingApi();
+ var client = new BillingApiClient(api, "https://business.example/api/v1/");
+ var vm = new BillingQueriesPageViewModel(
+ new ActivityInfo { Code = "dev", Name = "Développement" },
+ new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+ new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
+ client,
+ isReadOnly: true,
+ ongoingOnly: true);
+
+ await vm.InitializeAsync();
+
+ Assert.Equal(2, vm.Queries.Count);
+ Assert.All(vm.Queries, q => Assert.DoesNotContain("Rejected", q.StatusLabel, StringComparison.OrdinalIgnoreCase));
+ Assert.Contains("lecture seule", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+
+ Assert.True(vm.Queries.Count > 0);
+ }
+
+ private sealed class StubBillingApi : IYavscApiClient
+ {
+ public HttpClient Http { get; } = new();
+ public List Paths { get; } = new();
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ Paths.Add(path);
+
+ if (typeof(T) == typeof(List))
+ {
+ var data = new List
+ {
+ new()
+ {
+ Id = 11,
+ ActivityCode = "dev",
+ PerformerId = "perf-1",
+ ClientId = "cli-1",
+ Status = QueryStatus.Inserted,
+ Description = "Rendez-vous #1",
+ Reason = "Point de cadrage",
+ EventDate = new DateTime(2026, 9, 1, 10, 0, 0, DateTimeKind.Utc),
+ },
+ new()
+ {
+ Id = 12,
+ ActivityCode = "other",
+ PerformerId = "perf-1",
+ ClientId = "cli-1",
+ Status = QueryStatus.Accepted,
+ Description = "Autre activité",
+ EventDate = new DateTime(2026, 9, 2, 10, 0, 0, DateTimeKind.Utc),
+ },
+ new()
+ {
+ Id = 13,
+ ActivityCode = "dev",
+ PerformerId = "perf-2",
+ ClientId = "cli-1",
+ Status = QueryStatus.Accepted,
+ Description = "Autre performer",
+ EventDate = new DateTime(2026, 9, 3, 10, 0, 0, DateTimeKind.Utc),
+ },
+ new()
+ {
+ Id = 14,
+ ActivityCode = "dev",
+ PerformerId = "perf-1",
+ ClientId = "cli-1",
+ Status = QueryStatus.InProgress,
+ Description = "En cours",
+ EventDate = new DateTime(2026, 9, 4, 10, 0, 0, DateTimeKind.Utc),
+ },
+ new()
+ {
+ Id = 15,
+ ActivityCode = "dev",
+ PerformerId = "perf-1",
+ ClientId = "cli-1",
+ Status = QueryStatus.Rejected,
+ Description = "Rejetée",
+ EventDate = new DateTime(2026, 9, 5, 10, 0, 0, DateTimeKind.Utc),
+ }
+ };
+
+ return Task.FromResult((T)(object)data);
+ }
+
+ return Task.FromResult(default(T)!);
+ }
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ Paths.Add(path);
+ return Task.CompletedTask;
+ }
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+ }
+}
diff --git a/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs
new file mode 100644
index 000000000..db70e25fa
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs
@@ -0,0 +1,270 @@
+using System.Net.Http;
+using PostIt.ViewModels;
+using Yavsc;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+public class EstimateEditionPageViewModelTests
+{
+ private static BillingQuerySummaryDto SampleQuery() => new()
+ {
+ Id = 42,
+ BillingCode = "Brush",
+ ActivityCode = "hair",
+ PerformerId = "perf-1",
+ ClientId = "cli-1",
+ Status = QueryStatus.InProgress,
+ Description = "Coupe simple",
+ EventDate = new DateTime(2026, 9, 12, 10, 0, 0, DateTimeKind.Utc),
+ };
+
+ private static EstimateEditionPageViewModel CreateViewModel(StubEstimateApi api, BillingQuerySummaryDto? query = null)
+ {
+ var client = new EstimateApiClient(api, "https://business.example/api/v1/");
+ return new EstimateEditionPageViewModel(query ?? SampleQuery(), client);
+ }
+
+ [Fact]
+ public void Constructor_prefills_description_and_adds_a_first_line()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+
+ Assert.Equal("Coupe simple", vm.EstimateDescription);
+ Assert.Single(vm.Lines);
+ Assert.Same(vm.Lines[0], vm.SelectedLine);
+ Assert.Contains("#42", vm.ContextLabel);
+ Assert.Contains("cli-1", vm.ContextLabel);
+ }
+
+ [Fact]
+ public void AddLine_appends_and_selects_the_new_line()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+
+ vm.AddLineCommand.Execute(null);
+
+ Assert.Equal(2, vm.Lines.Count);
+ Assert.Same(vm.Lines[1], vm.SelectedLine);
+ }
+
+ [Fact]
+ public void RemoveLine_removes_the_selected_line()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ var first = vm.Lines[0];
+
+ vm.RemoveLineCommand.Execute(null);
+
+ Assert.Empty(vm.Lines);
+ Assert.Null(vm.SelectedLine);
+ Assert.False(vm.RemoveLineCommand.CanExecute(null));
+ Assert.DoesNotContain(first, vm.Lines);
+ }
+
+ [Fact]
+ public void Total_sums_line_totals_and_tracks_edits()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+
+ vm.Lines[0].Count = 2;
+ vm.Lines[0].UnitaryCost = 15.5m;
+
+ Assert.Equal(31m, vm.Total);
+ Assert.Equal($"{31m:0.00} EUR", vm.TotalLabel);
+
+ vm.AddLineCommand.Execute(null);
+ vm.Lines[1].Count = 1;
+ vm.Lines[1].UnitaryCost = 9m;
+
+ Assert.Equal(40m, vm.Total);
+ }
+
+ [Fact]
+ public async Task Send_without_title_warns_and_does_not_post()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ vm.Lines[0].Name = "Coupe";
+ vm.Lines[0].Description = "Coupe simple";
+ vm.Lines[0].UnitaryCost = 25m;
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ Assert.Null(api.LastBody);
+ Assert.Equal(StatusSeverity.Warning, vm.ActionStatus.Severity);
+ Assert.Contains("titre", vm.ActionStatus.Message);
+ }
+
+ [Fact]
+ public async Task Send_without_any_line_warns_and_does_not_post()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ vm.EstimateTitle = "Devis coupe";
+ vm.Lines.Clear();
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ Assert.Null(api.LastBody);
+ Assert.Equal(StatusSeverity.Warning, vm.ActionStatus.Severity);
+ Assert.Contains("ligne", vm.ActionStatus.Message);
+ }
+
+ [Fact]
+ public async Task Send_with_a_blank_line_name_warns_and_does_not_post()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ vm.EstimateTitle = "Devis coupe";
+ vm.Lines[0].Description = "Oubli du nom";
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ Assert.Null(api.LastBody);
+ Assert.Equal(StatusSeverity.Warning, vm.ActionStatus.Severity);
+ Assert.Contains("nom", vm.ActionStatus.Message);
+ }
+
+ [Fact]
+ public async Task Send_posts_the_estimate_payload_to_the_estimate_route()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ vm.EstimateTitle = " Devis coupe ";
+ vm.Lines[0].Name = "Coupe";
+ vm.Lines[0].Description = "Coupe simple";
+ vm.Lines[0].Count = 2.4m;
+ vm.Lines[0].UnitaryCost = 25m;
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ Assert.Equal("https://business.example/api/v1/estimate", api.LastPath);
+ Assert.Equal(HttpMethod.Post, api.LastMethod);
+
+ var payload = Assert.IsType(api.LastBody);
+ Assert.Equal(42, payload.CommandId);
+ Assert.Equal("cli-1", payload.ClientId);
+ Assert.Equal("Brush", payload.CommandType);
+ Assert.Equal("Devis coupe", payload.Title);
+ Assert.Equal("Coupe simple", payload.Description);
+ Assert.Empty(payload.AttachedFiles);
+ Assert.Empty(payload.AttachedGraphics);
+
+ var line = Assert.Single(payload.Bill);
+ Assert.Equal("Coupe", line.Name);
+ Assert.Equal(2, line.Count);
+ Assert.Equal(25m, line.UnitaryCost);
+ Assert.Equal("EUR", line.Currency);
+ }
+
+ [Fact]
+ public async Task Send_marks_the_page_as_sent_and_disables_resend()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ vm.EstimateTitle = "Devis coupe";
+ vm.Lines[0].Name = "Coupe";
+ vm.Lines[0].Description = "Coupe simple";
+ vm.Lines[0].UnitaryCost = 25m;
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ Assert.True(vm.HasSent);
+ Assert.False(vm.SendCommand.CanExecute(null));
+ Assert.Equal("Devis envoyé", vm.SendLabel);
+ Assert.Equal(StatusSeverity.Info, vm.ActionStatus.Severity);
+ Assert.Contains("#7", vm.ActionStatus.Message);
+ }
+
+ [Fact]
+ public async Task Send_surfaces_server_errors_as_error_status()
+ {
+ var api = new StubEstimateApi { Failure = new HttpRequestException("boom", null, System.Net.HttpStatusCode.InternalServerError) };
+ var vm = CreateViewModel(api);
+ vm.EstimateTitle = "Devis coupe";
+ vm.Lines[0].Name = "Coupe";
+ vm.Lines[0].Description = "Coupe simple";
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ Assert.False(vm.HasSent);
+ Assert.Equal(StatusSeverity.Error, vm.ActionStatus.Severity);
+ Assert.True(vm.SendCommand.CanExecute(null));
+ }
+
+ [Fact]
+ public async Task Send_accepts_negative_amounts_for_discount_lines()
+ {
+ var api = new StubEstimateApi();
+ var vm = CreateViewModel(api);
+ vm.EstimateTitle = "Devis avec remise";
+ vm.Lines[0].Name = "Coupe";
+ vm.Lines[0].Description = "Coupe simple";
+ vm.Lines[0].UnitaryCost = 25m;
+
+ vm.AddLineCommand.Execute(null);
+ vm.Lines[1].Name = "Remise fidélité";
+ vm.Lines[1].Description = "Remise client régulier";
+ vm.Lines[1].UnitaryCost = -5m;
+
+ Assert.Equal(20m, vm.Total);
+
+ await vm.SendCommand.ExecuteAsync(null);
+
+ var payload = Assert.IsType(api.LastBody);
+ Assert.Equal(2, payload.Bill.Count);
+ Assert.Equal(-5m, payload.Bill[1].UnitaryCost);
+ Assert.True(vm.HasSent);
+ }
+
+ private sealed class StubEstimateApi : IYavscApiClient
+ {
+ public HttpClient Http { get; } = new();
+ public string? LastPath { get; private set; }
+ public HttpMethod? LastMethod { get; private set; }
+ public object? LastBody { get; private set; }
+ public Exception? Failure { get; init; }
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ LastMethod = method;
+ LastPath = path;
+ LastBody = body;
+
+ if (Failure is not null)
+ {
+ throw Failure;
+ }
+
+ if (typeof(T) == typeof(EstimateCreatedDto))
+ {
+ var payload = (EstimateDto)body!;
+ var created = new EstimateCreatedDto { Id = 7, Bill = payload.Bill };
+ return Task.FromResult((T)(object)created);
+ }
+
+ return Task.FromResult(default(T)!);
+ }
+
+ public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+ {
+ LastMethod = method;
+ LastPath = path;
+ LastBody = body;
+ return Task.CompletedTask;
+ }
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default)
+ => CallAsync(method, path, (object?)null, ct);
+
+ public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+ }
+}
diff --git a/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs b/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs
new file mode 100644
index 000000000..16f01c5e9
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs
@@ -0,0 +1,15 @@
+using PostIt.ViewModels;
+
+namespace PostIt.Tests;
+
+public class HomePageProviderFlowTests
+{
+ [Fact]
+ public void HomePage_exposes_provider_requests_command()
+ {
+ var vm = new HomePageViewModel();
+
+ Assert.NotNull(vm.OpenProviderRequests);
+ Assert.True(vm.OpenProviderRequests.CanExecute(null));
+ }
+}
diff --git a/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs b/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs
index d1d00532d..f72c8d4d5 100644
--- a/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs
+++ b/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs
@@ -8,6 +8,8 @@ using Yavsc.Blogspot;
using PostIt.Services;
using PostIt.ViewModels;
using PostIt.Views;
+using PostIt.Views.Blogs;
+using PostIt.Helpers;
namespace PostIt.Tests;
@@ -72,13 +74,13 @@ public class MainPageButtonsTests
{ }
}
- private static MainViewModel MakeViewModel(BlogPostDto? selectedPost = null)
+ private static BlogsViewModel MakeViewModel(BlogPostDto? selectedPost = null)
{
var api = new ThrowingApi();
var blog = new BlogApiClient(api, "http://localhost/");
var circle = new CircleApiClient(api, "http://localhost/");
var acl = new BlogAclApiClient(api, "http://localhost/");
- // Minimal DI graph: only what MainPageViewModel resolves
+ // Minimal DI graph: only what BlogsViewModel resolves
// when the user clicks a navigation button. Today that's
// SignaturePageViewModel / CirclesPageViewModel / ACL
// dependencies. The graph intentionally stays local to this
@@ -93,7 +95,7 @@ public class MainPageButtonsTests
services.AddTransient();
services.AddTransient();
services.AddTransient();
- var vm = new MainViewModel(blog, services: services.BuildServiceProvider());
+ var vm = new BlogsViewModel(blog, services: services.BuildServiceProvider());
if (selectedPost is not null) vm.SelectedPost = selectedPost;
return vm;
}
@@ -101,7 +103,7 @@ public class MainPageButtonsTests
///
/// Mount a real (as
/// SessionStatusBannerTests does), push a
- /// with the given VM onto
+ /// with the given VM onto
/// NavRoot. PushAsync is awaited (via
/// GetAwaiter().GetResult()) so the page is on the
/// nav stack before the test tries to interact with its
@@ -109,13 +111,17 @@ public class MainPageButtonsTests
/// realised and KeyPressQwerty has a real
/// to dispatch against.
///
- private static (MainView window, MainPage page) MountMainPage(MainViewModel vm)
+ private static (MainView window, BlogsPage page) MountMainPage(BlogsViewModel vm)
{
var window = new MainView();
- var page = new MainPage { DataContext = vm };
+ var page = new BlogsPage { DataContext = vm };
var app = (PostIt.App)Application.Current!;
+
app.AttachMainWindow(window);
+
window.NavRoot.PushAsync(page).GetAwaiter().GetResult();
+ var mainWindow = new Window { Content = window };
+ mainWindow.Show();
return (window, page);
}
@@ -145,7 +151,7 @@ public class MainPageButtonsTests
}
[AvaloniaFact]
- public void Acl_button_click_pushes_a_page_onto_nav_stack()
+ public async Task Acl_button_click_pushes_a_page_onto_nav_stack()
{
// Arrange: a VM whose SelectedPost is non-null so
// CanManageAcl evaluates to true and the button is
@@ -178,7 +184,7 @@ public class MainPageButtonsTests
}
[AvaloniaFact]
- public void Circles_button_click_pushes_a_page_onto_nav_stack()
+ public async Task Circles_button_click_pushes_a_page_onto_nav_stack()
{
// Arrange: OpenCircles has no CanExecute guard today —
// any click should fire it and push the page.
@@ -203,7 +209,7 @@ public class MainPageButtonsTests
public void Signature_dev_button_click_pushes_a_page_onto_nav_stack()
{
// Arrange: the "[DEV] Signature" button is bound to the
- // MainPageViewModel.OpenSignatureDevCommand [RelayCommand].
+ // BlogsViewModel.OpenSignatureDevCommand [RelayCommand].
// The click must push SignaturePage on top of NavRoot.
// The ServiceCollection registered in MakeViewModel provides
// SignaturePageViewModel so the command can resolve it via
diff --git a/src/PostIt/PostIt.Tests/MainPageSaveTests.cs b/src/PostIt/PostIt.Tests/MainPageSaveTests.cs
index 0fd5627c8..519cd141d 100644
--- a/src/PostIt/PostIt.Tests/MainPageSaveTests.cs
+++ b/src/PostIt/PostIt.Tests/MainPageSaveTests.cs
@@ -5,10 +5,11 @@ using Yavsc.Blogspot;
using Yavsc.Api.Client;
using PostIt.ViewModels;
using PostIt.Views;
+using PostIt.Views.Blogs;
namespace PostIt.Tests;
///
-/// Headless UI tests for the "Save" flow in .
+/// Headless UI tests for the "Save" flow in .
/// The pattern is the one SessionStatusBannerTests
/// established: [AvaloniaFact], a
/// hosting the page (via a because
@@ -40,9 +41,9 @@ public class MainPageSaveTests
var recorder = new CallRecorder();
var api = new RecordingYavscApiClient(recorder);
var blog = new BlogApiClient(api, "http://localhost/");
- var viewModel = new MainViewModel(blog);
+ var viewModel = new BlogsViewModel(blog);
- var page = new MainPage { DataContext = viewModel };
+ var page = new BlogsPage { DataContext = viewModel };
// MainPage is a ContentPage (a Page, not a Control), so it
// must be hosted in a navigation surface. The production
// MainWindow.axaml uses NavigationPage, and the API is the
@@ -63,9 +64,7 @@ public class MainPageSaveTests
const string typed = "Mon premier billet";
titleBox.Text = typed;
- var saveButton = window.GetVisualDescendants()
- .OfType
public SignaturePadData Snapshot() => new(_strokes.ToArray());
+ ///
+ /// Copy of the current in-progress stroke, without the length
+ /// prefix used for sealed strokes. The view can render this as a
+ /// live preview while the user is still drawing.
+ ///
+ internal IReadOnlyList PendingStroke
+ => _capturing && _pendingPoints > 0
+ ? _strokes.GetRange(_strokes.Count - 2 * _pendingPoints, 2 * _pendingPoints)
+ : Array.Empty();
+
// --- Test-only surface (visible to PostIt.Tests) -------------------
///
@@ -183,6 +212,17 @@ public class SignaturePadControl : TemplatedControl
_pendingPoints++;
}
+ ///
+ /// Test hook: mark the control as actively capturing so tests
+ /// can exercise the live-preview path without synthetic pointer
+ /// events.
+ ///
+ internal void BeginCaptureForTest()
+ {
+ _capturing = true;
+ _pendingPoints = 0;
+ }
+
///
/// Test hook: seal the currently-pending stroke with a length
/// prefix. Mirrors what does at
diff --git a/src/PostIt/PostIt/Controls/StatusBar.axaml b/src/PostIt/PostIt/Controls/StatusBar.axaml
new file mode 100644
index 000000000..eaa6f5a09
--- /dev/null
+++ b/src/PostIt/PostIt/Controls/StatusBar.axaml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
diff --git a/src/PostIt/PostIt/Controls/StatusBar.axaml.cs b/src/PostIt/PostIt/Controls/StatusBar.axaml.cs
new file mode 100644
index 000000000..975f9b2f9
--- /dev/null
+++ b/src/PostIt/PostIt/Controls/StatusBar.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace PostIt.Controls;
+
+public partial class StatusBar : UserControl
+{
+ public StatusBar()
+ {
+ InitializeComponent();
+ }
+}
diff --git a/src/PostIt/PostIt/Helpers/FormHelpers.cs b/src/PostIt/PostIt/Helpers/FormHelpers.cs
new file mode 100644
index 000000000..18cc8fd0e
--- /dev/null
+++ b/src/PostIt/PostIt/Helpers/FormHelpers.cs
@@ -0,0 +1,50 @@
+using System;
+using PostIt.ViewModels;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Helpers;
+
+public static class FormHelpers
+{
+ public static BillingCommandPageViewModel?
+ CreateCommandPageViewModel(
+ this CommandFormSummary form,
+ ActivityInfo activity,
+ ActivityUserDisplayItem performer,
+ BillingApiClient billingClient)
+ {
+
+ string namespacePrefix = typeof(PostIt.ViewModels.Commands.RdvViewModel).Namespace + ".";
+
+ string formVMName = form.ActionName + "ViewModel";
+
+ string formOnActivityVMName = activity.Code + formVMName + "ViewModel";
+
+ var vmType = Type.GetType(namespacePrefix +formOnActivityVMName);
+ if (vmType == null)
+ {
+ vmType = Type.GetType(namespacePrefix + formVMName);
+ }
+ if (vmType == null)
+ {
+ Console.Error.WriteLine(
+ $"! Cannot find type '{formOnActivityVMName}' or '{formVMName}'");
+ return null;
+ }
+ if (!typeof(BillingCommandPageViewModel).IsAssignableFrom(vmType))
+ {
+ Console.Error.WriteLine($"! The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
+ return null;
+ }
+
+ var vm = Activator.CreateInstance(vmType, activity, performer, form, billingClient);
+
+ if (vm == null)
+ {
+ throw new InvalidOperationException($"Cannot create instance of '{formOnActivityVMName}' or '{formVMName}'");
+ }
+
+ return vm as BillingCommandPageViewModel ?? throw new InvalidOperationException($"The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
+ }
+}
diff --git a/src/PostIt/PostIt/Helpers/ImageHelper.cs b/src/PostIt/PostIt/Helpers/ImageHelper.cs
new file mode 100644
index 000000000..30e7e34e5
--- /dev/null
+++ b/src/PostIt/PostIt/Helpers/ImageHelper.cs
@@ -0,0 +1,34 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+
+namespace PostIt.Helpers;
+
+public static class ImageHelper
+{
+ private static readonly HttpClient HttpClient = new();
+
+ public static Bitmap LoadFromResource(Uri resourceUri)
+ {
+ return new Bitmap(AssetLoader.Open(resourceUri));
+ }
+
+ public static async Task LoadFromWeb(Uri url)
+ {
+ try
+ {
+ var response = await HttpClient.GetAsync(url).ConfigureAwait(false);
+ response.EnsureSuccessStatusCode();
+ var data = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
+ return new Bitmap(new MemoryStream(data));
+ }
+ catch (HttpRequestException ex)
+ {
+ Console.WriteLine($"An error occurred while downloading image '{url}': {ex.Message}");
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
index 5f19292ac..6bd54ca20 100644
--- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
+++ b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
@@ -3,6 +3,8 @@ using Microsoft.Extensions.DependencyInjection;
using PostIt.Services;
using PostIt.ViewModels;
using PostIt.Views;
+using PostIt.Views.Blogs;
+using PostIt.Views.Commands;
using Yavsc.Api.Client;
namespace PostIt.Helpers;
@@ -23,11 +25,18 @@ public static class ServiceCollectionHelpers
var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
+ var activityClient = new ActivityApiClient(
+ api,
+ () => settings.ApiUrl,
+ () => settings.Authentication?.Authority);
+ var billingClient = new BillingApiClient(api, () => settings.ApiUrl);
+ var estimateClient = new EstimateApiClient(api, () => settings.ApiUrl);
var userDirectory = new UserDirectory(userSearchClient);
+ var reverseGeocoding = new NominatimReverseGeocodingService();
// Vues
services.AddSingleton();
- services.AddSingleton();
+ services.AddSingleton();
services.AddSingleton();
// SettingsPage is a singleton: there must be one and only one
@@ -45,6 +54,15 @@ public static class ServiceCollectionHelpers
services.AddSingleton();
services.AddSingleton();
services.AddSingleton();
+ services.AddSingleton();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+
// ViewModels
services.AddSingleton(settings);
services.AddSingleton(api);
@@ -52,10 +70,16 @@ public static class ServiceCollectionHelpers
services.AddSingleton(circleClient);
services.AddSingleton(blogAclClient);
services.AddSingleton(userSearchClient);
+ services.AddSingleton(activityClient);
+ services.AddSingleton(billingClient);
+ services.AddSingleton(estimateClient);
+ services.AddSingleton(reverseGeocoding);
services.AddSingleton(userDirectory);
services.AddSingleton();
services.AddSingleton();
services.AddSingleton();
+ services.AddSingleton();
+ services.AddTransient();
// Dialogs (modal-light pages): the ViewLocator resolves
// them when a caller pushes a PostAclDialogViewModel or
@@ -71,7 +95,7 @@ public static class ServiceCollectionHelpers
sessionStatus.Refresh();
services.AddSingleton(sessionStatus);
services.AddSingleton();
- services.AddSingleton();
+ services.AddSingleton();
return services.BuildServiceProvider();
}
}
diff --git a/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs b/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs
index e4250cbb9..f30e021d9 100644
--- a/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs
+++ b/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs
@@ -8,7 +8,7 @@ namespace PostIt.Helpers;
public static class ViewModelBaseHelpers
{
- public static async Task PushPageAsync(this App app, ViewModelBase vm)
+ public static async Task PushPageAsync(this App app, ViewModelBase vm)
{
var window = app.View;
if (window is null)
@@ -43,9 +43,11 @@ public static class ViewModelBaseHelpers
var stack = window.NavRoot.NavigationStack;
if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
{
- return;
+ return page;
}
await window.NavRoot.PushAsync(page);
+
+ return page;
}
}
diff --git a/src/PostIt/PostIt/PostIt.csproj b/src/PostIt/PostIt/PostIt.csproj
index 177e346d3..09632bdf8 100644
--- a/src/PostIt/PostIt/PostIt.csproj
+++ b/src/PostIt/PostIt/PostIt.csproj
@@ -29,6 +29,8 @@
None
All
+
+
diff --git a/src/PostIt/PostIt/Services/CurrentLocationResult.cs b/src/PostIt/PostIt/Services/CurrentLocationResult.cs
new file mode 100644
index 000000000..ea19da436
--- /dev/null
+++ b/src/PostIt/PostIt/Services/CurrentLocationResult.cs
@@ -0,0 +1,28 @@
+namespace PostIt.Services;
+
+public sealed class CurrentLocationResult
+{
+ private CurrentLocationResult(bool isSuccess, bool isPermissionDenied, double? latitude, double? longitude, string message)
+ {
+ IsSuccess = isSuccess;
+ IsPermissionDenied = isPermissionDenied;
+ Latitude = latitude;
+ Longitude = longitude;
+ Message = message;
+ }
+
+ public bool IsSuccess { get; }
+ public bool IsPermissionDenied { get; }
+ public double? Latitude { get; }
+ public double? Longitude { get; }
+ public string Message { get; }
+
+ public static CurrentLocationResult Success(double latitude, double longitude, string? message = null)
+ => new(true, false, latitude, longitude, message ?? "Position récupérée.");
+
+ public static CurrentLocationResult PermissionDenied(string? message = null)
+ => new(false, true, null, null, message ?? "La géolocalisation n'est pas autorisée.");
+
+ public static CurrentLocationResult Unavailable(string? message = null)
+ => new(false, false, null, null, message ?? "La géolocalisation n'est pas disponible sur cette plateforme.");
+}
diff --git a/src/PostIt/PostIt/Services/IReverseGeocodingService.cs b/src/PostIt/PostIt/Services/IReverseGeocodingService.cs
new file mode 100644
index 000000000..0e62fe9dc
--- /dev/null
+++ b/src/PostIt/PostIt/Services/IReverseGeocodingService.cs
@@ -0,0 +1,9 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostIt.Services;
+
+public interface IReverseGeocodingService
+{
+ Task TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs b/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs
new file mode 100644
index 000000000..f9ddb2f6a
--- /dev/null
+++ b/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostIt.Services;
+
+public sealed class NominatimReverseGeocodingService : IReverseGeocodingService
+{
+ private static readonly Uri BaseUri = new("https://nominatim.openstreetmap.org/");
+ private readonly HttpClient _httpClient;
+
+ public NominatimReverseGeocodingService(HttpClient? httpClient = null)
+ {
+ _httpClient = httpClient ?? CreateDefaultClient();
+ }
+
+ public async Task TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default)
+ {
+ var requestUri = BuildReverseUri(latitude, longitude);
+
+ try
+ {
+ using var response = await _httpClient.GetAsync(requestUri, cancellationToken).ConfigureAwait(false);
+ if (!response.IsSuccessStatusCode)
+ return null;
+
+ await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+ using var json = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return FormatAddress(json.RootElement);
+ }
+ catch (OperationCanceledException)
+ {
+ throw;
+ }
+ catch
+ {
+ return null;
+ }
+ }
+
+ private static HttpClient CreateDefaultClient()
+ {
+ var client = new HttpClient
+ {
+ BaseAddress = BaseUri,
+ Timeout = TimeSpan.FromSeconds(10),
+ };
+ client.DefaultRequestHeaders.UserAgent.Clear();
+ client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("PostIt", "1.1"));
+ client.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("fr-FR"));
+ client.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("fr", 0.9));
+ return client;
+ }
+
+ private static Uri BuildReverseUri(double latitude, double longitude)
+ {
+ var lat = latitude.ToString("0.######", CultureInfo.InvariantCulture);
+ var lon = longitude.ToString("0.######", CultureInfo.InvariantCulture);
+ var path = $"reverse?format=jsonv2&addressdetails=1&accept-language=fr&zoom=18&lat={lat}&lon={lon}";
+ return new Uri(path, UriKind.Relative);
+ }
+
+ private static string? FormatAddress(JsonElement root)
+ {
+ if (root.TryGetProperty("address", out var address))
+ {
+ var street = JoinNonEmpty(
+ TryGetString(address, "house_number"),
+ TryGetString(address, "road"));
+
+ var locality = JoinNonEmpty(
+ TryGetString(address, "postcode"),
+ TryGetString(address, "city")
+ ?? TryGetString(address, "town")
+ ?? TryGetString(address, "village")
+ ?? TryGetString(address, "municipality"));
+
+ var formatted = JoinNonEmpty(street, locality);
+ if (!string.IsNullOrWhiteSpace(formatted))
+ return formatted;
+ }
+
+ if (root.TryGetProperty("display_name", out var displayName))
+ {
+ var value = displayName.GetString();
+ if (!string.IsNullOrWhiteSpace(value))
+ return value;
+ }
+
+ return null;
+ }
+
+ private static string? TryGetString(JsonElement element, string propertyName)
+ {
+ return element.TryGetProperty(propertyName, out var property)
+ ? property.GetString()
+ : null;
+ }
+
+ private static string? JoinNonEmpty(params string?[] values)
+ {
+ List? parts = null;
+ foreach (var value in values)
+ {
+ if (string.IsNullOrWhiteSpace(value))
+ continue;
+
+ parts ??= new List();
+ parts.Add(value.Trim());
+ }
+
+ return parts is null || parts.Count == 0 ? null : string.Join(", ", parts);
+ }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/Services/Platform.cs b/src/PostIt/PostIt/Services/Platform.cs
index 8e5f7e254..2e5ac76a3 100644
--- a/src/PostIt/PostIt/Services/Platform.cs
+++ b/src/PostIt/PostIt/Services/Platform.cs
@@ -1,4 +1,7 @@
+using System;
using IdentityModel.OidcClient.Browser;
+using System.Threading;
+using System.Threading.Tasks;
namespace PostIt.Services;
@@ -37,4 +40,12 @@ public static class Platform
///
public static System.Func? CreateBrowser { get; set; } =
() => new CustomSchemeBrowser(CustomScheme);
+
+ ///
+ /// Optional platform hook used by the shared billing form to request a
+ /// current device position. Platforms that do not expose a native
+ /// location provider can leave the default delegate in place.
+ ///
+ public static Func> TryGetCurrentLocationAsync { get; set; } =
+ _ => Task.FromResult(CurrentLocationResult.Unavailable());
}
diff --git a/src/PostIt/PostIt/Services/YavscApiClient.cs b/src/PostIt/PostIt/Services/YavscApiClient.cs
index 726b3f4f4..7e3187d8b 100644
--- a/src/PostIt/PostIt/Services/YavscApiClient.cs
+++ b/src/PostIt/PostIt/Services/YavscApiClient.cs
@@ -1,4 +1,5 @@
using System;
+using System.IO;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
@@ -190,7 +191,28 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
object? body = null,
CancellationToken ct = default)
{
- using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
+ using var response = await SendAsync(method, path, body is null ? null : () => JsonContent.Create(body), ct).ConfigureAwait(false);
+ await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
+
+ var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false);
+ var dto = await JsonSerializer.DeserializeAsync(stream,
+ new JsonSerializerOptions { PropertyNameCaseInsensitive = true }, ct).ConfigureAwait(false);
+ return dto!;
+ }
+
+ ///
+ /// Call a multipart endpoint, transparently refreshing the token if needed.
+ ///
+ public virtual async Task CallAsync(
+ HttpMethod method,
+ string path,
+ Func contentFactory,
+ CancellationToken ct = default)
+ {
+ if (contentFactory is null)
+ throw new ArgumentNullException(nameof(contentFactory));
+
+ using var response = await SendAsync(method, path, contentFactory, ct).ConfigureAwait(false);
await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false);
@@ -216,7 +238,23 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
object? body = null,
CancellationToken ct = default)
{
- using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
+ using var response = await SendAsync(method, path, body is null ? null : () => JsonContent.Create(body), ct).ConfigureAwait(false);
+ await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
+ }
+
+ ///
+ /// Call a multipart endpoint that returns no useful body (DELETE, etc.).
+ ///
+ public async Task CallAsync(
+ HttpMethod method,
+ string path,
+ Func contentFactory,
+ CancellationToken ct = default)
+ {
+ if (contentFactory is null)
+ throw new ArgumentNullException(nameof(contentFactory));
+
+ using var response = await SendAsync(method, path, contentFactory, ct).ConfigureAwait(false);
await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
}
@@ -231,7 +269,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
=> CallAsync(method, path, body: null, ct);
private async Task SendAsync(
- HttpMethod method, string path, object? body, CancellationToken ct)
+ HttpMethod method, string path, Func? contentFactory, CancellationToken ct)
{
if (_tokens is null)
throw new InvalidOperationException("Not logged in. Call LoginInteractiveAsync first.");
@@ -239,8 +277,8 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
await EnsureFreshTokenAsync(ct).ConfigureAwait(false);
using var req = new HttpRequestMessage(method, path);
- if (body is not null)
- req.Content = JsonContent.Create(body);
+ if (contentFactory is not null)
+ req.Content = contentFactory();
var response = await Http.SendAsync(req, ct).ConfigureAwait(false);
if (response.StatusCode == HttpStatusCode.Unauthorized)
@@ -251,8 +289,8 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
await ForceRefreshAsync(ct).ConfigureAwait(false);
using var retry = new HttpRequestMessage(method, path);
- if (body is not null)
- retry.Content = JsonContent.Create(body);
+ if (contentFactory is not null)
+ retry.Content = contentFactory();
response = await Http.SendAsync(retry, ct).ConfigureAwait(false);
}
@@ -351,6 +389,77 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
_store.Save(_tokens);
}
+ ///
+ /// Upload a user avatar to the Yavsc API. The server expects a
+ /// single multipart file named file and validates the image
+ /// content type before persisting it.
+ ///
+ public async Task SetAvatarAsync(
+ Stream imageStream,
+ string fileName,
+ string? contentType = null,
+ CancellationToken ct = default)
+ {
+ if (imageStream is null)
+ throw new ArgumentNullException(nameof(imageStream));
+ if (string.IsNullOrWhiteSpace(fileName))
+ throw new ArgumentException("A file name is required.", nameof(fileName));
+
+ var endpoint = new Uri(new Uri(Settings.ApiUrl.TrimEnd('/') + "/", UriKind.Absolute), "account/set-avatar");
+
+ await EnsureFreshTokenAsync(ct).ConfigureAwait(false);
+
+ var attemptUpload = async () =>
+ {
+ if (imageStream.CanSeek)
+ imageStream.Position = 0;
+
+ using var content = new MultipartFormDataContent();
+ using var fileContent = new StreamContent(imageStream);
+ fileContent.Headers.ContentType = new MediaTypeHeaderValue(
+ string.IsNullOrWhiteSpace(contentType) ? "application/octet-stream" : contentType);
+ content.Add(fileContent, "file", fileName);
+
+ using var request = new HttpRequestMessage(HttpMethod.Post, endpoint)
+ {
+ Content = content,
+ };
+
+ return await Http.SendAsync(request, ct).ConfigureAwait(false);
+ };
+
+ var response = await attemptUpload().ConfigureAwait(false);
+ if (response.StatusCode == HttpStatusCode.Unauthorized)
+ {
+ response.Dispose();
+ await ForceRefreshAsync(ct).ConfigureAwait(false);
+ response = await attemptUpload().ConfigureAwait(false);
+ }
+
+ await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
+
+ var payload = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
+ if (string.IsNullOrWhiteSpace(payload))
+ return "Avatar mis à jour.";
+
+ try
+ {
+ using var json = JsonDocument.Parse(payload);
+ if (json.RootElement.TryGetProperty("message", out var msgEl))
+ {
+ var message = msgEl.GetString();
+ if (!string.IsNullOrWhiteSpace(message))
+ return message;
+ }
+ }
+ catch (JsonException)
+ {
+ // Keep a user-friendly fallback when the API payload is not JSON.
+ }
+
+ return "Avatar mis à jour.";
+ }
+
public async Task LogoutAsync()
{
_store.Clear();
diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs
index 3543a9c9f..6f8c5d902 100644
--- a/src/PostIt/PostIt/ViewLocator.cs
+++ b/src/PostIt/PostIt/ViewLocator.cs
@@ -4,7 +4,10 @@ using Avalonia.Controls;
using Avalonia.Controls.Templates;
using Microsoft.Extensions.DependencyInjection;
using PostIt.ViewModels;
+using PostIt.ViewModels.Commands;
using PostIt.Views;
+using PostIt.Views.Blogs;
+using PostIt.Views.Commands;
namespace PostIt;
@@ -17,7 +20,7 @@ namespace PostIt;
public class ViewLocator : IDataTemplate
{
- public Control Build(object? data)
+ public Control Build(object? data)
{
try
{
@@ -36,17 +39,25 @@ public class ViewLocator : IDataTemplate
var services = app!.ServiceProvider!;
return data switch
{
- MainViewModel => services.GetRequiredService(),
+ BlogsViewModel => services.GetRequiredService(),
Settings => services.GetRequiredService(),
HomePageViewModel => services.GetRequiredService(),
+ ActivitiesPageViewModel => services.GetRequiredService(),
+ CommandFormsPageViewModel => services.GetRequiredService(),
+ BrushViewModel => services.GetRequiredService(),
+ RdvViewModel => services.GetRequiredService(),
SignaturePageViewModel => services.GetRequiredService(),
AddCircleMemberDialogViewModel => services.GetRequiredService(),
CirclesPageViewModel => services.GetRequiredService(),
PostAclDialogViewModel => services.GetRequiredService(),
+ BillingQueriesPageViewModel => services.GetRequiredService(),
+ BillingQueryDetailsPageViewModel => services.GetRequiredService(),
+ ProviderOngoingRequestsPageViewModel => services.GetRequiredService(),
+ EstimateEditionPageViewModel => services.GetRequiredService(),
null => new TextBlock { Text = "No view for " },
_ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
};
}
- public bool Match(object? data) => data is ViewModelBase;
+ public bool Match(object? data) => data is ViewModelBase;
}
diff --git a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/ACL/AddCircleMemberDialogViewModel.cs
similarity index 84%
rename from src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs
rename to src/PostIt/PostIt/ViewModels/ACL/AddCircleMemberDialogViewModel.cs
index 88d01335a..635073d1a 100644
--- a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/ACL/AddCircleMemberDialogViewModel.cs
@@ -29,7 +29,7 @@ namespace PostIt.ViewModels;
/// CirclesPage then calls
/// .
///
-public partial class AddCircleMemberDialogViewModel : ViewModelBase
+public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStatusViewModel
{
private readonly IUserDirectory _directory;
@@ -46,7 +46,10 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
public partial bool IsBusy { get; set; }
[ObservableProperty]
- public partial string StatusMessage { get; set; } = string.Empty;
+ public partial string StatusMessage { get; set; } = "Pret.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
///
/// Raised when the user confirms a selection. The hosting
@@ -79,7 +82,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
if (string.IsNullOrWhiteSpace(SearchQuery))
{
Results.Clear();
- StatusMessage = "Tapez un nom ou un email";
+ this.SetWarningStatus("Tapez un nom ou un email");
return;
}
@@ -88,11 +91,11 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
{
var hits = await _directory.SearchAsync(SearchQuery, CancellationToken.None).ConfigureAwait(true);
Results = new ObservableCollection(hits ?? Array.Empty());
- StatusMessage = $"{Results.Count} résultat(s)";
+ this.SetInfoStatus($"{Results.Count} résultat(s)");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -110,18 +113,20 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
{
if (Selected is null)
{
- StatusMessage = "Sélectionnez un utilisateur";
+ this.SetWarningStatus("Sélectionnez un utilisateur");
return;
}
Confirmed?.Invoke(this, Selected);
- var app = App.Current as App;
+ var app = App.Current as App
+ ?? throw new InvalidOperationException("Application PostIt indisponible.");
await app.GoBackAsync();
}
[RelayCommand]
public async Task CloseAsync()
{
- var app = App.Current as App;
+ var app = App.Current as App
+ ?? throw new InvalidOperationException("Application PostIt indisponible.");
await app.GoBackAsync();
}
}
diff --git a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs
similarity index 84%
rename from src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs
rename to src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs
index 9cee3ea8c..cd068b4f4 100644
--- a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs
@@ -34,7 +34,7 @@ namespace PostIt.ViewModels;
/// . The "remove"
/// command is per-row and runs inline.
///
-public partial class CirclesPageViewModel : ViewModelBase
+public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewModel
{
private readonly CircleApiClient _client;
@@ -63,8 +63,10 @@ public partial class CirclesPageViewModel : ViewModelBase
public partial bool IsBusy { get; set; }
[ObservableProperty]
- public partial string StatusMessage { get; set; } = string.Empty;
+ public partial string StatusMessage { get; set; } = "Pret.";
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
public CirclesPageViewModel(CircleApiClient client)
{
@@ -100,11 +102,11 @@ public partial class CirclesPageViewModel : ViewModelBase
{
var list = await _client.GetMyCirclesAsync();
Circles = new ObservableCollection(list ?? new());
- StatusMessage = $"{Circles.Count} cercle(s)";
+ this.SetInfoStatus($"{Circles.Count} cercle(s)");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -115,8 +117,10 @@ public partial class CirclesPageViewModel : ViewModelBase
[RelayCommand]
internal async Task OpenAddMemberAsync()
{
- var app = Application.Current as App;
- var services = app?.ServiceProvider;
+ var app = Application.Current as App
+ ?? throw new InvalidOperationException("Application PostIt indisponible.");
+ var services = app.ServiceProvider
+ ?? throw new InvalidOperationException("ServiceProvider PostIt indisponible.");
var directory = services.GetRequiredService();
AddCircleMemberDialogViewModel model =
new AddCircleMemberDialogViewModel(directory);
@@ -147,11 +151,11 @@ public partial class CirclesPageViewModel : ViewModelBase
{
var list = await _client.GetMembersAsync(circleId);
Members = new ObservableCollection(list ?? new());
- StatusMessage = $"{Members.Count} membre(s)";
+ this.SetInfoStatus($"{Members.Count} membre(s)");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
Members = new ObservableCollection();
}
finally
@@ -166,7 +170,7 @@ public partial class CirclesPageViewModel : ViewModelBase
SelectedCircle = null;
DraftName = string.Empty;
DraftPublic = false;
- StatusMessage = "Nouveau cercle";
+ this.SetInfoStatus("Nouveau cercle");
}
[RelayCommand]
@@ -176,7 +180,7 @@ public partial class CirclesPageViewModel : ViewModelBase
SelectedCircle = circle;
DraftName = circle.Name;
DraftPublic = circle.Public;
- StatusMessage = $"Édition de « {circle.Name} »";
+ this.SetInfoStatus($"Édition de « {circle.Name} »");
}
[RelayCommand]
@@ -184,7 +188,7 @@ public partial class CirclesPageViewModel : ViewModelBase
{
if (string.IsNullOrWhiteSpace(DraftName))
{
- StatusMessage = "Le nom est obligatoire";
+ this.SetWarningStatus("Le nom est obligatoire");
return;
}
@@ -198,22 +202,22 @@ public partial class CirclesPageViewModel : ViewModelBase
Name = DraftName.Trim(),
Public = DraftPublic,
});
- StatusMessage = created is null
- ? "Création échouée"
- : $"Cercle « {created.Name} » créé";
+ this.SetStatus(
+ created is null ? "Création échouée" : $"Cercle « {created.Name} » créé",
+ created is null ? StatusSeverity.Warning : StatusSeverity.Info);
}
else
{
SelectedCircle.Name = DraftName.Trim();
SelectedCircle.Public = DraftPublic;
await _client.UpdateCircleAsync(SelectedCircle.Id, SelectedCircle);
- StatusMessage = $"Cercle « {SelectedCircle.Name} » mis à jour";
+ this.SetInfoStatus($"Cercle « {SelectedCircle.Name} » mis à jour");
}
await RefreshAsync();
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -229,7 +233,7 @@ public partial class CirclesPageViewModel : ViewModelBase
try
{
await _client.DeleteCircleAsync(circle.Id);
- StatusMessage = $"Cercle « {circle.Name} » supprimé";
+ this.SetInfoStatus($"Cercle « {circle.Name} » supprimé");
// If the deleted circle was the selected one,
// clear the selection so the Members view goes
// empty too (the partial setter on
@@ -240,7 +244,7 @@ public partial class CirclesPageViewModel : ViewModelBase
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -261,7 +265,7 @@ public partial class CirclesPageViewModel : ViewModelBase
try
{
await _client.AddMemberAsync(SelectedCircle.Id, picked.Id);
- StatusMessage = $"« {picked.DisplayName} » ajouté au cercle";
+ this.SetInfoStatus($"« {picked.DisplayName} » ajouté au cercle");
await LoadMembersAsync(SelectedCircle.Id);
}
catch (Exception ex)
@@ -276,7 +280,7 @@ public partial class CirclesPageViewModel : ViewModelBase
var msg = ex.Message.Contains("409") || ex.Message.Contains("Conflict")
? "Déjà membre du cercle"
: $"Erreur: {ex.Message}";
- StatusMessage = msg;
+ this.SetStatus(msg, msg == "Déjà membre du cercle" ? StatusSeverity.Warning : StatusSeverity.Error);
}
finally
{
@@ -297,11 +301,11 @@ public partial class CirclesPageViewModel : ViewModelBase
{
await _client.RemoveMemberAsync(SelectedCircle.Id, member.Id);
Members.Remove(member);
- StatusMessage = $"« {member.UserName} » retiré du cercle";
+ this.SetInfoStatus($"« {member.UserName} » retiré du cercle");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
diff --git a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs
similarity index 87%
rename from src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs
rename to src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs
index 605446068..be1b220fa 100644
--- a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs
@@ -37,7 +37,7 @@ public sealed class PostAclEntry
/// any 403 / 404 will surface as an exception caught by the
/// command and routed to .
///
-public partial class PostAclDialogViewModel : ViewModelBase
+public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewModel
{
private readonly BlogAclApiClient _aclClient;
private readonly CircleApiClient _circleClient;
@@ -61,7 +61,10 @@ public partial class PostAclDialogViewModel : ViewModelBase
public partial bool IsBusy { get; set; }
[ObservableProperty]
- public partial string StatusMessage { get; set; } = string.Empty;
+ public partial string StatusMessage { get; set; } = "Pret.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
///
/// Idempotency gate for : the dialog
@@ -115,12 +118,12 @@ public partial class PostAclDialogViewModel : ViewModelBase
AclEntries = new ObservableCollection(AclEntries.Select(a => ToAclEntry(a.CircleId)));
- StatusMessage = $"{AclEntries.Count} autorisation(s)";
+ this.SetInfoStatus($"{AclEntries.Count} autorisation(s)");
_loaded = true;
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -133,7 +136,7 @@ public partial class PostAclDialogViewModel : ViewModelBase
{
if (SelectedCircleToAdd is null)
{
- StatusMessage = "Sélectionnez un cercle à ajouter";
+ this.SetWarningStatus("Sélectionnez un cercle à ajouter");
return;
}
@@ -142,7 +145,7 @@ public partial class PostAclDialogViewModel : ViewModelBase
{
if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id))
{
- StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
+ this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé");
return;
}
@@ -154,11 +157,11 @@ public partial class PostAclDialogViewModel : ViewModelBase
if (created is not null)
{
AclEntries.Add(ToAclEntry(created.CircleId));
- StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé";
+ this.SetInfoStatus($"Cercle « {SelectedCircleToAdd.Name} » autorisé");
}
else
{
- StatusMessage = "Autorisation refusée par le serveur";
+ this.SetWarningStatus("Autorisation refusée par le serveur");
}
}
catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict)
@@ -166,11 +169,11 @@ public partial class PostAclDialogViewModel : ViewModelBase
// Conflict means the link already exists in backend. Resync
// from the dedicated ACL API so the UI reflects server truth.
await ReloadAclEntriesFromServerAsync();
- StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
+ this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -189,11 +192,11 @@ public partial class PostAclDialogViewModel : ViewModelBase
var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId);
if (existing is not null)
AclEntries.Remove(existing);
- StatusMessage = "Autorisation révoquée";
+ this.SetInfoStatus("Autorisation révoquée");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
diff --git a/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs
new file mode 100644
index 000000000..bd13faf9b
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs
@@ -0,0 +1,278 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+ private readonly ActivityApiClient _client;
+ private readonly BillingApiClient _billingClient;
+ private bool _syncingSelection;
+
+ [ObservableProperty]
+ public partial ObservableCollection Activities { get; set; } = new();
+
+ [ObservableProperty]
+ public partial ActivityInfo? SelectedActivity { get; set; }
+
+ [ObservableProperty]
+ public partial ObservableCollection Specializations { get; set; } = new();
+
+ [ObservableProperty]
+ public partial ActivityInfo? SelectedSpecialization { get; set; }
+
+ [ObservableProperty]
+ public partial ObservableCollection Performers { get; set; } = new();
+
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenCommandFormsCommand))]
+ public partial ActivityUserDisplayItem? SelectedPerformer { get; set; }
+
+ [ObservableProperty]
+ public partial bool IsBusy { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Choisissez une activité.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Choisissez une activité.");
+
+ public ActivityInfo? CurrentActivity => SelectedSpecialization ?? SelectedActivity;
+ public string SelectedActivityLabel => SelectedActivity?.Name ?? "(aucune activité)";
+ public string CurrentActivityLabel => CurrentActivity?.Name ?? "(aucune)";
+ public int CurrentFormCount => CurrentActivity?.Forms?.Count ?? 0;
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public ActivitiesPageViewModel(ActivityApiClient client, BillingApiClient billingClient)
+ {
+ _client = client ?? throw new ArgumentNullException(nameof(client));
+ _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+ }
+
+ partial void OnSelectedActivityChanged(ActivityInfo? value)
+ {
+ if (_syncingSelection) return;
+ _ = ShowActivitySafeAsync(value);
+ }
+
+ partial void OnSelectedSpecializationChanged(ActivityInfo? value)
+ {
+ if (_syncingSelection) return;
+ _ = ShowSpecializationSafeAsync(value);
+ }
+
+ private async Task ShowActivitySafeAsync(ActivityInfo? value)
+ {
+ try
+ {
+ await ShowActivityAsync(value);
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur: {ex.Message}");
+ }
+ }
+
+ private async Task ShowSpecializationSafeAsync(ActivityInfo? value)
+ {
+ try
+ {
+ await ShowSpecializationAsync(value);
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur: {ex.Message}");
+ }
+ }
+
+ [RelayCommand]
+ public async Task RefreshAsync()
+ {
+ IsBusy = true;
+ try
+ {
+ var list = await _client.GetCatalogAsync();
+ Activities = new ObservableCollection(list ?? new());
+
+ var first = Activities.FirstOrDefault();
+ await ShowActivityAsync(first);
+ if (first is null)
+ {
+ this.SetInfoStatus("Aucune activité disponible.");
+ }
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ Activities = new ObservableCollection();
+ Specializations = new ObservableCollection();
+ Performers = new ObservableCollection();
+ this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ Activities = new ObservableCollection();
+ Specializations = new ObservableCollection();
+ Performers = new ObservableCollection();
+ this.SetErrorStatus($"Erreur: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ public async Task ShowActivityAsync(ActivityInfo? activity)
+ {
+ _syncingSelection = true;
+ try
+ {
+ SelectedActivity = activity;
+ SelectedSpecialization = null;
+ }
+ finally
+ {
+ _syncingSelection = false;
+ }
+
+ OnPropertyChanged(nameof(CurrentActivity));
+ OnPropertyChanged(nameof(SelectedActivityLabel));
+ OnPropertyChanged(nameof(CurrentActivityLabel));
+ OnPropertyChanged(nameof(CurrentFormCount));
+ Specializations = new ObservableCollection(activity?.Children ?? new());
+
+ if (activity is null)
+ {
+ Performers = new ObservableCollection();
+ SelectedPerformer = null;
+ return;
+ }
+
+ await LoadPerformersAsync(activity);
+ }
+
+ public async Task ShowSpecializationAsync(ActivityInfo? specialization)
+ {
+ _syncingSelection = true;
+ try
+ {
+ SelectedSpecialization = specialization;
+ }
+ finally
+ {
+ _syncingSelection = false;
+ }
+
+ OnPropertyChanged(nameof(CurrentActivity));
+ OnPropertyChanged(nameof(CurrentActivityLabel));
+ OnPropertyChanged(nameof(CurrentFormCount));
+
+ if (specialization is null)
+ {
+ if (SelectedActivity is not null)
+ {
+ await LoadPerformersAsync(SelectedActivity);
+ }
+ return;
+ }
+
+ await LoadPerformersAsync(specialization);
+ }
+
+ private async Task LoadPerformersAsync(ActivityInfo activity)
+ {
+ IsBusy = true;
+ try
+ {
+ var list = await _client.GetUsersAsync(activity.Code);
+ var items = (list ?? new())
+ .Select(dto => ActivityUserDisplayItem.FromDto(dto, _client.BuildAvatarXsUrl(dto.UserName)))
+ .ToList();
+
+ await Task.WhenAll(items.Select(async item =>
+ {
+ if (string.IsNullOrWhiteSpace(item.AvatarXsUrl))
+ {
+ return;
+ }
+
+ if (!Uri.TryCreate(item.AvatarXsUrl, UriKind.Absolute, out var avatarUri))
+ {
+ return;
+ }
+
+ item.AvatarImage = await ImageHelper.LoadFromWeb(avatarUri);
+ }));
+
+ Performers = new ObservableCollection(items);
+ SelectedPerformer = null;
+ this.SetInfoStatus($"{activity.Name} · {Performers.Count} utilisateur(s)");
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ Performers = new ObservableCollection();
+ SelectedPerformer = null;
+ this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ Performers = new ObservableCollection();
+ SelectedPerformer = null;
+ this.SetErrorStatus($"Erreur: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ OpenCommandFormsCommand.NotifyCanExecuteChanged();
+ }
+ }
+
+ private bool CanOpenCommandForms()
+ => SelectedPerformer is not null && CurrentActivity?.Forms?.Count > 0;
+
+ [RelayCommand(CanExecute = nameof(CanOpenCommandForms))]
+ private async Task OpenCommandFormsAsync()
+ {
+ if (SelectedPerformer is null || CurrentActivity is null)
+ {
+ this.SetWarningStatus("Sélectionnez un utilisateur et une activité avec formulaire.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ var vm = new CommandFormsPageViewModel(CurrentActivity, SelectedPerformer, _billingClient);
+ await app.PushPageAsync(vm);
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs b/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs
new file mode 100644
index 000000000..d89a66e96
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs
@@ -0,0 +1,50 @@
+using Avalonia.Media.Imaging;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Abstract.Workflow;
+
+namespace PostIt.ViewModels;
+
+public sealed partial class ActivityUserDisplayItem : ObservableObject
+{
+ public string PerformerId { get; init; } = string.Empty;
+ public string AvatarXsUrl { get; init; } = string.Empty;
+ public bool HasPerformerProfile { get; init; }
+ public string PerformerBadgeLabel { get; init; } = "Profil pro";
+ public bool IsPerformerActive { get; init; }
+ public string PerformerStatusBadgeLabel { get; init; } = "Inactif";
+ public string PerformerStatusBadgeBackground { get; init; } = "#FDECEA";
+ public string PerformerStatusBadgeBorder { get; init; } = "#C62828";
+ public string PerformerStatusBadgeForeground { get; init; } = "#8E0000";
+ public string UserName { get; init; } = string.Empty;
+ public string AvatarFallbackLabel { get; init; } = "?";
+ public string WebSite { get; init; } = string.Empty;
+ public int ExtraActivityCount { get; init; }
+ public string ExtraActivityLabel { get; init; } = "Pas d'autre activité";
+
+ [ObservableProperty]
+ public partial Bitmap? AvatarImage { get; set; }
+
+ public static ActivityUserDisplayItem FromDto(PerformerActivity dto, string avatarXsUrl)
+ {
+ return new ActivityUserDisplayItem
+ {
+ PerformerId = dto.PerformerId,
+ AvatarXsUrl = avatarXsUrl,
+ HasPerformerProfile = dto.HasPerformerProfile,
+ UserName = dto.UserName,
+ AvatarFallbackLabel = string.IsNullOrWhiteSpace(dto.UserName)
+ ? "?"
+ : dto.UserName.Trim()[0].ToString().ToUpperInvariant(),
+ WebSite = dto.WebSite,
+ IsPerformerActive = dto.Active,
+ PerformerStatusBadgeLabel = dto.Active ? "Actif" : "Inactif",
+ PerformerStatusBadgeBackground = dto.Active ? "#E6F7EC" : "#FDECEA",
+ PerformerStatusBadgeBorder = dto.Active ? "#2E7D32" : "#C62828",
+ PerformerStatusBadgeForeground = dto.Active ? "#1B5E20" : "#8E0000",
+ ExtraActivityCount = dto.ExtraActivityCount,
+ ExtraActivityLabel = dto.ExtraActivityCount == 0
+ ? "Pas d'autre activité"
+ : $"Autres spécialisations: {dto.ExtraActivityCount}"
+ };
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs
new file mode 100644
index 000000000..aab923d80
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc;
+using Yavsc.Api.Client;
+using Yavsc.Abstract.Workflow;
+
+namespace PostIt.ViewModels;
+
+public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+ private readonly BillingApiClient _billingClient;
+
+ public ActivityInfo Activity { get; }
+ public ActivityUserDisplayItem Performer { get; }
+ public CommandFormSummary Form { get; }
+ public bool IsReadOnly { get; }
+ public bool OngoingOnly { get; }
+
+ [ObservableProperty]
+ public partial ObservableCollection Queries { get; set; } = new();
+
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedQueryCommand))]
+ public partial BillingQueryDisplayItem? SelectedQuery { get; set; }
+
+ [ObservableProperty]
+ public partial bool IsBusy { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Chargement des commandes...";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Chargement des commandes...");
+
+ public string Title => IsReadOnly
+ ? $"Demandes en cours ({Form.Title})"
+ : $"Commandes {Form.Title}";
+ public string ContextLabel => $"{Performer.UserName} · {Activity.Name}";
+ public bool CanOpenDetails => !IsReadOnly;
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public BillingQueriesPageViewModel(
+ ActivityInfo activity,
+ ActivityUserDisplayItem performer,
+ CommandFormSummary form,
+ BillingApiClient billingClient,
+ bool isReadOnly = false,
+ bool ongoingOnly = false)
+ {
+ Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+ Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+ Form = form ?? throw new ArgumentNullException(nameof(form));
+ _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+ IsReadOnly = isReadOnly;
+ OngoingOnly = ongoingOnly;
+ }
+
+ public Task InitializeAsync() => RefreshAsync();
+
+ private bool CanOpenSelectedQuery() => CanOpenDetails && SelectedQuery is not null;
+
+ [RelayCommand]
+ public async Task RefreshAsync()
+ {
+ IsBusy = true;
+ try
+ {
+ var list = await _billingClient.GetQuerySummariesAsync(Form.ActionName).ConfigureAwait(true);
+ var filtered = (list ?? new())
+ .Where(q => q.ActivityCode == Activity.Code && q.PerformerId == Performer.PerformerId)
+ .Where(q => !OngoingOnly || IsOngoingStatus(q.Status))
+ .OrderByDescending(q => q.EventDate ?? DateTime.MinValue)
+ .ThenByDescending(q => q.Id)
+ .Select(BillingQueryDisplayItem.FromDto)
+ .ToList();
+
+ Queries = new ObservableCollection(filtered);
+ this.SetInfoStatus(BuildLoadedStatusMessage(filtered.Count));
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ Queries = new ObservableCollection();
+ this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ Queries = new ObservableCollection();
+ this.SetErrorStatus($"Erreur: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))]
+ public async Task OpenSelectedQueryAsync()
+ {
+ if (SelectedQuery is null)
+ {
+ this.SetWarningStatus("Sélectionnez une commande.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ IsBusy = true;
+ try
+ {
+ var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true);
+ var vm = new BillingQueryDetailsPageViewModel(
+ Activity,
+ Performer,
+ Form,
+ _billingClient,
+ details,
+ IsReadOnly);
+ await app.PushPageAsync(vm).ConfigureAwait(true);
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ private string BuildLoadedStatusMessage(int count)
+ {
+ if (count == 0)
+ {
+ return OngoingOnly
+ ? "Aucune demande en cours pour ce formulaire."
+ : "Aucune commande trouvée pour ce formulaire.";
+ }
+
+ if (OngoingOnly)
+ {
+ return $"{count} demande(s) en cours chargée(s) (lecture seule).";
+ }
+
+ return $"{count} commande(s) chargée(s).";
+ }
+
+ private static bool IsOngoingStatus(QueryStatus status)
+ => status is QueryStatus.Inserted or QueryStatus.Accepted or QueryStatus.InProgress;
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs
new file mode 100644
index 000000000..cd13daaf1
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+ private readonly BillingApiClient _billingClient;
+ private readonly BillingQueryDetailsDto _details;
+
+ public ActivityInfo Activity { get; }
+ public ActivityUserDisplayItem Performer { get; }
+ public CommandFormSummary Form { get; }
+ public bool IsReadOnly { get; }
+
+ public long Id => _details.Id;
+ public string Title => $"Detail commande #{_details.Id}";
+ public string ContextLabel => $"{Performer.UserName} · {Activity.Name} · {Form.Title}";
+ public string StatusLabel => _details.Status.ToString();
+ public string StatusGlyph => GetStatusGlyph(_details.Status);
+ public string StatusBadgeBackground => GetStatusBadgeBackground(_details.Status);
+ public string StatusBadgeBorder => GetStatusBadgeBorder(_details.Status);
+ public string StatusBadgeForeground => GetStatusBadgeForeground(_details.Status);
+ public string TitleForeground => StatusBadgeForeground;
+ public string BillingCode => _details.BillingCode;
+ public string Description => EmptyAsPlaceholder(_details.Description, "(sans description)");
+ public string Reason => EmptyAsPlaceholder(_details.Reason, "(aucun motif)");
+ public string AdditionalInfo => EmptyAsPlaceholder(_details.AdditionalInfo, "(aucune info complementaire)");
+ public string ClientId => EmptyAsPlaceholder(_details.ClientId, "(non renseigne)");
+ public string EventDateLabel => _details.EventDate?.ToLocalTime().ToString("f") ?? "Date non precisee";
+ public string ConsentLabel => _details.Consent ? "Oui" : "Non";
+ public string ProvisionalLabel => _details.Provisional.HasValue ? _details.Provisional.Value.ToString("0.00") : "(non renseigne)";
+ public string LocationLabel => BuildLocationLabel(_details.Location);
+ public string PrestationsLabel => BuildPrestationsLabel(_details);
+ public bool CanEdit => !IsReadOnly;
+
+ [ObservableProperty]
+ public partial bool IsBusy { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Pret.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public BillingQueryDetailsPageViewModel(
+ ActivityInfo activity,
+ ActivityUserDisplayItem performer,
+ CommandFormSummary form,
+ BillingApiClient billingClient,
+ BillingQueryDetailsDto details,
+ bool isReadOnly)
+ {
+ Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+ Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+ Form = form ?? throw new ArgumentNullException(nameof(form));
+ _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+ _details = details ?? throw new ArgumentNullException(nameof(details));
+ IsReadOnly = isReadOnly;
+
+ this.SetInfoStatus("Details de commande charges.");
+ }
+
+ [RelayCommand]
+ private async Task OpenEditorAsync()
+ {
+ if (IsReadOnly)
+ {
+ this.SetWarningStatus("Mode lecture seule: edition desactivee.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ IsBusy = true;
+ try
+ {
+ var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient);
+ if (vm is null)
+ {
+ this.SetWarningStatus("Ce formulaire n'est pas encore pris en charge en edition.");
+ return;
+ }
+
+ await vm.InitializeAsync(_details).ConfigureAwait(true);
+ await app.PushPageAsync(vm).ConfigureAwait(true);
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'ouverture en edition: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ [RelayCommand]
+ private async Task BackAsync()
+ {
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ await app.GoBackAsync().ConfigureAwait(true);
+ }
+
+ private static string EmptyAsPlaceholder(string? value, string placeholder)
+ => string.IsNullOrWhiteSpace(value) ? placeholder : value;
+
+ private static string BuildLocationLabel(BillingLocationDto? location)
+ {
+ if (location is null)
+ {
+ return "(non renseignee)";
+ }
+
+ var text = EmptyAsPlaceholder(location.Address, "adresse vide");
+ if (location.Latitude.HasValue && location.Longitude.HasValue)
+ {
+ text += $" ({location.Latitude.Value:0.####}, {location.Longitude.Value:0.####})";
+ }
+
+ return text;
+ }
+
+ private static string BuildPrestationsLabel(BillingQueryDetailsDto details)
+ {
+ if (details.PrestationIds.Count > 0)
+ {
+ return string.Join(", ", details.PrestationIds.Select(static id => id.ToString()));
+ }
+
+ return details.PrestationId.HasValue
+ ? details.PrestationId.Value.ToString()
+ : "(aucune)";
+ }
+
+ private static string GetStatusBadgeBackground(QueryStatus status)
+ => status switch
+ {
+ QueryStatus.Accepted => "#E6F7EC",
+ QueryStatus.InProgress => "#FFF4D6",
+ QueryStatus.Rejected => "#FDECEA",
+ QueryStatus.Failed => "#ECEFF1",
+ QueryStatus.Success => "#E8F8EF",
+ _ => "#EAF3FF",
+ };
+
+ private static string GetStatusBadgeBorder(QueryStatus status)
+ => status switch
+ {
+ QueryStatus.Accepted => "#2E7D32",
+ QueryStatus.InProgress => "#B26A00",
+ QueryStatus.Rejected => "#C62828",
+ QueryStatus.Failed => "#607D8B",
+ QueryStatus.Success => "#1E8E3E",
+ _ => "#2A5EA8",
+ };
+
+ private static string GetStatusBadgeForeground(QueryStatus status)
+ => status switch
+ {
+ QueryStatus.Accepted => "#1B5E20",
+ QueryStatus.InProgress => "#7A4A00",
+ QueryStatus.Rejected => "#8E0000",
+ QueryStatus.Failed => "#37474F",
+ QueryStatus.Success => "#145A2A",
+ _ => "#1A4178",
+ };
+
+ private static string GetStatusGlyph(QueryStatus status)
+ => status switch
+ {
+ QueryStatus.Accepted => "OK",
+ QueryStatus.InProgress => "~",
+ QueryStatus.Rejected => "!",
+ QueryStatus.Failed => "X",
+ QueryStatus.Success => "V",
+ _ => "i",
+ };
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs
new file mode 100644
index 000000000..bc4373377
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs
@@ -0,0 +1,35 @@
+using System;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public sealed class BillingQueryDisplayItem
+{
+ public long Id { get; init; }
+ public string Description { get; init; } = string.Empty;
+ public string Summary { get; init; } = string.Empty;
+ public string StatusLabel { get; init; } = string.Empty;
+ public string EventDateLabel { get; init; } = string.Empty;
+ public string BillingCode { get; init; } = string.Empty;
+
+ public static BillingQueryDisplayItem FromDto(BillingQuerySummaryDto dto)
+ {
+ var summary = !string.IsNullOrWhiteSpace(dto.Reason)
+ ? dto.Reason
+ : !string.IsNullOrWhiteSpace(dto.AdditionalInfo)
+ ? dto.AdditionalInfo
+ : dto.Description;
+
+ return new BillingQueryDisplayItem
+ {
+ Id = dto.Id,
+ Description = string.IsNullOrWhiteSpace(dto.Description)
+ ? $"Commande #{dto.Id}"
+ : dto.Description,
+ Summary = summary,
+ StatusLabel = dto.Status.ToString(),
+ EventDateLabel = dto.EventDate?.ToLocalTime().ToString("g") ?? "Date non précisée",
+ BillingCode = dto.BillingCode,
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs
new file mode 100644
index 000000000..533fbc380
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+ private readonly BillingApiClient _billingClient;
+
+ public ActivityInfo Activity { get; }
+ public ActivityUserDisplayItem Performer { get; }
+
+ [ObservableProperty]
+ public partial ObservableCollection Forms { get; set; }
+
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedFormCommand)), NotifyCanExecuteChangedFor(nameof(OpenQueriesCommand)), NotifyCanExecuteChangedFor(nameof(OpenOngoingQueriesCommand))]
+ public partial CommandFormSummary? SelectedForm { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Pret.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
+ public string Title => $"Formulaires pour {Performer.UserName}";
+ public string ContextLabel => $"{Activity.Name} · {Forms.Count} formulaire(s)";
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public CommandFormsPageViewModel(
+ ActivityInfo activity,
+ ActivityUserDisplayItem performer,
+ BillingApiClient billingClient)
+ {
+ Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+ Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+ _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+
+ Forms = new ObservableCollection((activity.Forms ?? new())
+ .OrderBy(f => f.Title)
+ .ThenBy(f => f.ActionName));
+ SelectedForm = Forms.FirstOrDefault();
+ this.SetStatus(
+ Forms.Count == 0
+ ? "Aucun formulaire n'est disponible pour cette activité."
+ : "Choisissez le formulaire à utiliser.",
+ Forms.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info);
+ }
+
+ private bool CanOpenSelectedForm() => SelectedForm is not null;
+
+ private bool CanOpenQueries() => SelectedForm is not null;
+
+ private bool CanOpenOngoingQueries() => SelectedForm is not null;
+
+ [RelayCommand(CanExecute = nameof(CanOpenSelectedForm))]
+ private async Task OpenSelectedFormAsync()
+ {
+ if (SelectedForm is null)
+ {
+ this.SetWarningStatus("Sélectionnez un formulaire.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ var vm = SelectedForm.CreateCommandPageViewModel(
+ Activity, Performer, _billingClient);
+ await vm!.InitializeAsync();
+ await app.PushPageAsync(vm);
+ }
+
+ [RelayCommand(CanExecute = nameof(CanOpenQueries))]
+ private async Task OpenQueriesAsync()
+ {
+ if (SelectedForm is null)
+ {
+ this.SetWarningStatus("Sélectionnez un formulaire.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ var vm = new BillingQueriesPageViewModel(Activity, Performer, SelectedForm, _billingClient);
+ await vm.InitializeAsync();
+ await app.PushPageAsync(vm);
+ }
+
+ [RelayCommand(CanExecute = nameof(CanOpenOngoingQueries))]
+ private async Task OpenOngoingQueriesAsync()
+ {
+ if (SelectedForm is null)
+ {
+ this.SetWarningStatus("Sélectionnez un formulaire.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ var vm = new BillingQueriesPageViewModel(
+ Activity,
+ Performer,
+ SelectedForm,
+ _billingClient,
+ isReadOnly: true,
+ ongoingOnly: true);
+ await vm.InitializeAsync();
+ await app.PushPageAsync(vm);
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs
new file mode 100644
index 000000000..8f007dc08
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+///
+/// Edition d'un devis (Estimate) créé en réponse à une demande
+/// client () consultée depuis la
+/// page « Mes demandes en cours ». L'envoi poste le devis sur
+/// api/v1/estimate; côté serveur, la commande liée
+/// () est alors marquée comme
+/// validée par le prestataire.
+///
+public partial class EstimateEditionPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+ private readonly EstimateApiClient _estimateClient;
+ private readonly BillingQuerySummaryDto _query;
+
+ public long QueryId => _query.Id;
+ public string ClientId => _query.ClientId;
+ public string BillingCode => _query.BillingCode;
+
+ public string Title => $"Devis — demande #{_query.Id}";
+
+ public string ContextLabel
+ => $"Demande #{_query.Id} · {BillingCode} · client {ClientId}";
+
+ public string QueryDescription => string.IsNullOrWhiteSpace(_query.Description)
+ ? "(sans description)"
+ : _query.Description;
+
+ [ObservableProperty]
+ public partial string EstimateTitle { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ public partial string EstimateDescription { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ public partial ObservableCollection Lines { get; set; } = new();
+
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(RemoveLineCommand))]
+ public partial EstimateLineItemViewModel? SelectedLine { get; set; }
+
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(SendCommand))]
+ public partial bool IsBusy { get; set; }
+
+ ///
+ /// True une fois le devis accepté par le serveur: l'envoi est
+ /// désactivé pour éviter les doublons, il ne reste que « Retour ».
+ ///
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(SendCommand))]
+ public partial bool HasSent { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Prêt.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Prêt.");
+
+ public decimal Total => Lines.Sum(line => line.LineTotal);
+
+ public string TotalLabel => $"{Total:0.00} {Lines.FirstOrDefault()?.Currency ?? "EUR"}";
+
+ public string SendLabel => HasSent ? "Devis envoyé" : "Envoyer le devis";
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public EstimateEditionPageViewModel(BillingQuerySummaryDto query, EstimateApiClient estimateClient)
+ {
+ _query = query ?? throw new ArgumentNullException(nameof(query));
+ _estimateClient = estimateClient ?? throw new ArgumentNullException(nameof(estimateClient));
+
+ EstimateDescription = query.Description ?? string.Empty;
+ Lines.CollectionChanged += OnLinesCollectionChanged;
+
+ AddLine();
+ this.SetInfoStatus("Complétez le devis puis envoyez-le. La demande associée sera validée.");
+ }
+
+ [RelayCommand]
+ private void AddLine()
+ {
+ var line = new EstimateLineItemViewModel();
+ Lines.Add(line);
+ SelectedLine = line;
+ }
+
+ private bool CanRemoveLine() => SelectedLine is not null && !IsBusy && !HasSent;
+
+ [RelayCommand(CanExecute = nameof(CanRemoveLine))]
+ private void RemoveLine()
+ {
+ if (SelectedLine is null)
+ {
+ return;
+ }
+
+ var index = Lines.IndexOf(SelectedLine);
+ Lines.Remove(SelectedLine);
+ SelectedLine = Lines.Count == 0
+ ? null
+ : Lines[Math.Min(index, Lines.Count - 1)];
+ }
+
+ private bool CanSend() => !IsBusy && !HasSent;
+
+ [RelayCommand(CanExecute = nameof(CanSend))]
+ private async Task SendAsync()
+ {
+ if (!TryValidate(out var validationMessage))
+ {
+ this.SetWarningStatus(validationMessage);
+ return;
+ }
+
+ IsBusy = true;
+ try
+ {
+ var payload = BuildPayload();
+ var created = await _estimateClient.CreateAsync(payload).ConfigureAwait(true);
+
+ HasSent = true;
+ OnPropertyChanged(nameof(SendLabel));
+ this.SetInfoStatus(
+ $"Devis #{created.Id} envoyé ({created.Bill.Count} ligne(s)). La demande #{QueryId} est validée.");
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé à l'API devis (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'envoi du devis: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ [RelayCommand]
+ private async Task BackAsync()
+ {
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ await app.GoBackAsync().ConfigureAwait(true);
+ }
+
+ internal EstimateDto BuildPayload()
+ {
+ return new EstimateDto
+ {
+ CommandId = QueryId,
+ ClientId = ClientId,
+ CommandType = BillingCode,
+ Title = EstimateTitle.Trim(),
+ Description = EstimateDescription.Trim(),
+ Bill = Lines.Select(line => new EstimateLineDto
+ {
+ Id = line.Id,
+ Name = line.Name.Trim(),
+ Description = line.Description.Trim(),
+ Count = Math.Max(1, (int)Math.Round(line.Count)),
+ UnitaryCost = line.UnitaryCost,
+ Currency = string.IsNullOrWhiteSpace(line.Currency) ? "EUR" : line.Currency.Trim(),
+ }).ToList(),
+ };
+ }
+
+ private bool TryValidate(out string message)
+ {
+ if (string.IsNullOrWhiteSpace(EstimateTitle))
+ {
+ message = "Le titre du devis est requis.";
+ return false;
+ }
+
+ if (string.IsNullOrWhiteSpace(ClientId))
+ {
+ message = "La demande sélectionnée n'identifie pas de client.";
+ return false;
+ }
+
+ if (string.IsNullOrWhiteSpace(BillingCode))
+ {
+ message = "La demande sélectionnée n'a pas de code de facturation.";
+ return false;
+ }
+
+ if (Lines.Count == 0)
+ {
+ message = "Ajoutez au moins une ligne au devis.";
+ return false;
+ }
+
+ foreach (var line in Lines)
+ {
+ if (string.IsNullOrWhiteSpace(line.Name))
+ {
+ message = "Chaque ligne doit avoir un nom.";
+ return false;
+ }
+
+ if (line.Name.Trim().Length > 256)
+ {
+ message = $"Le nom de la ligne « {line.Name.Trim()[..20]}… » dépasse 256 caractères.";
+ return false;
+ }
+
+ if (string.IsNullOrWhiteSpace(line.Description))
+ {
+ message = $"La ligne « {line.Name.Trim()} » doit avoir une description.";
+ return false;
+ }
+
+ if (line.Description.Trim().Length > 512)
+ {
+ message = $"La description de la ligne « {line.Name.Trim()} » dépasse 512 caractères.";
+ return false;
+ }
+
+ if (line.Count < 1)
+ {
+ message = $"La quantité de la ligne « {line.Name.Trim()} » doit être d'au moins 1.";
+ return false;
+ }
+ }
+
+ message = string.Empty;
+ return true;
+ }
+
+ private void OnLinesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+ {
+ if (e.OldItems is not null)
+ {
+ foreach (var item in e.OldItems.OfType())
+ {
+ item.PropertyChanged -= OnLinePropertyChanged;
+ }
+ }
+
+ if (e.NewItems is not null)
+ {
+ foreach (var item in e.NewItems.OfType())
+ {
+ item.PropertyChanged += OnLinePropertyChanged;
+ }
+ }
+
+ RaiseTotalsChanged();
+ }
+
+ private void OnLinePropertyChanged(object? sender, PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName is nameof(EstimateLineItemViewModel.LineTotal)
+ or nameof(EstimateLineItemViewModel.Currency))
+ {
+ RaiseTotalsChanged();
+ }
+ }
+
+ private void RaiseTotalsChanged()
+ {
+ OnPropertyChanged(nameof(Total));
+ OnPropertyChanged(nameof(TotalLabel));
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs
new file mode 100644
index 000000000..864906cdd
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs
@@ -0,0 +1,35 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace PostIt.ViewModels;
+
+///
+/// Editable estimate line. is exposed as a
+/// so it binds directly to
+/// NumericUpDown.Value (decimal?); it is rounded back
+/// to an integer when the DTO is built.
+///
+public partial class EstimateLineItemViewModel : ObservableObject
+{
+ public long Id { get; set; }
+
+ [ObservableProperty]
+ public partial string Name { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ public partial string Description { get; set; } = string.Empty;
+
+ [ObservableProperty, NotifyPropertyChangedFor(nameof(LineTotal))]
+ [NotifyPropertyChangedFor(nameof(LineTotalLabel))]
+ public partial decimal Count { get; set; } = 1m;
+
+ [ObservableProperty, NotifyPropertyChangedFor(nameof(LineTotal))]
+ [NotifyPropertyChangedFor(nameof(LineTotalLabel))]
+ public partial decimal UnitaryCost { get; set; }
+
+ [ObservableProperty]
+ public partial string Currency { get; set; } = "EUR";
+
+ public decimal LineTotal => Count * UnitaryCost;
+
+ public string LineTotalLabel => $"{LineTotal:0.00}";
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs
new file mode 100644
index 000000000..71e979e66
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs
@@ -0,0 +1,390 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class ProviderOngoingRequestsPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+ public const string SortByDate = "Date (plus récent d'abord)";
+ public const string SortByDateAsc = "Date (plus ancien d'abord)";
+ public const string SortByStatus = "Statut (en cours d'abord)";
+
+ private readonly BillingApiClient _billingClient;
+ private readonly EstimateApiClient? _estimateClient;
+ private readonly Settings? _settings;
+ private List _allQueries = new();
+
+ [ObservableProperty]
+ public partial ObservableCollection Queries { get; set; } = new();
+
+ [ObservableProperty]
+ public partial string FilterText { get; set; } = string.Empty;
+
+ public IReadOnlyList SortOptions { get; } = new[]
+ {
+ SortByDate,
+ SortByDateAsc,
+ SortByStatus,
+ };
+
+ [ObservableProperty]
+ public partial string SelectedSortOption { get; set; } = SortByDate;
+
+ [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedQueryCommand))]
+ [NotifyCanExecuteChangedFor(nameof(OpenSelectedEditorCommand))]
+ [NotifyCanExecuteChangedFor(nameof(CreateEstimateForSelectedCommand))]
+ public partial BillingQuerySummaryDto? SelectedQuery { get; set; }
+
+ [ObservableProperty]
+ public partial bool IsBusy { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Chargement des demandes fournisseur...";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Chargement des demandes fournisseur...");
+
+ public string Title => "Mes demandes en cours";
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public ProviderOngoingRequestsPageViewModel(
+ BillingApiClient billingClient,
+ Settings? settings = null,
+ EstimateApiClient? estimateClient = null)
+ {
+ _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+ _estimateClient = estimateClient;
+ _settings = settings;
+
+ if (_settings is not null)
+ {
+ var preferredSort = NormalizeSortOption(_settings.ProviderOngoingRequestsSortOption);
+ if (!string.Equals(preferredSort, SelectedSortOption, StringComparison.Ordinal))
+ {
+ SelectedSortOption = preferredSort;
+ }
+ }
+ }
+
+ public Task InitializeAsync() => RefreshAsync();
+
+ [RelayCommand]
+ public async Task RefreshAsync()
+ {
+ IsBusy = true;
+ try
+ {
+ var items = await _billingClient.GetProviderOngoingQueriesAsync().ConfigureAwait(true) ?? new();
+ _allQueries = items
+ .Where(x => !string.IsNullOrWhiteSpace(x.BillingCode))
+ .OrderByDescending(x => x.EventDate ?? DateTime.MinValue)
+ .ThenByDescending(x => x.Id)
+ .ToList();
+
+ ApplyFilter();
+ this.SetInfoStatus(_allQueries.Count == 0
+ ? "Aucune demande en cours pour votre profil fournisseur."
+ : $"{_allQueries.Count} demande(s) en cours chargée(s).");
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ _allQueries = new List();
+ Queries = new ObservableCollection();
+ this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ _allQueries = new List();
+ Queries = new ObservableCollection();
+ this.SetErrorStatus($"Erreur: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ private bool CanOpenSelectedQuery() => SelectedQuery is not null;
+
+ private bool CanOpenSelectedEditor() => SelectedQuery is not null;
+
+ [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))]
+ public async Task OpenSelectedQueryAsync()
+ {
+ if (SelectedQuery is null)
+ {
+ this.SetWarningStatus("Sélectionnez une demande.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ IsBusy = true;
+ try
+ {
+ var details = await _billingClient
+ .GetQueryAsync(SelectedQuery.BillingCode, SelectedQuery.Id)
+ .ConfigureAwait(true);
+ var (activity, performer, form) = BuildNavigationContext(SelectedQuery);
+
+ var vm = new BillingQueryDetailsPageViewModel(
+ activity,
+ performer,
+ form,
+ _billingClient,
+ details,
+ isReadOnly: false);
+
+ await app.PushPageAsync(vm).ConfigureAwait(true);
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ [RelayCommand(CanExecute = nameof(CanOpenSelectedEditor))]
+ public async Task OpenSelectedEditorAsync()
+ {
+ if (SelectedQuery is null)
+ {
+ this.SetWarningStatus("Sélectionnez une demande.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ IsBusy = true;
+ try
+ {
+ var details = await _billingClient
+ .GetQueryAsync(SelectedQuery.BillingCode, SelectedQuery.Id)
+ .ConfigureAwait(true);
+
+ var (activity, performer, form) = BuildNavigationContext(SelectedQuery);
+ var vm = form.CreateCommandPageViewModel(activity, performer, _billingClient);
+ if (vm is null)
+ {
+ this.SetWarningStatus($"Le formulaire '{form.ActionName}' n'est pas pris en charge en édition.");
+ return;
+ }
+
+ await vm.InitializeAsync(details).ConfigureAwait(true);
+ await app.PushPageAsync(vm).ConfigureAwait(true);
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'ouverture en édition: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ private bool CanCreateEstimateForSelected() => SelectedQuery is not null && _estimateClient is not null;
+
+ [RelayCommand(CanExecute = nameof(CanCreateEstimateForSelected))]
+ public async Task CreateEstimateForSelectedAsync()
+ {
+ if (SelectedQuery is null)
+ {
+ this.SetWarningStatus("Sélectionnez une demande.");
+ return;
+ }
+
+ if (_estimateClient is null)
+ {
+ this.SetWarningStatus("Le client devis n'est pas disponible.");
+ return;
+ }
+
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ var vm = new EstimateEditionPageViewModel(SelectedQuery, _estimateClient);
+ await app.PushPageAsync(vm).ConfigureAwait(true);
+ }
+
+ partial void OnFilterTextChanged(string value)
+ {
+ ApplyFilter();
+ }
+
+ partial void OnSelectedSortOptionChanged(string value)
+ {
+ var normalized = NormalizeSortOption(value);
+ if (!string.Equals(normalized, value, StringComparison.Ordinal))
+ {
+ SelectedSortOption = normalized;
+ return;
+ }
+
+ PersistSortPreference(value);
+ ApplyFilter();
+ }
+
+ private void ApplyFilter()
+ {
+ var query = FilterText?.Trim();
+ var filtered = string.IsNullOrWhiteSpace(query)
+ ? _allQueries
+ : _allQueries.Where(x =>
+ ContainsInsensitive(x.Description, query)
+ || ContainsInsensitive(x.ActivityCode, query)
+ || ContainsInsensitive(x.BillingCode, query)
+ || ContainsInsensitive(x.ClientId, query)
+ || ContainsInsensitive(x.Status.ToString(), query))
+ .ToList();
+
+ var sorted = ApplySort(filtered);
+ Queries = new ObservableCollection(sorted);
+ }
+
+ private List ApplySort(IEnumerable source)
+ {
+ if (string.Equals(SelectedSortOption, SortByStatus, StringComparison.Ordinal))
+ {
+ return source
+ .OrderBy(x => GetStatusRank(x.Status))
+ .ThenByDescending(x => x.EventDate ?? DateTime.MinValue)
+ .ThenByDescending(x => x.Id)
+ .ToList();
+ }
+
+ if (string.Equals(SelectedSortOption, SortByDateAsc, StringComparison.Ordinal))
+ {
+ return source
+ .OrderBy(x => x.EventDate ?? DateTime.MinValue)
+ .ThenBy(x => x.Id)
+ .ToList();
+ }
+
+ return source
+ .OrderByDescending(x => x.EventDate ?? DateTime.MinValue)
+ .ThenByDescending(x => x.Id)
+ .ToList();
+ }
+
+ private void PersistSortPreference(string selectedSort)
+ {
+ if (_settings is null)
+ {
+ return;
+ }
+
+ if (string.Equals(_settings.ProviderOngoingRequestsSortOption, selectedSort, StringComparison.Ordinal))
+ {
+ return;
+ }
+
+ _settings.ProviderOngoingRequestsSortOption = selectedSort;
+
+ try
+ {
+ _settings.Save();
+ }
+ catch
+ {
+ this.SetWarningStatus("Le tri a été appliqué, mais sa sauvegarde a échoué.");
+ }
+ }
+
+ private static string NormalizeSortOption(string? sortOption)
+ {
+ if (string.Equals(sortOption, SortByDate, StringComparison.Ordinal)
+ || string.Equals(sortOption, SortByDateAsc, StringComparison.Ordinal)
+ || string.Equals(sortOption, SortByStatus, StringComparison.Ordinal))
+ {
+ return sortOption!;
+ }
+
+ return SortByDate;
+ }
+
+ private static int GetStatusRank(QueryStatus status)
+ => status switch
+ {
+ QueryStatus.InProgress => 0,
+ QueryStatus.Accepted => 1,
+ QueryStatus.Inserted => 2,
+ QueryStatus.Success => 3,
+ QueryStatus.Rejected => 4,
+ QueryStatus.Failed => 5,
+ _ => 99,
+ };
+
+ private static bool ContainsInsensitive(string? source, string query)
+ => !string.IsNullOrWhiteSpace(source)
+ && source.Contains(query, StringComparison.OrdinalIgnoreCase);
+
+ private static (ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form)
+ BuildNavigationContext(BillingQuerySummaryDto query)
+ {
+ var activity = new ActivityInfo
+ {
+ Code = query.ActivityCode,
+ Name = string.IsNullOrWhiteSpace(query.ActivityCode)
+ ? "Activité"
+ : query.ActivityCode,
+ };
+
+ var performer = new ActivityUserDisplayItem
+ {
+ PerformerId = query.PerformerId,
+ UserName = "Mon profil fournisseur",
+ AvatarFallbackLabel = "M",
+ IsPerformerActive = true,
+ PerformerStatusBadgeLabel = "Actif",
+ PerformerStatusBadgeBackground = "#E6F7EC",
+ PerformerStatusBadgeBorder = "#2E7D32",
+ PerformerStatusBadgeForeground = "#1B5E20",
+ };
+
+ var form = new CommandFormSummary
+ {
+ ActionName = query.BillingCode,
+ Title = query.BillingCode,
+ };
+
+ return (activity, performer, form);
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs b/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs
new file mode 100644
index 000000000..ee07bb97a
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs
@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Models.Haircut;
+
+namespace PostIt.ViewModels;
+
+public partial class SelectableHairPrestationItem : ObservableObject
+{
+ public long Id { get; init; }
+ public string Title { get; init; } = string.Empty;
+ public string Details { get; init; } = string.Empty;
+
+ [ObservableProperty]
+ public partial bool IsSelected { get; set; }
+
+ public static SelectableHairPrestationItem FromDto(HairPrestationDto dto)
+ => new()
+ {
+ Id = dto.Id,
+ Title = dto.Title,
+ Details = dto.Details,
+ };
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/MainViewModel.cs b/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs
similarity index 78%
rename from src/PostIt/PostIt/ViewModels/MainViewModel.cs
rename to src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs
index f56b666dd..78be2e789 100644
--- a/src/PostIt/PostIt/ViewModels/MainViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.ObjectModel;
+using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Avalonia;
@@ -8,11 +9,12 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.DependencyInjection;
using Yavsc.Blogspot;
using Yavsc.Api.Client;
+using Yavsc.Abstract.Files;
using PostIt.Helpers;
namespace PostIt.ViewModels;
-public partial class MainViewModel : ViewModelBase
+public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
{
/// Window/tab title. Cosmetic — bound by
/// MainPage.axaml if at all. Not the post title.
@@ -54,6 +56,9 @@ public partial class MainViewModel : ViewModelBase
[ObservableProperty]
public partial string StatusMessage { get; set; }
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
[ObservableProperty]
public partial string SearchText { get; set; }
@@ -63,6 +68,9 @@ public partial class MainViewModel : ViewModelBase
[ObservableProperty]
public partial ObservableCollection FilteredPosts { get; set; }
+ [ObservableProperty]
+ public partial ObservableCollection DraftAttachments { get; set; }
+
[ObservableProperty]
public partial BlogPostDto? SelectedPost { get; set; }
@@ -84,16 +92,10 @@ public partial class MainViewModel : ViewModelBase
Posts.Add(post);
}
ApplyFilter();
- StatusMessage = $"Loaded {Posts.Count} posts.";
+ this.SetInfoStatus($"{Posts.Count} billet(s) chargé(s).");
});
}
- [RelayCommand]
- internal async Task SearchAsync() {
- await RefreshAsync();
- ApplyFilter();
- }
-
[RelayCommand]
internal async Task SaveAsync()
{
@@ -104,12 +106,14 @@ public partial class MainViewModel : ViewModelBase
// than to send a request the server will reject.
if (string.IsNullOrWhiteSpace(DraftTitle))
{
- StatusMessage = "Title is required.";
+ this.SetWarningStatus("Le titre est obligatoire.");
return;
}
await ExecuteAsync(async () =>
{
+ var attachments = DraftAttachments.ToArray();
+
// Build a fresh BlogPostDto from the editor buffer on
// every Save — we no longer mutate SelectedPost in
// place. The previous behaviour copied the buffer
@@ -130,11 +134,28 @@ public partial class MainViewModel : ViewModelBase
DateModified = DateTime.UtcNow,
IsPublished = DraftIsPublished
};
- var created = await BlogClient!.CreatePostAsync(draft);
+ var created = await BlogClient!.CreatePostAsync(draft, attachments);
if (created is not null)
{
SelectedPost = created;
- StatusMessage = $"Created post {created.Id}.";
+
+ if (TryAppendAttachmentLinks(created, attachments))
+ {
+ var linkUpdate = new BlogPostDto
+ {
+ Id = created.Id,
+ AuthorId = created.AuthorId,
+ Photo = created.Photo,
+ Title = DraftTitle,
+ Article = DraftArticle ?? string.Empty,
+ DateCreated = created.DateCreated,
+ DateModified = DateTime.UtcNow,
+ };
+ await BlogClient.UpdatePostAsync(created.Id, linkUpdate);
+ }
+
+ this.SetInfoStatus($"Billet {created.Id} créé.");
+ DraftAttachments.Clear();
}
}
else
@@ -149,8 +170,26 @@ public partial class MainViewModel : ViewModelBase
DateCreated = SelectedPost.DateCreated,
DateModified = DateTime.UtcNow,
};
- await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
- StatusMessage = $"Saved post {SelectedPost.Id}.";
+
+ await BlogClient!.UpdatePostAsync(SelectedPost.Id, update, attachments);
+
+ if (TryAppendAttachmentLinks(SelectedPost, attachments))
+ {
+ var linkUpdate = new BlogPostDto
+ {
+ Id = SelectedPost.Id,
+ AuthorId = SelectedPost.AuthorId,
+ Photo = SelectedPost.Photo,
+ Title = DraftTitle,
+ Article = DraftArticle ?? string.Empty,
+ DateCreated = SelectedPost.DateCreated,
+ DateModified = DateTime.UtcNow,
+ };
+ await BlogClient.UpdatePostAsync(SelectedPost.Id, linkUpdate);
+ }
+
+ this.SetInfoStatus($"Billet {SelectedPost.Id} enregistré.");
+ DraftAttachments.Clear();
}
await RefreshPostsAsync();
@@ -162,14 +201,14 @@ public partial class MainViewModel : ViewModelBase
{
if (SelectedPost is null || SelectedPost.Id == 0)
{
- StatusMessage = "Select an existing post before deleting.";
+ this.SetWarningStatus("Sélectionnez un billet existant avant suppression.");
return;
}
await ExecuteAsync(async () =>
{
await BlogClient!.DeletePostAsync(SelectedPost.Id);
- StatusMessage = $"Deleted post {SelectedPost.Id}.";
+ this.SetInfoStatus($"Billet {SelectedPost.Id} supprimé.");
SelectedPost = null;
await RefreshPostsAsync();
});
@@ -194,7 +233,7 @@ public partial class MainViewModel : ViewModelBase
{
if (SelectedPost is null || SelectedPost.Id == 0)
{
- StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
+ this.SetWarningStatus("Sélectionnez un billet existant pour changer sa publication.");
return;
}
@@ -211,9 +250,9 @@ public partial class MainViewModel : ViewModelBase
// locally flipped state until the round-trip
// re-hydrates it.
SelectedPost.IsPublished = publish;
- StatusMessage = publish
+ this.SetInfoStatus(publish
? $"Billet {SelectedPost.Id} publié."
- : $"Billet {SelectedPost.Id} remis en brouillon.";
+ : $"Billet {SelectedPost.Id} remis en brouillon.");
});
}
@@ -247,7 +286,7 @@ public partial class MainViewModel : ViewModelBase
{
if (SelectedPost is null)
{
- StatusMessage = "Select an existing post before managing ACL.";
+ this.SetWarningStatus("Sélectionnez un billet existant avant de gérer l'ACL.");
return;
}
@@ -333,7 +372,7 @@ public partial class MainViewModel : ViewModelBase
}
- public MainViewModel()
+ public BlogsViewModel()
{
SettingsModel = new Settings();
Init(SettingsModel);
@@ -344,9 +383,10 @@ public partial class MainViewModel : ViewModelBase
{
Posts = new ObservableCollection();
FilteredPosts = new ObservableCollection();
+ DraftAttachments = new ObservableCollection();
SelectedPost = null;
IsBusy = false;
- StatusMessage = "Ready";
+ this.SetInfoStatus("Prêt.");
Settings = settings ?? new Settings();
SearchText = Settings.SearchText;
WindowTitle = "PostIt";
@@ -393,7 +433,7 @@ public partial class MainViewModel : ViewModelBase
/// . Production code uses the
/// (Settings, BlogApiClient) overload below.
///
- public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
+ public BlogsViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
{
SettingsModel = new Settings();
BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ;
@@ -424,6 +464,7 @@ public partial class MainViewModel : ViewModelBase
// Mirror publication state too. Defaults to false on
// null selection so a fresh draft starts unpublished.
DraftIsPublished = value?.IsPublished ?? false;
+ DraftAttachments.Clear();
UpdateCommandStates();
}
@@ -476,12 +517,12 @@ public partial class MainViewModel : ViewModelBase
try
{
IsBusy = true;
- StatusMessage = "Working...";
+ this.SetInfoStatus("Traitement en cours...");
await action();
}
catch (Exception ex)
{
- StatusMessage = $"Error: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
finally
{
@@ -505,4 +546,55 @@ public partial class MainViewModel : ViewModelBase
IsLoaded = true;
}
}
+
+ private bool TryAppendAttachmentLinks(BlogPostDto post, IReadOnlyCollection attachments)
+ {
+ if (attachments.Count == 0)
+ return false;
+
+ var ownerSegment = post.Author?.UserName;
+ if (string.IsNullOrWhiteSpace(ownerSegment))
+ ownerSegment = post.AuthorId;
+
+ if (string.IsNullOrWhiteSpace(ownerSegment))
+ return false;
+
+ var article = DraftArticle ?? string.Empty;
+ var links = new List();
+
+ foreach (var attachment in attachments)
+ {
+ var relativePath = $"{EscapePathSegment(ownerSegment)}/blogs/{post.Id}/{EscapePathSegment(attachment.FileName)}";
+ var fileUrl = ResolveUserFileUrl(relativePath);
+ var markdownLine = $"- [{attachment.FileName}]({fileUrl})";
+
+ if (!article.Contains(markdownLine, StringComparison.Ordinal))
+ links.Add(markdownLine);
+ }
+
+ if (links.Count == 0)
+ return false;
+
+ var prefix = article.Length == 0
+ ? ""
+ : (article.EndsWith("\n", StringComparison.Ordinal) ? "\n" : "\n\n");
+
+ DraftArticle = article + prefix + string.Join("\n", links);
+ return true;
+ }
+
+ private string ResolveUserFileUrl(string relativePath)
+ {
+ var authority = Settings?.Authentication?.Authority;
+ if (!string.IsNullOrWhiteSpace(authority)
+ && Uri.TryCreate(authority, UriKind.Absolute, out var baseUri))
+ {
+ return FileServerUrlHelpers.GetUserFilesUri(baseUri, relativePath).ToString();
+ }
+
+ return $"{Yavsc.Constants.UserFilesPath}/{relativePath}";
+ }
+
+ private static string EscapePathSegment(string segment)
+ => Uri.EscapeDataString(segment);
}
diff --git a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs
new file mode 100644
index 000000000..5ad2b08f4
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+
+namespace PostIt.ViewModels;
+
+public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase, IActionStatusViewModel
+{
+ protected readonly BillingApiClient _billingClient;
+
+ public ActivityInfo Activity { get; }
+ public ActivityUserDisplayItem Performer { get; }
+ public CommandFormSummary Form { get; }
+
+ [ObservableProperty]
+ public partial bool IsBusy { get; set; }
+
+ [ObservableProperty]
+ public partial string StatusMessage { get; set; } = "Pret.";
+
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
+ [ObservableProperty]
+ public partial string Reason { get; set; } = string.Empty;
+
+
+
+ [ObservableProperty]
+ public partial bool Consent { get; set; } = true;
+
+
+ [ObservableProperty]
+ public partial string AdditionalInfo { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ public partial long? ExistingQueryId { get; set; }
+
+ [ObservableProperty]
+ public partial QueryStatus CommandStatus { get; set; } = QueryStatus.Inserted;
+
+ public bool CanUseCurrentLocation => IsSupported && !IsBusy;
+
+ public string Title => Form.Title;
+ public string PerformerLabel => Performer.UserName;
+ public string ActivityLabel => Activity.Name;
+ public virtual bool IsSupported => true;
+ public string BillingRoute => $"/billing/{Form.ActionName}";
+ public bool IsEditingExisting => ExistingQueryId.HasValue;
+ public string SubmitLabel => IsEditingExisting ? "Mettre à jour la commande" : "Poster la commande";
+ public virtual string SupportMessage => $"Le formulaire {Form.ActionName} n'est pas encore pris en charge dans PostIt.";
+
+ public override bool CanNavigateNext
+ {
+ get => false;
+ protected set { _ = value; }
+ }
+
+ public override bool CanNavigatePrevious
+ {
+ get => true;
+ protected set { _ = value; }
+ }
+
+ public BillingCommandPageViewModel(
+ ActivityInfo activity,
+ ActivityUserDisplayItem performer,
+ CommandFormSummary form,
+ BillingApiClient billingClient)
+ {
+ Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+ Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+ Form = form ?? throw new ArgumentNullException(nameof(form));
+ _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+
+ this.SetInfoStatus(SupportMessage);
+ }
+
+ partial void OnExistingQueryIdChanged(long? value)
+ {
+ OnPropertyChanged(nameof(IsEditingExisting));
+ OnPropertyChanged(nameof(SubmitLabel));
+ }
+
+ partial void OnIsBusyChanged(bool value)
+ {
+ OnPropertyChanged(nameof(CanUseCurrentLocation));
+ }
+
+ public async Task InitializeAsync(BillingQueryDetailsDto? existingQuery = null)
+ {
+ await LoadAsync();
+ if (existingQuery is not null)
+ {
+ ApplyExistingQuery(existingQuery);
+ return;
+ }
+ }
+
+ protected abstract void ApplyExistingQuery(BillingQueryDetailsDto existingQuery);
+
+
+
+ [RelayCommand]
+ protected abstract Task SubmitAsync();
+}
diff --git a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
new file mode 100644
index 000000000..72d9ce8ea
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Haircut;
+namespace PostIt.ViewModels.Commands;
+
+public partial class BrushViewModel : RdvViewModel
+{
+ public override string SupportMessage => "Choisissez une prestation coiffure puis postez la commande.";
+
+ [ObservableProperty]
+ public partial ObservableCollection AvailablePrestations { get; set; } = new();
+
+ [ObservableProperty]
+ public partial HairPrestationDto? SelectedPrestation { get; set; }
+
+ public BrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
+ : base(activity, performer, form, billingClient)
+ {
+ }
+
+ public override async Task LoadAsync()
+ {
+ var prestations = await _billingClient.GetHairPrestationsAsync(Form.ActionName);
+
+ AvailablePrestations = new ObservableCollection
+ (prestations ?? new List());
+
+ if (SelectedPrestation is null)
+ {
+ SelectedPrestation = AvailablePrestations.FirstOrDefault();
+ }
+
+ }
+
+ protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+ {
+ base.ApplyExistingQuery(existingQuery);
+
+ if (existingQuery.PrestationId is not null)
+ {
+ SelectedPrestation = AvailablePrestations.FirstOrDefault(x => x.Id == existingQuery.PrestationId.Value);
+ }
+
+ IsBusy = true;
+ try
+ {
+ if (SelectedPrestation is null)
+ {
+ SelectedPrestation = AvailablePrestations.FirstOrDefault();
+ }
+
+ this.SetStatus(
+ AvailablePrestations.Count == 0
+ ? "Aucune prestation coiffure disponible."
+ : SupportMessage,
+ AvailablePrestations.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info);
+ }
+ catch (HttpRequestException ex)
+ when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors du chargement des prestations: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ protected override async Task SubmitAsync()
+ {
+ if (!Consent)
+ {
+ this.SetWarningStatus("Le consentement est requis pour poster la commande.");
+ return;
+ }
+
+ if (string.IsNullOrWhiteSpace(Address))
+ {
+ this.SetWarningStatus("L'adresse du rendez-vous est requise.");
+ return;
+ }
+
+ if (SelectedPrestation is null)
+ {
+ this.SetWarningStatus("Sélectionnez une prestation coiffure.");
+ return;
+ }
+
+ IsBusy = true;
+ try
+ {
+ var address = Address.Trim();
+ var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
+
+ var payload = new BillingQueryDetailsDto
+ {
+ Id = ExistingQueryId ?? 0,
+ BillingCode = Form.ActionName,
+ ActivityCode = Activity.Code,
+ PerformerId = Performer.PerformerId,
+ Consent = Consent,
+ EventDate = EventDate,
+ Status = CommandStatus,
+ Reason = Reason.Trim(),
+ AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
+ Location = new BillingLocationDto
+ {
+ Address = address,
+ Latitude = Latitude,
+ Longitude = Longitude,
+ }
+ };
+
+ payload.PrestationId = SelectedPrestation.Id;
+
+ if (IsEditingExisting)
+ {
+ await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+ }
+ else
+ {
+ await _billingClient.CreateAsync(Form.ActionName, new
+ {
+ ActivityCode = Activity.Code,
+ PerformerId = Performer.PerformerId,
+ Consent,
+ EventDate = (DateTime?)EventDate,
+ Location = locationPayload,
+ PrestationId = SelectedPrestation.Id,
+ AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? null : AdditionalInfo.Trim(),
+ Status = payload.Status,
+ }).ConfigureAwait(true);
+ }
+
+ this.SetInfoStatus(IsEditingExisting
+ ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+ : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
+ }
+ catch (HttpRequestException ex)
+ when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
new file mode 100644
index 000000000..05481c2c3
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+
+namespace PostIt.ViewModels.Commands;
+
+public partial class MBrushViewModel : BrushViewModel
+{
+ public override string SupportMessage => "Choisissez une ou plusieurs prestations coiffure puis postez la commande.";
+
+ [ObservableProperty]
+ public partial ObservableCollection MultiPrestations { get; set; } = new();
+
+ public MBrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
+ : base(activity, performer, form, billingClient)
+ {
+ }
+
+ public override async Task LoadAsync()
+ {
+ await base.LoadAsync().ConfigureAwait(true);
+ MultiPrestations = new ObservableCollection(
+ AvailablePrestations.Select(SelectableHairPrestationItem.FromDto));
+ }
+
+ protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+ {
+ base.ApplyExistingQuery(existingQuery);
+
+ var selectedIds = existingQuery.PrestationIds is null
+ ? new HashSet()
+ : new HashSet(existingQuery.PrestationIds);
+
+ foreach (var item in MultiPrestations)
+ {
+ item.IsSelected = selectedIds.Contains(item.Id);
+ }
+ }
+
+ protected override async Task SubmitAsync()
+ {
+ if (!Consent)
+ {
+ this.SetWarningStatus("Le consentement est requis pour poster la commande.");
+ return;
+ }
+
+ if (string.IsNullOrWhiteSpace(Address))
+ {
+ this.SetWarningStatus("L'adresse du rendez-vous est requise.");
+ return;
+ }
+
+ var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList();
+ if (selectedPrestations.Count == 0)
+ {
+ this.SetWarningStatus("Sélectionnez au moins une prestation coiffure.");
+ return;
+ }
+
+ IsBusy = true;
+ try
+ {
+ var address = Address.Trim();
+ var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
+
+ var payload = new BillingQueryDetailsDto
+ {
+ Id = ExistingQueryId ?? 0,
+ BillingCode = Form.ActionName,
+ ActivityCode = Activity.Code,
+ PerformerId = Performer.PerformerId,
+ Consent = Consent,
+ EventDate = EventDate,
+ Status = CommandStatus,
+ Reason = Reason.Trim(),
+ Location = new BillingLocationDto
+ {
+ Address = address,
+ Latitude = Latitude,
+ Longitude = Longitude,
+ },
+ PrestationIds = selectedPrestations.Select(x => x.Id).ToList(),
+ };
+
+ if (IsEditingExisting)
+ {
+ await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+ }
+ else
+ {
+ await _billingClient.CreateAsync(Form.ActionName, new
+ {
+ ActivityCode = Activity.Code,
+ PerformerId = Performer.PerformerId,
+ Consent,
+ EventDate = EventDate,
+ Location = locationPayload,
+ Prestations = selectedPrestations.Select(x => new { PrestationId = x.Id }).ToList(),
+ Status = payload.Status,
+ }).ConfigureAwait(true);
+ }
+
+ this.SetInfoStatus(IsEditingExisting
+ ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+ : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
+ }
+ catch (HttpRequestException ex)
+ when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
new file mode 100644
index 000000000..4f9d457a5
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
@@ -0,0 +1,353 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Services;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels.Commands;
+
+public partial class RdvViewModel : BillingCommandPageViewModel
+{
+ private long? _existingLocationId;
+ private bool _hydratingExistingQuery;
+
+ public override string SupportMessage => "Complétez les informations du rendez-vous puis postez la commande.";
+
+ [ObservableProperty]
+ public partial string Address { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ public partial string SuggestedAddress { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ public partial bool IsResolvingAddress { get; set; }
+
+ [ObservableProperty]
+ public partial double? Latitude { get; set; }
+
+ [ObservableProperty]
+ public partial double? Longitude { get; set; }
+
+
+ [ObservableProperty]
+ public partial DateTime EventDate { get; set; }
+
+ public DateTimeOffset? EventDateSelection
+ {
+ get => new(EventDate);
+ set
+ {
+ if (!value.HasValue)
+ return;
+
+ EventDate = value.Value.LocalDateTime;
+ }
+ }
+
+ public RdvViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
+ : base(activity, performer, form, billingClient)
+ {
+ EventDate = DateTime.Now.AddDays(1);
+ }
+
+ public bool HasSuggestedAddress => !string.IsNullOrWhiteSpace(SuggestedAddress);
+ public bool HasSuggestedAddressPanel => HasSuggestedAddress || IsResolvingAddress;
+
+ protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+ {
+ _hydratingExistingQuery = true;
+ ExistingQueryId = existingQuery.Id;
+ CommandStatus = existingQuery.Status;
+ Consent = existingQuery.Consent;
+ Reason = existingQuery.Reason ?? string.Empty;
+ AdditionalInfo = existingQuery.AdditionalInfo ?? string.Empty;
+
+ if (existingQuery.EventDate is not null)
+ {
+ EventDate = existingQuery.EventDate.Value
+ .ToLocalTime();
+ }
+
+ if (existingQuery.Location is not null)
+ {
+ _existingLocationId = existingQuery.Location.Id;
+ Address = existingQuery.Location.Address ?? string.Empty;
+ SuggestedAddress = string.Empty;
+ Latitude = existingQuery.Location.Latitude;
+ Longitude = existingQuery.Location.Longitude;
+ }
+ else
+ {
+ _existingLocationId = null;
+ }
+
+ _hydratingExistingQuery = false;
+
+ this.SetInfoStatus($"Commande #{existingQuery.Id} chargée.");
+ }
+
+ [RelayCommand(CanExecute = nameof(CanUseCurrentLocation))]
+ private async Task UseCurrentLocationAsync()
+ {
+ if (!CanUseCurrentLocation)
+ {
+ return;
+ }
+
+ IsBusy = true;
+ try
+ {
+ var result = await Platform.TryGetCurrentLocationAsync(default).ConfigureAwait(true);
+ if (!result.IsSuccess || !result.Latitude.HasValue || !result.Longitude.HasValue)
+ {
+ this.SetWarningStatus(result.Message);
+ return;
+ }
+
+ Latitude = result.Latitude.Value;
+ Longitude = result.Longitude.Value;
+ this.SetInfoStatus(string.IsNullOrWhiteSpace(Address)
+ ? "Position récupérée. Complétez l'adresse puis envoyez la commande."
+ : result.Message);
+ }
+ catch (OperationCanceledException)
+ {
+ this.SetWarningStatus("La récupération de la position a été annulée.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Impossible de récupérer la position: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ protected static BillingLocationDto BuildLocationPayload(string address, double? latitude, double? longitude, long? locationId = null)
+ {
+ if (latitude.HasValue && longitude.HasValue)
+ {
+ return new BillingLocationDto
+ {
+ Id = locationId,
+ Address = address,
+ Latitude = latitude.Value,
+ Longitude = longitude.Value,
+ };
+ }
+
+ return new BillingLocationDto
+ {
+ Id = locationId,
+ Address = address,
+ };
+ }
+
+ public void ApplyLocationFromMap(double latitude, double longitude)
+ {
+ Latitude = Math.Round(latitude, 6);
+ Longitude = Math.Round(longitude, 6);
+
+ if (string.IsNullOrWhiteSpace(Address))
+ {
+ this.SetInfoStatus("Position sélectionnée sur la carte. Complétez l'adresse puis envoyez la commande.");
+ return;
+ }
+
+ this.SetInfoStatus("Position sélectionnée sur la carte.");
+ }
+
+ public void NotifyReverseGeocodingStarted()
+ {
+ IsResolvingAddress = true;
+ this.SetInfoStatus(string.IsNullOrWhiteSpace(Address)
+ ? "Recherche de l'adresse depuis la carte..."
+ : "Recherche d'une adresse suggérée..."
+ );
+ }
+
+ public void NotifyReverseGeocodingUnavailable()
+ {
+ IsResolvingAddress = false;
+ if (HasSuggestedAddress || !string.IsNullOrWhiteSpace(Address))
+ return;
+
+ this.SetInfoStatus("Position sélectionnée sur la carte. Complétez l'adresse puis envoyez la commande.");
+ }
+
+ public void ApplyResolvedAddress(string address)
+ {
+ if (string.IsNullOrWhiteSpace(address))
+ return;
+
+ var trimmedAddress = address.Trim();
+ if (string.IsNullOrWhiteSpace(Address))
+ {
+ Address = trimmedAddress;
+ SuggestedAddress = string.Empty;
+ IsResolvingAddress = false;
+ this.SetInfoStatus("Adresse mise à jour depuis la carte.");
+ return;
+ }
+
+ if (string.Equals(Address.Trim(), trimmedAddress, StringComparison.Ordinal))
+ {
+ SuggestedAddress = string.Empty;
+ IsResolvingAddress = false;
+ return;
+ }
+
+ SuggestedAddress = trimmedAddress;
+ IsResolvingAddress = false;
+ this.SetInfoStatus("Adresse suggérée depuis la carte. Appliquez-la si besoin.");
+ }
+
+ [RelayCommand(CanExecute = nameof(HasSuggestedAddress))]
+ private void ApplySuggestedAddress()
+ {
+ if (string.IsNullOrWhiteSpace(SuggestedAddress))
+ return;
+
+ Address = SuggestedAddress.Trim();
+ SuggestedAddress = string.Empty;
+ IsResolvingAddress = false;
+ this.SetInfoStatus("Adresse suggérée appliquée.");
+ }
+
+ partial void OnSuggestedAddressChanged(string value)
+ {
+ OnPropertyChanged(nameof(HasSuggestedAddress));
+ OnPropertyChanged(nameof(HasSuggestedAddressPanel));
+ ApplySuggestedAddressCommand.NotifyCanExecuteChanged();
+ }
+
+ partial void OnIsResolvingAddressChanged(bool value)
+ {
+ OnPropertyChanged(nameof(HasSuggestedAddressPanel));
+ }
+
+ partial void OnEventDateChanged(DateTime value)
+ {
+ OnPropertyChanged(nameof(EventDateSelection));
+ }
+
+ partial void OnAddressChanged(string value)
+ {
+ if (_hydratingExistingQuery)
+ return;
+
+ _existingLocationId = null;
+ }
+
+ partial void OnLatitudeChanged(double? value)
+ {
+ if (_hydratingExistingQuery)
+ return;
+
+ _existingLocationId = null;
+ }
+
+ partial void OnLongitudeChanged(double? value)
+ {
+ if (_hydratingExistingQuery)
+ return;
+
+ _existingLocationId = null;
+ }
+
+
+ protected override async Task SubmitAsync()
+ {
+ if (!IsSupported)
+ {
+ this.SetWarningStatus(SupportMessage);
+ return;
+ }
+
+ if (!Consent)
+ {
+ this.SetWarningStatus("Le consentement est requis pour poster la commande.");
+ return;
+ }
+
+ if (string.IsNullOrWhiteSpace(Address))
+ {
+ this.SetWarningStatus("L'adresse du rendez-vous est requise.");
+ return;
+ }
+
+
+ if (string.IsNullOrWhiteSpace(Reason))
+ {
+ this.SetWarningStatus("Le motif du rendez-vous est requis.");
+ return;
+ }
+
+
+
+ IsBusy = true;
+ try
+ {
+ var address = Address.Trim();
+ var locationPayload = BuildLocationPayload(address, Latitude, Longitude, IsEditingExisting ? _existingLocationId : null);
+
+ var payload = new BillingQueryDetailsDto
+ {
+ Id = ExistingQueryId ?? 0,
+ BillingCode = Form.ActionName,
+ ActivityCode = Activity.Code,
+ PerformerId = Performer.PerformerId,
+ Consent = Consent,
+ EventDate = EventDate,
+ Status = CommandStatus,
+ Reason = Reason.Trim(),
+ AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
+ Location = locationPayload
+ };
+
+ if (IsEditingExisting)
+ {
+ await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+ }
+ else
+ {
+ await _billingClient.CreateAsync(Form.ActionName, new
+ {
+ ActivityCode = Activity.Code,
+ PerformerId = Performer.PerformerId,
+ Consent,
+ EventDate = EventDate,
+ Location = locationPayload,
+ Reason = payload.Reason,
+ Status = payload.Status,
+ }).ConfigureAwait(true);
+ }
+
+ this.SetInfoStatus(IsEditingExisting
+ ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+ : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
+ }
+ catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+ {
+ this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+ }
+ catch (Exception ex)
+ {
+ this.SetErrorStatus($"Erreur lors de l'envoi: {ex.Message}");
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ public override Task LoadAsync()
+ {
+ return Task.CompletedTask;
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs b/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs
deleted file mode 100644
index 5d727729c..000000000
--- a/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using CommunityToolkit.Mvvm.Input;
-using PostIt.Services;
-namespace PostIt.ViewModels;
-
-public class HomePageViewModel : ViewModelBase
-{
- public YavscApiClient Api { get; }
- public Settings Settings { get; }
- public SessionStatusViewModel SessionStatus { get; }
-
- private string _welcomeText = "Welcome to PostIt!";
- public string WelcomeText
- {
- get => _welcomeText;
- set => SetProperty(ref _welcomeText, value);
- }
-
- public override bool CanNavigateNext { get => true; protected set => throw new System.NotImplementedException(); }
- public override bool CanNavigatePrevious { get => false; protected set => throw new System.NotImplementedException(); }
-
- public HomePageViewModel(YavscApiClient api, Settings settings, SessionStatusViewModel sessionStatus)
- {
- Api = api;
- Settings = settings;
- SessionStatus = sessionStatus;
-
- }
- public RelayCommand OpenBlogs { get; set; } = new RelayCommand(() => App.PushMainPageAsync());
- ///
- /// Avalonia designer constructor. Builds a self-contained VM
- /// with a freshly-constructed Settings so the XAML preview can
- /// render without a running App. Production paths always reach
- /// the parameterised constructor (DI or direct injection), and
- /// the postit://callback crash is fixed at the Settings layer
- /// (thread-safe dispatcher marshalling on PropertyChanged) — a
- /// designer-only duplicate instance is therefore harmless.
- ///
- public HomePageViewModel() : this(null!, new Settings(), new SessionStatusViewModel())
- {
-
- }
-}
diff --git a/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs
new file mode 100644
index 000000000..614d477c8
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs
@@ -0,0 +1,32 @@
+namespace PostIt.ViewModels;
+
+public interface IActionStatusViewModel
+{
+ string StatusMessage { get; set; }
+ StatusNotice ActionStatus { get; set; }
+}
+
+public static class ActionStatusViewModelExtensions
+{
+ public static void SetInfoStatus(this IActionStatusViewModel viewModel, string message)
+ => viewModel.SetStatus(message, StatusSeverity.Info);
+
+ public static void SetWarningStatus(this IActionStatusViewModel viewModel, string message)
+ => viewModel.SetStatus(message, StatusSeverity.Warning);
+
+ public static void SetErrorStatus(this IActionStatusViewModel viewModel, string message)
+ => viewModel.SetStatus(message, StatusSeverity.Error);
+
+ public static void SetStatus(this IActionStatusViewModel viewModel, string message, StatusSeverity severity)
+ {
+ var normalizedMessage = string.IsNullOrWhiteSpace(message) ? "Pret." : message.Trim();
+
+ viewModel.StatusMessage = normalizedMessage;
+ viewModel.ActionStatus = severity switch
+ {
+ StatusSeverity.Error => StatusNotice.Error(normalizedMessage),
+ StatusSeverity.Warning => StatusNotice.Warning(normalizedMessage),
+ _ => StatusNotice.Info(normalizedMessage),
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs
new file mode 100644
index 000000000..fd2ff1091
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Helpers;
+using PostIt.Services;
+using Yavsc.Api.Client;
+namespace PostIt.ViewModels;
+
+public class HomePageViewModel : ViewModelBase
+{
+ public YavscApiClient Api { get; }
+ public Settings Settings { get; }
+ public SessionStatusViewModel SessionStatus { get; }
+
+ private string _welcomeText = "Welcome to PostIt!";
+ public string WelcomeText
+ {
+ get => _welcomeText;
+ set => SetProperty(ref _welcomeText, value);
+ }
+
+ public override bool CanNavigateNext { get => true; protected set => throw new System.NotImplementedException(); }
+ public override bool CanNavigatePrevious { get => false; protected set => throw new System.NotImplementedException(); }
+
+ public HomePageViewModel(YavscApiClient api, Settings settings, SessionStatusViewModel sessionStatus)
+ {
+ Api = api;
+ Settings = settings;
+ SessionStatus = sessionStatus;
+
+ OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync);
+ OpenProviderRequests = new AsyncRelayCommand(OpenProviderRequestsAsync);
+ OpenBlogs = new AsyncRelayCommand(App.PushBlogsPageAsync);
+ }
+ public IAsyncRelayCommand OpenBlogs { get; }
+ public IAsyncRelayCommand OpenActivities { get; }
+ public IAsyncRelayCommand OpenProviderRequests { get; }
+
+ private async Task OpenActivitiesAsync()
+ {
+ var app = (App?)Application.Current;
+ var vm = app?.ServiceProvider?.GetRequiredService();
+ if (app is null || vm is null)
+ {
+ throw new InvalidOperationException("Activities page is not available.");
+ }
+
+ await vm.RefreshAsync();
+ await app.PushPageAsync(vm);
+ }
+
+ private async Task OpenProviderRequestsAsync()
+ {
+ var app = (App?)Application.Current;
+ if (app is null)
+ {
+ throw new InvalidOperationException("Application PostIt indisponible.");
+ }
+
+ var billingClient = app.ServiceProvider?.GetRequiredService();
+ if (billingClient is null)
+ {
+ throw new InvalidOperationException("Client billing indisponible.");
+ }
+
+ var estimateClient = app.ServiceProvider?.GetRequiredService();
+
+ var vm = new ProviderOngoingRequestsPageViewModel(billingClient, Settings, estimateClient);
+ await vm.InitializeAsync();
+ await app.PushPageAsync(vm);
+ }
+
+ ///
+ /// Avalonia designer constructor. Builds a self-contained VM
+ /// with a freshly-constructed Settings so the XAML preview can
+ /// render without a running App. Production paths always reach
+ /// the parameterised constructor (DI or direct injection), and
+ /// the postit://callback crash is fixed at the Settings layer
+ /// (thread-safe dispatcher marshalling on PropertyChanged) — a
+ /// designer-only duplicate instance is therefore harmless.
+ ///
+ public HomePageViewModel() : this(null!, new Settings(), new SessionStatusViewModel())
+ {
+
+ }
+}
diff --git a/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs
similarity index 100%
rename from src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs
rename to src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs
diff --git a/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs b/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs
new file mode 100644
index 000000000..c87af390c
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs
@@ -0,0 +1,35 @@
+namespace PostIt.ViewModels;
+
+public enum StatusSeverity
+{
+ Info,
+ Warning,
+ Error
+}
+
+public sealed class StatusNotice
+{
+ public string Message { get; }
+ public StatusSeverity Severity { get; }
+ public string Glyph { get; }
+ public string Background { get; }
+ public string BorderBrush { get; }
+ public string Foreground { get; }
+
+ private StatusNotice(string message, StatusSeverity severity)
+ {
+ Message = string.IsNullOrWhiteSpace(message) ? "Pret." : message;
+ Severity = severity;
+
+ (Glyph, Background, BorderBrush, Foreground) = severity switch
+ {
+ StatusSeverity.Error => ("!", "#7F1D1D", "#C62828", "#e1f0f6"),
+ StatusSeverity.Warning => ("~", "#7C4A03", "#E6A700", "#eaeaea"),
+ _ => ("i", "#E8F0FE", "#5B8DEF", "#1E3A8A"),
+ };
+ }
+
+ public static StatusNotice Info(string message) => new(message, StatusSeverity.Info);
+ public static StatusNotice Warning(string message) => new(message, StatusSeverity.Warning);
+ public static StatusNotice Error(string message) => new(message, StatusSeverity.Error);
+}
diff --git a/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs b/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs
new file mode 100644
index 000000000..0229cca49
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace PostIt.ViewModels;
+
+public abstract class RemoteViewModelBase : ViewModelBase
+{
+ public abstract Task LoadAsync();
+
+
+}
diff --git a/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs
index 8034820d9..3c23187e4 100644
--- a/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs
+++ b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs
@@ -22,7 +22,7 @@ public partial class AuthenticationSettings : ObservableObject
public const string DefaultClientId = "postit";
- public static readonly string[] DefaultScopes = { "blogs" };
+ public static readonly string[] DefaultScopes = { "blogs", "api" };
[ObservableProperty]
public partial string Authority { get; set; }
diff --git a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
index f942249b7..35d5a59fe 100644
--- a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
+++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.IO;
using System.Net.Http;
using System.Text.Json;
+using System.Text.Json.Serialization;
[assembly: InternalsVisibleTo("PostIt.Tests")]
@@ -14,7 +15,8 @@ namespace PostIt.ViewModels;
public partial class Settings : ViewModelBase
{
- const string SettingsFileName = "postit-settings.json";
+ [JsonIgnore]
+ public string? SettingsFileFullName { get; private set; }
[ObservableProperty]
public partial AuthenticationSettings Authentication { get; set; } = new();
@@ -26,11 +28,82 @@ public partial class Settings : ViewModelBase
public partial string BlogsApiUrl { get; set; } = "https://blogs.pschneider.fr/api/v1/";
[ObservableProperty]
- public partial string BusinessApiUrl { get; set; } = "https://business.pschneider.fr/api/v1/";
+ public partial string ApiUrl { get; set; } = "https://api.pschneider.fr/api/v1/";
[ObservableProperty]
public partial string SearchText { get; set; } = string.Empty;
+ [ObservableProperty]
+ public partial string ProviderOngoingRequestsSortOption { get; set; } = string.Empty;
+
+ [ObservableProperty]
+ [JsonIgnore]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
+
+ public bool Loaded { get; private set; } = false;
+
+
+ ///
+ /// True when the in-memory state has drifted from the last
+ /// or snapshot. The
+ /// Settings page binds the Sauver button's IsEnabled to
+ /// this flag, so it only enables when the user has actually
+ /// touched something since the last load / save. Cleared by
+ /// (and by ), set by
+ /// every successful setter on the four top-level mutable
+ /// properties and on the sub-properties of
+ /// .
+ ///
+ [ObservableProperty]
+ public partial bool IsDirty { get; private set; } = false;
+
+
+ ///
+ /// Guards every mutation of the observable state. [ObservableProperty]
+ /// generates setters that call SetProperty(...) which fires
+ /// PropertyChanged. Avalonia bindings consume that event on
+ /// the UI thread, and a stray background-thread update is exactly
+ /// what crashed DataValidationErrors.SetErrors on
+ /// postit://callback re-launches. The lock makes mutations
+ /// atomic;
+ /// then marshals the notification onto the UI thread so bindings
+ /// observe the change on the right thread.
+ ///
+ private readonly object _mutationGate = new();
+
+ ///
+ /// Scopes the PostIt client always requires from the OIDC provider,
+ /// regardless of what the user has in their settings file.
+ ///
+ /// PostIt calls into the Blog API (and any other Yavsc API
+ /// gated by an [Authorize("…Scope")] policy) and is silent
+ /// about the contract: a missing scope here surfaces as a 401
+ /// on the very first API call after login, with no obvious link
+ /// to the settings. The "feature" scopes the user must opt into
+ /// (e.g. blogs) are still their choice — we only force the
+ /// structural ones that OIDC itself needs.
+ ///
+ private static readonly string[] BuiltInScopes = new[]
+ {
+ "openid", // OIDC: required for the id_token
+ "profile", // OIDC: standard profile claims
+ "offline_access", // OIDC: required to receive a refresh_token
+ "blogs",
+ "api"
+ };
+ private readonly string DEFAULT_SETTINGS_FILENAME = "postit-settings.json";
+
+ public void SetActionStatus(string message, StatusSeverity severity = StatusSeverity.Info)
+ {
+ ActionStatus = severity switch
+ {
+ StatusSeverity.Error => StatusNotice.Error(message),
+ StatusSeverity.Warning => StatusNotice.Warning(message),
+ _ => StatusNotice.Info(message),
+ };
+ }
+
///
/// Catch top-level mutations: the four ObservableProperty
/// setters above all funnel through here, and we flip
@@ -45,8 +118,9 @@ public partial class Settings : ViewModelBase
partial void OnDarkModeChanged(bool value) => MarkDirty();
partial void OnBlogsApiUrlChanged(string value) => MarkDirty();
- partial void OnBusinessApiUrlChanged(string value) => MarkDirty();
+ partial void OnApiUrlChanged(string value) => MarkDirty();
partial void OnSearchTextChanged(string value) => MarkDirty();
+ partial void OnProviderOngoingRequestsSortOptionChanged(string value) => MarkDirty();
///
/// Authentication can be reassigned wholesale by
@@ -67,35 +141,6 @@ public partial class Settings : ViewModelBase
MarkDirty();
}
- public bool Loaded { get; private set; } = false;
-
- ///
- /// True when the in-memory state has drifted from the last
- /// or snapshot. The
- /// Settings page binds the Sauver button's IsEnabled to
- /// this flag, so it only enables when the user has actually
- /// touched something since the last load / save. Cleared by
- /// (and by ), set by
- /// every successful setter on the four top-level mutable
- /// properties and on the sub-properties of
- /// .
- ///
- [ObservableProperty]
- public partial bool IsDirty { get; private set; } = false;
-
- ///
- /// Guards every mutation of the observable state. [ObservableProperty]
- /// generates setters that call SetProperty(...) which fires
- /// PropertyChanged. Avalonia bindings consume that event on
- /// the UI thread, and a stray background-thread update is exactly
- /// what crashed DataValidationErrors.SetErrors on
- /// postit://callback re-launches. The lock makes mutations
- /// atomic;
- /// then marshals the notification onto the UI thread so bindings
- /// observe the change on the right thread.
- ///
- private readonly object _mutationGate = new();
-
///
/// Build OidcClient options configured for Authorization Code + PKCE
/// (no client secret). The browser implementation should be supplied
@@ -110,6 +155,8 @@ public partial class Settings : ViewModelBase
// build options from a torn read.
lock (_mutationGate)
{
+ EnsureAuthenticationDefaultsLocked();
+
var options = new OidcClientOptions
{
Authority = Authentication.Authority,
@@ -138,24 +185,25 @@ public partial class Settings : ViewModelBase
}
}
- ///
- /// Scopes the PostIt client always requires from the OIDC provider,
- /// regardless of what the user has in their settings file.
- ///
- /// PostIt calls into the Blog API (and any other Yavsc API
- /// gated by an [Authorize("…Scope")] policy) and is silent
- /// about the contract: a missing scope here surfaces as a 401
- /// on the very first API call after login, with no obvious link
- /// to the settings. The "feature" scopes the user must opt into
- /// (e.g. blogs) are still their choice — we only force the
- /// structural ones that OIDC itself needs.
- ///
- private static readonly string[] BuiltInScopes = new[]
+ private void EnsureAuthenticationDefaultsLocked()
{
- "openid", // OIDC: required for the id_token
- "profile", // OIDC: standard profile claims
- "offline_access" // OIDC: required to receive a refresh_token
- };
+ Authentication ??= new AuthenticationSettings();
+
+ if (string.IsNullOrWhiteSpace(Authentication.Authority))
+ Authentication.Authority = AuthenticationSettings.DefaultAuthority;
+
+ if (string.IsNullOrWhiteSpace(Authentication.ClientId))
+ Authentication.ClientId = AuthenticationSettings.DefaultClientId;
+
+ if (string.IsNullOrWhiteSpace(Authentication.RedirectUri))
+ Authentication.RedirectUri = AuthenticationSettings.DesktopRedirectUri;
+
+ if (Authentication.Scopes is null || Authentication.Scopes.Length == 0)
+ Authentication.Scopes = AuthenticationSettings.DefaultScopes;
+
+ Authentication.RefreshScopeListText();
+ }
+
///
/// Merge user-configured scopes with the built-in ones. User scopes
@@ -208,16 +256,42 @@ public partial class Settings : ViewModelBase
return;
}
}
-
+ if (Environment.GetEnvironmentVariable("POSTIT_SETTINGS_JSON") is string envJson
+ && !string.IsNullOrWhiteSpace(envJson))
+ {
+ Console.WriteLine("🔎 Loading settings from POSTIT_SETTINGS_JSON environment variable.");
+ FileInfo configByEnvFileInfo = new FileInfo(envJson);
+ if (!configByEnvFileInfo.Exists)
+ {
+ throw new Exception($"🩎 Settings file not found at {configByEnvFileInfo.FullName}");
+ }
+ string json = File.ReadAllText(configByEnvFileInfo.FullName);
+ ApplyJson(json, "POSTIT_SETTINGS_JSON");
+ SettingsFileFullName = configByEnvFileInfo.FullName;
+ Loaded = true;
+ return;
+ }
string configDir = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
- "PostIt"
-);
- Directory.CreateDirectory(configDir);
+ Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+ "PostIt"
+ );
- string configPath = Path.Combine(configDir, SettingsFileName);
+ if (SettingsFileFullName is not null)
+ {
+ // Already set by a previous Load() or by the environment
+ // variable path above. Use it as-is.
+ }
+ else if (Environment.GetEnvironmentVariable("POSTIT_SETTINGS_JSON") is string envPath
+ && !string.IsNullOrWhiteSpace(envPath))
+ {
+ SettingsFileFullName = envPath;
+ }
+ else
+ {
+ SettingsFileFullName = Path.Combine(configDir, "postit-settings.json");
+ }
- FileInfo configFileInfo = new FileInfo(configPath);
+ FileInfo configFileInfo = new FileInfo(SettingsFileFullName);
if (!configFileInfo.Exists)
{
@@ -246,6 +320,7 @@ public partial class Settings : ViewModelBase
using var reader = new StreamReader(stream);
var json = reader.ReadToEnd();
ApplyJson(json, $"user file {configFileInfo.FullName}");
+ SettingsFileFullName = configFileInfo.FullName;
Loaded = true;
}
catch (Exception ex)
@@ -297,9 +372,17 @@ public partial class Settings : ViewModelBase
// → our overridden dispatcher-safe marshaller below.
else lock (_mutationGate)
{
+ var legacyApiUrl = TryReadApiUrl(json);
this.Authentication = settings.Authentication;
this.DarkMode = settings.DarkMode;
+ this.BlogsApiUrl = !string.IsNullOrWhiteSpace(settings.BlogsApiUrl)
+ ? settings.BlogsApiUrl
+ : legacyApiUrl ?? this.BlogsApiUrl;
+ this.ApiUrl = !string.IsNullOrWhiteSpace(settings.ApiUrl)
+ ? settings.ApiUrl
+ : this.ApiUrl;
this.SearchText = settings.SearchText ?? string.Empty;
+ this.ProviderOngoingRequestsSortOption = settings.ProviderOngoingRequestsSortOption ?? string.Empty;
if (!(settings.Authentication is null))
{
this.Authentication = new AuthenticationSettings();
@@ -311,11 +394,13 @@ public partial class Settings : ViewModelBase
AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
{
- settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
+ this.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
}
else
this.Authentication.Scopes = settings.Authentication.Scopes;
}
+
+ EnsureAuthenticationDefaultsLocked();
}
// A disk load (or an embedded-resource fallback) is the
// baseline, not a user edit. Clear the dirty flag last
@@ -343,6 +428,26 @@ public partial class Settings : ViewModelBase
}
}
+ private static string? TryReadApiUrl(string json)
+ {
+ try
+ {
+ using var doc = JsonDocument.Parse(json);
+ if (doc.RootElement.TryGetProperty("ApiUrl", out var apiUrl)
+ && apiUrl.ValueKind == JsonValueKind.String)
+ {
+ return apiUrl.GetString();
+ }
+ }
+ catch
+ {
+ // Ignore legacy payload parse errors: normal deserialization
+ // already reports actionable diagnostics to the caller.
+ }
+
+ return null;
+ }
+
private void UseDefaultSettings()
{
this.Authentication = new AuthenticationSettings
@@ -353,7 +458,10 @@ public partial class Settings : ViewModelBase
Scopes = AuthenticationSettings.DefaultScopes
};
this.DarkMode = false;
+ this.BlogsApiUrl = "https://blogs.pschneider.fr/api/v1/";
+ this.ApiUrl = "https://api.pschneider.fr/api/v1/";
this.SearchText = string.Empty;
+ this.ProviderOngoingRequestsSortOption = string.Empty;
}
///
@@ -374,11 +482,19 @@ public partial class Settings : ViewModelBase
[RelayCommand(CanExecute = nameof(CanSave))]
public void Save()
{
- var configDir = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
- "PostIt");
- Directory.CreateDirectory(configDir);
- var configPath = Path.Combine(configDir, SettingsFileName);
+ SetActionStatus("Enregistrement des parametres...", StatusSeverity.Info);
+
+ if (SettingsFileFullName is null)
+ {
+ var configDir = Path.Combine(
+ Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+ "PostIt");
+ Directory.CreateDirectory(configDir);
+ SettingsFileFullName = Path.Combine(configDir, DEFAULT_SETTINGS_FILENAME);
+ }
+
+ var configPath = SettingsFileFullName!;
+ Directory.CreateDirectory(Path.GetDirectoryName(configPath)!);
lock (_mutationGate)
{
@@ -393,10 +509,13 @@ public partial class Settings : ViewModelBase
File.SetUnixFileMode(configPath,
UnixFileMode.UserRead | UnixFileMode.UserWrite);
IsDirty = false;
+ SetActionStatus("Parametres sauvegardes.", StatusSeverity.Info);
+
Console.WriteLine($"💾 Settings saved to {configPath}");
}
catch (Exception ex)
{
+ SetActionStatus($"Echec sauvegarde parametres: {ex.Message}", StatusSeverity.Error);
Console.Error.WriteLine($"🩎 Error saving settings to {configPath}: {ex.Message}");
throw;
}
diff --git a/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs b/src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs
similarity index 90%
rename from src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs
rename to src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs
index b4b37974b..23ba70cf9 100644
--- a/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs
@@ -30,7 +30,7 @@ namespace PostIt.ViewModels;
/// until the Yavsc.Org endpoint exists; the contract there will
/// be POST /api/signature/{devisId} with this same payload.
///
-public partial class SignaturePageViewModel : ViewModelBase
+public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewModel
{
///
/// Default capture surface, in DIPs. 3:1 ratio matches a
@@ -42,6 +42,9 @@ public partial class SignaturePageViewModel : ViewModelBase
[ObservableProperty]
public partial string StatusMessage { get; set; } = "Prêt.";
+ [ObservableProperty]
+ public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Prêt.");
+
[ObservableProperty]
public partial int StrokeCount { get; set; }
@@ -107,7 +110,7 @@ public partial class SignaturePageViewModel : ViewModelBase
private void OnStrokeCompleted(object? sender, SignaturePadData data)
{
- StatusMessage = $"Trait terminé. {data.StrokeCount} trait(s).";
+ this.SetInfoStatus($"Trait terminé. {data.StrokeCount} trait(s).");
RefreshCounts();
}
@@ -125,7 +128,7 @@ public partial class SignaturePageViewModel : ViewModelBase
public void Clear()
{
_control?.Clear();
- StatusMessage = "Effacé.";
+ this.SetInfoStatus("Effacé.");
RefreshCounts();
}
@@ -134,14 +137,14 @@ public partial class SignaturePageViewModel : ViewModelBase
{
if (_control is null)
{
- StatusMessage = "Contrôle non attaché.";
+ this.SetWarningStatus("Contrôle non attaché.");
return;
}
var data = _control.Snapshot();
if (data.IsEmpty)
{
- StatusMessage = "Rien à capturer.";
+ this.SetWarningStatus("Rien à capturer.");
return;
}
@@ -149,11 +152,11 @@ public partial class SignaturePageViewModel : ViewModelBase
{
var path = WriteCapture(data);
LastCapturedPath = path;
- StatusMessage = $"Capture enregistrée: {path}";
+ this.SetInfoStatus($"Capture enregistrée: {path}");
}
catch (Exception ex)
{
- StatusMessage = $"Erreur: {ex.Message}";
+ this.SetErrorStatus($"Erreur: {ex.Message}");
}
await Task.CompletedTask;
}
diff --git a/src/PostIt/PostIt/ViewModels/ViewModelBase.cs b/src/PostIt/PostIt/ViewModels/ViewModelBase.cs
index 4ca69eea0..307837645 100644
--- a/src/PostIt/PostIt/ViewModels/ViewModelBase.cs
+++ b/src/PostIt/PostIt/ViewModels/ViewModelBase.cs
@@ -1,8 +1,8 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
namespace PostIt.ViewModels;
-public abstract partial class ViewModelBase : ObservableObject
+public abstract class ViewModelBase : ObservableObject
{
///
/// Gets if the user can navigate to the next page
diff --git a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml b/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml
similarity index 93%
rename from src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml
rename to src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml
index 8b2329886..a17f8574e 100644
--- a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml
+++ b/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="PostIt.Views.AddCircleMemberDialog"
xmlns:vm="using:PostIt.ViewModels"
+ xmlns:postitControls="using:PostIt.Controls"
xmlns:services="using:PostIt.Services"
x:DataType="vm:AddCircleMemberDialogViewModel"
>
@@ -47,8 +48,8 @@
-
+
diff --git a/src/PostIt/PostIt/Views/Layout/SettingsPage.axaml.cs b/src/PostIt/PostIt/Views/Layout/SettingsPage.axaml.cs
new file mode 100644
index 000000000..b50245919
--- /dev/null
+++ b/src/PostIt/PostIt/Views/Layout/SettingsPage.axaml.cs
@@ -0,0 +1,116 @@
+
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Services;
+using PostIt.ViewModels;
+
+namespace PostIt.Views;
+public partial class SettingsPage: ContentPage
+{
+ private const int MaxAvatarSizeMegabytes = 2;
+ private const string AcceptedAvatarFormats = "PNG, JPG/JPEG, WEBP, GIF";
+
+ private int _avatarStatusVersion;
+
+ public SettingsPage()
+ {
+ InitializeComponent();
+ }
+
+ private async void ChooseAvatar_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+ {
+ var statusVersion = Interlocked.Increment(ref _avatarStatusVersion);
+ ChooseAvatarButton.IsEnabled = false;
+ SetAvatarStatus("Selection d'un fichier avatar...", StatusSeverity.Info);
+
+ var topLevel = TopLevel.GetTopLevel(this);
+ if (topLevel is null)
+ {
+ SetAvatarStatus("Impossible d'acceder a la fenetre active.", StatusSeverity.Error);
+ ChooseAvatarButton.IsEnabled = true;
+ return;
+ }
+
+ var files = await topLevel.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+ {
+ Title = "Choisir un avatar",
+ AllowMultiple = false,
+ FileTypeFilter = new[]
+ {
+ new FilePickerFileType("Images")
+ {
+ Patterns = new[] { "*.png", "*.jpg", "*.jpeg", "*.webp", "*.gif" }
+ }
+ }
+ });
+
+ var file = files.FirstOrDefault();
+ if (file is null)
+ {
+ SetAvatarStatus("Upload annule.", StatusSeverity.Warning);
+ ChooseAvatarButton.IsEnabled = true;
+ return;
+ }
+
+ try
+ {
+ SetAvatarStatus("Upload avatar en cours...", StatusSeverity.Info);
+
+ await using var stream = await file.OpenReadAsync();
+ var api = ((App)App.Current!).ServiceProvider!.GetRequiredService();
+ var message = await api.SetAvatarAsync(stream, file.Name, GetMimeType(file.Name));
+ SetAvatarStatus(string.IsNullOrWhiteSpace(message)
+ ? "Avatar mis a jour."
+ : message,
+ StatusSeverity.Info);
+
+ _ = ClearSuccessStatusLaterAsync(statusVersion);
+ }
+ catch (Exception ex)
+ {
+ SetAvatarStatus($"Echec upload avatar: {ex.Message}", StatusSeverity.Error);
+ Console.Error.WriteLine($"🩎 Avatar upload failed: {ex.Message}");
+ }
+ finally
+ {
+ ChooseAvatarButton.IsEnabled = true;
+ }
+ }
+
+ private async Task ClearSuccessStatusLaterAsync(int statusVersion)
+ {
+ await Task.Delay(TimeSpan.FromSeconds(5)).ConfigureAwait(true);
+ if (statusVersion != _avatarStatusVersion)
+ return;
+
+ SetAvatarStatus($"Avatar pret. Formats supportes: {AcceptedAvatarFormats}. Taille max: {MaxAvatarSizeMegabytes} MB.", StatusSeverity.Info);
+ }
+
+ private void SetAvatarStatus(string message, StatusSeverity severity)
+ {
+ if (DataContext is Settings settings)
+ {
+ settings.SetActionStatus(message, severity);
+ }
+ }
+
+ private static string GetMimeType(string fileName)
+ {
+ var ext = Path.GetExtension(fileName)?.ToLowerInvariant();
+ return ext switch
+ {
+ ".png" => "image/png",
+ ".jpg" or ".jpeg" => "image/jpeg",
+ ".webp" => "image/webp",
+ ".gif" => "image/gif",
+ _ => "application/octet-stream"
+ };
+ }
+}
diff --git a/src/PostIt/PostIt/Views/MainPage.axaml b/src/PostIt/PostIt/Views/MainPage.axaml
deleted file mode 100644
index 0d2f5411f..000000000
--- a/src/PostIt/PostIt/Views/MainPage.axaml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/PostIt/PostIt/Views/MainPage.axaml.cs b/src/PostIt/PostIt/Views/MainPage.axaml.cs
deleted file mode 100644
index 97e3f9227..000000000
--- a/src/PostIt/PostIt/Views/MainPage.axaml.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-
-namespace PostIt.Views;
-
-public partial class MainPage : ContentPage
-{
- public MainPage()
- {
- InitializeComponent();
- }
-
- protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
- {
- base.OnApplyTemplate(e);
- if (DataContext is ViewModels.MainViewModel vm)
- {
- if (!vm.IsLoaded)
- {
- vm.RefreshAsync().Wait();
- }
- }
- }
-}
diff --git a/src/PostIt/PostIt/Views/SettingsPage.axaml.cs b/src/PostIt/PostIt/Views/SettingsPage.axaml.cs
deleted file mode 100644
index 14916bb30..000000000
--- a/src/PostIt/PostIt/Views/SettingsPage.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-using Avalonia.Controls;
-
-namespace PostIt.Views;
-public partial class SettingsPage: ContentPage
-{
- public SettingsPage()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/Views/SignaturePage.axaml b/src/PostIt/PostIt/Views/Signature/SignaturePage.axaml
similarity index 94%
rename from src/PostIt/PostIt/Views/SignaturePage.axaml
rename to src/PostIt/PostIt/Views/Signature/SignaturePage.axaml
index d868f2a48..021208b54 100644
--- a/src/PostIt/PostIt/Views/SignaturePage.axaml
+++ b/src/PostIt/PostIt/Views/Signature/SignaturePage.axaml
@@ -3,6 +3,7 @@
xmlns:d="http://github.com/avaloniaui/avalonia"
xmlns:vm="using:PostIt.ViewModels"
xmlns:controls="using:PostIt.Controls"
+ xmlns:postitControls="using:PostIt.Controls"
x:Class="PostIt.Views.SignaturePage"
x:DataType="vm:SignaturePageViewModel"
HorizontalAlignment="Stretch"
@@ -59,10 +60,8 @@
-
+
0)
+ {
+ var poly = new Polyline
+ {
+ Stroke = StrokeBrush,
+ StrokeThickness = StrokeThickness,
+ StrokeLineCap = PenLineCap.Round,
+ StrokeJoin = PenLineJoin.Round,
+ };
+
+ var pts = new List(pending.Count / 2);
+ for (int p = 0; p < pending.Count; p += 2)
+ {
+ int nx = pending[p];
+ int ny = pending[p + 1];
+ pts.Add(new Point(nx / CoordinateMax * w, ny / CoordinateMax * h));
+ }
+
+ poly.Points = pts;
+ InkLayer.Children.Add(poly);
+ }
}
}
diff --git a/src/PostIt/PostIt/postit-settings sample.json b/src/PostIt/PostIt/postit-settings sample.json
deleted file mode 100644
index 6d8da8faf..000000000
--- a/src/PostIt/PostIt/postit-settings sample.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "Authentication": {
- "ClientId": "postit",
- "Authority": "https://yavsc.pschneider.fr"
- },
- "RedirectUri": "postit://callback",
- "DarkMode": false,
- "ApiUrl": "https://blogs.pschneider.fr/api/v1/",
- "Scopes": [
- "openid",
- "profile",
- "offline_access",
- "blogs"
- ]
-}
diff --git a/src/PostIt/PostIt/postit-settings-sample.json b/src/PostIt/PostIt/postit-settings-sample.json
new file mode 100644
index 000000000..fbf1f68a0
--- /dev/null
+++ b/src/PostIt/PostIt/postit-settings-sample.json
@@ -0,0 +1,17 @@
+{
+ "Authentication": {
+ "ClientId": "postit",
+ "Authority": "https://yavsc.pschneider.fr",
+ "Scopes": [
+ "openid",
+ "profile",
+ "offline_access",
+ "blogs",
+ "api"
+ ],
+ "RedirectUri": "postit://callback"
+ },
+ "DarkMode": false,
+ "ApiUrl": "https://api.pschneider.fr/api/v1/"
+
+}
diff --git a/src/PostIt/PostIt/postit-settings.json b/src/PostIt/PostIt/postit-settings.json
index 079479515..f62a9ac1c 100644
--- a/src/PostIt/PostIt/postit-settings.json
+++ b/src/PostIt/PostIt/postit-settings.json
@@ -1,15 +1,21 @@
{
- "Authentication": {
- "ClientId": "postit",
- "Authority": "https://yavsc.pschneider.fr/"
- },
- "RedirectUri": "postit://callback",
- "DarkMode": true,
- "ApiUrl": "https://blogs.pschneider.fr/api/v1/",
+ "Authentication": {
+ "Authority": "https://localhost:5001",
+ "ClientId": "postit",
"Scopes": [
- "openid",
- "profile",
- "offline_access",
- "blogs"
- ]
-}
+ "blogs",
+ "api"
+ ],
+ "RedirectUri": "postit://callback"
+ },
+ "DarkMode": true,
+ "BlogsApiUrl": "https://localhost:5003/api/v1/",
+ "ApiUrl": "https://localhost:5005/api/v1/",
+ "SearchText": "",
+ "ProviderOngoingRequestsSortOption": "",
+ "Loaded": true,
+ "IsDirty": true,
+ "CanNavigateNext": false,
+ "CanNavigatePrevious": true,
+ "SaveCommand": {}
+}
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/Billing/IBillable.cs b/src/Yavsc.Abstract/Billing/IBillable.cs
index 416dc5bee..f936a57df 100644
--- a/src/Yavsc.Abstract/Billing/IBillable.cs
+++ b/src/Yavsc.Abstract/Billing/IBillable.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using Yavsc.Services;
namespace Yavsc.Billing
diff --git a/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs b/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs
index e332822e1..ab1b3fbe8 100644
--- a/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs
+++ b/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
namespace Yavsc.Blogspot;
///
diff --git a/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs b/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs
index 9cb5b1430..bdb2ccdc8 100644
--- a/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs
+++ b/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using Yavsc.Abstract.Identity.Security;
using System.Text.Json.Serialization;
diff --git a/src/Yavsc.Abstract/Blogspot/IBlogPost.cs b/src/Yavsc.Abstract/Blogspot/IBlogPost.cs
index 1ef371803..38a50b78f 100644
--- a/src/Yavsc.Abstract/Blogspot/IBlogPost.cs
+++ b/src/Yavsc.Abstract/Blogspot/IBlogPost.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
diff --git a/src/Yavsc.Abstract/Chat/ChatHubConstants.cs b/src/Yavsc.Abstract/Chat/ChatHubConstants.cs
index b54c00c74..c673e6fae 100644
--- a/src/Yavsc.Abstract/Chat/ChatHubConstants.cs
+++ b/src/Yavsc.Abstract/Chat/ChatHubConstants.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
namespace Yavsc.Abstract.Chat
{
public static class ChatHubConstants
diff --git a/src/Yavsc.Abstract/Chat/IChatRoom.cs b/src/Yavsc.Abstract/Chat/IChatRoom.cs
index 1d6f68dd5..133ca2837 100644
--- a/src/Yavsc.Abstract/Chat/IChatRoom.cs
+++ b/src/Yavsc.Abstract/Chat/IChatRoom.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Abstract.Chat
diff --git a/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs b/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
index dd805864e..14bc86435 100644
--- a/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
+++ b/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
@@ -1,4 +1,6 @@
-using System.Text;
+#nullable enable annotations
+
+using System.Text;
using Yavsc.ViewModels.UserFiles;
namespace Yavsc.Server.Helpers
diff --git a/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs b/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
index 76a481492..0e3c0e0c7 100644
--- a/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
+++ b/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
namespace Yavsc.Abstract.Helpers
{
public enum ErrorCode {
diff --git a/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs b/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
index fa727d0c0..2ec5dcfaf 100644
--- a/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
+++ b/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using Yavsc.Server.Helpers;
namespace Yavsc.ViewModels.UserFiles
diff --git a/src/Yavsc.Abstract/Files/FileServerUrlHelpers.cs b/src/Yavsc.Abstract/Files/FileServerUrlHelpers.cs
new file mode 100644
index 000000000..64bcb405b
--- /dev/null
+++ b/src/Yavsc.Abstract/Files/FileServerUrlHelpers.cs
@@ -0,0 +1,67 @@
+namespace Yavsc.Abstract.Files;
+
+///
+/// Helpers pour dériver les URL publiques des fichiers statiques à partir
+/// d'une URL d'autorité OIDC ou d'un autre point d'entrée racine.
+///
+public static class FileServerUrlHelpers
+{
+ ///
+ /// Dérive la racine publique des fichiers utilisateur en alignant
+ /// le chemin sur .
+ ///
+ ///
+ /// URL absolue de base, typiquement l'autorité OIDC de Yavsc.Org.
+ ///
+ /// Une URL absolue pointant vers la racine des fichiers utilisateur.
+ public static Uri GetUserFilesBaseUri(Uri authorityBaseUrl)
+ {
+ ArgumentNullException.ThrowIfNull(authorityBaseUrl);
+
+ if (!authorityBaseUrl.IsAbsoluteUri)
+ {
+ throw new ArgumentException(
+ "The authority base URL must be absolute.",
+ nameof(authorityBaseUrl));
+ }
+
+ var baseString = authorityBaseUrl.GetLeftPart(UriPartial.Authority);
+ return new Uri(new Uri(baseString, UriKind.Absolute), EnsureTrailingSlash(Yavsc.Constants.UserFilesPath));
+ }
+
+ ///
+ /// Dérive la racine publique des fichiers utilisateur en alignant
+ /// le chemin sur .
+ ///
+ ///
+ /// URL absolue de base, typiquement l'autorité OIDC de Yavsc.Org.
+ ///
+ /// Une URL absolue pointant vers la racine des fichiers utilisateur.
+ public static Uri GetUserFilesBaseUri(string authorityBaseUrl)
+ => GetUserFilesBaseUri(new Uri(authorityBaseUrl, UriKind.Absolute));
+
+ ///
+ /// Construit l'URL d'un fichier utilisateur à partir de la base d'autorité
+ /// et d'un chemin relatif sous la racine des fichiers.
+ ///
+ public static Uri GetUserFilesUri(Uri authorityBaseUrl, string relativePath)
+ {
+ ArgumentException.ThrowIfNullOrWhiteSpace(relativePath);
+
+ var baseUri = GetUserFilesBaseUri(authorityBaseUrl);
+ return new Uri(baseUri, NormalizeRelativePath(relativePath));
+ }
+
+ ///
+ /// Construit l'URL d'un fichier utilisateur à partir de la base d'autorité
+ /// et d'un chemin relatif sous la racine des fichiers.
+ ///
+ public static Uri GetUserFilesUri(string authorityBaseUrl, string relativePath)
+ => GetUserFilesUri(new Uri(authorityBaseUrl, UriKind.Absolute), relativePath);
+
+ private static string EnsureTrailingSlash(string path)
+ => path.EndsWith("/", StringComparison.Ordinal) ? path : path + "/";
+
+ private static string NormalizeRelativePath(string relativePath)
+ => relativePath.TrimStart('/');
+}
diff --git a/src/Yavsc.Abstract/Google/GDate.cs b/src/Yavsc.Abstract/Google/GDate.cs
index 3506ba416..10e4de92e 100644
--- a/src/Yavsc.Abstract/Google/GDate.cs
+++ b/src/Yavsc.Abstract/Google/GDate.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
//
// GDate.cs
//
diff --git a/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs b/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs
index 59538ca62..980a4abcf 100644
--- a/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs
+++ b/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
//
// MessageWithPayloadResponse.cs
//
diff --git a/src/Yavsc.Abstract/HairCut/HairPrestationDto.cs b/src/Yavsc.Abstract/HairCut/HairPrestationDto.cs
new file mode 100644
index 000000000..0c4b80e2c
--- /dev/null
+++ b/src/Yavsc.Abstract/HairCut/HairPrestationDto.cs
@@ -0,0 +1,11 @@
+namespace Yavsc.Models.Haircut;
+
+///
+/// Lightweight hair-prestation description exposed to API clients.
+///
+public sealed class HairPrestationDto
+{
+ public long Id { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Details { get; set; } = string.Empty;
+}
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/IT/CodeFromChars.cs b/src/Yavsc.Abstract/IT/CodeFromChars.cs
index ff441568e..e0e31ce28 100644
--- a/src/Yavsc.Abstract/IT/CodeFromChars.cs
+++ b/src/Yavsc.Abstract/IT/CodeFromChars.cs
@@ -44,7 +44,6 @@ namespace Yavsc.Abstract.IT
public bool Validate()
{
// this is a n*n task
-
throw new NotImplementedException();
}
diff --git a/src/Yavsc.Abstract/IT/Fixing/Bug.cs b/src/Yavsc.Abstract/IT/Fixing/Bug.cs
index f0b403bb7..60bd155f6 100644
--- a/src/Yavsc.Abstract/IT/Fixing/Bug.cs
+++ b/src/Yavsc.Abstract/IT/Fixing/Bug.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Attributes.Validation;
diff --git a/src/Yavsc.Abstract/Identity/IApplicationUser.cs b/src/Yavsc.Abstract/Identity/IApplicationUser.cs
index 5d1d5b1ca..0b8e1047c 100644
--- a/src/Yavsc.Abstract/Identity/IApplicationUser.cs
+++ b/src/Yavsc.Abstract/Identity/IApplicationUser.cs
@@ -1,4 +1,6 @@
-namespace Yavsc.Abstract.Identity
+#nullable enable annotations
+
+namespace Yavsc.Abstract.Identity
{
public interface IApplicationUser
{
diff --git a/src/Yavsc.Abstract/Identity/Security/FileAccessControlRulePayload.cs b/src/Yavsc.Abstract/Identity/Security/FileAccessControlRulePayload.cs
new file mode 100644
index 000000000..af3af22bc
--- /dev/null
+++ b/src/Yavsc.Abstract/Identity/Security/FileAccessControlRulePayload.cs
@@ -0,0 +1,12 @@
+
+namespace Yavsc.Models.Access
+{
+ using Yavsc.Abstract.Identity.Security;
+
+ public class FileAccessControlRulePayload : CircleAuthorization
+ {
+ public virtual string Path { get; set; }
+
+
+ }
+}
diff --git a/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs b/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs
index 242615527..4277d6e3b 100644
--- a/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs
+++ b/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
namespace Yavsc.Abstract.Identity
{
///
diff --git a/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs b/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
index 2c844f925..eb3dee591 100644
--- a/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
+++ b/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
@@ -1,4 +1,6 @@
-using Yavsc.Abstract.Identity;
+#nullable enable annotations
+
+using Yavsc.Abstract.Identity;
namespace Yavsc.Interfaces
{
diff --git a/src/Yavsc.Abstract/Messaging/Comment.cs b/src/Yavsc.Abstract/Messaging/Comment.cs
index 3b8702ae1..d8eef456c 100644
--- a/src/Yavsc.Abstract/Messaging/Comment.cs
+++ b/src/Yavsc.Abstract/Messaging/Comment.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using Yavsc.Interfaces;
diff --git a/src/Yavsc.Abstract/Messaging/Notification.cs b/src/Yavsc.Abstract/Messaging/Notification.cs
index dbbf735d5..f7b35b48b 100644
--- a/src/Yavsc.Abstract/Messaging/Notification.cs
+++ b/src/Yavsc.Abstract/Messaging/Notification.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
diff --git a/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs b/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs
index b2168bd7c..9e2ecb754 100644
--- a/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs
+++ b/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
//
// BookQueryEvent.cs
//
diff --git a/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs b/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
index 87125c544..94eeb5ab9 100644
--- a/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
+++ b/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
using Yavsc.Abstract.Identity;
using Yavsc.Models.Relationship;
diff --git a/src/Yavsc.Abstract/Workflow/ActivityInfo.cs b/src/Yavsc.Abstract/Workflow/ActivityInfo.cs
new file mode 100644
index 000000000..c0f543f40
--- /dev/null
+++ b/src/Yavsc.Abstract/Workflow/ActivityInfo.cs
@@ -0,0 +1,17 @@
+namespace Yavsc.Abstract.Workflow;
+
+///
+/// Activity node returned by the browsing API.
+///
+public sealed class ActivityInfo
+{
+ public string Code { get; set; } = string.Empty;
+ public string Name { get; set; } = string.Empty;
+ public string ParentCode { get; set; } = string.Empty;
+ public string Description { get; set; } = string.Empty;
+ public string Photo { get; set; } = string.Empty;
+ public int Rate { get; set; }
+ public int PerformerCount { get; set; }
+ public List Forms { get; set; } = new();
+ public List Children { get; set; } = new();
+}
diff --git a/src/Yavsc.Abstract/Workflow/CommandFormSummary.cs b/src/Yavsc.Abstract/Workflow/CommandFormSummary.cs
new file mode 100644
index 000000000..865690e08
--- /dev/null
+++ b/src/Yavsc.Abstract/Workflow/CommandFormSummary.cs
@@ -0,0 +1,11 @@
+namespace Yavsc.Abstract.Workflow;
+
+///
+/// Lightweight command-form description exposed to API clients.
+///
+public sealed class CommandFormSummary
+{
+ public long Id { get; set; }
+ public string ActionName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+}
diff --git a/src/Yavsc.Abstract/Workflow/Country.cs b/src/Yavsc.Abstract/Workflow/Country.cs
new file mode 100644
index 000000000..d782d0aac
--- /dev/null
+++ b/src/Yavsc.Abstract/Workflow/Country.cs
@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.Models.Workflow
+{
+ ///
+ /// Supported country of exercise for performer profile validations.
+ ///
+ public class Country
+ {
+ [Key]
+ [MaxLength(2)]
+ [MinLength(2)]
+ public string Code { get; set; } = string.Empty;
+
+ [Required]
+ [MaxLength(64)]
+ public string DisplayName { get; set; } = string.Empty;
+ }
+}
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs b/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs
index 6e55ebe51..7a1dbc261 100644
--- a/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs
+++ b/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs
@@ -1,4 +1,6 @@
-// Copyright (C) 2016 Paul Schneider
+#nullable enable annotations
+
+// Copyright (C) 2016 Paul Schneider
//
// This file is part of yavsc.
//
diff --git a/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs b/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs
index e53583a59..606285a6c 100644
--- a/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs
+++ b/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs
@@ -1,8 +1,11 @@
+#nullable enable annotations
+
namespace Yavsc.Workflow
{
public interface IPerformerProfile
{
string PerformerId { get; set; }
+ string ExerciseCountryCode { get; set; }
string SIREN { get; set; }
bool AcceptNotifications { get; set; }
long OrganizationAddressId { get; set; }
diff --git a/src/Yavsc.Abstract/Workflow/PerformerActivity.cs b/src/Yavsc.Abstract/Workflow/PerformerActivity.cs
new file mode 100644
index 000000000..a5ee3b254
--- /dev/null
+++ b/src/Yavsc.Abstract/Workflow/PerformerActivity.cs
@@ -0,0 +1,19 @@
+namespace Yavsc.Abstract.Workflow;
+
+///
+/// Lightweight performer description returned for one activity.
+///
+public sealed class PerformerActivity
+{
+ public string PerformerId { get; set; } = string.Empty;
+ public bool HasPerformerProfile { get; set; }
+ public string UserName { get; set; } = string.Empty;
+ public bool Active { get; set; }
+ public bool AcceptNotifications { get; set; }
+ public bool AcceptPublicContact { get; set; }
+ public string WebSite { get; set; } = string.Empty;
+ public string ActivityCode { get; set; } = string.Empty;
+ public string ActivityName { get; set; } = string.Empty;
+ public string SettingsClassName { get; set; } = string.Empty;
+ public int ExtraActivityCount { get; set; }
+}
diff --git a/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs b/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs
new file mode 100644
index 000000000..4ed60e465
--- /dev/null
+++ b/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs
@@ -0,0 +1,88 @@
+#nullable enable annotations
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Yavsc.Models.Workflow
+{
+ ///
+ /// Validation rule for performer business code input by country.
+ ///
+ public class PerformerCodeInputValidation
+ {
+ [Key]
+ public long Id { get; set; }
+
+ [Required]
+ [MaxLength(2)]
+ [MinLength(2)]
+ public string CountryCode { get; set; } = string.Empty;
+
+ [Required]
+ [MaxLength(256)]
+ public string RegularExpression { get; set; } = string.Empty;
+
+ [Required]
+ [MaxLength(128)]
+ public string ErrorMessage { get; set; } = string.Empty;
+
+ [ForeignKey(nameof(CountryCode))]
+ public Country Country { get; set; }
+ }
+
+ public static class PerformerCodeInputValidationCatalog
+ {
+ public static readonly IReadOnlyList Countries = new List
+ {
+ new() { Code = "fr", DisplayName = "France" },
+ new() { Code = "en", DisplayName = "England" },
+ new() { Code = "pt", DisplayName = "Portugal" },
+ };
+
+ public static readonly IReadOnlyList Rules = new List
+ {
+ new()
+ {
+ Id = 1,
+ CountryCode = "fr",
+ RegularExpression = "^[0-9]{9,14}$",
+ ErrorMessage = "Le code FR doit contenir entre 9 et 14 chiffres."
+ },
+ new()
+ {
+ Id = 2,
+ CountryCode = "en",
+ RegularExpression = "^[A-Za-z0-9]{8,14}$",
+ ErrorMessage = "Le code EN doit contenir entre 8 et 14 caracteres alphanumeriques."
+ },
+ new()
+ {
+ Id = 3,
+ CountryCode = "pt",
+ RegularExpression = "^[0-9]{9}$",
+ ErrorMessage = "Le code PT doit contenir exactement 9 chiffres."
+ },
+ };
+
+ public static string NormalizeCountryCode(string? countryCode)
+ {
+ return (countryCode ?? string.Empty).Trim().ToLowerInvariant();
+ }
+
+ public static PerformerCodeInputValidation? GetRule(string? countryCode)
+ {
+ var normalized = NormalizeCountryCode(countryCode);
+ foreach (var rule in Rules)
+ {
+ if (string.Equals(rule.CountryCode, normalized, StringComparison.Ordinal))
+ {
+ return rule;
+ }
+ }
+
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Yavsc.Api.Client/ActivityApiClient.cs b/src/Yavsc.Api.Client/ActivityApiClient.cs
new file mode 100644
index 000000000..8199de9d4
--- /dev/null
+++ b/src/Yavsc.Api.Client/ActivityApiClient.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Yavsc.Abstract.Workflow;
+
+namespace Yavsc.Api.Client;
+
+///
+/// HTTP client for browsing business activities and their performers.
+/// Uses absolute URLs so it can coexist with other Yavsc clients that
+/// target a different API host on the same shared transport. The same
+/// activity payload also carries the eligible billing forms for a
+/// selected performer/activity pair.
+///
+public sealed class ActivityApiClient
+{
+ private const string PathPrefix = "activity";
+
+ private readonly IYavscApiClient _api;
+ private readonly Func _businessBaseAddress;
+ private readonly Func _avatarBaseAddress;
+
+ public ActivityApiClient(IYavscApiClient api, string businessBaseAddress, string? avatarBaseAddress = null)
+ : this(
+ api,
+ () => businessBaseAddress,
+ () => avatarBaseAddress)
+ {
+ }
+
+ public ActivityApiClient(
+ IYavscApiClient api,
+ Func businessBaseAddress,
+ Func? avatarBaseAddress = null)
+ {
+ _api = api ?? throw new ArgumentNullException(nameof(api));
+ _businessBaseAddress = businessBaseAddress ?? throw new ArgumentNullException(nameof(businessBaseAddress));
+ _avatarBaseAddress = avatarBaseAddress ?? (() => null);
+
+ // Validate initial values early to fail fast on invalid setup.
+ _ = ResolveBusinessBaseAddress();
+ _ = ResolveAvatarBaseAddress();
+ }
+
+ public Task> GetCatalogAsync(
+ string? parentCode = null,
+ CancellationToken ct = default)
+ {
+ var path = string.IsNullOrWhiteSpace(parentCode)
+ ? $"{PathPrefix}/catalog"
+ : $"{PathPrefix}/catalog?parentCode={Uri.EscapeDataString(parentCode)}";
+
+ return _api.CallAsync>(HttpMethod.Get, Absolute(path), ct: ct);
+ }
+
+ public Task> GetUsersAsync(
+ string activityCode,
+ CancellationToken ct = default)
+ {
+ if (string.IsNullOrWhiteSpace(activityCode))
+ throw new ArgumentException("Activity code is required.", nameof(activityCode));
+
+ return _api.CallAsync>(
+ HttpMethod.Get,
+ Absolute($"{PathPrefix}/{Uri.EscapeDataString(activityCode)}/users"),
+ ct: ct);
+ }
+
+ public Task> GetPerformersAsync(
+ string activityCode,
+ CancellationToken ct = default)
+ => GetUsersAsync(activityCode, ct);
+
+ public string BuildAvatarXsUrl(string? userName)
+ {
+ var siteRoot = new Uri(ResolveAvatarBaseAddress(), "/");
+
+ if (string.IsNullOrWhiteSpace(userName))
+ {
+ return new Uri(siteRoot, "images/Users/icon_user.xs.png").ToString();
+ }
+
+ return new Uri(siteRoot, $"avatars/{Uri.EscapeDataString(userName)}.xs.png").ToString();
+ }
+
+ private string Absolute(string relativePath) => new Uri(ResolveBusinessBaseAddress(), relativePath).ToString();
+
+ private Uri ResolveBusinessBaseAddress()
+ {
+ var raw = _businessBaseAddress();
+ if (string.IsNullOrWhiteSpace(raw))
+ throw new InvalidOperationException("Business base address is required.");
+
+ return new Uri(raw, UriKind.Absolute);
+ }
+
+ private Uri ResolveAvatarBaseAddress()
+ {
+ var raw = _avatarBaseAddress();
+ return string.IsNullOrWhiteSpace(raw)
+ ? ResolveBusinessBaseAddress()
+ : new Uri(raw, UriKind.Absolute);
+ }
+}
diff --git a/src/Yavsc.Api.Client/BillingApiClient.cs b/src/Yavsc.Api.Client/BillingApiClient.cs
new file mode 100644
index 000000000..a9e9deda6
--- /dev/null
+++ b/src/Yavsc.Api.Client/BillingApiClient.cs
@@ -0,0 +1,395 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Haircut;
+using Yavsc;
+
+namespace Yavsc.Api.Client;
+
+///
+/// HTTP client for posting commands to the business billing routes.
+/// Uses absolute URLs so it can coexist with blog-targeting clients on
+/// the same shared transport.
+///
+public sealed class BillingApiClient
+{
+ private const string PathPrefix = "billing";
+
+ private readonly IYavscApiClient _api;
+ private readonly Func _businessBaseAddress;
+
+ public BillingApiClient(IYavscApiClient api, string businessBaseAddress)
+ : this(api, () => businessBaseAddress)
+ {
+ }
+
+ public BillingApiClient(IYavscApiClient api, Func businessBaseAddress)
+ {
+ _api = api ?? throw new ArgumentNullException(nameof(api));
+ _businessBaseAddress = businessBaseAddress ?? throw new ArgumentNullException(nameof(businessBaseAddress));
+
+ // Validate initial value early to fail fast on invalid setup.
+ _ = ResolveBusinessBaseAddress();
+ }
+
+ public Task CreateAsync(string billingCode, object payload, CancellationToken ct = default)
+ {
+ if (string.IsNullOrWhiteSpace(billingCode))
+ throw new ArgumentException("Billing code is required.", nameof(billingCode));
+
+ return _api.CallAsync(
+ HttpMethod.Post,
+ Absolute($"{PathPrefix}/{Uri.EscapeDataString(billingCode)}"),
+ body: payload,
+ ct: ct);
+ }
+
+ public Task> GetHairPrestationsAsync(string billingCode, CancellationToken ct = default)
+ {
+ if (string.IsNullOrWhiteSpace(billingCode))
+ throw new ArgumentException("Billing code is required.", nameof(billingCode));
+
+ return _api.CallAsync>(
+ HttpMethod.Get,
+ Absolute($"{PathPrefix}/{Uri.EscapeDataString(billingCode)}/prestations"),
+ ct: ct);
+ }
+
+ public async Task> GetQuerySummariesAsync(string billingCode, CancellationToken ct = default)
+ {
+ if (string.IsNullOrWhiteSpace(billingCode))
+ throw new ArgumentException("Billing code is required.", nameof(billingCode));
+
+ var items = await _api.CallAsync>(
+ HttpMethod.Get,
+ Absolute($"{PathPrefix}/{Uri.EscapeDataString(billingCode)}"),
+ ct: ct) ?? new List();
+
+ foreach (var item in items)
+ {
+ item.BillingCode = billingCode;
+ }
+
+ return items;
+ }
+
+ public Task> GetProviderOngoingQueriesAsync(CancellationToken ct = default)
+ {
+ return _api.CallAsync>(
+ HttpMethod.Get,
+ Absolute("bill/provider/ongoing"),
+ ct: ct);
+ }
+
+ public async Task GetQueryAsync(string billingCode, long queryId, CancellationToken ct = default)
+ {
+ if (string.IsNullOrWhiteSpace(billingCode))
+ throw new ArgumentException("Billing code is required.", nameof(billingCode));
+ if (queryId <= 0)
+ throw new ArgumentOutOfRangeException(nameof(queryId));
+
+ var code = billingCode.Trim();
+ var path = Absolute($"{PathPrefix}/{Uri.EscapeDataString(code)}/{queryId}");
+
+ if (string.Equals(code, BillingCodes.Rdv, StringComparison.Ordinal))
+ {
+ var dto = await _api.CallAsync(HttpMethod.Get, path, ct: ct).ConfigureAwait(false);
+ return MapRdv(dto, code);
+ }
+
+ if (string.Equals(code, BillingCodes.Brush, StringComparison.Ordinal))
+ {
+ var dto = await _api.CallAsync(HttpMethod.Get, path, ct: ct).ConfigureAwait(false);
+ return MapBrush(dto, code);
+ }
+
+ if (string.Equals(code, BillingCodes.MBrush, StringComparison.Ordinal))
+ {
+ var dto = await _api.CallAsync(HttpMethod.Get, path, ct: ct).ConfigureAwait(false);
+ return MapMBrush(dto, code);
+ }
+
+ throw new NotSupportedException($"Billing code '{code}' is not supported.");
+ }
+
+ public Task UpdateAsync(string billingCode, long queryId, BillingQueryDetailsDto payload, CancellationToken ct = default)
+ {
+ if (string.IsNullOrWhiteSpace(billingCode))
+ throw new ArgumentException("Billing code is required.", nameof(billingCode));
+ if (queryId <= 0)
+ throw new ArgumentOutOfRangeException(nameof(queryId));
+ if (payload is null)
+ throw new ArgumentNullException(nameof(payload));
+
+ var code = billingCode.Trim();
+
+ return _api.CallAsync(
+ HttpMethod.Put,
+ Absolute($"{PathPrefix}/{Uri.EscapeDataString(code)}/{queryId}"),
+ body: BuildUpdatePayload(code, queryId, payload),
+ ct: ct);
+ }
+
+ private string Absolute(string relativePath) => new Uri(ResolveBusinessBaseAddress(), relativePath).ToString();
+
+ private Uri ResolveBusinessBaseAddress()
+ {
+ var raw = _businessBaseAddress();
+ if (string.IsNullOrWhiteSpace(raw))
+ throw new InvalidOperationException("Business base address is required.");
+
+ return new Uri(raw, UriKind.Absolute);
+ }
+
+ private static BillingQueryDetailsDto MapRdv(RdvQueryResponse dto, string billingCode)
+ {
+ return new BillingQueryDetailsDto
+ {
+ Id = dto.Id,
+ BillingCode = billingCode,
+ ActivityCode = dto.ActivityCode ?? string.Empty,
+ PerformerId = dto.PerformerId ?? string.Empty,
+ ClientId = dto.ClientId ?? string.Empty,
+ Description = dto.Description ?? string.Empty,
+ Consent = dto.Consent,
+ EventDate = dto.EventDate,
+ Status = dto.Status,
+ Reason = dto.Reason ?? string.Empty,
+ Provisional = dto.Provisional,
+ Location = dto.Location is null
+ ? null
+ : new BillingLocationDto
+ {
+ Id = dto.Location.Id > 0 ? dto.Location.Id : null,
+ Address = dto.Location.Address ?? string.Empty,
+ Latitude = dto.Location.Latitude,
+ Longitude = dto.Location.Longitude,
+ }
+ };
+ }
+
+ private static BillingQueryDetailsDto MapBrush(HairCutQueryResponse dto, string billingCode)
+ {
+ return new BillingQueryDetailsDto
+ {
+ Id = dto.Id,
+ BillingCode = billingCode,
+ ActivityCode = dto.ActivityCode ?? string.Empty,
+ PerformerId = dto.PerformerId ?? string.Empty,
+ ClientId = dto.ClientId ?? string.Empty,
+ Description = dto.Description ?? string.Empty,
+ Consent = dto.Consent,
+ EventDate = dto.EventDate,
+ Status = dto.Status,
+ AdditionalInfo = dto.AdditionalInfo ?? string.Empty,
+ Provisional = dto.Provisional,
+ PrestationId = dto.PrestationId,
+ Location = dto.Location is null
+ ? null
+ : new BillingLocationDto
+ {
+ Id = dto.Location.Id > 0 ? dto.Location.Id : null,
+ Address = dto.Location.Address ?? string.Empty,
+ Latitude = dto.Location.Latitude,
+ Longitude = dto.Location.Longitude,
+ }
+ };
+ }
+
+ private static BillingQueryDetailsDto MapMBrush(HairMultiCutQueryResponse dto, string billingCode)
+ {
+ return new BillingQueryDetailsDto
+ {
+ Id = dto.Id,
+ BillingCode = billingCode,
+ ActivityCode = dto.ActivityCode ?? string.Empty,
+ PerformerId = dto.PerformerId ?? string.Empty,
+ ClientId = dto.ClientId ?? string.Empty,
+ Description = dto.Description ?? string.Empty,
+ Consent = dto.Consent,
+ EventDate = dto.EventDate,
+ Status = dto.Status,
+ Provisional = dto.Provisional,
+ PrestationIds = (dto.Prestations ?? new List())
+ .Select(p => p.PrestationId)
+ .Where(id => id > 0)
+ .ToList(),
+ Location = dto.Location is null
+ ? null
+ : new BillingLocationDto
+ {
+ Id = dto.Location.Id > 0 ? dto.Location.Id : null,
+ Address = dto.Location.Address ?? string.Empty,
+ Latitude = dto.Location.Latitude,
+ Longitude = dto.Location.Longitude,
+ }
+ };
+ }
+
+ private static object BuildUpdatePayload(string billingCode, long queryId, BillingQueryDetailsDto payload)
+ {
+ if (string.Equals(billingCode, BillingCodes.Rdv, StringComparison.Ordinal))
+ {
+ if (payload.EventDate is null)
+ throw new ArgumentException("EventDate is required for Rdv.", nameof(payload));
+
+ return new
+ {
+ Id = queryId,
+ ActivityCode = payload.ActivityCode,
+ PerformerId = payload.PerformerId,
+ ClientId = payload.ClientId,
+ Consent = payload.Consent,
+ EventDate = payload.EventDate.Value,
+ Location = ToLocationPayload(payload.Location),
+ Reason = payload.Reason,
+ Status = payload.Status,
+ Provisional = payload.Provisional,
+ Description = payload.Description,
+ };
+ }
+
+ if (string.Equals(billingCode, BillingCodes.Brush, StringComparison.Ordinal))
+ {
+ if (payload.PrestationId is null || payload.PrestationId <= 0)
+ throw new ArgumentException("PrestationId is required for Brush.", nameof(payload));
+
+ return new
+ {
+ Id = queryId,
+ ActivityCode = payload.ActivityCode,
+ PerformerId = payload.PerformerId,
+ ClientId = payload.ClientId,
+ Consent = payload.Consent,
+ EventDate = payload.EventDate,
+ Location = ToLocationPayload(payload.Location),
+ PrestationId = payload.PrestationId.Value,
+ AdditionalInfo = payload.AdditionalInfo,
+ Status = payload.Status,
+ Provisional = payload.Provisional,
+ Description = payload.Description,
+ };
+ }
+
+ if (string.Equals(billingCode, BillingCodes.MBrush, StringComparison.Ordinal))
+ {
+ if (payload.EventDate is null)
+ throw new ArgumentException("EventDate is required for MBrush.", nameof(payload));
+ if (payload.PrestationIds is null || payload.PrestationIds.Count == 0)
+ throw new ArgumentException("At least one prestation is required for MBrush.", nameof(payload));
+
+ return new
+ {
+ Id = queryId,
+ ActivityCode = payload.ActivityCode,
+ PerformerId = payload.PerformerId,
+ ClientId = payload.ClientId,
+ Consent = payload.Consent,
+ EventDate = payload.EventDate.Value,
+ Location = ToLocationPayload(payload.Location),
+ Prestations = payload.PrestationIds
+ .Where(id => id > 0)
+ .Select(id => new { PrestationId = id })
+ .ToList(),
+ Status = payload.Status,
+ Provisional = payload.Provisional,
+ Description = payload.Description,
+ };
+ }
+
+ throw new NotSupportedException($"Billing code '{billingCode}' is not supported.");
+ }
+
+ private static object? ToLocationPayload(BillingLocationDto? location)
+ {
+ if (location is null)
+ {
+ return null;
+ }
+
+ var payload = new Dictionary
+ {
+ ["Address"] = location.Address,
+ };
+
+ if (location.Id.HasValue && location.Id.Value > 0)
+ {
+ payload["Id"] = location.Id.Value;
+ }
+
+ if (location.Latitude.HasValue)
+ {
+ payload["Latitude"] = location.Latitude.Value;
+ }
+
+ if (location.Longitude.HasValue)
+ {
+ payload["Longitude"] = location.Longitude.Value;
+ }
+
+ return payload;
+ }
+
+ private sealed class BillingLocationResponse
+ {
+ public long Id { get; set; }
+ public string? Address { get; set; }
+ public double Latitude { get; set; }
+ public double Longitude { get; set; }
+ }
+
+ private sealed class RdvQueryResponse
+ {
+ public long Id { get; set; }
+ public string? ActivityCode { get; set; }
+ public string? PerformerId { get; set; }
+ public string? ClientId { get; set; }
+ public string? Description { get; set; }
+ public bool Consent { get; set; }
+ public DateTime EventDate { get; set; }
+ public QueryStatus Status { get; set; }
+ public string? Reason { get; set; }
+ public decimal? Provisional { get; set; }
+ public BillingLocationResponse? Location { get; set; }
+ }
+
+ private sealed class HairCutQueryResponse
+ {
+ public long Id { get; set; }
+ public string? ActivityCode { get; set; }
+ public string? PerformerId { get; set; }
+ public string? ClientId { get; set; }
+ public string? Description { get; set; }
+ public bool Consent { get; set; }
+ public DateTime? EventDate { get; set; }
+ public QueryStatus Status { get; set; }
+ public decimal? Provisional { get; set; }
+ public long PrestationId { get; set; }
+ public string? AdditionalInfo { get; set; }
+ public BillingLocationResponse? Location { get; set; }
+ }
+
+ private sealed class HairMultiCutQueryResponse
+ {
+ public long Id { get; set; }
+ public string? ActivityCode { get; set; }
+ public string? PerformerId { get; set; }
+ public string? ClientId { get; set; }
+ public string? Description { get; set; }
+ public bool Consent { get; set; }
+ public DateTime EventDate { get; set; }
+ public QueryStatus Status { get; set; }
+ public decimal? Provisional { get; set; }
+ public BillingLocationResponse? Location { get; set; }
+ public List? Prestations { get; set; }
+ }
+
+ private sealed class HairPrestationCollectionItemResponse
+ {
+ public long PrestationId { get; set; }
+ }
+}
diff --git a/src/Yavsc.Api.Client/BlogApiClient.cs b/src/Yavsc.Api.Client/BlogApiClient.cs
index 8284c5ed9..3de5b37ec 100644
--- a/src/Yavsc.Api.Client/BlogApiClient.cs
+++ b/src/Yavsc.Api.Client/BlogApiClient.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Net.Http.Headers;
+using System.Text.Json;
using Yavsc.Blogspot;
namespace Yavsc.Api.Client;
@@ -62,11 +59,18 @@ public sealed class BlogApiClient
public Task GetPostAsync(long id, CancellationToken ct = default)
=> _api.CallAsync(HttpMethod.Get, $"{_pathPrefix}/{id}", ct: ct);
- public Task CreatePostAsync(BlogPostDto post, CancellationToken ct = default)
- => _api.CallAsync(HttpMethod.Post, _pathPrefix, body: post, ct: ct);
+ public Task CreatePostAsync(
+ BlogPostDto post,
+ IReadOnlyCollection? files = null,
+ CancellationToken ct = default)
+ => SendPostAsync(HttpMethod.Post, _pathPrefix, post, files, ct);
- public Task UpdatePostAsync(long id, BlogPostDto post, CancellationToken ct = default)
- => _api.CallAsync(HttpMethod.Put, $"{_pathPrefix}/{id}", body: post, ct: ct);
+ public Task UpdatePostAsync(
+ long id,
+ BlogPostDto post,
+ IReadOnlyCollection? files = null,
+ CancellationToken ct = default)
+ => SendPostAsync(HttpMethod.Put, $"{_pathPrefix}/{id}", post, files, ct);
public Task DeletePostAsync(long id, CancellationToken ct = default)
=> _api.CallAsync(HttpMethod.Delete, $"{_pathPrefix}/{id}", ct: ct);
@@ -81,4 +85,39 @@ public sealed class BlogApiClient
public Task SetPublishAsync(long id, bool publish, CancellationToken ct = default)
=> _api.CallAsync(HttpMethod.Put, $"{_pathPrefix}/{id}/publish",
body: new { publish }, ct: ct);
+
+ private async Task SendPostAsync(
+ HttpMethod method,
+ string path,
+ BlogPostDto post,
+ IReadOnlyCollection? files,
+ CancellationToken ct)
+ {
+ if (files is null || files.Count == 0)
+ return await _api.CallAsync(method, path, body: post, ct: ct);
+
+ return await _api.CallAsync(method, path, () => CreateMultipartContent(post, files), ct: ct);
+ }
+
+ private static HttpContent CreateMultipartContent(BlogPostDto post, IReadOnlyCollection files)
+ {
+ var content = new MultipartFormDataContent();
+ var blogJson = JsonSerializer.Serialize(post, new JsonSerializerOptions
+ {
+ PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+ DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull,
+ });
+
+ content.Add(new StringContent(blogJson), "blog");
+
+ foreach (var file in files)
+ {
+ var fileContent = new ByteArrayContent(file.Content);
+ fileContent.Headers.ContentType = new MediaTypeHeaderValue(
+ string.IsNullOrWhiteSpace(file.ContentType) ? "application/octet-stream" : file.ContentType);
+ content.Add(fileContent, "file", file.FileName);
+ }
+
+ return content;
+ }
}
diff --git a/src/Yavsc.Api.Client/BlogUploadFile.cs b/src/Yavsc.Api.Client/BlogUploadFile.cs
new file mode 100644
index 000000000..4b3a7b26d
--- /dev/null
+++ b/src/Yavsc.Api.Client/BlogUploadFile.cs
@@ -0,0 +1,6 @@
+namespace Yavsc.Api.Client;
+
+///
+/// Buffered file payload for multipart blog uploads.
+///
+public sealed record BlogUploadFile(string FileName, byte[] Content, string? ContentType = null);
diff --git a/src/Yavsc.Api.Client/Dtos/BillingQueryDetailsDto.cs b/src/Yavsc.Api.Client/Dtos/BillingQueryDetailsDto.cs
new file mode 100644
index 000000000..eb33ba816
--- /dev/null
+++ b/src/Yavsc.Api.Client/Dtos/BillingQueryDetailsDto.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using Yavsc;
+
+namespace Yavsc.Api.Client;
+
+///
+/// Normalized billing-query shape used by PostIt when opening an existing
+/// command from history.
+///
+public sealed class BillingQueryDetailsDto
+{
+ public long Id { get; set; }
+ public string BillingCode { get; set; } = string.Empty;
+ public string ActivityCode { get; set; } = string.Empty;
+ public string PerformerId { get; set; } = string.Empty;
+ public string ClientId { get; set; } = string.Empty;
+ public string Description { get; set; } = string.Empty;
+ public bool Consent { get; set; } = true;
+ public DateTime? EventDate { get; set; }
+ public QueryStatus Status { get; set; } = QueryStatus.Inserted;
+ public string Reason { get; set; } = string.Empty;
+ public string AdditionalInfo { get; set; } = string.Empty;
+ public decimal? Provisional { get; set; }
+ public BillingLocationDto? Location { get; set; }
+ public long? PrestationId { get; set; }
+ public List PrestationIds { get; set; } = new();
+}
+
+public sealed class BillingLocationDto
+{
+ [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+ public long? Id { get; set; }
+
+ public string Address { get; set; } = string.Empty;
+
+ [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+ public double? Latitude { get; set; }
+
+ [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+ public double? Longitude { get; set; }
+}
diff --git a/src/Yavsc.Api.Client/Dtos/BillingQuerySummaryDto.cs b/src/Yavsc.Api.Client/Dtos/BillingQuerySummaryDto.cs
new file mode 100644
index 000000000..0102b6917
--- /dev/null
+++ b/src/Yavsc.Api.Client/Dtos/BillingQuerySummaryDto.cs
@@ -0,0 +1,23 @@
+using System;
+using Yavsc;
+
+namespace Yavsc.Api.Client;
+
+///
+/// Lightweight billing-query projection consumed by PostIt list views.
+/// Extra JSON fields from concrete query types are ignored.
+///
+public sealed class BillingQuerySummaryDto
+{
+ public long Id { get; set; }
+ public string BillingCode { get; set; } = string.Empty;
+ public string ActivityCode { get; set; } = string.Empty;
+ public string PerformerId { get; set; } = string.Empty;
+ public string ClientId { get; set; } = string.Empty;
+ public QueryStatus Status { get; set; }
+ public string Description { get; set; } = string.Empty;
+ public DateTime? EventDate { get; set; }
+ public string Reason { get; set; } = string.Empty;
+ public string AdditionalInfo { get; set; } = string.Empty;
+ public decimal? Provisional { get; set; }
+}
\ No newline at end of file
diff --git a/src/Yavsc.Api.Client/Dtos/EstimateDtos.cs b/src/Yavsc.Api.Client/Dtos/EstimateDtos.cs
new file mode 100644
index 000000000..43c09d94a
--- /dev/null
+++ b/src/Yavsc.Api.Client/Dtos/EstimateDtos.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+
+namespace Yavsc.Api.Client;
+
+///
+/// A single billable line of an estimate, mirroring the JSON shape of
+/// the server-side Yavsc.Models.Billing.CommandLine entity.
+///
+public sealed class EstimateLineDto
+{
+ public long Id { get; set; }
+ public string Name { get; set; } = string.Empty;
+ public string Description { get; set; } = string.Empty;
+ public int Count { get; set; } = 1;
+ public decimal UnitaryCost { get; set; }
+ public long EstimateId { get; set; }
+ public string Currency { get; set; } = "EUR";
+}
+
+///
+/// Estimate payload exchanged with the api/v1/estimate routes
+/// (EstimateApiController). and
+/// are always initialised: the server-side
+/// entity reads them from non-nullable string properties and a null
+/// list would break its serialisation.
+///
+public sealed class EstimateDto
+{
+ public long Id { get; set; }
+ public long? CommandId { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Description { get; set; } = string.Empty;
+ public List Bill { get; set; } = new();
+ public List AttachedGraphics { get; set; } = new();
+ public List AttachedFiles { get; set; } = new();
+ public string? OwnerId { get; set; }
+ public string ClientId { get; set; } = string.Empty;
+ public string CommandType { get; set; } = string.Empty;
+ public DateTime ProviderValidationDate { get; set; }
+ public DateTime ClientValidationDate { get; set; }
+}
+
+///
+/// Response of a successful estimate creation
+/// (Ok(new { estimate.Id, estimate.Bill })).
+///
+public sealed class EstimateCreatedDto
+{
+ public long Id { get; set; }
+ public List Bill { get; set; } = new();
+}
diff --git a/src/Yavsc.Api.Client/EstimateApiClient.cs b/src/Yavsc.Api.Client/EstimateApiClient.cs
new file mode 100644
index 000000000..15b260786
--- /dev/null
+++ b/src/Yavsc.Api.Client/EstimateApiClient.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Yavsc.Api.Client;
+
+///
+/// HTTP client for the estimate routes (api/v1/estimate,
+/// served by EstimateApiController). Follows the same
+/// DTO↔path mapper shape as : all
+/// transport concerns (base URL, JSON, Bearer auth, silent refresh
+/// on 401) are delegated to .
+///
+public sealed class EstimateApiClient
+{
+ private const string PathPrefix = "estimate";
+
+ private readonly IYavscApiClient _api;
+ private readonly Func _businessBaseAddress;
+
+ public EstimateApiClient(IYavscApiClient api, string businessBaseAddress)
+ : this(api, () => businessBaseAddress)
+ {
+ }
+
+ public EstimateApiClient(IYavscApiClient api, Func businessBaseAddress)
+ {
+ _api = api ?? throw new ArgumentNullException(nameof(api));
+ _businessBaseAddress = businessBaseAddress ?? throw new ArgumentNullException(nameof(businessBaseAddress));
+
+ // Validate initial value early to fail fast on invalid setup.
+ _ = ResolveBusinessBaseAddress();
+ }
+
+ ///
+ /// Lists the estimates of the given owner; when
+ /// is null, the server falls back to the current user.
+ ///
+ public Task> GetEstimatesAsync(string? ownerId = null, CancellationToken ct = default)
+ {
+ var path = string.IsNullOrWhiteSpace(ownerId)
+ ? PathPrefix
+ : $"{PathPrefix}?ownerId={Uri.EscapeDataString(ownerId)}";
+
+ return _api.CallAsync>(HttpMethod.Get, Absolute(path), ct: ct);
+ }
+
+ public Task GetEstimateAsync(long id, CancellationToken ct = default)
+ {
+ if (id <= 0)
+ throw new ArgumentOutOfRangeException(nameof(id));
+
+ return _api.CallAsync(HttpMethod.Get, Absolute($"{PathPrefix}/{id}"), ct: ct);
+ }
+
+ ///
+ /// Creates an estimate. When is set,
+ /// the server also stamps the linked command as validated.
+ ///
+ public async Task CreateAsync(EstimateDto estimate, CancellationToken ct = default)
+ {
+ if (estimate is null)
+ throw new ArgumentNullException(nameof(estimate));
+
+ var created = await _api.CallAsync(
+ HttpMethod.Post,
+ Absolute(PathPrefix),
+ body: estimate,
+ ct: ct).ConfigureAwait(false);
+
+ return created ?? new EstimateCreatedDto();
+ }
+
+ public Task UpdateAsync(long id, EstimateDto estimate, CancellationToken ct = default)
+ {
+ if (id <= 0)
+ throw new ArgumentOutOfRangeException(nameof(id));
+ if (estimate is null)
+ throw new ArgumentNullException(nameof(estimate));
+
+ estimate.Id = id;
+
+ return _api.CallAsync(
+ HttpMethod.Put,
+ Absolute($"{PathPrefix}/{id}"),
+ body: estimate,
+ ct: ct);
+ }
+
+ public Task DeleteAsync(long id, CancellationToken ct = default)
+ {
+ if (id <= 0)
+ throw new ArgumentOutOfRangeException(nameof(id));
+
+ return _api.CallAsync(HttpMethod.Delete, Absolute($"{PathPrefix}/{id}"), ct: ct);
+ }
+
+ private string Absolute(string relativePath) => new Uri(ResolveBusinessBaseAddress(), relativePath).ToString();
+
+ private Uri ResolveBusinessBaseAddress()
+ {
+ var raw = _businessBaseAddress();
+ if (string.IsNullOrWhiteSpace(raw))
+ throw new InvalidOperationException("Business base address is required.");
+
+ return new Uri(raw, UriKind.Absolute);
+ }
+}
diff --git a/src/Yavsc.Api.Client/IYavscApiClient.cs b/src/Yavsc.Api.Client/IYavscApiClient.cs
index 209ec07d7..1d470b682 100644
--- a/src/Yavsc.Api.Client/IYavscApiClient.cs
+++ b/src/Yavsc.Api.Client/IYavscApiClient.cs
@@ -53,10 +53,24 @@ public interface IYavscApiClient : IAsyncDisposable
object? body = null,
CancellationToken ct = default);
+ /// Call a multipart endpoint with a typed return value.
+ Task CallAsync(
+ HttpMethod method,
+ string path,
+ Func contentFactory,
+ CancellationToken ct = default);
+
/// Call a JSON endpoint that returns no useful body (DELETE, 204, etc.).
Task CallAsync(
HttpMethod method,
string path,
object? body = null,
CancellationToken ct = default);
+
+ /// Call a multipart endpoint that returns no useful body.
+ Task CallAsync(
+ HttpMethod method,
+ string path,
+ Func contentFactory,
+ CancellationToken ct = default);
}
diff --git a/src/Yavsc.Api.Test/ActivityApiControllerTests.cs b/src/Yavsc.Api.Test/ActivityApiControllerTests.cs
new file mode 100644
index 000000000..0525e349f
--- /dev/null
+++ b/src/Yavsc.Api.Test/ActivityApiControllerTests.cs
@@ -0,0 +1,161 @@
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class ActivityApiControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public ActivityApiControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ private HttpClient NewClient(string subject = "alice", string scope = "api")
+ {
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+ var http = new HttpClient(handler)
+ {
+ BaseAddress = new Uri(_fixture.BaseAddress)
+ };
+ http.DefaultRequestHeaders.Authorization =
+ new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+ return http;
+ }
+
+ [Fact]
+ public async Task GetUsers_returns_declared_user_for_exact_activity_code()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/activity/dev/users", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.Single(payload!);
+ Assert.Equal("alice", payload[0].PerformerId);
+ Assert.Equal("alice", payload[0].UserName);
+ Assert.True(payload[0].HasPerformerProfile);
+ Assert.True(payload[0].Active);
+ Assert.Equal("dev", payload[0].ActivityCode);
+ }
+
+ [Fact]
+ public async Task GetUsers_returns_user_even_when_performer_inactive()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using (var scope = _fixture.Services.CreateScope())
+ {
+ var db = scope.ServiceProvider.GetRequiredService();
+ var performer = db.Performers.Single(p => p.PerformerId == "alice");
+ performer.Active = false;
+ db.SaveChanges();
+ }
+
+ using var http = NewClient();
+ var response = await http.GetAsync("/api/v1/activity/dev/users", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.Single(payload!);
+ Assert.Equal("alice", payload[0].PerformerId);
+ Assert.False(payload[0].Active);
+ }
+
+ [Fact]
+ public async Task Catalog_and_Performers_are_consistent_for_dev_activity()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient();
+
+ var catalogResponse = await http.GetAsync("/api/v1/activity/catalog", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, catalogResponse.StatusCode);
+
+ var catalog = await catalogResponse.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(catalog);
+
+ var dev = catalog!.Single(a => a.Code == "dev");
+ Assert.True(dev.PerformerCount > 0);
+
+ var performersResponse = await http.GetAsync("/api/v1/activity/dev/users", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, performersResponse.StatusCode);
+
+ var performers = await performersResponse.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(performers);
+ Assert.Equal(dev.PerformerCount, performers!.Count);
+ Assert.Contains(performers, p => p.PerformerId == "alice");
+ }
+
+ [Fact]
+ public async Task Catalog_does_not_list_activity_without_declaration()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient();
+
+ var catalogResponse = await http.GetAsync("/api/v1/activity/catalog", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, catalogResponse.StatusCode);
+
+ var catalog = await catalogResponse.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(catalog);
+ Assert.DoesNotContain(catalog!, a => a.Code == "ghost");
+ Assert.Contains(catalog!, a => a.Code == "dev");
+ }
+
+ [Fact]
+ public async Task Catalog_lists_declared_activity_even_when_performer_inactive()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient();
+
+ var catalogResponse = await http.GetAsync("/api/v1/activity/catalog", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, catalogResponse.StatusCode);
+
+ var catalog = await catalogResponse.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(catalog);
+ Assert.Contains(catalog!, a => a.Code == "declared-only");
+
+ var response = await http.GetAsync("/api/v1/activity/declared-only/users", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.Single(payload!);
+ Assert.Equal("bob", payload[0].PerformerId);
+ Assert.Equal("bob", payload[0].UserName);
+ Assert.True(payload[0].HasPerformerProfile);
+ Assert.False(payload[0].Active);
+ }
+
+ [Fact]
+ public async Task Performers_alias_returns_same_payload_as_users_endpoint()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient();
+
+ var usersResponse = await http.GetAsync("/api/v1/activity/dev/users", TestContext.Current.CancellationToken);
+ var performersResponse = await http.GetAsync("/api/v1/activity/dev/performers", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, usersResponse.StatusCode);
+ Assert.Equal(HttpStatusCode.OK, performersResponse.StatusCode);
+
+ var usersPayload = await usersResponse.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ var performersPayload = await performersResponse.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+
+ Assert.NotNull(usersPayload);
+ Assert.NotNull(performersPayload);
+ Assert.Equal(usersPayload!.Count, performersPayload!.Count);
+ Assert.Equal(usersPayload[0].PerformerId, performersPayload[0].PerformerId);
+ Assert.Equal(usersPayload[0].UserName, performersPayload[0].UserName);
+ }
+}
diff --git a/src/Yavsc.Api.Test/ApiCollection.cs b/src/Yavsc.Api.Test/ApiCollection.cs
new file mode 100644
index 000000000..2c670522b
--- /dev/null
+++ b/src/Yavsc.Api.Test/ApiCollection.cs
@@ -0,0 +1,6 @@
+namespace Yavsc.Api.Test;
+
+[CollectionDefinition("Yavsc Api")]
+public sealed class ApiCollection
+{
+}
diff --git a/src/Yavsc.Api.Test/BillingControllerTests.cs b/src/Yavsc.Api.Test/BillingControllerTests.cs
new file mode 100644
index 000000000..38b9a9919
--- /dev/null
+++ b/src/Yavsc.Api.Test/BillingControllerTests.cs
@@ -0,0 +1,236 @@
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Helpers;
+using Yavsc.Models;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Haircut;
+using Yavsc.Models.Workflow;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class BillingControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public BillingControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ private HttpClient NewClient(string subject = "alice", string scope = "api")
+ {
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+
+ var http = new HttpClient(handler)
+ {
+ BaseAddress = new Uri(_fixture.BaseAddress)
+ };
+
+ http.DefaultRequestHeaders.Authorization =
+ new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+
+ return http;
+ }
+
+ [Fact]
+ public async Task GetProviderOngoingCommands_returns_current_provider_requests()
+ {
+ WorkflowHelpers.ConfigureBillingService();
+ _fixture.ResetAndSeedActivityGraph();
+
+ using (var scope = _fixture.Services.CreateScope())
+ {
+ var db = scope.ServiceProvider.GetRequiredService();
+ var location = db.Locations.Single();
+
+ db.RdvQueries.Add(new RdvQuery
+ {
+ ActivityCode = "dev",
+ ClientId = "bob",
+ PerformerId = "alice",
+ Consent = true,
+ UserCreated = "alice",
+ UserModified = "alice",
+ DateCreated = DateTime.UtcNow.AddMinutes(-10),
+ DateModified = DateTime.UtcNow.AddMinutes(-8),
+ EventDate = DateTime.UtcNow.AddDays(1),
+ Location = location,
+ Reason = "Rendez-vous fournisseur",
+ Status = QueryStatus.InProgress,
+ Description = "Commande fournisseur en cours",
+ });
+
+ db.RdvQueries.Add(new RdvQuery
+ {
+ ActivityCode = "dev",
+ ClientId = "alice",
+ PerformerId = "bob",
+ Consent = true,
+ UserCreated = "bob",
+ UserModified = "bob",
+ DateCreated = DateTime.UtcNow.AddMinutes(-20),
+ DateModified = DateTime.UtcNow.AddMinutes(-20),
+ EventDate = DateTime.UtcNow.AddDays(2),
+ Location = location,
+ Reason = "Commande d'un autre prestataire",
+ Status = QueryStatus.Accepted,
+ Description = "Autre prestataire",
+ });
+
+ db.SaveChanges();
+ }
+
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/bill/provider/ongoing", TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.NotEmpty(payload!);
+ Assert.All(payload!, item => Assert.Equal("alice", item.PerformerId));
+ Assert.Contains(payload!, item => item.BillingCode == BillingCodes.Rdv);
+ }
+
+ [Fact]
+ public async Task GetProviderOngoingCommands_ignores_rows_with_invalid_discriminator()
+ {
+ WorkflowHelpers.ConfigureBillingService();
+ _fixture.ResetAndSeedActivityGraph();
+
+ using (var scope = _fixture.Services.CreateScope())
+ {
+ var db = scope.ServiceProvider.GetRequiredService();
+
+ db.Database.ExecuteSqlInterpolated($@"
+INSERT INTO ""NominativeServiceCommands""
+(""ActivityCode"", ""ClientId"", ""Consent"", ""DateCreated"", ""DateModified"", ""Description"", ""Discriminator"", ""PerformerId"", ""Status"", ""UserCreated"", ""UserModified"")
+VALUES
+({"dev"}, {"bob"}, {true}, {DateTime.UtcNow.AddMinutes(-5)}, {DateTime.UtcNow.AddMinutes(-4)}, {"Legacy malformed row"}, {""}, {"alice"}, {(int)QueryStatus.Accepted}, {"alice"}, {"alice"});
+");
+
+ var location = db.Locations.Single();
+ db.RdvQueries.Add(new RdvQuery
+ {
+ ActivityCode = "dev",
+ ClientId = "bob",
+ PerformerId = "alice",
+ Consent = true,
+ UserCreated = "alice",
+ UserModified = "alice",
+ DateCreated = DateTime.UtcNow.AddMinutes(-3),
+ DateModified = DateTime.UtcNow.AddMinutes(-2),
+ EventDate = DateTime.UtcNow.AddDays(1),
+ Location = location,
+ Reason = "Commande valide",
+ Status = QueryStatus.InProgress,
+ Description = "Commande fournisseur valide",
+ });
+
+ db.SaveChanges();
+ }
+
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/bill/provider/ongoing", TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.NotEmpty(payload!);
+ Assert.Contains(payload!, item => item.BillingCode == BillingCodes.Rdv && item.PerformerId == "alice");
+ Assert.DoesNotContain(payload!, item => string.IsNullOrWhiteSpace(item.BillingCode));
+ }
+
+ [Fact]
+ public async Task GetProviderOngoingCommands_returns_haircut_and_grouped_haircut_requests()
+ {
+ WorkflowHelpers.ConfigureBillingService();
+ _fixture.ResetAndSeedHaircutGraph();
+
+ using (var scope = _fixture.Services.CreateScope())
+ {
+ var db = scope.ServiceProvider.GetRequiredService();
+ db.UserActivities.Add(new UserActivity
+ {
+ UserId = "alice",
+ DoesCode = "brush",
+ Weight = 50,
+ });
+ db.UserActivities.Add(new UserActivity
+ {
+ UserId = "alice",
+ DoesCode = "mbrush",
+ Weight = 50,
+ });
+ db.CommandForm.Add(new CommandForm
+ {
+ ActivityCode = "brush",
+ ActionName = BillingCodes.Brush,
+ Title = "Brush",
+ });
+ db.CommandForm.Add(new CommandForm
+ {
+ ActivityCode = "mbrush",
+ ActionName = BillingCodes.MBrush,
+ Title = "MBrush",
+ });
+ db.SaveChanges();
+ }
+
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/bill/provider/ongoing", TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.Contains(payload!, item => item.BillingCode == BillingCodes.Brush && item.PerformerId == "alice");
+ Assert.Contains(payload!, item => item.BillingCode == BillingCodes.MBrush && item.PerformerId == "alice");
+ }
+
+ [Fact]
+ public async Task GetProviderOngoingCommands_excludes_requests_outside_performer_declared_activities()
+ {
+ WorkflowHelpers.ConfigureBillingService();
+ _fixture.ResetAndSeedHaircutGraph();
+
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/bill/provider/ongoing", TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ var payload = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(payload);
+ Assert.DoesNotContain(payload!, item => item.BillingCode == BillingCodes.Brush);
+ Assert.DoesNotContain(payload!, item => item.BillingCode == BillingCodes.MBrush);
+ }
+
+ private sealed class ProviderOngoingCommandDto
+ {
+ public long Id { get; set; }
+ public string BillingCode { get; set; } = string.Empty;
+ public string ActivityCode { get; set; } = string.Empty;
+ public string PerformerId { get; set; } = string.Empty;
+ public string ClientId { get; set; } = string.Empty;
+ public QueryStatus Status { get; set; }
+ public string Description { get; set; } = string.Empty;
+ }
+}
diff --git a/src/Yavsc.Api.Test/Directory.Packages.props b/src/Yavsc.Api.Test/Directory.Packages.props
new file mode 100644
index 000000000..c2edf9eae
--- /dev/null
+++ b/src/Yavsc.Api.Test/Directory.Packages.props
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/src/Yavsc.Api.Test/EstimateApiControllerTests.cs b/src/Yavsc.Api.Test/EstimateApiControllerTests.cs
new file mode 100644
index 000000000..f48f81ce5
--- /dev/null
+++ b/src/Yavsc.Api.Test/EstimateApiControllerTests.cs
@@ -0,0 +1,209 @@
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Text.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Models;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Workflow;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class EstimateApiControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public EstimateApiControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ private HttpClient NewClient(string subject = "alice", string scope = "api")
+ {
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+
+ var http = new HttpClient(handler)
+ {
+ BaseAddress = new Uri(_fixture.BaseAddress)
+ };
+
+ http.DefaultRequestHeaders.Authorization =
+ new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+
+ return http;
+ }
+
+ ///
+ /// Seed a provider (alice) and a client (bob) with a pending
+ /// from bob to alice, and return the
+ /// command id.
+ ///
+ private long SeedPendingCommand()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ var location = db.Locations.Single();
+
+ var query = new RdvQuery
+ {
+ ActivityCode = "dev",
+ ClientId = "bob",
+ PerformerId = "alice",
+ Consent = true,
+ UserCreated = "bob",
+ UserModified = "bob",
+ DateCreated = DateTime.UtcNow.AddMinutes(-10),
+ DateModified = DateTime.UtcNow.AddMinutes(-10),
+ EventDate = DateTime.UtcNow.AddDays(1),
+ Location = location,
+ Reason = "Demande de devis",
+ Status = QueryStatus.InProgress,
+ Description = "Demande en attente de devis",
+ };
+ db.RdvQueries.Add(query);
+ db.SaveChanges();
+
+ return query.Id;
+ }
+
+ private static object NewEstimatePayload(long? commandId, string clientId, string? ownerId = null)
+ => new
+ {
+ CommandId = commandId,
+ ClientId = clientId,
+ OwnerId = ownerId,
+ CommandType = BillingCodes.Rdv,
+ Title = "Devis prestation",
+ Description = "Devis détaillé",
+ AttachedFiles = Array.Empty(),
+ AttachedGraphics = Array.Empty(),
+ Bill = new[]
+ {
+ new { Name = "Prestation", Description = "Prestation de base", Count = 1, UnitaryCost = 120m, Currency = "EUR" },
+ new { Name = "Remise", Description = "Remise fidélité", Count = 1, UnitaryCost = -20m, Currency = "EUR" },
+ },
+ };
+
+ [Fact]
+ public async Task PostEstimate_creates_the_estimate_and_validates_the_linked_command()
+ {
+ var commandId = SeedPendingCommand();
+ using var http = NewClient("alice");
+
+ var response = await http.PostAsJsonAsync(
+ "/api/v1/estimate",
+ NewEstimatePayload(commandId, clientId: "bob"),
+ TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ using var doc = JsonDocument.Parse(body);
+ var estimateId = doc.RootElement.GetProperty("id").GetInt64();
+ Assert.True(estimateId > 0);
+ Assert.Equal(2, doc.RootElement.GetProperty("bill").GetArrayLength());
+
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+
+ var estimate = db.Estimates.Include(e => e.Bill).Single(e => e.Id == estimateId);
+ Assert.Equal("alice", estimate.OwnerId);
+ Assert.Equal("bob", estimate.ClientId);
+ Assert.Equal(commandId, estimate.CommandId);
+ Assert.Equal(BillingCodes.Rdv, estimate.CommandType);
+ Assert.Equal(2, estimate.Bill.Count);
+ Assert.Contains(estimate.Bill, line => line.UnitaryCost == -20m);
+
+ // PostEstimate stamps the linked command as validated.
+ var query = db.RdvQueries.Single(q => q.Id == commandId);
+ Assert.NotNull(query.ValidationDate);
+ }
+
+ [Fact]
+ public async Task PostEstimate_without_command_creates_a_standalone_estimate()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient("alice");
+
+ var response = await http.PostAsJsonAsync(
+ "/api/v1/estimate",
+ NewEstimatePayload(commandId: null, clientId: "bob"),
+ TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ using var doc = JsonDocument.Parse(body);
+ var estimateId = doc.RootElement.GetProperty("id").GetInt64();
+
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ var estimate = db.Estimates.Single(e => e.Id == estimateId);
+ Assert.Null(estimate.CommandId);
+ Assert.Equal("alice", estimate.OwnerId);
+ }
+
+ [Fact]
+ public async Task PostEstimate_for_another_owner_is_rejected()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient("alice");
+
+ var response = await http.PostAsJsonAsync(
+ "/api/v1/estimate",
+ NewEstimatePayload(commandId: null, clientId: "bob", ownerId: "bob"),
+ TestContext.Current.CancellationToken);
+
+ Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ Assert.Empty(db.Estimates);
+ }
+
+ [Fact]
+ public async Task PostEstimate_with_an_unknown_command_id_is_rejected()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+ using var http = NewClient("alice");
+
+ var response = await http.PostAsJsonAsync(
+ "/api/v1/estimate",
+ NewEstimatePayload(commandId: 999999, clientId: "bob"),
+ TestContext.Current.CancellationToken);
+
+ Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ Assert.Empty(db.Estimates);
+ }
+
+ [Fact]
+ public async Task PostEstimate_without_token_is_unauthorized()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+ using var http = new HttpClient(handler) { BaseAddress = new Uri(_fixture.BaseAddress) };
+
+ var response = await http.PostAsJsonAsync(
+ "/api/v1/estimate",
+ NewEstimatePayload(commandId: null, clientId: "bob"),
+ TestContext.Current.CancellationToken);
+
+ Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
+ }
+}
diff --git a/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs
new file mode 100644
index 000000000..51e939ceb
--- /dev/null
+++ b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs
@@ -0,0 +1,494 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.IdentityModel.Tokens;
+using Npgsql;
+using Yavsc.Controllers;
+using Yavsc.Interfaces.Workflow;
+using Yavsc.Models;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Google.Messaging;
+using Yavsc.Models.Haircut;
+using Yavsc.Models.Messaging;
+using Yavsc.Models.Relationship;
+using Yavsc.Models.Workflow;
+using Yavsc.Services;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test.Fixtures;
+
+public sealed class ApiWebServerFixture : WebHostFixture
+{
+ private const string DbProviderEnvVar = "YAVSC_API_TEST_DB_PROVIDER";
+ private const string NpgsqlAdminConnectionEnvVar = "YAVSC_API_TEST_NPGSQL_ADMIN_CONNECTION";
+ private const string DedicatedNpgsqlDatabaseName = "yavscTestDb";
+ private const string DefaultDevelopmentConnectionString = "Server=localhost;Port=5432;Database=yavscdev;Username=yavscdev;Password=8*5idas;Include Error Detail=true";
+
+ protected override int HttpsPort => 5104;
+
+ private static SqliteConnection? _sharedSqliteConnection;
+ private static readonly object _sqliteLock = new();
+ private static readonly object _npgsqlLock = new();
+ private static string? _sharedNpgsqlConnectionString;
+
+ protected override WebApplication BuildApp(WebApplicationBuilder builder)
+ {
+ if (UseNpgsqlProvider())
+ {
+ var npgsqlConnectionString = EnsureNpgsqlDatabaseCreated();
+ builder.Services.AddDbContext(opt =>
+ opt.UseNpgsql(npgsqlConnectionString,
+ x => x.MigrationsAssembly("Yavsc.Org")));
+ }
+ else
+ {
+ SqliteConnection sharedConnection;
+ lock (_sqliteLock)
+ {
+ if (_sharedSqliteConnection is null)
+ {
+ _sharedSqliteConnection = new SqliteConnection(
+ "Data Source=YavscApiTests;Mode=Memory;Cache=Shared");
+ _sharedSqliteConnection.Open();
+ }
+ sharedConnection = _sharedSqliteConnection;
+ }
+
+ builder.Services.AddDbContext(opt =>
+ opt.UseSqlite(sharedConnection));
+ }
+
+ builder.Services.AddControllers()
+ .AddApplicationPart(typeof(ActivityApiController).Assembly);
+
+ builder.Services.AddLocalization();
+ builder.Services.Configure(_ => { });
+ builder.Services.AddTransient();
+ builder.Services.AddTransient();
+ builder.Services.AddAuthorization();
+
+ builder.Services.AddAuthentication("Bearer")
+ .AddJwtBearer("Bearer", options =>
+ {
+ options.IncludeErrorDetails = true;
+ options.MapInboundClaims = false;
+ options.TokenValidationParameters = new TokenValidationParameters
+ {
+ ValidateIssuer = true,
+ ValidIssuer = TestTokenIssuer.Issuer,
+ ValidateAudience = false,
+ ValidateLifetime = true,
+ ValidateIssuerSigningKey = true,
+ IssuerSigningKey = TestTokenIssuer.SigningKey,
+ NameClaimType = "sub",
+ RoleClaimType = Yavsc.Constants.RoleClaimType,
+ };
+ });
+
+ return builder.Build();
+ }
+
+ protected override async Task ConfigurePipelineAsync(WebApplication app)
+ {
+ app.UseDeveloperExceptionPage();
+ app.UseRouting();
+ app.UseAuthentication();
+ app.UseAuthorization();
+ app.MapControllers();
+
+ using (var scope = app.Services.CreateScope())
+ {
+ var db = scope.ServiceProvider.GetRequiredService();
+ if (UseNpgsqlProvider())
+ {
+ // Apply the EF Core migrations (Yavsc.Org assembly) so the
+ // test database schema matches the production provider.
+ // EnsureCreated must not be used here: it would create the
+ // schema without the migrations history and break Migrate().
+ db.Database.Migrate();
+ }
+ else
+ {
+ db.Database.EnsureCreated();
+ }
+ }
+
+ await Task.CompletedTask;
+ return app;
+ }
+
+ public string BaseAddress => Addresses.First(a => a.StartsWith("https://", StringComparison.Ordinal));
+
+ public static bool UseNpgsqlProvider()
+ => string.Equals(
+ Environment.GetEnvironmentVariable(DbProviderEnvVar),
+ "npgsql",
+ StringComparison.OrdinalIgnoreCase);
+
+ private static string EnsureNpgsqlDatabaseCreated()
+ {
+ lock (_npgsqlLock)
+ {
+ if (!string.IsNullOrWhiteSpace(_sharedNpgsqlConnectionString))
+ {
+ return _sharedNpgsqlConnectionString;
+ }
+
+ var adminConnectionString = BuildAdminConnectionString();
+ var databaseName = DedicatedNpgsqlDatabaseName;
+
+ using (var adminConnection = new NpgsqlConnection(adminConnectionString))
+ {
+ adminConnection.Open();
+ using var existsCommand = adminConnection.CreateCommand();
+ existsCommand.CommandText = "SELECT 1 FROM pg_database WHERE datname = @databaseName";
+ existsCommand.Parameters.AddWithValue("databaseName", databaseName);
+
+ if (existsCommand.ExecuteScalar() is null)
+ {
+ using var createCommand = adminConnection.CreateCommand();
+ createCommand.CommandText = $"CREATE DATABASE \"{databaseName}\"";
+ createCommand.ExecuteNonQuery();
+ }
+ }
+
+ var testConnectionBuilder = new NpgsqlConnectionStringBuilder(adminConnectionString)
+ {
+ Database = databaseName,
+ Pooling = false,
+ IncludeErrorDetail = true
+ };
+
+ _sharedNpgsqlConnectionString = testConnectionBuilder.ToString();
+ return _sharedNpgsqlConnectionString;
+ }
+ }
+
+ private static string BuildAdminConnectionString()
+ {
+ var configured = Environment.GetEnvironmentVariable(NpgsqlAdminConnectionEnvVar);
+ var source = string.IsNullOrWhiteSpace(configured)
+ ? DefaultDevelopmentConnectionString
+ : configured;
+
+ var builder = new NpgsqlConnectionStringBuilder(source)
+ {
+ Pooling = false,
+ IncludeErrorDetail = true
+ };
+
+ if (string.IsNullOrWhiteSpace(configured))
+ {
+ builder.Database = "postgres";
+ }
+ else if (string.IsNullOrWhiteSpace(builder.Database))
+ {
+ builder.Database = "postgres";
+ }
+
+ return builder.ToString();
+ }
+
+ private sealed class NoopMessageSender : IYavscMessageSender
+ {
+ public Task NotifyBookQueryAsync(IEnumerable connectionIds, RdvQueryEvent ev)
+ => Task.FromResult(new MessageWithPayloadResponse());
+
+ public Task NotifyEstimateAsync(IEnumerable connectionIds, EstimationEvent ev)
+ => Task.FromResult(new MessageWithPayloadResponse());
+
+ public Task NotifyHairCutQueryAsync(IEnumerable connectionIds, HairCutQueryEvent ev)
+ => Task.FromResult(new MessageWithPayloadResponse());
+
+ public Task NotifyAsync(IEnumerable connectionIds, IEvent yaev)
+ => Task.FromResult(new MessageWithPayloadResponse());
+ }
+
+ public void ResetAndSeedActivityGraph()
+ {
+ using var scope = Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+
+ ResetDatabase(db);
+ db.Database.EnsureCreated();
+
+ var user = new ApplicationUser
+ {
+ Id = "alice",
+ UserName = "alice",
+ Email = "alice@example.test",
+ EmailConfirmed = true,
+ FullName = "Alice",
+ };
+ db.Users.Add(user);
+
+ var location = new Location
+ {
+ Address = "1 rue du Test",
+ Latitude = 48.8566,
+ Longitude = 2.3522,
+ };
+ db.Add(location);
+ db.SaveChanges();
+
+ var activity = new Activity
+ {
+ Code = "dev",
+ Name = "Dev",
+ Hidden = false,
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ };
+ db.Activities.Add(activity);
+
+ db.Activities.Add(new Activity
+ {
+ Code = "ghost",
+ Name = "Ghost",
+ Hidden = false,
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ });
+
+ var performer = new PerformerProfile
+ {
+ PerformerId = "alice",
+ SIREN = "123456789",
+ OrganizationAddressId = location.Id,
+ AcceptNotifications = true,
+ AcceptPublicContact = true,
+ Active = true,
+ Rate = 5,
+ WebSite = "https://alice.dev",
+ };
+ db.Performers.Add(performer);
+
+ db.UserActivities.Add(new UserActivity
+ {
+ UserId = "alice",
+ DoesCode = "dev",
+ Weight = 100,
+ });
+
+ db.Users.Add(new ApplicationUser
+ {
+ Id = "bob",
+ UserName = "bob",
+ Email = "bob@example.test",
+ EmailConfirmed = true,
+ FullName = "Bob",
+ });
+
+ db.Activities.Add(new Activity
+ {
+ Code = "declared-only",
+ Name = "Declared Only",
+ Hidden = false,
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ });
+
+ db.Performers.Add(new PerformerProfile
+ {
+ PerformerId = "bob",
+ SIREN = "987654321",
+ OrganizationAddressId = location.Id,
+ AcceptNotifications = false,
+ AcceptPublicContact = false,
+ Active = false,
+ Rate = 0,
+ WebSite = "",
+ });
+
+ db.UserActivities.Add(new UserActivity
+ {
+ UserId = "bob",
+ DoesCode = "declared-only",
+ Weight = 10,
+ });
+
+ db.SaveChanges();
+ }
+
+ private static void ResetDatabase(ApplicationDbContext db)
+ {
+ if (UseNpgsqlProvider())
+ {
+ // Purge only the tables of the test graph, children before
+ // parents, so no DELETE violates a foreign key. Estimate and
+ // CommandLine reference NominativeServiceCommand (CommandId) and
+ // must be deleted before the Rdv/HairCut/HairMultiCut queries.
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+ db.Set().RemoveRange(db.Set());
+
+ db.SaveChanges();
+ return;
+ }
+
+ db.Database.EnsureDeleted();
+ }
+
+ public void ResetAndSeedRdvQueryGraph()
+ {
+ ResetAndSeedActivityGraph();
+
+ using var scope = Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+
+ var location = db.Locations.Single(l => l.Address == "1 rue du Test");
+
+ db.RdvQueries.Add(new RdvQuery
+ {
+ ActivityCode = "dev",
+ ClientId = "alice",
+ PerformerId = "alice",
+ Consent = true,
+ UserCreated = "alice",
+ UserModified = "alice",
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ EventDate = DateTime.UtcNow.AddDays(1),
+ Location = location,
+ Reason = "Initial rendez-vous",
+ Status = Yavsc.QueryStatus.Inserted,
+ });
+
+ db.SaveChanges();
+ }
+
+ public void ResetAndSeedHaircutGraph()
+ {
+ ResetAndSeedActivityGraph();
+
+ using var scope = Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+
+ var location = db.Locations.Single(l => l.Address == "1 rue du Test");
+
+ if (!db.Activities.Any(a => a.Code == "brush"))
+ {
+ db.Activities.Add(new Activity
+ {
+ Code = "brush",
+ Name = "Brush",
+ Hidden = false,
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ });
+ }
+
+ if (!db.Activities.Any(a => a.Code == "mbrush"))
+ {
+ db.Activities.Add(new Activity
+ {
+ Code = "mbrush",
+ Name = "MBrush",
+ Hidden = false,
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ });
+ }
+
+ if (!db.BrusherProfile.Any(p => p.UserId == "alice"))
+ {
+ db.BrusherProfile.Add(new BrusherProfile
+ {
+ UserId = "alice",
+ ActionDistance = 25,
+ WomenLongCutPrice = 50m,
+ WomenHalfCutPrice = 40m,
+ WomenShortCutPrice = 30m,
+ ManCutPrice = 20m,
+ KidCutPrice = 15m,
+ ShampooPrice = 5m,
+ });
+ }
+
+ var prestation1 = new HairPrestation
+ {
+ Gender = HairCutGenders.Women,
+ Length = HairLength.HalfLong,
+ Cut = true,
+ Shampoo = true,
+ Dressing = HairDressings.Brushing,
+ Tech = HairTechnos.NoTech,
+ Cares = false,
+ Taints = new List(),
+ };
+ var prestation2 = new HairPrestation
+ {
+ Gender = HairCutGenders.Man,
+ Length = HairLength.Short,
+ Cut = true,
+ Shampoo = false,
+ Dressing = HairDressings.Brushing,
+ Tech = HairTechnos.NoTech,
+ Cares = false,
+ Taints = new List(),
+ };
+
+ db.HairPrestation.AddRange(prestation1, prestation2);
+ db.SaveChanges();
+
+ db.HairCutQueries.Add(new HairCutQuery
+ {
+ ActivityCode = "brush",
+ ClientId = "alice",
+ PerformerId = "alice",
+ Consent = true,
+ UserCreated = "alice",
+ UserModified = "alice",
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ EventDate = DateTime.UtcNow.AddDays(3),
+ Location = location,
+ PrestationId = prestation1.Id,
+ Prestation = prestation1,
+ AdditionalInfo = "Coupe test",
+ Status = Yavsc.QueryStatus.Inserted,
+ Description = "Haircut seed",
+ });
+
+ db.HairMultiCutQueries.Add(new HairMultiCutQuery
+ {
+ ActivityCode = "mbrush",
+ ClientId = "alice",
+ PerformerId = "alice",
+ Consent = true,
+ UserCreated = "alice",
+ UserModified = "alice",
+ DateCreated = DateTime.UtcNow,
+ DateModified = DateTime.UtcNow,
+ EventDate = DateTime.UtcNow.AddDays(4),
+ Location = location,
+ Prestations = new List
+ {
+ new() { PrestationId = prestation1.Id, Prestation = prestation1 },
+ new() { PrestationId = prestation2.Id, Prestation = prestation2 },
+ },
+ Status = Yavsc.QueryStatus.Inserted,
+ });
+
+ db.SaveChanges();
+ }
+
+ public override void Dispose()
+ {
+ // Keep the shared in-memory SQLite connection alive for the
+ // whole test process. Closing it from one fixture instance can
+ // drop the schema while other tests are still running.
+ base.Dispose();
+ }
+}
diff --git a/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs b/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs
new file mode 100644
index 000000000..97ed2e61c
--- /dev/null
+++ b/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs
@@ -0,0 +1,62 @@
+using System.Net;
+using System.Net.Http.Headers;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Helpers;
+using Yavsc.Models;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class FrontOfficeApiControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public FrontOfficeApiControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ private HttpClient NewClient(string subject = "alice", string scope = "api")
+ {
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+
+ var http = new HttpClient(handler)
+ {
+ BaseAddress = new Uri(_fixture.BaseAddress)
+ };
+ http.DefaultRequestHeaders.Authorization =
+ new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+ return http;
+ }
+
+ [Fact]
+ public async Task Front_accept_query_updates_status_without_server_error()
+ {
+ WorkflowHelpers.ConfigureBillingService();
+ _fixture.ResetAndSeedRdvQueryGraph();
+
+ long queryId;
+ using (var scope = _fixture.Services.CreateScope())
+ {
+ var db = scope.ServiceProvider.GetRequiredService();
+ queryId = db.RdvQueries.Select(q => q.Id).Single();
+ }
+
+ using var http = NewClient();
+ var response = await http.PostAsync($"/api/v1/front/query/accept?billingCode=Rdv&queryId={queryId}", content: null, TestContext.Current.CancellationToken);
+ var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+ Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+ using var assertScope = _fixture.Services.CreateScope();
+ var assertDb = assertScope.ServiceProvider.GetRequiredService();
+ var updated = assertDb.RdvQueries.Single(q => q.Id == queryId);
+
+ Assert.Equal(QueryStatus.Accepted, updated.Status);
+ }
+}
diff --git a/src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs b/src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs
new file mode 100644
index 000000000..b4b7e3e42
--- /dev/null
+++ b/src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs
@@ -0,0 +1,120 @@
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.EntityFrameworkCore;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Models;
+using Yavsc.Models.Haircut;
+using Yavsc.Models.Relationship;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class HairCutQueryApiControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public HairCutQueryApiControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ private HttpClient NewClient(string subject = "alice", string scope = "api")
+ {
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+
+ var http = new HttpClient(handler)
+ {
+ BaseAddress = new Uri(_fixture.BaseAddress)
+ };
+ http.DefaultRequestHeaders.Authorization =
+ new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+ return http;
+ }
+
+ [Fact]
+ public async Task Billing_brush_route_supports_crud()
+ {
+ _fixture.ResetAndSeedHaircutGraph();
+ using var http = NewClient();
+
+ var prestationId = await GetPrestationIdAsync();
+
+ var createPayload = new HairCutQuery
+ {
+ ActivityCode = "brush",
+ PerformerId = "alice",
+ Consent = true,
+ EventDate = DateTime.UtcNow.AddDays(5),
+ Location = new Location
+ {
+ Address = "2 rue de la Coupe",
+ Latitude = 48.8570,
+ Longitude = 2.3525,
+ },
+ PrestationId = prestationId,
+ AdditionalInfo = "Brushing test",
+ Status = QueryStatus.Inserted,
+ Description = "Haircut create",
+ };
+
+ var createResponse = await http.PostAsJsonAsync("/api/v1/billing/Brush", createPayload, TestContext.Current.CancellationToken);
+ if (createResponse.StatusCode != HttpStatusCode.Created)
+ {
+ var body = await createResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+ Assert.Fail($"Unexpected status {createResponse.StatusCode}: {body}");
+ }
+
+ var created = await createResponse.Content.ReadFromJsonAsync(TestContext.Current.CancellationToken);
+ Assert.NotNull(created);
+ Assert.NotEqual(0, created!.Id);
+ Assert.Equal("alice", created.ClientId);
+
+ var getResponse = await http.GetAsync($"/api/v1/billing/Brush/{created.Id}", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+
+ var fetched = await getResponse.Content.ReadFromJsonAsync(TestContext.Current.CancellationToken);
+ Assert.NotNull(fetched);
+ Assert.Equal(created.Id, fetched!.Id);
+ Assert.Equal("Brushing test", fetched.AdditionalInfo);
+
+ fetched.AdditionalInfo = "Brushing modifié";
+ var putResponse = await http.PutAsJsonAsync($"/api/v1/billing/Brush/{fetched.Id}", fetched, TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.NoContent, putResponse.StatusCode);
+
+ var deleteResponse = await http.DeleteAsync($"/api/v1/billing/Brush/{fetched.Id}", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, deleteResponse.StatusCode);
+
+ var missingResponse = await http.GetAsync($"/api/v1/billing/Brush/{fetched.Id}", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.NotFound, missingResponse.StatusCode);
+ }
+
+ [Fact]
+ public async Task Billing_brush_route_exposes_prestation_catalog()
+ {
+ _fixture.ResetAndSeedHaircutGraph();
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/billing/Brush/prestations", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+ var catalog = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(catalog);
+ Assert.NotEmpty(catalog!);
+ Assert.All(catalog!, item => Assert.False(string.IsNullOrWhiteSpace(item.Title)));
+ Assert.Contains(catalog!, item => item.Title == "Femme · Cheveux mi-longs"
+ && item.Details == "Coupe · Brushing · Aucune technique spécifique · Shampoing · Sans soins");
+ }
+
+ private async Task GetPrestationIdAsync()
+ {
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ return await db.HairPrestation.Select(p => p.Id).FirstAsync(TestContext.Current.CancellationToken);
+ }
+}
\ No newline at end of file
diff --git a/src/Yavsc.Api.Test/HairMultiCutQueryApiControllerTests.cs b/src/Yavsc.Api.Test/HairMultiCutQueryApiControllerTests.cs
new file mode 100644
index 000000000..8d940b8b1
--- /dev/null
+++ b/src/Yavsc.Api.Test/HairMultiCutQueryApiControllerTests.cs
@@ -0,0 +1,123 @@
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Models;
+using Yavsc.Models.Haircut;
+using Yavsc.Models.Relationship;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class HairMultiCutQueryApiControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public HairMultiCutQueryApiControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ private HttpClient NewClient(string subject = "alice", string scope = "api")
+ {
+ var handler = new HttpClientHandler
+ {
+ ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+ };
+
+ var http = new HttpClient(handler)
+ {
+ BaseAddress = new Uri(_fixture.BaseAddress)
+ };
+ http.DefaultRequestHeaders.Authorization =
+ new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+ return http;
+ }
+
+ [Fact]
+ public async Task Billing_mbrush_route_supports_crud()
+ {
+ _fixture.ResetAndSeedHaircutGraph();
+ using var http = NewClient();
+
+ var prestationIds = await GetPrestationIdsAsync();
+
+ var createPayload = new HairMultiCutQuery
+ {
+ ActivityCode = "mbrush",
+ PerformerId = "alice",
+ Consent = true,
+ EventDate = DateTime.UtcNow.AddDays(6),
+ Location = new Location
+ {
+ Address = "3 rue du Groupe",
+ Latitude = 48.8580,
+ Longitude = 2.3530,
+ },
+ Prestations = prestationIds.Select(id => new HairPrestationCollectionItem { PrestationId = id }).ToList(),
+ Status = QueryStatus.Inserted,
+ };
+
+ var createResponse = await http.PostAsJsonAsync("/api/v1/billing/MBrush", createPayload, TestContext.Current.CancellationToken);
+ if (createResponse.StatusCode != HttpStatusCode.Created)
+ {
+ var body = await createResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+ Assert.Fail($"Unexpected status {createResponse.StatusCode}: {body}");
+ }
+
+ var created = await createResponse.Content.ReadFromJsonAsync(TestContext.Current.CancellationToken);
+ Assert.NotNull(created);
+ Assert.NotEqual(0, created!.Id);
+ Assert.Equal("alice", created.ClientId);
+ Assert.Equal(2, created.Prestations.Count);
+
+ var getResponse = await http.GetAsync($"/api/v1/billing/MBrush/{created.Id}", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+
+ var fetched = await getResponse.Content.ReadFromJsonAsync(TestContext.Current.CancellationToken);
+ Assert.NotNull(fetched);
+ Assert.Equal(created.Id, fetched!.Id);
+ Assert.Equal(2, fetched.Prestations.Count);
+
+ fetched.Status = QueryStatus.Accepted;
+ var putResponse = await http.PutAsJsonAsync($"/api/v1/billing/MBrush/{fetched.Id}", fetched, TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.NoContent, putResponse.StatusCode);
+
+ var deleteResponse = await http.DeleteAsync($"/api/v1/billing/MBrush/{fetched.Id}", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, deleteResponse.StatusCode);
+
+ var missingResponse = await http.GetAsync($"/api/v1/billing/MBrush/{fetched.Id}", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.NotFound, missingResponse.StatusCode);
+ }
+
+ [Fact]
+ public async Task Billing_mbrush_route_exposes_prestation_catalog()
+ {
+ _fixture.ResetAndSeedHaircutGraph();
+ using var http = NewClient();
+
+ var response = await http.GetAsync("/api/v1/billing/MBrush/prestations", TestContext.Current.CancellationToken);
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+ var catalog = await response.Content.ReadFromJsonAsync>(TestContext.Current.CancellationToken);
+ Assert.NotNull(catalog);
+ Assert.NotEmpty(catalog!);
+ Assert.All(catalog!, item => Assert.False(string.IsNullOrWhiteSpace(item.Details)));
+ Assert.Contains(catalog!, item => item.Title == "Femme · Cheveux mi-longs"
+ && item.Details == "Coupe · Brushing · Aucune technique spécifique · Shampoing · Sans soins");
+ }
+
+ private async Task> GetPrestationIdsAsync()
+ {
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+ return await db.HairPrestation
+ .OrderBy(p => p.Id)
+ .Select(p => p.Id)
+ .Take(2)
+ .ToListAsync(TestContext.Current.CancellationToken);
+ }
+}
\ No newline at end of file
diff --git a/src/Yavsc.Api.Test/HomeControllerTests.cs b/src/Yavsc.Api.Test/HomeControllerTests.cs
new file mode 100644
index 000000000..a5706dc5f
--- /dev/null
+++ b/src/Yavsc.Api.Test/HomeControllerTests.cs
@@ -0,0 +1,69 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Controllers;
+using Yavsc.Models.Workflow;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class HomeControllerTests : IClassFixture
+{
+ private readonly ApiWebServerFixture _fixture;
+
+ public HomeControllerTests(ApiWebServerFixture fixture)
+ {
+ _fixture = fixture;
+ }
+
+ [Fact]
+ public async Task Index_does_not_list_activity_without_declaration()
+ {
+ _fixture.ResetAndSeedActivityGraph();
+
+ using var scope = _fixture.Services.CreateScope();
+ var db = scope.ServiceProvider.GetRequiredService();
+
+ var controller = new HomeController(
+ NullLogger.Instance,
+ localizer: null!,
+ context: db,
+ settingsOptions: Options.Create(new SiteSettings()),
+ env: new TestEnvironment());
+
+ controller.ControllerContext = new ControllerContext
+ {
+ HttpContext = new DefaultHttpContext
+ {
+ User = new ClaimsPrincipal(new ClaimsIdentity(new[]
+ {
+ new Claim("sub", "alice"),
+ new Claim(ClaimTypes.NameIdentifier, "alice")
+ }, "Bearer"))
+ }
+ };
+
+ var result = await controller.Index(id: null);
+ var view = Assert.IsType(result);
+ var model = Assert.IsAssignableFrom