From 95f7ade9e6f6d4d85d86f74ec84cd642ce6ea52f Mon Sep 17 00:00:00 2001
From: Mohammad Salameh <Salameh.m391@gmail.com>
Date: Tue, 16 Apr 2024 15:45:04 +0300
Subject: [PATCH] removed try-catch blocks from auth_api.dart, devices_api.dart
 and spaces_api.dart files

---
 lib/services/api/authentication_api.dart | 17 ++----
 lib/services/api/devices_api.dart        | 71 ++++++++++--------------
 lib/services/api/spaces_api.dart         | 52 ++++++++---------
 3 files changed, 58 insertions(+), 82 deletions(-)

diff --git a/lib/services/api/authentication_api.dart b/lib/services/api/authentication_api.dart
index f83b99c..a5e81e4 100644
--- a/lib/services/api/authentication_api.dart
+++ b/lib/services/api/authentication_api.dart
@@ -16,16 +16,11 @@ class AuthenticationAPI {
 
   static Future<Token> loginWithEmail(
       {required LoginWithEmailModel model}) async {
-    try {
-      final response = await HTTPService().post(
-          path: ApiEndpoints.login,
-          body: model.toJson(),
-          showServerMessage: false,
-          expectedResponseModel: (json) => Token.fromJson(json['data']));
-      // developer.log("response: $response");
-      return response;
-    } catch (e) {
-      rethrow;
-    }
+    final response = await HTTPService().post(
+        path: ApiEndpoints.login,
+        body: model.toJson(),
+        showServerMessage: false,
+        expectedResponseModel: (json) => Token.fromJson(json['data']));
+    return response;
   }
 }
diff --git a/lib/services/api/devices_api.dart b/lib/services/api/devices_api.dart
index 31bd309..97c5588 100644
--- a/lib/services/api/devices_api.dart
+++ b/lib/services/api/devices_api.dart
@@ -30,52 +30,41 @@ class DevicesAPI {
       "pageSize": 100,
       "pageNo": 1
     };
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.groups,
-        queryParameters: params,
-        showServerMessage: false,
-        expectedResponseModel: (json) =>
-            DevicesCategoryModel.fromJsonList(json['groups']),
-      );
-      return response;
-    } catch (e) {
-      rethrow;
-    }
+
+    final response = await _httpService.get(
+      path: ApiEndpoints.groups,
+      queryParameters: params,
+      showServerMessage: false,
+      expectedResponseModel: (json) =>
+          DevicesCategoryModel.fromJsonList(json['groups']),
+    );
+    return response;
   }
 
   static Future<Map<String, dynamic>> getDeviceStatus(String deviceId) async {
-    try {
-      final response = await _httpService.get(
-        path: '${ApiEndpoints.deviceStatus}/$deviceId/functions/status',
-        showServerMessage: false,
-        expectedResponseModel: (json) {
-          return json;
-        },
-      );
-      return response;
-    } catch (e) {
-      rethrow;
-    }
+    final response = await _httpService.get(
+      path: '${ApiEndpoints.deviceStatus}/$deviceId/functions/status',
+      showServerMessage: false,
+      expectedResponseModel: (json) {
+        return json;
+      },
+    );
+    return response;
   }
 
   static Future<List<DeviceModel>> getDevicesByRoomId(int roomId) async {
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.devicesByRoom,
-        queryParameters: {"roomId": roomId, "pageSize": 10},
-        showServerMessage: false,
-        expectedResponseModel: (json) {
-          List<DeviceModel> devices = [];
-          for (var device in json['devices']) {
-            devices.add(DeviceModel.fromJson(device));
-          }
-          return devices;
-        },
-      );
-      return response;
-    } catch (e) {
-      rethrow;
-    }
+    final response = await _httpService.get(
+      path: ApiEndpoints.devicesByRoom,
+      queryParameters: {"roomId": roomId, "pageSize": 10},
+      showServerMessage: false,
+      expectedResponseModel: (json) {
+        List<DeviceModel> devices = [];
+        for (var device in json['devices']) {
+          devices.add(DeviceModel.fromJson(device));
+        }
+        return devices;
+      },
+    );
+    return response;
   }
 }
diff --git a/lib/services/api/spaces_api.dart b/lib/services/api/spaces_api.dart
index f05df9f..3aa95dd 100644
--- a/lib/services/api/spaces_api.dart
+++ b/lib/services/api/spaces_api.dart
@@ -12,39 +12,31 @@ class SpacesAPI {
   static Future<List<SpaceModel>> getSpaces() async {
     var uuid =
         await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.spaces,
-        queryParameters: {
-          "userUuid": uuid,
-        },
-        showServerMessage: false,
-        expectedResponseModel: (json) => SpaceModel.fromJsonList(json),
-      );
-      return response;
-    } catch (e) {
-      rethrow;
-    }
+    final response = await _httpService.get(
+      path: ApiEndpoints.spaces,
+      queryParameters: {
+        "userUuid": uuid,
+      },
+      showServerMessage: false,
+      expectedResponseModel: (json) => SpaceModel.fromJsonList(json),
+    );
+    return response;
   }
 
   //get rooms by space id
   static Future<List<RoomModel>> getRoomsBySpaceId(int spaceId) async {
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.rooms,
-        queryParameters: {"homeId": spaceId},
-        showServerMessage: false,
-        expectedResponseModel: (json) {
-          List<RoomModel> rooms = [];
-          for (var room in json) {
-            rooms.add(RoomModel.fromJson(room));
-          }
-          return rooms;
-        },
-      );
-      return response;
-    } catch (e) {
-      rethrow;
-    }
+    final response = await _httpService.get(
+      path: ApiEndpoints.rooms,
+      queryParameters: {"homeId": spaceId},
+      showServerMessage: false,
+      expectedResponseModel: (json) {
+        List<RoomModel> rooms = [];
+        for (var room in json) {
+          rooms.add(RoomModel.fromJson(room));
+        }
+        return rooms;
+      },
+    );
+    return response;
   }
 }