lionsdev/unionflow-server-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: WebSocket temps réel + Finance Workflow + corrections

Browse Source 
- Task #6: WebSocket /ws/dashboard + Kafka events (5 topics)
  * Backend: KafkaEventProducer, KafkaEventConsumer
  * Mobile: WebSocketService (reconnection, heartbeat, typed events)
  * DashboardBloc: Auto-refresh depuis WebSocket events

- Finance Workflow: approbations + budgets (backend + mobile)
  * Backend: entities, services, resources, migrations Flyway V6
  * Mobile: features finance_workflow complète avec BLoC

- Corrections DI: interfaces IRepository partout
  * IProfileRepository, IOrganizationRepository, IMembreRepository
  * GetIt configuré avec @injectable

- Spec-Kit: constitution + templates mis à jour
  * .specify/memory/constitution.md enrichie
  * Templates agent, plan, spec, tasks, checklist

- Nettoyage: fichiers temporaires supprimés

Signed-off-by: lions dev Team
This commit is contained in:
dahoud
2026-03-15 02:12:17 +00:00
parent bbc409de9d
commit e8ad874015
635 changed files with 58160 additions and 20674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unionflow/unionflow-mobile-apps/lib/features/admin/bloc/admin_users_bloc.dart
View File

@@ -1,11 +1,13 @@
library admin_users_bloc;
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:injectable/injectable.dart';
import '../data/models/admin_user_model.dart';
import '../data/repositories/admin_user_repository.dart';
import 'admin_users_event.dart';
import 'admin_users_state.dart';
part 'admin_users_event.dart';
part 'admin_users_state.dart';
@injectable
class AdminUsersBloc extends Bloc<AdminUsersEvent, AdminUsersState> {
final AdminUserRepository _repository;

2
unionflow/unionflow-mobile-apps/lib/features/admin/bloc/admin_users_event.dart
View File

@@ -1,4 +1,4 @@
library admin_users_event;
part of 'admin_users_bloc.dart';
abstract class AdminUsersEvent {}

4
unionflow/unionflow-mobile-apps/lib/features/admin/bloc/admin_users_state.dart
View File

@@ -1,6 +1,4 @@
library admin_users_state;
import '../data/models/admin_user_model.dart';
part of 'admin_users_bloc.dart';
abstract class AdminUsersState {}

34
unionflow/unionflow-mobile-apps/lib/features/admin/data/repositories/admin_user_repository.dart
View File

@@ -2,6 +2,8 @@
library admin_user_repository;
import 'package:dio/dio.dart';
import 'package:injectable/injectable.dart';
import 'package:unionflow_mobile_apps/core/network/api_client.dart';
import '../models/admin_user_model.dart';
abstract class AdminUserRepository {
@@ -10,6 +12,8 @@ abstract class AdminUserRepository {
Future<List<AdminRoleModel>> getRealmRoles();
Future<List<AdminRoleModel>> getUserRoles(String userId);
Future<void> setUserRoles(String userId, List<String> roleNames);
/// Associe un utilisateur (email) à une organisation (réservé SUPER_ADMIN).
Future<void> associerOrganisation({required String email, required String organisationId});
}
class AdminUserSearchResult {
@@ -28,17 +32,18 @@ class AdminUserSearchResult {
});
}
@LazySingleton(as: AdminUserRepository)
class AdminUserRepositoryImpl implements AdminUserRepository {
final Dio _dio;
final ApiClient _apiClient;
static const String _base = '/api/admin/users';
AdminUserRepositoryImpl(this._dio);
AdminUserRepositoryImpl(this._apiClient);
@override
Future<AdminUserSearchResult> search({int page = 0, int size = 20, String? search}) async {
final query = <String, dynamic>{'page': page, 'size': size};
if (search != null && search.isNotEmpty) query['search'] = search;
final response = await _dio.get(_base, queryParameters: query);
final response = await _apiClient.get(_base, queryParameters: query);
if (response.statusCode != 200) throw Exception('Erreur ${response.statusCode}');
final data = response.data as Map<String, dynamic>;
final list = data['users'] as List<dynamic>? ?? [];
@@ -53,7 +58,7 @@ class AdminUserRepositoryImpl implements AdminUserRepository {
@override
Future<AdminUserModel?> getById(String id) async {
final response = await _dio.get('$_base/$id');
final response = await _apiClient.get('$_base/$id');
if (response.statusCode == 200) {
return AdminUserModel.fromJson(response.data as Map<String, dynamic>);
}
@@ -63,7 +68,7 @@ class AdminUserRepositoryImpl implements AdminUserRepository {
@override
Future<List<AdminRoleModel>> getRealmRoles() async {
final response = await _dio.get('$_base/roles');
final response = await _apiClient.get('$_base/roles');
if (response.statusCode != 200) return [];
final list = response.data as List<dynamic>? ?? [];
return list.map((e) => AdminRoleModel.fromJson(e as Map<String, dynamic>)).toList();
@@ -71,7 +76,7 @@ class AdminUserRepositoryImpl implements AdminUserRepository {
@override
Future<List<AdminRoleModel>> getUserRoles(String userId) async {
final response = await _dio.get('$_base/$userId/roles');
final response = await _apiClient.get('$_base/$userId/roles');
if (response.statusCode != 200) return [];
final list = response.data as List<dynamic>? ?? [];
return list.map((e) => AdminRoleModel.fromJson(e as Map<String, dynamic>)).toList();
@@ -79,7 +84,22 @@ class AdminUserRepositoryImpl implements AdminUserRepository {
@override
Future<void> setUserRoles(String userId, List<String> roleNames) async {
final response = await _dio.put('$_base/$userId/roles', data: roleNames);
final response = await _apiClient.put('$_base/$userId/roles', data: roleNames);
if (response.statusCode != 200) throw Exception('Erreur ${response.statusCode}');
}
@override
Future<void> associerOrganisation({required String email, required String organisationId}) async {
const path = '/api/admin/associer-organisation';
final response = await _apiClient.post(
path,
data: {'email': email, 'organisationId': organisationId},
);
if (response.statusCode != 200) {
final msg = response.data is Map && response.data['message'] != null
? response.data['message'] as String
: 'Erreur ${response.statusCode}';
throw Exception(msg);
}
}
}

15
unionflow/unionflow-mobile-apps/lib/features/admin/di/admin_di.dart
View File

@@ -1,15 +0,0 @@
library admin_di;
import 'package:get_it/get_it.dart';
import 'package:dio/dio.dart';
import '../bloc/admin_users_bloc.dart';
import '../data/repositories/admin_user_repository.dart';
void registerAdminDependencies(GetIt getIt) {
getIt.registerLazySingleton<AdminUserRepository>(
() => AdminUserRepositoryImpl(getIt<Dio>()),
);
getIt.registerFactory<AdminUsersBloc>(
() => AdminUsersBloc(getIt<AdminUserRepository>()),
);
}

192
unionflow/unionflow-mobile-apps/lib/features/admin/presentation/pages/user_management_detail_page.dart
View File

@@ -1,9 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:get_it/get_it.dart';
import '../../../../core/utils/logger.dart';
import '../../bloc/admin_users_bloc.dart';
import '../../bloc/admin_users_event.dart';
import '../../bloc/admin_users_state.dart';
import '../../data/models/admin_user_model.dart';
import '../../data/repositories/admin_user_repository.dart';
import '../../../organizations/data/models/organization_model.dart';
import '../../../organizations/data/services/organization_service.dart';
import '../../../../shared/design_system/unionflow_design_system.dart';
import '../../../../shared/widgets/core_card.dart';
import '../../../../shared/design_system/components/uf_app_bar.dart';
import '../../../../shared/design_system/components/uf_buttons.dart';
/// Page détail d'un utilisateur + édition des rôles
class UserManagementDetailPage extends StatelessWidget {
@@ -14,10 +21,9 @@ class UserManagementDetailPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Détail utilisateur'),
backgroundColor: const Color(0xFF0984E3),
foregroundColor: Colors.white,
backgroundColor: AppColors.background,
appBar: const UFAppBar(
title: 'Détail utilisateur',
),
body: BlocBuilder<AdminUsersBloc, AdminUsersState>(
builder: (context, state) {
@@ -95,28 +101,42 @@ class _UserDetailContentState extends State<_UserDetailContent> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(widget.user.displayName, style: Theme.of(context).textTheme.titleLarge),
const SizedBox(height: 8),
if (widget.user.email != null) Text('Email: ${widget.user.email}'),
if (widget.user.username != null) Text('Username: ${widget.user.username}'),
Text('Actif: ${widget.user.enabled == true ? "Oui" : "Non"}'),
],
),
CoreCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(widget.user.displayName, style: AppTypography.headerSmall),
const SizedBox(height: 8),
if (widget.user.email != null)
Text('Email: ${widget.user.email}', style: AppTypography.bodyTextSmall),
if (widget.user.username != null)
Text('Username: ${widget.user.username}', style: AppTypography.bodyTextSmall),
Text(
'Statut: ${widget.user.enabled == true ? "Actif" : "Inactif"}',
style: AppTypography.bodyTextSmall.copyWith(
color: widget.user.enabled == true ? AppColors.success : AppColors.error,
fontWeight: FontWeight.bold,
),
),
],
),
),
const SizedBox(height: 16),
const Text('Rôles (cochez pour attribuer)', style: TextStyle(fontWeight: FontWeight.bold)),
Text(
'RÔLES (SÉLECTION)',
style: AppTypography.subtitleSmall.copyWith(
fontWeight: FontWeight.bold,
letterSpacing: 1.1,
),
),
const SizedBox(height: 8),
...widget.allRoles.map((role) {
final selected = _selectedRoleNames.contains(role.name);
return CheckboxListTile(
title: Text(role.name),
title: Text(role.name, style: AppTypography.bodyTextSmall),
activeColor: AppColors.primaryGreen,
contentPadding: EdgeInsets.zero,
dense: true,
value: selected,
onChanged: (v) {
setState(() {
@@ -130,19 +150,39 @@ class _UserDetailContentState extends State<_UserDetailContent> {
);
}),
const SizedBox(height: 24),
SizedBox(
width: double.infinity,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF0984E3),
padding: const EdgeInsets.symmetric(vertical: 14),
),
onPressed: () {
context.read<AdminUsersBloc>().add(
AdminUserRolesUpdateRequested(widget.userId, _selectedRoleNames.toList()),
);
},
child: const Text('Enregistrer les rôles'),
UFPrimaryButton(
label: 'Enregistrer les rôles',
onPressed: () {
context.read<AdminUsersBloc>().add(
AdminUserRolesUpdateRequested(widget.userId, _selectedRoleNames.toList()),
);
},
),
const SizedBox(height: 24),
const Divider(height: 1),
const SizedBox(height: 16),
Text(
'ASSOCIER À UNE ORGANISATION',
style: AppTypography.subtitleSmall.copyWith(
fontWeight: FontWeight.bold,
letterSpacing: 1.1,
),
),
const SizedBox(height: 8),
Text(
'Permet à cet utilisateur (ex. admin d\'organisation) de voir « Mes organisations » et d\'accéder au dashboard de l\'organisation.',
style: AppTypography.bodyTextSmall.copyWith(color: AppColors.textSecondaryLight),
),
const SizedBox(height: 12),
OutlinedButton.icon(
onPressed: widget.user.email == null || widget.user.email!.isEmpty
? null
: () => _openAssocierOrganisationDialog(context, widget.user.email!),
icon: const Icon(Icons.business, size: 18),
label: const Text('Associer à une organisation'),
style: OutlinedButton.styleFrom(
foregroundColor: AppColors.primaryGreen,
side: const BorderSide(color: AppColors.primaryGreen),
),
),
],
@@ -150,4 +190,88 @@ class _UserDetailContentState extends State<_UserDetailContent> {
),
);
}
Future<void> _openAssocierOrganisationDialog(BuildContext context, String userEmail) async {
final orgService = GetIt.I<OrganizationService>();
final adminRepo = GetIt.I<AdminUserRepository>();
List<OrganizationModel> organisations = [];
try {
organisations = await orgService.getOrganizations(page: 0, size: 200);
} catch (e, st) {
AppLogger.error('UserManagementDetail: chargement organisations échoué', error: e, stackTrace: st);
if (!context.mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Impossible de charger les organisations')),
);
return;
}
if (!context.mounted) return;
final orgsWithId = organisations.where((o) => o.id != null && o.id!.isNotEmpty).toList();
if (orgsWithId.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Aucune organisation disponible. Créez-en une d\'abord.')),
);
return;
}
String? selectedOrgId = orgsWithId.first.id;
await showDialog<void>(
context: context,
builder: (ctx) => StatefulBuilder(
builder: (ctx2, setDialogState) {
return AlertDialog(
title: const Text('Associer à une organisation'),
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Utilisateur: $userEmail', style: AppTypography.bodyTextSmall),
const SizedBox(height: 16),
DropdownButtonFormField<String>(
value: selectedOrgId,
isExpanded: true,
decoration: const InputDecoration(
labelText: 'Organisation',
border: OutlineInputBorder(),
),
items: orgsWithId
.map((o) => DropdownMenuItem(value: o.id, child: Text(o.nom, overflow: TextOverflow.ellipsis)))
.toList(),
onChanged: (v) => setDialogState(() => selectedOrgId = v),
),
],
),
),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(),
child: const Text('Annuler'),
),
FilledButton(
onPressed: () async {
if (selectedOrgId == null) return;
try {
await adminRepo.associerOrganisation(email: userEmail, organisationId: selectedOrgId!);
if (ctx.mounted) Navigator.of(ctx).pop();
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Utilisateur associé à l\'organisation avec succès.')),
);
}
} catch (e) {
if (ctx.mounted) {
ScaffoldMessenger.of(ctx).showSnackBar(
SnackBar(content: Text('Erreur: ${e.toString().replaceFirst('Exception: ', '')}')),
);
}
}
},
child: const Text('Associer'),
),
],
);
},
),
);
}
}

