From 160e6d3b356830383eb6a656d73b5880318772be Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 21 Feb 2024 05:00:45 +0300 Subject: [PATCH] refactor: Remove unused job --- .../graphql_maps/server_api/server_api.dart | 39 +++++++++++++++++-- lib/logic/models/job.dart | 27 +------------ 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/lib/logic/api_maps/graphql_maps/server_api/server_api.dart b/lib/logic/api_maps/graphql_maps/server_api/server_api.dart index d94d7cf6..31c09a74 100644 --- a/lib/logic/api_maps/graphql_maps/server_api/server_api.dart +++ b/lib/logic/api_maps/graphql_maps/server_api/server_api.dart @@ -132,20 +132,51 @@ class ServerApi extends GraphQLApiMap return usesBinds; } - Future switchService(final String uid, final bool needTurnOn) async { + Future switchService( + final String uid, + final bool needTurnOn, + ) async { try { final GraphQLClient client = await getClient(); if (needTurnOn) { final variables = Variables$Mutation$EnableService(serviceId: uid); final mutation = Options$Mutation$EnableService(variables: variables); - await client.mutate$EnableService(mutation); + final result = await client.mutate$EnableService(mutation); + if (result.hasException) { + return GenericResult( + success: false, + message: result.exception.toString(), + data: null, + ); + } + return GenericResult( + success: result.parsedData?.services.enableService.success ?? false, + message: result.parsedData?.services.enableService.message, + data: null, + ); } else { final variables = Variables$Mutation$DisableService(serviceId: uid); final mutation = Options$Mutation$DisableService(variables: variables); - await client.mutate$DisableService(mutation); + final result = await client.mutate$DisableService(mutation); + if (result.hasException) { + return GenericResult( + success: false, + message: result.exception.toString(), + data: null, + ); + } + return GenericResult( + success: result.parsedData?.services.disableService.success ?? false, + message: result.parsedData?.services.disableService.message, + data: null, + ); } } catch (e) { - print(e); + return GenericResult( + success: false, + message: e.toString(), + data: null, + ); } } diff --git a/lib/logic/models/job.dart b/lib/logic/models/job.dart index fea658f9..0cda1407 100644 --- a/lib/logic/models/job.dart +++ b/lib/logic/models/job.dart @@ -36,29 +36,6 @@ abstract class ClientJob extends Equatable { }); } -@Deprecated('Jobs bloc should handle it itself') -class RebuildServerJob extends ClientJob { - RebuildServerJob({ - required super.title, - super.id, - }); - - @override - bool canAddTo(final List jobs) => - !jobs.any((final job) => job is RebuildServerJob); - - @override - Future<(bool, String)> execute() async => (false, 'unimplemented'); - - @override - RebuildServerJob copyWithNewStatus({ - required final JobStatusEnum status, - final String? message, - }) { - throw UnimplementedError(); - } -} - class UpgradeServerJob extends ClientJob { UpgradeServerJob({ super.status, @@ -228,10 +205,10 @@ class ServiceToggleJob extends ClientJob { @override Future<(bool, String)> execute() async { - await getIt() + final result = await getIt() .api .switchService(service.id, needToTurnOn); - return (true, 'Check not implemented'); + return (result.success, result.message ?? 'jobs.generic_error'.tr()); } @override