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');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,10 +60,10 @@ class AuthRepository {
|
||||
);
|
||||
await _saveFCMToken(firebaseUser.user!.uid);
|
||||
return await getUserFromFirestore(firebaseUser.user!.uid);
|
||||
} catch (e) {
|
||||
_errorService.showError(message: 'Utilisateur ou mot de passe incorrect');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError('AuthRepository', 'SignIn error: $e', stackTrace);
|
||||
throw Exception('Utilisateur ou mot de passe incorrect');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Creates a new user account with email and password.
|
||||
@@ -108,10 +108,10 @@ class AuthRepository {
|
||||
await _saveFCMToken(user.id!);
|
||||
}
|
||||
return user;
|
||||
} catch (e) {
|
||||
_errorService.showError(message: 'Erreur lors de la création du compte');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError('AuthRepository', 'SignUp error: $e', stackTrace);
|
||||
throw Exception('Erreur lors de la création du compte');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Signs in a user using Google authentication.
|
||||
@@ -160,10 +160,14 @@ class AuthRepository {
|
||||
return user;
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
_errorService.showError(message: 'Erreur lors de la connexion Google');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'AuthRepository',
|
||||
'Google SignUp error: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Erreur lors de la connexion Google');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Future<User?> signInWithGoogle() async {
|
||||
@@ -178,10 +182,14 @@ class AuthRepository {
|
||||
} else {
|
||||
throw Exception('Utilisateur non trouvé');
|
||||
}
|
||||
} catch (e) {
|
||||
_errorService.showError(message: 'Erreur lors de la connexion Google');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'AuthRepository',
|
||||
'Google SignIn error: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Erreur lors de la connexion Google');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Signs in a user using Apple authentication.
|
||||
@@ -228,10 +236,14 @@ class AuthRepository {
|
||||
return user;
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
_errorService.showError(message: 'Erreur lors de la connexion Apple');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'AuthRepository',
|
||||
'Apple SignUp error: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Erreur lors de la connexion Apple');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Future<User?> signInWithApple() async {
|
||||
@@ -246,10 +258,14 @@ class AuthRepository {
|
||||
} else {
|
||||
throw Exception('Utilisateur non trouvé');
|
||||
}
|
||||
} catch (e) {
|
||||
_errorService.showError(message: 'Erreur lors de la connexion Apple');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'AuthRepository',
|
||||
'Apple SignIn error: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Erreur lors de la connexion Apple');
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Signs out the current user.
|
||||
@@ -298,9 +314,13 @@ class AuthRepository {
|
||||
'fcmToken': token,
|
||||
}, SetOptions(merge: true));
|
||||
}
|
||||
} catch (e) {
|
||||
} catch (e, stackTrace) {
|
||||
// Non-blocking error
|
||||
print('Error saving FCM token: $e');
|
||||
_errorService.logError(
|
||||
'AuthRepository',
|
||||
'Error saving FCM token: $e',
|
||||
stackTrace,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,9 +37,13 @@ class BalanceRepository {
|
||||
totalExpenses: totalExpenses,
|
||||
calculatedAt: DateTime.now(),
|
||||
);
|
||||
} catch (e) {
|
||||
_errorService.logError('BalanceRepository', 'Erreur calcul balance: $e');
|
||||
rethrow;
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'BalanceRepository',
|
||||
'Erreur calcul balance: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de calculer la balance');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,9 +54,13 @@ class BalanceRepository {
|
||||
.first;
|
||||
|
||||
return _calculateUserBalances(expenses);
|
||||
} catch (e) {
|
||||
_errorService.logError('BalanceRepository', 'Erreur calcul user balances: $e');
|
||||
rethrow;
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'BalanceRepository',
|
||||
'Erreur calcul user balances: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de calculer les balances utilisateurs');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,19 +73,17 @@ class BalanceRepository {
|
||||
if (expense.isArchived) continue;
|
||||
|
||||
// Ajouter le payeur
|
||||
userBalanceMap.putIfAbsent(expense.paidById, () => {
|
||||
'name': expense.paidByName,
|
||||
'paid': 0.0,
|
||||
'owed': 0.0,
|
||||
});
|
||||
userBalanceMap.putIfAbsent(
|
||||
expense.paidById,
|
||||
() => {'name': expense.paidByName, 'paid': 0.0, 'owed': 0.0},
|
||||
);
|
||||
|
||||
// Ajouter les participants
|
||||
for (final split in expense.splits) {
|
||||
userBalanceMap.putIfAbsent(split.userId, () => {
|
||||
'name': split.userName,
|
||||
'paid': 0.0,
|
||||
'owed': 0.0,
|
||||
});
|
||||
userBalanceMap.putIfAbsent(
|
||||
split.userId,
|
||||
() => {'name': split.userName, 'paid': 0.0, 'owed': 0.0},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,7 +106,7 @@ class BalanceRepository {
|
||||
final data = entry.value;
|
||||
final paid = data['paid'] as double;
|
||||
final owed = data['owed'] as double;
|
||||
|
||||
|
||||
return UserBalance(
|
||||
userId: userId,
|
||||
userName: data['name'] as String,
|
||||
@@ -114,7 +120,7 @@ class BalanceRepository {
|
||||
// Algorithme d'optimisation des règlements
|
||||
List<Settlement> _calculateOptimalSettlements(List<UserBalance> balances) {
|
||||
final settlements = <Settlement>[];
|
||||
|
||||
|
||||
// Séparer les créditeurs et débiteurs
|
||||
final creditors = balances.where((b) => b.shouldReceive).toList();
|
||||
final debtors = balances.where((b) => b.shouldPay).toList();
|
||||
@@ -125,10 +131,10 @@ class BalanceRepository {
|
||||
|
||||
// Créer des copies mutables des montants
|
||||
final creditorsRemaining = Map.fromEntries(
|
||||
creditors.map((c) => MapEntry(c.userId, c.balance))
|
||||
creditors.map((c) => MapEntry(c.userId, c.balance)),
|
||||
);
|
||||
final debtorsRemaining = Map.fromEntries(
|
||||
debtors.map((d) => MapEntry(d.userId, -d.balance))
|
||||
debtors.map((d) => MapEntry(d.userId, -d.balance)),
|
||||
);
|
||||
|
||||
// Algorithme glouton pour minimiser le nombre de transactions
|
||||
@@ -139,15 +145,20 @@ class BalanceRepository {
|
||||
|
||||
if (creditAmount <= 0.01 || debtAmount <= 0.01) continue;
|
||||
|
||||
final settlementAmount = [creditAmount, debtAmount].reduce((a, b) => a < b ? a : b);
|
||||
final settlementAmount = [
|
||||
creditAmount,
|
||||
debtAmount,
|
||||
].reduce((a, b) => a < b ? a : b);
|
||||
|
||||
settlements.add(Settlement(
|
||||
fromUserId: debtor.userId,
|
||||
fromUserName: debtor.userName,
|
||||
toUserId: creditor.userId,
|
||||
toUserName: creditor.userName,
|
||||
amount: settlementAmount,
|
||||
));
|
||||
settlements.add(
|
||||
Settlement(
|
||||
fromUserId: debtor.userId,
|
||||
fromUserName: debtor.userName,
|
||||
toUserId: creditor.userId,
|
||||
toUserName: creditor.userName,
|
||||
amount: settlementAmount,
|
||||
),
|
||||
);
|
||||
|
||||
creditorsRemaining[creditor.userId] = creditAmount - settlementAmount;
|
||||
debtorsRemaining[debtor.userId] = debtAmount - settlementAmount;
|
||||
@@ -156,4 +167,4 @@ class BalanceRepository {
|
||||
|
||||
return settlements;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,8 +35,13 @@ class GroupRepository {
|
||||
|
||||
return groupRef.id;
|
||||
});
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la création du groupe: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur création groupe: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de créer le groupe');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +56,11 @@ class GroupRepository {
|
||||
}).toList();
|
||||
})
|
||||
.handleError((error, stackTrace) {
|
||||
_errorService.logError(error, stackTrace);
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur stream groups: $error',
|
||||
stackTrace,
|
||||
);
|
||||
return <Group>[];
|
||||
});
|
||||
}
|
||||
@@ -66,8 +75,13 @@ class GroupRepository {
|
||||
final members = await getGroupMembers(groupId);
|
||||
|
||||
return group.copyWith(members: members);
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération du groupe: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur get group: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer le groupe');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,8 +118,13 @@ class GroupRepository {
|
||||
final members = await getGroupMembers(doc.id);
|
||||
|
||||
return group.copyWith(members: members);
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération du groupe: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur get group by trip: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer le groupe du voyage');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,10 +141,11 @@ class GroupRepository {
|
||||
'Migration réussie pour le groupe $groupId',
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur de migration pour le groupe $groupId: $e',
|
||||
stackTrace,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -136,8 +156,13 @@ class GroupRepository {
|
||||
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');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur get members: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer les membres');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,8 +185,13 @@ class GroupRepository {
|
||||
await _firestore.collection('trips').doc(group.tripId).update({
|
||||
'participants': FieldValue.arrayUnion([member.userId]),
|
||||
});
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de l\'ajout du membre: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur add member: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible d\'ajouter le membre');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,8 +214,13 @@ class GroupRepository {
|
||||
await _firestore.collection('trips').doc(group.tripId).update({
|
||||
'participants': FieldValue.arrayRemove([userId]),
|
||||
});
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la suppression du membre: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur remove member: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de supprimer le membre');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,8 +232,13 @@ class GroupRepository {
|
||||
group.toMap()
|
||||
..['updatedAt'] = DateTime.now().millisecondsSinceEpoch,
|
||||
);
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la mise à jour du groupe: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur update group: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de mettre à jour le groupe');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,8 +266,13 @@ class GroupRepository {
|
||||
}
|
||||
|
||||
await _groupsCollection.doc(groupId).delete();
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la suppression du groupe: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'GroupRepository',
|
||||
'Erreur delete group: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de supprimer le groupe');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,33 +1,45 @@
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import '../models/trip.dart';
|
||||
import '../services/error_service.dart';
|
||||
|
||||
class TripRepository {
|
||||
final FirebaseFirestore _firestore = FirebaseFirestore.instance;
|
||||
final _errorService = ErrorService();
|
||||
|
||||
CollectionReference get _tripsCollection => _firestore.collection('trips');
|
||||
|
||||
// Récupérer tous les voyages d'un utilisateur
|
||||
Stream<List<Trip>> getTripsByUserId(String userId) {
|
||||
Stream<List<Trip>> getTripsByUserId(String userId) {
|
||||
try {
|
||||
return _tripsCollection
|
||||
.where('participants', arrayContains: userId)
|
||||
.snapshots()
|
||||
.map((snapshot) {
|
||||
final trips = snapshot.docs
|
||||
.map((doc) {
|
||||
try {
|
||||
final data = doc.data() as Map<String, dynamic>;
|
||||
return Trip.fromMap(data, doc.id);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
})
|
||||
.whereType<Trip>()
|
||||
.toList();
|
||||
return trips;
|
||||
});
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération des voyages: $e');
|
||||
.map((snapshot) {
|
||||
final trips = snapshot.docs
|
||||
.map((doc) {
|
||||
try {
|
||||
final data = doc.data() as Map<String, dynamic>;
|
||||
return Trip.fromMap(data, doc.id);
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'TripRepository',
|
||||
'Erreur parsing trip ${doc.id}: $e',
|
||||
stackTrace,
|
||||
);
|
||||
return null;
|
||||
}
|
||||
})
|
||||
.whereType<Trip>()
|
||||
.toList();
|
||||
return trips;
|
||||
});
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'TripRepository',
|
||||
'Erreur stream trips: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer les voyages');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,8 +50,13 @@ class TripRepository {
|
||||
// Ne pas modifier les timestamps ici, ils sont déjà au bon format
|
||||
final docRef = await _tripsCollection.add(tripData);
|
||||
return docRef.id;
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la création du voyage: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'TripRepository',
|
||||
'Erreur création trip: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de créer le voyage');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,14 +64,19 @@ class TripRepository {
|
||||
Future<Trip?> getTripById(String tripId) async {
|
||||
try {
|
||||
final doc = await _tripsCollection.doc(tripId).get();
|
||||
|
||||
|
||||
if (!doc.exists) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
return Trip.fromMap(doc.data() as Map<String, dynamic>, doc.id);
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la récupération du voyage: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'TripRepository',
|
||||
'Erreur get trip: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer le voyage');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,10 +86,15 @@ class TripRepository {
|
||||
final tripData = trip.toMap();
|
||||
// Mettre à jour le timestamp de modification
|
||||
tripData['updatedAt'] = Timestamp.now();
|
||||
|
||||
|
||||
await _tripsCollection.doc(tripId).update(tripData);
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la mise à jour du voyage: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'TripRepository',
|
||||
'Erreur update trip: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de mettre à jour le voyage');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,8 +102,13 @@ class TripRepository {
|
||||
Future<void> deleteTrip(String tripId) async {
|
||||
try {
|
||||
await _tripsCollection.doc(tripId).delete();
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la suppression du voyage: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'TripRepository',
|
||||
'Erreur delete trip: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de supprimer le voyage');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,34 +1,35 @@
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import '../models/user.dart';
|
||||
import '../services/auth_service.dart';
|
||||
import '../services/error_service.dart';
|
||||
|
||||
/// Repository for user data operations in Firestore.
|
||||
///
|
||||
///
|
||||
/// This repository provides methods for CRUD operations on user data,
|
||||
/// including retrieving users by ID or email, updating user information,
|
||||
/// and managing user profiles in the Firestore database.
|
||||
class UserRepository {
|
||||
/// Firestore instance for database operations.
|
||||
final FirebaseFirestore _firestore;
|
||||
|
||||
|
||||
/// Authentication service for user-related operations.
|
||||
final AuthService _authService;
|
||||
|
||||
final _errorService = ErrorService();
|
||||
|
||||
/// Creates a new [UserRepository] with optional dependencies.
|
||||
///
|
||||
///
|
||||
/// If [firestore] or [authService] are not provided, default instances will be used.
|
||||
UserRepository({
|
||||
FirebaseFirestore? firestore,
|
||||
AuthService? authService,
|
||||
}) : _firestore = firestore ?? FirebaseFirestore.instance,
|
||||
_authService = authService ?? AuthService();
|
||||
UserRepository({FirebaseFirestore? firestore, AuthService? authService})
|
||||
: _firestore = firestore ?? FirebaseFirestore.instance,
|
||||
_authService = authService ?? AuthService();
|
||||
|
||||
/// Retrieves a user by their unique ID.
|
||||
///
|
||||
///
|
||||
/// Fetches the user document from Firestore and converts it to a [User] model.
|
||||
///
|
||||
///
|
||||
/// [uid] - The unique user identifier
|
||||
///
|
||||
///
|
||||
/// Returns the [User] model if found, null otherwise.
|
||||
/// Throws an exception if the operation fails.
|
||||
Future<User?> getUserById(String uid) async {
|
||||
@@ -39,18 +40,23 @@ class UserRepository {
|
||||
return User.fromMap({...data, 'id': uid});
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
throw Exception('Error retrieving user: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'UserRepository',
|
||||
'Error retrieving user: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de récupérer l\'utilisateur');
|
||||
}
|
||||
}
|
||||
|
||||
/// Retrieves a user by their email address.
|
||||
///
|
||||
///
|
||||
/// Searches the users collection for a matching email address.
|
||||
/// Email comparison is case-insensitive after trimming whitespace.
|
||||
///
|
||||
///
|
||||
/// [email] - The email address to search for
|
||||
///
|
||||
///
|
||||
/// Returns the first [User] found with the matching email, null if not found.
|
||||
/// Throws an exception if the operation fails.
|
||||
Future<User?> getUserByEmail(String email) async {
|
||||
@@ -67,28 +73,38 @@ class UserRepository {
|
||||
return User.fromMap({...data, 'id': doc.id});
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
throw Exception('Error searching for user: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'UserRepository',
|
||||
'Error searching for user: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de trouver l\'utilisateur');
|
||||
}
|
||||
}
|
||||
|
||||
/// Updates an existing user in Firestore.
|
||||
///
|
||||
///
|
||||
/// Updates the user document with the provided user data.
|
||||
///
|
||||
///
|
||||
/// [user] - The user object containing updated information
|
||||
///
|
||||
///
|
||||
/// Returns true if the update was successful, false otherwise.
|
||||
Future<bool> updateUser(User user) async {
|
||||
try {
|
||||
await _firestore.collection('users').doc(user.id).update(user.toMap());
|
||||
|
||||
|
||||
// Mettre à jour le displayName dans Firebase Auth
|
||||
await _authService.updateDisplayName(displayName: user.fullName);
|
||||
|
||||
|
||||
return true;
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la mise à jour: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'UserRepository',
|
||||
'Erreur lors de la mise à jour: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de mettre à jour l\'utilisateur');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,8 +114,13 @@ class UserRepository {
|
||||
await _firestore.collection('users').doc(uid).delete();
|
||||
// Note: Vous devrez également supprimer le compte Firebase Auth
|
||||
return true;
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors de la suppression: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'UserRepository',
|
||||
'Erreur lors de la suppression: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de supprimer l\'utilisateur');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,15 +134,20 @@ class UserRepository {
|
||||
if (currentUser?.email == null) {
|
||||
throw Exception('Utilisateur non connecté ou email non disponible');
|
||||
}
|
||||
|
||||
|
||||
await _authService.resetPasswordFromCurrentPassword(
|
||||
email: currentUser!.email!,
|
||||
currentPassword: currentPassword,
|
||||
newPassword: newPassword,
|
||||
);
|
||||
return true;
|
||||
} catch (e) {
|
||||
throw Exception('Erreur lors du changement de mot de passe: $e');
|
||||
} catch (e, stackTrace) {
|
||||
_errorService.logError(
|
||||
'UserRepository',
|
||||
'Erreur lors du changement de mot de passe: $e',
|
||||
stackTrace,
|
||||
);
|
||||
throw Exception('Impossible de changer le mot de passe');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user