From 7d51ca1f1278432bd27df037ecdbeb346cdac55d Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Tue, 5 Nov 2024 00:52:38 +0400 Subject: [PATCH] Fixed bugs in automation --- lib/features/scene/bloc/scene_bloc/scene_bloc.dart | 2 +- lib/features/scene/model/scene_details_model.dart | 2 +- lib/features/scene/model/update_automation.dart | 12 ++++++------ .../scene/widgets/scene_view_widget/scene_item.dart | 2 +- lib/services/api/api_links_endpoints.dart | 2 +- lib/services/api/scene_api.dart | 3 +-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/features/scene/bloc/scene_bloc/scene_bloc.dart b/lib/features/scene/bloc/scene_bloc/scene_bloc.dart index 35bdbd6..4837d32 100644 --- a/lib/features/scene/bloc/scene_bloc/scene_bloc.dart +++ b/lib/features/scene/bloc/scene_bloc/scene_bloc.dart @@ -95,7 +95,7 @@ class SceneBloc extends Bloc { event.automationId, event.automationStatusUpdate); if (success) { automationList = await SceneApi.getAutomationByUnitId( - event.automationStatusUpdate.unitUuid); + event.automationStatusUpdate.spaceUuid); newLoadingStates[event.automationId] = false; emit(SceneLoaded( currentState.scenes, diff --git a/lib/features/scene/model/scene_details_model.dart b/lib/features/scene/model/scene_details_model.dart index 05453f7..d356d43 100644 --- a/lib/features/scene/model/scene_details_model.dart +++ b/lib/features/scene/model/scene_details_model.dart @@ -32,7 +32,7 @@ class SceneDetailsModel { factory SceneDetailsModel.fromJson(Map json) => SceneDetailsModel( - id: json["uuid"], + id: json["uuid"] ?? json["id"], name: json["name"], status: json["status"], type: json["type"], diff --git a/lib/features/scene/model/update_automation.dart b/lib/features/scene/model/update_automation.dart index d15d191..86aefbb 100644 --- a/lib/features/scene/model/update_automation.dart +++ b/lib/features/scene/model/update_automation.dart @@ -1,11 +1,11 @@ import 'dart:convert'; class AutomationStatusUpdate { - final String unitUuid; + final String spaceUuid; final bool isEnable; AutomationStatusUpdate({ - required this.unitUuid, + required this.spaceUuid, required this.isEnable, }); @@ -16,23 +16,23 @@ class AutomationStatusUpdate { factory AutomationStatusUpdate.fromJson(Map json) => AutomationStatusUpdate( - unitUuid: json["unitUuid"], + spaceUuid: json["spaceUuid"], isEnable: json["isEnable"], ); Map toJson() => { - "unitUuid": unitUuid, + "spaceUuid": spaceUuid, "isEnable": isEnable, }; factory AutomationStatusUpdate.fromMap(Map map) => AutomationStatusUpdate( - unitUuid: map["unitUuid"], + spaceUuid: map["spaceUuid"], isEnable: map["isEnable"], ); Map toMap() => { - "unitUuid": unitUuid, + "spaceUuid": spaceUuid, "isEnable": isEnable, }; } diff --git a/lib/features/scene/widgets/scene_view_widget/scene_item.dart b/lib/features/scene/widgets/scene_view_widget/scene_item.dart index 78f4200..be2be1b 100644 --- a/lib/features/scene/widgets/scene_view_widget/scene_item.dart +++ b/lib/features/scene/widgets/scene_view_widget/scene_item.dart @@ -113,7 +113,7 @@ class SceneItem extends StatelessWidget { context.read().add(UpdateAutomationStatus( automationStatusUpdate: AutomationStatusUpdate( isEnable: value, - unitUuid: HomeCubit.getInstance().selectedSpace!.id!), + spaceUuid: HomeCubit.getInstance().selectedSpace!.id!), automationId: scene.id)); }, ), diff --git a/lib/services/api/api_links_endpoints.dart b/lib/services/api/api_links_endpoints.dart index b6aa0bf..a1277a2 100644 --- a/lib/services/api/api_links_endpoints.dart +++ b/lib/services/api/api_links_endpoints.dart @@ -163,7 +163,7 @@ abstract class ApiEndpoints { static const String deleteScene = '/scene/tap-to-run/{sceneId}'; static const String deleteAutomation = - '/automation/{unitUuid}/{automationId}'; + '/automation/{automationId}'; //////////////////////Door Lock ////////////////////// //online diff --git a/lib/services/api/scene_api.dart b/lib/services/api/scene_api.dart index 65e4382..e2040e9 100644 --- a/lib/services/api/scene_api.dart +++ b/lib/services/api/scene_api.dart @@ -233,8 +233,7 @@ class SceneApi { try { final response = await _httpService.delete( path: ApiEndpoints.deleteAutomation - .replaceAll('{automationId}', automationId) - .replaceAll('{unitUuid}', unitUuid), + .replaceAll('{automationId}', automationId), showServerMessage: false, expectedResponseModel: (json) => json['statusCode'] == 200, );