Updated: formatting, readability

Author: we-mohd-i001

lib/vaahextendflutter/services/storage/local/services/base_service.dart

@@ -16,7 +16,10 @@ abstract class LocalStorageService {
 
   Future<StorageResponse> read({required String collectionName, required String key});
 
-  Future<StorageResponse> readMany({required String collectionName, required List<String> keys});
+  Future<StorageResponse> readMany({
+    required String collectionName,
+    required List<String> keys,
+  });
 
   Future<StorageResponse> readAll({required String collectionName});
 

lib/vaahextendflutter/services/storage/local/services/flutter_secure_storage.dart

@@ -14,7 +14,7 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     return StorageResponse(errors: [
       StorageError(
         message: 'FlutterSecureStorage does not support multiple collections.',
-        failedKey: '',
+        failedKey: name,
         stackTrace: StackTrace.current,
       ),
     ]);
@@ -26,7 +26,8 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     required String key,
     required String value,
   }) async {
-    if (await _storage.containsKey(key: key)) {
+    final bool hasKey = await _storage.containsKey(key: key);
+    if (hasKey) {
       return StorageResponse(
         errors: [
           StorageError(
@@ -39,7 +40,10 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     }
     try {
       await _storage.write(key: key, value: value);
-      return StorageResponse(data: value, message: 'Entry created with key: "$key"');
+      return StorageResponse(
+        data: value,
+        message: 'Entry created with key: "$key"',
+      );
     } catch (e) {
       return StorageResponse(
         errors: [
@@ -62,17 +66,23 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     List<StorageError> errors = [];
     List<String> success = [];
 
-    for (String k in values.keys) {
-      final result = await create(collectionName: collectionName, key: k, value: values[k]!);
+    for (final String key in values.keys) {
+      final result = await create(
+        collectionName: collectionName,
+        key: key,
+        value: values[key]!,
+      );
       if (result.hasData) {
         remainingEntries--;
         success.add(result.data);
-      } else if (result.hasError) {
-        errors.add(result.errors!.first);
       }
+      errors.add(result.errors!.first);
     }
     if (errors.isEmpty) {
-      return StorageResponse(data: success, message: 'All entries created successfully.');
+      return StorageResponse(
+        data: success,
+        message: 'All entries created successfully.',
+      );
     } else if (remainingEntries == values.length) {
       return StorageResponse(errors: errors);
     }
@@ -85,7 +95,8 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
 
   @override
   Future<StorageResponse> read({String collectionName = '', required String key}) async {
-    if (!(await _storage.containsKey(key: key))) {
+    final bool hasKey = await _storage.containsKey(key: key);
+    if (!hasKey) {
       return StorageResponse(
         errors: [
           StorageError(
@@ -98,7 +109,10 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     }
     try {
       String? result = await _storage.read(key: key);
-      return StorageResponse(data: result, message: 'Read successful: Entry with key: "$key".');
+      return StorageResponse(
+        data: result,
+        message: 'Read successful: Entry with key: "$key".',
+      );
     } catch (e) {
       return StorageResponse(
         errors: [
@@ -121,14 +135,16 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
       int remainingKeys = keys.length;
       List<StorageError> errors = [];
       Map<String, String?> data = {};
-      for (String k in keys) {
-        final result = await read(collectionName: collectionName, key: k);
+      for (final String key in keys) {
+        final StorageResponse result = await read(
+          collectionName: collectionName,
+          key: key,
+        );
         if (result.hasData) {
-          data[k] = result.data;
+          data[key] = result.data;
           remainingKeys--;
-        } else if (result.hasError) {
-          errors.add(result.errors!.first);
         }
+        errors.add(result.errors!.first);
       }
       if (errors.isEmpty) {
         return StorageResponse(data: data, message: 'Read successful.');
@@ -145,7 +161,6 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
       errors: [
         StorageError(
           message: 'No keys provided',
-          failedKey: '',
           stackTrace: StackTrace.current,
         ),
       ],
@@ -158,7 +173,7 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
       final Map<String, String> result = await _storage.readAll();
       return StorageResponse(data: result, message: 'Read successful.');
     } catch (e) {
-      StorageError error = StorageError(
+      final StorageError error = StorageError(
         message: 'Failed to read entries: $e',
         failedKey: '',
         stackTrace: StackTrace.current,
@@ -173,7 +188,8 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     required String key,
     required String value,
   }) async {
-    if (!(await _storage.containsKey(key: key))) {
+    final bool hasKey = await _storage.containsKey(key: key);
+    if (!hasKey) {
       return StorageResponse(
         errors: [
           StorageError(
@@ -186,7 +202,10 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     }
     try {
       await _storage.write(key: key, value: value);
-      return StorageResponse(data: value, message: 'Entry updated at key: $key');
+      return StorageResponse(
+        data: value,
+        message: 'Entry updated at key: $key',
+      );
     } catch (e) {
       final error = StorageError(
         failedKey: key,
@@ -205,17 +224,23 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     int remainigEntries = values.length;
     List<StorageError> errors = [];
     List<String> success = [];
-    for (String k in values.keys) {
-      final result = await update(collectionName: collectionName, key: k, value: values[k]!);
+    for (final String key in values.keys) {
+      final StorageResponse result = await update(
+        collectionName: collectionName,
+        key: key,
+        value: values[key]!,
+      );
       if (result.hasData) {
         remainigEntries--;
         success.add(result.data);
-      } else if (result.hasError) {
-        errors.add(result.errors!.first);
       }
+      errors.add(result.errors!.first);
     }
     if (errors.isEmpty) {
-      return StorageResponse(data: success, message: 'Updated all given entries.');
+      return StorageResponse(
+        data: success,
+        message: 'Updated all given entries.',
+      );
     } else if (remainigEntries == values.length) {
       return StorageResponse(errors: errors);
     }
@@ -232,7 +257,8 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     required String key,
     required String value,
   }) async {
-    if (!(await _storage.containsKey(key: key))) {
+    final bool hasKey = await _storage.containsKey(key: key);
+    if (!hasKey) {
       return create(key: key, value: value);
     }
     return update(key: key, value: value);
@@ -246,11 +272,11 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     int remainigEntries = values.length;
     List<StorageError> errors = [];
     List<String> success = [];
-    for (String k in values.keys) {
-      final result = await createOrUpdate(
+    for (final String key in values.keys) {
+      final StorageResponse result = await createOrUpdate(
         collectionName: collectionName,
-        key: k,
-        value: values[k]!,
+        key: key,
+        value: values[key]!,
       );
       if (result.hasData) {
         remainigEntries--;
@@ -272,7 +298,8 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
 
   @override
   Future<StorageResponse> delete({String collectionName = '', required String key}) async {
-    if (!(await _storage.containsKey(key: key))) {
+    final bool hasKey = await _storage.containsKey(key: key);
+    if (!hasKey) {
       return StorageResponse(
         errors: [
           StorageError(
@@ -285,7 +312,10 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     }
     try {
       await _storage.delete(key: key);
-      return StorageResponse(message: 'Deleted value at key: $key', isSuccess: true);
+      return StorageResponse(
+        message: 'Deleted value at key: $key',
+        isSuccess: true,
+      );
     } catch (e) {
       final error = StorageError(
         failedKey: key,
@@ -304,8 +334,11 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
     if (keys.isNotEmpty) {
       int remainingKeys = keys.length;
       List<StorageError> errors = [];
-      for (String k in keys) {
-        final result = await delete(collectionName: collectionName, key: k);
+      for (final String key in keys) {
+        final StorageResponse result = await delete(
+          collectionName: collectionName,
+          key: key,
+        );
         if (result.hasData) {
           remainingKeys--;
         }
@@ -340,7 +373,10 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
   Future<StorageResponse> deleteAll({String collectionName = ''}) async {
     try {
       await _storage.deleteAll();
-      return const StorageResponse(message: 'Deleted all entries.', isSuccess: true);
+      return const StorageResponse(
+        message: 'Deleted all entries.',
+        isSuccess: true,
+      );
     } catch (e) {
       return StorageResponse(errors: [
         StorageError(