Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 52de07ce23 | |||
| 117c2ff2e3 | |||
| a98ea3df37 | |||
| f1a9b42930 | |||
| 0b4874e94d | |||
| d70925b812 | |||
| f8fc4d6bd9 | |||
| 6ca91cbd3b | |||
| 8865bf51e6 | |||
| d1a980d1c2 | |||
| fdcf8df518 | |||
| 977e74f669 | |||
| a620833550 | |||
| fcfb16fc5b | |||
| b00e92bdd3 | |||
| 1aa43a5356 | |||
| 51de96c797 | |||
| 0ee82c8b62 | |||
| 111f37a0c9 | |||
| 5fbdda1983 | |||
| b301c543bb | |||
| 3053c09522 | |||
| 52399b35d9 | |||
| 748289b61a | |||
| 2d0e9de155 | |||
| a510b2ca73 | |||
| d0a49322e1 | |||
| 3e26c12052 | |||
| 6c32110288 |
@@ -54,8 +54,68 @@
|
|||||||
- **Pattern**: Retirer de composer.json + bundles.php + supprimer config YAML + templates
|
- **Pattern**: Retirer de composer.json + bundles.php + supprimer config YAML + templates
|
||||||
- **Learning**: API Platform ne requiert PAS twig, c'est juste suggéré pour Swagger UI
|
- **Learning**: API Platform ne requiert PAS twig, c'est juste suggéré pour Swagger UI
|
||||||
|
|
||||||
|
## Session 2026-06-19 (LST-56 / 0.1 — Socle back modular monolith)
|
||||||
|
|
||||||
|
### Contexte
|
||||||
|
- Ticket exécuté via plan TDD dédié (`docs/superpowers/plans/2026-06-19-lst-56-socle-back.md`) délégué à un sous-agent (contexte isolé), pilotage MCP/chrono/vérif depuis la session principale.
|
||||||
|
- 4 tâches, 14 nouveaux tests (110 total, 216 assertions, vert), 4 commits (un par tâche).
|
||||||
|
|
||||||
|
### Patterns
|
||||||
|
- **Strangler 100 % additif** : nouveau noyau `src/Shared/` (Domain/Contract, Domain/Module, Domain/Sidebar, Domain/Trait, Application, Infrastructure/{ApiPlatform,Doctrine,Security,Database}) sans toucher au métier — `make test` reste vert sans migration.
|
||||||
|
- **Endpoints DTO purs** : logique métier dans classes pures testées unitairement (`ModuleRegistry`, `SidebarFilter`), exposées par Providers API Platform minces (`ModulesProvider`/`SidebarProvider`) sur des Resources DTO.
|
||||||
|
- **resolve_target_entities** : contrat `Shared\Domain\Contract\UserInterface` mappé sur `App\Entity\User` (sera re-pointé vers `Module\Core\User` en 1.1). Inert tant qu'aucune entité n'utilise le trait.
|
||||||
|
|
||||||
|
### Gotchas
|
||||||
|
- **API Platform 4 découvre les Resources sous `src/Shared/...` sans config `mapping.paths`** — le 404 anticipé dans le plan ne s'est pas produit, aucun ajout dans `api_platform.yaml` nécessaire.
|
||||||
|
- **Hook pre-commit php-cs-fixer** normalise le style du code fourni dans le plan : `\DateTimeImmutable`→`DateTimeImmutable` importé, FQN→`use`, `static::createClient()`→`self::`. Pur style, tests inchangés. Ne pas lutter contre.
|
||||||
|
- **`config/reference.php`** : fichier auto-généré qui apparaît modifié dans `git status` — ne jamais le committer.
|
||||||
|
|
||||||
|
### Time tracking
|
||||||
|
- Le sous-agent a stoppé lui-même le timer d'implémentation (id 1005, 35 min) — garder le time-tracking sur la session principale pour rester maître du chrono si un sous-agent a accès aux tools MCP lesstime.
|
||||||
|
|
||||||
|
## Session 2026-06-19 (LST-62 / 0.2 — Socle front : shell + auto-détection layers Nuxt)
|
||||||
|
|
||||||
|
### Contexte
|
||||||
|
- Plan TDD dédié (`docs/superpowers/plans/2026-06-19-lst-62-socle-front.md`), 7 tasks. Exécution en 3 sous-agents (Task 1 back ; Tasks 2-4 fondations front ; Tasks 5-7 middlewares/layout/i18n), pilotage chrono/MCP/vérif sur la session principale.
|
||||||
|
- 7 commits + 1 commit doc de correction du plan. Back : 115 tests verts (110 + 5 nouveaux cas gate rôle).
|
||||||
|
|
||||||
|
### Patterns
|
||||||
|
- **Gate de rôle additif dans la sidebar** : clé `roles` optionnelle sur section/item dans `config/sidebar.php` ; `SidebarFilter::filter($sections, $activeModuleIds, $activeRoles = [])` masque sans polluer `disabledRoutes` (réservé au filtrage par module). `SidebarProvider` injecte `Symfony\Bundle\SecurityBundle\Security` et passe `array_values($user->getRoles())`. ROLE_ADMIN seulement (pas le RBAC fin, qui viendra en 1.1/1.2).
|
||||||
|
- **Layout front aligné Starseed** (vérifié dans le code Starseed) : `srcDir: '.'`, `dir.layouts/middleware → app/`, code transverse auto-importé sous `shared/{composables,stores,utils}` via `imports.dirs` EXPLICITE, scan `readdirSync('modules/')` → `extends` + dossiers `modules/*/composables` ajoutés dynamiquement à `imports.dirs`. `useApi`/`auth`/`ui` déplacés par `git mv` (historique préservé) ; `timer.ts`/`mail.ts` restent dans `stores/` (métier non migré).
|
||||||
|
- **Singletons module-level** : `useSidebar`/`useModules` portent leur état en `ref` au niveau module ; reset explicite au logout depuis `auth.global.ts` (l'approche Starseed via callback `onAuthSessionCleared()` est une alternative non retenue ici).
|
||||||
|
|
||||||
|
### Gotchas
|
||||||
|
- **`nuxt typecheck` n'est PAS un gate vert sur ce stack** : le baseline Lesstime est rouge (~230 lignes `error TS`) et la RÉFÉRENCE Starseed (même Nuxt 4.3.1, même layout) ship en prod avec **325 erreurs**. Classes structurelles tolérées : `Cannot find name 'ref'/'useApi'/'useRoute'/'navigateTo'/'defineStore'…` dans `shared/` (Nuxt 4 type `shared/` sous un `tsconfig.shared.json` isolé sans les globals d'auto-import, alors que `imports.dirs` les expose au RUNTIME — vérifié dans `.nuxt/imports.d.ts`), erreurs `nuxt.config.ts` (`node:fs`/`process`/`__dirname`, pas de `@types/node`, compilé au runtime par Nuxt), `useApi.ts` 'Property url'. **Le vrai gate** = zéro `Cannot find module '~/shared/…'` (= vrai import cassé) + auto-imports présents dans `.nuxt/imports.d.ts` + smoke runtime. Un sous-agent consciencieux s'est arrêté à tort sur ces erreurs ("bloqueur irréductible") → toujours vérifier le gate contre la réf Starseed avant de conclure à un blocage.
|
||||||
|
- **Vérif backend live > typecheck front** : le gate de rôle a été prouvé via curl réel (`/api/login_check` → cookie BEARER → `GET /api/sidebar`) : `alice` (ROLE_USER) n'a que la section générale, `admin` (ROLE_ADMIN) a Administration, non-auth = 401. Plus fiable que le typecheck sur ce stack.
|
||||||
|
- **i18n `fr.json`** : une clé racine `sidebar` préexistait (avec un `myTasks` orphelin) → fusionner les sous-namespaces plutôt que dupliquer la clé racine (JSON invalide sinon).
|
||||||
|
|
||||||
|
### Statut / time tracking
|
||||||
|
- Ticket laissé en **"En attente de validation" (4)**, pas "Terminé" : smoke visuel front (dev server + navigateur) et sign-off du **délta cosmétique d'ordre de sidebar** (décision 3 du plan) relèvent du PO. Implémentation + AC API validés.
|
||||||
|
- Time-tracking 100 % sur la session principale cette fois (consigne des sous-agents : ne jamais toucher aux outils `mcp__lesstime__*`) — respecté.
|
||||||
|
|
||||||
|
## Session 2026-06-19 (LST-63 / 1.1 — Module Core : identité User/Auth/JWT + Notifications + layer front)
|
||||||
|
|
||||||
|
### Contexte
|
||||||
|
- Plan TDD dédié (`docs/superpowers/plans/2026-06-19-lst-63-module-core.md`, 7 tasks / 6 phases A→F). Exécution : Phases A/B (1 sous-agent combiné), C (1 sous-agent), D (1 sous-agent), E + F faites en direct par la session principale (tâches courtes). Pilotage chrono/MCP/vérif + re-vérif login après chaque phase touchant l'auth sur la session principale.
|
||||||
|
- 5 commits impl (`6ca91cb` A, `f8fc4d6`+`d70925b` B, `0b4874e` C, `f1a9b42` D, `a98ea3d` E, `117c2ff` F) + plan `8865bf5`. Tests : 110→120 verts. Timer impl 1012 = 43 min.
|
||||||
|
|
||||||
|
### Patterns
|
||||||
|
- **Move d'entité « strangler » sans migration** : `git mv` `src/Entity/User.php` → `src/Module/Core/Domain/Entity/User.php` (table + colonnes + backticks VERBATIM) ; mapping Doctrine `Core` ajouté (dir `src/Module/Core/Domain/Entity`, prefix `App\Module\Core\Domain\Entity`) à côté de `App` ; `resolve_target_entities: UserInterface → Core\User`. `migrations:diff` reste vide (hors dérive préexistante `messenger_messages`) → AUCUNE migration. Idem Notification en Phase D.
|
||||||
|
- **Alias temporaire pour découpler le move des relations** : Phase B pose un `class_alias(App\Entity\User::class → Core\User)` (fichier `_compat_user_alias.php` en `autoload.files`, exclu de l'autowiring `App\:` via `exclude` services.yaml + `notPath` php-cs-fixer). Permet de relier d'abord les 8 relations d'entités au CONTRAT `UserInterface::class` (resolver propre) ; l'alias n'est qu'un pont de type-hint PHP. Phase C retire l'alias EN DERNIER, seulement quand `grep App\Entity\User` est vide.
|
||||||
|
- **Règle contrat-vs-concret pour migrer les consommateurs** (Phase C, ~50 fichiers) : type-hint `App\Shared\Domain\Contract\UserInterface` si le fichier n'appelle que les méthodes de lecture du contrat / instanceof / type DQL ; FQCN concret `App\Module\Core\Domain\Entity\User` si besoin de getters HR, `apiToken`, `avatarFileName`, setters, `new User()`. Les deux éliminent `App\Entity\User`. Collision de nom avec `Symfony\...\UserInterface` → aliaser en `SharedUserInterface`.
|
||||||
|
- **Notifier (Phase D)** : `NotifierInterface` (Shared) = API publique inter-modules ; impl `Notifier` (Core) persiste + flush. `TaskNotificationListener` appelle `notify()` UNIQUEMENT en `postFlush` (jamais `onFlush` — le flush interne y est dangereux). Comportement identique conservé.
|
||||||
|
- **Layer front d'un module (Phase F)** : `frontend/modules/core/nuxt.config.ts` (`export default defineNuxtConfig({})`) + `git mv` des pages d'identité sous `modules/core/pages/`. Les imports `~/...` (alias srcDir) survivent au déplacement ; seuls les imports relatifs/par chemin casseraient. Les URLs (`/login`, `/profile`) restent identiques (fusion auto des `pages/` de layers).
|
||||||
|
|
||||||
|
### Gotchas
|
||||||
|
- **`admin.vue` = shell admin MULTI-domaines** (onglets clients/workflows/efforts/gitea/zimbra/mail/absences + 1 onglet `AdminUserTab`) : NE PAS le déplacer entier dans Core (il porterait les admins d'autres modules pas encore extraits). Conformément au plan, en cas de doute on déplace seulement login + profile, on documente. La décomposition de `admin.vue` viendra avec les modules respectifs.
|
||||||
|
- **Vérifier la résolution des routes d'un layer Nuxt en SPA** : `ssr:false` → le dev server renvoie 200 pour N'IMPORTE QUEL chemin (shell SPA, routing client) — un `curl /login` = 200 ne prouve RIEN (testé : `/route-bidon-xyz` = 200 aussi). `nuxt prepare` ne génère pas le manifeste de routes. **Preuve déterministe** = `npx nuxt build` puis `grep 'name:"login"\|name:"profile"' .output/server/chunks/build/client.precomputed.mjs` (+ chunk CSS `profile.*.css` généré). Ne pas perturber un dev server déjà lancé (config `extends`/`imports.dirs` figée au démarrage avant création du layer) → lancer un dev frais sur un port libre pour smoke.
|
||||||
|
- **Aligner le contrat sur la réalité de l'entité, pas l'inverse** : `User::getUsername()` est `?string` (pas `string`) et la méthode réelle est `getIsEmployee(): bool` (pas `isEmployee()`). Le plan écrivait `isEmployee()` — le contrat existant était déjà correct, aucun changement. Toujours lire l'entité avant de figer une signature de contrat.
|
||||||
|
- **Tests fonctionnels qui persistent réellement** (pas de rollback transactionnel ici) : un `NotifierTest` qui crée une notif échoue au 2e run (`2 != 1`) → rendre les données uniques (`uniqid()` sur le titre) pour l'idempotence.
|
||||||
|
|
||||||
## Meta-learnings
|
## Meta-learnings
|
||||||
- **Parallélisation**: Les tickets touchant des fichiers indépendants peuvent tourner en parallèle sans problème
|
- **Parallélisation**: Les tickets touchant des fichiers indépendants peuvent tourner en parallèle sans problème
|
||||||
|
- **Commits concurrents**: NE PAS lancer deux sous-agents qui committent sur le même repo en parallèle (collision `.git/index.lock`) — séquencer.
|
||||||
|
- **Gate de vérif fourni par le plan**: si un plan fixe un seuil (ex "typecheck 0 erreur"), le confronter à la réalité du projet/réf AVANT de bloquer dessus ; corriger le plan si le seuil est faux.
|
||||||
- **MCP status**: Toujours mettre "En cours" AVANT de commencer, "Terminé" APRÈS validation
|
- **MCP status**: Toujours mettre "En cours" AVANT de commencer, "Terminé" APRÈS validation
|
||||||
- **PostgreSQL gotchas**: Tester les queries SQL avec agrégation + locking sur PostgreSQL, pas MySQL
|
- **PostgreSQL gotchas**: Tester les queries SQL avec agrégation + locking sur PostgreSQL, pas MySQL
|
||||||
- **Agents**: Les agents simples (1-3 fichiers) terminent en ~30s, les complexes (22 fichiers) en ~8min
|
- **Agents**: Les agents simples (1-3 fichiers) terminent en ~30s, les complexes (22 fichiers) en ~8min
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Liste ordonnée des modules actifs (classes implémentant App\Shared\Domain\Module\ModuleInterface).
|
||||||
|
* Activer/désactiver un module = ajouter/commenter sa ligne. Exposé par GET /api/modules.
|
||||||
|
*/
|
||||||
|
|
||||||
|
use App\Module\Core\CoreModule;
|
||||||
|
|
||||||
|
return [
|
||||||
|
CoreModule::class,
|
||||||
|
];
|
||||||
@@ -13,6 +13,8 @@ doctrine:
|
|||||||
identity_generation_preferences:
|
identity_generation_preferences:
|
||||||
Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
|
Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
|
||||||
auto_mapping: true
|
auto_mapping: true
|
||||||
|
resolve_target_entities:
|
||||||
|
App\Shared\Domain\Contract\UserInterface: App\Module\Core\Domain\Entity\User
|
||||||
mappings:
|
mappings:
|
||||||
App:
|
App:
|
||||||
type: attribute
|
type: attribute
|
||||||
@@ -20,6 +22,11 @@ doctrine:
|
|||||||
dir: '%kernel.project_dir%/src/Entity'
|
dir: '%kernel.project_dir%/src/Entity'
|
||||||
prefix: 'App\Entity'
|
prefix: 'App\Entity'
|
||||||
alias: App
|
alias: App
|
||||||
|
Core:
|
||||||
|
type: attribute
|
||||||
|
is_bundle: false
|
||||||
|
dir: '%kernel.project_dir%/src/Module/Core/Domain/Entity'
|
||||||
|
prefix: 'App\Module\Core\Domain\Entity'
|
||||||
controller_resolver:
|
controller_resolver:
|
||||||
auto_mapping: false
|
auto_mapping: false
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ security:
|
|||||||
providers:
|
providers:
|
||||||
app_user_provider:
|
app_user_provider:
|
||||||
entity:
|
entity:
|
||||||
class: App\Entity\User
|
class: App\Module\Core\Domain\Entity\User
|
||||||
property: username
|
property: username
|
||||||
|
|
||||||
firewalls:
|
firewalls:
|
||||||
@@ -62,6 +62,8 @@ security:
|
|||||||
- { path: ^/api/docs, roles: PUBLIC_ACCESS }
|
- { path: ^/api/docs, roles: PUBLIC_ACCESS }
|
||||||
# Version de l'application en public
|
# Version de l'application en public
|
||||||
- { path: ^/api/version, roles: PUBLIC_ACCESS, methods: [ GET ] }
|
- { path: ^/api/version, roles: PUBLIC_ACCESS, methods: [ GET ] }
|
||||||
|
# Liste des modules actifs en public (consommée au boot du front)
|
||||||
|
- { path: ^/api/modules, roles: PUBLIC_ACCESS, methods: [ GET ] }
|
||||||
- { path: ^/_mcp, roles: PUBLIC_ACCESS, methods: [ GET ] }
|
- { path: ^/_mcp, roles: PUBLIC_ACCESS, methods: [ GET ] }
|
||||||
- { path: ^/_mcp, roles: IS_AUTHENTICATED_FULLY }
|
- { path: ^/_mcp, roles: IS_AUTHENTICATED_FULLY }
|
||||||
# Mail : requiert authentification (le check ROLE_USER est dans MailAccessChecker)
|
# Mail : requiert authentification (le check ROLE_USER est dans MailAccessChecker)
|
||||||
|
|||||||
@@ -66,3 +66,7 @@ services:
|
|||||||
$uploadDir: '%absence_justification_upload_dir%'
|
$uploadDir: '%absence_justification_upload_dir%'
|
||||||
|
|
||||||
App\Service\Share\FileSource: '@App\Service\Share\SmbFileSource'
|
App\Service\Share\FileSource: '@App\Service\Share\SmbFileSource'
|
||||||
|
|
||||||
|
App\Module\Core\Domain\Repository\UserRepositoryInterface: '@App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository'
|
||||||
|
|
||||||
|
App\Shared\Domain\Contract\NotifierInterface: '@App\Module\Core\Infrastructure\Notifier'
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Définition de la sidebar (sections + items) — navigation GLOBALE uniquement.
|
||||||
|
* Filtrée par SidebarFilter : `module` (route ajoutée à disabledRoutes si module inactif),
|
||||||
|
* `roles` (section ou item masqué si l'utilisateur n'a aucun des rôles listés ; gate minimal,
|
||||||
|
* le RBAC fin par permission arrive en #1.2).
|
||||||
|
* Les items contextuels (Kanban/Groupes/Archives), feature-flag (Documents, Mail) et user-flag
|
||||||
|
* (Mes absences) restent rendus côté layout, hors de cet endpoint.
|
||||||
|
* Les labels sont des clés i18n (sidebar.<domaine>.<item>).
|
||||||
|
*/
|
||||||
|
return [
|
||||||
|
[
|
||||||
|
'label' => 'sidebar.general.section',
|
||||||
|
'icon' => 'mdi:view-dashboard-outline',
|
||||||
|
'items' => [
|
||||||
|
['label' => 'sidebar.general.dashboard', 'to' => '/', 'icon' => 'mdi:view-dashboard-outline'],
|
||||||
|
['label' => 'sidebar.general.myTasks', 'to' => '/my-tasks', 'icon' => 'mdi:clipboard-check-outline'],
|
||||||
|
['label' => 'sidebar.general.projects', 'to' => '/projects', 'icon' => 'mdi:folder-outline'],
|
||||||
|
['label' => 'sidebar.general.timeTracking', 'to' => '/time-tracking', 'icon' => 'mdi:calendar-edit-outline'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'label' => 'sidebar.admin.section',
|
||||||
|
'icon' => 'mdi:cog-outline',
|
||||||
|
'roles' => ['ROLE_ADMIN'],
|
||||||
|
'items' => [
|
||||||
|
['label' => 'sidebar.admin.teamAbsences', 'to' => '/team-absences', 'icon' => 'mdi:calendar-account-outline'],
|
||||||
|
['label' => 'sidebar.admin.administration', 'to' => '/admin', 'icon' => 'mdi:cog-outline'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
];
|
||||||
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.4.29'
|
app.version: '0.4.30'
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,976 @@
|
|||||||
|
# LST-62 (0.2) — Socle front : shell + auto-détection des layers Nuxt — Implementation Plan
|
||||||
|
|
||||||
|
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||||
|
|
||||||
|
**Goal:** Poser l'ossature frontend modulaire (shell `app/`, code partagé `shared/`, auto-détection des layers `modules/*/`, sidebar dynamique alimentée par `/api/sidebar`, redirection des routes désactivées) **sans déplacer aucune page métier** — l'app reste « plate » et la navigation ne régresse pas.
|
||||||
|
|
||||||
|
**Architecture:** On s'aligne sur le pattern Starseed : `srcDir: '.'`, layouts/middleware sous `frontend/app/`, composables/stores transverses sous `frontend/shared/` (auto-importés via `imports.dirs`), et un scan `readdirSync('modules/')` qui ajoute chaque `modules/*/` à `extends`. Le backend `/api/modules` + `/api/sidebar` existe déjà (LST-56). On ajoute un **gate de rôle minimal** côté `SidebarProvider`/`SidebarFilter` (ROLE_ADMIN) pour préserver la visibilité de l'Administration sans attendre le RBAC fin (#1.2). Les items **contextuels** (Kanban/Groupes/Archives), **feature-flag** (Documents, Mail) et **user-flag** (Mes absences) restent rendus côté layout, hors `/api/sidebar`.
|
||||||
|
|
||||||
|
**Tech Stack:** Nuxt 4.3, Vue 3.5, Pinia 3, @malio/layer-ui 1.7, @nuxtjs/i18n 10, @nuxt/icon — côté back PHP 8.4 / Symfony 8 / API Platform 4 / PHPUnit 13.
|
||||||
|
|
||||||
|
## Global Constraints
|
||||||
|
|
||||||
|
- **Aucune page métier déplacée** : `frontend/pages/` reste tel quel ; on ne crée AUCUN `frontend/modules/<x>/pages/` peuplé en 0.2 (le dossier `modules/` est créé vide pour le scan).
|
||||||
|
- **Zéro régression de navigation** : tous les liens actuels restent atteignables et correctement gardés (admin reste admin-only).
|
||||||
|
- **Auto-import Nuxt** : les composants/pages référencent les composables/stores **par nom** (`useApi()`, `useAuthStore()`), jamais par chemin → déplacer un fichier entre deux dossiers auto-scannés est transparent. Toujours le vérifier par un `typecheck` après déplacement.
|
||||||
|
- **Commits** : format `<type>(<scope>) : <message>` (espaces autour du `:`). **Jamais** de mention IA/Claude/Anthropic (message, body, trailers).
|
||||||
|
- **PHP** : `declare(strict_types=1);` en tête ; tests via `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit …`.
|
||||||
|
- **TS** : strict, 4 espaces d'indentation, pas de `any`.
|
||||||
|
- **Pas de migration BDD** dans ce lot (aucune entité touchée).
|
||||||
|
|
||||||
|
## Décisions de conception (actées avec le PO)
|
||||||
|
|
||||||
|
1. **Gate de rôle minimal côté back** : les items/sections réservés (`/team-absences`, `/admin`) portent une clé `roles` dans `config/sidebar.php` ; `SidebarProvider` passe les rôles de l'utilisateur courant à `SidebarFilter` qui masque ce qui n'est pas autorisé. Ce n'est **pas** le RBAC fin (#1.2) — juste ROLE_ADMIN/ROLE_USER.
|
||||||
|
2. **Items contextuels / feature-flag / user-flag hors `/api/sidebar`** : Kanban/Groupes/Archives (contexte `currentProjectId`), Documents (`shareEnabled`), Mail (+ badge non lus), Mes absences (`isEmployee`) restent rendus par le layout comme aujourd'hui.
|
||||||
|
3. **Délta cosmétique assumé** : la sidebar dynamique regroupe le Tableau de bord avec « Mes tâches / Projets / Suivi de temps » sous un même en-tête, et le bloc statique (contextuel/flag/Mes absences) s'insère après cette première section. Léger réordonnancement visuel, **à valider**, harmonisé en #60 (Finition Malio). Aucun lien perdu.
|
||||||
|
|
||||||
|
## Vérification (pas de runner de tests JS dans ce projet)
|
||||||
|
|
||||||
|
- **Back (Task 1)** : vraie TDD PHPUnit.
|
||||||
|
- **Front (Tasks 2-7)** : la verif = `typecheck` Nuxt (en LECTURE différentielle, cf. ci-dessous) + smoke test runtime. Commandes :
|
||||||
|
- Typecheck : `cd /home/matthieu/dev_malio/Lesstime/frontend && npx nuxt typecheck`
|
||||||
|
- Runtime : dev server `make dev-nuxt` (port 3002, proxy `/api` → nginx) ; vérifier manuellement la navigation + `curl` des endpoints via nginx (`http://localhost:8082/api/...`). Les containers sont up.
|
||||||
|
|
||||||
|
> **⚠️ `nuxt typecheck` n'est PAS un gate vert sur ce projet (constat 2026-06-19).** Le baseline Lesstime est déjà rouge (~230 lignes `error TS`), et le projet de référence **Starseed (même Nuxt 4.3.1, même layout `shared/` + `srcDir: '.'`) ship en prod avec 325 erreurs `error TS`**. Ces erreurs sont des classes structurelles attendues, pas des régressions :
|
||||||
|
> - dans `shared/composables/*` et `shared/stores/*` : `Cannot find name 'ref'/'useApi'/'useRoute'/'navigateTo'/'defineStore'/'useToast'/'useNuxtApp'…` — Nuxt 4 type le dossier `shared/` sous un `tsconfig.shared.json` isolé sans les globals d'auto-import, alors que `imports.dirs` les rend bien disponibles au RUNTIME (vérifié dans `.nuxt/imports.d.ts`). Starseed a exactement ces 15 erreurs et fonctionne.
|
||||||
|
> - dans `nuxt.config.ts` : `node:fs`/`node:path`/`__dirname`/`process` (pas de `@types/node` — comme Starseed) ; ce fichier est compilé par Nuxt au runtime, pas par `tsc`.
|
||||||
|
> - dans `useApi.ts` : `Property 'url' does not exist…` (préexistant, code forké de Starseed).
|
||||||
|
>
|
||||||
|
> **Le vrai gate front** = (1) **ZÉRO erreur `Cannot find module '~/shared/…'` / chemin cassé** (sinon un import a vraiment été cassé par un déplacement) ; (2) les auto-imports attendus présents dans `.nuxt/imports.d.ts` ; (3) smoke runtime sur le dev server. Ne JAMAIS s'arrêter sur les classes d'erreurs structurelles ci-dessus — elles sont identiques à la référence Starseed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Backend — gate de rôle dans la sidebar (`roles`) + config complète
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `src/Shared/Domain/Sidebar/SidebarFilter.php` (signature + gate `roles`)
|
||||||
|
- Modify: `src/Shared/Infrastructure/ApiPlatform/State/SidebarProvider.php` (injecter `Security`, passer les rôles)
|
||||||
|
- Modify: `config/sidebar.php` (navigation globale + section Administration gated ROLE_ADMIN ; retrait de `/absences` qui reste client-side)
|
||||||
|
- Modify: `tests/Unit/Shared/Sidebar/SidebarFilterTest.php` (adapter à la nouvelle signature + cas `roles`)
|
||||||
|
- Modify: `tests/Functional/Shared/SidebarEndpointTest.php` (vérifier le gate admin)
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Produces : `SidebarFilter::filter(array $sections, array $activeModuleIds, array $activeRoles = []): array`. Règles ajoutées : une **section** ou un **item** portant une clé `roles` (non vide) n'est conservé que si `$activeRoles` contient au moins un des rôles listés ; sinon la section/l'item est retiré (les `to` des items retirés **par rôle** ne sont PAS ajoutés à `disabledRoutes` — `disabledRoutes` reste réservé au filtrage **par module**, qui pilote la redirection front). Les clés internes `module` et `roles` sont retirées de la sortie.
|
||||||
|
- Consumes : `Symfony\Bundle\SecurityBundle\Security` (rôles via `getUser()`).
|
||||||
|
|
||||||
|
- [ ] **Step 1: Adapter le test unitaire existant + ajouter les cas `roles`**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `tests/Unit/Shared/Sidebar/SidebarFilterTest.php` par :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\Unit\Shared\Sidebar;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Sidebar\SidebarFilter;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class SidebarFilterTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testItemWithoutModuleIsAlwaysVisible(): void
|
||||||
|
{
|
||||||
|
$sections = [
|
||||||
|
['label' => 'sidebar.core.section', 'icon' => 'mdi:home', 'items' => [
|
||||||
|
['label' => 'sidebar.core.dashboard', 'to' => '/', 'icon' => 'mdi:view-dashboard'],
|
||||||
|
]],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = SidebarFilter::filter($sections, [], ['ROLE_USER']);
|
||||||
|
|
||||||
|
self::assertCount(1, $result['sections']);
|
||||||
|
self::assertSame('/', $result['sections'][0]['items'][0]['to']);
|
||||||
|
self::assertSame([], $result['disabledRoutes']);
|
||||||
|
self::assertArrayNotHasKey('module', $result['sections'][0]['items'][0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testItemWithInactiveModuleIsHiddenAndRouteDisabled(): void
|
||||||
|
{
|
||||||
|
$sections = [
|
||||||
|
['label' => 'sidebar.tt.section', 'icon' => 'mdi:clock', 'items' => [
|
||||||
|
['label' => 'sidebar.tt.timesheet', 'to' => '/time-tracking', 'icon' => 'mdi:clock', 'module' => 'time_tracking'],
|
||||||
|
]],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = SidebarFilter::filter($sections, [], ['ROLE_USER']);
|
||||||
|
|
||||||
|
self::assertSame([], $result['sections']);
|
||||||
|
self::assertSame(['/time-tracking'], $result['disabledRoutes']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testItemWithActiveModuleIsVisible(): void
|
||||||
|
{
|
||||||
|
$sections = [
|
||||||
|
['label' => 'sidebar.tt.section', 'icon' => 'mdi:clock', 'items' => [
|
||||||
|
['label' => 'sidebar.tt.timesheet', 'to' => '/time-tracking', 'icon' => 'mdi:clock', 'module' => 'time_tracking'],
|
||||||
|
]],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = SidebarFilter::filter($sections, ['time_tracking'], ['ROLE_USER']);
|
||||||
|
|
||||||
|
self::assertCount(1, $result['sections']);
|
||||||
|
self::assertSame('/time-tracking', $result['sections'][0]['items'][0]['to']);
|
||||||
|
self::assertSame([], $result['disabledRoutes']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSectionWithRolesIsHiddenWhenRoleMissing(): void
|
||||||
|
{
|
||||||
|
$sections = [
|
||||||
|
['label' => 'sidebar.admin.section', 'icon' => 'mdi:cog', 'roles' => ['ROLE_ADMIN'], 'items' => [
|
||||||
|
['label' => 'sidebar.admin.admin', 'to' => '/admin', 'icon' => 'mdi:cog'],
|
||||||
|
]],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = SidebarFilter::filter($sections, [], ['ROLE_USER']);
|
||||||
|
|
||||||
|
self::assertSame([], $result['sections']);
|
||||||
|
// Filtrage par rôle => PAS de disabledRoutes (réservé au filtrage par module).
|
||||||
|
self::assertSame([], $result['disabledRoutes']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSectionWithRolesIsVisibleWhenRolePresent(): void
|
||||||
|
{
|
||||||
|
$sections = [
|
||||||
|
['label' => 'sidebar.admin.section', 'icon' => 'mdi:cog', 'roles' => ['ROLE_ADMIN'], 'items' => [
|
||||||
|
['label' => 'sidebar.admin.admin', 'to' => '/admin', 'icon' => 'mdi:cog'],
|
||||||
|
]],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = SidebarFilter::filter($sections, [], ['ROLE_USER', 'ROLE_ADMIN']);
|
||||||
|
|
||||||
|
self::assertCount(1, $result['sections']);
|
||||||
|
self::assertSame('/admin', $result['sections'][0]['items'][0]['to']);
|
||||||
|
self::assertArrayNotHasKey('roles', $result['sections'][0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testItemWithRolesIsHiddenWhenRoleMissing(): void
|
||||||
|
{
|
||||||
|
$sections = [
|
||||||
|
['label' => 'sidebar.hr.section', 'icon' => 'mdi:calendar', 'items' => [
|
||||||
|
['label' => 'sidebar.hr.teamAbsences', 'to' => '/team-absences', 'icon' => 'mdi:account-group', 'roles' => ['ROLE_ADMIN']],
|
||||||
|
['label' => 'sidebar.hr.x', 'to' => '/x', 'icon' => 'mdi:x'],
|
||||||
|
]],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = SidebarFilter::filter($sections, [], ['ROLE_USER']);
|
||||||
|
|
||||||
|
self::assertCount(1, $result['sections']);
|
||||||
|
self::assertCount(1, $result['sections'][0]['items']);
|
||||||
|
self::assertSame('/x', $result['sections'][0]['items'][0]['to']);
|
||||||
|
self::assertArrayNotHasKey('roles', $result['sections'][0]['items'][0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Lancer le test, vérifier l'échec**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit tests/Unit/Shared/Sidebar/SidebarFilterTest.php`
|
||||||
|
Expected: FAIL — `filter()` actuel n'accepte que 2 args / ne gère pas `roles` (erreur d'arité ou assertions rouges).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Étendre `SidebarFilter`**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `src/Shared/Domain/Sidebar/SidebarFilter.php` par :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Sidebar;
|
||||||
|
|
||||||
|
final class SidebarFilter
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param list<array{label:string, icon:string, roles?:list<string>, items: list<array{label:string, to:string, icon:string, module?:string, roles?:list<string>}>}> $sections
|
||||||
|
* @param list<string> $activeModuleIds
|
||||||
|
* @param list<string> $activeRoles
|
||||||
|
*
|
||||||
|
* @return array{sections: list<array{label:string, icon:string, items: list<array{label:string, to:string, icon:string}>}>, disabledRoutes: list<string>}
|
||||||
|
*/
|
||||||
|
public static function filter(array $sections, array $activeModuleIds, array $activeRoles = []): array
|
||||||
|
{
|
||||||
|
$outSections = [];
|
||||||
|
$disabledRoutes = [];
|
||||||
|
|
||||||
|
foreach ($sections as $section) {
|
||||||
|
// Gate de rôle au niveau section (ne pollue pas disabledRoutes : réservé au filtrage module).
|
||||||
|
if (!self::rolesSatisfied($section['roles'] ?? null, $activeRoles)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$items = [];
|
||||||
|
foreach ($section['items'] as $item) {
|
||||||
|
// Gate de rôle au niveau item.
|
||||||
|
if (!self::rolesSatisfied($item['roles'] ?? null, $activeRoles)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filtrage par module actif (pilote la redirection front via disabledRoutes).
|
||||||
|
$module = $item['module'] ?? null;
|
||||||
|
if (null !== $module && !in_array($module, $activeModuleIds, true)) {
|
||||||
|
$disabledRoutes[] = $item['to'];
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$items[] = ['label' => $item['label'], 'to' => $item['to'], 'icon' => $item['icon']];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] !== $items) {
|
||||||
|
$outSections[] = ['label' => $section['label'], 'icon' => $section['icon'], 'items' => $items];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['sections' => $outSections, 'disabledRoutes' => $disabledRoutes];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<string>|null $required
|
||||||
|
* @param list<string> $activeRoles
|
||||||
|
*/
|
||||||
|
private static function rolesSatisfied(?array $required, array $activeRoles): bool
|
||||||
|
{
|
||||||
|
if (null === $required || [] === $required) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($required as $role) {
|
||||||
|
if (in_array($role, $activeRoles, true)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 4: Lancer le test unitaire, vérifier le vert**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit tests/Unit/Shared/Sidebar/SidebarFilterTest.php`
|
||||||
|
Expected: PASS (6 tests).
|
||||||
|
|
||||||
|
- [ ] **Step 5: Injecter les rôles dans `SidebarProvider`**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `src/Shared/Infrastructure/ApiPlatform/State/SidebarProvider.php` par :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\ApiPlatform\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProviderInterface;
|
||||||
|
use App\Shared\Domain\Module\ModuleRegistry;
|
||||||
|
use App\Shared\Domain\Sidebar\SidebarFilter;
|
||||||
|
use App\Shared\Infrastructure\ApiPlatform\Resource\SidebarResource;
|
||||||
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
|
|
||||||
|
final readonly class SidebarProvider implements ProviderInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
#[Autowire('%kernel.project_dir%')]
|
||||||
|
private string $projectDir,
|
||||||
|
private Security $security,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): SidebarResource
|
||||||
|
{
|
||||||
|
/** @var list<class-string> $moduleClasses */
|
||||||
|
$moduleClasses = require $this->projectDir.'/config/modules.php';
|
||||||
|
|
||||||
|
/** @var list<array{label:string, icon:string, roles?:list<string>, items: list<array{label:string, to:string, icon:string, module?:string, roles?:list<string>}>}> $sidebar */
|
||||||
|
$sidebar = require $this->projectDir.'/config/sidebar.php';
|
||||||
|
|
||||||
|
$user = $this->security->getUser();
|
||||||
|
$roles = null !== $user ? $user->getRoles() : [];
|
||||||
|
|
||||||
|
$filtered = SidebarFilter::filter($sidebar, ModuleRegistry::ids($moduleClasses), array_values($roles));
|
||||||
|
|
||||||
|
$dto = new SidebarResource();
|
||||||
|
$dto->sections = $filtered['sections'];
|
||||||
|
$dto->disabledRoutes = $filtered['disabledRoutes'];
|
||||||
|
|
||||||
|
return $dto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 6: Compléter `config/sidebar.php`**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `config/sidebar.php` par (icônes alignées sur le layout actuel ; `/absences` retiré car gardé client-side via `isEmployee`) :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Définition de la sidebar (sections + items) — navigation GLOBALE uniquement.
|
||||||
|
* Filtrée par SidebarFilter : `module` (route ajoutée à disabledRoutes si module inactif),
|
||||||
|
* `roles` (section ou item masqué si l'utilisateur n'a aucun des rôles listés ; gate minimal,
|
||||||
|
* le RBAC fin par permission arrive en #1.2).
|
||||||
|
* Les items contextuels (Kanban/Groupes/Archives), feature-flag (Documents, Mail) et user-flag
|
||||||
|
* (Mes absences) restent rendus côté layout, hors de cet endpoint.
|
||||||
|
* Les labels sont des clés i18n (sidebar.<domaine>.<item>).
|
||||||
|
*/
|
||||||
|
return [
|
||||||
|
[
|
||||||
|
'label' => 'sidebar.general.section',
|
||||||
|
'icon' => 'mdi:view-dashboard-outline',
|
||||||
|
'items' => [
|
||||||
|
['label' => 'sidebar.general.dashboard', 'to' => '/', 'icon' => 'mdi:view-dashboard-outline'],
|
||||||
|
['label' => 'sidebar.general.myTasks', 'to' => '/my-tasks', 'icon' => 'mdi:clipboard-check-outline'],
|
||||||
|
['label' => 'sidebar.general.projects', 'to' => '/projects', 'icon' => 'mdi:folder-outline'],
|
||||||
|
['label' => 'sidebar.general.timeTracking', 'to' => '/time-tracking', 'icon' => 'mdi:calendar-edit-outline'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'label' => 'sidebar.admin.section',
|
||||||
|
'icon' => 'mdi:cog-outline',
|
||||||
|
'roles' => ['ROLE_ADMIN'],
|
||||||
|
'items' => [
|
||||||
|
['label' => 'sidebar.admin.teamAbsences', 'to' => '/team-absences', 'icon' => 'mdi:calendar-account-outline'],
|
||||||
|
['label' => 'sidebar.admin.administration', 'to' => '/admin', 'icon' => 'mdi:cog-outline'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
];
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 7: Renforcer le test fonctionnel sidebar (gate admin)**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `tests/Functional/Shared/SidebarEndpointTest.php` par :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\Functional\Shared;
|
||||||
|
|
||||||
|
use App\Entity\User;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class SidebarEndpointTest extends WebTestCase
|
||||||
|
{
|
||||||
|
public function testSidebarRequiresAuthentication(): void
|
||||||
|
{
|
||||||
|
$client = self::createClient();
|
||||||
|
$client->request('GET', '/api/sidebar');
|
||||||
|
|
||||||
|
self::assertResponseStatusCodeSame(401);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSidebarReturnsSectionsForAuthenticatedUser(): void
|
||||||
|
{
|
||||||
|
$client = self::createClient();
|
||||||
|
$em = self::getContainer()->get('doctrine.orm.entity_manager');
|
||||||
|
|
||||||
|
$user = $em->getRepository(User::class)->findOneBy(['username' => 'alice']);
|
||||||
|
$client->loginUser($user);
|
||||||
|
|
||||||
|
$client->request('GET', '/api/sidebar');
|
||||||
|
|
||||||
|
self::assertResponseIsSuccessful();
|
||||||
|
$data = json_decode($client->getResponse()->getContent(), true);
|
||||||
|
self::assertArrayHasKey('sections', $data);
|
||||||
|
self::assertArrayHasKey('disabledRoutes', $data);
|
||||||
|
self::assertNotEmpty($data['sections']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAdminSectionHiddenForNonAdmin(): void
|
||||||
|
{
|
||||||
|
$client = self::createClient();
|
||||||
|
$em = self::getContainer()->get('doctrine.orm.entity_manager');
|
||||||
|
|
||||||
|
$user = $em->getRepository(User::class)->findOneBy(['username' => 'alice']); // ROLE_USER
|
||||||
|
$client->loginUser($user);
|
||||||
|
|
||||||
|
$client->request('GET', '/api/sidebar');
|
||||||
|
$data = json_decode($client->getResponse()->getContent(), true);
|
||||||
|
$labels = array_column($data['sections'], 'label');
|
||||||
|
|
||||||
|
self::assertNotContains('sidebar.admin.section', $labels);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testAdminSectionVisibleForAdmin(): void
|
||||||
|
{
|
||||||
|
$client = self::createClient();
|
||||||
|
$em = self::getContainer()->get('doctrine.orm.entity_manager');
|
||||||
|
|
||||||
|
$user = $em->getRepository(User::class)->findOneBy(['username' => 'admin']); // ROLE_ADMIN
|
||||||
|
$client->loginUser($user);
|
||||||
|
|
||||||
|
$client->request('GET', '/api/sidebar');
|
||||||
|
$data = json_decode($client->getResponse()->getContent(), true);
|
||||||
|
$labels = array_column($data['sections'], 'label');
|
||||||
|
|
||||||
|
self::assertContains('sidebar.admin.section', $labels);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 8: Lancer la suite complète, vérifier le vert**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`
|
||||||
|
Expected: PASS (les 110 tests précédents adaptés + nouveaux cas). Si `admin`/`alice` n'existent pas en base de test, vérifier les fixtures (`admin`/`admin`, `alice`/`alice` d'après CLAUDE.md).
|
||||||
|
|
||||||
|
- [ ] **Step 9: php-cs-fixer + commit**
|
||||||
|
|
||||||
|
Run: `make php-cs-fixer-allow-risky`
|
||||||
|
```bash
|
||||||
|
git add src/Shared/Domain/Sidebar/SidebarFilter.php src/Shared/Infrastructure/ApiPlatform/State/SidebarProvider.php config/sidebar.php tests/Unit/Shared/Sidebar/SidebarFilterTest.php tests/Functional/Shared/SidebarEndpointTest.php
|
||||||
|
git commit -m "feat(sidebar) : add role gate to sidebar provider and global nav config"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 2: Frontend — types + composables partagés (`useModules`, `useSidebar`)
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `frontend/shared/types/sidebar.ts`
|
||||||
|
- Create: `frontend/shared/composables/useModules.ts`
|
||||||
|
- Create: `frontend/shared/composables/useSidebar.ts`
|
||||||
|
|
||||||
|
> Note : à cette étape `shared/` n'est pas encore dans `imports.dirs` (fait en Task 4). Ces fichiers sont créés ici mais référencés/auto-importés seulement après Task 4 ; le typecheck final de validation se fait donc en fin de Task 4. Cette task se termine sans verif runtime (pur ajout de fichiers).
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Produces :
|
||||||
|
- `useModules(): { activeModuleIds: Ref<string[]>, loaded: Ref<boolean>, loadModules(): Promise<void>, isModuleActive(id: string): boolean, resetModules(): void }`
|
||||||
|
- `useSidebar(): { sections: Ref<SidebarSection[]>, disabledRoutes: Ref<string[]>, loaded: Ref<boolean>, loadSidebar(): Promise<void>, isRouteDisabled(path: string): boolean, resetSidebar(): void }`
|
||||||
|
- `SidebarSection`, `SidebarItem` (types).
|
||||||
|
- Consumes : `useApi()` (auto-importé, déplacé en Task 3 — toujours appelé par nom).
|
||||||
|
|
||||||
|
- [ ] **Step 1: Créer les types**
|
||||||
|
|
||||||
|
`frontend/shared/types/sidebar.ts` :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export type SidebarItem = {
|
||||||
|
label: string
|
||||||
|
to: string
|
||||||
|
icon: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export type SidebarSection = {
|
||||||
|
label: string
|
||||||
|
icon: string
|
||||||
|
items: SidebarItem[]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Créer `useModules`**
|
||||||
|
|
||||||
|
`frontend/shared/composables/useModules.ts` (état singleton au niveau module) :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
const activeModuleIds = ref<string[]>([])
|
||||||
|
const loaded = ref(false)
|
||||||
|
|
||||||
|
export function useModules() {
|
||||||
|
async function loadModules(): Promise<void> {
|
||||||
|
const api = useApi()
|
||||||
|
const data = await api.get<{ modules: string[] }>('/modules', {}, { toast: false })
|
||||||
|
activeModuleIds.value = data.modules ?? []
|
||||||
|
loaded.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function isModuleActive(id: string): boolean {
|
||||||
|
return activeModuleIds.value.includes(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetModules(): void {
|
||||||
|
activeModuleIds.value = []
|
||||||
|
loaded.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
return { activeModuleIds, loaded, loadModules, isModuleActive, resetModules }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
> Vérifier la signature réelle de `useApi().get` (Task 3 / source actuelle) : `get<T>(url, query?, options?)`. L'option `{ toast: false }` doit exister dans `ApiFetchOptions` ; si la clé diffère (ex. `toastSuccessKey`/`toast`), aligner sur la signature réelle de `useApi.ts`. Si aucune option « silencieux » n'existe, passer `{}`.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Créer `useSidebar`**
|
||||||
|
|
||||||
|
`frontend/shared/composables/useSidebar.ts` :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
import type { SidebarSection } from '~/shared/types/sidebar'
|
||||||
|
|
||||||
|
const sections = ref<SidebarSection[]>([])
|
||||||
|
const disabledRoutes = ref<string[]>([])
|
||||||
|
const loaded = ref(false)
|
||||||
|
|
||||||
|
export function useSidebar() {
|
||||||
|
async function loadSidebar(): Promise<void> {
|
||||||
|
const api = useApi()
|
||||||
|
const data = await api.get<{ sections: SidebarSection[]; disabledRoutes: string[] }>(
|
||||||
|
'/sidebar', {}, { toast: false },
|
||||||
|
)
|
||||||
|
sections.value = data.sections ?? []
|
||||||
|
disabledRoutes.value = data.disabledRoutes ?? []
|
||||||
|
loaded.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function isRouteDisabled(path: string): boolean {
|
||||||
|
return disabledRoutes.value.some(
|
||||||
|
(disabled) => path === disabled || path.startsWith(disabled + '/'),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetSidebar(): void {
|
||||||
|
sections.value = []
|
||||||
|
disabledRoutes.value = []
|
||||||
|
loaded.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
return { sections, disabledRoutes, loaded, loadSidebar, isRouteDisabled, resetSidebar }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add frontend/shared/types/sidebar.ts frontend/shared/composables/useModules.ts frontend/shared/composables/useSidebar.ts
|
||||||
|
git commit -m "feat(front) : add shared useModules/useSidebar composables and sidebar types"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 3: Frontend — déplacer `useApi` et les stores transverses vers `shared/`
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Move: `frontend/composables/useApi.ts` → `frontend/shared/composables/useApi.ts`
|
||||||
|
- Move: `frontend/stores/auth.ts` → `frontend/shared/stores/auth.ts`
|
||||||
|
- Move: `frontend/stores/ui.ts` → `frontend/shared/stores/ui.ts`
|
||||||
|
|
||||||
|
> `timer.ts` et `mail.ts` **restent** dans `frontend/stores/` (domaines métier non encore migrés en module). On ne déplace que les deux stores transverses (auth, ui) + `useApi`. La résolution effective (auto-import depuis `shared/`) est activée en Task 4 ; cette task fait les `git mv` et termine par un commit. Le typecheck de validation est en Task 4 (après config).
|
||||||
|
|
||||||
|
- [ ] **Step 1: Déplacer les fichiers (git mv pour préserver l'historique)**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/matthieu/dev_malio/Lesstime/frontend
|
||||||
|
mkdir -p shared/stores
|
||||||
|
git mv composables/useApi.ts shared/composables/useApi.ts
|
||||||
|
git mv stores/auth.ts shared/stores/auth.ts
|
||||||
|
git mv stores/ui.ts shared/stores/ui.ts
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Vérifier qu'aucun import par CHEMIN ne pointe vers les anciens emplacements**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && grep -rn "composables/useApi\|stores/auth\|stores/ui" --include=*.ts --include=*.vue . | grep -v node_modules | grep -v "shared/"`
|
||||||
|
Expected: aucun résultat (tout passe par auto-import). Si un import explicite existe (ex. `from '~/composables/useApi'`), le corriger en `from '~/shared/composables/useApi'` ou retirer l'import (auto-import). Noter chaque correction.
|
||||||
|
|
||||||
|
> `layouts/default.vue` importe actuellement `useAppVersion` depuis `~/composables/useAppVersion` (NON déplacé) — ne pas y toucher ici.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add -A
|
||||||
|
git commit -m "refactor(front) : move useApi and shared stores (auth, ui) to shared/"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 4: Frontend — `nuxt.config.ts` (srcDir, dossiers `app/`, scan des layers, auto-imports)
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `frontend/nuxt.config.ts`
|
||||||
|
- Create: `frontend/modules/.gitkeep` (dossier vide prêt pour le scan)
|
||||||
|
- Move: `frontend/layouts/` → `frontend/app/layouts/` (default.vue, auth.vue)
|
||||||
|
- Move: `frontend/middleware/` → `frontend/app/middleware/` (auth.global.ts, admin.ts, employee.ts)
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Produces : structure `app/{layouts,middleware}`, `modules/` scannable, `shared/*` auto-importé.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Déplacer layouts et middleware sous `app/`**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/matthieu/dev_malio/Lesstime/frontend
|
||||||
|
mkdir -p app modules
|
||||||
|
git mv layouts app/layouts
|
||||||
|
git mv middleware app/middleware
|
||||||
|
touch modules/.gitkeep
|
||||||
|
git add modules/.gitkeep
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Réécrire `nuxt.config.ts`**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `frontend/nuxt.config.ts` par (conserve `vite`/`toast` existants — repris depuis la version actuelle) :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
import { existsSync, readdirSync } from 'node:fs'
|
||||||
|
import { resolve } from 'node:path'
|
||||||
|
|
||||||
|
const modulesDir = resolve(__dirname, 'modules')
|
||||||
|
const moduleDirs = existsSync(modulesDir)
|
||||||
|
? readdirSync(modulesDir, { withFileTypes: true })
|
||||||
|
.filter((d) => d.isDirectory())
|
||||||
|
.map((d) => d.name)
|
||||||
|
: []
|
||||||
|
const moduleLayers = moduleDirs.map((name) => `./modules/${name}`)
|
||||||
|
const moduleComposableDirs = moduleDirs
|
||||||
|
.map((name) => `modules/${name}/composables`)
|
||||||
|
.filter((path) => existsSync(resolve(__dirname, path)))
|
||||||
|
const moduleStoreDirs = moduleDirs
|
||||||
|
.map((name) => `modules/${name}/stores`)
|
||||||
|
.filter((path) => existsSync(resolve(__dirname, path)))
|
||||||
|
|
||||||
|
export default defineNuxtConfig({
|
||||||
|
compatibilityDate: '2025-07-15',
|
||||||
|
devtools: { enabled: false },
|
||||||
|
ssr: false,
|
||||||
|
srcDir: '.',
|
||||||
|
css: ['~/assets/css/app.css', '~/assets/css/dark.css'],
|
||||||
|
app: {
|
||||||
|
baseURL: process.env.NODE_ENV === 'production'
|
||||||
|
? (process.env.NUXT_PUBLIC_APP_BASE || '/')
|
||||||
|
: '/',
|
||||||
|
},
|
||||||
|
extends: ['@malio/layer-ui', ...moduleLayers],
|
||||||
|
modules: [
|
||||||
|
'@nuxtjs/tailwindcss',
|
||||||
|
'@pinia/nuxt',
|
||||||
|
'nuxt-toast',
|
||||||
|
'@nuxtjs/i18n',
|
||||||
|
'@nuxt/icon',
|
||||||
|
],
|
||||||
|
dir: {
|
||||||
|
layouts: 'app/layouts',
|
||||||
|
middleware: 'app/middleware',
|
||||||
|
},
|
||||||
|
imports: {
|
||||||
|
dirs: [
|
||||||
|
'shared/composables',
|
||||||
|
'shared/stores',
|
||||||
|
'shared/utils',
|
||||||
|
'composables',
|
||||||
|
'stores',
|
||||||
|
'utils',
|
||||||
|
...moduleComposableDirs,
|
||||||
|
...moduleStoreDirs,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
pinia: {
|
||||||
|
storesDirs: ['shared/stores/**', 'stores/**', 'modules/*/stores/**'],
|
||||||
|
},
|
||||||
|
runtimeConfig: {
|
||||||
|
public: {
|
||||||
|
apiBase: process.env.NUXT_PUBLIC_API_BASE,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
devServer: {
|
||||||
|
port: 3002,
|
||||||
|
},
|
||||||
|
components: [
|
||||||
|
{ path: '~/components', pathPrefix: false },
|
||||||
|
],
|
||||||
|
// ⬇️ Reprendre VERBATIM les blocs `vite: {...}`, `toast: {...}`, `i18n: {...}`,
|
||||||
|
// `typescript: {...}`, `build: {...}` de l'ancien nuxt.config.ts (inchangés).
|
||||||
|
typescript: { strict: true },
|
||||||
|
build: { transpile: ['@vuepic/vue-datepicker'] },
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
> ⚠️ Les blocs `vite`, `toast`, `i18n` de l'ancienne config ne sont pas réécrits ici : **les recopier à l'identique** depuis la version d'origine (récupérable via `git show HEAD~1:frontend/nuxt.config.ts` après les déplacements). Le `i18n.langDir: 'locales'` reste résolu depuis `i18n/`.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Typecheck complet (valide Tasks 2, 3 et 4)**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && npx nuxt typecheck`
|
||||||
|
Expected: 0 erreur. Pièges probables :
|
||||||
|
- Store non trouvé → vérifier `pinia.storesDirs` inclut bien `shared/stores/**`.
|
||||||
|
- Composable non auto-importé → vérifier `imports.dirs` inclut `shared/composables`.
|
||||||
|
- `~/composables/useApi` cassé → un import explicite a survécu (corriger comme Task 3 Step 2).
|
||||||
|
|
||||||
|
- [ ] **Step 4: Smoke test runtime — l'app boote et la nav existante fonctionne**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime && make dev-nuxt` (ou rebuild SPA selon le workflow). Ouvrir l'app, se connecter (`alice`/`alice`), vérifier que la sidebar **statique actuelle** s'affiche encore et que la navigation marche (le layout n'est pas encore dynamisé — c'est normal). Aucun écran blanc / erreur console bloquante.
|
||||||
|
Expected: app fonctionnelle, identique à avant (les déplacements sont transparents).
|
||||||
|
|
||||||
|
- [ ] **Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add -A
|
||||||
|
git commit -m "feat(front) : modular nuxt config with app/ shell dirs and modules/* layer auto-detection"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 5: Frontend — middlewares (`auth.global.ts` étendu + `modules.global.ts`)
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `frontend/app/middleware/auth.global.ts` (charge sidebar + modules après login ; reset au logout)
|
||||||
|
- Create: `frontend/app/middleware/modules.global.ts` (redirige les routes désactivées)
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Consumes : `useAuthStore()`, `useSidebar()`, `useModules()` (auto-importés).
|
||||||
|
|
||||||
|
- [ ] **Step 1: Étendre `auth.global.ts`**
|
||||||
|
|
||||||
|
Remplace INTÉGRALEMENT `frontend/app/middleware/auth.global.ts` par :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export default defineNuxtRouteMiddleware(async (to) => {
|
||||||
|
const auth = useAuthStore()
|
||||||
|
const isLogin = to.path === '/login'
|
||||||
|
|
||||||
|
if (!auth.checked) {
|
||||||
|
await auth.ensureSession()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isLogin && !auth.isAuthenticated) {
|
||||||
|
return navigateTo('/login')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isLogin && auth.isAuthenticated) {
|
||||||
|
return navigateTo('/')
|
||||||
|
}
|
||||||
|
|
||||||
|
const { loaded: sidebarLoaded, loadSidebar, resetSidebar } = useSidebar()
|
||||||
|
const { loaded: modulesLoaded, loadModules, resetModules } = useModules()
|
||||||
|
|
||||||
|
if (auth.isAuthenticated) {
|
||||||
|
await Promise.all([
|
||||||
|
sidebarLoaded.value ? Promise.resolve() : loadSidebar(),
|
||||||
|
modulesLoaded.value ? Promise.resolve() : loadModules(),
|
||||||
|
])
|
||||||
|
} else {
|
||||||
|
// Logout / session expirée : purge l'état partagé pour le prochain login.
|
||||||
|
resetSidebar()
|
||||||
|
resetModules()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Créer `modules.global.ts`**
|
||||||
|
|
||||||
|
`frontend/app/middleware/modules.global.ts` :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export default defineNuxtRouteMiddleware(async (to) => {
|
||||||
|
const auth = useAuthStore()
|
||||||
|
if (!auth.isAuthenticated) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const { loaded, loadSidebar, isRouteDisabled } = useSidebar()
|
||||||
|
if (!loaded.value) {
|
||||||
|
await loadSidebar()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isRouteDisabled(to.path)) {
|
||||||
|
return navigateTo('/')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
> Ordre des middlewares globaux : Nuxt les exécute par ordre alphabétique de nom de fichier → `auth.global.ts` puis `modules.global.ts`. C'est l'ordre voulu (auth charge la sidebar avant que modules teste les routes désactivées).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Typecheck**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && npx nuxt typecheck`
|
||||||
|
Expected: 0 erreur.
|
||||||
|
|
||||||
|
- [ ] **Step 4: Smoke test — chargement sidebar/modules + redirection**
|
||||||
|
|
||||||
|
Avec le dev server : se connecter (`alice`), ouvrir l'onglet Réseau → confirmer un `GET /api/sidebar` et `GET /api/modules` après login. Vérifier la redirection : ajouter TEMPORAIREMENT dans `config/sidebar.php` un item avec `'module' => 'demo'` (module inactif) et un `'to' => '/demo-disabled'`, recharger, confirmer que `/demo-disabled` apparaît dans `disabledRoutes` (réponse `/api/sidebar`) et qu'y naviguer redirige vers `/`. **Puis retirer l'item de démo** (ne pas committer ce stub).
|
||||||
|
Expected: appels présents, redirection effective.
|
||||||
|
|
||||||
|
- [ ] **Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add frontend/app/middleware/auth.global.ts frontend/app/middleware/modules.global.ts
|
||||||
|
git commit -m "feat(front) : load sidebar/modules after login and redirect disabled routes"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 6: Frontend — layout `default.vue` : sidebar dynamique + items conservés
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `frontend/app/layouts/default.vue`
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Consumes : `useSidebar()` (sections dynamiques traduites), `useUiStore()`, `useAuthStore()`, `useI18n()`, + le reste de la logique existante (timer, mail, refData) conservée VERBATIM.
|
||||||
|
|
||||||
|
> Stratégie : on remplace le bloc statique des items **globaux** (Tableau de bord, Mes tâches, Projets, Suivi de temps, Absences équipe, Administration) par un rendu **dynamique** issu de `useSidebar()`. On **conserve** les `SidebarLink` des items contextuels (Kanban/Groupes/Archives), feature-flag (Documents, Mail + badge) et user-flag (Mes absences) tels quels. Tout le `<script setup>` non lié à la sidebar (timer, drawer, head, mail polling, refData) est conservé à l'identique.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Réécrire le bloc `<nav>` et l'en-tête du `<script setup>` de `frontend/app/layouts/default.vue`**
|
||||||
|
|
||||||
|
Dans le `<template>`, remplace le contenu de `<nav class="flex-1 overflow-hidden" …>…</nav>` (lignes ~40-167 de l'original) par :
|
||||||
|
|
||||||
|
```vue
|
||||||
|
<nav class="flex-1 overflow-hidden" :class="sidebarIsCollapsed ? 'px-1 pb-6' : 'px-4 pb-6'">
|
||||||
|
<!-- Sections dynamiques (/api/sidebar) : navigation globale + sections gated par rôle -->
|
||||||
|
<template v-for="(section, sIndex) in translatedSections" :key="section.label">
|
||||||
|
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
||||||
|
{{ section.label }}
|
||||||
|
</p>
|
||||||
|
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
||||||
|
<SidebarLink
|
||||||
|
v-for="item in section.items"
|
||||||
|
:key="item.to"
|
||||||
|
:to="item.to"
|
||||||
|
:icon="item.icon"
|
||||||
|
:label="item.label"
|
||||||
|
:collapsed="sidebarIsCollapsed"
|
||||||
|
@click="ui.closeMobileSidebar()"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- Items conservés côté client, insérés après la 1re section (cf. décision 3) -->
|
||||||
|
<template v-if="sIndex === 0">
|
||||||
|
<!-- Contextuel projet -->
|
||||||
|
<template v-if="currentProjectId">
|
||||||
|
<SidebarLink :to="`/projects/${currentProjectId}`" icon="mdi:view-column-outline" label="Kanban" :collapsed="sidebarIsCollapsed" sub exact @click="ui.closeMobileSidebar()" />
|
||||||
|
<SidebarLink :to="`/projects/${currentProjectId}/groups`" icon="mdi:tag-multiple-outline" label="Groupes" :collapsed="sidebarIsCollapsed" sub @click="ui.closeMobileSidebar()" />
|
||||||
|
<SidebarLink :to="`/projects/${currentProjectId}/archives`" icon="mdi:archive-outline" label="Archives" :collapsed="sidebarIsCollapsed" sub @click="ui.closeMobileSidebar()" />
|
||||||
|
</template>
|
||||||
|
<!-- Feature-flag : Documents -->
|
||||||
|
<SidebarLink v-if="isDocumentsVisible" to="/documents" icon="mdi:folder-network-outline" :label="$t('sharedFiles.sidebar.title')" :collapsed="sidebarIsCollapsed" @click="ui.closeMobileSidebar()" />
|
||||||
|
<!-- Feature-flag : Mail + badge -->
|
||||||
|
<div v-if="isMailVisible" class="relative">
|
||||||
|
<SidebarLink to="/mail" icon="mdi:email-outline" :label="$t('mail.sidebar.title')" :collapsed="sidebarIsCollapsed" @click="ui.closeMobileSidebar()" />
|
||||||
|
<span
|
||||||
|
v-if="mailStore.globalUnreadCount > 0"
|
||||||
|
class="pointer-events-none absolute right-3 top-1/2 flex h-5 min-w-5 -translate-y-1/2 items-center justify-center rounded-full bg-red-500 px-1 text-xs font-bold text-white"
|
||||||
|
:class="{ 'right-1 top-1 translate-y-0': sidebarIsCollapsed }"
|
||||||
|
:aria-label="`${mailStore.globalUnreadCount} messages non lus`"
|
||||||
|
>
|
||||||
|
{{ mailStore.globalUnreadCount > 99 ? '99+' : mailStore.globalUnreadCount }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<!-- User-flag : Mes absences (isEmployee — non couvert par le gate rôle) -->
|
||||||
|
<SidebarLink v-if="isEmployee" to="/absences" icon="mdi:umbrella-beach-outline" label="Mes absences" :collapsed="sidebarIsCollapsed" @click="ui.closeMobileSidebar()" />
|
||||||
|
</template>
|
||||||
|
</template>
|
||||||
|
</nav>
|
||||||
|
```
|
||||||
|
|
||||||
|
Dans le `<script setup lang="ts">`, **ajoute** en tête (après les `useXxxStore()` existants) :
|
||||||
|
|
||||||
|
```ts
|
||||||
|
const { t } = useI18n()
|
||||||
|
const { sections } = useSidebar()
|
||||||
|
|
||||||
|
const translatedSections = computed(() =>
|
||||||
|
sections.value.map((section) => ({
|
||||||
|
label: t(section.label),
|
||||||
|
icon: section.icon,
|
||||||
|
items: section.items.map((item) => ({
|
||||||
|
label: t(item.label),
|
||||||
|
to: item.to,
|
||||||
|
icon: item.icon,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
**Conserve** tout le reste du `<script setup>` (`isAdmin`, `isEmployee`, `isMailVisible`, `isDocumentsVisible`, `currentProjectId`, `sidebarIsCollapsed`, timer/drawer/head/mail/refData…) et le `<style scoped>` à l'identique. `isAdmin`/`isAbsenceSectionVisible` deviennent inutilisés pour la sidebar (l'admin est gated côté serveur) — si le typecheck signale une variable inutilisée, retirer `isAbsenceSectionVisible` ; garder `isAdmin` s'il sert ailleurs, sinon le retirer aussi.
|
||||||
|
|
||||||
|
- [ ] **Step 2: Typecheck**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && npx nuxt typecheck`
|
||||||
|
Expected: 0 erreur (corriger toute variable / tout import inutilisé signalé).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Smoke test visuel — non-régression de navigation**
|
||||||
|
|
||||||
|
Dev server. Se connecter successivement :
|
||||||
|
- `alice` (ROLE_USER) : sidebar affiche Tableau de bord / Mes tâches / Projets / Suivi de temps (dynamiques), + Documents/Mail si visibles, + Mes absences si employé ; **PAS** de section Administration ni Absences équipe.
|
||||||
|
- `admin` (ROLE_ADMIN) : en plus, section **Administration** avec Absences équipe + Administration.
|
||||||
|
- Entrer dans un projet (`/projects/<id>`) : Kanban/Groupes/Archives apparaissent (contextuel conservé).
|
||||||
|
Expected: tous les liens d'avant atteignables ; gating admin respecté. Noter tout délta visuel (ordre) pour validation PO (cf. décision 3).
|
||||||
|
|
||||||
|
- [ ] **Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add frontend/app/layouts/default.vue
|
||||||
|
git commit -m "feat(front) : render dynamic sidebar from /api/sidebar in default layout"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 7: Frontend — clés i18n `sidebar.*` + vérification bout-en-bout
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `frontend/i18n/locales/fr.json` (ajouter le namespace `sidebar`)
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Consumes : les labels renvoyés par `/api/sidebar` (`sidebar.general.*`, `sidebar.admin.*`) traduits par `t()` dans `translatedSections`.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Repérer la structure du fichier i18n**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && head -20 i18n/locales/fr.json`
|
||||||
|
Objectif : connaître l'indentation et confirmer que c'est un objet JSON imbriqué (ajouter une clé racine `sidebar`).
|
||||||
|
|
||||||
|
- [ ] **Step 2: Ajouter le namespace `sidebar`**
|
||||||
|
|
||||||
|
Ajoute (à la racine de l'objet JSON, en respectant l'indentation existante) :
|
||||||
|
|
||||||
|
```json
|
||||||
|
"sidebar": {
|
||||||
|
"general": {
|
||||||
|
"section": "Gestion de projet",
|
||||||
|
"dashboard": "Tableau de bord",
|
||||||
|
"myTasks": "Mes tâches",
|
||||||
|
"projects": "Projets",
|
||||||
|
"timeTracking": "Suivi de temps"
|
||||||
|
},
|
||||||
|
"admin": {
|
||||||
|
"section": "Administration",
|
||||||
|
"teamAbsences": "Absences équipe",
|
||||||
|
"administration": "Administration"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
> Les libellés reprennent ceux du layout actuel. `sidebar.general.section` = « Gestion de projet » (regroupe désormais le Tableau de bord — délta cosmétique acté, décision 3).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Typecheck + smoke i18n**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && npx nuxt typecheck`
|
||||||
|
Dev server : confirmer que les en-têtes/labels de sidebar s'affichent **traduits** (pas les clés brutes `sidebar.general.*`).
|
||||||
|
Expected: libellés FR corrects.
|
||||||
|
|
||||||
|
- [ ] **Step 4: Vérification bout-en-bout de l'activation/désactivation (AC)**
|
||||||
|
|
||||||
|
Test manuel documenté (aucun module réel en 0.2) :
|
||||||
|
1. Ajouter TEMPORAIREMENT dans `config/sidebar.php` un item avec `'module' => 'demo'`, `'to' => '/projects'` (route existante) dans une section visible.
|
||||||
|
2. `config/modules.php` reste vide (module `demo` inactif) → `GET /api/sidebar` doit lister `/projects` dans `disabledRoutes` et masquer l'item ; naviguer vers `/projects` doit rediriger vers `/`.
|
||||||
|
3. Ajouter une classe `DemoModule implements ModuleInterface { id()='demo' … }` + `config/modules.php` = `[DemoModule::class]` → l'item réapparaît, `/projects` n'est plus dans `disabledRoutes`, la navigation fonctionne.
|
||||||
|
4. **Tout retirer** (item démo + DemoModule + entrée modules.php). Confirmer l'état initial.
|
||||||
|
Documenter le résultat dans le message de fin. **Ne rien committer de ce stub.**
|
||||||
|
|
||||||
|
- [ ] **Step 5: Suite back + cs-fixer (non-régression globale) + commit**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`
|
||||||
|
Expected: vert (inchangé vs Task 1).
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && npx nuxt typecheck` → 0 erreur.
|
||||||
|
```bash
|
||||||
|
git add frontend/i18n/locales/fr.json
|
||||||
|
git commit -m "feat(front) : add sidebar i18n labels"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Acceptance check (après toutes les tasks)
|
||||||
|
|
||||||
|
- [ ] `frontend/app/{layouts,middleware}`, `frontend/shared/{composables,stores,types}`, `frontend/modules/` (vide) en place ; `nuxt.config.ts` scanne `modules/*/`.
|
||||||
|
- [ ] Sidebar **dynamique** alimentée par `/api/sidebar` pour la nav globale ; gate ROLE_ADMIN effectif (admin-only invisible pour `alice`).
|
||||||
|
- [ ] Route d'un module désactivé → **redirigée** vers `/` (vérifié via le stub démo).
|
||||||
|
- [ ] **Aucune page métier déplacée** ; `frontend/pages/` intact ; tous les liens actuels atteignables.
|
||||||
|
- [ ] `npx nuxt typecheck` = 0 erreur ; suite PHPUnit verte ; aucune migration BDD.
|
||||||
|
- [ ] Délta cosmétique d'ordre de sidebar présenté au PO pour validation.
|
||||||
|
|
||||||
|
## Notes pour le ticket suivant (1.1 — Module Core)
|
||||||
|
|
||||||
|
Le 1.1 migrera `User`/Auth dans `src/Module/Core/`, re-pointera `resolve_target_entities` vers `Module\Core\User`, déclarera `CoreModule` (REQUIRED) dans `config/modules.php`, et créera le premier vrai layer front `frontend/modules/core/` (login, profile, admin users) — c'est là que le scan de layers et `useModules`/`useSidebar` prennent tout leur sens (premier item de sidebar avec une clé `module` réelle).
|
||||||
@@ -0,0 +1,732 @@
|
|||||||
|
# LST-63 (1.1) — Module Core : Identité (User/Auth/JWT) & Notifications — Implementation Plan
|
||||||
|
|
||||||
|
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||||
|
|
||||||
|
**Goal:** Migrer l'identité (`User` + Auth/JWT + password hashing + `MeProvider`) et les notifications dans `src/Module/Core/`, exposer le contrat `UserInterface` enrichi + `NotifierInterface`, déclarer `CoreModule` (REQUIRED), et créer le premier vrai layer front `modules/core/` — **sans aucune migration destructive et sans casser le login à aucune étape**.
|
||||||
|
|
||||||
|
**Architecture:** Strangler 100 % additif, phasé. On déplace physiquement la classe `User` vers `App\Module\Core\Domain\Entity\User` (table `user` inchangée → zéro migration), on re-pointe `resolve_target_entities` et le provider de sécurité, puis on bascule les 8 relations d'entités et les 26 consommateurs du concret `App\Entity\User` vers le **contrat** `App\Shared\Domain\Contract\UserInterface` (enrichi des accessors réellement utilisés). Les notifications passent par un `NotifierInterface` (impl Core). Chaque phase laisse `make test` vert ET le login JWT fonctionnel (re-vérifié par curl).
|
||||||
|
|
||||||
|
**Tech Stack:** PHP 8.4 / Symfony 8 / API Platform 4 / Doctrine ORM / lexik/jwt-authentication / PostgreSQL 16 / PHPUnit 13 — front Nuxt 4.3 / Vue 3.5 / Pinia 3.
|
||||||
|
|
||||||
|
## Global Constraints
|
||||||
|
|
||||||
|
- **`declare(strict_types=1);`** en tête de chaque fichier PHP.
|
||||||
|
- **Zéro migration destructive** : le déplacement de namespace ne change ni la table (`user`) ni les colonnes → `doctrine:migrations:diff` doit produire un diff VIDE. Si un diff non vide apparaît, c'est un bug (mapping mal recopié) — corriger, ne pas générer la migration.
|
||||||
|
- **Login JWT fonctionnel à chaque phase** : vérif curl obligatoire (voir « Vérification login » ci-dessous) après toute phase touchant `User`/sécurité.
|
||||||
|
- **AC ticket** : (1) login/JWT OK via le module ; (2) aucun `use App\Entity\User;` hors `src/Module/Core/` ; (3) `make test` vert, aucune migration destructive.
|
||||||
|
- **Commits** : `<type>(<scope>) : <message>` (espaces autour du `:`). **Jamais** de mention IA/Claude/Anthropic.
|
||||||
|
- **`config/reference.php`** : auto-généré, **jamais committé** (apparaît modifié dans `git status`).
|
||||||
|
- **Tests** : `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`. Baseline avant ce ticket : **115 tests, 227 assertions** (16 PHPUnit Notices préexistantes, non bloquantes).
|
||||||
|
- **Front** : `nuxt typecheck` n'est PAS un gate vert sur ce stack (cf. plan LST-62) — gate front = zéro `Cannot find module`, auto-imports présents dans `.nuxt/imports.d.ts`, smoke runtime.
|
||||||
|
- **PostgreSQL** : noms de colonnes en minuscules dans le SQL brut.
|
||||||
|
|
||||||
|
## Vérification login (à exécuter après chaque phase back touchant User/sécurité)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Doit renvoyer http=204 (cookie BEARER posé) puis le profil courant
|
||||||
|
curl -s -c /tmp/cj.txt -X POST http://localhost:8082/api/login_check \
|
||||||
|
-H "Content-Type: application/json" -d '{"username":"alice","password":"alice"}' \
|
||||||
|
-o /dev/null -w "login http=%{http_code}\n"
|
||||||
|
curl -s -b /tmp/cj.txt http://localhost:8082/api/me -w "\nme http=%{http_code}\n" | head -c 400
|
||||||
|
# MCP apiToken (ApiTokenAuthenticator) — admin
|
||||||
|
curl -s -X POST http://localhost:8082/_mcp -H "Authorization: Bearer dev-mcp-token-for-testing-only-do-not-use-in-production" \
|
||||||
|
-H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1,"method":"ping"}' -o /dev/null -w "mcp http=%{http_code}\n"
|
||||||
|
```
|
||||||
|
Attendu : `login http=204`, `me http=200` avec le JSON de l'utilisateur (`username`, `roles`), MCP répond (200). **Si l'un casse, arrêter la phase et corriger avant de committer.**
|
||||||
|
|
||||||
|
## Décisions de conception (actées, à valider PO a posteriori)
|
||||||
|
|
||||||
|
1. **`UserInterface` enrichi (contrat de lecture)** — plutôt que de garder `App\Entity\User` partout, on enrichit `App\Shared\Domain\Contract\UserInterface` des accessors **réellement consommés** hors Core (lecture). Les setters/écriture restent sur le concret (Core uniquement). Cela permet de typer les 8 relations et les 26 consommateurs sur le contrat sans casse.
|
||||||
|
2. **Move physique, table inchangée** — `User` change de namespace mais garde `#[ORM\Table(name: '`user`')]` et toutes ses colonnes → aucune migration. La classe reste une entité Doctrine mappée (nouveau dir de mapping `Core`).
|
||||||
|
3. **Relations via le contrat** — les 8 entités passent à `targetEntity: UserInterface::class` + type `?UserInterface`, résolu par `resolve_target_entities → Core\User`. C'est le pattern Starseed.
|
||||||
|
4. **Notification dans Core + `NotifierInterface`** — `Notification` migre dans Core (couplée à l'identité) ; la création de notif passe par `NotifierInterface` (impl Core), `TaskNotificationListener` (qui reste legacy en Phase D) en dépend par contrat. L'API REST `/api/notifications` est préservée à l'identique.
|
||||||
|
5. **Front layer `modules/core/`** — login, profile, admin users **déplacés** de `frontend/pages/` vers `frontend/modules/core/pages/` (premier layer réel ; le scan `readdirSync('modules/')` de LST-62 l'enregistre automatiquement). Le routage Nuxt est préservé (mêmes chemins d'URL).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase A — Squelette Core + contrats (100 % additif, app inchangée)
|
||||||
|
|
||||||
|
### Task 1: `CoreModule` + `UserRepositoryInterface` + `NotifierInterface` + contrat `UserInterface` enrichi
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `src/Module/Core/CoreModule.php`
|
||||||
|
- Create: `src/Module/Core/Domain/Repository/UserRepositoryInterface.php`
|
||||||
|
- Create: `src/Shared/Domain/Contract/NotifierInterface.php`
|
||||||
|
- Modify: `src/Shared/Domain/Contract/UserInterface.php` (enrichir)
|
||||||
|
- Create: `tests/Unit/Module/Core/CoreModuleTest.php`
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Produces :
|
||||||
|
- `App\Module\Core\CoreModule implements ModuleInterface` : `id()='core'`, `label()='Core'`, `isRequired()=true`, `permissions()` (stub pour 1.2, voir code).
|
||||||
|
- `App\Module\Core\Domain\Repository\UserRepositoryInterface` : `findByRole(string $role): array`, `findActiveEmployees(\DateTimeInterface $date): array`, `findOneByUsername(string $username): ?UserInterface`.
|
||||||
|
- `App\Shared\Domain\Contract\NotifierInterface` : `notify(UserInterface $user, string $type, string $title, string $message): void`.
|
||||||
|
- `UserInterface` enrichi (lecture) : `getId(): ?int`, `getUserIdentifier(): string`, `getUsername(): string`, `getRoles(): array`, `getFirstName(): ?string`, `getLastName(): ?string`, `getAvatarUrl(): ?string`, `isEmployee(): bool`.
|
||||||
|
- Consumes : `App\Shared\Domain\Module\ModuleInterface` (existant).
|
||||||
|
|
||||||
|
- [ ] **Step 1: Écrire le test unitaire `CoreModule`**
|
||||||
|
|
||||||
|
`tests/Unit/Module/Core/CoreModuleTest.php` :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\Unit\Module\Core;
|
||||||
|
|
||||||
|
use App\Module\Core\CoreModule;
|
||||||
|
use App\Shared\Domain\Module\ModuleInterface;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class CoreModuleTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testItIsAModule(): void
|
||||||
|
{
|
||||||
|
self::assertInstanceOf(ModuleInterface::class, new CoreModule());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testIdentity(): void
|
||||||
|
{
|
||||||
|
self::assertSame('core', CoreModule::id());
|
||||||
|
self::assertTrue(CoreModule::isRequired());
|
||||||
|
self::assertNotSame('', CoreModule::label());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testPermissionsAreWellFormed(): void
|
||||||
|
{
|
||||||
|
foreach (CoreModule::permissions() as $permission) {
|
||||||
|
self::assertArrayHasKey('code', $permission);
|
||||||
|
self::assertArrayHasKey('label', $permission);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Lancer le test, vérifier l'échec**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit tests/Unit/Module/Core/CoreModuleTest.php`
|
||||||
|
Expected: FAIL (classe `CoreModule` inexistante).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Créer `CoreModule`**
|
||||||
|
|
||||||
|
`src/Module/Core/CoreModule.php` :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Module\Core;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Module\ModuleInterface;
|
||||||
|
|
||||||
|
final class CoreModule implements ModuleInterface
|
||||||
|
{
|
||||||
|
public static function id(): string
|
||||||
|
{
|
||||||
|
return 'core';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function label(): string
|
||||||
|
{
|
||||||
|
return 'Core';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isRequired(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Permissions posées pour le RBAC fin (1.2). Inertes tant que 1.2 n'est pas livré.
|
||||||
|
*
|
||||||
|
* @return list<array{code: string, label: string}>
|
||||||
|
*/
|
||||||
|
public static function permissions(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
['code' => 'core.user.read', 'label' => 'Consulter les utilisateurs'],
|
||||||
|
['code' => 'core.user.manage', 'label' => 'Gérer les utilisateurs'],
|
||||||
|
['code' => 'core.notification.read', 'label' => 'Consulter ses notifications'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
> ⚠️ Confirmer la signature EXACTE de `ModuleInterface` (`src/Shared/Domain/Module/ModuleInterface.php`) avant d'écrire : la cartographie indique `id()`, `label()`, `isRequired()`, `permissions()` statiques. Si une méthode diffère (ex. non statique), aligner `CoreModule` ET le test dessus.
|
||||||
|
|
||||||
|
- [ ] **Step 4: Lancer le test, vérifier le vert**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit tests/Unit/Module/Core/CoreModuleTest.php`
|
||||||
|
Expected: PASS (3 tests).
|
||||||
|
|
||||||
|
- [ ] **Step 5: Enrichir le contrat `UserInterface`**
|
||||||
|
|
||||||
|
Remplace `src/Shared/Domain/Contract/UserInterface.php` par :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Contract;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Contrat de LECTURE de l'identité, consommé hors du module Core.
|
||||||
|
* Les écritures (setPassword, setters HR…) restent sur le concret Core\Domain\Entity\User.
|
||||||
|
*/
|
||||||
|
interface UserInterface
|
||||||
|
{
|
||||||
|
public function getId(): ?int;
|
||||||
|
|
||||||
|
public function getUserIdentifier(): string;
|
||||||
|
|
||||||
|
public function getUsername(): string;
|
||||||
|
|
||||||
|
/** @return list<string> */
|
||||||
|
public function getRoles(): array;
|
||||||
|
|
||||||
|
public function getFirstName(): ?string;
|
||||||
|
|
||||||
|
public function getLastName(): ?string;
|
||||||
|
|
||||||
|
public function getAvatarUrl(): ?string;
|
||||||
|
|
||||||
|
public function isEmployee(): bool;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
> ⚠️ Cet enrichissement DOIT correspondre à des méthodes existantes de l'entité `User` (la cartographie confirme `getId`, `getUserIdentifier`, `getUsername`, `getRoles`, `getFirstName`, `getLastName`, `getAvatarUrl`, `isEmployee`). Si une signature diffère (ex. `getAvatarUrl(): string` non-nullable), aligner le contrat sur le réel. Ne PAS ajouter au contrat une méthode absente de `User`.
|
||||||
|
|
||||||
|
- [ ] **Step 6: Créer `UserRepositoryInterface`**
|
||||||
|
|
||||||
|
`src/Module/Core/Domain/Repository/UserRepositoryInterface.php` :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Module\Core\Domain\Repository;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
|
||||||
|
interface UserRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @return list<UserInterface>
|
||||||
|
*/
|
||||||
|
public function findByRole(string $role): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<UserInterface>
|
||||||
|
*/
|
||||||
|
public function findActiveEmployees(\DateTimeInterface $date): array;
|
||||||
|
|
||||||
|
public function findOneByUsername(string $username): ?UserInterface;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 7: Créer `NotifierInterface`**
|
||||||
|
|
||||||
|
`src/Shared/Domain/Contract/NotifierInterface.php` :
|
||||||
|
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Contract;
|
||||||
|
|
||||||
|
interface NotifierInterface
|
||||||
|
{
|
||||||
|
public function notify(UserInterface $user, string $type, string $title, string $message): void;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 8: Suite complète + commit**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`
|
||||||
|
Expected: PASS (115 + 3 = 118 tests). L'enrichissement du contrat ne casse rien (l'entité `User` implémente déjà ces méthodes ; `resolve_target_entities` pointe encore `App\Entity\User`).
|
||||||
|
Run: `make php-cs-fixer-allow-risky`
|
||||||
|
```bash
|
||||||
|
git add src/Module/Core/CoreModule.php src/Module/Core/Domain/Repository/UserRepositoryInterface.php src/Shared/Domain/Contract/NotifierInterface.php src/Shared/Domain/Contract/UserInterface.php tests/Unit/Module/Core/CoreModuleTest.php
|
||||||
|
git commit -m "feat(core) : add CoreModule, user repository contract, notifier contract and enriched user contract"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase B — Déplacer `User` + Auth dans Core (re-pointage, zéro migration)
|
||||||
|
|
||||||
|
### Task 2: Déplacer la classe `User` vers Core + mapping Doctrine + provider sécurité
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Move: `src/Entity/User.php` → `src/Module/Core/Domain/Entity/User.php` (namespace `App\Module\Core\Domain\Entity`)
|
||||||
|
- Modify: `config/packages/doctrine.yaml` (mapping `Core` + `resolve_target_entities`)
|
||||||
|
- Modify: `config/packages/security.yaml` (`app_user_provider.entity.class`)
|
||||||
|
- Modify: `config/packages/api_platform.yaml` (mapping paths : ajouter le dir entité Core)
|
||||||
|
|
||||||
|
**Interfaces:**
|
||||||
|
- Produces : entité `App\Module\Core\Domain\Entity\User` (table `user` inchangée), résolue par `resolve_target_entities`.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Déplacer le fichier (git mv) et changer le namespace**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/matthieu/dev_malio/Lesstime
|
||||||
|
mkdir -p src/Module/Core/Domain/Entity
|
||||||
|
git mv src/Entity/User.php src/Module/Core/Domain/Entity/User.php
|
||||||
|
```
|
||||||
|
Puis éditer `src/Module/Core/Domain/Entity/User.php` :
|
||||||
|
- `namespace App\Entity;` → `namespace App\Module\Core\Domain\Entity;`
|
||||||
|
- Adapter les `use` internes devenus nécessaires (l'entité référençait `UserRepository`, `MeProvider`, `UserPasswordHasherProcessor`, l'enum `ContractType`, le contrat `UserInterface as SharedUserInterface`). Mettre les `use` complets vers leurs emplacements ACTUELS (la plupart bougent en Tasks 3/4 ; pour cette task, pointer encore vers `App\Repository\UserRepository`, `App\State\MeProvider`, `App\State\UserPasswordHasherProcessor`, `App\Entity\Enum\ContractType` ou l'emplacement réel — vérifier les `use` d'origine et les conserver tels quels tant que ces classes n'ont pas bougé).
|
||||||
|
- Garder VERBATIM : tous les attributs `#[ORM\...]` (dont `#[ORM\Table(name: '`user`')]`), `#[ApiResource(...)]`, `#[ApiProperty(...)]`, toutes les propriétés/méthodes, `implements UserInterface, PasswordAuthenticatedUserInterface, SharedUserInterface`.
|
||||||
|
|
||||||
|
> ⚠️ Lire le fichier d'origine en entier AVANT de déplacer pour relever tous les `use`. Ne changer QUE le `namespace` et, si besoin, garder les `use` pointant vers les emplacements actuels des classes non encore déplacées.
|
||||||
|
|
||||||
|
- [ ] **Step 2: Mapping Doctrine + resolve_target_entities**
|
||||||
|
|
||||||
|
Dans `config/packages/doctrine.yaml`, sous `orm:` :
|
||||||
|
- `resolve_target_entities` :
|
||||||
|
```yaml
|
||||||
|
resolve_target_entities:
|
||||||
|
App\Shared\Domain\Contract\UserInterface: App\Module\Core\Domain\Entity\User
|
||||||
|
```
|
||||||
|
- Ajouter un mapping pour les entités Core (en plus du mapping `App` existant qui scanne `src/Entity`) :
|
||||||
|
```yaml
|
||||||
|
mappings:
|
||||||
|
App:
|
||||||
|
type: attribute
|
||||||
|
is_bundle: false
|
||||||
|
dir: '%kernel.project_dir%/src/Entity'
|
||||||
|
prefix: 'App\Entity'
|
||||||
|
alias: App
|
||||||
|
Core:
|
||||||
|
type: attribute
|
||||||
|
is_bundle: false
|
||||||
|
dir: '%kernel.project_dir%/src/Module/Core/Domain/Entity'
|
||||||
|
prefix: 'App\Module\Core\Domain\Entity'
|
||||||
|
```
|
||||||
|
|
||||||
|
> Le mapping `App` (src/Entity) ne contient plus `User.php` (déplacé) → cohérent. Aucune entité orpheline.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Provider de sécurité**
|
||||||
|
|
||||||
|
Dans `config/packages/security.yaml` :
|
||||||
|
```yaml
|
||||||
|
providers:
|
||||||
|
app_user_provider:
|
||||||
|
entity:
|
||||||
|
class: App\Module\Core\Domain\Entity\User
|
||||||
|
property: username
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 4: API Platform mapping paths**
|
||||||
|
|
||||||
|
Dans `config/packages/api_platform.yaml`, ajouter au `mapping.paths` le dossier entité Core (l'`#[ApiResource]` est porté par l'entité `User` déplacée) :
|
||||||
|
```yaml
|
||||||
|
- '%kernel.project_dir%/src/Module/Core/Domain/Entity'
|
||||||
|
```
|
||||||
|
> Conserver tous les paths existants. Si `api_platform.yaml` n'a pas de `mapping.paths` explicite (auto-discovery), vérifier que les Resources sous `src/Module/...` sont bien découvertes (comme `src/Shared/...` l'a été en #56 — cf. LEARNINGS : API Platform 4 auto-découvre). Si la découverte auto suffit, NE PAS ajouter de path ; sinon ajouter celui ci-dessus.
|
||||||
|
|
||||||
|
- [ ] **Step 5: Vider le cache + vérifier qu'AUCUNE migration n'est nécessaire**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console cache:clear
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console doctrine:schema:validate
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console doctrine:migrations:diff --no-interaction 2>&1 | tail -20
|
||||||
|
```
|
||||||
|
Expected : schema VALID (mapping ok, sync DB ok). Le `diff` doit annoncer **« No changes detected »** (table/colonnes identiques). **Si une migration est générée, la SUPPRIMER** (`git status` → retirer le fichier sous `migrations/`) : un diff non vide = mapping mal recopié, corriger l'entité.
|
||||||
|
|
||||||
|
- [ ] **Step 6: Vérif login + suite complète**
|
||||||
|
|
||||||
|
Exécuter le bloc « Vérification login » (curl) → `login http=204`, `me http=200`, MCP 200.
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`
|
||||||
|
Expected: PASS (118). Les consommateurs importent encore `App\Entity\User` → **ERREUR attendue** : la classe n'existe plus à cet emplacement. ⇒ Cette task NE PASSE PAS seule ; elle est indissociable de la Task 3 (rewire). **Voir note ci-dessous.**
|
||||||
|
|
||||||
|
> 🔴 **Note d'ordonnancement** : déplacer `User` casse les 26 `use App\Entity\User;`. Pour garder l'app bootable entre Task 2 et Task 3, **ajouter un alias de compatibilité TEMPORAIRE** au tout début de Task 2 et le retirer en fin de Task 3 :
|
||||||
|
> Créer `src/Module/Core/_compat_user_alias.php` (chargé via `composer.json` `autoload.files`) :
|
||||||
|
> ```php
|
||||||
|
> <?php
|
||||||
|
> declare(strict_types=1);
|
||||||
|
> if (!class_exists(\App\Entity\User::class, false)) {
|
||||||
|
> class_alias(\App\Module\Core\Domain\Entity\User::class, \App\Entity\User::class);
|
||||||
|
> }
|
||||||
|
> ```
|
||||||
|
> Ajouter `"files": ["src/Module/Core/_compat_user_alias.php"]` sous `autoload` dans `composer.json`, puis `composer dump-autoload`. Cela garde les 26 consommateurs fonctionnels (et Doctrine `targetEntity: User::class` résolu via l'alias) le temps de la Task 3. **L'alias est SUPPRIMÉ en Task 3 Step final** (avec le retrait du fichier, l'entrée composer et un nouveau `dump-autoload`) une fois tous les consommateurs basculés sur le contrat. La verif login de cette Step utilise donc l'alias — c'est attendu.
|
||||||
|
|
||||||
|
- [ ] **Step 7: php-cs-fixer + commit (Phase B, avec alias temporaire)**
|
||||||
|
|
||||||
|
Run: `make php-cs-fixer-allow-risky`
|
||||||
|
```bash
|
||||||
|
git add src/Module/Core/Domain/Entity/User.php src/Module/Core/_compat_user_alias.php composer.json composer.lock config/packages/doctrine.yaml config/packages/security.yaml config/packages/api_platform.yaml
|
||||||
|
git commit -m "feat(core) : move user entity into core module and repoint security/doctrine (temp legacy alias)"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase C — Basculer relations + consommateurs sur le contrat, retirer l'alias
|
||||||
|
|
||||||
|
### Task 3: Relations d'entités → `UserInterface::class`
|
||||||
|
|
||||||
|
**Files (8 entités):**
|
||||||
|
- Modify: `src/Entity/Task.php` (assignee ManyToOne, collaborators ManyToMany)
|
||||||
|
- Modify: `src/Entity/TimeEntry.php` (user)
|
||||||
|
- Modify: `src/Entity/AbsenceRequest.php` (user)
|
||||||
|
- Modify: `src/Entity/AbsenceBalance.php` (user)
|
||||||
|
- Modify: `src/Entity/TaskDocument.php` (user)
|
||||||
|
- Modify: `src/Entity/TaskMailLink.php` (user)
|
||||||
|
- Modify: `src/Module/Core/Domain/Entity/Notification.php` (user) — **après son déplacement en Phase D** ; en Phase C, `Notification` est encore `src/Entity/Notification.php`, la traiter ici aussi.
|
||||||
|
|
||||||
|
> Pour CHAQUE relation vers User : remplacer `use App\Entity\User;` par `use App\Shared\Domain\Contract\UserInterface;`, le `targetEntity: User::class` par `targetEntity: UserInterface::class`, et le type de propriété/param `?User` → `?UserInterface` (idem getters/setters). Doctrine résout via `resolve_target_entities`. La colonne FK et son nom restent identiques → **aucune migration**.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Modifier les relations (entité par entité)**
|
||||||
|
|
||||||
|
Pour chaque fichier ci-dessus, lire puis appliquer le remplacement décrit. Exemple `Task.php` (assignee) :
|
||||||
|
```php
|
||||||
|
// avant
|
||||||
|
use App\Entity\User;
|
||||||
|
#[ORM\ManyToOne(targetEntity: User::class)]
|
||||||
|
private ?User $assignee = null;
|
||||||
|
public function getAssignee(): ?User { return $this->assignee; }
|
||||||
|
public function setAssignee(?User $assignee): static { $this->assignee = $assignee; return $this; }
|
||||||
|
// collaborators
|
||||||
|
#[ORM\ManyToMany(targetEntity: User::class)]
|
||||||
|
private Collection $collaborators;
|
||||||
|
|
||||||
|
// après
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
|
private ?UserInterface $assignee = null;
|
||||||
|
public function getAssignee(): ?UserInterface { return $this->assignee; }
|
||||||
|
public function setAssignee(?UserInterface $assignee): static { $this->assignee = $assignee; return $this; }
|
||||||
|
#[ORM\ManyToMany(targetEntity: UserInterface::class)]
|
||||||
|
private Collection $collaborators;
|
||||||
|
```
|
||||||
|
> ⚠️ Conserver tous les autres attributs de relation (`inversedBy`, `joinTable`, `joinColumn`, `nullable`, `onDelete`, Groups…) VERBATIM. Ne changer que le type et `targetEntity`.
|
||||||
|
|
||||||
|
- [ ] **Step 2: Valider le schéma (toujours zéro migration)**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console cache:clear
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console doctrine:schema:validate
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console doctrine:migrations:diff --no-interaction 2>&1 | tail -5
|
||||||
|
```
|
||||||
|
Expected : « No changes detected ». Sinon corriger (un `joinColumn`/`onDelete` a été perdu).
|
||||||
|
|
||||||
|
### Task 4: Consommateurs (26 fichiers) → contrat + repository interface, MeProvider/Processor dans Core, retrait alias
|
||||||
|
|
||||||
|
**Files:** les 26 fichiers listés dans la cartographie (Controllers, Repositories, State, Services, EventListener, Security, DataFixtures, Mcp). Déplacements vers Core :
|
||||||
|
- Move: `src/Repository/UserRepository.php` → `src/Module/Core/Infrastructure/Doctrine/DoctrineUserRepository.php` (implémente `UserRepositoryInterface`, namespace `App\Module\Core\Infrastructure\Doctrine`)
|
||||||
|
- Move: `src/State/MeProvider.php` → `src/Module/Core/Infrastructure/ApiPlatform/State/MeProvider.php`
|
||||||
|
- Move: `src/State/UserPasswordHasherProcessor.php` → `src/Module/Core/Infrastructure/ApiPlatform/State/UserPasswordHasherProcessor.php`
|
||||||
|
- Modify: l'`#[ApiResource]` de l'entité `User` (les `provider:`/`processor:` pointent vers les nouveaux FQCN Core).
|
||||||
|
- Delete (en fin de task): `src/Module/Core/_compat_user_alias.php` + entrée `composer.json`.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Déplacer le repository et l'aligner sur l'interface**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mkdir -p src/Module/Core/Infrastructure/Doctrine src/Module/Core/Infrastructure/ApiPlatform/State
|
||||||
|
git mv src/Repository/UserRepository.php src/Module/Core/Infrastructure/Doctrine/DoctrineUserRepository.php
|
||||||
|
git mv src/State/MeProvider.php src/Module/Core/Infrastructure/ApiPlatform/State/MeProvider.php
|
||||||
|
git mv src/State/UserPasswordHasherProcessor.php src/Module/Core/Infrastructure/ApiPlatform/State/UserPasswordHasherProcessor.php
|
||||||
|
```
|
||||||
|
Éditer `DoctrineUserRepository.php` : `namespace App\Module\Core\Infrastructure\Doctrine;`, `class DoctrineUserRepository extends ServiceEntityRepository implements UserRepositoryInterface`, `use App\Module\Core\Domain\Entity\User;`, `use App\Module\Core\Domain\Repository\UserRepositoryInterface;`, et passer `User::class` au constructeur parent. Ajouter `findOneByUsername()` si absent (`return $this->findOneBy(['username' => $username]);`). Conserver `findByRole()` (SQL natif `roles::text LIKE`) et `findActiveEmployees()`.
|
||||||
|
Éditer `User.php` : `#[ORM\Entity(repositoryClass: DoctrineUserRepository::class)]` avec le bon `use`.
|
||||||
|
Éditer `MeProvider.php` / `UserPasswordHasherProcessor.php` : nouveaux namespaces ; `use App\Module\Core\Domain\Entity\User;` (le processor manipule le concret — c'est dans Core, autorisé).
|
||||||
|
Mettre à jour les `provider:`/`processor:` dans l'`#[ApiResource]` de `User` vers les nouveaux FQCN.
|
||||||
|
|
||||||
|
- [ ] **Step 2: Lier l'interface repository au service Doctrine**
|
||||||
|
|
||||||
|
Dans `config/services.yaml`, alias pour l'injection par interface :
|
||||||
|
```yaml
|
||||||
|
App\Module\Core\Domain\Repository\UserRepositoryInterface: '@App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository'
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 3: Basculer les 25 autres consommateurs sur le contrat**
|
||||||
|
|
||||||
|
Pour chaque fichier important `App\Entity\User` (hors Core), remplacer `use App\Entity\User;` par `use App\Shared\Domain\Contract\UserInterface;` et le type-hint `User` par `UserInterface` (params, retours, propriétés, `@var`, expressions). Cas particuliers :
|
||||||
|
- `src/Repository/{Notification,AbsenceBalance,AbsenceRequest,TimeEntry}Repository.php` : les signatures `countUnreadByUser(User $user)` etc. → `UserInterface`. Ne pas changer la logique DQL (`n.user = :user` fonctionne avec l'instance).
|
||||||
|
- `src/State/Absence*`, `TaskDocumentProvider`, `src/Service/AbsenceBalanceService`, `src/Security/MailAccessChecker`, `src/EventListener/TaskNotificationListener` (sera retravaillé en Phase D mais peut déjà passer au contrat ici), `src/Controller/*` (7), `src/Mcp/Tool/Absence/ReviewAbsenceRequestTool`, `src/Mcp/Tool/Serializer` : remplacer le type-hint.
|
||||||
|
- `src/DataFixtures/AppFixtures.php` : **garde le concret** `App\Module\Core\Domain\Entity\User` (les fixtures INSTANCIENT `new User()` et appellent des setters d'écriture — c'est légitime ; importer le concret Core, pas le contrat). C'est hors `src/Module/Core/` mais c'est de l'écriture d'identité → exception documentée (les fixtures sont un cas d'amorçage, pas un consommateur métier).
|
||||||
|
|
||||||
|
> Liste de contrôle : après cette step, `grep -rn "use App\\\\Entity\\\\User;" src/` ne doit retourner QUE `src/DataFixtures/AppFixtures.php` (qui importe désormais le FQCN Core, donc 0 occurrence de `App\Entity\User`). Viser **0 occurrence de `App\Entity\User`** dans tout `src/`.
|
||||||
|
|
||||||
|
- [ ] **Step 4: Retirer l'alias de compatibilité**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git rm src/Module/Core/_compat_user_alias.php
|
||||||
|
```
|
||||||
|
Retirer l'entrée `"files": [...]` ajoutée sous `autoload` dans `composer.json` (Task 2), puis :
|
||||||
|
```bash
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm composer dump-autoload
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console cache:clear
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 5: `grep` de garde (AC 2) + schéma + tests + login**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
grep -rn "App\\\\Entity\\\\User" src/ config/ ; echo "(doit être VIDE)"
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console doctrine:schema:validate
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php bin/console doctrine:migrations:diff --no-interaction 2>&1 | tail -5
|
||||||
|
docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit
|
||||||
|
```
|
||||||
|
Expected : grep VIDE, schéma valide, « No changes detected », **118 tests verts**. Puis bloc « Vérification login » (login 204, me 200, MCP 200).
|
||||||
|
|
||||||
|
- [ ] **Step 6: php-cs-fixer + commit (Phase C)**
|
||||||
|
|
||||||
|
Run: `make php-cs-fixer-allow-risky`
|
||||||
|
```bash
|
||||||
|
git add -A -- src config composer.json composer.lock
|
||||||
|
git commit -m "refactor(core) : wire user relations and consumers to the shared contract, drop legacy alias"
|
||||||
|
```
|
||||||
|
> ⚠️ NE PAS `git add config/reference.php`. Vérifier `git status` avant le commit ; si `reference.php` est listé, l'exclure du `git add` (stager explicitement les fichiers voulus).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase D — Notifications via `NotifierInterface` (impl Core)
|
||||||
|
|
||||||
|
### Task 5: Déplacer `Notification` dans Core + `Notifier` (impl) + recâbler le listener
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Move: `src/Entity/Notification.php` → `src/Module/Core/Domain/Entity/Notification.php`
|
||||||
|
- Move: `src/Repository/NotificationRepository.php` → `src/Module/Core/Infrastructure/Doctrine/DoctrineNotificationRepository.php`
|
||||||
|
- Move: `src/State/NotificationProvider.php` → `src/Module/Core/Infrastructure/ApiPlatform/State/NotificationProvider.php`
|
||||||
|
- Create: `src/Module/Core/Infrastructure/Notifier.php` (implements `NotifierInterface`)
|
||||||
|
- Modify: `src/EventListener/TaskNotificationListener.php` (dépend de `NotifierInterface`)
|
||||||
|
- Modify: `config/packages/doctrine.yaml` (le mapping `Core` couvre déjà `Domain/Entity` → Notification incluse automatiquement)
|
||||||
|
- Modify: `tests/` — ajouter `tests/Unit/Module/Core/NotifierTest.php` (ou Functional) si testable unitairement.
|
||||||
|
|
||||||
|
- [ ] **Step 1: Écrire un test du `Notifier`**
|
||||||
|
|
||||||
|
`tests/Functional/Module/Core/NotifierTest.php` (crée une notif et vérifie la persistance) :
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\Functional\Module\Core;
|
||||||
|
|
||||||
|
use App\Module\Core\Domain\Entity\User;
|
||||||
|
use App\Shared\Domain\Contract\NotifierInterface;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class NotifierTest extends KernelTestCase
|
||||||
|
{
|
||||||
|
public function testNotifyPersistsANotificationForTheUser(): void
|
||||||
|
{
|
||||||
|
self::bootKernel();
|
||||||
|
$em = self::getContainer()->get(EntityManagerInterface::class);
|
||||||
|
$notifier = self::getContainer()->get(NotifierInterface::class);
|
||||||
|
|
||||||
|
$user = $em->getRepository(User::class)->findOneBy(['username' => 'alice']);
|
||||||
|
self::assertNotNull($user);
|
||||||
|
|
||||||
|
$notifier->notify($user, 'task_assigned', 'Titre', 'Message');
|
||||||
|
|
||||||
|
$count = (int) $em->createQuery(
|
||||||
|
'SELECT COUNT(n.id) FROM App\\Module\\Core\\Domain\\Entity\\Notification n WHERE n.user = :u AND n.title = :t'
|
||||||
|
)->setParameter('u', $user)->setParameter('t', 'Titre')->getSingleScalarResult();
|
||||||
|
|
||||||
|
self::assertSame(1, $count);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 2: Lancer, vérifier l'échec** — `NotifierInterface` non instanciable / `Notification` introuvable au nouveau namespace.
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit tests/Functional/Module/Core/NotifierTest.php`
|
||||||
|
Expected: FAIL.
|
||||||
|
|
||||||
|
- [ ] **Step 3: Déplacer `Notification` + repository + provider**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git mv src/Entity/Notification.php src/Module/Core/Domain/Entity/Notification.php
|
||||||
|
git mv src/Repository/NotificationRepository.php src/Module/Core/Infrastructure/Doctrine/DoctrineNotificationRepository.php
|
||||||
|
git mv src/State/NotificationProvider.php src/Module/Core/Infrastructure/ApiPlatform/State/NotificationProvider.php
|
||||||
|
```
|
||||||
|
- `Notification.php` : `namespace App\Module\Core\Domain\Entity;`, `use App\Shared\Domain\Contract\UserInterface;`, relation `user` → `targetEntity: UserInterface::class` + type `?UserInterface`, `repositoryClass: DoctrineNotificationRepository::class`, conserver `#[ORM\Table(name:'notification')]` + index VERBATIM, ApiResource (provider → nouveau FQCN). **Table/colonnes inchangées.**
|
||||||
|
- `DoctrineNotificationRepository.php` : namespace Core, `use App\Module\Core\Domain\Entity\Notification;`, signatures `UserInterface`.
|
||||||
|
- `NotificationProvider.php` : namespace Core, mêmes dépendances.
|
||||||
|
|
||||||
|
- [ ] **Step 4: Implémenter `Notifier`**
|
||||||
|
|
||||||
|
`src/Module/Core/Infrastructure/Notifier.php` :
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Module\Core\Infrastructure;
|
||||||
|
|
||||||
|
use App\Module\Core\Domain\Entity\Notification;
|
||||||
|
use App\Shared\Domain\Contract\NotifierInterface;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
|
||||||
|
final readonly class Notifier implements NotifierInterface
|
||||||
|
{
|
||||||
|
public function __construct(private EntityManagerInterface $em) {}
|
||||||
|
|
||||||
|
public function notify(UserInterface $user, string $type, string $title, string $message): void
|
||||||
|
{
|
||||||
|
$notification = new Notification();
|
||||||
|
$notification->setUser($user);
|
||||||
|
$notification->setType($type);
|
||||||
|
$notification->setTitle($title);
|
||||||
|
$notification->setMessage($message);
|
||||||
|
$this->em->persist($notification);
|
||||||
|
$this->em->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
> ⚠️ Aligner sur les setters réels de `Notification` (la cartographie indique `user`, `type`, `title`, `message`, `isRead` default false, `createdAt`). Si `createdAt` n'est pas auto (prePersist), le poser ici. Si `setUser` attend le concret, accepter `UserInterface` (resolve_target_entities) — vérifier le type du setter.
|
||||||
|
|
||||||
|
- [ ] **Step 5: Recâbler `TaskNotificationListener` sur `NotifierInterface`**
|
||||||
|
|
||||||
|
Lire le listener ; remplacer la création directe de `Notification` (`new Notification()` + persist) par l'injection et l'appel de `NotifierInterface::notify(...)`. **Attention** : le listener tourne sur `onFlush`/`postFlush` — un `flush()` dans `notify()` pendant un `onFlush` est dangereux. Conserver le pattern existant (accumulation en `onFlush`, écriture en `postFlush`). Si `notify()` flush, l'appeler UNIQUEMENT en `postFlush` (jamais pendant `onFlush`). Préserver le comportement exact (mêmes types `task_assigned`/`task_collaborator_added`, mêmes destinataires). Adapter le test existant du listener s'il y en a un.
|
||||||
|
|
||||||
|
> Si l'intrication onFlush/postFlush rend `NotifierInterface` inadapté (flush imbriqué), documenter et garder le listener en écriture directe via le repository Core, mais TOUJOURS dépendre du contrat pour le type User. Le but AC est « Notification exposée via NotifierInterface » : `NotifierInterface` doit exister et être l'API publique pour les autres modules ; le listener interne Core peut écrire directement.
|
||||||
|
|
||||||
|
- [ ] **Step 6: Tests + login + endpoints notifications**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`
|
||||||
|
Expected: PASS (118 + 1 = 119). Vérifier `doctrine:migrations:diff` → « No changes detected ». Bloc login. Puis curl notifications :
|
||||||
|
```bash
|
||||||
|
curl -s -b /tmp/cj.txt "http://localhost:8082/api/notifications" -w "\nnotif http=%{http_code}\n" | head -c 200
|
||||||
|
curl -s -b /tmp/cj.txt "http://localhost:8082/api/notifications/unread-count" -w "\nunread http=%{http_code}\n"
|
||||||
|
```
|
||||||
|
Expected : 200 sur les deux.
|
||||||
|
|
||||||
|
- [ ] **Step 7: php-cs-fixer + commit**
|
||||||
|
|
||||||
|
Run: `make php-cs-fixer-allow-risky`
|
||||||
|
```bash
|
||||||
|
git add -A -- src config tests
|
||||||
|
git commit -m "feat(core) : move notification into core and expose notifier contract"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase E — Déclarer `CoreModule` actif
|
||||||
|
|
||||||
|
### Task 6: Enregistrer Core dans `config/modules.php`
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `config/modules.php`
|
||||||
|
- Modify: `tests/Functional/Shared/ModulesEndpointTest.php` (ou équivalent — adapter l'assertion à la présence de `core`)
|
||||||
|
|
||||||
|
- [ ] **Step 1: Adapter/écrire le test de l'endpoint modules**
|
||||||
|
|
||||||
|
Vérifier le test existant de `/api/modules` (cartographie : `ModulesProvider`/`ModulesResource` créés en #56). Ajouter une assertion :
|
||||||
|
```php
|
||||||
|
public function testCoreModuleIsActive(): void
|
||||||
|
{
|
||||||
|
$client = self::createClient();
|
||||||
|
// /api/modules est public (GET) d'après security.yaml
|
||||||
|
$client->request('GET', '/api/modules');
|
||||||
|
self::assertResponseIsSuccessful();
|
||||||
|
$data = json_decode($client->getResponse()->getContent(), true);
|
||||||
|
self::assertContains('core', $data['modules']);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
> Adapter le nom de classe/fichier de test à l'existant (#56). Si aucun test fonctionnel modules n'existe, créer `tests/Functional/Shared/ModulesEndpointTest.php`.
|
||||||
|
|
||||||
|
- [ ] **Step 2: Lancer, vérifier l'échec** (modules.php retourne `[]`).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Activer Core**
|
||||||
|
|
||||||
|
`config/modules.php` :
|
||||||
|
```php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use App\Module\Core\CoreModule;
|
||||||
|
|
||||||
|
return [
|
||||||
|
CoreModule::class,
|
||||||
|
];
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 4: Tests + curl**
|
||||||
|
|
||||||
|
Run: `docker exec -t -u www-data php-lesstime-fpm php vendor/bin/phpunit`
|
||||||
|
Expected: PASS. Curl :
|
||||||
|
```bash
|
||||||
|
curl -s http://localhost:8082/api/modules | head -c 200 # doit contenir "core"
|
||||||
|
```
|
||||||
|
|
||||||
|
- [ ] **Step 5: commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add config/modules.php tests/
|
||||||
|
git commit -m "feat(core) : activate core module in modules registry"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase F — Layer front `modules/core/`
|
||||||
|
|
||||||
|
### Task 7: Déplacer login / profile / admin users dans `frontend/modules/core/`
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `frontend/modules/core/nuxt.config.ts` (`export default defineNuxtConfig({})`)
|
||||||
|
- Move: `frontend/pages/login.vue` → `frontend/modules/core/pages/login.vue`
|
||||||
|
- Move: `frontend/pages/profile.vue` → `frontend/modules/core/pages/profile.vue`
|
||||||
|
- Move: `frontend/pages/admin/**` (gestion users) → `frontend/modules/core/pages/admin/**`
|
||||||
|
- Move (si pertinent): composants/services liés à l'identité (ex. `frontend/components/user/**`, `frontend/components/admin/**`, `frontend/services/user.ts`) → `frontend/modules/core/{components,services}/**`
|
||||||
|
|
||||||
|
> ⚠️ AVANT de déplacer, LIRE `frontend/pages/` et `frontend/components/` pour identifier précisément les pages/compos d'identité. Le scan `readdirSync('modules/')` (LST-62) ajoute `./modules/core` à `extends` et `modules/core/composables`/`stores` à `imports.dirs`. Les `pages/` d'un layer Nuxt sont fusionnées automatiquement → **les URLs (`/login`, `/profile`, `/admin/...`) restent identiques**. Vérifier qu'aucune page déplacée n'utilise un import PAR CHEMIN cassé (auto-import sinon).
|
||||||
|
|
||||||
|
- [ ] **Step 1: Créer le layer + déplacer les pages d'identité**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/matthieu/dev_malio/Lesstime/frontend
|
||||||
|
mkdir -p modules/core/pages
|
||||||
|
printf 'export default defineNuxtConfig({})\n' > modules/core/nuxt.config.ts
|
||||||
|
git mv pages/login.vue modules/core/pages/login.vue
|
||||||
|
git mv pages/profile.vue modules/core/pages/profile.vue
|
||||||
|
# admin users : adapter au réel (git mv pages/admin/... modules/core/pages/admin/...)
|
||||||
|
```
|
||||||
|
> Lister `frontend/pages/admin/` d'abord ; déplacer UNIQUEMENT les pages de gestion des utilisateurs (pas les pages admin d'autres domaines). En cas de doute, déplacer seulement login + profile en 1.1 et laisser admin users (documenter).
|
||||||
|
|
||||||
|
- [ ] **Step 2: Corriger les imports par chemin éventuels**
|
||||||
|
|
||||||
|
Run: `cd /home/matthieu/dev_malio/Lesstime/frontend && grep -rn "pages/login\|pages/profile\|~/pages" --include=*.ts --include=*.vue . | grep -v node_modules`
|
||||||
|
Corriger toute référence cassée (les redirections `navigateTo('/login')` restent valides — c'est une URL, pas un chemin de fichier).
|
||||||
|
|
||||||
|
- [ ] **Step 3: Gate front (cf. LST-62) + smoke**
|
||||||
|
|
||||||
|
Run: `cd frontend && npx nuxt typecheck 2>&1 | grep "Cannot find module" | grep -E "modules/core|login|profile"` → doit être VIDE.
|
||||||
|
Run: `grep -E "login|profile" frontend/.nuxt/routes.* 2>/dev/null` ou démarrer `make dev-nuxt` et confirmer que `/login`, `/profile` répondent (la fusion des pages du layer est effective).
|
||||||
|
> Smoke runtime (login via navigateur) : laisser au PO si pas de navigateur côté exécutant.
|
||||||
|
|
||||||
|
- [ ] **Step 4: commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add -A -- frontend
|
||||||
|
git commit -m "feat(core) : add core front layer with login, profile and admin users pages"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Acceptance check (après toutes les phases)
|
||||||
|
|
||||||
|
- [ ] **AC1** Login/JWT OK via le module : `login http=204`, `/api/me` 200, MCP apiToken 200, `/api/notifications` 200.
|
||||||
|
- [ ] **AC2** `grep -rn "App\\Entity\\User" src/ config/` → **VIDE** (User vit dans `src/Module/Core/Domain/Entity/`, consommé via contrat ; fixtures importent le FQCN Core).
|
||||||
|
- [ ] **AC3** `make test` vert (≈119 tests), `doctrine:schema:validate` OK, `doctrine:migrations:diff` = « No changes detected » (**aucune migration destructive ni même additive**).
|
||||||
|
- [ ] `/api/modules` renvoie `core` ; `CoreModule::isRequired() === true`.
|
||||||
|
- [ ] `resolve_target_entities: UserInterface → App\Module\Core\Domain\Entity\User`.
|
||||||
|
- [ ] Front : layer `modules/core/` détecté ; `/login`, `/profile` (+ admin users) accessibles aux mêmes URLs ; aucun `Cannot find module`.
|
||||||
|
- [ ] `config/reference.php` jamais committé.
|
||||||
|
|
||||||
|
## Notes pour le ticket suivant (1.2 — RBAC fin)
|
||||||
|
|
||||||
|
`CoreModule::permissions()` est déjà posé (stub). 1.2 ajoutera `Role`/`Permission`, `app:sync-permissions`, `PermissionVoter`, et fera filtrer `SidebarProvider` **par permission** (en plus du module actif + du gate rôle minimal posé en 0.2). Le contrat `UserInterface` enrichi est prêt à recevoir `getPermissions()` si besoin.
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
# LST-56 — Socle modular monolith DDD + pilote « Projets/Tâches »
|
||||||
|
|
||||||
|
> Ticket Lesstime **#56** (1/5 — groupe « Refonte / Alignement Starseed »).
|
||||||
|
> Design validé le 2026-06-19. Référence vivante : repo **Starseed** (`.claude/rules/*.md` + implémentation réelle), et `Starseed/doc/architecture-modulaire-malio.md` (vision cible théorique — **non contraignante** là où elle diverge du code réel).
|
||||||
|
|
||||||
|
## 1. Objectif & contraintes
|
||||||
|
|
||||||
|
Poser dans Lesstime l'**infrastructure d'un modular monolith DDD** calquée sur Starseed, et **migrer un premier module pilote** (Projets/Tâches) de bout en bout comme preuve que la mécanique tient sur le cœur métier.
|
||||||
|
|
||||||
|
Contraintes **non négociables** :
|
||||||
|
|
||||||
|
- **Ne rien casser de l'existant.** Migration **strangler progressive** : le code legacy (`src/Entity/…`) et les modules (`src/Module/…`) coexistent ; l'application reste fonctionnelle et `make test` vert à **chaque** étape.
|
||||||
|
- **Prod = Docker, BDD peuplée** → uniquement des migrations **additives et nullable** (aucun `DROP`, aucun `NOT NULL` rétroactif, aucun déplacement de données).
|
||||||
|
- **Profondeur DDD : pragmatique**, alignée sur le **Starseed réel** (pas la doc théorique) : ORM attributs conservés dans les entités Domain, Repository = interface (Domain) + impl Doctrine (Infrastructure), Provider/Processor API Platform, contrats `Shared/Domain/Contract` pour le cross-module. **Pas de CQRS bus systématique, pas de multi-tenant.**
|
||||||
|
|
||||||
|
### Décisions de cadrage (figées)
|
||||||
|
|
||||||
|
| Sujet | Décision |
|
||||||
|
|-------|----------|
|
||||||
|
| Périmètre #56 | Socle complet + **1 module pilote** migré de bout en bout |
|
||||||
|
| Stratégie | **Strangler progressif** (legacy + modules en parallèle) |
|
||||||
|
| Profondeur DDD | **Pragmatique** (= Starseed réel) |
|
||||||
|
| Module pilote | **Projets/Tâches** (cœur métier) |
|
||||||
|
| Dépendances du pilote (User/Client/Notification) | Restent **legacy**, câblées via **contrats `Shared/Domain/Contract`** + `resolve_target_entities` |
|
||||||
|
| Infra d'audit Starseed | **Différée** → ticket Lesstime dédié (créé séparément) |
|
||||||
|
| Périmètre front #56 | **Câblage shell/shared/middlewares + migration du pilote en layer**, sans relooking (le relooking Malio reste #60) |
|
||||||
|
| Exposition API du pilote | **Garder les `#[ApiResource]` actuels** (étendre seulement les chemins de scan) — zéro régression API |
|
||||||
|
| Tâche → Notification | **Contrat `NotifierInterface`** (impl legacy crée la `Notification`) |
|
||||||
|
| Nom/ID du module | back `ProjectManagement` / front `project-management` / ID `project_management` |
|
||||||
|
|
||||||
|
## 2. Garde-fous Starseed retenus pour #56
|
||||||
|
|
||||||
|
Repris : `declare(strict_types=1)`, `src/Module/<X>/{Domain,Application,Infrastructure}`, `Shared/Domain/Contract` + `resolve_target_entities` (zéro import inter-modules), `config/modules.php` + `config/sidebar.php`, endpoints `/api/modules` + `/api/sidebar` + `/api/version`, `TimestampableBlamableTrait` + subscriber, pagination obligatoire, `COMMENT ON COLUMN` (helper `ColumnCommentsCatalog`), front layers auto-détectés + `useSidebar`/`useModules` + `auth.global.ts`/`modules.global.ts`.
|
||||||
|
|
||||||
|
Reportés (hors #56) : **infra d'audit** (`#[Auditable]`/`#[AuditIgnore]`, table `audit_log`, listener, resource) → ticket dédié. **RBAC fin** (`module.resource.action`) → #57 ; en #56 la sidebar filtre **par module actif** (au plus un gate `ROLE_ADMIN`).
|
||||||
|
|
||||||
|
## 3. Backend — arborescence cible
|
||||||
|
|
||||||
|
```
|
||||||
|
src/Shared/
|
||||||
|
├── Domain/
|
||||||
|
│ ├── Contract/ UserInterface, UserResolverInterface, ClientInterface, NotifierInterface
|
||||||
|
│ ├── Event/ DomainEventInterface
|
||||||
|
│ └── Trait/ TimestampableBlamableTrait
|
||||||
|
├── Infrastructure/
|
||||||
|
│ ├── Doctrine/ TimestampableBlamableSubscriber
|
||||||
|
│ ├── Database/ ColumnCommentsCatalog (helper COMMENT ON COLUMN + 4 colonnes std)
|
||||||
|
│ └── ApiPlatform/
|
||||||
|
│ ├── Resource/ ModulesResource, SidebarResource
|
||||||
|
│ └── State/ ModulesProvider, SidebarProvider
|
||||||
|
│
|
||||||
|
src/Module/ProjectManagement/
|
||||||
|
├── ProjectManagementModule.php ID='project_management', LABEL='Projets', REQUIRED=false, permissions()=[] (stub, RBAC réel #57)
|
||||||
|
├── Domain/
|
||||||
|
│ ├── Entity/ Project, Task, Workflow, TaskStatus, TaskGroup, TaskEffort,
|
||||||
|
│ │ TaskPriority, TaskTag, TaskRecurrence, TaskDocument
|
||||||
|
│ └── Repository/ *RepositoryInterface (une interface par agrégat consommé)
|
||||||
|
├── Application/ RecurrenceCalculator/RecurrenceHandler + services task-centric déplacés
|
||||||
|
└── Infrastructure/
|
||||||
|
├── Doctrine/ Doctrine*Repository + Migrations/ (additif Timestampable)
|
||||||
|
├── ApiPlatform/ State/Provider + State/Processor déplacés (TaskNumber, TaskCalendar,
|
||||||
|
│ TaskDocument*, SwitchProjectWorkflow, WorkflowDelete, ActiveTimeEntry resté legacy…)
|
||||||
|
└── Mcp/Tool/ MCP tools Project/, Task/, TaskMeta/, Workflow/ déplacés
|
||||||
|
```
|
||||||
|
|
||||||
|
`src/Entity/` conserve **intacts** : `User`, `Client`, `Notification`, `TimeEntry`, `AbsenceRequest`/`AbsencePolicy`/`AbsenceBalance`, `Mail*`, `Gitea*`/`BookStack*`/`Zimbra*`/`Share*Configuration`. Ces domaines seront modularisés dans des tickets ultérieurs.
|
||||||
|
|
||||||
|
> **Note de découpage** : `TimeEntry` reste legacy en #56 (domaine Time tracking séparé). Le lien `Task ↔ TimeEntry` est porté côté `TimeEntry` (FK nullable vers la table `task`) ; aucune contrainte ne casse car la table `task` ne change pas de nom.
|
||||||
|
|
||||||
|
## 4. Câblage des dépendances (zéro import inter-modules)
|
||||||
|
|
||||||
|
1. Interfaces dans `src/Shared/Domain/Contract/` :
|
||||||
|
- `UserInterface` (id + identifiants nécessaires aux entités du module : assignee, collaborators, createdBy/updatedBy),
|
||||||
|
- `ClientInterface` (id + nom, pour `Project.client`),
|
||||||
|
- `UserResolverInterface` (résoudre un user par id, pour les State/MCP du module),
|
||||||
|
- `NotifierInterface` (créer une notification — impl legacy).
|
||||||
|
2. Les entités du module **type-hintent les interfaces**, jamais `App\Entity\*`.
|
||||||
|
3. `config/packages/doctrine.yaml → orm.resolve_target_entities` :
|
||||||
|
```yaml
|
||||||
|
resolve_target_entities:
|
||||||
|
App\Shared\Domain\Contract\UserInterface: App\Entity\User
|
||||||
|
App\Shared\Domain\Contract\ClientInterface: App\Entity\Client
|
||||||
|
```
|
||||||
|
4. `App\Entity\User` `implements UserInterface`, `App\Entity\Client` `implements ClientInterface` (legacy modifié à minima, additif).
|
||||||
|
5. Notifications : `App\Module\ProjectManagement\…` appelle `NotifierInterface` ; impl `App\…\LegacyNotifier` (wrappe le `NotificationService` actuel). Le `TaskNotificationListener` est déplacé/adapté pour passer par le contrat.
|
||||||
|
|
||||||
|
## 5. Config backend (toutes additives)
|
||||||
|
|
||||||
|
- **`doctrine.yaml`** — ajouter un mapping module (garder `App → src/Entity`) :
|
||||||
|
```yaml
|
||||||
|
mappings:
|
||||||
|
App: { type: attribute, is_bundle: false, dir: '%kernel.project_dir%/src/Entity', prefix: 'App\Entity', alias: App }
|
||||||
|
ProjectManagement:
|
||||||
|
type: attribute
|
||||||
|
is_bundle: false
|
||||||
|
dir: '%kernel.project_dir%/src/Module/ProjectManagement/Domain/Entity'
|
||||||
|
prefix: 'App\Module\ProjectManagement\Domain\Entity'
|
||||||
|
```
|
||||||
|
Les entités déplacées **gardent leur `#[ORM\Table(name: '…')]` actuel** (table inchangée → aucune donnée déplacée). `#[ORM\Entity(repositoryClass: DoctrineXxxRepository::class)]` mis à jour vers la nouvelle classe.
|
||||||
|
- **`doctrine_migrations.yaml`** — ajouter le namespace module (garder `DoctrineMigrations`) :
|
||||||
|
```yaml
|
||||||
|
migrations_paths:
|
||||||
|
DoctrineMigrations: '%kernel.project_dir%/migrations'
|
||||||
|
'App\Module\ProjectManagement\Infrastructure\Doctrine\Migrations': '%kernel.project_dir%/src/Module/ProjectManagement/Infrastructure/Doctrine/Migrations'
|
||||||
|
```
|
||||||
|
> ⚠️ Doctrine Migrations trie par FQCN entre namespaces : le legacy `DoctrineMigrations` (setup initial) passe avant les migrations modulaires sur base vide. Sur la prod déjà migrée, seules les **nouvelles** migrations additives s'appliquent → pas d'impact d'ordre.
|
||||||
|
- **`api_platform.yaml`** — déclarer les chemins de mapping (entités + resources legacy **et** module) pour que les `#[ApiResource]` du pilote restent découverts :
|
||||||
|
```yaml
|
||||||
|
mapping:
|
||||||
|
paths:
|
||||||
|
- '%kernel.project_dir%/src/Entity'
|
||||||
|
- '%kernel.project_dir%/src/ApiResource'
|
||||||
|
- '%kernel.project_dir%/src/Shared/Infrastructure/ApiPlatform/Resource'
|
||||||
|
- '%kernel.project_dir%/src/Module/ProjectManagement/Domain/Entity'
|
||||||
|
```
|
||||||
|
- **`services.yaml`** — mettre à jour les FQCN explicites déplacés : `App\EventListener\TaskDocumentListener`, `App\State\TaskDocumentProcessor`, `App\Controller\TaskDocumentDownloadController`, `App\Mcp\Tool\Task\AddTaskDocumentTool`, `App\Mcp\Tool\Task\UpdateTaskDocumentTool` → nouveaux namespaces module. Le glob `App\: '../src/'` continue d'autowire les classes déplacées.
|
||||||
|
|
||||||
|
## 6. Garde-fous portés dans #56
|
||||||
|
|
||||||
|
- **TimestampableBlamable** : trait `Shared/Domain/Trait/TimestampableBlamableTrait` (4 colonnes `created_at`, `updated_at`, `created_by`, `updated_by` — toutes **nullable**), rempli par `TimestampableBlamableSubscriber` (prePersist/preUpdate). Appliqué aux entités du pilote → **1 migration additive** par table concernée, avec `COMMENT ON COLUMN` via `ColumnCommentsCatalog::addStandardTimestampableBlamableComments()`.
|
||||||
|
- **Pagination** : conserver le standard API Platform actuel (les collections du pilote restent paginées comme aujourd'hui).
|
||||||
|
- **`COMMENT ON COLUMN`** : appliqué sur les colonnes ajoutées par #56 (pas de rétro-commentaire forcé sur le legacy).
|
||||||
|
|
||||||
|
## 7. Endpoints modules / sidebar / version
|
||||||
|
|
||||||
|
- `GET /api/modules` (public) — `ModulesResource` + `ModulesProvider` lisant `config/modules.php` (renvoie `{ modules: ["project_management", …] }`).
|
||||||
|
- `GET /api/sidebar` (auth) — `SidebarResource` + `SidebarProvider` lisant `config/sidebar.php` ; filtrage **par module actif** (item `module` absent de la liste active → masqué + route ajoutée à `disabledRoutes`) ; gate de section optionnel `ROLE_ADMIN`. Le filtrage par **permissions fines** est explicitement reporté à #57.
|
||||||
|
- `GET /api/version` — **déjà présent** (`AppVersion`) ; vérifier le format `{ version }`, ré-aligner si besoin (déplacement optionnel vers `Shared/`).
|
||||||
|
- `config/modules.php` : `return [ ProjectManagementModule::class ];` (Core viendra plus tard ; pas de module REQUIRED bloquant en #56).
|
||||||
|
- `config/sidebar.php` : sections « Projets » / « Mes tâches » avec `module => 'project_management'` ; les entrées des domaines encore legacy (Time tracking, Absences, Mail, Admin…) listées **sans** clé `module` (donc toujours visibles) pour ne rien masquer.
|
||||||
|
|
||||||
|
## 8. Frontend — câblage + pilote en layer (sans relooking)
|
||||||
|
|
||||||
|
```
|
||||||
|
frontend/app/
|
||||||
|
├── layouts/default.vue shell : sidebar (depuis /api/sidebar) + main
|
||||||
|
├── middleware/auth.global.ts protège routes, charge sidebar+modules après login
|
||||||
|
└── middleware/modules.global.ts redirige si route ∈ disabledRoutes
|
||||||
|
frontend/shared/
|
||||||
|
├── composables/ useApi (déplacé), useSidebar, useModules, + existants réutilisés
|
||||||
|
├── stores/ auth, ui, timer (timer reste partagé : Time tracking encore legacy)
|
||||||
|
├── utils/ api.ts (extractHydraMembers/fetchAllHydra), …
|
||||||
|
└── types/
|
||||||
|
frontend/modules/project-management/
|
||||||
|
├── nuxt.config.ts defineNuxtConfig({})
|
||||||
|
├── pages/ my-tasks.vue, projects/index.vue, projects/[id]/* (déplacés tels quels)
|
||||||
|
├── components/ task/*, project/* (déplacés)
|
||||||
|
├── services/ tasks.ts, projects.ts, task-*.ts, workflows.ts (déplacés)
|
||||||
|
└── stores/ (si spécifiques au domaine)
|
||||||
|
```
|
||||||
|
|
||||||
|
- **`nuxt.config.ts`** : auto-détection des layers `modules/*/` (scan `readdirSync` comme Starseed) ajoutés à `extends`, + dirs d'auto-import des composables/stores par layer. `extends: ['@malio/layer-ui']` conservé en tête.
|
||||||
|
- **`useSidebar`/`useModules`** : état singleton, `loadSidebar()`/`loadModules()` appelés dans `auth.global.ts`, `reset*()` au logout.
|
||||||
|
- **`modules.global.ts`** : `isRouteDisabled(to.path)` → `navigateTo('/')`.
|
||||||
|
- **Migration des pages** : déplacement **sans réécriture visuelle** ; les pages des autres domaines (time-tracking, absences, mail, admin, profile…) **restent dans `frontend/pages/`** (legacy) tant que leurs modules ne sont pas migrés. Nuxt fusionne les routes du shell + des layers → cohabitation transparente.
|
||||||
|
|
||||||
|
> Point de vigilance front : vérifier que la cohabitation `frontend/pages/` (legacy) + `frontend/modules/*/pages/` (layer) ne crée pas de collision de routes ; `my-tasks`/`projects` sont déplacés **et retirés** de `frontend/pages/` pour éviter le doublon.
|
||||||
|
|
||||||
|
## 9. Plan strangler (ordre d'exécution — app verte à chaque palier)
|
||||||
|
|
||||||
|
1. **Shared/ + garde-fous** : trait, subscriber, `ColumnCommentsCatalog`. Neutre (rien ne les consomme encore).
|
||||||
|
2. **Endpoints modules/sidebar** + `config/modules.php` + `config/sidebar.php` (toutes entrées legacy sans `module` → rien masqué). Additif.
|
||||||
|
3. **Contrats `Shared/Domain/Contract`** + `resolve_target_entities` + `User`/`Client` `implements …Interface`. Neutre.
|
||||||
|
4. **Déplacement back du module** ProjectManagement (entités → Domain/Entity, repos → Infra/Doctrine + interfaces Domain, State, MCP) + mises à jour `doctrine.yaml`/`api_platform.yaml`/`doctrine_migrations.yaml`/`services.yaml`. **`make test` vert.**
|
||||||
|
5. **Migration additive Timestampable** sur les tables du pilote (+ `COMMENT ON COLUMN`).
|
||||||
|
6. **Front shell** : `app/` + `shared/` + middlewares + auto-détection `nuxt.config.ts`. App encore en pages plates.
|
||||||
|
7. **Déplacement front du pilote** vers `modules/project-management/` (pages/components/services), retrait des doublons de `frontend/pages/`.
|
||||||
|
8. **Vérification bout-en-bout** : commenter `ProjectManagementModule::class` dans `config/modules.php` → `/api/modules` ne le liste plus, `/api/sidebar` masque ses entrées + peuple `disabledRoutes`, le front redirige `/my-tasks`→`/`. Décommenter → tout revient. Documenter le test.
|
||||||
|
|
||||||
|
## 10. Critères d'acceptation (repris du ticket, raffinés)
|
||||||
|
|
||||||
|
- [ ] `src/Shared/` + `src/Module/ProjectManagement/{Domain,Application,Infrastructure}` en place.
|
||||||
|
- [ ] `/api/modules`, `/api/sidebar` fonctionnels ; `/api/version` aligné.
|
||||||
|
- [ ] Aucun import direct `App\Entity\User`/`Client` depuis le module (contrats + `resolve_target_entities`).
|
||||||
|
- [ ] Front : layers `frontend/modules/*/` auto-détectés ; `useSidebar`/`useModules` + `auth.global.ts`/`modules.global.ts` opérationnels ; pilote migré sans régression visuelle.
|
||||||
|
- [ ] Garde-fous : TimestampableBlamable (migration additive + `COMMENT ON COLUMN`) ; pagination conservée. **Audit explicitement hors périmètre** (ticket dédié).
|
||||||
|
- [ ] `make test` vert ; activation/désactivation du module validée de bout en bout.
|
||||||
|
- [ ] Aucune migration destructive ; prod déployable sans perte.
|
||||||
|
|
||||||
|
## 11. Risques & points de vigilance
|
||||||
|
|
||||||
|
- **Prod peuplée** : seules migrations additives nullable. `created_by`/`updated_by` non backfillés (historique) — conforme Starseed.
|
||||||
|
- **Changement de namespace des entités** : sans impact DB (Doctrine mappe par table). Vérifier qu'aucun code legacy ne référence en dur `App\Entity\Task` etc. → grep + remplacement (le pilote tire Task/Project, consommés par TimeEntry/Mail/BookStack links restés legacy : ces liens passeront par les contrats ou un type-hint relâché).
|
||||||
|
- **Collision de routes front** legacy vs layer (cf. §8).
|
||||||
|
- **MCP tools** (spécificité Lesstime) : déplacés sous `Module/*/Infrastructure/Mcp/` ; confirmer que `McpSchemaGeneratorPass` les redécouvre (scan `src/`).
|
||||||
|
- **`auto_mapping: true`** : valider que l'ajout d'un mapping explicite ne perturbe pas la résolution (sinon désactiver `auto_mapping` et lister explicitement).
|
||||||
|
|
||||||
|
## 12. Suite
|
||||||
|
|
||||||
|
- Ticket **audit** dédié à créer (infra `#[Auditable]` + `audit_log` + listener + resource), prérequis souple de #57.
|
||||||
|
- #57 RBAC fin (permissions `module.resource.action`, sidebar filtrée par permission).
|
||||||
|
- #58 Répertoire (Clients/Prospects), #59 Reporting, #60 Refonte front Malio.
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
# Roadmap — Migration Lesstime → modular monolith DDD (archi Starseed)
|
||||||
|
|
||||||
|
> Plan de migration **complet** validé le 2026-06-19. Référence architecture : repo **Starseed**
|
||||||
|
> (`.claude/rules/*.md` + implémentation réelle). Détail technique du socle : voir
|
||||||
|
> `2026-06-19-lst-56-modular-monolith-design.md`.
|
||||||
|
|
||||||
|
## Principes directeurs
|
||||||
|
|
||||||
|
- **Strangler progressif** : legacy (`src/Entity/…`) et modules (`src/Module/…`) coexistent ; l'app
|
||||||
|
reste fonctionnelle et `make test` vert à **chaque** merge. Aucune migration destructive (prod Docker, BDD peuplée → migrations **additives nullable** uniquement).
|
||||||
|
- **DDD pragmatique** (= Starseed réel) : ORM attrs dans l'entité Domain, Repository interface (Domain)
|
||||||
|
+ impl Doctrine (Infra), Provider/Processor API Platform, contrats `Shared/Domain/Contract` pour le
|
||||||
|
cross-module. **Pas de CQRS bus, pas de multi-tenant.**
|
||||||
|
- **Tranches verticales** : chaque module de Phase 2 est livré **back + front (layer Malio) + MCP**
|
||||||
|
d'un coup → fonctionnel de bout en bout à son merge. L'ancienne idée d'un « ticket refonte front »
|
||||||
|
global est dissoute : chaque module arrive déjà en Malio ; un ticket de finition harmonise à la fin.
|
||||||
|
- **Ordre par dépendances** : socle → Core (identité/RBAC/audit) → modules métier → transverse/finition.
|
||||||
|
- **Zéro import inter-modules** : interfaces `Shared/Domain/Contract` + `resolve_target_entities`,
|
||||||
|
ou domain events / contrat `NotifierInterface`.
|
||||||
|
|
||||||
|
## Garde-fous Starseed (appliqués à chaque entité migrée)
|
||||||
|
|
||||||
|
`declare(strict_types=1)` · `TimestampableBlamableTrait` (4 colonnes nullable) + subscriber ·
|
||||||
|
pagination obligatoire · `COMMENT ON COLUMN` (helper `ColumnCommentsCatalog`) ·
|
||||||
|
`#[Auditable]`/`#[AuditIgnore]` (dès que 1.3 est livré) · front `Malio*` + `usePaginatedList` +
|
||||||
|
`useFormErrors` · RBAC `module.resource.action` (dès 1.2).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 0 — Socle (fondations, ne touche aucun métier)
|
||||||
|
|
||||||
|
### 0.1 · Socle back — infrastructure modulaire *(réécrit depuis #56)*
|
||||||
|
**Dépend de** : —
|
||||||
|
`src/Shared/Domain/Contract/` (UserInterface, UserResolverInterface, ClientInterface, NotifierInterface),
|
||||||
|
`Shared/Domain/Event/DomainEventInterface`, `Shared/Domain/Trait/TimestampableBlamableTrait`,
|
||||||
|
`Shared/Infrastructure/Doctrine/TimestampableBlamableSubscriber`,
|
||||||
|
`Shared/Infrastructure/Database/ColumnCommentsCatalog`,
|
||||||
|
`Shared/Infrastructure/ApiPlatform/{Resource,State}` (`ModulesResource`/`ModulesProvider`,
|
||||||
|
`SidebarResource`/`SidebarProvider`), `config/modules.php`, `config/sidebar.php`, `/api/version` aligné.
|
||||||
|
Config additive : mapping Doctrine module prêt, `migrations_paths` modulaire, `api_platform.mapping.paths`.
|
||||||
|
**AC** : `/api/modules` + `/api/sidebar` répondent ; app verte ; aucune migration destructive.
|
||||||
|
|
||||||
|
### 0.2 · Socle front — shell + auto-détection des layers
|
||||||
|
**Dépend de** : 0.1
|
||||||
|
`frontend/app/` (shell `layouts/default.vue`), `frontend/shared/` (`useApi` déplacé, `useSidebar`,
|
||||||
|
`useModules`, stores), middlewares `auth.global.ts` + `modules.global.ts`, auto-détection des layers
|
||||||
|
`modules/*/` dans `nuxt.config.ts`. **Aucune page métier déplacée** (app encore plate).
|
||||||
|
**AC** : sidebar dynamique depuis `/api/sidebar` ; routes désactivées redirigées ; app verte.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 1 — Module Core (identité, sécurité, traçabilité — transverse)
|
||||||
|
|
||||||
|
### 1.1 · Core — Identité & Notifications
|
||||||
|
**Dépend de** : 0.1, 0.2
|
||||||
|
Migrer `User` + Auth/JWT dans `src/Module/Core/` (Domain/Entity, Repository interface + Doctrine impl,
|
||||||
|
`MeProvider`, password hasher), `User implements UserInterface`, `resolve_target_entities → Core\User`.
|
||||||
|
`Notification` exposée via `NotifierInterface`. `CoreModule.php` (**REQUIRED=true**). Front : layer
|
||||||
|
`modules/core/` (login, profile, admin users).
|
||||||
|
**AC** : login/JWT OK ; app verte ; aucun import direct `App\Entity\User` hors Core.
|
||||||
|
|
||||||
|
### 1.2 · RBAC fin *(réécrit depuis #57)*
|
||||||
|
**Dépend de** : 1.1
|
||||||
|
`Role`/`Permission`, `permissions()` par module, commande `app:sync-permissions`, `PermissionVoter`,
|
||||||
|
`SidebarProvider` filtrant **par permission** (en plus du module actif), seed RBAC. Front : gestion des
|
||||||
|
rôles + `usePermissions`.
|
||||||
|
**AC** : permissions `module.resource.action` ; sidebar gated par permission.
|
||||||
|
|
||||||
|
### 1.3 · Audit log *(réécrit depuis #61)*
|
||||||
|
**Dépend de** : 1.1
|
||||||
|
`#[Auditable]`/`#[AuditIgnore]` (`Shared/Domain/Attribute`), table `audit_log` (migration additive +
|
||||||
|
`COMMENT ON COLUMN`), `AuditListener`/`AuditLogWriter`/`RequestIdProvider`, `AuditLogResource` +
|
||||||
|
`/api/audit-logs` paginé/filtrable, page front + labels i18n `audit.entity.*`.
|
||||||
|
**AC** : CRUD des entités `#[Auditable]` tracé ; endpoint paginé ; aucune migration destructive.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 2 — Modules métier (tranches verticales back + front + MCP, strangler)
|
||||||
|
|
||||||
|
### 2.1 · Module TimeTracking *(premier module — rodage)*
|
||||||
|
**Dépend de** : 1.1
|
||||||
|
Migrer `TimeEntry` → `src/Module/TimeTracking/` (Domain/Entity, repo, `ActiveTimeEntryProvider`,
|
||||||
|
`TimeEntryExportService`/controller, MCP TimeEntry tools), front layer `modules/time-tracking/`
|
||||||
|
(`time-tracking.vue`, components, services, store `timer`). Timestampable additif. **Rode toute la
|
||||||
|
mécanique modulaire à risque quasi nul.**
|
||||||
|
**AC** : time tracking fonctionnel en module ; activation/désactivation testée ; app verte.
|
||||||
|
|
||||||
|
### 2.2 · Module ProjectManagement *(cœur métier — réécrit depuis #56 pilote)*
|
||||||
|
**Dépend de** : 2.1, 1.1
|
||||||
|
`Project, Task, Workflow, TaskStatus, TaskGroup, TaskEffort, TaskPriority, TaskTag, TaskRecurrence,
|
||||||
|
TaskDocument` → `src/Module/ProjectManagement/` (vertical back + MCP Task/Project/TaskMeta/Workflow +
|
||||||
|
front layer `modules/project-management/`). User/Client via contrats (Client encore legacy jusqu'à 2.4).
|
||||||
|
Notifications via `NotifierInterface`. `#[ApiResource]` conservés (étendre le scan). Timestampable additif.
|
||||||
|
**AC** : cœur en module sans régression API ; app verte.
|
||||||
|
|
||||||
|
### 2.3 · Module Absence
|
||||||
|
**Dépend de** : 1.1
|
||||||
|
`AbsenceRequest/AbsencePolicy/AbsenceBalance` + services (`AbsenceBalanceService`, `AbsenceDayCalculator`,
|
||||||
|
`PublicHolidayProvider`) + controllers (calendar, preview, justificatif) + MCP absence tools →
|
||||||
|
`src/Module/Absence/`, front layer `modules/absence/`.
|
||||||
|
**AC** : module absences complet ; app verte.
|
||||||
|
|
||||||
|
### 2.4 · Module Directory — Clients + Prospects *(réécrit depuis #58)*
|
||||||
|
**Dépend de** : 1.1 (et après 2.2 qui référence Client via contrat)
|
||||||
|
`Client` → `src/Module/Directory/` + nouvelle entité `Prospect`. L'impl de `ClientInterface` migre du
|
||||||
|
legacy vers le module (`resolve_target_entities` mis à jour). Front répertoire (clients + prospects).
|
||||||
|
**AC** : Clients + Prospects en module ; contrats à jour ; app verte.
|
||||||
|
|
||||||
|
### 2.5 · Module Mail
|
||||||
|
**Dépend de** : 1.1, 2.2 (TaskMailLink → Task)
|
||||||
|
`Mail*` + `TaskMailLink` + `MailSyncService` + controllers + settings → `src/Module/Mail/`, front layer.
|
||||||
|
Intègre le WIP `feat/mail-integration`.
|
||||||
|
**AC** : mail en module ; app verte.
|
||||||
|
|
||||||
|
### 2.6 · Module Integration — Gitea / BookStack / Zimbra / Share
|
||||||
|
**Dépend de** : 1.1, 2.2 (liens Task)
|
||||||
|
Configs + services API (`GiteaApiService`, `BookStackApiService`, `CalDavService`, Share) + controllers +
|
||||||
|
liens → `src/Module/Integration/`, front (onglets admin + sections task).
|
||||||
|
**AC** : intégrations en module ; app verte.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 3 — Transverse & finition
|
||||||
|
|
||||||
|
### 3.1 · Module Reporting *(réécrit depuis #59)*
|
||||||
|
**Dépend de** : Phase 2 (consomme les modules)
|
||||||
|
Reporting natif transverse (agrège time tracking, tâches, absences) via contrats / API. Module
|
||||||
|
`src/Module/Reporting/` + front.
|
||||||
|
**AC** : rapports natifs ; aucune dépendance directe inter-modules.
|
||||||
|
|
||||||
|
### 3.2 · Module Portail client
|
||||||
|
**Dépend de** : 1.1, 2.2, 2.4
|
||||||
|
Portail client (accès restreint), module `src/Module/ClientPortal/` + front layer + RBAC dédié.
|
||||||
|
**AC** : portail fonctionnel ; gated RBAC.
|
||||||
|
|
||||||
|
### 3.3 · Finition Malio + nettoyage legacy *(réécrit depuis #60)*
|
||||||
|
**Dépend de** : tout
|
||||||
|
Harmonisation visuelle Malio finale, **vidage de `src/Entity/` legacy résiduel**, suppression du mapping
|
||||||
|
Doctrine legacy + des pages plates `frontend/pages/` résiduelles, durcissement `resolve_target_entities`.
|
||||||
|
**AC** : `src/Entity` vide ; 100 % modulaire ; app verte ; aucune route/legacy orpheline.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Ordre d'exécution recommandé
|
||||||
|
|
||||||
|
`0.1 → 0.2 → 1.1 → 1.2 → 1.3 → 2.1 → 2.2 → 2.3 → 2.4 → 2.5 → 2.6 → 3.1 → 3.2 → 3.3`
|
||||||
|
|
||||||
|
Les tickets 1.2 et 1.3 peuvent se paralléliser après 1.1. Les modules 2.3 (Absence) et 2.4 (Directory)
|
||||||
|
peuvent se paralléliser après 2.2. Mail (2.5) et Integration (2.6) suivent 2.2.
|
||||||
|
|
||||||
|
## Mapping avec les tickets Lesstime existants
|
||||||
|
|
||||||
|
| Ancien | Devient |
|
||||||
|
|--------|---------|
|
||||||
|
| #56 (1/5 Aligner archi) | **0.1 Socle back** (le reste éclaté en 0.2 + 2.2) |
|
||||||
|
| #57 (2/5 RBAC) | **1.2 RBAC fin** |
|
||||||
|
| #58 (3/5 Répertoire) | **2.4 Directory** |
|
||||||
|
| #59 (4/5 Reporting) | **3.1 Reporting** |
|
||||||
|
| #60 (5/5 Front Malio) | **3.3 Finition Malio + nettoyage** (le front se fait par module) |
|
||||||
|
| #61 (Audit) | **1.3 Audit log** |
|
||||||
|
| *(créés)* | 0.2, 1.1, 2.1, 2.2, 2.3, 2.5, 2.6, 3.2 |
|
||||||
@@ -38,131 +38,47 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<nav class="flex-1 overflow-hidden" :class="sidebarIsCollapsed ? 'px-1 pb-6' : 'px-4 pb-6'">
|
<nav class="flex-1 overflow-hidden" :class="sidebarIsCollapsed ? 'px-1 pb-6' : 'px-4 pb-6'">
|
||||||
<SidebarLink
|
<!-- Sections dynamiques (/api/sidebar) : navigation globale + sections gated par rôle -->
|
||||||
to="/"
|
<template v-for="(section, sIndex) in translatedSections" :key="section.label">
|
||||||
icon="mdi:view-dashboard-outline"
|
|
||||||
label="Tableau de bord"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
:class="sidebarIsCollapsed ? 'mt-4' : 'border-t border-secondary-500 pt-6'"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- Section : Gestion de projet -->
|
|
||||||
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
|
||||||
Gestion de projet
|
|
||||||
</p>
|
|
||||||
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
|
||||||
<SidebarLink
|
|
||||||
to="/my-tasks"
|
|
||||||
icon="mdi:clipboard-check-outline"
|
|
||||||
label="Mes tâches"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<SidebarLink
|
|
||||||
to="/projects"
|
|
||||||
icon="mdi:folder-outline"
|
|
||||||
label="Projets"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<template v-if="currentProjectId">
|
|
||||||
<SidebarLink
|
|
||||||
:to="`/projects/${currentProjectId}`"
|
|
||||||
icon="mdi:view-column-outline"
|
|
||||||
label="Kanban"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
sub
|
|
||||||
exact
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<SidebarLink
|
|
||||||
:to="`/projects/${currentProjectId}/groups`"
|
|
||||||
icon="mdi:tag-multiple-outline"
|
|
||||||
label="Groupes"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
sub
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<SidebarLink
|
|
||||||
:to="`/projects/${currentProjectId}/archives`"
|
|
||||||
icon="mdi:archive-outline"
|
|
||||||
label="Archives"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
sub
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
<SidebarLink
|
|
||||||
to="/time-tracking"
|
|
||||||
icon="mdi:calendar-edit-outline"
|
|
||||||
label="Suivi de temps"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<SidebarLink
|
|
||||||
v-if="isDocumentsVisible"
|
|
||||||
to="/documents"
|
|
||||||
icon="mdi:folder-network-outline"
|
|
||||||
:label="$t('sharedFiles.sidebar.title')"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<div v-if="isMailVisible" class="relative">
|
|
||||||
<SidebarLink
|
|
||||||
to="/mail"
|
|
||||||
icon="mdi:email-outline"
|
|
||||||
:label="$t('mail.sidebar.title')"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<span
|
|
||||||
v-if="mailStore.globalUnreadCount > 0"
|
|
||||||
class="pointer-events-none absolute right-3 top-1/2 flex h-5 min-w-5 -translate-y-1/2 items-center justify-center rounded-full bg-red-500 px-1 text-xs font-bold text-white"
|
|
||||||
:class="{ 'right-1 top-1 translate-y-0': sidebarIsCollapsed }"
|
|
||||||
:aria-label="`${mailStore.globalUnreadCount} messages non lus`"
|
|
||||||
>
|
|
||||||
{{ mailStore.globalUnreadCount > 99 ? '99+' : mailStore.globalUnreadCount }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Section : Absences -->
|
|
||||||
<template v-if="isAbsenceSectionVisible">
|
|
||||||
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
||||||
Absences
|
{{ section.label }}
|
||||||
</p>
|
|
||||||
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
|
||||||
</template>
|
|
||||||
<SidebarLink
|
|
||||||
v-if="isEmployee"
|
|
||||||
to="/absences"
|
|
||||||
icon="mdi:umbrella-beach-outline"
|
|
||||||
label="Mes absences"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
<SidebarLink
|
|
||||||
v-if="isAdmin"
|
|
||||||
to="/team-absences"
|
|
||||||
icon="mdi:calendar-account-outline"
|
|
||||||
label="Absences équipe"
|
|
||||||
:collapsed="sidebarIsCollapsed"
|
|
||||||
@click="ui.closeMobileSidebar()"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- Section : Administration (admin only) -->
|
|
||||||
<template v-if="isAdmin">
|
|
||||||
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
|
||||||
Administration
|
|
||||||
</p>
|
</p>
|
||||||
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
||||||
<SidebarLink
|
<SidebarLink
|
||||||
to="/admin"
|
v-for="item in section.items"
|
||||||
icon="mdi:cog-outline"
|
:key="item.to"
|
||||||
label="Administration"
|
:to="item.to"
|
||||||
|
:icon="item.icon"
|
||||||
|
:label="item.label"
|
||||||
:collapsed="sidebarIsCollapsed"
|
:collapsed="sidebarIsCollapsed"
|
||||||
@click="ui.closeMobileSidebar()"
|
@click="ui.closeMobileSidebar()"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<!-- Items conservés côté client, insérés après la 1re section (cf. décision 3) -->
|
||||||
|
<template v-if="sIndex === 0">
|
||||||
|
<!-- Contextuel projet -->
|
||||||
|
<template v-if="currentProjectId">
|
||||||
|
<SidebarLink :to="`/projects/${currentProjectId}`" icon="mdi:view-column-outline" label="Kanban" :collapsed="sidebarIsCollapsed" sub exact @click="ui.closeMobileSidebar()" />
|
||||||
|
<SidebarLink :to="`/projects/${currentProjectId}/groups`" icon="mdi:tag-multiple-outline" label="Groupes" :collapsed="sidebarIsCollapsed" sub @click="ui.closeMobileSidebar()" />
|
||||||
|
<SidebarLink :to="`/projects/${currentProjectId}/archives`" icon="mdi:archive-outline" label="Archives" :collapsed="sidebarIsCollapsed" sub @click="ui.closeMobileSidebar()" />
|
||||||
|
</template>
|
||||||
|
<!-- Feature-flag : Documents -->
|
||||||
|
<SidebarLink v-if="isDocumentsVisible" to="/documents" icon="mdi:folder-network-outline" :label="$t('sharedFiles.sidebar.title')" :collapsed="sidebarIsCollapsed" @click="ui.closeMobileSidebar()" />
|
||||||
|
<!-- Feature-flag : Mail + badge -->
|
||||||
|
<div v-if="isMailVisible" class="relative">
|
||||||
|
<SidebarLink to="/mail" icon="mdi:email-outline" :label="$t('mail.sidebar.title')" :collapsed="sidebarIsCollapsed" @click="ui.closeMobileSidebar()" />
|
||||||
|
<span
|
||||||
|
v-if="mailStore.globalUnreadCount > 0"
|
||||||
|
class="pointer-events-none absolute right-3 top-1/2 flex h-5 min-w-5 -translate-y-1/2 items-center justify-center rounded-full bg-red-500 px-1 text-xs font-bold text-white"
|
||||||
|
:class="{ 'right-1 top-1 translate-y-0': sidebarIsCollapsed }"
|
||||||
|
:aria-label="`${mailStore.globalUnreadCount} messages non lus`"
|
||||||
|
>
|
||||||
|
{{ mailStore.globalUnreadCount > 99 ? '99+' : mailStore.globalUnreadCount }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<!-- User-flag : Mes absences (isEmployee — non couvert par le gate rôle) -->
|
||||||
|
<SidebarLink v-if="isEmployee" to="/absences" icon="mdi:umbrella-beach-outline" label="Mes absences" :collapsed="sidebarIsCollapsed" @click="ui.closeMobileSidebar()" />
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
@@ -220,10 +136,22 @@ const ui = useUiStore()
|
|||||||
const mailStore = useMailStore()
|
const mailStore = useMailStore()
|
||||||
const {version} = useAppVersion()
|
const {version} = useAppVersion()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
|
const { t } = useI18n()
|
||||||
|
const { sections } = useSidebar()
|
||||||
|
|
||||||
|
const translatedSections = computed(() =>
|
||||||
|
sections.value.map((section) => ({
|
||||||
|
label: t(section.label),
|
||||||
|
icon: section.icon,
|
||||||
|
items: section.items.map((item) => ({
|
||||||
|
label: t(item.label),
|
||||||
|
to: item.to,
|
||||||
|
icon: item.icon,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
)
|
||||||
|
|
||||||
const isAdmin = computed(() => (auth.user?.roles ?? []).includes('ROLE_ADMIN'))
|
|
||||||
const isEmployee = computed(() => Boolean(auth.user?.isEmployee))
|
const isEmployee = computed(() => Boolean(auth.user?.isEmployee))
|
||||||
const isAbsenceSectionVisible = computed(() => isEmployee.value || isAdmin.value)
|
|
||||||
|
|
||||||
const isMailVisible = computed(() => {
|
const isMailVisible = computed(() => {
|
||||||
const roles: string[] = auth.user?.roles ?? []
|
const roles: string[] = auth.user?.roles ?? []
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
export default defineNuxtRouteMiddleware(async (to) => {
|
||||||
|
const auth = useAuthStore()
|
||||||
|
const isLogin = to.path === '/login'
|
||||||
|
|
||||||
|
if (!auth.checked) {
|
||||||
|
await auth.ensureSession()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isLogin && !auth.isAuthenticated) {
|
||||||
|
return navigateTo('/login')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isLogin && auth.isAuthenticated) {
|
||||||
|
return navigateTo('/')
|
||||||
|
}
|
||||||
|
|
||||||
|
const { loaded: sidebarLoaded, loadSidebar, resetSidebar } = useSidebar()
|
||||||
|
const { loaded: modulesLoaded, loadModules, resetModules } = useModules()
|
||||||
|
|
||||||
|
if (auth.isAuthenticated) {
|
||||||
|
await Promise.all([
|
||||||
|
sidebarLoaded.value ? Promise.resolve() : loadSidebar(),
|
||||||
|
modulesLoaded.value ? Promise.resolve() : loadModules(),
|
||||||
|
])
|
||||||
|
} else {
|
||||||
|
// Logout / session expirée : purge l'état partagé pour le prochain login.
|
||||||
|
resetSidebar()
|
||||||
|
resetModules()
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
export default defineNuxtRouteMiddleware(async (to) => {
|
||||||
|
const auth = useAuthStore()
|
||||||
|
if (!auth.isAuthenticated) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const { loaded, loadSidebar, isRouteDisabled } = useSidebar()
|
||||||
|
if (!loaded.value) {
|
||||||
|
await loadSidebar()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isRouteDisabled(to.path)) {
|
||||||
|
return navigateTo('/')
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -8,7 +8,7 @@ import { useMailService } from '~/services/mail'
|
|||||||
import { useProjectService } from '~/services/projects'
|
import { useProjectService } from '~/services/projects'
|
||||||
import { useTaskGroupService } from '~/services/task-groups'
|
import { useTaskGroupService } from '~/services/task-groups'
|
||||||
import { useUserService } from '~/services/users'
|
import { useUserService } from '~/services/users'
|
||||||
import { useAuthStore } from '~/stores/auth'
|
import { useAuthStore } from '~/shared/stores/auth'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
modelValue: boolean
|
modelValue: boolean
|
||||||
|
|||||||
@@ -296,7 +296,19 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sidebar": {
|
"sidebar": {
|
||||||
"myTasks": "Mes tâches"
|
"myTasks": "Mes tâches",
|
||||||
|
"general": {
|
||||||
|
"section": "Gestion de projet",
|
||||||
|
"dashboard": "Tableau de bord",
|
||||||
|
"myTasks": "Mes tâches",
|
||||||
|
"projects": "Projets",
|
||||||
|
"timeTracking": "Suivi de temps"
|
||||||
|
},
|
||||||
|
"admin": {
|
||||||
|
"section": "Administration",
|
||||||
|
"teamAbsences": "Absences équipe",
|
||||||
|
"administration": "Administration"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
"cancel": "Annuler",
|
"cancel": "Annuler",
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
export default defineNuxtRouteMiddleware(async (to) => {
|
|
||||||
const auth = useAuthStore()
|
|
||||||
const isLogin = to.path === '/login'
|
|
||||||
|
|
||||||
if (!auth.checked) {
|
|
||||||
await auth.ensureSession()
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isLogin && !auth.isAuthenticated) {
|
|
||||||
return navigateTo('/login')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isLogin && auth.isAuthenticated) {
|
|
||||||
return navigateTo('/')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export default defineNuxtConfig({})
|
||||||
+45
-12
@@ -1,14 +1,32 @@
|
|||||||
|
import { existsSync, readdirSync } from 'node:fs'
|
||||||
|
import { resolve } from 'node:path'
|
||||||
|
|
||||||
|
const modulesDir = resolve(__dirname, 'modules')
|
||||||
|
const moduleDirs = existsSync(modulesDir)
|
||||||
|
? readdirSync(modulesDir, { withFileTypes: true })
|
||||||
|
.filter((d) => d.isDirectory())
|
||||||
|
.map((d) => d.name)
|
||||||
|
: []
|
||||||
|
const moduleLayers = moduleDirs.map((name) => `./modules/${name}`)
|
||||||
|
const moduleComposableDirs = moduleDirs
|
||||||
|
.map((name) => `modules/${name}/composables`)
|
||||||
|
.filter((path) => existsSync(resolve(__dirname, path)))
|
||||||
|
const moduleStoreDirs = moduleDirs
|
||||||
|
.map((name) => `modules/${name}/stores`)
|
||||||
|
.filter((path) => existsSync(resolve(__dirname, path)))
|
||||||
|
|
||||||
export default defineNuxtConfig({
|
export default defineNuxtConfig({
|
||||||
compatibilityDate: '2025-07-15',
|
compatibilityDate: '2025-07-15',
|
||||||
devtools: {enabled: false},
|
devtools: { enabled: false },
|
||||||
ssr: false,
|
ssr: false,
|
||||||
|
srcDir: '.',
|
||||||
css: ['~/assets/css/app.css', '~/assets/css/dark.css'],
|
css: ['~/assets/css/app.css', '~/assets/css/dark.css'],
|
||||||
app: {
|
app: {
|
||||||
baseURL: process.env.NODE_ENV === 'production'
|
baseURL: process.env.NODE_ENV === 'production'
|
||||||
? (process.env.NUXT_PUBLIC_APP_BASE || '/')
|
? (process.env.NUXT_PUBLIC_APP_BASE || '/')
|
||||||
: '/'
|
: '/',
|
||||||
},
|
},
|
||||||
extends: ['@malio/layer-ui'],
|
extends: ['@malio/layer-ui', ...moduleLayers],
|
||||||
modules: [
|
modules: [
|
||||||
'@nuxtjs/tailwindcss',
|
'@nuxtjs/tailwindcss',
|
||||||
'@pinia/nuxt',
|
'@pinia/nuxt',
|
||||||
@@ -16,16 +34,35 @@ export default defineNuxtConfig({
|
|||||||
'@nuxtjs/i18n',
|
'@nuxtjs/i18n',
|
||||||
'@nuxt/icon',
|
'@nuxt/icon',
|
||||||
],
|
],
|
||||||
|
dir: {
|
||||||
|
layouts: 'app/layouts',
|
||||||
|
middleware: 'app/middleware',
|
||||||
|
},
|
||||||
|
imports: {
|
||||||
|
dirs: [
|
||||||
|
'shared/composables',
|
||||||
|
'shared/stores',
|
||||||
|
'shared/utils',
|
||||||
|
'composables',
|
||||||
|
'stores',
|
||||||
|
'utils',
|
||||||
|
...moduleComposableDirs,
|
||||||
|
...moduleStoreDirs,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
pinia: {
|
||||||
|
storesDirs: ['shared/stores/**', 'stores/**', 'modules/*/stores/**'],
|
||||||
|
},
|
||||||
runtimeConfig: {
|
runtimeConfig: {
|
||||||
public: {
|
public: {
|
||||||
apiBase: process.env.NUXT_PUBLIC_API_BASE
|
apiBase: process.env.NUXT_PUBLIC_API_BASE,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
devServer: {
|
devServer: {
|
||||||
port: 3002,
|
port: 3002,
|
||||||
},
|
},
|
||||||
components: [
|
components: [
|
||||||
{path: '~/components', pathPrefix: false},
|
{ path: '~/components', pathPrefix: false },
|
||||||
],
|
],
|
||||||
vite: {
|
vite: {
|
||||||
server: {
|
server: {
|
||||||
@@ -56,10 +93,6 @@ export default defineNuxtConfig({
|
|||||||
{code: 'fr', file: 'fr.json', name: 'Français'}
|
{code: 'fr', file: 'fr.json', name: 'Français'}
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
typescript: {
|
typescript: { strict: true },
|
||||||
strict: true
|
build: { transpile: ['@vuepic/vue-datepicker'] },
|
||||||
},
|
|
||||||
build: {
|
|
||||||
transpile: ['@vuepic/vue-datepicker']
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { FetchOptions } from 'ofetch'
|
import type { FetchOptions } from 'ofetch'
|
||||||
import { $fetch, FetchError } from 'ofetch'
|
import { $fetch, FetchError } from 'ofetch'
|
||||||
import { useAuthStore } from '~/stores/auth'
|
import { useAuthStore } from '~/shared/stores/auth'
|
||||||
|
|
||||||
export type AnyObject = Record<string, unknown>
|
export type AnyObject = Record<string, unknown>
|
||||||
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
const activeModuleIds = ref<string[]>([])
|
||||||
|
const loaded = ref(false)
|
||||||
|
|
||||||
|
export function useModules() {
|
||||||
|
async function loadModules(): Promise<void> {
|
||||||
|
const api = useApi()
|
||||||
|
const data = await api.get<{ modules: string[] }>('/modules', {}, { toast: false })
|
||||||
|
activeModuleIds.value = data.modules ?? []
|
||||||
|
loaded.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function isModuleActive(id: string): boolean {
|
||||||
|
return activeModuleIds.value.includes(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetModules(): void {
|
||||||
|
activeModuleIds.value = []
|
||||||
|
loaded.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
return { activeModuleIds, loaded, loadModules, isModuleActive, resetModules }
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import type { SidebarSection } from '~/shared/types/sidebar'
|
||||||
|
|
||||||
|
const sections = ref<SidebarSection[]>([])
|
||||||
|
const disabledRoutes = ref<string[]>([])
|
||||||
|
const loaded = ref(false)
|
||||||
|
|
||||||
|
export function useSidebar() {
|
||||||
|
async function loadSidebar(): Promise<void> {
|
||||||
|
const api = useApi()
|
||||||
|
const data = await api.get<{ sections: SidebarSection[]; disabledRoutes: string[] }>(
|
||||||
|
'/sidebar', {}, { toast: false },
|
||||||
|
)
|
||||||
|
sections.value = data.sections ?? []
|
||||||
|
disabledRoutes.value = data.disabledRoutes ?? []
|
||||||
|
loaded.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function isRouteDisabled(path: string): boolean {
|
||||||
|
return disabledRoutes.value.some(
|
||||||
|
(disabled) => path === disabled || path.startsWith(disabled + '/'),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetSidebar(): void {
|
||||||
|
sections.value = []
|
||||||
|
disabledRoutes.value = []
|
||||||
|
loaded.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
return { sections, disabledRoutes, loaded, loadSidebar, isRouteDisabled, resetSidebar }
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
export type SidebarItem = {
|
||||||
|
label: string
|
||||||
|
to: string
|
||||||
|
icon: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export type SidebarSection = {
|
||||||
|
label: string
|
||||||
|
icon: string
|
||||||
|
items: SidebarItem[]
|
||||||
|
}
|
||||||
@@ -73,7 +73,7 @@ COPY --from=frontend-build /app/frontend/.output/public /var/www/html/frontend/.
|
|||||||
RUN echo "APP_ENV=prod" > /var/www/html/.env
|
RUN echo "APP_ENV=prod" > /var/www/html/.env
|
||||||
|
|
||||||
# Permissions
|
# Permissions
|
||||||
RUN mkdir -p /var/www/html/var /var/www/html/var/uploads /var/www/html/var/mcp-sessions \
|
RUN mkdir -p /var/www/html/var /var/www/html/var/log /var/www/html/var/uploads /var/www/html/var/mcp-sessions \
|
||||||
&& chown -R www-data:www-data /var/www/html/var
|
&& chown -R www-data:www-data /var/www/html/var
|
||||||
|
|
||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ declare(strict_types=1);
|
|||||||
namespace App\Command;
|
namespace App\Command;
|
||||||
|
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\AbsenceBalanceRepository;
|
use App\Repository\AbsenceBalanceRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use App\Service\AbsenceBalanceService;
|
use App\Service\AbsenceBalanceService;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
@@ -37,7 +37,7 @@ use function sprintf;
|
|||||||
class AccrueLeaveCommand extends Command
|
class AccrueLeaveCommand extends Command
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly AbsenceBalanceRepository $balanceRepository,
|
private readonly AbsenceBalanceRepository $balanceRepository,
|
||||||
private readonly AbsenceBalanceService $balanceService,
|
private readonly AbsenceBalanceService $balanceService,
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Command;
|
namespace App\Command;
|
||||||
|
|
||||||
use App\Repository\UserRepository;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
@@ -22,7 +22,7 @@ use function sprintf;
|
|||||||
class GenerateApiTokenCommand extends Command
|
class GenerateApiTokenCommand extends Command
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller\Absence;
|
namespace App\Controller\Absence;
|
||||||
|
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Enum\HalfDay;
|
use App\Enum\HalfDay;
|
||||||
use App\Repository\AbsenceBalanceRepository;
|
use App\Repository\AbsenceBalanceRepository;
|
||||||
use App\Repository\AbsencePolicyRepository;
|
use App\Repository\AbsencePolicyRepository;
|
||||||
use App\Service\AbsenceBalanceService;
|
use App\Service\AbsenceBalanceService;
|
||||||
use App\Service\AbsenceDayCalculator;
|
use App\Service\AbsenceDayCalculator;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
@@ -71,7 +71,7 @@ class AbsencePreviewController extends AbstractController
|
|||||||
);
|
);
|
||||||
|
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
assert($user instanceof User);
|
assert($user instanceof UserInterface);
|
||||||
|
|
||||||
$available = null;
|
$available = null;
|
||||||
$projectedAvailable = null;
|
$projectedAvailable = null;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ use App\Entity\Task;
|
|||||||
use App\Entity\TaskGroup;
|
use App\Entity\TaskGroup;
|
||||||
use App\Entity\TaskMailLink;
|
use App\Entity\TaskMailLink;
|
||||||
use App\Entity\TaskStatus;
|
use App\Entity\TaskStatus;
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use App\Repository\MailMessageRepository;
|
use App\Repository\MailMessageRepository;
|
||||||
use App\Repository\TaskRepository;
|
use App\Repository\TaskRepository;
|
||||||
use App\Security\MailAccessChecker;
|
use App\Security\MailAccessChecker;
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineNotificationRepository;
|
||||||
use App\Repository\NotificationRepository;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
@@ -14,14 +14,14 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
|
|||||||
class MarkAllReadController extends AbstractController
|
class MarkAllReadController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly NotificationRepository $notificationRepository,
|
private readonly DoctrineNotificationRepository $notificationRepository,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/api/notifications/mark-all-read', name: 'notification_mark_all_read', methods: ['POST'], priority: 1)]
|
#[Route('/api/notifications/mark-all-read', name: 'notification_mark_all_read', methods: ['POST'], priority: 1)]
|
||||||
#[IsGranted('IS_AUTHENTICATED_FULLY')]
|
#[IsGranted('IS_AUTHENTICATED_FULLY')]
|
||||||
public function __invoke(): Response
|
public function __invoke(): Response
|
||||||
{
|
{
|
||||||
/** @var User $user */
|
/** @var UserInterface $user */
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
|
|
||||||
$this->notificationRepository->markAllReadByUser($user);
|
$this->notificationRepository->markAllReadByUser($user);
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineNotificationRepository;
|
||||||
use App\Repository\NotificationRepository;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
@@ -14,14 +14,14 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
|
|||||||
class NotificationUnreadCountController extends AbstractController
|
class NotificationUnreadCountController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly NotificationRepository $notificationRepository,
|
private readonly DoctrineNotificationRepository $notificationRepository,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
#[Route('/api/notifications/unread-count', name: 'notification_unread_count', methods: ['GET'], priority: 1)]
|
#[Route('/api/notifications/unread-count', name: 'notification_unread_count', methods: ['GET'], priority: 1)]
|
||||||
#[IsGranted('IS_AUTHENTICATED_FULLY')]
|
#[IsGranted('IS_AUTHENTICATED_FULLY')]
|
||||||
public function __invoke(): JsonResponse
|
public function __invoke(): JsonResponse
|
||||||
{
|
{
|
||||||
/** @var User $user */
|
/** @var UserInterface $user */
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
|
|
||||||
$count = $this->notificationRepository->countUnreadByUser($user);
|
$count = $this->notificationRepository->countUnreadByUser($user);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use App\Entity\Project;
|
use App\Entity\Project;
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use App\Repository\TimeEntryRepository;
|
use App\Repository\TimeEntryRepository;
|
||||||
use App\Service\TimeEntryExportService;
|
use App\Service\TimeEntryExportService;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller;
|
namespace App\Controller;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ use App\Entity\TaskRecurrence;
|
|||||||
use App\Entity\TaskStatus;
|
use App\Entity\TaskStatus;
|
||||||
use App\Entity\TaskTag;
|
use App\Entity\TaskTag;
|
||||||
use App\Entity\TimeEntry;
|
use App\Entity\TimeEntry;
|
||||||
use App\Entity\User;
|
|
||||||
use App\Entity\Workflow;
|
use App\Entity\Workflow;
|
||||||
use App\Entity\ZimbraConfiguration;
|
use App\Entity\ZimbraConfiguration;
|
||||||
use App\Enum\AbsenceStatus;
|
use App\Enum\AbsenceStatus;
|
||||||
@@ -26,6 +25,7 @@ use App\Enum\AbsenceType;
|
|||||||
use App\Enum\ContractType;
|
use App\Enum\ContractType;
|
||||||
use App\Enum\RecurrenceType;
|
use App\Enum\RecurrenceType;
|
||||||
use App\Enum\StatusCategory;
|
use App\Enum\StatusCategory;
|
||||||
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use DateTimeZone;
|
use DateTimeZone;
|
||||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ use ApiPlatform\Metadata\GetCollection;
|
|||||||
use ApiPlatform\Metadata\Patch;
|
use ApiPlatform\Metadata\Patch;
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Repository\AbsenceBalanceRepository;
|
use App\Repository\AbsenceBalanceRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use App\State\AbsenceBalanceProvider;
|
use App\State\AbsenceBalanceProvider;
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
@@ -45,10 +46,10 @@ class AbsenceBalance
|
|||||||
#[Groups(['absence_balance:read'])]
|
#[Groups(['absence_balance:read'])]
|
||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
#[Groups(['absence_balance:read'])]
|
#[Groups(['absence_balance:read'])]
|
||||||
private ?User $user = null;
|
private ?UserInterface $user = null;
|
||||||
|
|
||||||
#[ORM\Column(type: Types::STRING, length: 32, enumType: AbsenceType::class)]
|
#[ORM\Column(type: Types::STRING, length: 32, enumType: AbsenceType::class)]
|
||||||
#[Groups(['absence_balance:read'])]
|
#[Groups(['absence_balance:read'])]
|
||||||
@@ -110,12 +111,12 @@ class AbsenceBalance
|
|||||||
return $this->id;
|
return $this->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getUser(): ?User
|
public function getUser(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->user;
|
return $this->user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setUser(?User $user): static
|
public function setUser(?UserInterface $user): static
|
||||||
{
|
{
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use App\Enum\AbsenceStatus;
|
|||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Enum\HalfDay;
|
use App\Enum\HalfDay;
|
||||||
use App\Repository\AbsenceRequestRepository;
|
use App\Repository\AbsenceRequestRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use App\State\AbsenceCancelProcessor;
|
use App\State\AbsenceCancelProcessor;
|
||||||
use App\State\AbsenceRequestProcessor;
|
use App\State\AbsenceRequestProcessor;
|
||||||
use App\State\AbsenceRequestProvider;
|
use App\State\AbsenceRequestProvider;
|
||||||
@@ -73,10 +74,10 @@ class AbsenceRequest
|
|||||||
#[Groups(['absence_request:read'])]
|
#[Groups(['absence_request:read'])]
|
||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
#[Groups(['absence_request:read'])]
|
#[Groups(['absence_request:read'])]
|
||||||
private ?User $user = null;
|
private ?UserInterface $user = null;
|
||||||
|
|
||||||
#[ORM\Column(type: Types::STRING, length: 32, enumType: AbsenceType::class)]
|
#[ORM\Column(type: Types::STRING, length: 32, enumType: AbsenceType::class)]
|
||||||
#[Groups(['absence_request:read', 'absence_request:write'])]
|
#[Groups(['absence_request:read', 'absence_request:write'])]
|
||||||
@@ -130,10 +131,10 @@ class AbsenceRequest
|
|||||||
#[Groups(['absence_request:read'])]
|
#[Groups(['absence_request:read'])]
|
||||||
private ?DateTimeImmutable $reviewedAt = null;
|
private ?DateTimeImmutable $reviewedAt = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||||
#[Groups(['absence_request:read'])]
|
#[Groups(['absence_request:read'])]
|
||||||
private ?User $reviewedBy = null;
|
private ?UserInterface $reviewedBy = null;
|
||||||
|
|
||||||
#[Groups(['absence_request:read'])]
|
#[Groups(['absence_request:read'])]
|
||||||
public function getLabel(): ?string
|
public function getLabel(): ?string
|
||||||
@@ -156,12 +157,12 @@ class AbsenceRequest
|
|||||||
return $this->id;
|
return $this->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getUser(): ?User
|
public function getUser(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->user;
|
return $this->user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setUser(?User $user): static
|
public function setUser(?UserInterface $user): static
|
||||||
{
|
{
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
|
||||||
@@ -312,12 +313,12 @@ class AbsenceRequest
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getReviewedBy(): ?User
|
public function getReviewedBy(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->reviewedBy;
|
return $this->reviewedBy;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setReviewedBy(?User $reviewedBy): static
|
public function setReviewedBy(?UserInterface $reviewedBy): static
|
||||||
{
|
{
|
||||||
$this->reviewedBy = $reviewedBy;
|
$this->reviewedBy = $reviewedBy;
|
||||||
|
|
||||||
|
|||||||
+10
-9
@@ -16,6 +16,7 @@ use ApiPlatform\Metadata\GetCollection;
|
|||||||
use ApiPlatform\Metadata\Patch;
|
use ApiPlatform\Metadata\Patch;
|
||||||
use ApiPlatform\Metadata\Post;
|
use ApiPlatform\Metadata\Post;
|
||||||
use App\Repository\TaskRepository;
|
use App\Repository\TaskRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use App\State\TaskCalendarProcessor;
|
use App\State\TaskCalendarProcessor;
|
||||||
use App\State\TaskNumberProcessor;
|
use App\State\TaskNumberProcessor;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
@@ -80,13 +81,13 @@ class Task
|
|||||||
#[Groups(['task:read', 'task:write'])]
|
#[Groups(['task:read', 'task:write'])]
|
||||||
private ?TaskPriority $priority = null;
|
private ?TaskPriority $priority = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||||
#[Groups(['task:read', 'task:write'])]
|
#[Groups(['task:read', 'task:write'])]
|
||||||
private ?User $assignee = null;
|
private ?UserInterface $assignee = null;
|
||||||
|
|
||||||
/** @var Collection<int, User> */
|
/** @var Collection<int, UserInterface> */
|
||||||
#[ORM\ManyToMany(targetEntity: User::class)]
|
#[ORM\ManyToMany(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinTable(
|
#[ORM\JoinTable(
|
||||||
name: 'task_collaborator',
|
name: 'task_collaborator',
|
||||||
joinColumns: [new ORM\JoinColumn(name: 'task_id', referencedColumnName: 'id', onDelete: 'CASCADE')],
|
joinColumns: [new ORM\JoinColumn(name: 'task_id', referencedColumnName: 'id', onDelete: 'CASCADE')],
|
||||||
@@ -239,25 +240,25 @@ class Task
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getAssignee(): ?User
|
public function getAssignee(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->assignee;
|
return $this->assignee;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setAssignee(?User $assignee): static
|
public function setAssignee(?UserInterface $assignee): static
|
||||||
{
|
{
|
||||||
$this->assignee = $assignee;
|
$this->assignee = $assignee;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, UserInterface> */
|
||||||
public function getCollaborators(): Collection
|
public function getCollaborators(): Collection
|
||||||
{
|
{
|
||||||
return $this->collaborators;
|
return $this->collaborators;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function addCollaborator(User $user): static
|
public function addCollaborator(UserInterface $user): static
|
||||||
{
|
{
|
||||||
if (!$this->collaborators->contains($user)) {
|
if (!$this->collaborators->contains($user)) {
|
||||||
$this->collaborators->add($user);
|
$this->collaborators->add($user);
|
||||||
@@ -266,7 +267,7 @@ class Task
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeCollaborator(User $user): static
|
public function removeCollaborator(UserInterface $user): static
|
||||||
{
|
{
|
||||||
$this->collaborators->removeElement($user);
|
$this->collaborators->removeElement($user);
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use ApiPlatform\Metadata\Get;
|
|||||||
use ApiPlatform\Metadata\GetCollection;
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
use ApiPlatform\Metadata\Post;
|
use ApiPlatform\Metadata\Post;
|
||||||
use App\EventListener\TaskDocumentListener;
|
use App\EventListener\TaskDocumentListener;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use App\State\TaskDocumentProcessor;
|
use App\State\TaskDocumentProcessor;
|
||||||
use App\State\TaskDocumentProvider;
|
use App\State\TaskDocumentProvider;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
@@ -77,10 +78,10 @@ class TaskDocument
|
|||||||
#[Groups(['task_document:read', 'task:read'])]
|
#[Groups(['task_document:read', 'task:read'])]
|
||||||
private ?DateTimeImmutable $createdAt = null;
|
private ?DateTimeImmutable $createdAt = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||||
#[Groups(['task_document:read', 'task:read'])]
|
#[Groups(['task_document:read', 'task:read'])]
|
||||||
private ?User $uploadedBy = null;
|
private ?UserInterface $uploadedBy = null;
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
{
|
{
|
||||||
@@ -176,12 +177,12 @@ class TaskDocument
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getUploadedBy(): ?User
|
public function getUploadedBy(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->uploadedBy;
|
return $this->uploadedBy;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setUploadedBy(?User $uploadedBy): static
|
public function setUploadedBy(?UserInterface $uploadedBy): static
|
||||||
{
|
{
|
||||||
$this->uploadedBy = $uploadedBy;
|
$this->uploadedBy = $uploadedBy;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace App\Entity;
|
namespace App\Entity;
|
||||||
|
|
||||||
use App\Repository\TaskMailLinkRepository;
|
use App\Repository\TaskMailLinkRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
|
||||||
@@ -29,9 +30,9 @@ class TaskMailLink
|
|||||||
#[ORM\Column(type: 'datetimetz_immutable')]
|
#[ORM\Column(type: 'datetimetz_immutable')]
|
||||||
private DateTimeImmutable $linkedAt;
|
private DateTimeImmutable $linkedAt;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(name: 'linked_by_id', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
|
#[ORM\JoinColumn(name: 'linked_by_id', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
|
||||||
private ?User $linkedBy = null;
|
private ?UserInterface $linkedBy = null;
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
{
|
{
|
||||||
@@ -74,12 +75,12 @@ class TaskMailLink
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLinkedBy(): ?User
|
public function getLinkedBy(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->linkedBy;
|
return $this->linkedBy;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setLinkedBy(?User $linkedBy): static
|
public function setLinkedBy(?UserInterface $linkedBy): static
|
||||||
{
|
{
|
||||||
$this->linkedBy = $linkedBy;
|
$this->linkedBy = $linkedBy;
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use ApiPlatform\Metadata\GetCollection;
|
|||||||
use ApiPlatform\Metadata\Patch;
|
use ApiPlatform\Metadata\Patch;
|
||||||
use ApiPlatform\Metadata\Post;
|
use ApiPlatform\Metadata\Post;
|
||||||
use App\Repository\TimeEntryRepository;
|
use App\Repository\TimeEntryRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use App\State\ActiveTimeEntryProvider;
|
use App\State\ActiveTimeEntryProvider;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
@@ -77,10 +78,10 @@ class TimeEntry
|
|||||||
#[Groups(['time_entry:read', 'time_entry:write'])]
|
#[Groups(['time_entry:read', 'time_entry:write'])]
|
||||||
private ?DateTimeImmutable $stoppedAt = null;
|
private ?DateTimeImmutable $stoppedAt = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
#[Groups(['time_entry:read', 'time_entry:write'])]
|
#[Groups(['time_entry:read', 'time_entry:write'])]
|
||||||
private ?User $user = null;
|
private ?UserInterface $user = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: Project::class)]
|
#[ORM\ManyToOne(targetEntity: Project::class)]
|
||||||
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
#[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
|
||||||
@@ -160,12 +161,12 @@ class TimeEntry
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getUser(): ?User
|
public function getUser(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->user;
|
return $this->user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setUser(?User $user): static
|
public function setUser(?UserInterface $user): static
|
||||||
{
|
{
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
|
||||||
|
|||||||
@@ -4,10 +4,9 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\EventListener;
|
namespace App\EventListener;
|
||||||
|
|
||||||
use App\Entity\Notification;
|
|
||||||
use App\Entity\Task;
|
use App\Entity\Task;
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\NotifierInterface;
|
||||||
use DateTimeImmutable;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
|
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
|
||||||
use Doctrine\ORM\Event\OnFlushEventArgs;
|
use Doctrine\ORM\Event\OnFlushEventArgs;
|
||||||
use Doctrine\ORM\Event\PostFlushEventArgs;
|
use Doctrine\ORM\Event\PostFlushEventArgs;
|
||||||
@@ -18,15 +17,18 @@ use Symfony\Bundle\SecurityBundle\Security;
|
|||||||
#[AsDoctrineListener(event: Events::postFlush)]
|
#[AsDoctrineListener(event: Events::postFlush)]
|
||||||
final class TaskNotificationListener
|
final class TaskNotificationListener
|
||||||
{
|
{
|
||||||
/** @var list<array{user: User, type: string, task: Task}> */
|
/** @var list<array{user: UserInterface, type: string, task: Task}> */
|
||||||
private array $pending = [];
|
private array $pending = [];
|
||||||
|
|
||||||
public function __construct(private readonly Security $security) {}
|
public function __construct(
|
||||||
|
private readonly Security $security,
|
||||||
|
private readonly NotifierInterface $notifier,
|
||||||
|
) {}
|
||||||
|
|
||||||
public function onFlush(OnFlushEventArgs $args): void
|
public function onFlush(OnFlushEventArgs $args): void
|
||||||
{
|
{
|
||||||
$actor = $this->security->getUser();
|
$actor = $this->security->getUser();
|
||||||
if (!$actor instanceof User) {
|
if (!$actor instanceof UserInterface) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,7 +40,7 @@ final class TaskNotificationListener
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$assignee = $entity->getAssignee();
|
$assignee = $entity->getAssignee();
|
||||||
if ($assignee instanceof User && $assignee !== $actor) {
|
if ($assignee instanceof UserInterface && $assignee !== $actor) {
|
||||||
$this->pending[] = ['user' => $assignee, 'type' => 'task_assigned', 'task' => $entity];
|
$this->pending[] = ['user' => $assignee, 'type' => 'task_assigned', 'task' => $entity];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -53,7 +55,7 @@ final class TaskNotificationListener
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$new = $changeSet['assignee'][1];
|
$new = $changeSet['assignee'][1];
|
||||||
if ($new instanceof User && $new !== $actor) {
|
if ($new instanceof UserInterface && $new !== $actor) {
|
||||||
$this->pending[] = ['user' => $new, 'type' => 'task_assigned', 'task' => $entity];
|
$this->pending[] = ['user' => $new, 'type' => 'task_assigned', 'task' => $entity];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -68,7 +70,7 @@ final class TaskNotificationListener
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
foreach ($collection->getInsertDiff() as $user) {
|
foreach ($collection->getInsertDiff() as $user) {
|
||||||
if ($user instanceof User && $user !== $actor) {
|
if ($user instanceof UserInterface && $user !== $actor) {
|
||||||
$this->pending[] = ['user' => $user, 'type' => 'task_collaborator_added', 'task' => $owner];
|
$this->pending[] = ['user' => $user, 'type' => 'task_collaborator_added', 'task' => $owner];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -84,25 +86,10 @@ final class TaskNotificationListener
|
|||||||
$pending = $this->pending;
|
$pending = $this->pending;
|
||||||
$this->pending = [];
|
$this->pending = [];
|
||||||
|
|
||||||
$em = $args->getObjectManager();
|
|
||||||
foreach ($pending as $item) {
|
foreach ($pending as $item) {
|
||||||
$em->persist($this->buildNotification($item['user'], $item['type'], $item['task']));
|
[$title, $message] = $this->render($item['type'], $item['task']);
|
||||||
|
$this->notifier->notify($item['user'], $item['type'], $title, $message);
|
||||||
}
|
}
|
||||||
$em->flush();
|
|
||||||
}
|
|
||||||
|
|
||||||
private function buildNotification(User $user, string $type, Task $task): Notification
|
|
||||||
{
|
|
||||||
[$title, $message] = $this->render($type, $task);
|
|
||||||
|
|
||||||
$notification = new Notification();
|
|
||||||
$notification->setUser($user);
|
|
||||||
$notification->setType($type);
|
|
||||||
$notification->setTitle($title);
|
|
||||||
$notification->setMessage($message);
|
|
||||||
$notification->setCreatedAt(new DateTimeImmutable());
|
|
||||||
|
|
||||||
return $notification;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ use App\Enum\AbsenceStatus;
|
|||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Enum\HalfDay;
|
use App\Enum\HalfDay;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\AbsencePolicyRepository;
|
use App\Repository\AbsencePolicyRepository;
|
||||||
use App\Repository\AbsenceRequestRepository;
|
use App\Repository\AbsenceRequestRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use App\Service\AbsenceBalanceService;
|
use App\Service\AbsenceBalanceService;
|
||||||
use App\Service\AbsenceDayCalculator;
|
use App\Service\AbsenceDayCalculator;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
@@ -28,7 +28,7 @@ class CreateAbsenceRequestTool
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly AbsencePolicyRepository $policyRepository,
|
private readonly AbsencePolicyRepository $policyRepository,
|
||||||
private readonly AbsenceRequestRepository $requestRepository,
|
private readonly AbsenceRequestRepository $requestRepository,
|
||||||
private readonly AbsenceDayCalculator $calculator,
|
private readonly AbsenceDayCalculator $calculator,
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ namespace App\Mcp\Tool\Absence;
|
|||||||
|
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\AbsenceBalanceRepository;
|
use App\Repository\AbsenceBalanceRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use Mcp\Capability\Attribute\McpTool;
|
use Mcp\Capability\Attribute\McpTool;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
@@ -20,7 +20,7 @@ class ListAbsenceBalancesTool
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly AbsenceBalanceRepository $balanceRepository,
|
private readonly AbsenceBalanceRepository $balanceRepository,
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ namespace App\Mcp\Tool\Absence;
|
|||||||
use App\Enum\AbsenceStatus;
|
use App\Enum\AbsenceStatus;
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\AbsenceRequestRepository;
|
use App\Repository\AbsenceRequestRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use Mcp\Capability\Attribute\McpTool;
|
use Mcp\Capability\Attribute\McpTool;
|
||||||
@@ -22,7 +22,7 @@ class ListAbsenceRequestsTool
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly AbsenceRequestRepository $requestRepository,
|
private readonly AbsenceRequestRepository $requestRepository,
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Mcp\Tool\Absence;
|
namespace App\Mcp\Tool\Absence;
|
||||||
|
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceStatus;
|
use App\Enum\AbsenceStatus;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
use App\Repository\AbsenceRequestRepository;
|
use App\Repository\AbsenceRequestRepository;
|
||||||
use App\Service\AbsenceBalanceService;
|
use App\Service\AbsenceBalanceService;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
@@ -49,7 +49,7 @@ class ReviewAbsenceRequestTool
|
|||||||
}
|
}
|
||||||
|
|
||||||
$admin = $this->security->getUser();
|
$admin = $this->security->getUser();
|
||||||
assert($admin instanceof User);
|
assert($admin instanceof UserInterface);
|
||||||
|
|
||||||
if ('approve' === $decision) {
|
if ('approve' === $decision) {
|
||||||
// Never let an approval push the balance below zero (CP only).
|
// Never let an approval push the balance below zero (CP only).
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace App\Mcp\Tool\Reference;
|
namespace App\Mcp\Tool\Reference;
|
||||||
|
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
use App\Repository\UserRepository;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use Mcp\Capability\Attribute\McpTool;
|
use Mcp\Capability\Attribute\McpTool;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
@@ -17,7 +17,7 @@ use function sprintf;
|
|||||||
class GetUserTool
|
class GetUserTool
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Mcp\Tool\Reference;
|
namespace App\Mcp\Tool\Reference;
|
||||||
|
|
||||||
use App\Repository\UserRepository;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use Mcp\Capability\Attribute\McpTool;
|
use Mcp\Capability\Attribute\McpTool;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
||||||
@@ -13,7 +13,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
|||||||
class ListUsersTool
|
class ListUsersTool
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ namespace App\Mcp\Tool\Reference;
|
|||||||
|
|
||||||
use App\Enum\ContractType;
|
use App\Enum\ContractType;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
use App\Repository\UserRepository;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
@@ -20,7 +20,7 @@ use function sprintf;
|
|||||||
class UpdateUserTool
|
class UpdateUserTool
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
) {}
|
) {}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ use App\Entity\TaskPriority;
|
|||||||
use App\Entity\TaskStatus;
|
use App\Entity\TaskStatus;
|
||||||
use App\Entity\TaskTag;
|
use App\Entity\TaskTag;
|
||||||
use App\Entity\TimeEntry;
|
use App\Entity\TimeEntry;
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Doctrine\Common\Collections\Collection;
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ namespace App\Mcp\Tool\Task;
|
|||||||
|
|
||||||
use App\Entity\Task;
|
use App\Entity\Task;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\ProjectRepository;
|
use App\Repository\ProjectRepository;
|
||||||
use App\Repository\TaskEffortRepository;
|
use App\Repository\TaskEffortRepository;
|
||||||
use App\Repository\TaskGroupRepository;
|
use App\Repository\TaskGroupRepository;
|
||||||
@@ -13,7 +14,6 @@ use App\Repository\TaskPriorityRepository;
|
|||||||
use App\Repository\TaskRepository;
|
use App\Repository\TaskRepository;
|
||||||
use App\Repository\TaskStatusRepository;
|
use App\Repository\TaskStatusRepository;
|
||||||
use App\Repository\TaskTagRepository;
|
use App\Repository\TaskTagRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use App\Service\CalDavService;
|
use App\Service\CalDavService;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
@@ -36,7 +36,7 @@ class CreateTaskTool
|
|||||||
private readonly TaskEffortRepository $taskEffortRepository,
|
private readonly TaskEffortRepository $taskEffortRepository,
|
||||||
private readonly TaskGroupRepository $taskGroupRepository,
|
private readonly TaskGroupRepository $taskGroupRepository,
|
||||||
private readonly TaskTagRepository $taskTagRepository,
|
private readonly TaskTagRepository $taskTagRepository,
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
private readonly CalDavService $calDavService,
|
private readonly CalDavService $calDavService,
|
||||||
) {}
|
) {}
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ declare(strict_types=1);
|
|||||||
namespace App\Mcp\Tool\Task;
|
namespace App\Mcp\Tool\Task;
|
||||||
|
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\TaskEffortRepository;
|
use App\Repository\TaskEffortRepository;
|
||||||
use App\Repository\TaskGroupRepository;
|
use App\Repository\TaskGroupRepository;
|
||||||
use App\Repository\TaskPriorityRepository;
|
use App\Repository\TaskPriorityRepository;
|
||||||
use App\Repository\TaskRepository;
|
use App\Repository\TaskRepository;
|
||||||
use App\Repository\TaskStatusRepository;
|
use App\Repository\TaskStatusRepository;
|
||||||
use App\Repository\TaskTagRepository;
|
use App\Repository\TaskTagRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use App\Service\CalDavService;
|
use App\Service\CalDavService;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
@@ -33,7 +33,7 @@ class UpdateTaskTool
|
|||||||
private readonly TaskEffortRepository $taskEffortRepository,
|
private readonly TaskEffortRepository $taskEffortRepository,
|
||||||
private readonly TaskGroupRepository $taskGroupRepository,
|
private readonly TaskGroupRepository $taskGroupRepository,
|
||||||
private readonly TaskTagRepository $taskTagRepository,
|
private readonly TaskTagRepository $taskTagRepository,
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
private readonly CalDavService $calDavService,
|
private readonly CalDavService $calDavService,
|
||||||
) {}
|
) {}
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ namespace App\Mcp\Tool\TimeEntry;
|
|||||||
|
|
||||||
use App\Entity\TimeEntry;
|
use App\Entity\TimeEntry;
|
||||||
use App\Mcp\Tool\Serializer;
|
use App\Mcp\Tool\Serializer;
|
||||||
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use App\Repository\ProjectRepository;
|
use App\Repository\ProjectRepository;
|
||||||
use App\Repository\TaskRepository;
|
use App\Repository\TaskRepository;
|
||||||
use App\Repository\TaskTagRepository;
|
use App\Repository\TaskTagRepository;
|
||||||
use App\Repository\TimeEntryRepository;
|
use App\Repository\TimeEntryRepository;
|
||||||
use App\Repository\UserRepository;
|
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
@@ -25,7 +25,7 @@ class CreateTimeEntryTool
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
private readonly ProjectRepository $projectRepository,
|
private readonly ProjectRepository $projectRepository,
|
||||||
private readonly TaskRepository $taskRepository,
|
private readonly TaskRepository $taskRepository,
|
||||||
private readonly TaskTagRepository $taskTagRepository,
|
private readonly TaskTagRepository $taskTagRepository,
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Module\Core;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Module\ModuleInterface;
|
||||||
|
|
||||||
|
final class CoreModule implements ModuleInterface
|
||||||
|
{
|
||||||
|
public static function id(): string
|
||||||
|
{
|
||||||
|
return 'core';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function label(): string
|
||||||
|
{
|
||||||
|
return 'Core';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function isRequired(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Permissions posées pour le RBAC fin (1.2). Inertes tant que 1.2 n'est pas livré.
|
||||||
|
*
|
||||||
|
* @return list<array{code: string, label: string}>
|
||||||
|
*/
|
||||||
|
public static function permissions(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
['code' => 'core.user.read', 'label' => 'Consulter les utilisateurs'],
|
||||||
|
['code' => 'core.user.manage', 'label' => 'Gérer les utilisateurs'],
|
||||||
|
['code' => 'core.notification.read', 'label' => 'Consulter ses notifications'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\Entity;
|
namespace App\Module\Core\Domain\Entity;
|
||||||
|
|
||||||
use ApiPlatform\Metadata\ApiResource;
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
use ApiPlatform\Metadata\GetCollection;
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
use ApiPlatform\Metadata\Patch;
|
use ApiPlatform\Metadata\Patch;
|
||||||
use App\Repository\NotificationRepository;
|
use App\Module\Core\Infrastructure\ApiPlatform\State\NotificationProvider;
|
||||||
use App\State\NotificationProvider;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineNotificationRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
@@ -28,7 +29,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
denormalizationContext: ['groups' => ['notification:write']],
|
denormalizationContext: ['groups' => ['notification:write']],
|
||||||
order: ['createdAt' => 'DESC'],
|
order: ['createdAt' => 'DESC'],
|
||||||
)]
|
)]
|
||||||
#[ORM\Entity(repositoryClass: NotificationRepository::class)]
|
#[ORM\Entity(repositoryClass: DoctrineNotificationRepository::class)]
|
||||||
#[ORM\Index(columns: ['user_id'], name: 'idx_notification_user')]
|
#[ORM\Index(columns: ['user_id'], name: 'idx_notification_user')]
|
||||||
#[ORM\Index(columns: ['user_id', 'is_read'], name: 'idx_notification_user_read')]
|
#[ORM\Index(columns: ['user_id', 'is_read'], name: 'idx_notification_user_read')]
|
||||||
class Notification
|
class Notification
|
||||||
@@ -39,10 +40,10 @@ class Notification
|
|||||||
#[Groups(['notification:read'])]
|
#[Groups(['notification:read'])]
|
||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
#[ORM\ManyToOne(targetEntity: User::class)]
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||||
#[Groups(['notification:read'])]
|
#[Groups(['notification:read'])]
|
||||||
private ?User $user = null;
|
private ?UserInterface $user = null;
|
||||||
|
|
||||||
#[ORM\Column(length: 50)]
|
#[ORM\Column(length: 50)]
|
||||||
#[Groups(['notification:read'])]
|
#[Groups(['notification:read'])]
|
||||||
@@ -69,12 +70,12 @@ class Notification
|
|||||||
return $this->id;
|
return $this->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getUser(): ?User
|
public function getUser(): ?UserInterface
|
||||||
{
|
{
|
||||||
return $this->user;
|
return $this->user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setUser(?User $user): static
|
public function setUser(?UserInterface $user): static
|
||||||
{
|
{
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\Entity;
|
namespace App\Module\Core\Domain\Entity;
|
||||||
|
|
||||||
use ApiPlatform\Metadata\ApiProperty;
|
use ApiPlatform\Metadata\ApiProperty;
|
||||||
use ApiPlatform\Metadata\ApiResource;
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
@@ -12,9 +12,10 @@ use ApiPlatform\Metadata\GetCollection;
|
|||||||
use ApiPlatform\Metadata\Patch;
|
use ApiPlatform\Metadata\Patch;
|
||||||
use ApiPlatform\Metadata\Post;
|
use ApiPlatform\Metadata\Post;
|
||||||
use App\Enum\ContractType;
|
use App\Enum\ContractType;
|
||||||
use App\Repository\UserRepository;
|
use App\Module\Core\Infrastructure\ApiPlatform\State\MeProvider;
|
||||||
use App\State\MeProvider;
|
use App\Module\Core\Infrastructure\ApiPlatform\State\UserPasswordHasherProcessor;
|
||||||
use App\State\UserPasswordHasherProcessor;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface as SharedUserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\DBAL\Types\Types;
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
@@ -42,9 +43,9 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
],
|
],
|
||||||
denormalizationContext: ['groups' => ['user:write']],
|
denormalizationContext: ['groups' => ['user:write']],
|
||||||
)]
|
)]
|
||||||
#[ORM\Entity(repositoryClass: UserRepository::class)]
|
#[ORM\Entity(repositoryClass: DoctrineUserRepository::class)]
|
||||||
#[ORM\Table(name: '`user`')]
|
#[ORM\Table(name: '`user`')]
|
||||||
class User implements UserInterface, PasswordAuthenticatedUserInterface
|
class User implements UserInterface, PasswordAuthenticatedUserInterface, SharedUserInterface
|
||||||
{
|
{
|
||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
#[ORM\GeneratedValue]
|
#[ORM\GeneratedValue]
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Module\Core\Domain\Repository;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
use DateTimeInterface;
|
||||||
|
|
||||||
|
interface UserRepositoryInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @return list<UserInterface>
|
||||||
|
*/
|
||||||
|
public function findByRole(string $role): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<UserInterface>
|
||||||
|
*/
|
||||||
|
public function findActiveEmployees(DateTimeInterface $date): array;
|
||||||
|
|
||||||
|
public function findOneByUsername(string $username): ?UserInterface;
|
||||||
|
}
|
||||||
+2
-2
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\State;
|
namespace App\Module\Core\Infrastructure\ApiPlatform\State;
|
||||||
|
|
||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProviderInterface;
|
use ApiPlatform\State\ProviderInterface;
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
+4
-4
@@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\State;
|
namespace App\Module\Core\Infrastructure\ApiPlatform\State;
|
||||||
|
|
||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\Pagination\Pagination;
|
use ApiPlatform\State\Pagination\Pagination;
|
||||||
use ApiPlatform\State\Pagination\TraversablePaginator;
|
use ApiPlatform\State\Pagination\TraversablePaginator;
|
||||||
use ApiPlatform\State\ProviderInterface;
|
use ApiPlatform\State\ProviderInterface;
|
||||||
use App\Entity\Notification;
|
use App\Module\Core\Domain\Entity\Notification;
|
||||||
use App\Repository\NotificationRepository;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineNotificationRepository;
|
||||||
use ArrayIterator;
|
use ArrayIterator;
|
||||||
use Doctrine\ORM\Tools\Pagination\Paginator as DoctrinePaginator;
|
use Doctrine\ORM\Tools\Pagination\Paginator as DoctrinePaginator;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
@@ -23,7 +23,7 @@ final readonly class NotificationProvider implements ProviderInterface
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private Security $security,
|
private Security $security,
|
||||||
private NotificationRepository $notificationRepository,
|
private DoctrineNotificationRepository $notificationRepository,
|
||||||
private Pagination $pagination,
|
private Pagination $pagination,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
+2
-2
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\State;
|
namespace App\Module\Core\Infrastructure\ApiPlatform\State;
|
||||||
|
|
||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProcessorInterface;
|
use ApiPlatform\State\ProcessorInterface;
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||||
|
|
||||||
+6
-6
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\Repository;
|
namespace App\Module\Core\Infrastructure\Doctrine;
|
||||||
|
|
||||||
use App\Entity\Notification;
|
use App\Module\Core\Domain\Entity\Notification;
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\UserInterface as SharedUserInterface;
|
||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\ORM\QueryBuilder;
|
use Doctrine\ORM\QueryBuilder;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
@@ -14,7 +14,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
|
|||||||
/**
|
/**
|
||||||
* @extends ServiceEntityRepository<Notification>
|
* @extends ServiceEntityRepository<Notification>
|
||||||
*/
|
*/
|
||||||
class NotificationRepository extends ServiceEntityRepository
|
class DoctrineNotificationRepository extends ServiceEntityRepository
|
||||||
{
|
{
|
||||||
public function __construct(ManagerRegistry $registry)
|
public function __construct(ManagerRegistry $registry)
|
||||||
{
|
{
|
||||||
@@ -30,7 +30,7 @@ class NotificationRepository extends ServiceEntityRepository
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function countUnreadByUser(User $user): int
|
public function countUnreadByUser(SharedUserInterface $user): int
|
||||||
{
|
{
|
||||||
return (int) $this->createQueryBuilder('n')
|
return (int) $this->createQueryBuilder('n')
|
||||||
->select('COUNT(n.id)')
|
->select('COUNT(n.id)')
|
||||||
@@ -42,7 +42,7 @@ class NotificationRepository extends ServiceEntityRepository
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function markAllReadByUser(User $user): int
|
public function markAllReadByUser(SharedUserInterface $user): int
|
||||||
{
|
{
|
||||||
return $this->createQueryBuilder('n')
|
return $this->createQueryBuilder('n')
|
||||||
->update()
|
->update()
|
||||||
+12
-5
@@ -2,9 +2,11 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\Repository;
|
namespace App\Module\Core\Infrastructure\Doctrine;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
|
use App\Module\Core\Domain\Repository\UserRepositoryInterface;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
@@ -12,7 +14,7 @@ use Doctrine\Persistence\ManagerRegistry;
|
|||||||
/**
|
/**
|
||||||
* @extends ServiceEntityRepository<User>
|
* @extends ServiceEntityRepository<User>
|
||||||
*/
|
*/
|
||||||
class UserRepository extends ServiceEntityRepository
|
class DoctrineUserRepository extends ServiceEntityRepository implements UserRepositoryInterface
|
||||||
{
|
{
|
||||||
public function __construct(ManagerRegistry $registry)
|
public function __construct(ManagerRegistry $registry)
|
||||||
{
|
{
|
||||||
@@ -20,7 +22,7 @@ class UserRepository extends ServiceEntityRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return User[]
|
* @return list<UserInterface>
|
||||||
*/
|
*/
|
||||||
public function findByRole(string $role): array
|
public function findByRole(string $role): array
|
||||||
{
|
{
|
||||||
@@ -43,7 +45,7 @@ class UserRepository extends ServiceEntityRepository
|
|||||||
/**
|
/**
|
||||||
* Employees active on the given date (hired on/before it, not yet left).
|
* Employees active on the given date (hired on/before it, not yet left).
|
||||||
*
|
*
|
||||||
* @return User[]
|
* @return list<UserInterface>
|
||||||
*/
|
*/
|
||||||
public function findActiveEmployees(DateTimeInterface $date): array
|
public function findActiveEmployees(DateTimeInterface $date): array
|
||||||
{
|
{
|
||||||
@@ -59,4 +61,9 @@ class UserRepository extends ServiceEntityRepository
|
|||||||
->getResult()
|
->getResult()
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function findOneByUsername(string $username): ?UserInterface
|
||||||
|
{
|
||||||
|
return $this->findOneBy(['username' => $username]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Module\Core\Infrastructure;
|
||||||
|
|
||||||
|
use App\Module\Core\Domain\Entity\Notification;
|
||||||
|
use App\Shared\Domain\Contract\NotifierInterface;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
|
||||||
|
final readonly class Notifier implements NotifierInterface
|
||||||
|
{
|
||||||
|
public function __construct(private EntityManagerInterface $em) {}
|
||||||
|
|
||||||
|
public function notify(UserInterface $user, string $type, string $title, string $message): void
|
||||||
|
{
|
||||||
|
$notification = new Notification();
|
||||||
|
$notification->setUser($user);
|
||||||
|
$notification->setType($type);
|
||||||
|
$notification->setTitle($title);
|
||||||
|
$notification->setMessage($message);
|
||||||
|
$notification->setCreatedAt(new DateTimeImmutable());
|
||||||
|
|
||||||
|
$this->em->persist($notification);
|
||||||
|
$this->em->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,8 +5,8 @@ declare(strict_types=1);
|
|||||||
namespace App\Repository;
|
namespace App\Repository;
|
||||||
|
|
||||||
use App\Entity\AbsenceBalance;
|
use App\Entity\AbsenceBalance;
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ class AbsenceBalanceRepository extends ServiceEntityRepository
|
|||||||
parent::__construct($registry, AbsenceBalance::class);
|
parent::__construct($registry, AbsenceBalance::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findOneForPeriod(User $user, AbsenceType $type, string $period): ?AbsenceBalance
|
public function findOneForPeriod(UserInterface $user, AbsenceType $type, string $period): ?AbsenceBalance
|
||||||
{
|
{
|
||||||
return $this->findOneBy([
|
return $this->findOneBy([
|
||||||
'user' => $user,
|
'user' => $user,
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ declare(strict_types=1);
|
|||||||
namespace App\Repository;
|
namespace App\Repository;
|
||||||
|
|
||||||
use App\Entity\AbsenceRequest;
|
use App\Entity\AbsenceRequest;
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceStatus;
|
use App\Enum\AbsenceStatus;
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
@@ -28,7 +28,7 @@ class AbsenceRequestRepository extends ServiceEntityRepository
|
|||||||
* end_a >= start_b.
|
* end_a >= start_b.
|
||||||
*/
|
*/
|
||||||
public function hasOverlap(
|
public function hasOverlap(
|
||||||
User $user,
|
UserInterface $user,
|
||||||
DateTimeInterface $startDate,
|
DateTimeInterface $startDate,
|
||||||
DateTimeInterface $endDate,
|
DateTimeInterface $endDate,
|
||||||
?int $excludeId = null,
|
?int $excludeId = null,
|
||||||
@@ -77,7 +77,7 @@ class AbsenceRequestRepository extends ServiceEntityRepository
|
|||||||
* @return AbsenceRequest[]
|
* @return AbsenceRequest[]
|
||||||
*/
|
*/
|
||||||
public function findFiltered(
|
public function findFiltered(
|
||||||
?User $user = null,
|
?UserInterface $user = null,
|
||||||
?AbsenceStatus $status = null,
|
?AbsenceStatus $status = null,
|
||||||
?AbsenceType $type = null,
|
?AbsenceType $type = null,
|
||||||
?DateTimeInterface $from = null,
|
?DateTimeInterface $from = null,
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ namespace App\Repository;
|
|||||||
|
|
||||||
use App\Entity\Project;
|
use App\Entity\Project;
|
||||||
use App\Entity\TimeEntry;
|
use App\Entity\TimeEntry;
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
use Doctrine\Persistence\ManagerRegistry;
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
@@ -21,7 +21,7 @@ class TimeEntryRepository extends ServiceEntityRepository
|
|||||||
parent::__construct($registry, TimeEntry::class);
|
parent::__construct($registry, TimeEntry::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findActiveByUser(User $user): ?TimeEntry
|
public function findActiveByUser(UserInterface $user): ?TimeEntry
|
||||||
{
|
{
|
||||||
return $this->findOneBy([
|
return $this->findOneBy([
|
||||||
'user' => $user,
|
'user' => $user,
|
||||||
@@ -30,9 +30,9 @@ class TimeEntryRepository extends ServiceEntityRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param null|User[] $users
|
* @param null|UserInterface[] $users
|
||||||
* @param null|Project[] $projects
|
* @param null|Project[] $projects
|
||||||
* @param null|int[] $tagIds
|
* @param null|int[] $tagIds
|
||||||
*
|
*
|
||||||
* @return TimeEntry[]
|
* @return TimeEntry[]
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Security;
|
namespace App\Security;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use App\Repository\UserRepository;
|
use App\Module\Core\Infrastructure\Doctrine\DoctrineUserRepository;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
@@ -20,7 +20,7 @@ use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPasspor
|
|||||||
class ApiTokenAuthenticator extends AbstractAuthenticator
|
class ApiTokenAuthenticator extends AbstractAuthenticator
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserRepository $userRepository,
|
private readonly DoctrineUserRepository $userRepository,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function supports(Request $request): ?bool
|
public function supports(Request $request): ?bool
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Security;
|
namespace App\Security;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\UserInterface as SharedUserInterface;
|
||||||
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
|
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
|
||||||
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
||||||
use Symfony\Component\Security\Core\User\UserInterface;
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
@@ -23,7 +23,7 @@ final readonly class MailAccessChecker
|
|||||||
*/
|
*/
|
||||||
public function ensureCanAccessMail(?UserInterface $user): void
|
public function ensureCanAccessMail(?UserInterface $user): void
|
||||||
{
|
{
|
||||||
if (!$user instanceof User) {
|
if (!$user instanceof SharedUserInterface) {
|
||||||
throw new AccessDeniedException('Authentication required');
|
throw new AccessDeniedException('Authentication required');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@ final readonly class MailAccessChecker
|
|||||||
*/
|
*/
|
||||||
public function ensureIsAdmin(?UserInterface $user): void
|
public function ensureIsAdmin(?UserInterface $user): void
|
||||||
{
|
{
|
||||||
if (!$user instanceof User || !$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
|
if (!$user instanceof SharedUserInterface || !$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
|
||||||
throw new AccessDeniedException('Admin only');
|
throw new AccessDeniedException('Admin only');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ namespace App\Service;
|
|||||||
|
|
||||||
use App\Entity\AbsenceBalance;
|
use App\Entity\AbsenceBalance;
|
||||||
use App\Entity\AbsenceRequest;
|
use App\Entity\AbsenceRequest;
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use App\Repository\AbsenceBalanceRepository;
|
use App\Repository\AbsenceBalanceRepository;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Application;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
|
||||||
|
interface CurrentUserProviderInterface
|
||||||
|
{
|
||||||
|
public function getCurrentUser(): ?UserInterface;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Contract;
|
||||||
|
|
||||||
|
interface BlamableInterface
|
||||||
|
{
|
||||||
|
public function getCreatedBy(): ?UserInterface;
|
||||||
|
|
||||||
|
public function setCreatedBy(?UserInterface $user): void;
|
||||||
|
|
||||||
|
public function getUpdatedBy(): ?UserInterface;
|
||||||
|
|
||||||
|
public function setUpdatedBy(?UserInterface $user): void;
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Contract;
|
||||||
|
|
||||||
|
interface NotifierInterface
|
||||||
|
{
|
||||||
|
public function notify(UserInterface $user, string $type, string $title, string $message): void;
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Contract;
|
||||||
|
|
||||||
|
use DateTimeImmutable;
|
||||||
|
|
||||||
|
interface TimestampableInterface
|
||||||
|
{
|
||||||
|
public function getCreatedAt(): ?DateTimeImmutable;
|
||||||
|
|
||||||
|
public function setCreatedAt(DateTimeImmutable $createdAt): void;
|
||||||
|
|
||||||
|
public function getUpdatedAt(): ?DateTimeImmutable;
|
||||||
|
|
||||||
|
public function setUpdatedAt(DateTimeImmutable $updatedAt): void;
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Contract;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Contrat de LECTURE de l'identité, consommé hors du module Core.
|
||||||
|
* Les écritures (setPassword, setters HR…) restent sur le concret Core\Domain\Entity\User.
|
||||||
|
*/
|
||||||
|
interface UserInterface
|
||||||
|
{
|
||||||
|
public function getId(): ?int;
|
||||||
|
|
||||||
|
public function getUserIdentifier(): string;
|
||||||
|
|
||||||
|
public function getUsername(): ?string;
|
||||||
|
|
||||||
|
/** @return list<string> */
|
||||||
|
public function getRoles(): array;
|
||||||
|
|
||||||
|
public function getFirstName(): ?string;
|
||||||
|
|
||||||
|
public function getLastName(): ?string;
|
||||||
|
|
||||||
|
public function getAvatarUrl(): ?string;
|
||||||
|
|
||||||
|
public function getIsEmployee(): bool;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Module;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implemented by every `*Module` declaration class. The set of active modules
|
||||||
|
* is listed in config/modules.php and exposed via GET /api/modules.
|
||||||
|
*/
|
||||||
|
interface ModuleInterface
|
||||||
|
{
|
||||||
|
public static function id(): string;
|
||||||
|
|
||||||
|
public static function label(): string;
|
||||||
|
|
||||||
|
public static function isRequired(): bool;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{code: string, label: string}>
|
||||||
|
*/
|
||||||
|
public static function permissions(): array;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Module;
|
||||||
|
|
||||||
|
final class ModuleRegistry
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param list<class-string> $moduleClasses
|
||||||
|
*
|
||||||
|
* @return list<string>
|
||||||
|
*/
|
||||||
|
public static function ids(array $moduleClasses): array
|
||||||
|
{
|
||||||
|
$ids = [];
|
||||||
|
foreach ($moduleClasses as $moduleClass) {
|
||||||
|
if (is_a($moduleClass, ModuleInterface::class, true)) {
|
||||||
|
$ids[] = $moduleClass::id();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ids;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Sidebar;
|
||||||
|
|
||||||
|
final class SidebarFilter
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param list<array{label:string, icon:string, roles?:list<string>, items: list<array{label:string, to:string, icon:string, module?:string, roles?:list<string>}>}> $sections
|
||||||
|
* @param list<string> $activeModuleIds
|
||||||
|
* @param list<string> $activeRoles
|
||||||
|
*
|
||||||
|
* @return array{sections: list<array{label:string, icon:string, items: list<array{label:string, to:string, icon:string}>}>, disabledRoutes: list<string>}
|
||||||
|
*/
|
||||||
|
public static function filter(array $sections, array $activeModuleIds, array $activeRoles = []): array
|
||||||
|
{
|
||||||
|
$outSections = [];
|
||||||
|
$disabledRoutes = [];
|
||||||
|
|
||||||
|
foreach ($sections as $section) {
|
||||||
|
// Gate de rôle au niveau section (ne pollue pas disabledRoutes : réservé au filtrage module).
|
||||||
|
if (!self::rolesSatisfied($section['roles'] ?? null, $activeRoles)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$items = [];
|
||||||
|
foreach ($section['items'] as $item) {
|
||||||
|
// Gate de rôle au niveau item.
|
||||||
|
if (!self::rolesSatisfied($item['roles'] ?? null, $activeRoles)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filtrage par module actif (pilote la redirection front via disabledRoutes).
|
||||||
|
$module = $item['module'] ?? null;
|
||||||
|
if (null !== $module && !in_array($module, $activeModuleIds, true)) {
|
||||||
|
$disabledRoutes[] = $item['to'];
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$items[] = ['label' => $item['label'], 'to' => $item['to'], 'icon' => $item['icon']];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] !== $items) {
|
||||||
|
$outSections[] = ['label' => $section['label'], 'icon' => $section['icon'], 'items' => $items];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['sections' => $outSections, 'disabledRoutes' => $disabledRoutes];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param null|list<string> $required
|
||||||
|
* @param list<string> $activeRoles
|
||||||
|
*/
|
||||||
|
private static function rolesSatisfied(?array $required, array $activeRoles): bool
|
||||||
|
{
|
||||||
|
if (null === $required || [] === $required) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($required as $role) {
|
||||||
|
if (in_array($role, $activeRoles, true)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Domain\Trait;
|
||||||
|
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
trait TimestampableBlamableTrait
|
||||||
|
{
|
||||||
|
#[ORM\Column(name: 'created_at', type: 'datetime_immutable', nullable: true)]
|
||||||
|
#[Groups(['timestampable:read'])]
|
||||||
|
private ?DateTimeImmutable $createdAt = null;
|
||||||
|
|
||||||
|
#[ORM\Column(name: 'updated_at', type: 'datetime_immutable', nullable: true)]
|
||||||
|
#[Groups(['timestampable:read'])]
|
||||||
|
private ?DateTimeImmutable $updatedAt = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
|
#[ORM\JoinColumn(name: 'created_by', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
|
||||||
|
#[Groups(['blamable:read'])]
|
||||||
|
private ?UserInterface $createdBy = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(targetEntity: UserInterface::class)]
|
||||||
|
#[ORM\JoinColumn(name: 'updated_by', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
|
||||||
|
#[Groups(['blamable:read'])]
|
||||||
|
private ?UserInterface $updatedBy = null;
|
||||||
|
|
||||||
|
public function getCreatedAt(): ?DateTimeImmutable
|
||||||
|
{
|
||||||
|
return $this->createdAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCreatedAt(DateTimeImmutable $createdAt): void
|
||||||
|
{
|
||||||
|
$this->createdAt = $createdAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUpdatedAt(): ?DateTimeImmutable
|
||||||
|
{
|
||||||
|
return $this->updatedAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setUpdatedAt(DateTimeImmutable $updatedAt): void
|
||||||
|
{
|
||||||
|
$this->updatedAt = $updatedAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCreatedBy(): ?UserInterface
|
||||||
|
{
|
||||||
|
return $this->createdBy;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCreatedBy(?UserInterface $user): void
|
||||||
|
{
|
||||||
|
$this->createdBy = $user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUpdatedBy(): ?UserInterface
|
||||||
|
{
|
||||||
|
return $this->updatedBy;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setUpdatedBy(?UserInterface $user): void
|
||||||
|
{
|
||||||
|
$this->updatedBy = $user;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\ApiPlatform\Resource;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use App\Shared\Infrastructure\ApiPlatform\State\ModulesProvider;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
uriTemplate: '/modules',
|
||||||
|
normalizationContext: ['groups' => ['modules:read']],
|
||||||
|
provider: ModulesProvider::class,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)]
|
||||||
|
final class ModulesResource
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var list<string>
|
||||||
|
*/
|
||||||
|
#[Groups(['modules:read'])]
|
||||||
|
public array $modules = [];
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\ApiPlatform\Resource;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use App\Shared\Infrastructure\ApiPlatform\State\SidebarProvider;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
uriTemplate: '/sidebar',
|
||||||
|
normalizationContext: ['groups' => ['sidebar:read']],
|
||||||
|
provider: SidebarProvider::class,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)]
|
||||||
|
final class SidebarResource
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var list<array{label:string, icon:string, items: list<array{label:string, to:string, icon:string}>}>
|
||||||
|
*/
|
||||||
|
#[Groups(['sidebar:read'])]
|
||||||
|
public array $sections = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var list<string>
|
||||||
|
*/
|
||||||
|
#[Groups(['sidebar:read'])]
|
||||||
|
public array $disabledRoutes = [];
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\ApiPlatform\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProviderInterface;
|
||||||
|
use App\Shared\Domain\Module\ModuleRegistry;
|
||||||
|
use App\Shared\Infrastructure\ApiPlatform\Resource\ModulesResource;
|
||||||
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
|
|
||||||
|
final readonly class ModulesProvider implements ProviderInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
#[Autowire('%kernel.project_dir%')]
|
||||||
|
private string $projectDir,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): ModulesResource
|
||||||
|
{
|
||||||
|
/** @var list<class-string> $classes */
|
||||||
|
$classes = require $this->projectDir.'/config/modules.php';
|
||||||
|
|
||||||
|
$dto = new ModulesResource();
|
||||||
|
$dto->modules = ModuleRegistry::ids($classes);
|
||||||
|
|
||||||
|
return $dto;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\ApiPlatform\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProviderInterface;
|
||||||
|
use App\Shared\Domain\Module\ModuleRegistry;
|
||||||
|
use App\Shared\Domain\Sidebar\SidebarFilter;
|
||||||
|
use App\Shared\Infrastructure\ApiPlatform\Resource\SidebarResource;
|
||||||
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
|
|
||||||
|
final readonly class SidebarProvider implements ProviderInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
#[Autowire('%kernel.project_dir%')]
|
||||||
|
private string $projectDir,
|
||||||
|
private Security $security,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): SidebarResource
|
||||||
|
{
|
||||||
|
/** @var list<class-string> $moduleClasses */
|
||||||
|
$moduleClasses = require $this->projectDir.'/config/modules.php';
|
||||||
|
|
||||||
|
/** @var list<array{label:string, icon:string, roles?:list<string>, items: list<array{label:string, to:string, icon:string, module?:string, roles?:list<string>}>}> $sidebar */
|
||||||
|
$sidebar = require $this->projectDir.'/config/sidebar.php';
|
||||||
|
|
||||||
|
$user = $this->security->getUser();
|
||||||
|
$roles = null !== $user ? $user->getRoles() : [];
|
||||||
|
|
||||||
|
$filtered = SidebarFilter::filter($sidebar, ModuleRegistry::ids($moduleClasses), array_values($roles));
|
||||||
|
|
||||||
|
$dto = new SidebarResource();
|
||||||
|
$dto->sections = $filtered['sections'];
|
||||||
|
$dto->disabledRoutes = $filtered['disabledRoutes'];
|
||||||
|
|
||||||
|
return $dto;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\Database;
|
||||||
|
|
||||||
|
final class ColumnCommentsCatalog
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* SQL `COMMENT ON COLUMN` statements for the 4 standard Timestampable/Blamable columns.
|
||||||
|
* Call from a migration: foreach (...) { $this->addSql($statement); }.
|
||||||
|
*
|
||||||
|
* @return list<string>
|
||||||
|
*/
|
||||||
|
public static function timestampableBlamableComments(string $table): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
"COMMENT ON COLUMN {$table}.created_at IS 'Date de creation (UTC). Rempli automatiquement (Timestampable).'",
|
||||||
|
"COMMENT ON COLUMN {$table}.updated_at IS 'Date de derniere modification (UTC). Rempli automatiquement (Timestampable).'",
|
||||||
|
"COMMENT ON COLUMN {$table}.created_by IS 'Auteur de la creation (FK user, SET NULL). Rempli automatiquement (Blamable).'",
|
||||||
|
"COMMENT ON COLUMN {$table}.updated_by IS 'Auteur de la derniere modification (FK user, SET NULL). Rempli automatiquement (Blamable).'",
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\Doctrine;
|
||||||
|
|
||||||
|
use App\Shared\Application\CurrentUserProviderInterface;
|
||||||
|
use App\Shared\Domain\Contract\BlamableInterface;
|
||||||
|
use App\Shared\Domain\Contract\TimestampableInterface;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
|
||||||
|
use Doctrine\ORM\Event\PrePersistEventArgs;
|
||||||
|
use Doctrine\ORM\Event\PreUpdateEventArgs;
|
||||||
|
use Doctrine\ORM\Events;
|
||||||
|
|
||||||
|
#[AsDoctrineListener(event: Events::prePersist)]
|
||||||
|
#[AsDoctrineListener(event: Events::preUpdate)]
|
||||||
|
final readonly class TimestampableBlamableSubscriber
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private CurrentUserProviderInterface $currentUserProvider,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function prePersist(PrePersistEventArgs $args): void
|
||||||
|
{
|
||||||
|
$this->applyOnCreate($args->getObject());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function preUpdate(PreUpdateEventArgs $args): void
|
||||||
|
{
|
||||||
|
$this->applyOnUpdate($args->getObject());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function applyOnCreate(object $entity): void
|
||||||
|
{
|
||||||
|
$now = new DateTimeImmutable();
|
||||||
|
|
||||||
|
if ($entity instanceof TimestampableInterface) {
|
||||||
|
if (null === $entity->getCreatedAt()) {
|
||||||
|
$entity->setCreatedAt($now);
|
||||||
|
}
|
||||||
|
$entity->setUpdatedAt($now);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($entity instanceof BlamableInterface) {
|
||||||
|
$user = $this->currentUserProvider->getCurrentUser();
|
||||||
|
if (null === $entity->getCreatedBy()) {
|
||||||
|
$entity->setCreatedBy($user);
|
||||||
|
}
|
||||||
|
$entity->setUpdatedBy($user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function applyOnUpdate(object $entity): void
|
||||||
|
{
|
||||||
|
if ($entity instanceof TimestampableInterface) {
|
||||||
|
$entity->setUpdatedAt(new DateTimeImmutable());
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($entity instanceof BlamableInterface) {
|
||||||
|
$entity->setUpdatedBy($this->currentUserProvider->getCurrentUser());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Shared\Infrastructure\Security;
|
||||||
|
|
||||||
|
use App\Shared\Application\CurrentUserProviderInterface;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
|
||||||
|
final readonly class SecurityCurrentUserProvider implements CurrentUserProviderInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private Security $security,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function getCurrentUser(): ?UserInterface
|
||||||
|
{
|
||||||
|
$user = $this->security->getUser();
|
||||||
|
|
||||||
|
return $user instanceof UserInterface ? $user : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ namespace App\State;
|
|||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProviderInterface;
|
use ApiPlatform\State\ProviderInterface;
|
||||||
use App\Entity\AbsenceBalance;
|
use App\Entity\AbsenceBalance;
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ final readonly class AbsenceBalanceProvider implements ProviderInterface
|
|||||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): AbsenceBalance|array|null
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): AbsenceBalance|array|null
|
||||||
{
|
{
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
assert($user instanceof User);
|
assert($user instanceof UserInterface);
|
||||||
|
|
||||||
$repo = $this->entityManager->getRepository(AbsenceBalance::class);
|
$repo = $this->entityManager->getRepository(AbsenceBalance::class);
|
||||||
$isAdmin = $this->security->isGranted('ROLE_ADMIN');
|
$isAdmin = $this->security->isGranted('ROLE_ADMIN');
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ namespace App\State;
|
|||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProcessorInterface;
|
use ApiPlatform\State\ProcessorInterface;
|
||||||
use App\Entity\AbsenceRequest;
|
use App\Entity\AbsenceRequest;
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceStatus;
|
use App\Enum\AbsenceStatus;
|
||||||
use App\Enum\AbsenceType;
|
use App\Enum\AbsenceType;
|
||||||
use App\Repository\AbsencePolicyRepository;
|
use App\Repository\AbsencePolicyRepository;
|
||||||
use App\Repository\AbsenceRequestRepository;
|
use App\Repository\AbsenceRequestRepository;
|
||||||
use App\Service\AbsenceBalanceService;
|
use App\Service\AbsenceBalanceService;
|
||||||
use App\Service\AbsenceDayCalculator;
|
use App\Service\AbsenceDayCalculator;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
@@ -42,7 +42,7 @@ final readonly class AbsenceRequestProcessor implements ProcessorInterface
|
|||||||
assert($data instanceof AbsenceRequest);
|
assert($data instanceof AbsenceRequest);
|
||||||
|
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
assert($user instanceof User);
|
assert($user instanceof UserInterface);
|
||||||
|
|
||||||
$type = $data->getType();
|
$type = $data->getType();
|
||||||
$startDate = $data->getStartDate();
|
$startDate = $data->getStartDate();
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace App\State;
|
|||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProviderInterface;
|
use ApiPlatform\State\ProviderInterface;
|
||||||
use App\Entity\AbsenceRequest;
|
use App\Entity\AbsenceRequest;
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ final readonly class AbsenceRequestProvider implements ProviderInterface
|
|||||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): AbsenceRequest|array|null
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): AbsenceRequest|array|null
|
||||||
{
|
{
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
assert($user instanceof User);
|
assert($user instanceof UserInterface);
|
||||||
|
|
||||||
$repo = $this->entityManager->getRepository(AbsenceRequest::class);
|
$repo = $this->entityManager->getRepository(AbsenceRequest::class);
|
||||||
$isAdmin = $this->security->isGranted('ROLE_ADMIN');
|
$isAdmin = $this->security->isGranted('ROLE_ADMIN');
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ namespace App\State;
|
|||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProcessorInterface;
|
use ApiPlatform\State\ProcessorInterface;
|
||||||
use App\Entity\AbsenceRequest;
|
use App\Entity\AbsenceRequest;
|
||||||
use App\Entity\User;
|
|
||||||
use App\Enum\AbsenceStatus;
|
use App\Enum\AbsenceStatus;
|
||||||
use App\Service\AbsenceBalanceService;
|
use App\Service\AbsenceBalanceService;
|
||||||
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
@@ -55,7 +55,7 @@ final readonly class AbsenceReviewProcessor implements ProcessorInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$admin = $this->security->getUser();
|
$admin = $this->security->getUser();
|
||||||
assert($admin instanceof User);
|
assert($admin instanceof UserInterface);
|
||||||
|
|
||||||
if ($isApprove) {
|
if ($isApprove) {
|
||||||
// Never let an approval push the balance below zero (CP only): the
|
// Never let an approval push the balance below zero (CP only): the
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace App\State;
|
|||||||
use ApiPlatform\Metadata\Operation;
|
use ApiPlatform\Metadata\Operation;
|
||||||
use ApiPlatform\State\ProviderInterface;
|
use ApiPlatform\State\ProviderInterface;
|
||||||
use App\Entity\TaskDocument;
|
use App\Entity\TaskDocument;
|
||||||
use App\Entity\User;
|
use App\Shared\Domain\Contract\UserInterface;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Bundle\SecurityBundle\Security;
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ final readonly class TaskDocumentProvider implements ProviderInterface
|
|||||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|TaskDocument|null
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): array|TaskDocument|null
|
||||||
{
|
{
|
||||||
$user = $this->security->getUser();
|
$user = $this->security->getUser();
|
||||||
assert($user instanceof User);
|
assert($user instanceof UserInterface);
|
||||||
|
|
||||||
$repo = $this->entityManager->getRepository(TaskDocument::class);
|
$repo = $this->entityManager->getRepository(TaskDocument::class);
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Tests\Functional\Controller\Mail;
|
namespace App\Tests\Functional\Controller\Mail;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Tests\Functional\Controller\Mail;
|
namespace App\Tests\Functional\Controller\Mail;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Module\Core\Domain\Entity\User;
|
||||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user