diff --git a/.vscode/tasks.json b/.vscode/tasks.json index fd46437a..a30c9c06 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, diff --git a/CHANGELOG.md b/CHANGELOG.md index b3dbd65a..9bef40e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,78 @@ # Changelog +## [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] 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 + +néant + +## [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 + +nothing + +### Changed + +masquage non-owner côté backend de l'ACL du billet + +### Fixed + +On a maintenant le comportement attendu bout en bout: + +ACL chargée depuis le BlogPostDto +noms de cercles affichés dans le dialogue ACL côté PostIt + ## [1.0.8-rc8] - unstable ### Added diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd408c5c..8aa0567d 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 7505c851..f1be93f9 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/README.md b/README.md index b132f3f2..549348f4 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 4c00e629..364b98bd 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 00000000..fb01ede4 --- /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 151045db..79145668 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,6 +89,7 @@ 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) @@ -92,4 +98,3 @@ showConfig: clean: @rm -rf generated -.PHONY: build_publish mep showConfig copy-service-Org copy-service-Blogs reinstall clean diff --git a/contrib/README.md b/contrib/README.md new file mode 100644 index 00000000..01156156 --- /dev/null +++ b/contrib/README.md @@ -0,0 +1,5 @@ +# Read me + +## Note aux icones + +㝉®🅬⛒⛑🩎🩺🞫🞮🞕🞖🞆🔴🔵🔲🖂🔧🔩🔐🔌💾💼💬💭👿👾🏷🎯🏹🌍🎎💩 diff --git a/contrib/tmp/yavscBlogs.service b/contrib/tmp/yavscBlogs.service new file mode 100644 index 00000000..718534cd --- /dev/null +++ b/contrib/tmp/yavscBlogs.service @@ -0,0 +1,37 @@ +[Unit] +Description=yavsc-Blogs +After=syslog.target +After=network.target +Wants=postgresql.service +After=postgresql.service + +[Service] +RestartSec=5s +Type=simple +User=yavsc +Group=yavsc +WorkingDirectory=/srv/www/yavsc +ExecStart=/srv/www/yavsc/Yavsc.Blogs +Restart=always +Environment="HOME=" +Environment="ANTHROPIC_API_KEY=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" +Environment="ANTHROPIC_MAX_TOKENS=255" +Environment="ASPNETCORE_Environment=" +Environment="ASPNETCORE_Kestrel__Endpoints__Http=http://localhost:Blogs_" +Environment="ASPNETCORE_ConnectionStrings__YavscConnection=Server=localhost;Port=5432;Database=yavsc;Username=yavsc;Password=4T/X+fOnE;" + +Environment="ASPNETCORE_Smtp__Host=\"mercure.pschneider.f\"" +Environment="ASPNETCORE_Smtp__Port=465" +Environment="ASPNETCORE_Smtp__SenderName=\"Paul Schneider\"" +Environment="ASPNETCORE_Smtp__SenderEmail=\"paul@pschneider.fr\"" +Environment="ASPNETCORE_Smtp__UserName=\"paul\"" +Environment="ASPNETCORE_Smtp__Password=\"j\0Dsn5=t\"" + +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +AmbientCapabilities=CAP_NET_BIND_SERVICE +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=yavscBlogs + +[Install] +WantedBy=multi-user.target diff --git a/doc/README.md b/doc/README.md index 912a2e56..fb9bea94 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 00000000..975cd7b7 --- /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 00000000..ecc14f1d --- /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 00000000..14a727a1 --- /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/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props index 0d5fa50c..4dd4b288 100644 --- a/src/PostIt/Directory.Packages.props +++ b/src/PostIt/Directory.Packages.props @@ -8,8 +8,6 @@ 12.1.1 - - @@ -21,16 +19,12 @@ - - - - diff --git a/src/PostIt/PostIt.Android/Application.cs b/src/PostIt/PostIt.Android/Application.cs index f5a7908d..040b01ca 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 ad8455ef..54910080 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 f208f9ce..5b90267f 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 00000000..f710cacc --- /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 00000000..2e8d3e54 --- /dev/null +++ b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs @@ -0,0 +1,151 @@ +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 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 ValueTask DisposeAsync() => ValueTask.CompletedTask; + } +} diff --git a/src/PostIt/PostIt.Tests/BearerScopeTests.cs b/src/PostIt/PostIt.Tests/BearerScopeTests.cs index c6bf7d56..984483fc 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 00000000..c7b5b926 --- /dev/null +++ b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs @@ -0,0 +1,274 @@ +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 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 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 00000000..a7f2b084 --- /dev/null +++ b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs @@ -0,0 +1,134 @@ +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.False(vm.CanOpenDetails); + + vm.SelectedQuery = vm.Queries[0]; + Assert.False(vm.OpenSelectedQueryCommand.CanExecute(null)); + } + + 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 ValueTask DisposeAsync() => ValueTask.CompletedTask; + } +} diff --git a/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs b/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs index 895f220e..daabdf59 100644 --- a/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs +++ b/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs @@ -166,4 +166,51 @@ public class BlogPostAuthorDtoTests Assert.True(root.TryGetProperty("userName", out _)); Assert.True(root.TryGetProperty("avatar", out _)); } + + [Fact] + public void BlogPostDto_deserialises_acl_from_detail_payload() + { + // Detail payload shape emitted by BlogApiController.GetBlog: + // ACL entries are included under "acl"/"ACL". + var json = """ + { + "id": 99, + "title": "ACL test", + "authorId": "u-alice", + "acl": [ + { "circleId": 12, "blogPostId": 99 }, + { "circleId": 34, "blogPostId": 99 } + ] + } + """; + + var post = JsonSerializer.Deserialize(json, CaseInsensitiveJson); + + Assert.NotNull(post); + var acl = post!.GetACL(); + Assert.Equal(2, acl.Length); + Assert.Contains(acl, a => a.CircleId == 12); + Assert.Contains(acl, a => a.CircleId == 34); + } + + [Fact] + public void BlogPostDto_does_not_emit_acl_when_serialized_for_write() + { + var post = new BlogPostDto + { + Id = 77, + Title = "Write payload" + }; + post.AuthorizeCircle(11); + + // The client should not send ACL through POST/PUT blog payloads. + // ACL mutations have their own dedicated /blogacl endpoint. + var json = JsonSerializer.Serialize(post, + new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); + + using var doc = JsonDocument.Parse(json); + var root = doc.RootElement; + Assert.False(root.TryGetProperty("acl", out _)); + Assert.False(root.TryGetProperty("wireAcl", out _)); + } } diff --git a/src/PostIt/PostIt.Tests/PostAclDialogTests.cs b/src/PostIt/PostIt.Tests/PostAclDialogTests.cs index ccb33ec7..e7175203 100644 --- a/src/PostIt/PostIt.Tests/PostAclDialogTests.cs +++ b/src/PostIt/PostIt.Tests/PostAclDialogTests.cs @@ -9,6 +9,7 @@ using PostIt.Services; using PostIt.ViewModels; using PostIt.Views; using Yavsc.Api.Client; +using Yavsc.Api.Client.Dtos; using Yavsc.Blogspot; namespace PostIt.Tests; @@ -94,7 +95,7 @@ public class PostAclDialogTests HttpMethod method, string path, object? body = null, CancellationToken ct = default) { - 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); using var resp = _http.SendAsync(req, ct).GetAwaiter().GetResult(); resp.EnsureSuccessStatusCode(); @@ -122,8 +123,8 @@ public class PostAclDialogTests var handler = new CountingHttpHandler(); var settings = new Settings(); var api = new TestableYavscApiClient(settings, new TokenStore(System.IO.Path.GetTempFileName()), handler); - var aclClient = new BlogAclApiClient(api, settings.BusinessApiUrl); - var circleClient = new CircleApiClient(api, settings.BusinessApiUrl); + var aclClient = new BlogAclApiClient(api, settings.ApiUrl); + var circleClient = new CircleApiClient(api, settings.ApiUrl); var services = new ServiceCollection(); services.AddSingleton(settings); @@ -190,9 +191,8 @@ public class PostAclDialogTests await Task.Delay(20); } - // Assert: exactly two GETs went out (one to /blogacl, - // one to /circle), both from the LoadAsync call. - Assert.Equal(2, handler.RequestCount); + // Assert: one GET went out (for /circle) from LoadAsync. + Assert.Equal(1, handler.RequestCount); // And the VM's idempotency gate has flipped. Assert.True(vm.Loaded); @@ -218,7 +218,58 @@ public class PostAclDialogTests await vm.LoadAsync(); // Assert: the second call short-circuited on _loaded. - Assert.Equal(2, handler.RequestCount); + Assert.Equal(1, handler.RequestCount); Assert.True(vm.Loaded); } + + [Fact] + public async Task LoadAsync_keeps_acl_from_blogpostdto_and_only_loads_circles() + { + var post = new BlogPostDto { Id = 42, Title = "ACL hydration" }; + post.AuthorizeCircle(12); + post.AuthorizeCircle(34); + + var api = new StubAclApiClient(); + var aclClient = new BlogAclApiClient(api, "http://localhost/"); + var circleClient = new CircleApiClient(api, "http://localhost/"); + var vm = new PostAclDialogViewModel(post, aclClient, circleClient); + + await vm.LoadAsync(); + + Assert.Equal(1, api.CallCount); + Assert.Equal(2, vm.AclEntries.Count); + Assert.Contains(vm.AclEntries, a => a.CircleId == 12); + Assert.Contains(vm.AclEntries, a => a.CircleId == 34); + } + + private sealed class StubAclApiClient : IYavscApiClient + { + public HttpClient Http { get; } = new(); + public int CallCount { get; private set; } + + public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) + { + CallCount++; + + if (typeof(T) == typeof(List)) + { + var circles = new List + { + new() { Id = 12, Name = "A", OwnerId = "owner", Public = false }, + new() { Id = 34, Name = "B", OwnerId = "owner", Public = false }, + }; + return Task.FromResult((T)(object)circles); + } + + return Task.FromResult(default(T)!); + } + + public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) + { + CallCount++; + return Task.CompletedTask; + } + + public ValueTask DisposeAsync() => ValueTask.CompletedTask; + } } diff --git a/src/PostIt/PostIt.Tests/SettingsLoadTests.cs b/src/PostIt/PostIt.Tests/SettingsLoadTests.cs index 3f350240..3f8dc02b 100644 --- a/src/PostIt/PostIt.Tests/SettingsLoadTests.cs +++ b/src/PostIt/PostIt.Tests/SettingsLoadTests.cs @@ -89,7 +89,7 @@ public class SettingsLoadTests settings.Authentication.RedirectUri = global::AuthenticationSettings.DesktopRedirectUri; - settings.BusinessApiUrl = flip + settings.ApiUrl = flip ? "https://a.example.test/api/v1/" : "https://b.example.test/api/v1/"; diff --git a/src/PostIt/PostIt.Tests/SignaturePadControlTests.cs b/src/PostIt/PostIt.Tests/SignaturePadControlTests.cs index c03e6850..ff1233e9 100644 --- a/src/PostIt/PostIt.Tests/SignaturePadControlTests.cs +++ b/src/PostIt/PostIt.Tests/SignaturePadControlTests.cs @@ -94,6 +94,26 @@ public class SignaturePadControlTests Assert.NotEqual(first.Strokes, third.Strokes); } + [Fact] + public void PendingStroke_is_exposed_only_while_capturing() + { + var pad = new SignaturePadControl(); + + Assert.Empty(pad.PendingStroke); + + pad.BeginCaptureForTest(); + pad.AppendPointForTest(1_000, 2_000); + pad.AppendPointForTest(3_000, 4_000); + + Assert.Equal(new[] { 1_000, 2_000, 3_000, 4_000 }, pad.PendingStroke); + Assert.Equal(new[] { 1_000, 2_000, 3_000, 4_000 }, pad.Strokes); + + pad.SealStrokeForTest(); + + Assert.Empty(pad.PendingStroke); + Assert.Equal(new[] { 2, 1_000, 2_000, 3_000, 4_000 }, pad.Strokes); + } + [Fact] public void Clear_empties_buffer_and_raises_redraw() { diff --git a/src/PostIt/PostIt.Tests/YavscApiClientTests.cs b/src/PostIt/PostIt.Tests/YavscApiClientTests.cs index 21c0dd00..b074de66 100644 --- a/src/PostIt/PostIt.Tests/YavscApiClientTests.cs +++ b/src/PostIt/PostIt.Tests/YavscApiClientTests.cs @@ -58,7 +58,7 @@ public class YavscApiClientTests // calls CallAsync("posts", ...) directly (bypassing // BlogApiClient, which is the only thing that would set // it in production). Mirror prod here. - reloaded.Http.BaseAddress = new Uri(settings.BusinessApiUrl); + reloaded.Http.BaseAddress = new Uri(settings.ApiUrl); var posts = await reloaded.CallAsync>( HttpMethod.Get, "posts", TestContext.Current.CancellationToken); @@ -118,7 +118,7 @@ public class YavscApiClientTests RedirectUri = "postit://callback", Scopes = new[] { "openid" }, }, - BusinessApiUrl = "https://127.0.0.1:5003/api/v1", + ApiUrl = "https://127.0.0.1:5003/api/v1", }; var client = new YavscApiClient(settings, new TokenStore(Path.Combine( Path.GetTempPath(), $"postit-tests-noop-{Guid.NewGuid():N}.json"))); @@ -162,7 +162,7 @@ public class YavscApiClientTests RedirectUri = authority.LoopbackRedirectUri, Scopes = new[] { "openid", "profile", "blog" } }, - BusinessApiUrl = apiBaseUrl + ApiUrl = apiBaseUrl }; private static async Task LoginAndPersistAsync( @@ -175,7 +175,7 @@ public class YavscApiClientTests // directly (bypassing BlogApiClient) rely on the same // BaseAddress the production chain sets in BlogApiClient's // ctor. Mirror that here so "posts" resolves to the stub. - client.Http.BaseAddress = new Uri(settings.BusinessApiUrl); + client.Http.BaseAddress = new Uri(settings.ApiUrl); // Force the API client to use the test browser by routing the // LoginInteractiveAsync call through a small wrapper. diff --git a/src/PostIt/PostIt/App.axaml.cs b/src/PostIt/PostIt/App.axaml.cs index f43aa1d9..59d5e412 100644 --- a/src/PostIt/PostIt/App.axaml.cs +++ b/src/PostIt/PostIt/App.axaml.cs @@ -86,11 +86,6 @@ private void ConfigureRootView(MainView rootView) rootView.NavRoot.PopToRootAsync(); }; - sessionStatus.LoginSucceeded += async () => - { - await PushMainPageAsync(); - }; - rootView.SessionBanner.DataContext = sessionStatus; } @@ -140,9 +135,6 @@ private void ConfigureRootView(MainView rootView) var homePage = provider.GetRequiredService(); var app = (App)Current!; await app.PushPageAsync(homePage); - if (!refreshed) return; - - await PushMainPageAsync().ConfigureAwait(true); } /// @@ -153,7 +145,7 @@ private void ConfigureRootView(MainView rootView) /// (interactive login from the banner). Pulled out as a helper so /// the two callers can't drift apart. /// - public static async Task PushMainPageAsync() + public static async Task PushBlogsPageAsync() { var app = (App)Current!; var mainVm = app.ServiceProvider!.GetRequiredService(); diff --git a/src/PostIt/PostIt/Controls/SignaturePadControl.cs b/src/PostIt/PostIt/Controls/SignaturePadControl.cs index 87949d30..dee8af36 100644 --- a/src/PostIt/PostIt/Controls/SignaturePadControl.cs +++ b/src/PostIt/PostIt/Controls/SignaturePadControl.cs @@ -68,21 +68,38 @@ public class SignaturePadControl : TemplatedControl public event EventHandler? RedrawRequested; private readonly List _strokes = new(capacity: 256); + private InputElement? _wiredCaptureArea; private int _pendingPoints; // number of (x, y) pairs awaiting a length prefix private bool _capturing; protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { base.OnApplyTemplate(e); + RewireCaptureArea(); + } - if (CaptureArea is { } previous) + protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + { + base.OnPropertyChanged(change); + + if (change.Property == CaptureAreaProperty) + { + RewireCaptureArea(); + } + } + + private void RewireCaptureArea() + { + if (_wiredCaptureArea is { } previous) { previous.PointerPressed -= OnCapturePressed; previous.PointerMoved -= OnCaptureMoved; previous.PointerReleased -= OnCaptureReleased; } - if (CaptureArea is { } area) + _wiredCaptureArea = CaptureArea; + + if (_wiredCaptureArea is { } area) { area.PointerPressed += OnCapturePressed; area.PointerMoved += OnCaptureMoved; @@ -97,12 +114,14 @@ public class SignaturePadControl : TemplatedControl _capturing = true; _pendingPoints = 0; AppendPoint(e.GetPosition(CaptureArea)); + RedrawRequested?.Invoke(this, EventArgs.Empty); } private void OnCaptureMoved(object? sender, PointerEventArgs e) { if (!_capturing) return; AppendPoint(e.GetPosition(CaptureArea)); + RedrawRequested?.Invoke(this, EventArgs.Empty); } private void OnCaptureReleased(object? sender, PointerReleasedEventArgs e) @@ -169,6 +188,16 @@ public class SignaturePadControl : TemplatedControl /// 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/Helpers/FormHelpers.cs b/src/PostIt/PostIt/Helpers/FormHelpers.cs new file mode 100644 index 00000000..18cc8fd0 --- /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 00000000..30e7e34e --- /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 5f19292a..f95f31e3 100644 --- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs +++ b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using PostIt.Services; using PostIt.ViewModels; using PostIt.Views; +using PostIt.Views.Commands; using Yavsc.Api.Client; namespace PostIt.Helpers; @@ -23,6 +24,11 @@ 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 userDirectory = new UserDirectory(userSearchClient); // Vues @@ -45,6 +51,11 @@ public static class ServiceCollectionHelpers services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // ViewModels services.AddSingleton(settings); services.AddSingleton(api); @@ -52,10 +63,14 @@ public static class ServiceCollectionHelpers services.AddSingleton(circleClient); services.AddSingleton(blogAclClient); services.AddSingleton(userSearchClient); + services.AddSingleton(activityClient); + services.AddSingleton(billingClient); 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 diff --git a/src/PostIt/PostIt/Services/CurrentLocationResult.cs b/src/PostIt/PostIt/Services/CurrentLocationResult.cs new file mode 100644 index 00000000..ea19da43 --- /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/Platform.cs b/src/PostIt/PostIt/Services/Platform.cs index 8e5f7e25..2e5ac76a 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 726b3f4f..4d748f87 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; @@ -351,6 +352,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 3543a9c9..0055a9e6 100644 --- a/src/PostIt/PostIt/ViewLocator.cs +++ b/src/PostIt/PostIt/ViewLocator.cs @@ -4,7 +4,9 @@ using Avalonia.Controls; using Avalonia.Controls.Templates; using Microsoft.Extensions.DependencyInjection; using PostIt.ViewModels; +using PostIt.ViewModels.Commands; using PostIt.Views; +using PostIt.Views.Commands; namespace PostIt; @@ -39,6 +41,10 @@ public class ViewLocator : IDataTemplate MainViewModel => 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(), diff --git a/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs new file mode 100644 index 00000000..2dc8938f --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs @@ -0,0 +1,275 @@ +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 +{ + 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é."; + + 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) + { + StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"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) + { + StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"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) + { + StatusMessage = "Aucune activité disponible."; + } + } + catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) + { + Activities = new ObservableCollection(); + Specializations = new ObservableCollection(); + Performers = new ObservableCollection(); + StatusMessage = "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(); + StatusMessage = $"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; + StatusMessage = $"{activity.Name} · {Performers.Count} utilisateur(s)"; + } + catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) + { + Performers = new ObservableCollection(); + SelectedPerformer = null; + StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + Performers = new ObservableCollection(); + SelectedPerformer = null; + StatusMessage = $"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) + { + StatusMessage = "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/ActivityUserDisplayItem.cs b/src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs new file mode 100644 index 00000000..d89a66e9 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/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/BillingQueriesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs new file mode 100644 index 00000000..d5aba021 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs @@ -0,0 +1,173 @@ +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 +{ + 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..."; + + 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() => !IsReadOnly && 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); + StatusMessage = BuildLoadedStatusMessage(filtered.Count); + } + catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) + { + Queries = new ObservableCollection(); + StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + Queries = new ObservableCollection(); + StatusMessage = $"Erreur: {ex.Message}"; + } + finally + { + IsBusy = false; + } + } + + [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))] + public async Task OpenSelectedQueryAsync() + { + if (IsReadOnly) + { + StatusMessage = "Mode lecture seule: l'ouverture en modification est désactivée."; + return; + } + + if (SelectedQuery is null) + { + StatusMessage = "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 = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient); + await vm!.InitializeAsync(details).ConfigureAwait(true); + await app.PushPageAsync(vm).ConfigureAwait(true); + } + catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) + { + StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"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/BillingQueryDisplayItem.cs b/src/PostIt/PostIt/ViewModels/BillingQueryDisplayItem.cs new file mode 100644 index 00000000..bc437337 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/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/CommandFormsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs new file mode 100644 index 00000000..71f5d67a --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs @@ -0,0 +1,135 @@ +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 +{ + 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; } + + 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(); + StatusMessage = Forms.Count == 0 + ? "Aucun formulaire n'est disponible pour cette activité." + : "Choisissez le formulaire à utiliser."; + } + + 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) + { + StatusMessage = "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) + { + StatusMessage = "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) + { + StatusMessage = "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/Commands/BillingCommandPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs new file mode 100644 index 00000000..0ab76291 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs @@ -0,0 +1,108 @@ +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 +{ + 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; } + + [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)); + + StatusMessage = 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 00000000..d49fde80 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs @@ -0,0 +1,165 @@ +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(); + } + + StatusMessage = AvailablePrestations.Count == 0 + ? "Aucune prestation coiffure disponible." + : SupportMessage; + } + catch (HttpRequestException ex) + when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) + { + StatusMessage = "Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"Erreur lors du chargement des prestations: {ex.Message}"; + } + finally + { + IsBusy = false; + } + } + + protected override async Task SubmitAsync() + { + if (!Consent) + { + StatusMessage = "Le consentement est requis pour poster la commande."; + return; + } + + if (string.IsNullOrWhiteSpace(Address)) + { + StatusMessage = "L'adresse du rendez-vous est requise."; + return; + } + + if (SelectedPrestation is null) + { + StatusMessage = "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); + } + + StatusMessage = 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) + { + StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"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 00000000..793a7751 --- /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) + { + StatusMessage = "Le consentement est requis pour poster la commande."; + return; + } + + if (string.IsNullOrWhiteSpace(Address)) + { + StatusMessage = "L'adresse du rendez-vous est requise."; + return; + } + + var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList(); + if (selectedPrestations.Count == 0) + { + StatusMessage = "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); + } + + StatusMessage = 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) + { + StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"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 00000000..c2ff3294 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs @@ -0,0 +1,211 @@ +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 +{ + 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 double? Latitude { get; set; } + + [ObservableProperty] + public partial double? Longitude { get; set; } + + + [ObservableProperty] + public partial DateTime EventDate { get; set; } + + public RdvViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient) + : base(activity, performer, form, billingClient) + { + EventDate = DateTime.Now.AddDays(1); + } + + protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery) + { + 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) + { + Address = existingQuery.Location.Address ?? string.Empty; + Latitude = existingQuery.Location.Latitude; + Longitude = existingQuery.Location.Longitude; + } + + StatusMessage = $"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) + { + StatusMessage = result.Message; + return; + } + + Latitude = result.Latitude.Value; + Longitude = result.Longitude.Value; + StatusMessage = string.IsNullOrWhiteSpace(Address) + ? "Position récupérée. Complétez l'adresse puis envoyez la commande." + : result.Message; + } + catch (OperationCanceledException) + { + StatusMessage = "La récupération de la position a été annulée."; + } + catch (Exception ex) + { + StatusMessage = $"Impossible de récupérer la position: {ex.Message}"; + } + finally + { + IsBusy = false; + } + } + + protected static object BuildLocationPayload(string address, double? latitude, double? longitude) + { + if (latitude.HasValue && longitude.HasValue) + { + return new + { + Address = address, + Latitude = latitude.Value, + Longitude = longitude.Value, + }; + } + + return new + { + Address = address, + }; + } + + + protected override async Task SubmitAsync() + { + if (!IsSupported) + { + StatusMessage = SupportMessage; + return; + } + + if (!Consent) + { + StatusMessage = "Le consentement est requis pour poster la commande."; + return; + } + + if (string.IsNullOrWhiteSpace(Address)) + { + StatusMessage = "L'adresse du rendez-vous est requise."; + return; + } + + + if (string.IsNullOrWhiteSpace(Reason)) + { + StatusMessage = "Le motif du rendez-vous est requis."; + 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, + } + }; + + 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); + } + + StatusMessage = 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) + { + StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + } + catch (Exception ex) + { + StatusMessage = $"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 index 5d727729..830be4dd 100644 --- a/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs @@ -1,4 +1,9 @@ +using System; +using System.Threading.Tasks; +using Avalonia; using CommunityToolkit.Mvvm.Input; +using Microsoft.Extensions.DependencyInjection; +using PostIt.Helpers; using PostIt.Services; namespace PostIt.ViewModels; @@ -24,8 +29,25 @@ public class HomePageViewModel : ViewModelBase Settings = settings; SessionStatus = sessionStatus; + OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync); + } - public RelayCommand OpenBlogs { get; set; } = new RelayCommand(() => App.PushMainPageAsync()); + public IAsyncRelayCommand OpenBlogs { get; } = new AsyncRelayCommand(App.PushBlogsPageAsync); + public IAsyncRelayCommand OpenActivities { 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); + } + /// /// Avalonia designer constructor. Builds a self-contained VM /// with a freshly-constructed Settings so the XAML preview can diff --git a/src/PostIt/PostIt/ViewModels/MainViewModel.cs b/src/PostIt/PostIt/ViewModels/MainViewModel.cs index 84e10cfb..f56b666d 100644 --- a/src/PostIt/PostIt/ViewModels/MainViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/MainViewModel.cs @@ -250,7 +250,23 @@ public partial class MainViewModel : ViewModelBase StatusMessage = "Select an existing post before managing ACL."; return; } - await ((App)App.Current!).PushPageAsync(GetACLViewModel(SelectedPost)).ConfigureAwait(true); + + var postForAcl = SelectedPost; + try + { + var detailed = await BlogClient!.GetPostAsync(SelectedPost.Id).ConfigureAwait(true); + if (detailed is not null) + { + postForAcl = detailed; + SelectedPost = detailed; + } + } + catch + { + // Keep the dialog usable even if the detail refresh fails. + } + + await ((App)App.Current!).PushPageAsync(GetACLViewModel(postForAcl)).ConfigureAwait(true); } [RelayCommand] diff --git a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs index ae9e71d5..60544606 100644 --- a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; +using System.Net; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; @@ -8,9 +10,17 @@ using Yavsc.Blogspot; using Yavsc.Api.Client; using Yavsc.Api.Client.Dtos; using Yavsc.Abstract.BlogSpot; +using Yavsc.Abstract.Identity.Security; +using System.Net.Http; namespace PostIt.ViewModels; +public sealed class PostAclEntry +{ + public long CircleId { get; init; } + public string CircleName { get; init; } = string.Empty; +} + /// /// View model for the "Gérer l'ACL" modal of a single blog post. /// @@ -41,7 +51,7 @@ public partial class PostAclDialogViewModel : ViewModelBase MyCircles { get; set; } = new(); [ObservableProperty] - public partial ObservableCollection + public partial ObservableCollection AclEntries { get; set; } = new(); [ObservableProperty] @@ -77,6 +87,9 @@ public partial class PostAclDialogViewModel : ViewModelBase Post = post ?? throw new ArgumentNullException(nameof(post)); _aclClient = aclClient ?? throw new ArgumentNullException(nameof(aclClient)); _circleClient = circleClient ?? throw new ArgumentNullException(nameof(circleClient)); + + AclEntries = new ObservableCollection(post.GetACL().Select(a => ToAclEntry(a.CircleId))); + SelectedCircleToAdd = null; } public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); } @@ -90,16 +103,17 @@ public partial class PostAclDialogViewModel : ViewModelBase IsBusy = true; try { - // Load circles and ACL entries in parallel — both are - // independent reads on the same host. The caller's uid - // is implicit in both endpoints. + // Load circles for the picker. ACL entries come from the + // BlogPostDto detail payload (source of truth for initial state). var circlesTask = _circleClient.GetMyCirclesAsync(); - var aclTask = _aclClient.GetMyAclAsync(); - await Task.WhenAll(circlesTask, aclTask); + await Task.WhenAll(circlesTask); var circles = circlesTask.Result ?? new List(); MyCircles = new ObservableCollection(circles); + // Resolve labels now that circles are available. + AclEntries = new ObservableCollection(AclEntries.Select(a => ToAclEntry(a.CircleId))); + StatusMessage = $"{AclEntries.Count} autorisation(s)"; _loaded = true; @@ -126,14 +140,20 @@ public partial class PostAclDialogViewModel : ViewModelBase IsBusy = true; try { - var created = await _aclClient.GrantAsync(new Yavsc.Abstract.BlogSpot.PostAccessControlRulePayload + if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id)) + { + StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé"; + return; + } + + var created = await _aclClient.GrantAsync(new PostAccessControlRulePayload { CircleId = SelectedCircleToAdd.Id, BlogPostId = Post.Id }); if (created is not null) { - AclEntries.Add(created); + AclEntries.Add(ToAclEntry(created.CircleId)); StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé"; } else @@ -141,6 +161,13 @@ public partial class PostAclDialogViewModel : ViewModelBase StatusMessage = "Autorisation refusée par le serveur"; } } + catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict) + { + // 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é"; + } catch (Exception ex) { StatusMessage = $"Erreur: {ex.Message}"; @@ -152,14 +179,16 @@ public partial class PostAclDialogViewModel : ViewModelBase } [RelayCommand] - public async Task RevokeAsync(PostAccessControlRulePayload? acl) + public async Task RevokeAsync(PostAclEntry? acl) { if (acl is null) return; IsBusy = true; try { await _aclClient.RevokeAsync(acl.CircleId); - AclEntries.Remove(acl); + var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId); + if (existing is not null) + AclEntries.Remove(existing); StatusMessage = "Autorisation révoquée"; } catch (Exception ex) @@ -171,4 +200,26 @@ public partial class PostAclDialogViewModel : ViewModelBase IsBusy = false; } } + + private async Task ReloadAclEntriesFromServerAsync() + { + var allAcl = await _aclClient.GetMyAclAsync(); + var currentPostAcl = (allAcl ?? new List()) + .Where(a => a.BlogPostId == Post.Id) + .Select(a => ToAclEntry(a.CircleId)) + .GroupBy(a => a.CircleId) + .Select(g => g.First()) + .ToList(); + AclEntries = new ObservableCollection(currentPostAcl); + } + + private PostAclEntry ToAclEntry(long circleId) + { + var circleName = MyCircles.FirstOrDefault(c => c.Id == circleId)?.Name; + return new PostAclEntry + { + CircleId = circleId, + CircleName = string.IsNullOrWhiteSpace(circleName) ? $"Cercle #{circleId}" : circleName + }; + } } diff --git a/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs b/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs new file mode 100644 index 00000000..0229cca4 --- /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/SelectableHairPrestationItem.cs b/src/PostIt/PostIt/ViewModels/SelectableHairPrestationItem.cs new file mode 100644 index 00000000..ee07bb97 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/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/Settings/AuthenticationSettings.cs b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs similarity index 95% rename from src/PostIt/PostIt/Settings/AuthenticationSettings.cs rename to src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs index 9ebeaebd..8034820d 100644 --- a/src/PostIt/PostIt/Settings/AuthenticationSettings.cs +++ b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs @@ -18,11 +18,11 @@ public partial class AuthenticationSettings : ObservableObject /// public const string AndroidRedirectUri = "android://postit-signin"; - public static string DefaultAuthority { get; internal set; } = "https://yavsc.pschneider.fr"; + public const string DefaultAuthority = "https://yavsc.pschneider.fr"; - public static string DefaultClientId { get; internal set; } = "postit"; + public const string DefaultClientId = "postit"; - public static string[] DefaultScopes { get; set; } = { "blogs"} ; + public static readonly string[] DefaultScopes = { "blogs" }; [ObservableProperty] public partial string Authority { get; set; } diff --git a/src/PostIt/PostIt/ViewModels/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs similarity index 92% rename from src/PostIt/PostIt/ViewModels/Settings.cs rename to src/PostIt/PostIt/ViewModels/Settings/Settings.cs index 8586fa34..e63f0b32 100644 --- a/src/PostIt/PostIt/ViewModels/Settings.cs +++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs @@ -26,7 +26,7 @@ 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; @@ -45,7 +45,7 @@ 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(); /// @@ -154,7 +154,10 @@ public partial class Settings : ViewModelBase { "openid", // OIDC: required for the id_token "profile", // OIDC: standard profile claims - "offline_access" // OIDC: required to receive a refresh_token + "offline_access", // OIDC: required to receive a refresh_token + "blogs", + "api" + }; /// @@ -297,8 +300,15 @@ public partial class Settings : ViewModelBase // → our overridden dispatcher-safe marshaller below. else lock (_mutationGate) { + var legacyApiUrl = TryReadLegacyApiUrl(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; if (!(settings.Authentication is null)) { @@ -314,7 +324,7 @@ public partial class Settings : ViewModelBase settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes; } else - this.Authentication.Scopes = settings.Authentication.Scopes; + this.Authentication.Scopes = settings.Authentication.Scopes; } } // A disk load (or an embedded-resource fallback) is the @@ -343,6 +353,26 @@ public partial class Settings : ViewModelBase } } + private static string? TryReadLegacyApiUrl(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,6 +383,8 @@ 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; } diff --git a/src/PostIt/PostIt/ViewModels/ViewModelBase.cs b/src/PostIt/PostIt/ViewModels/ViewModelBase.cs index 4ca69eea..30783764 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/ActivitiesPage.axaml b/src/PostIt/PostIt/Views/ActivitiesPage.axaml new file mode 100644 index 00000000..16d88344 --- /dev/null +++ b/src/PostIt/PostIt/Views/ActivitiesPage.axaml @@ -0,0 +1,147 @@ + + + + + + + + + -public sealed class CircleAuthorization : ICircleAuthorization +public class CircleAuthorization { public long CircleId { get; set; } } diff --git a/src/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs b/src/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs deleted file mode 100644 index 9c16bd3b..00000000 --- a/src/Yavsc.Abstract/Identity/Security/ICircleAuthorization.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Yavsc.Abstract.Identity.Security -{ - - public interface ICircleAuthorization - { - long CircleId { get; set; } - } -} diff --git a/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs b/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs index 25c21961..6b593f3c 100644 --- a/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs +++ b/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs @@ -9,7 +9,7 @@ namespace Yavsc.Abstract.Identity.Security bool AuthorizeCircle(long circleId); - ICircleAuthorization [] GetACL(); + ICollection ACL { get; } //ICircleAuthorization [] GetACL(); } } diff --git a/src/Yavsc.Abstract/Workflow/ActivityInfo.cs b/src/Yavsc.Abstract/Workflow/ActivityInfo.cs new file mode 100644 index 00000000..c0f543f4 --- /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 00000000..865690e0 --- /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 00000000..d782d0aa --- /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/IPerformerProfile.cs b/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs index e53583a5..4314dd37 100644 --- a/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs +++ b/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs @@ -3,6 +3,7 @@ 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 00000000..a5ee3b25 --- /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 00000000..84e9c1cc --- /dev/null +++ b/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs @@ -0,0 +1,86 @@ +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 00000000..52fad1a4 --- /dev/null +++ b/src/Yavsc.Api.Client/ActivityApiClient.cs @@ -0,0 +1,79 @@ +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 Uri _baseAddress; + private readonly Uri _avatarBaseAddress; + + public ActivityApiClient(IYavscApiClient api, string businessBaseAddress, string? avatarBaseAddress = null) + { + _api = api ?? throw new ArgumentNullException(nameof(api)); + if (string.IsNullOrEmpty(businessBaseAddress)) + throw new ArgumentException("Base address is required.", nameof(businessBaseAddress)); + + _baseAddress = new Uri(businessBaseAddress, UriKind.Absolute); + _avatarBaseAddress = string.IsNullOrWhiteSpace(avatarBaseAddress) + ? _baseAddress + : new Uri(avatarBaseAddress, UriKind.Absolute); + } + + 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(_avatarBaseAddress, "/"); + + 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(_baseAddress, relativePath).ToString(); +} diff --git a/src/Yavsc.Api.Client/BillingApiClient.cs b/src/Yavsc.Api.Client/BillingApiClient.cs new file mode 100644 index 00000000..35a6722d --- /dev/null +++ b/src/Yavsc.Api.Client/BillingApiClient.cs @@ -0,0 +1,364 @@ +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 Uri _baseAddress; + + public BillingApiClient(IYavscApiClient api, string businessBaseAddress) + { + _api = api ?? throw new ArgumentNullException(nameof(api)); + if (string.IsNullOrWhiteSpace(businessBaseAddress)) + throw new ArgumentException("Base address is required.", nameof(businessBaseAddress)); + + _baseAddress = new Uri(businessBaseAddress, UriKind.Absolute); + } + + 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 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(_baseAddress, relativePath).ToString(); + + 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 + { + 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 + { + 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 + { + 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.Latitude.HasValue) + { + payload["Latitude"] = location.Latitude.Value; + } + + if (location.Longitude.HasValue) + { + payload["Longitude"] = location.Longitude.Value; + } + + return payload; + } + + private sealed class BillingLocationResponse + { + 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/Dtos/BillingQueryDetailsDto.cs b/src/Yavsc.Api.Client/Dtos/BillingQueryDetailsDto.cs new file mode 100644 index 00000000..6d658ce4 --- /dev/null +++ b/src/Yavsc.Api.Client/Dtos/BillingQueryDetailsDto.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +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 +{ + public string Address { get; set; } = string.Empty; + public double? Latitude { get; set; } + 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 00000000..0102b691 --- /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.Test/ActivityApiControllerTests.cs b/src/Yavsc.Api.Test/ActivityApiControllerTests.cs new file mode 100644 index 00000000..0525e349 --- /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 00000000..2c670522 --- /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/Directory.Packages.props b/src/Yavsc.Api.Test/Directory.Packages.props new file mode 100644 index 00000000..c2edf9ea --- /dev/null +++ b/src/Yavsc.Api.Test/Directory.Packages.props @@ -0,0 +1,7 @@ + + + + diff --git a/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs new file mode 100644 index 00000000..ca4ae70f --- /dev/null +++ b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs @@ -0,0 +1,343 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Builder; +using Microsoft.Data.Sqlite; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; +using Yavsc.Controllers; +using Yavsc.Models; +using Yavsc.Models.Haircut; +using Yavsc.Models.Relationship; +using Yavsc.Models.Workflow; +using Yavsc.Tests.Shared; + +namespace Yavsc.Api.Test.Fixtures; + +public sealed class ApiWebServerFixture : WebHostFixture +{ + protected override int HttpsPort => 5104; + + private static SqliteConnection? _sharedSqliteConnection; + private static readonly object _sqliteLock = new(); + + protected override WebApplication BuildApp(WebApplicationBuilder builder) + { + 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.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(); + db.Database.EnsureCreated(); + } + + await Task.CompletedTask; + return app; + } + + public string BaseAddress => Addresses.First(a => a.StartsWith("https://", StringComparison.Ordinal)); + + public void ResetAndSeedActivityGraph() + { + using var scope = Services.CreateScope(); + var db = scope.ServiceProvider.GetRequiredService(); + + db.Database.EnsureDeleted(); + 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(); + } + + 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, + 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, + 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, + 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() + { + try + { + base.Dispose(); + } + finally + { + lock (_sqliteLock) + { + if (_sharedSqliteConnection is not null) + { + _sharedSqliteConnection.Close(); + _sharedSqliteConnection.Dispose(); + _sharedSqliteConnection = null; + } + } + } + } +} diff --git a/src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs b/src/Yavsc.Api.Test/HairCutQueryApiControllerTests.cs new file mode 100644 index 00000000..b4b7e3e4 --- /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 00000000..8d940b8b --- /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 00000000..a5706dc5 --- /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>(view.Model); + + Assert.Contains(model, a => a.Code == "dev"); + Assert.DoesNotContain(model, a => a.Code == "ghost"); + } + + private sealed class TestEnvironment : IWebHostEnvironment + { + public string ApplicationName { get; set; } = "Yavsc.Api.Test"; + public IFileProvider WebRootFileProvider { get; set; } = null!; + public string WebRootPath { get; set; } = string.Empty; + public string EnvironmentName { get; set; } = "Development"; + public string ContentRootPath { get; set; } = string.Empty; + public IFileProvider ContentRootFileProvider { get; set; } = null!; + } +} diff --git a/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs b/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs new file mode 100644 index 00000000..8fe7e959 --- /dev/null +++ b/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs @@ -0,0 +1,85 @@ +using System.Net; +using System.Net.Http.Headers; +using System.Net.Http.Json; +using Yavsc; +using Yavsc.Api.Test.Fixtures; +using Yavsc.Models.Workflow; +using Yavsc.Tests.Shared; + +namespace Yavsc.Api.Test; + +[Collection("Yavsc Api")] +public sealed class RdvQueryApiControllerTests : IClassFixture +{ + private readonly ApiWebServerFixture _fixture; + + public RdvQueryApiControllerTests(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_rdv_route_supports_crud() + { + _fixture.ResetAndSeedRdvQueryGraph(); + using var http = NewClient(); + + var createPayload = new RdvQuery + { + ActivityCode = "dev", + PerformerId = "alice", + Consent = true, + EventDate = DateTime.UtcNow.AddDays(2), + Location = new Yavsc.Models.Relationship.Location + { + Address = "1 rue du Test", + Latitude = 48.8566, + Longitude = 2.3522, + }, + Reason = "Second rendez-vous", + Status = QueryStatus.Inserted, + }; + + var createResponse = await http.PostAsJsonAsync("/api/v1/billing/Rdv", createPayload, TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.Created, createResponse.StatusCode); + + 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/Rdv/{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("Second rendez-vous", fetched.Reason); + + fetched.Reason = "Rendez-vous modifié"; + var putResponse = await http.PutAsJsonAsync($"/api/v1/billing/Rdv/{fetched.Id}", fetched, TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.NoContent, putResponse.StatusCode); + + var deleteResponse = await http.DeleteAsync($"/api/v1/billing/Rdv/{fetched.Id}", TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.OK, deleteResponse.StatusCode); + + var missingResponse = await http.GetAsync($"/api/v1/billing/Rdv/{fetched.Id}", TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.NotFound, missingResponse.StatusCode); + } +} diff --git a/src/Yavsc.Api.Test/Yavsc.Api.Test.csproj b/src/Yavsc.Api.Test/Yavsc.Api.Test.csproj new file mode 100644 index 00000000..760f5ce8 --- /dev/null +++ b/src/Yavsc.Api.Test/Yavsc.Api.Test.csproj @@ -0,0 +1,33 @@ + + + net10.0 + enable + enable + false + Yavsc.Api.Test + true + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs b/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs index 6d91ba82..a8d28806 100644 --- a/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Yavsc.Abstract.Workflow; using Yavsc.Server.Helpers; using Yavsc.Models; using Yavsc.Models.Workflow; @@ -8,6 +9,7 @@ using Yavsc.Models.Workflow; namespace Yavsc.Controllers { + [Authorize] [Produces("application/json")] [Route(Constants.APIPrefix + "/activity")] public class ActivityApiController : Controller @@ -26,6 +28,119 @@ namespace Yavsc.Controllers return _context.Activities.Include(a=>a.Forms).Where( a => !a.Hidden ); } + [HttpGet("catalog")] + public async Task>> GetCatalog( + CancellationToken cancellationToken, + [FromQuery] string parentCode = null) + { + var activities = await _context.Activities + .AsNoTracking() + .Include(a => a.Forms) + .Include(a => a.Children) + .ThenInclude(c => c.Forms) + .Where(a => !a.Hidden && a.ParentCode == parentCode) + .OrderByDescending(a => a.Rate) + .ToListAsync(cancellationToken); + + var codes = activities + .Select(a => a.Code) + .Concat(activities.SelectMany(a => (a.Children ?? new List()) + .Where(c => !c.Hidden) + .Select(c => c.Code))) + .Where(c => !string.IsNullOrWhiteSpace(c)) + .Distinct() + .ToArray(); + + var performerCounts = await ( + from ua in _context.UserActivities.AsNoTracking() + where !string.IsNullOrWhiteSpace(ua.DoesCode) && codes.Contains(ua.DoesCode) + group ua by ua.DoesCode into g + select new + { + Code = g.Key, + Count = g.Select(x => x.UserId).Distinct().Count() + }) + .ToDictionaryAsync(x => x.Code, x => x.Count, cancellationToken); + + var filteredActivities = activities + .Where(a => + (performerCounts.TryGetValue(a.Code, out var ownCount) && ownCount > 0) + || (a.Children ?? new List()) + .Where(c => !c.Hidden) + .Any(c => performerCounts.TryGetValue(c.Code, out var childCount) && childCount > 0)) + .ToList(); + + return Ok(filteredActivities.Select(a => ToBrowseItem(a, performerCounts)).ToList()); + } + + [HttpGet("{id}/users")] + public async Task>> GetUsers( + [FromRoute] string id, + CancellationToken cancellationToken) + { + if (string.IsNullOrWhiteSpace(id)) + { + return BadRequest("Activity code is required."); + } + + var activity = await _context.Activities + .AsNoTracking() + .SingleOrDefaultAsync(a => a.Code == id, cancellationToken); + if (activity is null) + { + return NotFound(); + } + + var users = await QueryDeclaredUsersAsync(id, activity.Name, cancellationToken); + + return Ok(users); + } + + [HttpGet("{id}/performers")] + public Task>> GetPerformers( + [FromRoute] string id, + CancellationToken cancellationToken) + { + // Backward-compatible alias kept for existing clients. + return GetUsers(id, cancellationToken); + } + + private Task> QueryDeclaredUsersAsync( + string activityCode, + string activityName, + CancellationToken cancellationToken) + { + return ( + from ua in _context.UserActivities.AsNoTracking() + join u in _context.ApplicationUser.AsNoTracking() on ua.UserId equals u.Id into users + from user in users.DefaultIfEmpty() + join p in _context.Performers.AsNoTracking() on ua.UserId equals p.PerformerId into performerProfiles + from performer in performerProfiles.DefaultIfEmpty() + where ua.DoesCode == activityCode + orderby user != null ? user.UserName : ua.UserId + select new PerformerActivity + { + PerformerId = ua.UserId, + HasPerformerProfile = performer != null, + UserName = user != null ? (user.UserName ?? string.Empty) : string.Empty, + Active = performer != null && performer.Active, + AcceptNotifications = performer != null && performer.AcceptNotifications, + AcceptPublicContact = performer != null && performer.AcceptPublicContact, + WebSite = performer != null ? (performer.WebSite ?? string.Empty) : string.Empty, + ActivityCode = activityCode, + ActivityName = activityName, + SettingsClassName = _context.Activities + .Where(a => a.Code == activityCode) + .Select(a => a.SettingsClassName) + .FirstOrDefault() ?? string.Empty, + ExtraActivityCount = _context.UserActivities + .Where(x => x.UserId == ua.UserId && x.DoesCode != activityCode) + .Count() + }) + .Distinct() + .ToListAsync(cancellationToken); + } + // GET: api/ActivityApi/5 [HttpGet("{id}", Name = "GetActivity")] public async Task GetActivity([FromRoute] string id) @@ -144,5 +259,52 @@ namespace Yavsc.Controllers { return _context.Activities.Count(e => e.Code == id) > 0; } + + private static ActivityInfo ToBrowseItem( + Activity activity, + IReadOnlyDictionary performerCounts) + { + return new ActivityInfo + { + Code = activity.Code, + Name = activity.Name, + ParentCode = activity.ParentCode, + Description = activity.Description, + Photo = activity.Photo, + Rate = activity.Rate, + PerformerCount = performerCounts.TryGetValue(activity.Code, out var count) ? count : 0, + Forms = (activity.Forms ?? Enumerable.Empty()) + .Select(f => new CommandFormSummary + { + Id = f.Id, + ActionName = f.ActionName, + Title = f.Title, + }) + .ToList(), + Children = (activity.Children ?? Enumerable.Empty()) + .Where(c => !c.Hidden) + .Where(c => performerCounts.TryGetValue(c.Code, out var childCount) && childCount > 0) + .OrderByDescending(c => c.Rate) + .Select(c => new ActivityInfo + { + Code = c.Code, + Name = c.Name, + ParentCode = c.ParentCode, + Description = c.Description, + Photo = c.Photo, + Rate = c.Rate, + PerformerCount = performerCounts.TryGetValue(c.Code, out var childCount) ? childCount : 0, + Forms = (c.Forms ?? Enumerable.Empty()) + .Select(f => new CommandFormSummary + { + Id = f.Id, + ActionName = f.ActionName, + Title = f.Title, + }) + .ToList(), + }) + .ToList(), + }; + } } } diff --git a/src/Yavsc.Api/Controllers/Business/BillingController.cs b/src/Yavsc.Api/Controllers/Business/BillingController.cs index 72180fc1..197e06b1 100644 --- a/src/Yavsc.Api/Controllers/Business/BillingController.cs +++ b/src/Yavsc.Api/Controllers/Business/BillingController.cs @@ -19,6 +19,7 @@ namespace Yavsc.ApiControllers using Yavsc.ViewModels.Auth; using Yavsc.Server.Helpers; + [Authorize] [Route(Constants.APIPrefix + "/bill"), Authorize] public class BillingController : Controller { diff --git a/src/Yavsc.Api/Controllers/Business/BookQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/BookQueryApiController.cs index 0d7112ec..293cca9a 100644 --- a/src/Yavsc.Api/Controllers/Business/BookQueryApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/BookQueryApiController.cs @@ -12,6 +12,7 @@ namespace Yavsc.Controllers using Microsoft.EntityFrameworkCore; using Yavsc.Server.Helpers; + [Authorize] [Produces("application/json")] [Route(Constants.APIPrefix + "/bookquery"), Authorize("Performer")] public class BookQueryApiController : Controller diff --git a/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs b/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs index 891909f0..b01819f2 100644 --- a/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/EstimateApiController.cs @@ -9,6 +9,7 @@ using Yavsc.Server.Helpers; namespace Yavsc.Controllers { + [Authorize] [Produces("application/json")] [Route(Constants.APIPrefix + "/estimate"), Authorize] public class EstimateApiController : Controller diff --git a/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs b/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs index 3fc91365..748f60cc 100644 --- a/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/EstimateTemplatesApiController.cs @@ -1,4 +1,5 @@ using System.Security.Claims; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Yavsc.Models; @@ -7,6 +8,7 @@ using Yavsc.Server.Helpers; namespace Yavsc.Controllers { + [Authorize] [Produces("application/json")] [Route(Constants.APIPrefix + "/EstimateTemplatesApi")] public class EstimateTemplatesApiController : Controller diff --git a/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs b/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs index 91d57d9f..a4ecbf2f 100644 --- a/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Yavsc.Helpers; using Yavsc.Models; @@ -6,6 +7,7 @@ using Yavsc.ViewModels.FrontOffice; namespace Yavsc.ApiControllers { + [Authorize] [Route(Constants.APIPrefix + "/front")] public class FrontOfficeApiController : Controller { diff --git a/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs new file mode 100644 index 00000000..6c7c1ba6 --- /dev/null +++ b/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs @@ -0,0 +1,234 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Yavsc.Models; +using Yavsc.Models.Billing; +using Yavsc.Models.Haircut; +using Yavsc.Models.Relationship; +using Yavsc.Server.Helpers; + +namespace Yavsc.Controllers; + +[Authorize] +[Produces("application/json")] +[Route(Constants.APIPrefix + "/billing/" + BillingCodes.Brush)] +public class HairCutQueryApiController : Controller +{ + private readonly ApplicationDbContext _context; + + public HairCutQueryApiController(ApplicationDbContext context) + { + _context = context; + } + + [HttpGet] + public async Task GetQueries(CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var queries = await _context.HairCutQueries + .AsNoTracking() + .Include(q => q.Prestation) + .Include(q => q.Location) + .Include(q => q.Client) + .Include(q => q.PerformerProfile) + .Where(q => q.ClientId == uid || q.PerformerId == uid) + .OrderByDescending(q => q.Id) + .ToListAsync(cancellationToken); + + return Ok(queries); + } + + [HttpGet("prestations")] + public async Task GetPrestations(CancellationToken cancellationToken) + { + var prestations = await _context.HairPrestation + .AsNoTracking() + .OrderBy(p => p.Gender) + .ThenBy(p => p.Length) + .ThenBy(p => p.Tech) + .Select(p => ToDto(p)) + .ToListAsync(cancellationToken); + + return Ok(prestations); + } + + [HttpGet("{id}", Name = "GetBillingHairCutQuery")] + public async Task GetQuery([FromRoute] long id, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var query = await _context.HairCutQueries + .Include(q => q.Prestation) + .Include(q => q.Location) + .Include(q => q.Client) + .Include(q => q.PerformerProfile) + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (query is null) + { + return NotFound(); + } + + if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + return Ok(query); + } + + [HttpPost] + public async Task PostQuery([FromBody] HairCutQuery query, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + if (string.IsNullOrWhiteSpace(query.ClientId)) + { + query.ClientId = uid; + } + + ModelState.Remove("ClientId"); + ModelState.Remove("Prestation"); + + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + ModelState.AddModelError("ClientId", "You can only create your own HairCutQuery"); + return BadRequest(ModelState); + } + + query.Prestation = await _context.HairPrestation + .SingleOrDefaultAsync(p => p.Id == query.PrestationId, cancellationToken); + if (query.Prestation is null) + { + ModelState.AddModelError("PrestationId", "Unknown hair prestation."); + return BadRequest(ModelState); + } + + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + query.Location = await ResolveLocationAsync(query.Location, cancellationToken); + + _context.HairCutQueries.Add(query); + + try + { + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + } + catch (DbUpdateException) + { + if (QueryExists(query.Id)) + { + return Conflict(); + } + + throw; + } + + return CreatedAtRoute("GetBillingHairCutQuery", new { id = query.Id }, query); + } + + [HttpPut("{id}")] + public async Task PutQuery([FromRoute] long id, [FromBody] HairCutQuery query, CancellationToken cancellationToken) + { + var existing = await _context.HairCutQueries + .Include(q => q.Location) + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (existing is null) + { + return NotFound(); + } + + var uid = User.GetUserId(); + if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + var prestation = await _context.HairPrestation + .SingleOrDefaultAsync(p => p.Id == query.PrestationId, cancellationToken); + if (prestation is null) + { + ModelState.AddModelError("PrestationId", "Unknown hair prestation."); + return BadRequest(ModelState); + } + + existing.ActivityCode = query.ActivityCode; + existing.PerformerId = query.PerformerId; + existing.Consent = query.Consent; + existing.EventDate = query.EventDate; + existing.AdditionalInfo = query.AdditionalInfo; + existing.Status = query.Status; + existing.Provisional = query.Provisional; + existing.PrestationId = prestation.Id; + existing.Prestation = prestation; + existing.Location = await ResolveLocationAsync(query.Location, cancellationToken); + + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + return NoContent(); + } + + [HttpDelete("{id}")] + public async Task DeleteQuery([FromRoute] long id, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var query = await _context.HairCutQueries + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (query is null) + { + return NotFound(); + } + + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + _context.HairCutQueries.Remove(query); + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + + return Ok(query); + } + + private async Task ResolveLocationAsync(Location candidate, CancellationToken cancellationToken) + { + if (candidate is null) + { + return null; + } + + var existingLocation = await _context.Locations.FirstOrDefaultAsync( + x => x.Address == candidate.Address + && x.Longitude == candidate.Longitude + && x.Latitude == candidate.Latitude, + cancellationToken); + + if (existingLocation is not null) + { + return existingLocation; + } + + _context.Attach(candidate); + return candidate; + } + + private bool QueryExists(long id) + { + return _context.HairCutQueries.Any(e => e.Id == id); + } + + private static HairPrestationDto ToDto(HairPrestation prestation) + { + return new HairPrestationDto + { + Id = prestation.Id, + Title = prestation.GetDisplayTitle(), + Details = prestation.GetDisplayDetails(), + }; + } +} \ No newline at end of file diff --git a/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs new file mode 100644 index 00000000..f850b3f4 --- /dev/null +++ b/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs @@ -0,0 +1,286 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Yavsc.Models; +using Yavsc.Models.Billing; +using Yavsc.Models.Haircut; +using Yavsc.Models.Relationship; +using Yavsc.Server.Helpers; + +namespace Yavsc.Controllers; + +[Authorize] +[Produces("application/json")] +[Route(Constants.APIPrefix + "/billing/" + BillingCodes.MBrush)] +public class HairMultiCutQueryApiController : Controller +{ + private readonly ApplicationDbContext _context; + + public HairMultiCutQueryApiController(ApplicationDbContext context) + { + _context = context; + } + + [HttpGet] + public async Task GetQueries(CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var queries = await _context.HairMultiCutQueries + .AsNoTracking() + .Include(q => q.Prestations) + .ThenInclude(p => p.Prestation) + .Include(q => q.Location) + .Include(q => q.Client) + .Include(q => q.PerformerProfile) + .Where(q => q.ClientId == uid || q.PerformerId == uid) + .OrderByDescending(q => q.Id) + .ToListAsync(cancellationToken); + + return Ok(queries.Select(SanitizeForResponse).ToList()); + } + + [HttpGet("prestations")] + public async Task GetPrestations(CancellationToken cancellationToken) + { + var prestations = await _context.HairPrestation + .AsNoTracking() + .OrderBy(p => p.Gender) + .ThenBy(p => p.Length) + .ThenBy(p => p.Tech) + .Select(p => new HairPrestationDto + { + Id = p.Id, + Title = p.GetDisplayTitle(), + Details = p.GetDisplayDetails() + }) + .ToListAsync(cancellationToken); + + return Ok(prestations); + } + + [HttpGet("{id}", Name = "GetBillingHairMultiCutQuery")] + public async Task GetQuery([FromRoute] long id, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var query = await _context.HairMultiCutQueries + .Include(q => q.Prestations) + .ThenInclude(p => p.Prestation) + .Include(q => q.Location) + .Include(q => q.Client) + .Include(q => q.PerformerProfile) + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (query is null) + { + return NotFound(); + } + + if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + return Ok(SanitizeForResponse(query)); + } + + [HttpPost] + public async Task PostQuery([FromBody] HairMultiCutQuery query, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + if (string.IsNullOrWhiteSpace(query.ClientId)) + { + query.ClientId = uid; + } + + ModelState.Remove("ClientId"); + + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + ModelState.AddModelError("ClientId", "You can only create your own HairMultiCutQuery"); + return BadRequest(ModelState); + } + + if (query.Prestations is null || query.Prestations.Count == 0) + { + ModelState.AddModelError("Prestations", "At least one hair prestation is required."); + return BadRequest(ModelState); + } + + var prestationItems = await ResolvePrestationsAsync(query.Prestations, cancellationToken); + if (prestationItems is null) + { + ModelState.AddModelError("Prestations", "One or more hair prestations are unknown."); + return BadRequest(ModelState); + } + + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + query.Prestations = prestationItems; + query.Location = await ResolveLocationAsync(query.Location, cancellationToken); + _context.HairMultiCutQueries.Add(query); + + try + { + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + } + catch (DbUpdateException) + { + if (QueryExists(query.Id)) + { + return Conflict(); + } + + throw; + } + + return CreatedAtRoute("GetBillingHairMultiCutQuery", new { id = query.Id }, SanitizeForResponse(query)); + } + + [HttpPut("{id}")] + public async Task PutQuery([FromRoute] long id, [FromBody] HairMultiCutQuery query, CancellationToken cancellationToken) + { + var existing = await _context.HairMultiCutQueries + .Include(q => q.Prestations) + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (existing is null) + { + return NotFound(); + } + + var uid = User.GetUserId(); + if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + if (query.Prestations is null || query.Prestations.Count == 0) + { + ModelState.AddModelError("Prestations", "At least one hair prestation is required."); + return BadRequest(ModelState); + } + + var prestationItems = await ResolvePrestationsAsync(query.Prestations, cancellationToken); + if (prestationItems is null) + { + ModelState.AddModelError("Prestations", "One or more hair prestations are unknown."); + return BadRequest(ModelState); + } + + _context.RemoveRange(existing.Prestations); + existing.ActivityCode = query.ActivityCode; + existing.PerformerId = query.PerformerId; + existing.Consent = query.Consent; + existing.EventDate = query.EventDate; + existing.Status = query.Status; + existing.Provisional = query.Provisional; + existing.Prestations = prestationItems; + existing.Location = await ResolveLocationAsync(query.Location, cancellationToken); + + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + return NoContent(); + } + + [HttpDelete("{id}")] + public async Task DeleteQuery([FromRoute] long id, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var query = await _context.HairMultiCutQueries + .Include(q => q.Prestations) + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (query is null) + { + return NotFound(); + } + + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + _context.RemoveRange(query.Prestations); + _context.HairMultiCutQueries.Remove(query); + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + + return Ok(SanitizeForResponse(query)); + } + + private async Task> ResolvePrestationsAsync( + IEnumerable requestedItems, + CancellationToken cancellationToken) + { + var ids = requestedItems + .Select(x => x.PrestationId) + .Where(x => x > 0) + .ToArray(); + + if (ids.Length == 0) + { + return null; + } + + var prestations = await _context.HairPrestation + .Where(p => ids.Contains(p.Id)) + .ToDictionaryAsync(p => p.Id, cancellationToken); + + if (prestations.Count != ids.Distinct().Count()) + { + return null; + } + + return requestedItems + .Select(item => new HairPrestationCollectionItem + { + PrestationId = item.PrestationId, + Prestation = prestations[item.PrestationId], + }) + .ToList(); + } + + private async Task ResolveLocationAsync(Location candidate, CancellationToken cancellationToken) + { + if (candidate is null) + { + return null; + } + + var existingLocation = await _context.Locations.FirstOrDefaultAsync( + x => x.Address == candidate.Address + && x.Longitude == candidate.Longitude + && x.Latitude == candidate.Latitude, + cancellationToken); + + if (existingLocation is not null) + { + return existingLocation; + } + + _context.Attach(candidate); + return candidate; + } + + private bool QueryExists(long id) + { + return _context.HairMultiCutQueries.Any(e => e.Id == id); + } + + private static HairMultiCutQuery SanitizeForResponse(HairMultiCutQuery query) + { + if (query.Prestations is not null) + { + foreach (var item in query.Prestations) + { + item.Query = null; + } + } + + return query; + } +} \ No newline at end of file diff --git a/src/Yavsc.Api/Controllers/Business/PaymentApiController.cs b/src/Yavsc.Api/Controllers/Business/PaymentApiController.cs index 5f769e4e..930eea91 100644 --- a/src/Yavsc.Api/Controllers/Business/PaymentApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/PaymentApiController.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Newtonsoft.Json; @@ -6,6 +7,7 @@ using Yavsc.Models; namespace Yavsc.ApiControllers { + [Authorize] [Route(Constants.APIPrefix + "/payment")] public class PaymentApiController : Controller { diff --git a/src/Yavsc.Api/Controllers/Business/PerformersApiController.cs b/src/Yavsc.Api/Controllers/Business/PerformersApiController.cs index 2ad1ded5..36586adb 100644 --- a/src/Yavsc.Api/Controllers/Business/PerformersApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/PerformersApiController.cs @@ -10,6 +10,7 @@ namespace Yavsc.Controllers using Yavsc.Helpers; using Yavsc.Services; + [Authorize] [Produces("application/json")] [Route(Constants.APIPrefix + "/performers")] public class PerformersApiController : Controller diff --git a/src/Yavsc.Api/Controllers/Business/ProductApiController.cs b/src/Yavsc.Api/Controllers/Business/ProductApiController.cs index d9792839..ae3820dc 100644 --- a/src/Yavsc.Api/Controllers/Business/ProductApiController.cs +++ b/src/Yavsc.Api/Controllers/Business/ProductApiController.cs @@ -7,6 +7,7 @@ using Yavsc.Server.Helpers; namespace Yavsc.Controllers { + [Authorize] [Produces("application/json")] [Route(Constants.APIPrefix + "/ProductApi")] public class ProductApiController : Controller diff --git a/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs new file mode 100644 index 00000000..fcfac2b2 --- /dev/null +++ b/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs @@ -0,0 +1,189 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Yavsc.Models; +using Yavsc.Models.Billing; +using Yavsc.Models.Workflow; +using Yavsc.Server.Helpers; + +namespace Yavsc.Controllers; + +[Authorize] +[Produces("application/json")] +[Route(Constants.APIPrefix + "/billing/" + BillingCodes.Rdv)] +public class RdvQueryApiController : Controller +{ + private readonly ApplicationDbContext _context; + + public RdvQueryApiController(ApplicationDbContext context) + { + _context = context; + } + + [HttpGet] + public async Task GetQueries(CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var queries = await _context.RdvQueries + .AsNoTracking() + .Include(q => q.Location) + .Include(q => q.Client) + .Include(q => q.PerformerProfile) + .Where(q => q.ClientId == uid || q.PerformerId == uid) + .OrderByDescending(q => q.Id) + .ToListAsync(cancellationToken); + + return Ok(queries); + } + + [HttpGet("{id}", Name = "GetRdvQuery")] + public async Task GetQuery([FromRoute] long id, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var query = await _context.RdvQueries + .Include(q => q.Location) + .Include(q => q.Client) + .Include(q => q.PerformerProfile) + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (query is null) + { + return NotFound(); + } + + if (query.ClientId != uid && query.PerformerId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + return Ok(query); + } + + [HttpPost] + public async Task PostQuery([FromBody] RdvQuery query, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + if (string.IsNullOrWhiteSpace(query.ClientId)) + { + query.ClientId = uid; + } + + ModelState.Remove("ClientId"); + + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + ModelState.AddModelError("ClientId", "You can only create your own RdvQuery"); + return BadRequest(ModelState); + } + + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + if (query.Location is not null) + { + var existingLocation = await _context.Locations.FirstOrDefaultAsync( + x => x.Address == query.Location.Address + && x.Longitude == query.Location.Longitude + && x.Latitude == query.Location.Latitude, + cancellationToken); + + if (existingLocation is not null) + { + query.Location = existingLocation; + } + else + { + _context.Attach(query.Location); + } + } + + _context.RdvQueries.Add(query); + + try + { + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + } + catch (DbUpdateException) + { + if (QueryExists(query.Id)) + { + return Conflict(); + } + + throw; + } + + return CreatedAtRoute("GetRdvQuery", new { id = query.Id }, query); + } + + [HttpPut("{id}")] + public async Task PutQuery([FromRoute] long id, [FromBody] RdvQuery query, CancellationToken cancellationToken) + { + if (!ModelState.IsValid) + { + return BadRequest(ModelState); + } + + if (id != query.Id) + { + return BadRequest(); + } + + var uid = User.GetUserId(); + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + _context.Entry(query).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + } + catch (DbUpdateConcurrencyException) + { + if (!QueryExists(id)) + { + return NotFound(); + } + + throw; + } + + return NoContent(); + } + + [HttpDelete("{id}")] + public async Task DeleteQuery([FromRoute] long id, CancellationToken cancellationToken) + { + var uid = User.GetUserId(); + + var query = await _context.RdvQueries + .SingleOrDefaultAsync(q => q.Id == id, cancellationToken); + + if (query is null) + { + return NotFound(); + } + + if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName)) + { + return Forbid(); + } + + _context.RdvQueries.Remove(query); + await _context.SaveChangesAsync(User.GetUserId(), cancellationToken); + + return Ok(query); + } + + private bool QueryExists(long id) + { + return _context.RdvQueries.Any(e => e.Id == id); + } +} diff --git a/src/Yavsc.Api/Controllers/accounting/AccountController.cs b/src/Yavsc.Api/Controllers/accounting/AccountController.cs index aff71013..155274cd 100644 --- a/src/Yavsc.Api/Controllers/accounting/AccountController.cs +++ b/src/Yavsc.Api/Controllers/accounting/AccountController.cs @@ -2,6 +2,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.AspNetCore.Http; +using ImageMagick; using Yavsc.Models; using Yavsc.Api.Helpers; @@ -10,10 +12,21 @@ using System.Diagnostics; namespace Yavsc.WebApi.Controllers { - [Route("~/api/account")] + [Route( Constants.APIPrefix + "/account")] [Authorize("ApiScope")] public class ApiAccountController : Controller { + private const long MaxAvatarSizeBytes = 2 * 1024 * 1024; + private static readonly string[] AcceptedAvatarMimeTypes = + [ + "image/png", + "image/jpeg", + "image/webp", + "image/gif", + "image/bmp", + "image/tiff", + ]; + readonly ApplicationDbContext _dbContext; private readonly ILogger _logger; @@ -61,23 +74,102 @@ namespace Yavsc.WebApi.Controllers return Ok(new { host = Request.ForwardedFor() }); } - + /// /// Updates the avatar /// /// - [HttpPost("~/api/set-avatar")] + [HttpPost("set-avatar")] public async Task SetAvatar() { var user = await GetUserData(User.GetUserId()); - if (Request.Form.Files.Count!=1) - return new BadRequestResult(); - if (!Request.Form.Files[0].ContentType.StartsWith("image/png")) - return new BadRequestResult(); + if (!Request.HasFormContentType) + { + return BadRequest(new + { + status = "invalid_request", + message = "A multipart/form-data request is required.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + }); + } - var info = user.ReceiveAvatar(Request.Form.Files[0]); - await _dbContext.SaveChangesAsync(); - return Ok(info); + if (Request.Form.Files.Count != 1) + { + return BadRequest(new + { + status = "invalid_file_count", + message = "Exactly one file is required.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + }); + } + + var avatarFile = Request.Form.Files[0]; + if (avatarFile.Length <= 0) + { + return BadRequest(new + { + status = "empty_file", + message = "The uploaded file is empty.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + }); + } + + if (avatarFile.Length > MaxAvatarSizeBytes) + { + return BadRequest(new + { + status = "file_too_large", + message = "Avatar is too large.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + }); + } + + if (!AcceptedAvatarMimeTypes.Any(m => string.Equals(m, avatarFile.ContentType, StringComparison.OrdinalIgnoreCase))) + { + return StatusCode(StatusCodes.Status415UnsupportedMediaType, new + { + status = "unsupported_media_type", + message = "Unsupported image format.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + }); + } + + try + { + var info = user.ReceiveAvatar(avatarFile); + await _dbContext.SaveChangesAsync(); + return Ok(new + { + status = "uploaded", + message = "Avatar uploaded successfully.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + avatar = info, + }); + } + catch (MagickException ex) + { + _logger.LogWarning(ex, "Avatar upload failed: invalid image data for user {UserId}", user.Id); + return BadRequest(new + { + status = "invalid_image_data", + message = "Image content could not be decoded.", + acceptedMimeTypes = AcceptedAvatarMimeTypes, + maxFileSizeBytes = MaxAvatarSizeBytes, + outputFormat = "image/png", + }); + } } [HttpGet("identity")] diff --git a/src/Yavsc.Api/Program.cs b/src/Yavsc.Api/Program.cs index 3ed20e8d..5269eef1 100644 --- a/src/Yavsc.Api/Program.cs +++ b/src/Yavsc.Api/Program.cs @@ -20,6 +20,7 @@ using Yavsc.Helpers; using Yavsc.Interface; using Yavsc.Interfaces; using Yavsc.Models; +using Yavsc; using Yavsc.Server.Helpers; using Yavsc.Services; @@ -32,6 +33,7 @@ internal class Program var builder = WebApplication.CreateBuilder(args); builder.AddConfiguration("api"); + Config.SiteSetup = builder.Configuration.GetSection("Site").Get() ?? new SiteSettings(); var services = builder.Services; @@ -72,9 +74,10 @@ internal class Program services.AddAuthentication("Bearer") .AddYavscJwtBearer(builder.Configuration); + // DbContextBuilder services.AddDbContext(options => - - options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"))); + options.UseNpgsql(builder.Configuration.GetConnectionString( + Yavsc.Constants.YavscConnectionStringName))); services.AddLocalization(options => { diff --git a/src/Yavsc.Api/appsettings-api.json b/src/Yavsc.Api/appsettings-api.json index ac626c0d..d8b295de 100644 --- a/src/Yavsc.Api/appsettings-api.json +++ b/src/Yavsc.Api/appsettings-api.json @@ -2,7 +2,8 @@ "Site": { "Authority": "https://localhost:5001", "CorsAllowedOrigins": [ - "https://localhost:5003" + "https://localhost:5003", + "https://yavsc.pschneider.fr" ] }, "Logging": { diff --git a/src/Yavsc.Blogs.Tests/BlogAclApiTests.cs b/src/Yavsc.Blogs.Tests/BlogAclApiTests.cs index 4aef805f..ab5ebcc6 100644 --- a/src/Yavsc.Blogs.Tests/BlogAclApiTests.cs +++ b/src/Yavsc.Blogs.Tests/BlogAclApiTests.cs @@ -283,8 +283,8 @@ public sealed class BlogAclApiTests : IClassFixture TestContext.Current.CancellationToken )); Assert.Equal(JsonValueKind.Array, doc.RootElement.ValueKind); - Assert.Equal(2, doc.RootElement.GetArrayLength()); - Assert.Equal(created.Id, doc.RootElement[0].GetProperty("id").GetInt64()); + Assert.True(doc.RootElement.GetArrayLength() >= 1); + Assert.Contains(doc.RootElement.EnumerateArray(), p => p.GetProperty("id").GetInt64() == created.Id); // detail should return the same post, with ACL and tags. var detailResponse = await http.GetAsync( @@ -296,7 +296,86 @@ public sealed class BlogAclApiTests : IClassFixture )); Assert.Equal(JsonValueKind.Object, detailDoc.RootElement.ValueKind); Assert.Equal(created.Id, detailDoc.RootElement.GetProperty("id").GetInt64()); - Assert.Equal(1, detailDoc.RootElement.GetProperty("acl").GetArrayLength()); + Assert.True(detailDoc.RootElement.TryGetProperty("acl", out var acl)); + Assert.False(detailDoc.RootElement.TryGetProperty("ACL", out _)); + Assert.Equal(JsonValueKind.Array, acl.ValueKind); + Assert.Equal(1, acl.GetArrayLength()); + + var aclEntry = acl[0]; + Assert.Equal(JsonValueKind.Object, aclEntry.ValueKind); + Assert.True(aclEntry.TryGetProperty("circleId", out var circleId)); + Assert.Equal(_fixture.CircleId, circleId.GetInt64()); + } + + [Fact] + public async Task Non_owner_can_read_restricted_post_but_receives_empty_acl_in_list_and_detail() + { + CleanupAcl(); + _fixture.SeedUser(_fixture.DefaultUserLogin); + _fixture.SeedUser("tester"); + _fixture.SeedCircle(_fixture.DefaultUserLogin, "test", false, + new[] { _fixture.DefaultUserLogin, "tester" }); + + using var ownerHttp = NewClient(_fixture.DefaultUserLogin); + using var readerHttp = NewClient("tester"); + + var draft = new BlogPost + { + Id = 0, + Title = "ACL scrub test", + Article = "Visible to circle member", + DateCreated = DateTime.UtcNow, + DateModified = DateTime.UtcNow + }; + + var postResponse = await ownerHttp.PostAsJsonAsync( + BlogUrl(), + draft, + TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.Created, postResponse.StatusCode); + + var created = await postResponse.Content.ReadFromJsonAsync( + TestContext.Current.CancellationToken); + Assert.NotNull(created); + Assert.NotEqual(0, created!.Id); + + var grantResponse = await ownerHttp.PostAsJsonAsync( + BlogAclUrl(), + new PostAccessControlRulePayload + { + CircleId = _fixture.CircleId, + BlogPostId = created.Id + }, + TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.Created, grantResponse.StatusCode); + + var listResponse = await readerHttp.GetAsync( + BlogUrl(), + TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.OK, listResponse.StatusCode); + + using var listDoc = JsonDocument.Parse(await listResponse.Content.ReadAsStringAsync( + TestContext.Current.CancellationToken)); + Assert.Equal(JsonValueKind.Array, listDoc.RootElement.ValueKind); + foreach (var listed in listDoc.RootElement.EnumerateArray()) + { + var authorId = listed.GetProperty("authorId").GetString(); + if (string.Equals(authorId, "tester", StringComparison.Ordinal)) + continue; + + Assert.True(listed.TryGetProperty("acl", out var listedAcl)); + Assert.Equal(0, listedAcl.GetArrayLength()); + } + + var detailResponse = await readerHttp.GetAsync( + $"{BlogUrl()}/{created.Id}", + TestContext.Current.CancellationToken); + Assert.Equal(HttpStatusCode.OK, detailResponse.StatusCode); + + using var detailDoc = JsonDocument.Parse(await detailResponse.Content.ReadAsStringAsync( + TestContext.Current.CancellationToken)); + Assert.True(detailDoc.RootElement.TryGetProperty("acl", out var detailAcl)); + Assert.Equal(0, detailAcl.GetArrayLength()); } } diff --git a/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs b/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs new file mode 100644 index 00000000..200f37fa --- /dev/null +++ b/src/Yavsc.Org.Tests/NonRegression/AvatarFallbackTests.cs @@ -0,0 +1,34 @@ +namespace Yavsc.Org.Tests.NonRegression; + +/// +/// Non-regression: avatar requests under /avatars must never return 404 +/// for missing files. The pipeline falls back to static defaults under +/// /images/Users/icon_user*.png. +/// +public class AvatarFallbackTests : IClassFixture +{ + private readonly TestWebApplicationFactory _factory; + + public AvatarFallbackTests(TestWebApplicationFactory factory) + { + _factory = factory; + } + + [Theory] + [InlineData("/avatars/user-does-not-exist.png")] + [InlineData("/avatars/user-does-not-exist.s.png")] + [InlineData("/avatars/user-does-not-exist.xs.png")] + public async Task Missing_avatar_file_returns_default_image_instead_of_404(string path) + { + using var client = _factory.CreateClient(); + var ct = TestContext.Current.CancellationToken; + + var response = await client.GetAsync(path, ct); + + Assert.Equal(System.Net.HttpStatusCode.OK, response.StatusCode); + Assert.Equal("image/png", response.Content.Headers.ContentType?.MediaType); + + var payload = await response.Content.ReadAsByteArrayAsync(ct); + Assert.True(payload.Length > 0, $"Expected a non-empty fallback image for {path}."); + } +} diff --git a/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs b/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs new file mode 100644 index 00000000..c47bdff5 --- /dev/null +++ b/src/Yavsc.Org.Tests/NonRegression/PerformerCodeInputValidationTests.cs @@ -0,0 +1,76 @@ +using System.ComponentModel.DataAnnotations; +using Yavsc.Models.Relationship; +using Yavsc.Models.Workflow; + +namespace Yavsc.Tests.NonRegression; + +public class PerformerCodeInputValidationTests +{ + [Fact] + public void Validate_rejects_unknown_country_code() + { + var profile = CreateBaseProfile(); + profile.ExerciseCountryCode = "de"; + profile.SIREN = "123456789"; + + var results = Validate(profile); + + Assert.Contains(results, r => r.MemberNames.Contains(nameof(PerformerProfile.ExerciseCountryCode))); + } + + [Fact] + public void Validate_rejects_code_not_matching_country_rule() + { + var profile = CreateBaseProfile(); + profile.ExerciseCountryCode = "pt"; + profile.SIREN = "ABC123"; + + var results = Validate(profile); + + Assert.Contains(results, r => r.MemberNames.Contains(nameof(PerformerProfile.SIREN))); + } + + [Fact] + public void Validate_accepts_country_specific_valid_codes() + { + var fr = CreateBaseProfile(); + fr.ExerciseCountryCode = "fr"; + fr.SIREN = "123456789"; + + var en = CreateBaseProfile(); + en.ExerciseCountryCode = "en"; + en.SIREN = "AB12CD34"; + + var pt = CreateBaseProfile(); + pt.ExerciseCountryCode = "pt"; + pt.SIREN = "501964843"; + + Assert.Empty(Validate(fr)); + Assert.Empty(Validate(en)); + Assert.Empty(Validate(pt)); + } + + private static PerformerProfile CreateBaseProfile() + { + return new PerformerProfile + { + PerformerId = "perf-1", + SIREN = "123456789", + ExerciseCountryCode = "fr", + OrganizationAddress = new Location + { + Address = "1 rue du Test", + Latitude = 48.8566, + Longitude = 2.3522, + }, + }; + } + + private static List Validate(PerformerProfile profile) + { + var ctx = new ValidationContext(profile); + var results = new List(); + Validator.TryValidateObject(profile, ctx, results, validateAllProperties: true); + return results; + } +} \ No newline at end of file diff --git a/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs b/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs new file mode 100644 index 00000000..23ace458 --- /dev/null +++ b/src/Yavsc.Org.Tests/NonRegression/SetActivityCountryValidationViewTests.cs @@ -0,0 +1,70 @@ +namespace Yavsc.Org.Tests.NonRegression; + +/// +/// Guard rails for the SetActivity performer settings page: +/// - countries are provided to the ComboBox via ViewBag.Countries +/// - client-side SIREN validation is wired to country-specific regex rules +/// - controller exposes the validation catalog to the view +/// +public class SetActivityCountryValidationViewTests +{ + [Fact] + public void SetActivity_cshtml_binds_country_combo_to_ViewBag_Countries() + { + var content = File.ReadAllText(ResolveSetActivityViewPath()); + + Assert.Contains("asp-for=\"ExerciseCountryCode\"", content); + Assert.Contains("asp-items=\"ViewBag.Countries\"", content); + } + + [Fact] + public void SetActivity_cshtml_contains_country_aware_siren_javascript_validation() + { + var content = File.ReadAllText(ResolveSetActivityViewPath()); + + Assert.Contains("$.validator.addMethod(\"sirenByCountry\"", content); + Assert.Contains("new RegExp(selectedRule.regex)", content); + Assert.Contains("const countryInput = $(\"#ExerciseCountryCode\")", content); + Assert.Contains("const sirenInput = $(\"#SIREN\")", content); + } + + [Fact] + public void ManageController_exposes_countries_and_country_validation_rules_to_view() + { + var content = File.ReadAllText(ResolveManageControllerPath()); + + Assert.Contains("ViewBag.Countries = countries;", content); + Assert.Contains("ViewBag.CountryCodeValidationRules = PerformerCodeInputValidationCatalog.Rules;", content); + Assert.Contains("ModelState.Remove(nameof(PerformerProfile.ExerciseCountryCode));", content); + } + + private static string ResolveSetActivityViewPath() + { + return ResolveFromWorkspaceRoot( + "src", "Yavsc.Org", "Views", "Manage", "SetActivity.cshtml"); + } + + private static string ResolveManageControllerPath() + { + return ResolveFromWorkspaceRoot( + "src", "Yavsc.Org", "Controllers", "Accounting", "ManageController.cs"); + } + + private static string ResolveFromWorkspaceRoot(params string[] relative) + { + var dir = AppContext.BaseDirectory; + for (var i = 0; i < 10 && dir is not null; i++) + { + var candidate = Path.Combine(new[] { dir }.Concat(relative).ToArray()); + if (File.Exists(candidate)) + { + return candidate; + } + + dir = Path.GetDirectoryName(dir); + } + + throw new FileNotFoundException( + "Could not locate test target from " + AppContext.BaseDirectory); + } +} diff --git a/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs b/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs index c77a20ab..327c2db4 100644 --- a/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs +++ b/src/Yavsc.Org.Tests/Smoke/AccountSmokeTests.cs @@ -1,3 +1,6 @@ +using IdentityServer8.Stores; +using Microsoft.Extensions.DependencyInjection; + namespace Yavsc.Org.Tests.Smoke; /// @@ -30,4 +33,27 @@ public class AccountSmokeTests : SmokeTestBase, IClassFixture(); + + var exception = await Record.ExceptionAsync(resourceStore.GetAllResourcesAsync); + + Assert.Null(exception); + } } diff --git a/src/Yavsc.Org/Contants.cs b/src/Yavsc.Org/Contants.cs index c4a5e8b1..246bc3ac 100644 --- a/src/Yavsc.Org/Contants.cs +++ b/src/Yavsc.Org/Contants.cs @@ -14,7 +14,7 @@ public static class Constants // 'offline_access' is handled by IdentityServer8 itself and never // needs an explicit ApiScope row. public static readonly string[] BuildInApiScopes = { - "admin", "moderation", "performer", "client" }; + "admin", "moderation", "performer", "client", "api" }; // One ApiResource per application scope. Each scope is exposed by // exactly one resource, named after the scope ("admin" -> "admin" @@ -29,6 +29,7 @@ public static class Constants new ApiResourceScopeSpecification { ScopeName = "moderation", Description = "Moderation access", ResourceName = "moderation", ResourceDisplayName = "Moderation API" }, new ApiResourceScopeSpecification { ScopeName = "performer", Description = "Performer access", ResourceName = "performer", ResourceDisplayName = "Performer API" }, new ApiResourceScopeSpecification { ScopeName = "client", Description = "Client access", ResourceName = "client", ResourceDisplayName = "Client API" }, + new ApiResourceScopeSpecification { ScopeName = "api", Description = "Core API access", ResourceName = "api", ResourceDisplayName = "Yavsc Core API" }, new ApiResourceScopeSpecification { ScopeName = "blogs", Description = "Blogs access", ResourceName = "blogs", ResourceDisplayName = "Yavsc Blogs API" } }; } diff --git a/src/Yavsc.Org/Controllers/Accounting/AccountController.cs b/src/Yavsc.Org/Controllers/Accounting/AccountController.cs index 05cb55b5..77e0e32a 100644 --- a/src/Yavsc.Org/Controllers/Accounting/AccountController.cs +++ b/src/Yavsc.Org/Controllers/Accounting/AccountController.cs @@ -94,107 +94,6 @@ IHtmlLocalizerFactory htmlLocalizerFactory, } - public async Task SignIn(SignInModel model, [FromForm] string button) - { - if (Request.Method == "POST") // "hGbkk9B94NAae#aG" - - { - if (model.Provider == null || model.Provider == "LOCAL") - { - if (ModelState.IsValid) - { - var user = await _userManager.FindByNameAsync(model.UserName); - var context = await _interaction.GetAuthorizationContextAsync(model.ReturnUrl); - if (user != null) - { - - - var signin = await _signInManager.CheckPasswordSignInAsync(user, model.Password, true); - - // validate username/password against in-memory store - if (signin.Succeeded) - { - await _events.RaiseAsync(new UserLoginSuccessEvent(user.UserName, user.Id, user.UserName, clientId: context?.Client.ClientId)); - - // only set explicit expiration here if user chooses "remember me". - // otherwise we rely upon expiration configured in cookie middleware. - await HttpContext.SignInAsync(user, _roleManager, model.RememberMe, _dbContext); - var authResult = await HttpContext.AuthenticateAsync(); - if (!authResult.Succeeded) - { - return this.Unauthorized(); - } - String bearer = await HttpContext.GetTokenAsync("Bearer", "Bearer"); - HttpContext.Response.Cookies.Append("Bearer", bearer); - - if (context != null) - { - if (context.IsNativeClient()) - { - // The client is native, so this change in how to - // return the response is for better UX for the end user. - return this.LoadingPage("Redirect", model.ReturnUrl); - } - - // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null - return Redirect(model.ReturnUrl); - } - - // request for a local page - if (Url.IsLocalUrl(model.ReturnUrl)) - { - return Redirect(model.ReturnUrl); - } - else if (string.IsNullOrEmpty(model.ReturnUrl)) - { - return Redirect("~/"); - } - else - { - // user might have clicked on a malicious link - should be logged - throw new Exception("invalid return URL"); - } - } - } - - await _events.RaiseAsync(new UserLoginFailureEvent(model.UserName, "invalid credentials", clientId: context?.Client.ClientId)); - ModelState.AddModelError(string.Empty, AccountOptions.InvalidCredentialsErrorMessage); - } - } - else - { - - // Note: the "provider" parameter corresponds to the external - // authentication provider choosen by the user agent. - if (string.IsNullOrEmpty(model.Provider)) - { - _logger.LogWarning("Provider not specified"); - return BadRequest(); - } - - // Instruct the middleware corresponding to the requested external identity - // provider to redirect the user agent to its own authorization endpoint. - // Note: the authenticationScheme parameter must match the value configured in Startup.cs - - // Note: the "returnUrl" parameter corresponds to the endpoint the user agent - // will be redirected to after a successful authentication and not - // the redirect_uri of the requesting client application. - if (string.IsNullOrEmpty(model.ReturnUrl)) - { - _logger.LogWarning("ReturnUrl not specified"); - return BadRequest(); - } - // Note: this still is not the redirect uri given to the third party provider, at building the challenge. - var redirectUrl = Url.Action("ExternalLoginCallback", "Account", new { model.ReturnUrl }, protocol: "https", host: Config.Authority); - var properties = _signInManager.ConfigureExternalAuthenticationProperties(model.Provider, redirectUrl); - // var properties = new AuthenticationProperties{RedirectUri=ReturnUrl}; - return new ChallengeResult(model.Provider, properties); - - } - } - return View(model); - } - /// /// Entry point into the login workflow /// diff --git a/src/Yavsc.Org/Controllers/Accounting/ManageController.cs b/src/Yavsc.Org/Controllers/Accounting/ManageController.cs index 43e11cd2..e09bbb5a 100644 --- a/src/Yavsc.Org/Controllers/Accounting/ManageController.cs +++ b/src/Yavsc.Org/Controllers/Accounting/ManageController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; +using Microsoft.AspNetCore.Mvc.Rendering; using Yavsc.Models.Workflow; using Yavsc.Helpers; using Yavsc.Models.Relationship; @@ -15,6 +16,7 @@ using Yavsc.Services; using Yavsc.ViewModels.Manage; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Authorization; +using IdentityServer8; using Yavsc.Server.Helpers; namespace Yavsc.Controllers @@ -523,8 +525,45 @@ namespace Yavsc.Controllers } [HttpGet] - public IActionResult SetAvatar() + public async Task SetAvatar( + [FromServices] IdentityServerTools identityServerTools) { + var currentUser = await GetCurrentUserAsync(); + if (currentUser == null) + { + return Challenge(); + } + + var claims = new List + { + new("sub", currentUser.Id), + new("name", currentUser.UserName ?? currentUser.Email ?? currentUser.Id), + new("scope", "api"), + new("aud", "api") + }; + + // Short-lived token limited to avatar upload from this page. + string avatarAccessToken = string.Empty; + try + { + avatarAccessToken = await identityServerTools.IssueClientJwtAsync( + "postit", + 300, + new[] { "api" }, + new[] { "api" }, + claims); + } + catch (Exception ex) + { + _logger.LogWarning(ex, "IssueClientJwtAsync failed for SetAvatar, trying direct IssueJwtAsync fallback."); + } + + if (string.IsNullOrWhiteSpace(avatarAccessToken)) + { + avatarAccessToken = await identityServerTools.IssueJwtAsync(300, claims); + } + + ViewData["AvatarAccessToken"] = avatarAccessToken; return View(); } @@ -544,15 +583,19 @@ namespace Yavsc.Controllers { var currentProfile = _dbContext.Performers.Include(x => x.OrganizationAddress) .First(x => x.PerformerId == uid); + currentProfile.ExerciseCountryCode = NormalizeCountryCodeOrDefault(currentProfile.ExerciseCountryCode); ViewBag.Activities = _dbContext.ActivityItems(existing.Activity); + SetExerciseCountries(currentProfile.ExerciseCountryCode); return View(currentProfile); } ViewBag.Activities = _dbContext.ActivityItems(new List()); + SetExerciseCountries("fr"); return View(new PerformerProfile { PerformerId = user.Id, Performer = user, + ExerciseCountryCode = "fr", OrganizationAddress = new Location() }); } @@ -563,28 +606,42 @@ namespace Yavsc.Controllers { var user = GetCurrentUserAsync().Result; var uid = user.Id; + var postedCountryCode = model.ExerciseCountryCode; + model.ExerciseCountryCode = NormalizeCountryCodeOrDefault(model.ExerciseCountryCode); + + // Model binding validated the raw posted payload before entering + // the action. If country was empty, we fallback to "fr" above, + // so remove the stale min-length error attached to the empty value. + if (string.IsNullOrWhiteSpace(postedCountryCode)) + { + ModelState.Remove(nameof(PerformerProfile.ExerciseCountryCode)); + } + try { if (ModelState.IsValid) { - - var exSiren = await _dbContext.ExceptionsSIREN.FirstOrDefaultAsync( - ex => ex.SIREN == model.SIREN - ); - if (exSiren != null) + var isFrenchPerformerCode = string.Equals(model.ExerciseCountryCode, "fr", StringComparison.Ordinal); + if (isFrenchPerformerCode) { - _logger.LogInformation("Exception SIREN:" + exSiren); - } - else - { - var taskCheck = await _cchecker.CheckAsync(model.SIREN); - if (!taskCheck.success) + var exSiren = await _dbContext.ExceptionsSIREN.FirstOrDefaultAsync( + ex => ex.SIREN == model.SIREN + ); + if (exSiren != null) { - ModelState.AddModelError( - "SIREN", - _SR["Invalid company number"] + " (" + taskCheck.errorCode + ")" - ); - _logger.LogInformation($"Invalid company number: {model.SIREN}/{taskCheck.errorType}/{taskCheck.errorCode}/{taskCheck.errorMessage}" ); + _logger.LogInformation("Exception SIREN:" + exSiren); + } + else + { + var taskCheck = await _cchecker.CheckAsync(model.SIREN); + if (!taskCheck.success) + { + ModelState.AddModelError( + "SIREN", + _SR["Invalid company number"] + " (" + taskCheck.errorCode + ")" + ); + _logger.LogInformation($"Invalid company number: {model.SIREN}/{taskCheck.errorType}/{taskCheck.errorCode}/{taskCheck.errorMessage}" ); + } } } } @@ -622,10 +679,35 @@ namespace Yavsc.Controllers } ViewBag.Activities = _dbContext.ActivityItems(new List()); ViewBag.GoogleSettings = _googleSettings; + SetExerciseCountries(model.ExerciseCountryCode); model.Performer = _dbContext.Users.Single(u=>u.Id == model.PerformerId); return View(model); } + private static string NormalizeCountryCodeOrDefault(string code) + { + var normalized = PerformerCodeInputValidationCatalog.NormalizeCountryCode(code); + if (string.IsNullOrWhiteSpace(normalized)) + { + return "fr"; + } + + return normalized; + } + + private void SetExerciseCountries(string selectedCountryCode) + { + var selected = NormalizeCountryCodeOrDefault(selectedCountryCode); + var countries = new SelectList( + PerformerCodeInputValidationCatalog.Countries, + nameof(Country.Code), + nameof(Country.DisplayName), + selected); + ViewBag.ExerciseCountries = countries; + ViewBag.Countries = countries; + ViewBag.CountryCodeValidationRules = PerformerCodeInputValidationCatalog.Rules; + } + [HttpPost] public async Task UnsetActivity() { diff --git a/src/Yavsc.Org/Controllers/Contracting/FormsController.cs b/src/Yavsc.Org/Controllers/Contracting/FormsController.cs deleted file mode 100644 index 423cf2f4..00000000 --- a/src/Yavsc.Org/Controllers/Contracting/FormsController.cs +++ /dev/null @@ -1,120 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; -using Yavsc.Models; -using Yavsc.Models.Forms; -using Yavsc.Server.Helpers; - -namespace Yavsc.Controllers -{ - public class FormsController : Controller - { - private readonly ApplicationDbContext _context; - - public FormsController(ApplicationDbContext context) - { - _context = context; - } - - // GET: Forms - public async Task Index() - { - return View(await _context.Form.ToListAsync()); - } - - // GET: Forms/Details/5 - public async Task Details(string id) - { - if (id == null) - { - return NotFound(); - } - - Form form = await _context.Form.SingleAsync(m => m.Id == id); - if (form == null) - { - return NotFound(); - } - - return View(form); - } - - // GET: Forms/Create - public IActionResult Create() - { - return View(); - } - - // POST: Forms/Create - [HttpPost] - [ValidateAntiForgeryToken] - public async Task Create(Form form) - { - if (ModelState.IsValid) - { - _context.Form.Add(form); - await _context.SaveChangesAsync(User.GetUserId()); - return RedirectToAction("Index"); - } - return View(form); - } - - // GET: Forms/Edit/5 - public async Task Edit(string id) - { - if (id == null) - { - return NotFound(); - } - - Form form = await _context.Form.SingleAsync(m => m.Id == id); - if (form == null) - { - return NotFound(); - } - return View(form); - } - - // POST: Forms/Edit/5 - [HttpPost] - [ValidateAntiForgeryToken] - public async Task Edit(Form form) - { - if (ModelState.IsValid) - { - _context.Update(form); - await _context.SaveChangesAsync(User.GetUserId()); - return RedirectToAction("Index"); - } - return View(form); - } - - // GET: Forms/Delete/5 - [ActionName("Delete")] - public async Task Delete(string id) - { - if (id == null) - { - return NotFound(); - } - - Form form = await _context.Form.SingleAsync(m => m.Id == id); - if (form == null) - { - return NotFound(); - } - - return View(form); - } - - // POST: Forms/Delete/5 - [HttpPost, ActionName("Delete")] - [ValidateAntiForgeryToken] - public async Task DeleteConfirmed(string id) - { - Form form = await _context.Form.SingleAsync(m => m.Id == id); - _context.Form.Remove(form); - await _context.SaveChangesAsync(User.GetUserId()); - return RedirectToAction("Index"); - } - } -} diff --git a/src/Yavsc.Org/Controllers/Contracting/SIRENExceptionsController.cs b/src/Yavsc.Org/Controllers/Contracting/SIRENExceptionsController.cs index bf08484e..ed4ee5b5 100644 --- a/src/Yavsc.Org/Controllers/Contracting/SIRENExceptionsController.cs +++ b/src/Yavsc.Org/Controllers/Contracting/SIRENExceptionsController.cs @@ -3,6 +3,8 @@ using Microsoft.AspNetCore.Mvc; using Yavsc.Models; using Yavsc.Models.Billing; using Yavsc.Server.Helpers; +using Microsoft.EntityFrameworkCore; +using System.Linq; namespace Yavsc.Controllers { @@ -13,7 +15,7 @@ namespace Yavsc.Controllers public SIRENExceptionsController(ApplicationDbContext context) { - _context = context; + _context = context; } // GET: SIRENExceptions @@ -50,15 +52,41 @@ namespace Yavsc.Controllers [ValidateAntiForgeryToken] public IActionResult Create(ExceptionSIREN exceptionSIREN) { + exceptionSIREN ??= new ExceptionSIREN(); + exceptionSIREN.SIREN = NormalizeSiren(exceptionSIREN.SIREN); + + if (string.IsNullOrWhiteSpace(exceptionSIREN.SIREN) || exceptionSIREN.SIREN.Length != 9 || !exceptionSIREN.SIREN.All(char.IsDigit)) + { + ModelState.AddModelError(nameof(ExceptionSIREN.SIREN), "Le SIREN doit contenir exactement 9 chiffres."); + } + + if (_context.ExceptionsSIREN.Any(e => e.SIREN == exceptionSIREN.SIREN)) + { + ModelState.AddModelError(nameof(ExceptionSIREN.SIREN), "Ce SIREN est deja dans la liste des exceptions."); + } + if (ModelState.IsValid) { _context.ExceptionsSIREN.Add(exceptionSIREN); - _context.SaveChanges(User.GetUserId()); - return RedirectToAction("Index"); + try + { + _context.SaveChanges(User.GetUserId()); + return RedirectToAction("Index"); + } + catch (DbUpdateException) + { + ModelState.AddModelError(string.Empty, "Impossible d'enregistrer cette exception SIREN."); + } } return View(exceptionSIREN); } + private static string NormalizeSiren(string? siren) + { + if (string.IsNullOrWhiteSpace(siren)) return string.Empty; + return new string(siren.Where(char.IsDigit).ToArray()); + } + // GET: SIRENExceptions/Edit/5 public IActionResult Edit(string id) { diff --git a/src/Yavsc.Org/Controllers/HomeController.cs b/src/Yavsc.Org/Controllers/HomeController.cs index c7aa131f..6132b093 100644 --- a/src/Yavsc.Org/Controllers/HomeController.cs +++ b/src/Yavsc.Org/Controllers/HomeController.cs @@ -63,9 +63,35 @@ namespace Yavsc.Controllers .Where(a => a.ParentCode == id) .OrderByDescending(a => a.Rate).ToList(); + var candidateCodes = toShow + .Select(a => a.Code) + .Concat(toShow.SelectMany(a => (a.Children ?? new List()) + .Where(c => !c.Hidden) + .Select(c => c.Code))) + .Where(c => !string.IsNullOrWhiteSpace(c)) + .Distinct() + .ToArray(); + + var performerCounts = _dbContext.UserActivities + .Where(ua => candidateCodes.Contains(ua.DoesCode)) + .GroupBy(ua => ua.DoesCode) + .Select(g => new { Code = g.Key, Count = g.Select(x => x.UserId).Distinct().Count() }) + .ToDictionary(x => x.Code, x => x.Count); + + toShow = toShow + .Where(a => + (performerCounts.TryGetValue(a.Code, out var ownCount) && ownCount > 0) + || (a.Children ?? new List()) + .Where(c => !c.Hidden) + .Any(c => performerCounts.TryGetValue(c.Code, out var childCount) && childCount > 0)) + .ToList(); + foreach (var a in toShow) { - a.Children = a.Children.Where(c => !c.Hidden).ToList(); + a.Children = (a.Children ?? new List()) + .Where(c => !c.Hidden) + .Where(c => performerCounts.TryGetValue(c.Code, out var childCount) && childCount > 0) + .ToList(); } return View(toShow); } diff --git a/src/Yavsc.Org/Directory.Packages.props b/src/Yavsc.Org/Directory.Packages.props deleted file mode 100644 index d9925e02..00000000 --- a/src/Yavsc.Org/Directory.Packages.props +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Yavsc.Org/Extensions/HostingExtensions.cs b/src/Yavsc.Org/Extensions/HostingExtensions.cs index 6528b9c6..e986620f 100644 --- a/src/Yavsc.Org/Extensions/HostingExtensions.cs +++ b/src/Yavsc.Org/Extensions/HostingExtensions.cs @@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Razor; +using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; @@ -803,6 +804,7 @@ public static class HostingExtensions // silent refresh path to work; without it IdentityServer // refuses to issue a refresh_token. "blogs", + "api", IdentityServer8.IdentityServerConstants.StandardScopes.OpenId, IdentityServer8.IdentityServerConstants.StandardScopes.Profile, IdentityServer8.IdentityServerConstants.StandardScopes.OfflineAccess, @@ -1281,10 +1283,52 @@ ADD COLUMN IF NOT EXISTS ""Moderated"" boolean NOT NULL DEFAULT FALSE;"); app.UseFileServer(Config.AvatarsOptions); + app.Use(async (context, next) => + { + await next(); + + if (context.Response.StatusCode != StatusCodes.Status404NotFound + || context.Response.HasStarted + || !HttpMethods.IsGet(context.Request.Method) + || !context.Request.Path.StartsWithSegments(Constants.AvatarsPath, out var avatarFile)) + { + return; + } + + var webHostEnvironment = app.ApplicationServices.GetRequiredService(); + var fallbackAsset = ResolveAvatarFallbackAsset(avatarFile); + var fallbackFile = webHostEnvironment.WebRootFileProvider.GetFileInfo(fallbackAsset.TrimStart('/')); + if (!fallbackFile.Exists) + { + return; + } + + context.Response.StatusCode = StatusCodes.Status200OK; + context.Response.ContentType = "image/png"; + await context.Response.SendFileAsync(fallbackFile); + }); + app.UseFileServer(Config.GitOptions); app.UseStaticFiles(); return app; } + private static string ResolveAvatarFallbackAsset(PathString avatarFile) + { + var fileName = avatarFile.Value ?? string.Empty; + + if (fileName.EndsWith(".xs.png", StringComparison.OrdinalIgnoreCase)) + { + return "/images/Users/icon_user.xs.png"; + } + + if (fileName.EndsWith(".s.png", StringComparison.OrdinalIgnoreCase)) + { + return "/images/Users/icon_user.s.png"; + } + + return Constants.DefaultAvatar; + } + } diff --git a/src/Yavsc.Org/Migrations/20260831040104_AddPerformerCountryValidation.Designer.cs b/src/Yavsc.Org/Migrations/20260831040104_AddPerformerCountryValidation.Designer.cs new file mode 100644 index 00000000..3348b9c4 --- /dev/null +++ b/src/Yavsc.Org/Migrations/20260831040104_AddPerformerCountryValidation.Designer.cs @@ -0,0 +1,4734 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using Yavsc.Models; + +#nullable disable + +namespace Yavsc.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20260831040104_AddPerformerCountryValidation")] + partial class AddPerformerCountryValidation + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.9") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("AllowedAccessTokenSigningAlgorithms") + .HasColumnType("text"); + + b.Property("Created") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("DisplayName") + .HasColumnType("text"); + + b.Property("Enabled") + .HasColumnType("boolean"); + + b.Property("LastAccessed") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("NonEditable") + .HasColumnType("boolean"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("boolean"); + + b.Property("Updated") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("ApiResources"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ApiResourceId") + .HasColumnType("integer"); + + b.Property("ApiResourceId1") + .HasColumnType("integer"); + + b.Property("Type") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ApiResourceId"); + + b.HasIndex("ApiResourceId1"); + + b.ToTable("ApiResourceClaims"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceProperty", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ApiResourceId") + .HasColumnType("integer"); + + b.Property("ApiResourceId1") + .HasColumnType("integer"); + + b.Property("Key") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ApiResourceId"); + + b.HasIndex("ApiResourceId1"); + + b.ToTable("ApiResourceProperties"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceScope", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ApiResourceId") + .HasColumnType("integer"); + + b.Property("ApiResourceId1") + .HasColumnType("integer"); + + b.Property("Scope") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ApiResourceId"); + + b.HasIndex("ApiResourceId1"); + + b.ToTable("ApiResourceScopes"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceSecret", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ApiResourceId") + .HasColumnType("integer"); + + b.Property("ApiResourceId1") + .HasColumnType("integer"); + + b.Property("Created") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Expiration") + .HasColumnType("timestamp with time zone"); + + b.Property("Type") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ApiResourceId"); + + b.HasIndex("ApiResourceId1"); + + b.ToTable("ApiResourceSecrets"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiScope", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("DisplayName") + .HasColumnType("text"); + + b.Property("Emphasize") + .HasColumnType("boolean"); + + b.Property("Enabled") + .HasColumnType("boolean"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Required") + .HasColumnType("boolean"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.ToTable("ApiScopes"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiScopeClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ScopeId") + .HasColumnType("integer"); + + b.Property("ScopeId1") + .HasColumnType("integer"); + + b.Property("Type") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ScopeId"); + + b.HasIndex("ScopeId1"); + + b.ToTable("ApiScopeClaims"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiScopeProperty", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Key") + .HasColumnType("text"); + + b.Property("ScopeId") + .HasColumnType("integer"); + + b.Property("ScopeId1") + .HasColumnType("integer"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ScopeId"); + + b.HasIndex("ScopeId1"); + + b.ToTable("ApiScopeProperties"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("AbsoluteRefreshTokenLifetime") + .HasColumnType("integer"); + + b.Property("AccessTokenLifetime") + .HasColumnType("integer"); + + b.Property("AccessTokenType") + .HasColumnType("integer"); + + b.Property("AllowAccessTokensViaBrowser") + .HasColumnType("boolean"); + + b.Property("AllowOfflineAccess") + .HasColumnType("boolean"); + + b.Property("AllowPlainTextPkce") + .HasColumnType("boolean"); + + b.Property("AllowRememberConsent") + .HasColumnType("boolean"); + + b.Property("AllowedIdentityTokenSigningAlgorithms") + .HasColumnType("text"); + + b.Property("AlwaysIncludeUserClaimsInIdToken") + .HasColumnType("boolean"); + + b.Property("AlwaysSendClientClaims") + .HasColumnType("boolean"); + + b.Property("AuthorizationCodeLifetime") + .HasColumnType("integer"); + + b.Property("BackChannelLogoutSessionRequired") + .HasColumnType("boolean"); + + b.Property("BackChannelLogoutUri") + .HasColumnType("text"); + + b.Property("ClientClaimsPrefix") + .HasColumnType("text"); + + b.Property("ClientId") + .HasColumnType("text"); + + b.Property("ClientName") + .HasColumnType("text"); + + b.Property("ClientUri") + .HasColumnType("text"); + + b.Property("ConsentLifetime") + .HasColumnType("integer"); + + b.Property("Created") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("DeviceCodeLifetime") + .HasColumnType("integer"); + + b.Property("EnableLocalLogin") + .HasColumnType("boolean"); + + b.Property("Enabled") + .HasColumnType("boolean"); + + b.Property("FrontChannelLogoutSessionRequired") + .HasColumnType("boolean"); + + b.Property("FrontChannelLogoutUri") + .HasColumnType("text"); + + b.Property("IdentityTokenLifetime") + .HasColumnType("integer"); + + b.Property("IncludeJwtId") + .HasColumnType("boolean"); + + b.Property("LastAccessed") + .HasColumnType("timestamp with time zone"); + + b.Property("LogoUri") + .HasColumnType("text"); + + b.Property("NonEditable") + .HasColumnType("boolean"); + + b.Property("PairWiseSubjectSalt") + .HasColumnType("text"); + + b.Property("ProtocolType") + .HasColumnType("text"); + + b.Property("RefreshTokenExpiration") + .HasColumnType("integer"); + + b.Property("RefreshTokenUsage") + .HasColumnType("integer"); + + b.Property("RequireClientSecret") + .HasColumnType("boolean"); + + b.Property("RequireConsent") + .HasColumnType("boolean"); + + b.Property("RequirePkce") + .HasColumnType("boolean"); + + b.Property("RequireRequestObject") + .HasColumnType("boolean"); + + b.Property("SlidingRefreshTokenLifetime") + .HasColumnType("integer"); + + b.Property("UpdateAccessTokenClaimsOnRefresh") + .HasColumnType("boolean"); + + b.Property("Updated") + .HasColumnType("timestamp with time zone"); + + b.Property("UserCodeType") + .HasColumnType("text"); + + b.Property("UserSsoLifetime") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("Type") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("ClientClaims"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientCorsOrigin", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("ClientId1") + .HasColumnType("integer"); + + b.Property("Origin") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ClientId1"); + + b.ToTable("ClientCorsOrigins"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientGrantType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("GrantType") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("ClientGrantTypes"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientIdPRestriction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("ClientId1") + .HasColumnType("integer"); + + b.Property("Provider") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ClientId1"); + + b.ToTable("ClientIdPRestrictions"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientPostLogoutRedirectUri", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("ClientId1") + .HasColumnType("integer"); + + b.Property("PostLogoutRedirectUri") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ClientId1"); + + b.ToTable("ClientPostLogoutRedirectUris"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientProperty", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("ClientId1") + .HasColumnType("integer"); + + b.Property("Key") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ClientId1"); + + b.ToTable("ClientProperties"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientRedirectUri", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("RedirectUri") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("ClientRedirectUris"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientScope", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("Scope") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("ClientScopes"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientSecret", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityAlwaysColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("ClientId1") + .HasColumnType("integer"); + + b.Property("Created") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Expiration") + .HasColumnType("timestamp with time zone"); + + b.Property("Type") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("ClientId1"); + + b.ToTable("ClientSecrets"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.DeviceFlowCodes", b => + { + b.Property("UserCode") + .HasColumnType("text"); + + b.Property("DeviceCode") + .HasColumnType("text"); + + b.Property("ClientId") + .HasColumnType("text"); + + b.Property("CreationTime") + .HasColumnType("timestamp with time zone"); + + b.Property("Data") + .HasColumnType("text"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Expiration") + .HasColumnType("timestamp with time zone"); + + b.Property("SessionId") + .HasColumnType("text"); + + b.Property("SubjectId") + .HasColumnType("text"); + + b.HasKey("UserCode", "DeviceCode"); + + b.ToTable("DeviceFlowCodes"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.IdentityResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Created") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("DisplayName") + .HasColumnType("text"); + + b.Property("Emphasize") + .HasColumnType("boolean"); + + b.Property("Enabled") + .HasColumnType("boolean"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("NonEditable") + .HasColumnType("boolean"); + + b.Property("Required") + .HasColumnType("boolean"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("boolean"); + + b.Property("Updated") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("IdentityResources"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.IdentityResourceClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("IdentityResourceId") + .HasColumnType("integer"); + + b.Property("Type") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("IdentityResourceId"); + + b.ToTable("IdentityResourceClaims"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.IdentityResourceProperty", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("IdentityResourceId") + .HasColumnType("integer"); + + b.Property("Key") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("IdentityResourceId"); + + b.ToTable("IdentityResourceProperties"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.PersistedGrant", b => + { + b.Property("Key") + .HasColumnType("text"); + + b.Property("ClientId") + .HasColumnType("text"); + + b.Property("ConsumedTime") + .HasColumnType("timestamp with time zone"); + + b.Property("CreationTime") + .HasColumnType("timestamp with time zone"); + + b.Property("Data") + .HasColumnType("text"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Expiration") + .HasColumnType("timestamp with time zone"); + + b.Property("SessionId") + .HasColumnType("text"); + + b.Property("SubjectId") + .HasColumnType("text"); + + b.Property("Type") + .HasColumnType("text"); + + b.HasKey("Key"); + + b.ToTable("PersistedGrants"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("text"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("Yavsc.Abstract.Identity.ClientProviderInfo", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("Avatar") + .HasColumnType("text"); + + b.Property("BillingAddressId") + .HasColumnType("bigint"); + + b.Property("EMail") + .HasColumnType("text"); + + b.Property("Phone") + .HasColumnType("text"); + + b.Property("UserName") + .HasColumnType("text"); + + b.HasKey("UserId"); + + b.ToTable("ClientProviderInfo"); + }); + + modelBuilder.Entity("Yavsc.Abstract.Models.Messaging.Notification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Target") + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("body") + .IsRequired() + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("click_action") + .IsRequired() + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("color") + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("icon") + .ValueGeneratedOnAdd() + .HasMaxLength(512) + .HasColumnType("character varying(512)") + .HasDefaultValue("exclam"); + + b.Property("sound") + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("tag") + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("title") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("character varying(1024)"); + + b.HasKey("Id"); + + b.ToTable("Notification"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.Ban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("text"); + + b.Property("TargetId") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("TargetId"); + + b.ToTable("Ban"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.HasIndex("UserId"); + + b.ToTable("BlackListed"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b => + { + b.Property("CircleId") + .HasColumnType("bigint"); + + b.Property("BlogPostId") + .HasColumnType("bigint"); + + b.HasKey("CircleId", "BlogPostId"); + + b.HasIndex("BlogPostId"); + + b.ToTable("CircleAuthorizationToBlogPost"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("ContactCredits") + .HasColumnType("bigint"); + + b.Property("Credits") + .HasColumnType("numeric"); + + b.HasKey("UserId"); + + b.ToTable("BankStatus"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("AllowMonthlyEmail") + .HasColumnType("boolean"); + + b.Property("Avatar") + .ValueGeneratedOnAdd() + .HasMaxLength(512) + .HasColumnType("character varying(512)") + .HasDefaultValue("/images/Users/icon_user.png"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("DedicatedGoogleCalendar") + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("DiskQuota") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasDefaultValue(524288000L); + + b.Property("DiskUsage") + .HasColumnType("bigint"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("FullName") + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("MaxFileSize") + .HasColumnType("bigint"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("PostalAddressId") + .HasColumnType("bigint"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasAlternateKey("Email"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.HasIndex("PostalAddressId"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("BalanceId") + .IsRequired() + .HasColumnType("text"); + + b.Property("ExecDate") + .HasColumnType("timestamp with time zone"); + + b.Property("Impact") + .HasColumnType("numeric"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("BalanceId"); + + b.ToTable("BalanceImpact"); + }); + + modelBuilder.Entity("Yavsc.Models.Bank.BankIdentity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AccountNumber") + .HasColumnType("text"); + + b.Property("BIC") + .HasColumnType("text"); + + b.Property("BankCode") + .HasColumnType("text"); + + b.Property("BankedKey") + .HasColumnType("integer"); + + b.Property("IBAN") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("text"); + + b.Property("WicketCode") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("BankIdentity"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("Currency") + .HasColumnType("text"); + + b.Property("Description") + .IsRequired() + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("EstimateId") + .HasColumnType("bigint"); + + b.Property("EstimateTemplateId") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("UnitaryCost") + .HasColumnType("numeric"); + + b.HasKey("Id"); + + b.HasIndex("EstimateId"); + + b.HasIndex("EstimateTemplateId"); + + b.ToTable("CommandLine"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AttachedFilesString") + .HasColumnType("text"); + + b.Property("AttachedGraphicsString") + .HasColumnType("text"); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("text"); + + b.Property("ClientValidationDate") + .HasColumnType("timestamp with time zone"); + + b.Property("CommandId") + .HasColumnType("bigint"); + + b.Property("CommandType") + .IsRequired() + .HasColumnType("text"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("OwnerId") + .HasColumnType("text"); + + b.Property("ProviderValidationDate") + .HasColumnType("timestamp with time zone"); + + b.Property("Title") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("CommandId"); + + b.HasIndex("OwnerId"); + + b.ToTable("Estimates"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.EstimateTemplate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("EstimateTemplates"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b => + { + b.Property("SIREN") + .HasColumnType("text"); + + b.HasKey("SIREN"); + + b.ToTable("ExceptionsSIREN"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Signature", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CapturedAtUtc") + .HasColumnType("timestamp with time zone"); + + b.Property("CoordinateMax") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(10000); + + b.Property("EstimateId") + .HasColumnType("bigint"); + + b.Property("FilePath") + .IsRequired() + .HasColumnType("text"); + + b.Property("SignerId") + .IsRequired() + .HasColumnType("text"); + + b.PrimitiveCollection("Strokes") + .IsRequired() + .HasColumnType("integer[]"); + + b.Property("Type") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("SignerId"); + + b.HasIndex("EstimateId", "Type") + .IsUnique(); + + b.ToTable("Signatures"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogAttachedFile", b => + { + b.Property("FileId") + .HasColumnType("bigint"); + + b.Property("PostId") + .HasColumnType("bigint"); + + b.HasKey("FileId", "PostId"); + + b.HasIndex("PostId"); + + b.ToTable("BlogAttachedFiles"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogPost", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Article") + .HasMaxLength(56224) + .HasColumnType("character varying(56224)"); + + b.Property("AuthorId") + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Photo") + .HasMaxLength(1024) + .HasColumnType("character varying(1024)"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("character varying(1024)"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.ToTable("BlogSpot"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogTag", b => + { + b.Property("PostId") + .HasColumnType("bigint"); + + b.Property("TagId") + .HasColumnType("bigint"); + + b.HasKey("PostId", "TagId"); + + b.HasIndex("TagId"); + + b.ToTable("BlogTag"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.Comment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Article") + .HasColumnType("text"); + + b.Property("AuthorId") + .IsRequired() + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("ParentId") + .HasColumnType("bigint"); + + b.Property("ReceiverId") + .HasColumnType("bigint"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.Property("Visible") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("ParentId"); + + b.HasIndex("ReceiverId"); + + b.ToTable("Comment"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.UploadedFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ContentType") + .HasColumnType("text"); + + b.Property("Length") + .HasColumnType("bigint"); + + b.Property("Path") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("UploadedFiles"); + }); + + modelBuilder.Entity("Yavsc.Models.BlogSpotPublication", b => + { + b.Property("BlogpostId") + .HasColumnType("bigint"); + + b.HasKey("BlogpostId"); + + b.ToTable("blogSpotPublications"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b => + { + b.Property("OwnerId") + .HasColumnType("text"); + + b.HasKey("OwnerId"); + + b.ToTable("Schedule"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.ScheduledEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("PeriodEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("PeriodStart") + .HasColumnType("timestamp with time zone"); + + b.Property("Reccurence") + .HasColumnType("integer"); + + b.Property("ScheduleOwnerId") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ScheduleOwnerId"); + + b.HasIndex("PeriodStart", "PeriodEnd"); + + b.ToTable("ScheduledEvent"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatConnection", b => + { + b.Property("ConnectionId") + .HasColumnType("text"); + + b.Property("ApplicationUserId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Connected") + .HasColumnType("boolean"); + + b.Property("UserAgent") + .HasColumnType("text"); + + b.HasKey("ConnectionId"); + + b.HasIndex("ApplicationUserId"); + + b.ToTable("ChatConnection"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoom", b => + { + b.Property("Name") + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("LatestJoinPart") + .HasColumnType("timestamp with time zone"); + + b.Property("OwnerId") + .HasColumnType("text"); + + b.Property("Topic") + .HasColumnType("text"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("Name"); + + b.HasIndex("OwnerId"); + + b.ToTable("ChatRoom"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoomAccess", b => + { + b.Property("ChannelName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("text"); + + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Level") + .HasColumnType("integer"); + + b.HasKey("ChannelName", "UserId"); + + b.HasIndex("UserId"); + + b.ToTable("ChatRoomAccess"); + }); + + modelBuilder.Entity("Yavsc.Models.Cratie.Option", b => + { + b.Property("Code") + .HasColumnType("text"); + + b.Property("CodeScrutin") + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("Code", "CodeScrutin"); + + b.ToTable("Option"); + }); + + modelBuilder.Entity("Yavsc.Models.Drawing.Color", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Blue") + .HasColumnType("smallint"); + + b.Property("Green") + .HasColumnType("smallint"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Red") + .HasColumnType("smallint"); + + b.HasKey("Id"); + + b.ToTable("Color"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("ActionDistance") + .HasColumnType("integer"); + + b.Property("CarePrice") + .HasColumnType("numeric"); + + b.Property("FlatFeeDiscount") + .HasColumnType("numeric"); + + b.Property("HalfBalayagePrice") + .HasColumnType("numeric"); + + b.Property("HalfBrushingPrice") + .HasColumnType("numeric"); + + b.Property("HalfColorPrice") + .HasColumnType("numeric"); + + b.Property("HalfDefrisPrice") + .HasColumnType("numeric"); + + b.Property("HalfFoldingPrice") + .HasColumnType("numeric"); + + b.Property("HalfMechPrice") + .HasColumnType("numeric"); + + b.Property("HalfMultiColorPrice") + .HasColumnType("numeric"); + + b.Property("HalfPermanentPrice") + .HasColumnType("numeric"); + + b.Property("KidCutPrice") + .HasColumnType("numeric"); + + b.Property("LongBalayagePrice") + .HasColumnType("numeric"); + + b.Property("LongBrushingPrice") + .HasColumnType("numeric"); + + b.Property("LongColorPrice") + .HasColumnType("numeric"); + + b.Property("LongDefrisPrice") + .HasColumnType("numeric"); + + b.Property("LongFoldingPrice") + .HasColumnType("numeric"); + + b.Property("LongMechPrice") + .HasColumnType("numeric"); + + b.Property("LongMultiColorPrice") + .HasColumnType("numeric"); + + b.Property("LongPermanentPrice") + .HasColumnType("numeric"); + + b.Property("ManBrushPrice") + .HasColumnType("numeric"); + + b.Property("ManCutPrice") + .HasColumnType("numeric"); + + b.Property("ScheduleOwnerId") + .HasColumnType("text"); + + b.Property("ShampooPrice") + .HasColumnType("numeric"); + + b.Property("ShortBalayagePrice") + .HasColumnType("numeric"); + + b.Property("ShortBrushingPrice") + .HasColumnType("numeric"); + + b.Property("ShortColorPrice") + .HasColumnType("numeric"); + + b.Property("ShortDefrisPrice") + .HasColumnType("numeric"); + + b.Property("ShortFoldingPrice") + .HasColumnType("numeric"); + + b.Property("ShortMechPrice") + .HasColumnType("numeric"); + + b.Property("ShortMultiColorPrice") + .HasColumnType("numeric"); + + b.Property("ShortPermanentPrice") + .HasColumnType("numeric"); + + b.Property("WomenHalfCutPrice") + .HasColumnType("numeric"); + + b.Property("WomenLongCutPrice") + .HasColumnType("numeric"); + + b.Property("WomenShortCutPrice") + .HasColumnType("numeric"); + + b.HasKey("UserId"); + + b.HasIndex("ScheduleOwnerId"); + + b.ToTable("BrusherProfile"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairCutQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ActivityCode") + .IsRequired() + .HasColumnType("text"); + + b.Property("AdditionalInfo") + .HasColumnType("text"); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Consent") + .HasColumnType("boolean"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("EventDate") + .HasColumnType("timestamp with time zone"); + + b.Property("LocationId") + .HasColumnType("bigint"); + + b.Property("PaymentId") + .HasColumnType("text"); + + b.Property("PerformerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("PrestationId") + .HasColumnType("bigint"); + + b.Property("Provisional") + .HasColumnType("numeric"); + + b.Property("SelectedProfileUserId") + .HasColumnType("text"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.Property("ValidationDate") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("ActivityCode"); + + b.HasIndex("ClientId"); + + b.HasIndex("LocationId"); + + b.HasIndex("PaymentId"); + + b.HasIndex("PerformerId"); + + b.HasIndex("PrestationId"); + + b.HasIndex("SelectedProfileUserId"); + + b.ToTable("HairCutQueries"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ActivityCode") + .IsRequired() + .HasColumnType("text"); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Consent") + .HasColumnType("boolean"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("EventDate") + .HasColumnType("timestamp with time zone"); + + b.Property("LocationId") + .HasColumnType("bigint"); + + b.Property("PaymentId") + .HasColumnType("text"); + + b.Property("PerformerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Provisional") + .HasColumnType("numeric"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.Property("ValidationDate") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("ActivityCode"); + + b.HasIndex("ClientId"); + + b.HasIndex("LocationId"); + + b.HasIndex("PaymentId"); + + b.HasIndex("PerformerId"); + + b.ToTable("HairMultiCutQueries"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Cares") + .HasColumnType("boolean"); + + b.Property("Cut") + .HasColumnType("boolean"); + + b.Property("Dressing") + .HasColumnType("integer"); + + b.Property("Gender") + .HasColumnType("integer"); + + b.Property("Length") + .HasColumnType("integer"); + + b.Property("Shampoo") + .HasColumnType("boolean"); + + b.Property("Tech") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("HairPrestation"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestationCollectionItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("PrestationId") + .HasColumnType("bigint"); + + b.Property("QueryId") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("PrestationId"); + + b.HasIndex("QueryId"); + + b.ToTable("HairPrestationCollectionItem"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaint", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Brand") + .HasColumnType("text"); + + b.Property("ColorId") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("ColorId"); + + b.ToTable("HairTaint"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaintInstance", b => + { + b.Property("TaintId") + .HasColumnType("bigint"); + + b.Property("PrestationId") + .HasColumnType("bigint"); + + b.HasKey("TaintId", "PrestationId"); + + b.HasIndex("PrestationId"); + + b.ToTable("HairTaintInstance"); + }); + + modelBuilder.Entity("Yavsc.Models.IT.Evolution.Feature", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("ShortName") + .HasColumnType("text"); + + b.Property("Status") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("Feature"); + }); + + modelBuilder.Entity("Yavsc.Models.IT.Fixing.Bug", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .HasMaxLength(10240) + .HasColumnType("character varying(10240)"); + + b.Property("FeatureId") + .HasColumnType("bigint"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("Title") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("FeatureId"); + + b.ToTable("Bug"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.DeviceDeclaration", b => + { + b.Property("DeviceId") + .HasColumnType("text"); + + b.Property("DeclarationDate") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasDefaultValueSql("LOCALTIMESTAMP"); + + b.Property("DeviceOwnerId") + .HasColumnType("text"); + + b.Property("LatestActivityUpdate") + .HasColumnType("timestamp with time zone"); + + b.Property("Model") + .HasColumnType("text"); + + b.Property("Platform") + .HasColumnType("text"); + + b.Property("Version") + .HasColumnType("text"); + + b.HasKey("DeviceId"); + + b.HasIndex("DeviceOwnerId"); + + b.ToTable("DeviceDeclaration"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.DeclarationFlag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("DeclarationId") + .HasColumnType("bigint"); + + b.Property("MatchExcerpt") + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("PatternId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("DeclarationId"); + + b.HasIndex("PatternId"); + + b.ToTable("DeclarationFlag"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.ModerationLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Action") + .HasColumnType("integer"); + + b.Property("DeclarationId") + .HasColumnType("bigint"); + + b.Property("ModeratorId") + .HasColumnType("text"); + + b.Property("ScoreDelta") + .HasColumnType("integer"); + + b.Property("Timestamp") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("DeclarationId"); + + b.HasIndex("ModeratorId"); + + b.HasIndex("Timestamp"); + + b.ToTable("ModerationLogs", t => + { + t.HasCheckConstraint("CK_ModerationLog_Immutable", "1=1"); + }); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.RegexAlertPattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Pattern") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("Severity") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("IsActive"); + + b.ToTable("RegexAlertPatterns"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.TrustDeclaration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Content") + .HasMaxLength(2000) + .HasColumnType("character varying(2000)"); + + b.Property("DeclarantTokenId") + .HasColumnType("uuid"); + + b.Property("ScoreDelta") + .HasColumnType("integer"); + + b.Property("Sentiment") + .HasColumnType("integer"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("SubmittedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("TrustTokenId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("Status"); + + b.HasIndex("SubmittedAt"); + + b.HasIndex("TrustTokenId"); + + b.ToTable("TrustDeclarations"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.TrustToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("TokenHash") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("TokenSource") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("character varying(32)"); + + b.Property("TrustScore") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("TokenHash") + .IsUnique(); + + b.ToTable("TrustTokens"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Product", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Depth") + .HasColumnType("numeric"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Height") + .HasColumnType("numeric"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("numeric"); + + b.Property("Public") + .HasColumnType("boolean"); + + b.Property("Weight") + .HasColumnType("numeric"); + + b.Property("Width") + .HasColumnType("numeric"); + + b.HasKey("Id"); + + b.ToTable("Products"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ContextId") + .HasColumnType("text"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Public") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("ContextId"); + + b.ToTable("Services"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.Announce", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("For") + .HasColumnType("smallint"); + + b.Property("Message") + .HasColumnType("text"); + + b.Property("OwnerId") + .HasColumnType("text"); + + b.Property("Sender") + .HasColumnType("text"); + + b.Property("Topic") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("Announce"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.DismissClicked", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("NotificationId") + .HasColumnType("bigint"); + + b.HasKey("UserId", "NotificationId"); + + b.HasIndex("NotificationId"); + + b.ToTable("DismissClicked"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Instrument", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("character varying(255)"); + + b.HasKey("Id"); + + b.ToTable("Instrument"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.InstrumentRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("InstrumentId") + .HasColumnType("bigint"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasAlternateKey("InstrumentId", "OwnerId"); + + b.HasIndex("OwnerId"); + + b.ToTable("InstrumentRating"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.MusicalPreference", b => + { + b.Property("OwnerProfileId") + .HasColumnType("text"); + + b.Property("DjSettingsUserId") + .HasColumnType("text"); + + b.Property("MusicLoverSettingsUserId") + .HasColumnType("text"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.Property("TendencyId") + .HasColumnType("bigint"); + + b.HasKey("OwnerProfileId"); + + b.HasIndex("DjSettingsUserId"); + + b.HasIndex("MusicLoverSettingsUserId"); + + b.HasIndex("TendencyId"); + + b.ToTable("MusicalPreference"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.MusicalTendency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasMaxLength(255) + .HasColumnType("character varying(255)"); + + b.HasKey("Id"); + + b.ToTable("MusicalTendency"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.DjSettings", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("SoundCloudId") + .HasColumnType("text"); + + b.HasKey("UserId"); + + b.ToTable("DjSettings"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.Instrumentation", b => + { + b.Property("InstrumentId") + .HasColumnType("bigint"); + + b.Property("UserId") + .HasColumnType("text"); + + b.HasKey("InstrumentId", "UserId"); + + b.HasIndex("UserId"); + + b.ToTable("Instrumentation"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.MusicLoverSettings", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.HasKey("UserId"); + + b.ToTable("MusicLoverSettings"); + }); + + modelBuilder.Entity("Yavsc.Models.Payment.PayPalPayment", b => + { + b.Property("CreationToken") + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("ExecutorId") + .IsRequired() + .HasColumnType("text"); + + b.Property("OrderReference") + .HasColumnType("text"); + + b.Property("PaypalPayerId") + .HasColumnType("text"); + + b.Property("State") + .HasColumnType("text"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("CreationToken"); + + b.HasIndex("ExecutorId"); + + b.ToTable("PayPalPayment"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ApplicationUserId") + .HasColumnType("text"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Public") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("ApplicationUserId"); + + b.ToTable("Circle"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.CircleMember", b => + { + b.Property("MemberId") + .HasColumnType("text"); + + b.Property("CircleId") + .HasColumnType("bigint"); + + b.HasKey("MemberId", "CircleId"); + + b.HasIndex("CircleId"); + + b.ToTable("CircleMembers"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Contact", b => + { + b.Property("OwnerId") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("text"); + + b.Property("AddressId") + .HasColumnType("bigint"); + + b.Property("ApplicationUserId") + .HasColumnType("text"); + + b.Property("EMail") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("OwnerId", "UserId"); + + b.HasIndex("AddressId"); + + b.HasIndex("ApplicationUserId"); + + b.ToTable("Contact"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.HyperLink", b => + { + b.Property("HRef") + .HasColumnType("text"); + + b.Property("Method") + .HasColumnType("text"); + + b.Property("BrusherProfileUserId") + .HasColumnType("text"); + + b.Property("ContentType") + .HasColumnType("text"); + + b.Property("PayPalPaymentCreationToken") + .HasColumnType("text"); + + b.Property("Rel") + .HasColumnType("text"); + + b.HasKey("HRef", "Method"); + + b.HasIndex("BrusherProfileUserId"); + + b.HasIndex("PayPalPaymentCreationToken"); + + b.ToTable("HyperLink"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Location", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasMaxLength(512) + .HasColumnType("character varying(512)"); + + b.Property("Latitude") + .HasColumnType("double precision"); + + b.Property("Longitude") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.ToTable("Locations"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.PostalAddress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("City") + .HasColumnType("text"); + + b.Property("Country") + .HasColumnType("text"); + + b.Property("PostalCode") + .HasColumnType("text"); + + b.Property("Province") + .HasColumnType("text"); + + b.Property("State") + .HasColumnType("text"); + + b.Property("Street1") + .HasColumnType("text"); + + b.Property("Street2") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("PostalAddress"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Tags"); + }); + + modelBuilder.Entity("Yavsc.Models.Skill", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("SiteSkills"); + }); + + modelBuilder.Entity("Yavsc.Models.Streaming.LiveFlow", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("DifferedFileName") + .HasColumnType("text"); + + b.Property("MediaType") + .HasColumnType("text"); + + b.Property("OwnerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Pitch") + .HasColumnType("text"); + + b.Property("SequenceNumber") + .HasColumnType("integer"); + + b.Property("Title") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("LiveFlow"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b => + { + b.Property("Code") + .HasColumnType("text"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("Hidden") + .HasColumnType("boolean"); + + b.Property("Moderated") + .HasColumnType("boolean"); + + b.Property("ModeratorGroupName") + .HasColumnType("text"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ParentCode") + .HasColumnType("text"); + + b.Property("Photo") + .HasColumnType("text"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.Property("SettingsClassName") + .HasColumnType("text"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("Code"); + + b.HasIndex("ParentCode"); + + b.ToTable("Activities"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CoWorking", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("FormationSettingsUserId") + .HasColumnType("text"); + + b.Property("PerformerId") + .HasColumnType("text"); + + b.Property("WorkingForId") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("FormationSettingsUserId"); + + b.HasIndex("PerformerId"); + + b.HasIndex("WorkingForId"); + + b.ToTable("CoWorking"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CommandForm", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ActionName") + .HasColumnType("text"); + + b.Property("ActivityCode") + .IsRequired() + .HasColumnType("text"); + + b.Property("Title") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ActivityCode"); + + b.ToTable("CommandForm"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Country", b => + { + b.Property("Code") + .HasMaxLength(2) + .HasColumnType("character varying(2)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("character varying(64)"); + + b.HasKey("Code"); + + b.ToTable("Countries"); + + b.HasData( + new + { + Code = "fr", + DisplayName = "France" + }, + new + { + Code = "en", + DisplayName = "England" + }, + new + { + Code = "pt", + DisplayName = "Portugal" + }); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerCodeInputValidation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CountryCode") + .IsRequired() + .HasMaxLength(2) + .HasColumnType("character varying(2)"); + + b.Property("ErrorMessage") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("RegularExpression") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("CountryCode"); + + b.ToTable("PerformerCodeInputValidations"); + + b.HasData( + new + { + Id = 1L, + CountryCode = "fr", + ErrorMessage = "Le code FR doit contenir entre 9 et 14 chiffres.", + RegularExpression = "^[0-9]{9,14}$" + }, + new + { + Id = 2L, + CountryCode = "en", + ErrorMessage = "Le code EN doit contenir entre 8 et 14 caracteres alphanumeriques.", + RegularExpression = "^[A-Za-z0-9]{8,14}$" + }, + new + { + Id = 3L, + CountryCode = "pt", + ErrorMessage = "Le code PT doit contenir exactement 9 chiffres.", + RegularExpression = "^[0-9]{9}$" + }); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Property("PerformerId") + .HasColumnType("text"); + + b.Property("AcceptNotifications") + .HasColumnType("boolean"); + + b.Property("AcceptPublicContact") + .HasColumnType("boolean"); + + b.Property("Active") + .HasColumnType("boolean"); + + b.Property("ExerciseCountryCode") + .IsRequired() + .HasMaxLength(2) + .HasColumnType("character varying(2)"); + + b.Property("MaxDailyCost") + .HasColumnType("integer"); + + b.Property("MinDailyCost") + .HasColumnType("integer"); + + b.Property("OrganizationAddressId") + .HasColumnType("bigint"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.Property("SIREN") + .IsRequired() + .HasColumnType("text"); + + b.Property("UseGeoLocalizationToReduceDistanceWithClients") + .HasColumnType("boolean"); + + b.Property("WebSite") + .HasColumnType("text"); + + b.HasKey("PerformerId"); + + b.HasIndex("OrganizationAddressId"); + + b.ToTable("Performers"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Profiles.FormationSettings", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("DisplayName") + .HasColumnType("text"); + + b.HasKey("UserId"); + + b.ToTable("FormationSettings"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.RdvQuery", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ActivityCode") + .IsRequired() + .HasColumnType("text"); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Consent") + .HasColumnType("boolean"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("EventDate") + .HasColumnType("timestamp with time zone"); + + b.Property("LocationId") + .HasColumnType("bigint"); + + b.Property("LocationType") + .HasColumnType("integer"); + + b.Property("PaymentId") + .HasColumnType("text"); + + b.Property("PerformerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Provisional") + .HasColumnType("numeric"); + + b.Property("Reason") + .HasColumnType("text"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.Property("ValidationDate") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("ActivityCode"); + + b.HasIndex("ClientId"); + + b.HasIndex("LocationId"); + + b.HasIndex("PaymentId"); + + b.HasIndex("PerformerId"); + + b.ToTable("RdvQueries"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.UserActivity", b => + { + b.Property("DoesCode") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("text"); + + b.Property("Weight") + .HasColumnType("integer"); + + b.HasKey("DoesCode", "UserId"); + + b.HasIndex("UserId"); + + b.ToTable("UserActivities"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.Calendar.Period", b => + { + b.Property("Start") + .HasColumnType("timestamp with time zone"); + + b.Property("End") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Start", "End"); + + b.ToTable("Period"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.EMailing.MailingTemplate", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("Body") + .HasMaxLength(65536) + .HasColumnType("character varying(65536)"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("ReplyToAddress") + .HasColumnType("text"); + + b.Property("ToSend") + .HasColumnType("integer"); + + b.Property("Topic") + .HasColumnType("text"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("MailingTemplate"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.Project", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ActivityCode") + .IsRequired() + .HasColumnType("text"); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Consent") + .HasColumnType("boolean"); + + b.Property("DateCreated") + .HasColumnType("timestamp with time zone"); + + b.Property("DateModified") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("GitId") + .HasColumnType("bigint"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("OwnerId") + .HasColumnType("text"); + + b.Property("PaymentId") + .HasColumnType("text"); + + b.Property("PerformerId") + .IsRequired() + .HasColumnType("text"); + + b.Property("Provisional") + .HasColumnType("numeric"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("UserCreated") + .HasColumnType("text"); + + b.Property("UserModified") + .HasColumnType("text"); + + b.Property("ValidationDate") + .HasColumnType("timestamp with time zone"); + + b.Property("Version") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ActivityCode"); + + b.HasIndex("ClientId"); + + b.HasIndex("GitId"); + + b.HasIndex("PaymentId"); + + b.HasIndex("PerformerId"); + + b.ToTable("Project"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.ProjectBuildConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ProjectId") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("ProjectId"); + + b.ToTable("ProjectBuildConfiguration"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.SourceCode.GitRepositoryReference", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Branch") + .HasColumnType("text"); + + b.Property("OwnerId") + .HasColumnType("text"); + + b.Property("Path") + .IsRequired() + .HasColumnType("text"); + + b.Property("Url") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("OwnerId"); + + b.ToTable("GitRepositoryReference"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceClaim", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", "ApiResource") + .WithMany() + .HasForeignKey("ApiResourceId1"); + + b.Navigation("ApiResource"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceProperty", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", null) + .WithMany("Properties") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", "ApiResource") + .WithMany() + .HasForeignKey("ApiResourceId1"); + + b.Navigation("ApiResource"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceScope", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", null) + .WithMany("Scopes") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", "ApiResource") + .WithMany() + .HasForeignKey("ApiResourceId1"); + + b.Navigation("ApiResource"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResourceSecret", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", null) + .WithMany("Secrets") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiResource", "ApiResource") + .WithMany() + .HasForeignKey("ApiResourceId1"); + + b.Navigation("ApiResource"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiScopeClaim", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiScope", null) + .WithMany("UserClaims") + .HasForeignKey("ScopeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiScope", "Scope") + .WithMany() + .HasForeignKey("ScopeId1"); + + b.Navigation("Scope"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiScopeProperty", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiScope", null) + .WithMany("Properties") + .HasForeignKey("ScopeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.ApiScope", "Scope") + .WithMany() + .HasForeignKey("ScopeId1"); + + b.Navigation("Scope"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientClaim", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany("Claims") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientCorsOrigin", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", null) + .WithMany("AllowedCorsOrigins") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany() + .HasForeignKey("ClientId1"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientGrantType", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany("AllowedGrantTypes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientIdPRestriction", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", null) + .WithMany("IdentityProviderRestrictions") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany() + .HasForeignKey("ClientId1"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientPostLogoutRedirectUri", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", null) + .WithMany("PostLogoutRedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany() + .HasForeignKey("ClientId1"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientProperty", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", null) + .WithMany("Properties") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany() + .HasForeignKey("ClientId1"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientRedirectUri", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany("RedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientScope", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany("AllowedScopes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ClientSecret", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", null) + .WithMany("ClientSecrets") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("IdentityServer8.EntityFramework.Entities.Client", "Client") + .WithMany() + .HasForeignKey("ClientId1"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.IdentityResourceClaim", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.IdentityResource", "IdentityResource") + .WithMany("UserClaims") + .HasForeignKey("IdentityResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("IdentityResource"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.IdentityResourceProperty", b => + { + b.HasOne("IdentityServer8.EntityFramework.Entities.IdentityResource", "IdentityResource") + .WithMany("Properties") + .HasForeignKey("IdentityResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("IdentityResource"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Yavsc.Models.Access.Ban", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "TargetUser") + .WithMany() + .HasForeignKey("TargetId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TargetUser"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany("BlackList") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b => + { + b.HasOne("Yavsc.Models.Blog.BlogPost", "Target") + .WithMany("ACL") + .HasForeignKey("BlogPostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Relationship.Circle", "Allowed") + .WithMany() + .HasForeignKey("CircleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Allowed"); + + b.Navigation("Target"); + }); + + modelBuilder.Entity("Yavsc.Models.AccountBalance", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithOne("AccountBalance") + .HasForeignKey("Yavsc.Models.AccountBalance", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.HasOne("Yavsc.Models.Relationship.Location", "PostalAddress") + .WithMany() + .HasForeignKey("PostalAddressId"); + + b.Navigation("PostalAddress"); + }); + + modelBuilder.Entity("Yavsc.Models.BalanceImpact", b => + { + b.HasOne("Yavsc.Models.AccountBalance", "Balance") + .WithMany() + .HasForeignKey("BalanceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Balance"); + }); + + modelBuilder.Entity("Yavsc.Models.Bank.BankIdentity", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "User") + .WithMany("BankInfo") + .HasForeignKey("UserId"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b => + { + b.HasOne("Yavsc.Models.Billing.Estimate", null) + .WithMany("Bill") + .HasForeignKey("EstimateId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Billing.EstimateTemplate", null) + .WithMany("Bill") + .HasForeignKey("EstimateTemplateId"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Client") + .WithMany() + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Workflow.RdvQuery", "Query") + .WithMany() + .HasForeignKey("CommandId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "Owner") + .WithMany() + .HasForeignKey("OwnerId"); + + b.Navigation("Client"); + + b.Navigation("Owner"); + + b.Navigation("Query"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Signature", b => + { + b.HasOne("Yavsc.Models.Billing.Estimate", "Estimate") + .WithMany("Signatures") + .HasForeignKey("EstimateId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Signer") + .WithMany() + .HasForeignKey("SignerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Estimate"); + + b.Navigation("Signer"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogAttachedFile", b => + { + b.HasOne("Yavsc.Models.Blog.UploadedFile", "File") + .WithMany() + .HasForeignKey("FileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Blog.BlogPost", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("File"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogPost", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Author") + .WithMany("Posts") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Restrict); + + b.Navigation("Author"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogTag", b => + { + b.HasOne("Yavsc.Models.Blog.BlogPost", "Post") + .WithMany("Tags") + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Relationship.Tag", "Tag") + .WithMany() + .HasForeignKey("TagId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + + b.Navigation("Tag"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.Comment", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Author") + .WithMany("BlogComments") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("Yavsc.Models.Blog.Comment", "Parent") + .WithMany("Children") + .HasForeignKey("ParentId"); + + b.HasOne("Yavsc.Models.Blog.BlogPost", "Post") + .WithMany("Comments") + .HasForeignKey("ReceiverId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Author"); + + b.Navigation("Parent"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("Yavsc.Models.BlogSpotPublication", b => + { + b.HasOne("Yavsc.Models.Blog.BlogPost", "BlogPost") + .WithMany() + .HasForeignKey("BlogpostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BlogPost"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.ScheduledEvent", b => + { + b.HasOne("Yavsc.Models.Calendar.Schedule", null) + .WithMany("Events") + .HasForeignKey("ScheduleOwnerId"); + + b.HasOne("Yavsc.Server.Models.Calendar.Period", "Period") + .WithMany() + .HasForeignKey("PeriodStart", "PeriodEnd"); + + b.Navigation("Period"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatConnection", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany("Connections") + .HasForeignKey("ApplicationUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoom", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany("Rooms") + .HasForeignKey("OwnerId"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoomAccess", b => + { + b.HasOne("Yavsc.Models.Chat.ChatRoom", "Room") + .WithMany("Moderation") + .HasForeignKey("ChannelName") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "User") + .WithMany("RoomAccess") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Room"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b => + { + b.HasOne("Yavsc.Models.Calendar.Schedule", "Schedule") + .WithMany() + .HasForeignKey("ScheduleOwnerId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "BaseProfile") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("BaseProfile"); + + b.Navigation("Schedule"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairCutQuery", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Context") + .WithMany() + .HasForeignKey("ActivityCode") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Client") + .WithMany() + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Relationship.Location", "Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularization") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Haircut.HairPrestation", "Prestation") + .WithMany() + .HasForeignKey("PrestationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Haircut.BrusherProfile", "SelectedProfile") + .WithMany() + .HasForeignKey("SelectedProfileUserId"); + + b.Navigation("Client"); + + b.Navigation("Context"); + + b.Navigation("Location"); + + b.Navigation("PerformerProfile"); + + b.Navigation("Prestation"); + + b.Navigation("Regularization"); + + b.Navigation("SelectedProfile"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Context") + .WithMany() + .HasForeignKey("ActivityCode") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Client") + .WithMany() + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Relationship.Location", "Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularization") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Context"); + + b.Navigation("Location"); + + b.Navigation("PerformerProfile"); + + b.Navigation("Regularization"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestationCollectionItem", b => + { + b.HasOne("Yavsc.Models.Haircut.HairPrestation", "Prestation") + .WithMany() + .HasForeignKey("PrestationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Haircut.HairMultiCutQuery", "Query") + .WithMany("Prestations") + .HasForeignKey("QueryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Prestation"); + + b.Navigation("Query"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaint", b => + { + b.HasOne("Yavsc.Models.Drawing.Color", "Color") + .WithMany() + .HasForeignKey("ColorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Color"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairTaintInstance", b => + { + b.HasOne("Yavsc.Models.Haircut.HairPrestation", "Prestation") + .WithMany("Taints") + .HasForeignKey("PrestationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Haircut.HairTaint", "Taint") + .WithMany() + .HasForeignKey("TaintId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Prestation"); + + b.Navigation("Taint"); + }); + + modelBuilder.Entity("Yavsc.Models.IT.Fixing.Bug", b => + { + b.HasOne("Yavsc.Models.IT.Evolution.Feature", "False") + .WithMany() + .HasForeignKey("FeatureId"); + + b.Navigation("False"); + }); + + modelBuilder.Entity("Yavsc.Models.Identity.DeviceDeclaration", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "DeviceOwner") + .WithMany("DeviceDeclaration") + .HasForeignKey("DeviceOwnerId"); + + b.Navigation("DeviceOwner"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.DeclarationFlag", b => + { + b.HasOne("Yavsc.Models.Kyc.TrustDeclaration", "Declaration") + .WithMany("Flags") + .HasForeignKey("DeclarationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Kyc.RegexAlertPattern", "Pattern") + .WithMany() + .HasForeignKey("PatternId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Declaration"); + + b.Navigation("Pattern"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.ModerationLog", b => + { + b.HasOne("Yavsc.Models.Kyc.TrustDeclaration", "Declaration") + .WithMany() + .HasForeignKey("DeclarationId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Declaration"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.TrustDeclaration", b => + { + b.HasOne("Yavsc.Models.Kyc.TrustToken", "Subject") + .WithMany("Declarations") + .HasForeignKey("TrustTokenId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Subject"); + }); + + modelBuilder.Entity("Yavsc.Models.Market.Service", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Context") + .WithMany("Services") + .HasForeignKey("ContextId"); + + b.Navigation("Context"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.Announce", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany() + .HasForeignKey("OwnerId"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Yavsc.Models.Messaging.DismissClicked", b => + { + b.HasOne("Yavsc.Abstract.Models.Messaging.Notification", "Notified") + .WithMany() + .HasForeignKey("NotificationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Notified"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.InstrumentRating", b => + { + b.HasOne("Yavsc.Models.Musical.Instrument", "Instrument") + .WithMany() + .HasForeignKey("InstrumentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "Profile") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Instrument"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.MusicalPreference", b => + { + b.HasOne("Yavsc.Models.Musical.Profiles.DjSettings", null) + .WithMany("SoundColor") + .HasForeignKey("DjSettingsUserId"); + + b.HasOne("Yavsc.Models.Musical.Profiles.MusicLoverSettings", null) + .WithMany("SoundColor") + .HasForeignKey("MusicLoverSettingsUserId"); + + b.HasOne("Yavsc.Models.Musical.MusicalTendency", "MusicalTendency") + .WithMany() + .HasForeignKey("TendencyId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MusicalTendency"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.Instrumentation", b => + { + b.HasOne("Yavsc.Models.Musical.Instrument", "Tool") + .WithMany() + .HasForeignKey("InstrumentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Tool"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Yavsc.Models.Payment.PayPalPayment", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Executor") + .WithMany() + .HasForeignKey("ExecutorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Executor"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", null) + .WithMany("Circles") + .HasForeignKey("ApplicationUserId"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.CircleMember", b => + { + b.HasOne("Yavsc.Models.Relationship.Circle", "Circle") + .WithMany("Members") + .HasForeignKey("CircleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Member") + .WithMany("Membership") + .HasForeignKey("MemberId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Circle"); + + b.Navigation("Member"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Contact", b => + { + b.HasOne("Yavsc.Models.Relationship.PostalAddress", "PostalAddress") + .WithMany() + .HasForeignKey("AddressId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", null) + .WithMany("Book") + .HasForeignKey("ApplicationUserId"); + + b.Navigation("PostalAddress"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.HyperLink", b => + { + b.HasOne("Yavsc.Models.Haircut.BrusherProfile", null) + .WithMany("Links") + .HasForeignKey("BrusherProfileUserId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment", null) + .WithMany("Links") + .HasForeignKey("PayPalPaymentCreationToken"); + }); + + modelBuilder.Entity("Yavsc.Models.Streaming.LiveFlow", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Parent") + .WithMany("Children") + .HasForeignKey("ParentCode"); + + b.Navigation("Parent"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CoWorking", b => + { + b.HasOne("Yavsc.Models.Workflow.Profiles.FormationSettings", null) + .WithMany("CoWorking") + .HasForeignKey("FormationSettingsUserId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "Performer") + .WithMany() + .HasForeignKey("PerformerId"); + + b.HasOne("Yavsc.Models.ApplicationUser", "WorkingFor") + .WithMany() + .HasForeignKey("WorkingForId"); + + b.Navigation("Performer"); + + b.Navigation("WorkingFor"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.CommandForm", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Context") + .WithMany("Forms") + .HasForeignKey("ActivityCode") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Context"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerCodeInputValidation", b => + { + b.HasOne("Yavsc.Models.Workflow.Country", "Country") + .WithMany() + .HasForeignKey("CountryCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Country"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.HasOne("Yavsc.Models.Relationship.Location", "OrganizationAddress") + .WithMany() + .HasForeignKey("OrganizationAddressId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Performer") + .WithMany() + .HasForeignKey("PerformerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("OrganizationAddress"); + + b.Navigation("Performer"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.RdvQuery", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Context") + .WithMany() + .HasForeignKey("ActivityCode") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Client") + .WithMany() + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Relationship.Location", "Location") + .WithMany() + .HasForeignKey("LocationId"); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularization") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Context"); + + b.Navigation("Location"); + + b.Navigation("PerformerProfile"); + + b.Navigation("Regularization"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.UserActivity", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Does") + .WithMany() + .HasForeignKey("DoesCode") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "User") + .WithMany("Activity") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Does"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.Project", b => + { + b.HasOne("Yavsc.Models.Workflow.Activity", "Context") + .WithMany() + .HasForeignKey("ActivityCode") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.ApplicationUser", "Client") + .WithMany() + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Server.Models.IT.SourceCode.GitRepositoryReference", "Repository") + .WithMany() + .HasForeignKey("GitId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Yavsc.Models.Payment.PayPalPayment", "Regularization") + .WithMany() + .HasForeignKey("PaymentId"); + + b.HasOne("Yavsc.Models.Workflow.PerformerProfile", "PerformerProfile") + .WithMany() + .HasForeignKey("PerformerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Context"); + + b.Navigation("PerformerProfile"); + + b.Navigation("Regularization"); + + b.Navigation("Repository"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.ProjectBuildConfiguration", b => + { + b.HasOne("Yavsc.Server.Models.IT.Project", "TargetProject") + .WithMany("Configurations") + .HasForeignKey("ProjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TargetProject"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.SourceCode.GitRepositoryReference", b => + { + b.HasOne("Yavsc.Models.ApplicationUser", "Owner") + .WithMany() + .HasForeignKey("OwnerId"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiResource", b => + { + b.Navigation("Properties"); + + b.Navigation("Scopes"); + + b.Navigation("Secrets"); + + b.Navigation("UserClaims"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.ApiScope", b => + { + b.Navigation("Properties"); + + b.Navigation("UserClaims"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.Client", b => + { + b.Navigation("AllowedCorsOrigins"); + + b.Navigation("AllowedGrantTypes"); + + b.Navigation("AllowedScopes"); + + b.Navigation("Claims"); + + b.Navigation("ClientSecrets"); + + b.Navigation("IdentityProviderRestrictions"); + + b.Navigation("PostLogoutRedirectUris"); + + b.Navigation("Properties"); + + b.Navigation("RedirectUris"); + }); + + modelBuilder.Entity("IdentityServer8.EntityFramework.Entities.IdentityResource", b => + { + b.Navigation("Properties"); + + b.Navigation("UserClaims"); + }); + + modelBuilder.Entity("Yavsc.Models.ApplicationUser", b => + { + b.Navigation("AccountBalance"); + + b.Navigation("BankInfo"); + + b.Navigation("BlackList"); + + b.Navigation("BlogComments"); + + b.Navigation("Book"); + + b.Navigation("Circles"); + + b.Navigation("Connections"); + + b.Navigation("DeviceDeclaration"); + + b.Navigation("Membership"); + + b.Navigation("Posts"); + + b.Navigation("RoomAccess"); + + b.Navigation("Rooms"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b => + { + b.Navigation("Bill"); + + b.Navigation("Signatures"); + }); + + modelBuilder.Entity("Yavsc.Models.Billing.EstimateTemplate", b => + { + b.Navigation("Bill"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.BlogPost", b => + { + b.Navigation("ACL"); + + b.Navigation("Comments"); + + b.Navigation("Tags"); + }); + + modelBuilder.Entity("Yavsc.Models.Blog.Comment", b => + { + b.Navigation("Children"); + }); + + modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b => + { + b.Navigation("Events"); + }); + + modelBuilder.Entity("Yavsc.Models.Chat.ChatRoom", b => + { + b.Navigation("Moderation"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b => + { + b.Navigation("Links"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairMultiCutQuery", b => + { + b.Navigation("Prestations"); + }); + + modelBuilder.Entity("Yavsc.Models.Haircut.HairPrestation", b => + { + b.Navigation("Taints"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.TrustDeclaration", b => + { + b.Navigation("Flags"); + }); + + modelBuilder.Entity("Yavsc.Models.Kyc.TrustToken", b => + { + b.Navigation("Declarations"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.DjSettings", b => + { + b.Navigation("SoundColor"); + }); + + modelBuilder.Entity("Yavsc.Models.Musical.Profiles.MusicLoverSettings", b => + { + b.Navigation("SoundColor"); + }); + + modelBuilder.Entity("Yavsc.Models.Payment.PayPalPayment", b => + { + b.Navigation("Links"); + }); + + modelBuilder.Entity("Yavsc.Models.Relationship.Circle", b => + { + b.Navigation("Members"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Activity", b => + { + b.Navigation("Children"); + + b.Navigation("Forms"); + + b.Navigation("Services"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => + { + b.Navigation("Activity"); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.Profiles.FormationSettings", b => + { + b.Navigation("CoWorking"); + }); + + modelBuilder.Entity("Yavsc.Server.Models.IT.Project", b => + { + b.Navigation("Configurations"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Yavsc.Org/Migrations/20260831040104_AddPerformerCountryValidation.cs b/src/Yavsc.Org/Migrations/20260831040104_AddPerformerCountryValidation.cs new file mode 100644 index 00000000..9d65d19c --- /dev/null +++ b/src/Yavsc.Org/Migrations/20260831040104_AddPerformerCountryValidation.cs @@ -0,0 +1,97 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional + +namespace Yavsc.Migrations +{ + /// + public partial class AddPerformerCountryValidation : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "ExerciseCountryCode", + table: "Performers", + type: "character varying(2)", + maxLength: 2, + nullable: false, + defaultValue: "fr"); + + migrationBuilder.CreateTable( + name: "Countries", + columns: table => new + { + Code = table.Column(type: "character varying(2)", maxLength: 2, nullable: false), + DisplayName = table.Column(type: "character varying(64)", maxLength: 64, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Countries", x => x.Code); + }); + + migrationBuilder.CreateTable( + name: "PerformerCodeInputValidations", + columns: table => new + { + Id = table.Column(type: "bigint", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + CountryCode = table.Column(type: "character varying(2)", maxLength: 2, nullable: false), + RegularExpression = table.Column(type: "character varying(256)", maxLength: 256, nullable: false), + ErrorMessage = table.Column(type: "character varying(128)", maxLength: 128, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PerformerCodeInputValidations", x => x.Id); + table.ForeignKey( + name: "FK_PerformerCodeInputValidations_Countries_CountryCode", + column: x => x.CountryCode, + principalTable: "Countries", + principalColumn: "Code", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.InsertData( + table: "Countries", + columns: new[] { "Code", "DisplayName" }, + values: new object[,] + { + { "en", "England" }, + { "fr", "France" }, + { "pt", "Portugal" } + }); + + migrationBuilder.InsertData( + table: "PerformerCodeInputValidations", + columns: new[] { "Id", "CountryCode", "ErrorMessage", "RegularExpression" }, + values: new object[,] + { + { 1L, "fr", "Le code FR doit contenir entre 9 et 14 chiffres.", "^[0-9]{9,14}$" }, + { 2L, "en", "Le code EN doit contenir entre 8 et 14 caracteres alphanumeriques.", "^[A-Za-z0-9]{8,14}$" }, + { 3L, "pt", "Le code PT doit contenir exactement 9 chiffres.", "^[0-9]{9}$" } + }); + + migrationBuilder.CreateIndex( + name: "IX_PerformerCodeInputValidations_CountryCode", + table: "PerformerCodeInputValidations", + column: "CountryCode"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "PerformerCodeInputValidations"); + + migrationBuilder.DropTable( + name: "Countries"); + + migrationBuilder.DropColumn( + name: "ExerciseCountryCode", + table: "Performers"); + } + } +} diff --git a/src/Yavsc.Org/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Yavsc.Org/Migrations/ApplicationDbContextModelSnapshot.cs index a0295ef6..804a5259 100644 --- a/src/Yavsc.Org/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Yavsc.Org/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1762,19 +1762,6 @@ namespace Yavsc.Migrations b.ToTable("Color"); }); - modelBuilder.Entity("Yavsc.Models.Forms.Form", b => - { - b.Property("Id") - .HasColumnType("text"); - - b.Property("Summary") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Form"); - }); - modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b => { b.Property("UserId") @@ -2997,6 +2984,92 @@ namespace Yavsc.Migrations b.ToTable("CommandForm"); }); + modelBuilder.Entity("Yavsc.Models.Workflow.Country", b => + { + b.Property("Code") + .HasMaxLength(2) + .HasColumnType("character varying(2)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("character varying(64)"); + + b.HasKey("Code"); + + b.ToTable("Countries"); + + b.HasData( + new + { + Code = "fr", + DisplayName = "France" + }, + new + { + Code = "en", + DisplayName = "England" + }, + new + { + Code = "pt", + DisplayName = "Portugal" + }); + }); + + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerCodeInputValidation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CountryCode") + .IsRequired() + .HasMaxLength(2) + .HasColumnType("character varying(2)"); + + b.Property("ErrorMessage") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("character varying(128)"); + + b.Property("RegularExpression") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("CountryCode"); + + b.ToTable("PerformerCodeInputValidations"); + + b.HasData( + new + { + Id = 1L, + CountryCode = "fr", + ErrorMessage = "Le code FR doit contenir entre 9 et 14 chiffres.", + RegularExpression = "^[0-9]{9,14}$" + }, + new + { + Id = 2L, + CountryCode = "en", + ErrorMessage = "Le code EN doit contenir entre 8 et 14 caracteres alphanumeriques.", + RegularExpression = "^[A-Za-z0-9]{8,14}$" + }, + new + { + Id = 3L, + CountryCode = "pt", + ErrorMessage = "Le code PT doit contenir exactement 9 chiffres.", + RegularExpression = "^[0-9]{9}$" + }); + }); + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => { b.Property("PerformerId") @@ -3011,6 +3084,11 @@ namespace Yavsc.Migrations b.Property("Active") .HasColumnType("boolean"); + b.Property("ExerciseCountryCode") + .IsRequired() + .HasMaxLength(2) + .HasColumnType("character varying(2)"); + b.Property("MaxDailyCost") .HasColumnType("integer"); @@ -4321,6 +4399,17 @@ namespace Yavsc.Migrations b.Navigation("Context"); }); + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerCodeInputValidation", b => + { + b.HasOne("Yavsc.Models.Workflow.Country", "Country") + .WithMany() + .HasForeignKey("CountryCode") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Country"); + }); + modelBuilder.Entity("Yavsc.Models.Workflow.PerformerProfile", b => { b.HasOne("Yavsc.Models.Relationship.Location", "OrganizationAddress") diff --git a/src/Yavsc.Org/Services/BlogSpotService.cs b/src/Yavsc.Org/Services/BlogSpotService.cs index 7eac07a1..39e9329f 100644 --- a/src/Yavsc.Org/Services/BlogSpotService.cs +++ b/src/Yavsc.Org/Services/BlogSpotService.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.EntityFrameworkCore; using Yavsc.Blogspot; using Yavsc.Models; +using Yavsc.Models.Access; using Yavsc.Models.Blog; using Yavsc.Server.Exceptions; using Yavsc.Server.Helpers; @@ -97,6 +98,7 @@ public class OldBlogSpotService throw new AuthorizationFailureException(auth); } var pub = await _context.blogSpotPublications.AnyAsync(x => x.BlogpostId == blog.Id); + ScrubAclForViewer(blog, user); return new BlogPostEditViewModel(blog, pub); } @@ -118,6 +120,7 @@ public class OldBlogSpotService { throw new AuthorizationFailureException(auth); } + ScrubAclForViewer(blog, user); foreach (var c in blog.Comments) { c.Author = _context.Users.First(u => u.Id == c.AuthorId); @@ -189,13 +192,14 @@ public class OldBlogSpotService public async Task> Index(ClaimsPrincipal user, string id, int skip = 0, int take = 25) { + string? viewerId = user.Identity?.IsAuthenticated == true ? user.GetUserId() : null; IEnumerable posts; if (user.Identity.IsAuthenticated) { - string viewerId = user.GetUserId(); + string viewerIdNonNull = viewerId!; long[] userCircles = await _context.Circle.Include(c => c.Members). - Where(c => c.Members.Any(m => m.MemberId == viewerId)) + Where(c => c.Members.Any(m => m.MemberId == viewerIdNonNull)) .Select(c => c.Id).ToArrayAsync(); posts = _context.BlogSpot @@ -205,7 +209,7 @@ public class OldBlogSpotService .Include(p => p.Comments) .Where(p => p.ACL == null || p.ACL.Count == 0 - || (p.AuthorId == viewerId) + || (p.AuthorId == viewerIdNonNull) || (userCircles != null && p.ACL.Any(a => userCircles.Contains(a.CircleId))) ); @@ -223,7 +227,11 @@ public class OldBlogSpotService .Select(p => p.BlogPost).ToArray(); } - var data = posts.OrderByDescending(p => p.DateModified) + var materialised = posts.ToList(); + foreach (var post in materialised.OfType()) + ScrubAclForViewer(post, user); + + var data = materialised.OrderByDescending(p => p.DateModified) .Skip(skip) .Take(take); return data; @@ -246,7 +254,11 @@ public class OldBlogSpotService { string? posterId = (await _context.Users.SingleOrDefaultAsync(u => u.UserName == posterName))?.Id ?? null; if (posterId == null) return Array.Empty(); - return _context.UserPosts(posterId, readerId); + var posts = _context.UserPosts(posterId, readerId).ToList(); + var viewerId = string.Equals(readerId, posterId, StringComparison.Ordinal) ? readerId : null; + foreach (var post in posts) + ScrubAclForViewer(post, viewerId); + return posts; } public object? GetTitle(string title) @@ -266,4 +278,39 @@ public class OldBlogSpotService .SingleOrDefaultAsync(x => x.Id == value); } + private static void ScrubAclForViewer(Yavsc.Models.Blog.BlogPost post, ClaimsPrincipal? user) + { + if (!IsOwner(post, user)) + post.ACL = new List(); + } + + private static void ScrubAclForViewer(Yavsc.Models.Blog.BlogPost post, string? viewerId) + { + if (!string.Equals(post.AuthorId, viewerId, StringComparison.Ordinal) + && !string.Equals(post.Author?.Id, viewerId, StringComparison.Ordinal)) + post.ACL = new List(); + } + + private static bool IsOwner(Yavsc.Models.Blog.BlogPost post, ClaimsPrincipal? user) + { + if (user?.Identity?.IsAuthenticated != true) return false; + + var viewerId = user.GetUserId(); + var viewerName = user.GetUserName() ?? user.Identity?.Name; + + if (!string.IsNullOrWhiteSpace(viewerId)) + { + if (string.Equals(post.AuthorId, viewerId, StringComparison.Ordinal)) return true; + if (string.Equals(post.Author?.Id, viewerId, StringComparison.Ordinal)) return true; + } + + if (!string.IsNullOrWhiteSpace(viewerName)) + { + if (string.Equals(post.AuthorId, viewerName, StringComparison.OrdinalIgnoreCase)) return true; + if (string.Equals(post.Author?.UserName, viewerName, StringComparison.OrdinalIgnoreCase)) return true; + } + + return false; + } + } diff --git a/src/Yavsc.Org/Views/Manage/Index.cshtml b/src/Yavsc.Org/Views/Manage/Index.cshtml index 2624c284..13b45339 100755 --- a/src/Yavsc.Org/Views/Manage/Index.cshtml +++ b/src/Yavsc.Org/Views/Manage/Index.cshtml @@ -2,6 +2,9 @@ @using System.Security.Claims @{ ViewBag.Title = "Manage your account"; + var avatarSrc = string.IsNullOrWhiteSpace(Model.UserName) + ? Yavsc.Constants.DefaultAvatar + : $"{Yavsc.Constants.AvatarsPath}/{Model.UserName}.s.png"; }

