Refactor customer management: migrate from Bloc to Cubit, update state handling, and implement customer search functionality

This commit is contained in:
2026-04-17 21:51:37 +02:00
parent a06be4bf7a
commit 762a7530d5
9 changed files with 435 additions and 170 deletions

View File

@@ -1,117 +0,0 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:flux/features/customers/data/customer_repository.dart';
import 'package:flux/features/customers/models/customer_model.dart';
import 'package:get_it/get_it.dart';
part 'customer_events.dart';
part 'customer_state.dart';
class CustomerBloc extends Bloc<CustomerEvent, CustomerState> {
final CustomerRepository _repository = GetIt.I<CustomerRepository>();
CustomerBloc() : super(const CustomerState()) {
on<LoadCustomersRequested>(_onLoadCustomers);
on<CreateCustomerRequested>(_onCreateCustomer);
on<SearchCustomersRequested>(_onSearchCustomers);
on<UpdateCustomerRequested>(_onUpdateCustomer);
}
Future<void> _onLoadCustomers(
LoadCustomersRequested event,
Emitter<CustomerState> emit,
) async {
emit(state.copyWith(status: CustomerStatus.loading));
try {
final customers = await _repository.getCustomers(event.companyId);
emit(
state.copyWith(status: CustomerStatus.success, customers: customers),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
}
Future<void> _onCreateCustomer(
CreateCustomerRequested event,
Emitter<CustomerState> emit,
) async {
emit(state.copyWith(status: CustomerStatus.loading));
try {
final newCustomer = await _repository.createCustomer(event.customer);
// Aggiorniamo la lista locale aggiungendo il nuovo cliente in cima
final updatedList = List<CustomerModel>.from(state.customers)
..insert(0, newCustomer);
emit(
state.copyWith(
status: CustomerStatus.success,
customers: updatedList,
lastCreatedCustomer:
newCustomer, // Lo passiamo per le Dialog "al volo"
),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
}
Future<void> _onUpdateCustomer(
UpdateCustomerRequested event,
Emitter<CustomerState> emit,
) async {
emit(state.copyWith(status: CustomerStatus.loading));
try {
// Qui dovresti aggiungere un metodo updateCustomer nel Repository
// Simile al create ma usando .update().eq('id', customer.id)
final updatedCustomer = await _repository.updateCustomer(event.customer);
final updatedList = List<CustomerModel>.from(state.customers);
final index = updatedList.indexWhere((c) => c.id == updatedCustomer.id);
if (index != -1) {
updatedList[index] = updatedCustomer;
}
emit(
state.copyWith(
status: CustomerStatus.success,
customers: updatedList,
lastCreatedCustomer: updatedCustomer,
),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
}
Future<void> _onSearchCustomers(
SearchCustomersRequested event,
Emitter<CustomerState> emit,
) async {
// Non mettiamo loading per evitare flickering durante la digitazione
try {
final results = await _repository.searchCustomers(
event.companyId,
event.query,
);
emit(state.copyWith(status: CustomerStatus.success, customers: results));
} catch (_) {}
}
}

View File

@@ -0,0 +1,130 @@
import 'dart:async'; // Serve per il Timer del debounce
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:flux/features/customers/data/customer_repository.dart';
import 'package:flux/features/customers/models/customer_model.dart';
import 'package:get_it/get_it.dart';
part 'customer_state.dart';
class CustomerCubit extends Cubit<CustomerState> {
final CustomerRepository _repository = GetIt.I<CustomerRepository>();
// Variabile per gestire il debounce della ricerca
Timer? _searchDebounce;
CustomerCubit() : super(const CustomerState());
// --- LETTURA ---
Future<void> loadCustomers(String companyId) async {
emit(state.copyWith(status: CustomerStatus.loading));
try {
final customers = await _repository.getCustomers(companyId);
emit(
state.copyWith(status: CustomerStatus.success, customers: customers),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
}
// --- CREAZIONE ---
Future<void> createCustomer(CustomerModel customer) async {
emit(state.copyWith(status: CustomerStatus.loading));
try {
final newCustomer = await _repository.createCustomer(customer);
// Aggiorniamo la lista locale aggiungendo il nuovo cliente in cima
final updatedList = List<CustomerModel>.from(state.customers)
..insert(0, newCustomer);
emit(
state.copyWith(
status: CustomerStatus.success,
customers: updatedList,
lastCreatedCustomer: newCustomer,
),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
}
// --- AGGIORNAMENTO ---
Future<void> updateCustomer(CustomerModel customer) async {
emit(state.copyWith(status: CustomerStatus.loading));
try {
final updatedCustomer = await _repository.updateCustomer(customer);
final updatedList = List<CustomerModel>.from(state.customers);
final index = updatedList.indexWhere((c) => c.id == updatedCustomer.id);
if (index != -1) {
updatedList[index] = updatedCustomer;
}
emit(
state.copyWith(
status: CustomerStatus.success,
customers: updatedList,
lastCreatedCustomer:
updatedCustomer, // Utile se modifichi un cliente appena creato
),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
}
// --- RICERCA CON DEBOUNCE ---
void searchCustomers(String companyId, String query) {
// 1. Se c'è già una ricerca in attesa (l'utente sta digitando veloce), la annulliamo
if (_searchDebounce?.isActive ?? false) _searchDebounce!.cancel();
// 2. Facciamo partire un timer di 400 millisecondi
_searchDebounce = Timer(const Duration(milliseconds: 400), () async {
// Se cancella tutto e la query è vuota, ricarichiamo la lista base
if (query.trim().isEmpty) {
await loadCustomers(companyId);
return;
}
// Nessun "loading" state qui, per evitare sfarfallii visivi mentre si scrive
try {
final results = await _repository.searchCustomers(companyId, query);
emit(
state.copyWith(status: CustomerStatus.success, customers: results),
);
} catch (e) {
emit(
state.copyWith(
status: CustomerStatus.failure,
errorMessage: e.toString(),
),
);
}
});
}
// Pulizia della memoria quando il Cubit viene distrutto
@override
Future<void> close() {
_searchDebounce?.cancel();
return super.close();
}
}

View File

@@ -1,34 +0,0 @@
part of 'customer_bloc.dart';
abstract class CustomerEvent extends Equatable {
const CustomerEvent();
@override
List<Object?> get props => [];
}
// Carica tutti i clienti dell'azienda
class LoadCustomersRequested extends CustomerEvent {
final String companyId;
const LoadCustomersRequested(this.companyId);
}
// Crea un cliente (usato sia dalla lista che dalla Dialog operazioni)
class CreateCustomerRequested extends CustomerEvent {
final CustomerModel customer;
const CreateCustomerRequested(this.customer);
}
// Ricerca in tempo reale
class SearchCustomersRequested extends CustomerEvent {
final String companyId;
final String query;
const SearchCustomersRequested(this.companyId, this.query);
}
class UpdateCustomerRequested extends CustomerEvent {
final CustomerModel customer;
const UpdateCustomerRequested(this.customer);
@override
List<Object?> get props => [customer];
}

View File

@@ -1,12 +1,11 @@
part of 'customer_bloc.dart'; part of 'customer_cubit.dart';
enum CustomerStatus { initial, loading, success, failure } enum CustomerStatus { initial, loading, success, failure }
class CustomerState extends Equatable { class CustomerState extends Equatable {
final CustomerStatus status; final CustomerStatus status;
final List<CustomerModel> customers; // Per la lista generale final List<CustomerModel> customers;
final CustomerModel? final CustomerModel? lastCreatedCustomer;
lastCreatedCustomer; // <--- Fondamentale per la Dialog "al volo"
final String? errorMessage; final String? errorMessage;
const CustomerState({ const CustomerState({

View File

@@ -0,0 +1,194 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/customers/blocs/customer_cubit.dart';
import 'package:flux/features/services/blocs/services_cubit.dart';
class CustomerSearchSheet extends StatefulWidget {
const CustomerSearchSheet({super.key});
@override
State<CustomerSearchSheet> createState() => _CustomerSearchSheetState();
}
class _CustomerSearchSheetState extends State<CustomerSearchSheet> {
final TextEditingController _searchController = TextEditingController();
@override
void initState() {
super.initState();
// Opzionale ma consigliato: carica i clienti recenti appena si apre la modale,
// così l'utente non vede una schermata vuota prima di cercare.
// context.read<CustomersCubit>().loadCustomers(query: '');
}
@override
void dispose() {
_searchController.dispose();
super.dispose();
}
void _onSearchChanged(String query) {
// Comunichiamo al Cubit dei clienti di fare la query su Supabase
// (Consiglio Pro: nel Cubit, metti un "debounce" di 300ms su questa chiamata
// per non bombardare Supabase a ogni singola lettera digitata!)
// context.read<CustomersCubit>().searchCustomers(query);
}
@override
Widget build(BuildContext context) {
return ConstrainedBox(
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.85,
),
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// --- HEADER ---
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
"Trova Cliente",
style: TextStyle(fontSize: 22, fontWeight: FontWeight.bold),
),
IconButton(
icon: const Icon(Icons.close),
onPressed: () => Navigator.pop(context),
tooltip: "Chiudi",
),
],
),
const SizedBox(height: 16),
// --- BARRA DI RICERCA ---
TextField(
controller: _searchController,
decoration: InputDecoration(
hintText: "Cerca per nome, cognome o CF...",
prefixIcon: const Icon(Icons.search),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
),
filled: true,
fillColor: Theme.of(
context,
).colorScheme.surfaceContainerHighest.withValues(alpha: 0.3),
suffixIcon: IconButton(
icon: const Icon(Icons.clear),
onPressed: () {
_searchController.clear();
_onSearchChanged("");
},
),
),
onChanged: _onSearchChanged,
),
const SizedBox(height: 16),
// --- TASTO NUOVO CLIENTE ---
SizedBox(
width: double.infinity,
child: OutlinedButton.icon(
onPressed: () {
// TODO: Naviga alla pagina "Crea Cliente".
},
icon: const Icon(Icons.person_add),
label: const Text("Crea Nuovo Cliente"),
style: OutlinedButton.styleFrom(
padding: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
),
),
),
const SizedBox(height: 24),
// --- LISTA RISULTATI CON BLOC BUILDER ---
const Text(
"Risultati",
style: TextStyle(fontWeight: FontWeight.bold, color: Colors.grey),
),
const SizedBox(height: 8),
Expanded(
// AGGANCIO AL CUBIT REALE
child: BlocBuilder<CustomerCubit, CustomerState>(
builder: (context, state) {
// 1. Stato di caricamento
if (state.status == CustomerStatus.loading) {
return const Center(child: CircularProgressIndicator());
}
// 2. Nessun risultato trovato
if (state.customers.isEmpty) {
return const Center(
child: Text(
"Nessun cliente trovato.\nProva a cambiare i termini di ricerca.",
textAlign: TextAlign.center,
style: TextStyle(color: Colors.grey),
),
);
}
// 3. Mostriamo la lista vera
return ListView.separated(
itemCount: state.customers.length,
separatorBuilder: (context, index) =>
const Divider(height: 1),
itemBuilder: (context, index) {
final customer = state.customers[index];
// Assumo che il tuo CustomerModel abbia le proprietà name e surname.
// Adatta queste variabili al tuo modello reale!
final displayName = customer.nome.trim();
return ListTile(
contentPadding: EdgeInsets.zero,
leading: CircleAvatar(
backgroundColor: Theme.of(
context,
).colorScheme.primaryContainer,
foregroundColor: Theme.of(
context,
).colorScheme.onPrimaryContainer,
// Mostra l'iniziale
child: Text(
displayName.isNotEmpty
? displayName[0].toUpperCase()
: "?",
),
),
title: Text(
displayName,
style: const TextStyle(fontWeight: FontWeight.w500),
),
subtitle: Text(customer.email),
trailing: const Icon(
Icons.check_circle_outline,
color: Colors.grey,
),
onTap: () {
// Salviamo l'ID e il nome formattato nel form dei servizi
context.read<ServicesCubit>().updateField(
customerId: customer.id,
customerDisplayName: displayName,
);
// Chiudiamo la modale
Navigator.pop(context);
},
);
},
);
},
),
),
],
),
),
);
}
}

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/core/blocs/session/session_bloc.dart'; import 'package:flux/core/blocs/session/session_bloc.dart';
import 'package:flux/core/theme/theme.dart'; import 'package:flux/core/theme/theme.dart';
import 'package:flux/features/customers/blocs/customer_bloc.dart'; import 'package:flux/features/customers/blocs/customer_cubit.dart';
import 'package:flux/features/customers/models/customer_model.dart'; import 'package:flux/features/customers/models/customer_model.dart';
import 'package:flux/features/customers/ui/customer_form.dart'; import 'package:flux/features/customers/ui/customer_form.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -26,16 +26,14 @@ class _CustomersContentState extends State<CustomersContent> {
void _loadInitialCustomers() { void _loadInitialCustomers() {
final companyId = context.read<SessionBloc>().state.company?.id; final companyId = context.read<SessionBloc>().state.company?.id;
if (companyId != null) { if (companyId != null) {
context.read<CustomerBloc>().add(LoadCustomersRequested(companyId)); context.read<CustomerCubit>().loadCustomers(companyId);
} }
} }
void _onSearch(String query) { void _onSearch(String query) {
final companyId = context.read<SessionBloc>().state.company?.id; final companyId = context.read<SessionBloc>().state.company?.id;
if (companyId != null) { if (companyId != null) {
context.read<CustomerBloc>().add( context.read<CustomerCubit>().searchCustomers(companyId, query);
SearchCustomersRequested(companyId, query),
);
} }
} }
@@ -57,16 +55,12 @@ class _CustomersContentState extends State<CustomersContent> {
if (customer == null) { if (customer == null) {
// CASO NUOVO: Iniettiamo il companyId e inviamo l'evento create // CASO NUOVO: Iniettiamo il companyId e inviamo l'evento create
context.read<CustomerBloc>().add( context.read<CustomerCubit>().createCustomer(
CreateCustomerRequested( customerFromForm.copyWith(companyId: companyId),
customerFromForm.copyWith(companyId: companyId),
),
); );
} else { } else {
// CASO MODIFICA: L'ID e il companyId sono già nel modello // CASO MODIFICA: L'ID e il companyId sono già nel modello
context.read<CustomerBloc>().add( context.read<CustomerCubit>().updateCustomer(customerFromForm);
UpdateCustomerRequested(customerFromForm),
);
} }
Navigator.pop(dialogContext); Navigator.pop(dialogContext);
}, },
@@ -125,7 +119,7 @@ class _CustomersContentState extends State<CustomersContent> {
// LISTA CLIENTI // LISTA CLIENTI
Expanded( Expanded(
child: BlocBuilder<CustomerBloc, CustomerState>( child: BlocBuilder<CustomerCubit, CustomerState>(
builder: (context, state) { builder: (context, state) {
if (state.status == CustomerStatus.loading && if (state.status == CustomerStatus.loading &&
state.customers.isEmpty) { state.customers.isEmpty) {

View File

@@ -124,6 +124,7 @@ class ServicesCubit extends Cubit<ServicesState> {
bool? isBozza, bool? isBozza,
bool? resultOk, bool? resultOk,
String? customerId, String? customerId,
String? customerDisplayName,
}) { }) {
if (state.currentService == null) return; if (state.currentService == null) return;
@@ -138,6 +139,7 @@ class ServicesCubit extends Cubit<ServicesState> {
isBozza: isBozza, isBozza: isBozza,
resultOk: resultOk, resultOk: resultOk,
customerId: customerId, customerId: customerId,
customerDisplayName: customerDisplayName,
); );
emit(state.copyWith(currentService: updated)); emit(state.copyWith(currentService: updated));

View File

@@ -0,0 +1,97 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/customers/ui/customer_search_sheet.dart';
import 'package:flux/features/services/models/service_model.dart';
class CustomerSection extends StatelessWidget {
final ServiceModel service;
const CustomerSection({super.key, required this.service});
void _openCustomerSearch(BuildContext context) {
showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
builder: (modalContext) {
return Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(modalContext).viewInsets.bottom,
),
// La modale di ricerca
child: const CustomerSearchSheet(),
);
},
);
}
@override
Widget build(BuildContext context) {
// Niente BlocBuilder qui! Leggiamo solo la variabile 'service'
final hasCustomer = service.customerId != null;
return Card(
elevation: 2,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(
Icons.person,
color: Theme.of(context).colorScheme.primary,
),
const SizedBox(width: 8),
Text(
"Dati Cliente",
style: Theme.of(context).textTheme.titleMedium,
),
],
),
const SizedBox(height: 16),
if (!hasCustomer)
Center(
child: ElevatedButton.icon(
onPressed: () => _openCustomerSearch(context),
icon: const Icon(Icons.search),
label: const Text("Seleziona o Crea Cliente"),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 24,
vertical: 12,
),
),
),
)
else
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Text(
service.customerDisplayName ?? "Cliente Selezionato",
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
),
TextButton.icon(
onPressed: () => _openCustomerSearch(context),
icon: const Icon(Icons.edit, size: 18),
label: const Text("Cambia"),
),
],
),
],
),
),
);
}
}

View File

@@ -8,7 +8,7 @@ import 'package:flux/core/theme/bloc/theme_bloc.dart';
import 'package:flux/features/auth/bloc/auth_bloc.dart'; import 'package:flux/features/auth/bloc/auth_bloc.dart';
import 'package:flux/features/company/bloc/company_bloc.dart'; import 'package:flux/features/company/bloc/company_bloc.dart';
import 'package:flux/features/company/data/company_repository.dart'; import 'package:flux/features/company/data/company_repository.dart';
import 'package:flux/features/customers/blocs/customer_bloc.dart'; import 'package:flux/features/customers/blocs/customer_cubit.dart';
import 'package:flux/features/customers/data/customer_repository.dart'; import 'package:flux/features/customers/data/customer_repository.dart';
import 'package:flux/features/master_data/products/blocs/product_cubit.dart'; import 'package:flux/features/master_data/products/blocs/product_cubit.dart';
import 'package:flux/features/master_data/products/data/product_repository.dart'; import 'package:flux/features/master_data/products/data/product_repository.dart';
@@ -93,7 +93,7 @@ class _FluxAppState extends State<FluxApp> {
BlocProvider<StoreCubit>( BlocProvider<StoreCubit>(
create: (_) => StoreCubit(context.read<SessionBloc>())..loadStores(), create: (_) => StoreCubit(context.read<SessionBloc>())..loadStores(),
), ),
BlocProvider<CustomerBloc>(create: (_) => CustomerBloc()), BlocProvider<CustomerCubit>(create: (_) => CustomerCubit()),
BlocProvider<ProductCubit>( BlocProvider<ProductCubit>(
create: (context) => ProductCubit(context.read<SessionBloc>()), create: (context) => ProductCubit(context.read<SessionBloc>()),
), ),