83
unionflow/unionflow-mobile-apps/lib/features/admin/presentation/pages/user_management_page.dart
View File

@@ -2,9 +2,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:get_it/get_it.dart';
import '../../bloc/admin_users_bloc.dart';
import '../../bloc/admin_users_event.dart';
import '../../bloc/admin_users_state.dart';
import '../../data/models/admin_user_model.dart';
import '../../../../shared/design_system/unionflow_design_system.dart';
import '../../../../shared/widgets/core_card.dart';
import '../../../../shared/widgets/mini_avatar.dart';
import '../../../../shared/design_system/components/uf_app_bar.dart';
import 'user_management_detail_page.dart';
/// Page de gestion des utilisateurs (SUPER_ADMIN) - liste paginée
@@ -39,13 +41,12 @@ class _UserManagementViewState extends State<_UserManagementView> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Gestion des utilisateurs'),
backgroundColor: const Color(0xFF0984E3),
foregroundColor: Colors.white,
backgroundColor: AppColors.background,
appBar: UFAppBar(
title: 'Gestion des utilisateurs',
actions: [
IconButton(
icon: const Icon(Icons.refresh),
icon: const Icon(Icons.refresh, size: 20),
onPressed: () => context.read<AdminUsersBloc>().add(AdminUsersLoadRequested()),
),
],
@@ -58,9 +59,23 @@ class _UserManagementViewState extends State<_UserManagementView> {
controller: _searchController,
decoration: InputDecoration(
hintText: 'Rechercher (email, nom...)',
prefixIcon: const Icon(Icons.search),
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
hintStyle: AppTypography.subtitleSmall,
prefixIcon: const Icon(Icons.search, size: 18),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(RadiusTokens.md),
borderSide: const BorderSide(color: AppColors.lightBorder),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(RadiusTokens.md),
borderSide: const BorderSide(color: AppColors.lightBorder),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(RadiusTokens.md),
borderSide: const BorderSide(color: AppColors.primaryGreen),
),
filled: true,
fillColor: AppColors.lightSurface,
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
),
onSubmitted: (v) => context.read<AdminUsersBloc>().add(
AdminUsersLoadRequested(search: v.isEmpty ? null : v),
@@ -120,27 +135,45 @@ class _UserManagementViewState extends State<_UserManagementView> {
}
Widget _buildUserTile(BuildContext context, AdminUserModel user) {
return Card(
return CoreCard(
margin: const EdgeInsets.only(bottom: 8),
child: ListTile(
leading: CircleAvatar(
backgroundColor: const Color(0xFF0984E3),
child: Text(
(user.prenom?.substring(0, 1) ?? user.username?.substring(0, 1) ?? '?').toUpperCase(),
style: const TextStyle(color: Colors.white),
onTap: () => Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => BlocProvider(
create: (_) => GetIt.I<AdminUsersBloc>()..add(AdminUserDetailWithRolesRequested(user.id)),
child: UserManagementDetailPage(userId: user.id),
),
),
title: Text(user.displayName),
subtitle: Text(user.email ?? user.username ?? user.id),
trailing: const Icon(Icons.chevron_right),
onTap: () => Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => BlocProvider(
create: (_) => GetIt.I<AdminUsersBloc>()..add(AdminUserDetailWithRolesRequested(user.id)),
child: UserManagementDetailPage(userId: user.id),
),
child: Row(
children: [
MiniAvatar(
imageUrl: null, // AdminUserModel n'a pas de champ avatar
fallbackText: (user.prenom?.substring(0, 1) ?? user.username?.substring(0, 1) ?? '?').toUpperCase(),
size: 36,
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
user.displayName,
style: AppTypography.actionText,
),
Text(
user.email ?? user.username ?? user.id,
style: AppTypography.subtitleSmall,
),
],
),
),
),
const Icon(
Icons.chevron_right,
size: 16,
color: AppColors.textSecondaryLight,
),
],
),
);
}