fix functional bugs

This commit is contained in:
2026-05-29 11:40:55 +03:00
parent 591265a7fc
commit 134ffdde60
50 changed files with 1086 additions and 771 deletions

View File

@@ -40,7 +40,7 @@ class PaymentRepositoryImpl implements PaymentRepository {
required String cvv,
}) async {
try {
final cardId = await apiService.addPaymentCard(
await apiService.addPaymentCard(
cardNumber: cardNumber,
cardHolder: cardHolder,
expirationMonth: int.parse(expiryMonth),
@@ -48,8 +48,7 @@ class PaymentRepositoryImpl implements PaymentRepository {
cvv: cvv,
);
// Сохраняем полный номер карты локально
await securityService.saveCardFullNumber(cardId, cardNumber);
// await securityService.saveCardFullNumber(cardId, cardNumber);
return Success(null);
} on AuthException catch (e) {

View File

@@ -10,6 +10,7 @@ import 'package:be_happy/domain/repositories/scooter_repository.dart';
import '../../core/failures.dart';
import '../../core/result.dart';
import '../../domain/entities/active_scooter_order.dart';
import '../../domain/entities/client_subscription.dart';
import '../../domain/entities/scooter.dart';
import '../../domain/entities/tariff.dart';
import '../../domain/entities/subscription.dart';
@@ -127,8 +128,8 @@ class ScooterRepositoryImpl extends ScooterRepository {
}
@override
Future<Result<List<Subscription>>> getClientSubscriptions() async {
late final Result<List<Subscription>> result;
Future<Result<List<ClientSubscription>>> getClientSubscriptions() async {
late final Result<List<ClientSubscription>> result;
try {
final subscriptions = await _apiService.getClientSubscriptions();
result = Success(subscriptions);
@@ -268,15 +269,12 @@ class ScooterRepositoryImpl extends ScooterRepository {
}
@override
Future<Result<ScooterOrder>> payRide(int orderId) async {
late final Result<ScooterOrder> result;
Future<Result<void>> payRide(int orderId) async {
late final Result<void> result;
try {
final order = await _apiService.payRide(orderId);
if (order != null) {
result = Success(order);
} else {
result = Failure(UnknownFailure("Неизвестная ошибка"));
}
await _apiService.payRide(orderId);
result = Success(null);
} on AuthException catch (e) {
result = Failure(AuthFailure(e.attemptsLeft));
} catch (e) {
@@ -335,23 +333,19 @@ class ScooterRepositoryImpl extends ScooterRepository {
}
@override
Future<Result<ScooterOrder>> payScooterOrderWithPhotos({
Future<Result<void>> payScooterOrderWithPhotos({
required int orderId,
required int? cardId,
required bool isBalance,
}) async {
late final Result<ScooterOrder> result;
late final Result<void> result;
try {
final order = await _apiService.payScooterOrderWithPhotos(
orderId: orderId,
cardId: cardId,
isBalance: isBalance,
);
if (order != null) {
result = Success(order);
} else {
result = Failure(UnknownFailure("Неизвестная ошибка"));
}
result = Success(null);
} on AuthException catch (e) {
result = Failure(AuthFailure(e.attemptsLeft));
} catch (e) {