@ViewBag.Title

@@ -11,15 +14,15 @@
UserName:
- -
+ +
@Model.UserName [modifier]
E-mail
- -
+ +
@Model.EMail @if (Model.EmailConfirmed) { @@ -46,22 +49,22 @@
FullName:
-
- @Html.DisplayFor(m=>m.FullName) +
+ @Html.DisplayFor(m=>m.FullName) [modifier]
@if (Model.Roles.Count()>0) {
Roles:
-
+
@string.Join(", ",Model.Roles)
}
Password:
[@{if (Model.HasPassword) - {Change} else - {Create}}]
External Logins:
@@ -76,19 +79,19 @@ { Html.DisplayText("Set"); } - else + else { Html.DisplayText("Modify"); } } ] - +
Avatar:
- + [Modify] -
+
Vos cercles
(WIP) Ajouter suprimer des cercles @@ -115,8 +118,8 @@ Html.DisplayText("Modify");
Your posts:
@Model.PostsCounter
- -
TwoFactorAuthentication:
+ +
TwoFactorAuthentication:
@if (Model.TwoFactor) { @@ -139,19 +142,19 @@ Html.DisplayText("Modify"); } }
-
Calendar
-
+
Calendar
+
@Html.DisplayText(Model.HasDedicatedCalendar?"Yes":"No" ) @{ - if (Model.HasDedicatedCalendar) { + if (Model.HasDedicatedCalendar) { : @Model.DedicatedCalendarId } } [Select a Google calendar]
-
Credits:
-
+
Credits:
+
@(Model.Balance?.Credits ?? 0) € [Manage]
@@ -162,9 +165,9 @@ Html.DisplayText("Modify"); @if (Model.DiskQuota>0) { - @(((double)Model.DiskUsage/Model.DiskQuota).ToString("%#0")) : + @(((double)Model.DiskUsage/Model.DiskQuota).ToString("%#0")) : - } + } @(Model.DiskUsage.ToString("0,#")) / @(Model.DiskQuota.ToString("0,#")) diff --git a/src/Yavsc.Org/Views/Manage/SetActivity.cshtml b/src/Yavsc.Org/Views/Manage/SetActivity.cshtml index 48690359..19836110 100644 --- a/src/Yavsc.Org/Views/Manage/SetActivity.cshtml +++ b/src/Yavsc.Org/Views/Manage/SetActivity.cshtml @@ -1,4 +1,5 @@ @model PerformerProfile +@using System.Text.Json @{ ViewBag.Title = "Your performer profile"; } @section header {