From 275ff88615cbd81cf2ac57fd241574fc7300b462 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 8 Jan 2026 20:17:16 +0300 Subject: [PATCH] fix --- mnemo_cards_backend/codegen.sh | 3 ++- .../lib/api/di/injector.config.dart | 18 ++++++++---------- .../lib/api/v2/auth_api_v2.dart | 2 -- .../lib/packs/card_pack_drift_extension.dart | 4 +++- .../packs/product_availability_manager.dart | 7 ++----- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/mnemo_cards_backend/codegen.sh b/mnemo_cards_backend/codegen.sh index 89a6989..94ab2cf 100755 --- a/mnemo_cards_backend/codegen.sh +++ b/mnemo_cards_backend/codegen.sh @@ -1 +1,2 @@ -dart run build_runner build --delete-conflicting-outputs --verbose \ No newline at end of file +dart run build_runner build --delete-conflicting-outputs --verbose +dart format . \ No newline at end of file diff --git a/mnemo_cards_backend/lib/api/di/injector.config.dart b/mnemo_cards_backend/lib/api/di/injector.config.dart index 1460ad6..960b05b 100644 --- a/mnemo_cards_backend/lib/api/di/injector.config.dart +++ b/mnemo_cards_backend/lib/api/di/injector.config.dart @@ -197,7 +197,6 @@ extension GetItInjectableX on _i174.GetIt { () => _i797.ProductAvailabilityManager( gh<_i833.PackManager>(), gh<_i1072.AppDatabase>(), - publicPackIds: gh>(), ), ); gh.lazySingleton<_i1062.FreePacksDistributor>( @@ -236,6 +235,14 @@ extension GetItInjectableX on _i174.GetIt { gh.lazySingleton<_i561.MnemoShelf>( () => _i561.MnemoShelf(gh<_i280.UserManager>()), ); + gh.lazySingleton<_i52.AuthApiV2>( + () => _i52.AuthApiV2( + gh<_i280.UserManager>(), + gh<_i972.GoogleApi>(), + gh<_i108.JwtService>(), + gh<_i240.TelegramAuthCodeService>(), + ), + ); gh.lazySingleton<_i1009.PaymentManager>( () => _i1009.PaymentManager( gh<_i1072.AppDatabase>(), @@ -277,15 +284,6 @@ extension GetItInjectableX on _i174.GetIt { gh<_i1072.AppDatabase>(), ), ); - gh.lazySingleton<_i52.AuthApiV2>( - () => _i52.AuthApiV2( - gh<_i1072.AppDatabase>(), - gh<_i280.UserManager>(), - gh<_i972.GoogleApi>(), - gh<_i108.JwtService>(), - gh<_i240.TelegramAuthCodeService>(), - ), - ); gh.lazySingleton<_i247.UsersApiV2>( () => _i247.UsersApiV2( gh<_i280.UserManager>(), diff --git a/mnemo_cards_backend/lib/api/v2/auth_api_v2.dart b/mnemo_cards_backend/lib/api/v2/auth_api_v2.dart index dc9abda..b95adb6 100644 --- a/mnemo_cards_backend/lib/api/v2/auth_api_v2.dart +++ b/mnemo_cards_backend/lib/api/v2/auth_api_v2.dart @@ -21,14 +21,12 @@ part 'auth_api_v2.g.dart'; /// Implements OAuth2/JWT Bearer token authentication @lazySingleton class AuthApiV2 { - final AppDatabase _db; final UserManager _userManager; final GoogleApi _googleApi; final JwtService _jwtService; final TelegramAuthCodeService _telegramAuthCodeService; AuthApiV2( - this._db, this._userManager, this._googleApi, this._jwtService, diff --git a/mnemo_cards_backend/lib/packs/card_pack_drift_extension.dart b/mnemo_cards_backend/lib/packs/card_pack_drift_extension.dart index 71decc3..ad9e649 100644 --- a/mnemo_cards_backend/lib/packs/card_pack_drift_extension.dart +++ b/mnemo_cards_backend/lib/packs/card_pack_drift_extension.dart @@ -11,7 +11,9 @@ import 'product_availability_manager.dart'; /// Extension для конвертации CardPack (Drift) в DTO extension CardPackToDto on CardPack { Future toPreviewDto(UserModel? user) async { - final isAvailable = await getIt.get().isPackAvailable(packId: id.toString(), user: user); + final isAvailable = await getIt + .get() + .isPackAvailable(packId: id.toString(), user: user); // Generate cover image URL String? coverUrl; diff --git a/mnemo_cards_backend/lib/packs/product_availability_manager.dart b/mnemo_cards_backend/lib/packs/product_availability_manager.dart index b73d366..6f6a2a5 100644 --- a/mnemo_cards_backend/lib/packs/product_availability_manager.dart +++ b/mnemo_cards_backend/lib/packs/product_availability_manager.dart @@ -12,11 +12,8 @@ class ProductAvailabilityManager { final AppDatabase _db; final Set _publicPackIds; - ProductAvailabilityManager( - this._packManager, - this._db, { - Set? publicPackIds, - }) : _publicPackIds = publicPackIds ?? const {'10'}; + ProductAvailabilityManager(this._packManager, this._db) + : _publicPackIds = const {'10'}; /// Проверить доступность пакета для пользователя ///