feat: integrate ErrorService for consistent error display and standardize bloc error messages.
This commit is contained in:
@@ -7,7 +7,8 @@ class AccountRepository {
|
||||
final FirebaseFirestore _firestore = FirebaseFirestore.instance;
|
||||
final _errorService = ErrorService();
|
||||
|
||||
CollectionReference get _accountCollection => _firestore.collection('accounts');
|
||||
CollectionReference get _accountCollection =>
|
||||
_firestore.collection('accounts');
|
||||
|
||||
CollectionReference _membersCollection(String accountId) {
|
||||
return _accountCollection.doc(accountId).collection('members');
|
||||
@@ -32,8 +33,13 @@ class AccountRepository {
|
||||
|
||||
return accountRef.id;
|
||||
});
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la création du compte: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la création du compte: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de créer le compte');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +47,6 @@ class AccountRepository {
|
||||
return _accountCollection
|
||||
.snapshots()
|
||||
.asyncMap((snapshot) async {
|
||||
|
||||
List<Account> userAccounts = [];
|
||||
|
||||
for (var accountDoc in snapshot.docs) {
|
||||
@@ -54,14 +59,24 @@ class AccountRepository {
|
||||
.get();
|
||||
if (memberDoc.exists) {
|
||||
final accountData = accountDoc.data() as Map<String, dynamic>;
|
||||
final account = Account.fromMap(accountData, accountId); // ✅ Ajout de l'ID
|
||||
final account = Account.fromMap(
|
||||
accountData,
|
||||
accountId,
|
||||
); // ✅ Ajout de l'ID
|
||||
final members = await getAccountMembers(accountId);
|
||||
userAccounts.add(account.copyWith(members: members));
|
||||
} else {
|
||||
_errorService.logInfo('account_repository.dart', 'Utilisateur NON membre de $accountId');
|
||||
_errorService.logInfo(
|
||||
'account_repository.dart',
|
||||
'Utilisateur NON membre de $accountId',
|
||||
);
|
||||
}
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(e.toString(), stackTrace);
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur processing account doc: $e',
|
||||
stackTrace,
|
||||
);
|
||||
}
|
||||
}
|
||||
return userAccounts;
|
||||
@@ -70,14 +85,19 @@ class AccountRepository {
|
||||
if (prev.length != next.length) return false;
|
||||
final prevIds = prev.map((a) => a.id).toSet();
|
||||
final nextIds = next.map((a) => a.id).toSet();
|
||||
|
||||
final identical = prevIds.difference(nextIds).isEmpty &&
|
||||
nextIds.difference(prevIds).isEmpty;
|
||||
|
||||
|
||||
final identical =
|
||||
prevIds.difference(nextIds).isEmpty &&
|
||||
nextIds.difference(prevIds).isEmpty;
|
||||
|
||||
return identical;
|
||||
})
|
||||
.handleError((error, stackTrace) {
|
||||
_errorService.logError(error, stackTrace);
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur stream accounts: $error',
|
||||
stackTrace,
|
||||
);
|
||||
return <Account>[];
|
||||
});
|
||||
}
|
||||
@@ -85,16 +105,16 @@ class AccountRepository {
|
||||
Future<List<GroupMember>> getAccountMembers(String accountId) async {
|
||||
try {
|
||||
final snapshot = await _membersCollection(accountId).get();
|
||||
return snapshot.docs
|
||||
.map((doc) {
|
||||
return GroupMember.fromMap(
|
||||
doc.data() as Map<String, dynamic>,
|
||||
doc.id,
|
||||
);
|
||||
})
|
||||
.toList();
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération des membres: $e');
|
||||
return snapshot.docs.map((doc) {
|
||||
return GroupMember.fromMap(doc.data() as Map<String, dynamic>, doc.id);
|
||||
}).toList();
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la récupération des membres: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer les membres');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,8 +125,13 @@ class AccountRepository {
|
||||
return Account.fromMap(doc.data() as Map<String, dynamic>, doc.id);
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération du compte: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la récupération du compte: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer le compte');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,14 +142,19 @@ class AccountRepository {
|
||||
.where('tripId', isEqualTo: tripId)
|
||||
.limit(1)
|
||||
.get();
|
||||
|
||||
|
||||
if (querySnapshot.docs.isNotEmpty) {
|
||||
final doc = querySnapshot.docs.first;
|
||||
return Account.fromMap(doc.data(), doc.id);
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération du compte: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la récupération du compte: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer le compte');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,10 +162,17 @@ class AccountRepository {
|
||||
try {
|
||||
// Mettre à jour la date de modification
|
||||
final updatedAccount = account.copyWith(updatedAt: DateTime.now());
|
||||
await _firestore.collection('accounts').doc(accountId).update(updatedAccount.toMap());
|
||||
} catch (e) {
|
||||
_errorService.logError('account_repository.dart', 'Erreur lors de la mise à jour du compte: $e');
|
||||
throw Exception('Erreur lors de la mise à jour du compte: $e');
|
||||
await _firestore
|
||||
.collection('accounts')
|
||||
.doc(accountId)
|
||||
.update(updatedAccount.toMap());
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la mise à jour du compte: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de mettre à jour le compte');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,24 +193,28 @@ class AccountRepository {
|
||||
for (var memberDoc in membersSnapshot.docs) {
|
||||
await _membersCollection(docId).doc(memberDoc.id).delete();
|
||||
}
|
||||
|
||||
|
||||
// Supprimer le compte
|
||||
await _accountCollection.doc(docId).delete();
|
||||
} catch (e) {
|
||||
_errorService.logError('account_repository.dart', 'Erreur lors de la suppression du compte: $e');
|
||||
throw Exception('Erreur lors de la suppression du compte: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la suppression du compte: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de supprimer le compte');
|
||||
}
|
||||
}
|
||||
|
||||
Stream<List<GroupMember>> watchGroupMembers(String accountId) {
|
||||
return _membersCollection(accountId).snapshots().map(
|
||||
(snapshot) => snapshot.docs
|
||||
.map((doc) => GroupMember.fromMap(
|
||||
doc.data() as Map<String, dynamic>,
|
||||
doc.id,
|
||||
))
|
||||
.toList(),
|
||||
);
|
||||
(snapshot) => snapshot.docs
|
||||
.map(
|
||||
(doc) =>
|
||||
GroupMember.fromMap(doc.data() as Map<String, dynamic>, doc.id),
|
||||
)
|
||||
.toList(),
|
||||
);
|
||||
}
|
||||
|
||||
Stream<Account?> watchAccount(String accountId) {
|
||||
@@ -201,19 +242,32 @@ class AccountRepository {
|
||||
|
||||
Future<void> addMemberToAccount(String accountId, GroupMember member) async {
|
||||
try {
|
||||
await _membersCollection(accountId).doc(member.userId).set(member.toMap());
|
||||
} catch (e) {
|
||||
_errorService.logError('account_repository.dart', 'Erreur lors de l\'ajout du membre: $e');
|
||||
throw Exception('Erreur lors de l\'ajout du membre: $e');
|
||||
await _membersCollection(
|
||||
accountId,
|
||||
).doc(member.userId).set(member.toMap());
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de l\'ajout du membre: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible d\'ajouter le membre');
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> removeMemberFromAccount(String accountId, String memberId) async {
|
||||
Future<void> removeMemberFromAccount(
|
||||
String accountId,
|
||||
String memberId,
|
||||
) async {
|
||||
try {
|
||||
await _membersCollection(accountId).doc(memberId).delete();
|
||||
} catch (e) {
|
||||
_errorService.logError('account_repository.dart', 'Erreur lors de la suppression du membre: $e');
|
||||
throw Exception('Erreur lors de la suppression du membre: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'account_repository.dart',
|
||||
'Erreur lors de la suppression du membre: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de supprimer le membre');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user