feat(Synchro pages test)
This commit is contained in:
16
.ai-agent.md
16
.ai-agent.md
@@ -1,16 +0,0 @@
|
||||
Tu es un agent IA senior specialise en Laravel, Filament, React et Tailwind.
|
||||
|
||||
Tu respectes STRICTEMENT les regles du fichier .ai-rules.md et tu parcours bien le ficher .PROJECT_STRUCTURE.md pour avoir le contexte du projet.
|
||||
|
||||
Ton role :
|
||||
- proposer des solutions simples et maintenables
|
||||
- respecter l'architecture existante
|
||||
- generer du code uniquement apres validation explicite
|
||||
- inclure les tests pour chaque feature
|
||||
- ne jamais refactorer sans demande explicite
|
||||
|
||||
Tu dois toujours :
|
||||
1. Analyser la demande
|
||||
2. Proposer un plan d'action
|
||||
3. Attendre validation
|
||||
4. Generer le code
|
||||
10
.ai-rules.md
10
.ai-rules.md
@@ -1,10 +1,9 @@
|
||||
# Regles de developpement du projet
|
||||
|
||||
## Stack
|
||||
- Backend : Laravel + Filament v4
|
||||
- Backend : Laravel 12 + Filament v4
|
||||
- Frontend : React + Tailwind
|
||||
- Tests : Pest ou PHPUnit (preciser)
|
||||
- IDE : PhpStorm
|
||||
- Tests : PHPUnit 11
|
||||
|
||||
## Architecture Backend
|
||||
- Utiliser des Services
|
||||
@@ -24,7 +23,8 @@
|
||||
- Commentaires uniquement si necessaire et explicites
|
||||
- Code simple > code "clever"
|
||||
|
||||
## Workflow IA
|
||||
- Ne jamais modifier le code sans validation
|
||||
## Comportement attendu
|
||||
- Ne jamais modifier le code sans validation explicite
|
||||
- Ne jamais refactorer sans demande explicite
|
||||
- Toujours proposer un plan avant d'ecrire du code
|
||||
- Toujours expliquer brievement ce qui va etre ajoute/modifie
|
||||
|
||||
@@ -9,7 +9,12 @@
|
||||
"Bash(vendor/bin/pint:*)",
|
||||
"Bash(php artisan test:*)",
|
||||
"Bash(php artisan migrate:*)",
|
||||
"Bash(php artisan make:filament-relation-manager:*)"
|
||||
"Bash(php artisan make:filament-relation-manager:*)",
|
||||
"mcp__laravel-boost__list-artisan-commands",
|
||||
"mcp__laravel-boost__tinker",
|
||||
"Bash(php artisan make:job:*)",
|
||||
"mcp__laravel-boost__last-error",
|
||||
"Bash(php artisan view:clear:*)"
|
||||
]
|
||||
},
|
||||
"enableAllProjectMcpServers": true,
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
# Configuration Claude Code - Projet Roxane
|
||||
|
||||
Lire et appliquer les fichiers suivants avant toute action :
|
||||
Lire et appliquer avant toute action :
|
||||
|
||||
- [.ai-rules.md](.ai-rules.md) : regles de developpement, stack, architecture, style de code
|
||||
- [.ai-agent.md](.ai-agent.md) : comportement attendu de l'agent IA
|
||||
- [.ai-rules.md](.ai-rules.md) : regles de developpement, stack, architecture, style de code, comportement attendu
|
||||
|
||||
Lire avant chaque session de code et mettre à jour après ajout ou modification de fonctionnalités :
|
||||
- [PROJECT_STRUCTURE.md](PROJECT_STRUCTURE.md)
|
||||
|
||||
## Rappels critiques
|
||||
|
||||
- Backend : Laravel + Filament v4 | Frontend : React + Tailwind
|
||||
- Backend : Laravel 12 + Filament v4 | Frontend : React + Tailwind
|
||||
- Architecture : Services (pas de Repository pattern), Controllers fins
|
||||
- Toujours proposer un plan avant de coder
|
||||
- Ne jamais modifier de code sans validation explicite
|
||||
|
||||
@@ -19,16 +19,12 @@ Elle gère les membres, les cotisations, et s'intègre avec des services tiers (
|
||||
## Modeles Eloquent
|
||||
|
||||
### User
|
||||
|
||||
- **Table** : `users`
|
||||
- **Traits** : HasRoles, TwoFactorAuthenticatable, HasFactory, Notifiable
|
||||
- **Traits** : HasRoles, TwoFactorAuthenticatable
|
||||
- **Relations** : `members()` hasMany(Member)
|
||||
- **Role** : Compte utilisateur de l'application. Implemente `FilamentUser` pour l'acces admin.
|
||||
- **Role** : Implemente `FilamentUser` pour l'acces admin.
|
||||
|
||||
### Member
|
||||
|
||||
- **Table** : `members` (soft deletes)
|
||||
- **Champs cles** : `user_id`, `dolibarr_id`, `keycloak_id`, `status`, `nature`, `group_id`, lastname, firstname, email, company, date_of_birth, address, zipcode, city, country, phone1, phone2, public_membership, website_url
|
||||
- **Statuts** : draft, valid, pending, cancelled, excluded
|
||||
- **Natures** : physical, legal
|
||||
- **Relations** :
|
||||
@@ -41,9 +37,7 @@ Elle gère les membres, les cotisations, et s'intègre avec des services tiers (
|
||||
- **Methodes** : `lastMembership()`, `hasService()`, `isExpired()`
|
||||
|
||||
### Membership
|
||||
|
||||
- **Table** : `memberships` (soft deletes)
|
||||
- **Champs cles** : `member_id`, `admin_id`, `package_id`, start_date, end_date, status, validation_date, payment_method, amount, payment_status, note_public, note_private, dolibarr_id
|
||||
- **Statuts** : active, expired, pending
|
||||
- **Statuts paiement** : paid, unpaid, partial
|
||||
- **Relations** :
|
||||
@@ -53,176 +47,82 @@ Elle gère les membres, les cotisations, et s'intègre avec des services tiers (
|
||||
- `services()` belongsToMany(Service) via `services_memberships`
|
||||
|
||||
### Package
|
||||
|
||||
- **Table** : `packages`
|
||||
- **Champs** : identifier, name, description, price, is_active
|
||||
- **Donnees** : custom (1EUR), one-year (12EUR), two-years (24EUR)
|
||||
|
||||
### Service
|
||||
|
||||
- **Table** : `services`
|
||||
- **Champs** : identifier, name, description, url, icon
|
||||
- **Relations** : `memberships()` belongsToMany(Membership)
|
||||
- **Donnees** : mail (RoundCube), file2link, nextcloud, sympa (listes de diffusion), webhosting
|
||||
- **Donnees** : mail (RoundCube), file2link, nextcloud, sympa, webhosting
|
||||
|
||||
### MemberGroup
|
||||
|
||||
- **Table** : `member_groups`
|
||||
- **Champs** : name, description, identifier
|
||||
- **Relations** : `members()` hasMany(Member)
|
||||
- **Donnees** : admin-interface, website
|
||||
|
||||
### Contact
|
||||
|
||||
- **Table** : `contacts`
|
||||
- **Champs** : firstname, lastname, email, address, subject, message
|
||||
|
||||
### IspconfigMember
|
||||
|
||||
- **Table** : `ispconfigs_members`
|
||||
- **Champs** : member_id, ispconfig_client_id, ispconfig_service_user_id, email, type, data
|
||||
- **Cast** : `type` vers IspconfigType enum, `data` vers array
|
||||
|
||||
### NextCloudMember
|
||||
|
||||
- **Table** : `nextclouds_members`
|
||||
- **Champs** : member_id, nextcloud_user_id, data
|
||||
|
||||
---
|
||||
|
||||
## Enums
|
||||
|
||||
| Enum | Valeurs |
|
||||
| -------------- | ------------------------------------- |
|
||||
| IspconfigType | MAIL ("Email"), WEB ("Hebergement"), OTHER ("Autre") |
|
||||
| Enum | Valeurs |
|
||||
| ------------- | ----------------------------------------------------- |
|
||||
| IspconfigType | MAIL ("Email"), WEB ("Hebergement"), OTHER ("Autre") |
|
||||
|
||||
---
|
||||
|
||||
## Services (couche metier)
|
||||
|
||||
### ContactService
|
||||
|
||||
- `registerNewContactRequest(array $data)` : cree un enregistrement Contact
|
||||
|
||||
### MemberService
|
||||
|
||||
- `registerNewMember(array $data)` : cree un Member + Membership pending, assigne au groupe "website", declenche MemberRegistered
|
||||
- `deactivateMember(Member $member)` : passe le statut a "excluded", desactive la cotisation, detache les services
|
||||
|
||||
### DolibarrService
|
||||
|
||||
Integration avec l'ERP Dolibarr via API REST.
|
||||
|
||||
- `getAllMembers()` : recupere la liste des membres
|
||||
- `getMemberSubscriptions()` : recupere les cotisations d'un membre
|
||||
- `updateMember()` : met a jour un membre
|
||||
|
||||
### ISPConfigService (base)
|
||||
|
||||
Integration via SOAP. Sous-classes :
|
||||
|
||||
**ISPConfigMailService** (serveur mail) :
|
||||
- `getAllMailDomains()`, `getAllMailUsers()`
|
||||
- `getMailDomainsForClient()`, `getMailUsersForDomain()`
|
||||
- `getMailUserDetails()` : quota, usage, protocoles
|
||||
- `updateMailUser()` : modification d'un compte mail
|
||||
|
||||
**ISPConfigWebService** (serveur web) :
|
||||
- `getAllWebsites()`, `getAllDatabases()`, `getAllFtpUsers()`, `getAllShellUsers()`, `getAllDnsZones()`
|
||||
- `getWebsiteCompleteInfo()` : infos agregees d'un site
|
||||
- Gestion de cache avec invalidation
|
||||
|
||||
### NextcloudService
|
||||
|
||||
Integration avec l'API OCS Nextcloud.
|
||||
|
||||
- `disableUserByEmail()`, `disableUserById()`
|
||||
- `listUsers()`, `getUserDetails()`
|
||||
- `findUserIdByEmail()` : recherche avec cache 7 jours
|
||||
| Service | Responsabilite |
|
||||
| ---------------------- | ----------------------------------------------------------- |
|
||||
| ContactService | Creation de demandes de contact |
|
||||
| MemberService | Inscription et desactivation de membres |
|
||||
| DolibarrService | Integration ERP via API REST |
|
||||
| ISPConfigMailService | Gestion comptes mail via SOAP |
|
||||
| ISPConfigWebService | Gestion hebergement web via SOAP (avec cache) |
|
||||
| NextcloudService | Gestion comptes Nextcloud via OCS (avec cache 7 jours) |
|
||||
|
||||
---
|
||||
|
||||
## Commandes Artisan (synchronisation)
|
||||
|
||||
| Commande | Description |
|
||||
| --------------------------------- | -------------------------------------------------------- |
|
||||
| `sync:dolibarr-members` | Importe les membres et cotisations depuis Dolibarr |
|
||||
| `members:cleanup-expired` | Desactive les membres expires (Dolibarr + ISPConfig mail + Nextcloud). Supporte `--dry-run` |
|
||||
| `sync:ispconfig-mail-members` | Lie les membres a leurs comptes mail ISPConfig (@retzien.fr) |
|
||||
| `sync:ispconfig-web-members` | Lie les membres a leurs comptes d'hebergement web |
|
||||
| `sync:nextcloud-members` | Lie les membres a leurs comptes Nextcloud |
|
||||
| `sync:services-members` | Synchronise les services associes aux membres |
|
||||
|
||||
---
|
||||
|
||||
## Routes
|
||||
|
||||
### Publiques
|
||||
|
||||
| Methode | URI | Description |
|
||||
| --------- | ---------------- | ------------------------------- |
|
||||
| GET | `/welcome` | Page d'accueil (home) |
|
||||
| GET | `/` | Page de maintenance |
|
||||
| GET/POST | `/contact` | Formulaire de contact |
|
||||
| GET/POST | `/membership` | Formulaire d'adhesion |
|
||||
|
||||
### Authentification (guest)
|
||||
|
||||
| Methode | URI | Description |
|
||||
| --------- | ------------------------ | -------------------------- |
|
||||
| GET/POST | `/login` | Connexion |
|
||||
| GET/POST | `/register` | Inscription |
|
||||
| GET/POST | `/forgot-password` | Mot de passe oublie |
|
||||
| GET/POST | `/reset-password/{token}`| Reinitialisation |
|
||||
| GET/POST | `/two-factor-challenge` | Challenge 2FA |
|
||||
|
||||
### Authentifie
|
||||
|
||||
| Methode | URI | Description |
|
||||
| ------------- | ------------------------ | -------------------------- |
|
||||
| GET | `/dashboard` | Tableau de bord |
|
||||
| GET/PATCH/DEL | `/settings/profile` | Profil utilisateur |
|
||||
| GET/PUT | `/settings/password` | Mot de passe |
|
||||
| GET | `/settings/appearance` | Theme / apparence |
|
||||
| GET | `/settings/two-factor` | Configuration 2FA |
|
||||
| GET | `/verify-email` | Verification email |
|
||||
| POST | `/logout` | Deconnexion |
|
||||
|
||||
### Admin (Filament)
|
||||
|
||||
| URI | Ressource |
|
||||
| -------------------------- | ---------------------- |
|
||||
| `/admin` | Dashboard |
|
||||
| `/admin/members` | Gestion des membres |
|
||||
| `/admin/memberships` | Gestion des cotisations|
|
||||
| `/admin/packages` | Formules d'adhesion |
|
||||
| `/admin/services` | Services numeriques |
|
||||
| `/admin/member-groups` | Groupes de membres |
|
||||
| `/admin/users` | Utilisateurs |
|
||||
| `/admin/shield/roles` | Roles et permissions |
|
||||
| Commande | Description |
|
||||
| ------------------------------- | ------------------------------------------------------------------------------ |
|
||||
| `sync:dolibarr-members` | Importe les membres et cotisations depuis Dolibarr |
|
||||
| `members:cleanup-expired` | Desactive les membres expires (Dolibarr + ISPConfig + Nextcloud). `--dry-run` |
|
||||
| `sync:ispconfig-mail-members` | Lie les membres a leurs comptes mail ISPConfig (@retzien.fr) |
|
||||
| `sync:ispconfig-web-members` | Lie les membres a leurs comptes d'hebergement web |
|
||||
| `sync:nextcloud-members` | Lie les membres a leurs comptes Nextcloud |
|
||||
| `sync:services-members` | Synchronise les services associes aux membres |
|
||||
|
||||
---
|
||||
|
||||
## Panel Admin (Filament v4)
|
||||
|
||||
### Ressources
|
||||
|
||||
Chaque ressource suit une structure modulaire :
|
||||
### Structure des ressources
|
||||
|
||||
```
|
||||
app/Filament/Resources/<Nom>/
|
||||
├── <Nom>Resource.php # Definition (modele, navigation, schema, table)
|
||||
├── Schemas/<Nom>Form.php # Formulaire
|
||||
├── Tables/<Nom>sTable.php # Tableau
|
||||
├── Pages/
|
||||
│ ├── List<Nom>s.php
|
||||
│ ├── Create<Nom>.php
|
||||
│ └── Edit<Nom>.php
|
||||
├── Widgets/ # (optionnel)
|
||||
└── RelationManagers/ # (optionnel)
|
||||
├── <Nom>Resource.php
|
||||
├── Schemas/<Nom>Form.php
|
||||
├── Tables/<Nom>sTable.php
|
||||
├── Pages/ (List, Create, Edit)
|
||||
├── Widgets/ (optionnel)
|
||||
└── RelationManagers/ (optionnel)
|
||||
```
|
||||
|
||||
**Ressources disponibles** : MemberResource, MembershipResource, PackageResource, ServiceResource, MemberGroupResource, UserResource
|
||||
**Ressources** : MemberResource, MembershipResource, PackageResource, ServiceResource, MemberGroupResource, UserResource
|
||||
|
||||
**Pages custom** : Synchronisations (groupe "Paramètres" — lancement manuel des commandes Artisan)
|
||||
|
||||
**Widgets** : MemberCount, MembershipsChart
|
||||
|
||||
@@ -236,8 +136,6 @@ Roles :
|
||||
- `super_admin` : acces complet
|
||||
- `panel_user` : acces au panel avec permissions specifiques
|
||||
|
||||
Chaque modele a sa Policy associee verifiant les permissions Spatie.
|
||||
|
||||
---
|
||||
|
||||
## Frontend (React + Inertia v2)
|
||||
@@ -246,92 +144,50 @@ Chaque modele a sa Policy associee verifiant les permissions Spatie.
|
||||
|
||||
```
|
||||
resources/js/pages/
|
||||
├── welcome.tsx # Accueil
|
||||
├── maintenance.tsx # Maintenance
|
||||
├── dashboard.tsx # Tableau de bord (placeholder)
|
||||
├── auth/
|
||||
│ ├── login.tsx
|
||||
│ ├── register.tsx
|
||||
│ ├── forgot-password.tsx
|
||||
│ ├── reset-password.tsx
|
||||
│ ├── verify-email.tsx
|
||||
│ ├── confirm-password.tsx
|
||||
│ └── two-factor-challenge.tsx
|
||||
├── forms/
|
||||
│ ├── contact.tsx # Formulaire de contact
|
||||
│ └── membership.tsx # Formulaire d'adhesion
|
||||
└── settings/
|
||||
├── profile.tsx
|
||||
├── password.tsx
|
||||
├── two-factor.tsx
|
||||
└── appearance.tsx
|
||||
├── welcome.tsx / maintenance.tsx / dashboard.tsx
|
||||
├── auth/ (login, register, forgot-password, reset-password, verify-email, two-factor-challenge)
|
||||
├── forms/ (contact.tsx, membership.tsx)
|
||||
└── settings/ (profile, password, two-factor, appearance)
|
||||
```
|
||||
|
||||
### Composants principaux
|
||||
|
||||
```
|
||||
resources/js/components/
|
||||
├── app-shell.tsx # Layout principal
|
||||
├── app-header.tsx / app-sidebar.tsx
|
||||
├── app-shell.tsx / app-header.tsx / app-sidebar.tsx
|
||||
├── nav-main.tsx / nav-user.tsx / nav-footer.tsx
|
||||
├── breadcrumbs.tsx
|
||||
├── flash-message.tsx
|
||||
├── two-factor-setup-modal.tsx
|
||||
├── appearance-tabs.tsx
|
||||
└── ui/ # Composants Shadcn/ui
|
||||
├── breadcrumbs.tsx / flash-message.tsx
|
||||
├── two-factor-setup-modal.tsx / appearance-tabs.tsx
|
||||
└── ui/ (Shadcn/ui)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Notifications
|
||||
|
||||
| Classe | Canal | Description |
|
||||
| ---------------------------- | ----- | ---------------------------------- |
|
||||
| SubscriptionExpiredPhase1 | Email | Notification d'expiration d'adhesion (queued) |
|
||||
|
||||
---
|
||||
|
||||
## Configuration externe
|
||||
|
||||
Definie dans `config/services.php` via variables d'environnement :
|
||||
|
||||
| Service | Type d'integration | Description |
|
||||
|--------|---------------------|--------------------------------------------|
|
||||
| Dolibarr | API REST + htaccess | ERP - gestion des adherents et cotisations |
|
||||
| ISPConfig | SOAP (3 serveurs) | Mail, hebergement web, test. Cache 5 min |
|
||||
| Nextcloud | API OCS | Comptes cloud des membres |
|
||||
| Sympa | Mail Listing | Liste de diffusion mail (à venir) |
|
||||
| Classe | Canal | Description |
|
||||
| ------------------------- | ----- | --------------------------------------------- |
|
||||
| SubscriptionExpiredPhase1 | Email | Notification d'expiration d'adhesion (queued) |
|
||||
|
||||
---
|
||||
|
||||
## Localisation
|
||||
|
||||
Langues supportees : **francais** (fr), **anglais** (en)
|
||||
|
||||
Fichiers de traduction par modele dans `lang/{locale}/` : contacts, members, memberships, packages, services, users, member_groups.
|
||||
|
||||
---
|
||||
|
||||
## Seeders
|
||||
|
||||
Le `DatabaseSeeder` cree :
|
||||
- 1 super admin (contact@nebulae-design.com)
|
||||
- 2 groupes de membres (admin-interface, website)
|
||||
- 3 formules (custom, one-year, two-years)
|
||||
- 5 services (mail, file2link, nextcloud, sympa, webhosting)
|
||||
- 1 utilisateur test (JaneDoe) avec profil membre et cotisation active
|
||||
Langues : **fr**, **en** — fichiers dans `lang/{locale}/` : contacts, members, memberships, packages, services, users, member_groups.
|
||||
|
||||
---
|
||||
|
||||
## TODOs identifies dans le code
|
||||
|
||||
| Fichier | TODO |
|
||||
| -------------------------------- | --------------------------------------------------- |
|
||||
| ContactService | Envoyer un email a l'administrateur |
|
||||
| MemberService | Envoyer des emails au membre + admin a la desactivation |
|
||||
| SubscriptionExpiredPhase1 | Creer un template generique + UI backend pour le contenu |
|
||||
| User.php | Restreindre l'acces admin en prod aux emails @retzien.fr |
|
||||
| SyncDolibarrMembers | Exporter la methode toDate() dans un service/helper |
|
||||
| SyncISPConfigMailMembers | Gerer plusieurs emails par membre |
|
||||
| SyncISPConfigMailMembers | Ajouter le suivi ispconfig_client_id |
|
||||
| MembershipFormController | Supprimer le `dd()` de debug (ligne 37) |
|
||||
| Fichier | TODO |
|
||||
|---------------------------|----------------------------------------------------------------------------|
|
||||
| ContactService | Envoyer un email a l'administrateur |
|
||||
| MemberService | Envoyer des emails au membre + admin a la desactivation |
|
||||
| SubscriptionExpiredPhase1 | Creer un template generique + UI backend pour le contenu |
|
||||
| User.php | Restreindre l'acces admin en prod aux emails @retzien.fr |
|
||||
| SyncDolibarrMembers | Exporter la methode toDate() dans un service/helper |
|
||||
| SyncISPConfigMailMembers | Gerer plusieurs emails par membre |
|
||||
| SyncISPConfigMailMembers | Ajouter le suivi ispconfig_client_id |
|
||||
| Global | Refactoriser pour rendre générique le projet Roxane (ERP pour association) |
|
||||
| Traduction | Crawler le prrojet pour retrouver toutes les clés manquantes |
|
||||
| Global | PHPstan niveau 8 |
|
||||
|
||||
171
app/Filament/Pages/Synchronisations.php
Normal file
171
app/Filament/Pages/Synchronisations.php
Normal file
@@ -0,0 +1,171 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Pages;
|
||||
|
||||
use App\Jobs\RunSyncCommand;
|
||||
use BackedEnum;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Pages\Page;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use UnitEnum;
|
||||
|
||||
class Synchronisations extends Page
|
||||
{
|
||||
protected string $view = 'filament.pages.synchronisations';
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-arrow-path';
|
||||
|
||||
protected static string|UnitEnum|null $navigationGroup = 'Paramètres';
|
||||
|
||||
protected static ?string $navigationLabel = 'Synchronisations';
|
||||
|
||||
protected static ?string $title = 'Synchronisations';
|
||||
|
||||
protected static ?string $slug = 'synchronisations';
|
||||
|
||||
protected static ?int $navigationSort = 10;
|
||||
|
||||
private const array CACHE_KEYS = [
|
||||
'dolibarr',
|
||||
'cleanup_expired',
|
||||
'ispconfig_mail',
|
||||
'ispconfig_web',
|
||||
'nextcloud',
|
||||
'services',
|
||||
];
|
||||
|
||||
public static function canAccess(): bool
|
||||
{
|
||||
return auth()->user()?->hasRole('super_admin') ?? false;
|
||||
}
|
||||
|
||||
public function getCommandStatus(string $key): array
|
||||
{
|
||||
return Cache::get("sync_run.{$key}", [
|
||||
'status' => 'idle',
|
||||
'output' => null,
|
||||
'started_at' => null,
|
||||
'finished_at' => null,
|
||||
]);
|
||||
}
|
||||
|
||||
public function hasRunningCommands(): bool
|
||||
{
|
||||
foreach (self::CACHE_KEYS as $key) {
|
||||
if (in_array($this->getCommandStatus($key)['status'], ['pending', 'running'])) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private function enqueueCommand(string $key, string $command, array $parameters = []): void
|
||||
{
|
||||
Cache::put("sync_run.{$key}", [
|
||||
'status' => 'pending',
|
||||
'output' => null,
|
||||
'started_at' => null,
|
||||
'finished_at' => null,
|
||||
], now()->addHour());
|
||||
|
||||
RunSyncCommand::dispatch($command, $parameters, $key);
|
||||
}
|
||||
|
||||
public function syncDolibarrAction(): Action
|
||||
{
|
||||
return Action::make('syncDolibarr')
|
||||
->label('Lancer')
|
||||
->requiresConfirmation()
|
||||
->modalHeading('Synchronisation Dolibarr')
|
||||
->modalDescription('Importer les membres et cotisations depuis Dolibarr.')
|
||||
->modalSubmitActionLabel('Lancer')
|
||||
->disabled(fn () => in_array($this->getCommandStatus('dolibarr')['status'], ['pending', 'running']))
|
||||
->action(fn () => $this->enqueueCommand('dolibarr', 'sync:dolibarr-members'));
|
||||
}
|
||||
|
||||
public function cleanupExpiredAction(): Action
|
||||
{
|
||||
return Action::make('cleanupExpired')
|
||||
->label('Lancer')
|
||||
->modalHeading('Désactiver les membres expirés')
|
||||
->modalDescription('Désactive les membres expirés dans Dolibarr, ISPConfig et Nextcloud.')
|
||||
->modalSubmitActionLabel('Lancer')
|
||||
->schema([
|
||||
Toggle::make('dry_run')
|
||||
->label('Mode simulation (dry-run)')
|
||||
->helperText('Simule l\'opération sans effectuer de modifications.')
|
||||
->default(true),
|
||||
])
|
||||
->disabled(fn () => in_array($this->getCommandStatus('cleanup_expired')['status'], ['pending', 'running']))
|
||||
->action(function (array $data) {
|
||||
$parameters = $data['dry_run'] ? ['--dry-run' => true] : [];
|
||||
$this->enqueueCommand('cleanup_expired', 'members:cleanup-expired', $parameters);
|
||||
});
|
||||
}
|
||||
|
||||
public function syncISPConfigMailAction(): Action
|
||||
{
|
||||
return Action::make('syncISPConfigMail')
|
||||
->label('Lancer')
|
||||
->requiresConfirmation()
|
||||
->modalHeading('Synchronisation ISPConfig Mail')
|
||||
->modalDescription('Lie les membres à leurs comptes mail ISPConfig (@retzien.fr).')
|
||||
->modalSubmitActionLabel('Lancer')
|
||||
->disabled(fn () => in_array($this->getCommandStatus('ispconfig_mail')['status'], ['pending', 'running']))
|
||||
->action(fn () => $this->enqueueCommand('ispconfig_mail', 'sync:ispconfig-mail-members'));
|
||||
}
|
||||
|
||||
public function syncISPConfigWebAction(): Action
|
||||
{
|
||||
return Action::make('syncISPConfigWeb')
|
||||
->label('Lancer')
|
||||
->modalHeading('Synchronisation ISPConfig Web')
|
||||
->modalDescription('Lie les membres à leurs comptes d\'hébergement web.')
|
||||
->modalSubmitActionLabel('Lancer')
|
||||
->schema([
|
||||
Toggle::make('refresh_cache')
|
||||
->label('Vider le cache ISPConfig')
|
||||
->helperText('Vide le cache avant la synchronisation.')
|
||||
->default(false),
|
||||
])
|
||||
->disabled(fn () => in_array($this->getCommandStatus('ispconfig_web')['status'], ['pending', 'running']))
|
||||
->action(function (array $data) {
|
||||
$parameters = $data['refresh_cache'] ? ['--refresh-cache' => true] : [];
|
||||
$this->enqueueCommand('ispconfig_web', 'sync:ispconfig-web-members', $parameters);
|
||||
});
|
||||
}
|
||||
|
||||
public function syncNextcloudAction(): Action
|
||||
{
|
||||
return Action::make('syncNextcloud')
|
||||
->label('Lancer')
|
||||
->modalHeading('Synchronisation Nextcloud')
|
||||
->modalDescription('Lie les membres à leurs comptes Nextcloud.')
|
||||
->modalSubmitActionLabel('Lancer')
|
||||
->schema([
|
||||
Toggle::make('dry_run')
|
||||
->label('Mode simulation (dry-run)')
|
||||
->helperText('Simule l\'opération sans effectuer de modifications.')
|
||||
->default(false),
|
||||
])
|
||||
->disabled(fn () => in_array($this->getCommandStatus('nextcloud')['status'], ['pending', 'running']))
|
||||
->action(function (array $data) {
|
||||
$parameters = $data['dry_run'] ? ['--dry-run' => true] : [];
|
||||
$this->enqueueCommand('nextcloud', 'nextcloud:sync-members', $parameters);
|
||||
});
|
||||
}
|
||||
|
||||
public function syncServicesAction(): Action
|
||||
{
|
||||
return Action::make('syncServices')
|
||||
->label('Lancer')
|
||||
->requiresConfirmation()
|
||||
->modalHeading('Synchronisation des services')
|
||||
->modalDescription('Synchronise les services associés aux membres actifs.')
|
||||
->modalSubmitActionLabel('Lancer')
|
||||
->disabled(fn () => in_array($this->getCommandStatus('services')['status'], ['pending', 'running']))
|
||||
->action(fn () => $this->enqueueCommand('services', 'memberships:sync-services'));
|
||||
}
|
||||
}
|
||||
64
app/Jobs/RunSyncCommand.php
Normal file
64
app/Jobs/RunSyncCommand.php
Normal file
@@ -0,0 +1,64 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs;
|
||||
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Queue\Queueable;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Symfony\Component\Console\Output\BufferedOutput;
|
||||
|
||||
class RunSyncCommand implements ShouldQueue
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
public int $timeout = 600;
|
||||
|
||||
public function __construct(
|
||||
public readonly string $command,
|
||||
public readonly array $parameters,
|
||||
public readonly string $cacheKey,
|
||||
) {}
|
||||
|
||||
public function handle(): void
|
||||
{
|
||||
$startedAt = now()->toDateTimeString();
|
||||
|
||||
Cache::put("sync_run.{$this->cacheKey}", [
|
||||
'status' => 'running',
|
||||
'output' => null,
|
||||
'started_at' => $startedAt,
|
||||
'finished_at' => null,
|
||||
], now()->addHour());
|
||||
|
||||
try {
|
||||
$buffer = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, false);
|
||||
Artisan::call($this->command, $this->parameters, $buffer);
|
||||
$output = trim(preg_replace('/\x1b\[[0-9;]*m/', '', $buffer->fetch()));
|
||||
|
||||
Cache::put("sync_run.{$this->cacheKey}", [
|
||||
'status' => 'completed',
|
||||
'output' => $output,
|
||||
'started_at' => $startedAt,
|
||||
'finished_at' => now()->toDateTimeString(),
|
||||
], now()->addDay());
|
||||
} catch (\Throwable $e) {
|
||||
Cache::put("sync_run.{$this->cacheKey}", [
|
||||
'status' => 'failed',
|
||||
'output' => $e->getMessage(),
|
||||
'started_at' => $startedAt,
|
||||
'finished_at' => now()->toDateTimeString(),
|
||||
], now()->addDay());
|
||||
}
|
||||
}
|
||||
|
||||
public function failed(\Throwable $exception): void
|
||||
{
|
||||
Cache::put("sync_run.{$this->cacheKey}", [
|
||||
'status' => 'failed',
|
||||
'output' => $exception->getMessage(),
|
||||
'started_at' => null,
|
||||
'finished_at' => now()->toDateTimeString(),
|
||||
], now()->addDay());
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@ return [
|
||||
'widgets' => [
|
||||
'stats' => [
|
||||
'name' => 'Nouveaux Membres',
|
||||
'description' => 'Nombre de nouveaux membres par jour',
|
||||
'description' => 'Nombre de nouveaux membres par an',
|
||||
]
|
||||
]
|
||||
],
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
<span class="flex items-center gap-2">
|
||||
{{ $label }}
|
||||
@if(in_array($status['status'], ['pending', 'running']))
|
||||
<x-filament::loading-indicator class="h-4 w-4 text-primary-500" />
|
||||
@elseif($status['status'] === 'completed')
|
||||
<x-filament::icon icon="heroicon-o-check-circle" class="h-4 w-4 text-success-500" />
|
||||
@elseif($status['status'] === 'failed')
|
||||
<x-filament::icon icon="heroicon-o-x-circle" class="h-4 w-4 text-danger-500" />
|
||||
@endif
|
||||
</span>
|
||||
@@ -0,0 +1,12 @@
|
||||
@if($status['status'] === 'pending')
|
||||
<p class="text-sm text-warning-600 dark:text-warning-400">En attente dans la file d'exécution...</p>
|
||||
@elseif($status['status'] === 'running')
|
||||
<p class="text-sm text-primary-600 dark:text-primary-400">Exécution en cours...</p>
|
||||
@elseif(in_array($status['status'], ['completed', 'failed']) && $status['output'])
|
||||
<div class="rounded-lg bg-gray-50 p-2 dark:bg-gray-900">
|
||||
<pre class="max-h-28 overflow-auto whitespace-pre-wrap text-xs {{ $status['status'] === 'failed' ? 'text-danger-600' : 'text-gray-700 dark:text-gray-300' }}">{{ $status['output'] }}</pre>
|
||||
</div>
|
||||
@if($status['finished_at'])
|
||||
<p class="text-xs text-gray-400">Terminé à {{ $status['finished_at'] }}</p>
|
||||
@endif
|
||||
@endif
|
||||
109
resources/views/filament/pages/synchronisations.blade.php
Normal file
109
resources/views/filament/pages/synchronisations.blade.php
Normal file
@@ -0,0 +1,109 @@
|
||||
@vite('resources/css/backend.css')
|
||||
|
||||
<x-filament-panels::page>
|
||||
<div
|
||||
class="grid grid-cols-1 gap-4 sm:grid-cols-2"
|
||||
@if($this->hasRunningCommands()) wire:poll.5s @endif
|
||||
>
|
||||
@php
|
||||
$dolibarr = $this->getCommandStatus('dolibarr');
|
||||
$expired = $this->getCommandStatus('cleanup_expired');
|
||||
$ispMail = $this->getCommandStatus('ispconfig_mail');
|
||||
$ispWeb = $this->getCommandStatus('ispconfig_web');
|
||||
$nextcloud = $this->getCommandStatus('nextcloud');
|
||||
$services = $this->getCommandStatus('services');
|
||||
@endphp
|
||||
|
||||
{{-- Dolibarr --}}
|
||||
<x-filament::section>
|
||||
<x-slot name="heading">
|
||||
@include('filament.pages.partials.sync-heading', ['label' => 'Dolibarr', 'status' => $dolibarr])
|
||||
</x-slot>
|
||||
<div class="space-y-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Importe les membres et cotisations depuis Dolibarr.
|
||||
</p>
|
||||
@include('filament.pages.partials.sync-status', ['status' => $dolibarr])
|
||||
|
||||
{{ $this->getAction('syncDolibarr') }}
|
||||
</div>
|
||||
</x-filament::section>
|
||||
|
||||
{{-- Membres expirés --}}
|
||||
<x-filament::section>
|
||||
<x-slot name="heading">
|
||||
@include('filament.pages.partials.sync-heading', ['label' => 'Membres expirés', 'status' => $expired])
|
||||
</x-slot>
|
||||
<div class="space-y-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Désactive les membres expirés dans Dolibarr, ISPConfig et Nextcloud.
|
||||
</p>
|
||||
@include('filament.pages.partials.sync-status', ['status' => $expired])
|
||||
|
||||
{{ $this->getAction('cleanupExpired') }}
|
||||
</div>
|
||||
</x-filament::section>
|
||||
|
||||
{{-- ISPConfig Mail --}}
|
||||
<x-filament::section>
|
||||
<x-slot name="heading">
|
||||
@include('filament.pages.partials.sync-heading', ['label' => 'ISPConfig Mail', 'status' => $ispMail])
|
||||
</x-slot>
|
||||
<div class="space-y-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Lie les membres à leurs comptes mail ISPConfig (@retzien.fr).
|
||||
</p>
|
||||
@include('filament.pages.partials.sync-status', ['status' => $ispMail])
|
||||
|
||||
{{ $this->getAction('syncISPConfigMail') }}
|
||||
</div>
|
||||
</x-filament::section>
|
||||
|
||||
{{-- ISPConfig Web --}}
|
||||
<x-filament::section>
|
||||
<x-slot name="heading">
|
||||
@include('filament.pages.partials.sync-heading', ['label' => 'ISPConfig Web', 'status' => $ispWeb])
|
||||
</x-slot>
|
||||
<div class="space-y-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Lie les membres à leurs comptes d'hébergement web.
|
||||
</p>
|
||||
@include('filament.pages.partials.sync-status', ['status' => $ispWeb])
|
||||
|
||||
{{ $this->getAction('syncISPConfigWeb') }}
|
||||
</div>
|
||||
</x-filament::section>
|
||||
|
||||
{{-- Nextcloud --}}
|
||||
<x-filament::section>
|
||||
<x-slot name="heading">
|
||||
@include('filament.pages.partials.sync-heading', ['label' => 'Nextcloud', 'status' => $nextcloud])
|
||||
</x-slot>
|
||||
<div class="space-y-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Lie les membres à leurs comptes Nextcloud.
|
||||
</p>
|
||||
@include('filament.pages.partials.sync-status', ['status' => $nextcloud])
|
||||
|
||||
{{ $this->getAction('syncNextcloud') }}
|
||||
</div>
|
||||
</x-filament::section>
|
||||
|
||||
{{-- Services membres --}}
|
||||
<x-filament::section>
|
||||
<x-slot name="heading">
|
||||
@include('filament.pages.partials.sync-heading', ['label' => 'Services membres', 'status' => $services])
|
||||
</x-slot>
|
||||
<div class="space-y-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Synchronise les services associés aux membres actifs.
|
||||
</p>
|
||||
@include('filament.pages.partials.sync-status', ['status' => $services])
|
||||
|
||||
{{ $this->getAction('syncServices') }}
|
||||
</div>
|
||||
</x-filament::section>
|
||||
</div>
|
||||
|
||||
<x-filament-actions::modals />
|
||||
</x-filament-panels::page>
|
||||
Reference in New Issue
Block a user