Skip to content

Commit 259ad86

Browse files
we-mohd-i001we-mohd-i001
committed
Updated: Response class made it concise
Removed: unnecessary else(s) Updated: return whole entry instead of key
1 parent 74ff59c commit 259ad86

File tree

3 files changed

+332
-418
lines changed

3 files changed

+332
-418
lines changed

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

Lines changed: 104 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,23 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
3636
),
3737
],
3838
);
39-
} else {
40-
try {
41-
await _storage.write(key: key, value: value);
42-
return StorageResponse(
43-
data: key,
44-
message: 'Entry created with key: "$key"',
45-
isSuccess: true,
46-
);
47-
} catch (e) {
48-
return StorageResponse(
49-
errors: [
50-
StorageError(
51-
message: 'Failed to create entry at key: "$key".',
52-
failedKey: key,
53-
stackTrace: StackTrace.current,
54-
),
55-
],
56-
);
57-
}
39+
}
40+
try {
41+
await _storage.write(key: key, value: value);
42+
return StorageResponse(
43+
data: value,
44+
message: 'Entry created with key: "$key"',
45+
);
46+
} catch (e) {
47+
return StorageResponse(
48+
errors: [
49+
StorageError(
50+
message: 'Failed to create entry at key: "$key".',
51+
failedKey: key,
52+
stackTrace: StackTrace.current,
53+
),
54+
],
55+
);
5856
}
5957
}
6058

@@ -69,29 +67,23 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
6967

7068
for (String k in values.keys) {
7169
final result = await create(collectionName: collectionName, key: k, value: values[k]!);
72-
if (result.isSuccess) {
70+
if (result.hasData) {
7371
remainingEntries--;
7472
success.add(result.data);
7573
} else if (result.hasError) {
7674
errors.add(result.errors!.first);
7775
}
7876
}
7977
if (errors.isEmpty) {
80-
return StorageResponse(
81-
data: success,
82-
message: 'All entries created successfully.',
83-
isSuccess: true,
84-
);
78+
return StorageResponse(data: success, message: 'All entries created successfully.');
8579
} else if (remainingEntries == values.length) {
8680
return StorageResponse(errors: errors);
87-
} else {
88-
return StorageResponse(
89-
data: success,
90-
message: '${values.length - remainingEntries}/${values.length} entries created.',
91-
errors: errors,
92-
isPartialSuccess: true,
93-
);
9481
}
82+
return StorageResponse(
83+
data: success,
84+
message: '${values.length - remainingEntries}/${values.length} entries created.',
85+
errors: errors,
86+
);
9587
}
9688

9789
@override
@@ -106,25 +98,20 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
10698
),
10799
],
108100
);
109-
} else {
110-
try {
111-
String? result = await _storage.read(key: key);
112-
return StorageResponse(
113-
data: result,
114-
message: 'Read successful: Entry with key: "$key".',
115-
isSuccess: true,
116-
);
117-
} catch (e) {
118-
return StorageResponse(
119-
errors: [
120-
StorageError(
121-
message: 'Failed to read entry at key: "$key": $e',
122-
failedKey: key,
123-
stackTrace: StackTrace.current,
124-
),
125-
],
126-
);
127-
}
101+
}
102+
try {
103+
String? result = await _storage.read(key: key);
104+
return StorageResponse(data: result, message: 'Read successful: Entry with key: "$key".');
105+
} catch (e) {
106+
return StorageResponse(
107+
errors: [
108+
StorageError(
109+
message: 'Failed to read entry at key: "$key": $e',
110+
failedKey: key,
111+
stackTrace: StackTrace.current,
112+
),
113+
],
114+
);
128115
}
129116
}
130117

@@ -139,43 +126,40 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
139126
Map<String, String?> data = {};
140127
for (String k in keys) {
141128
final result = await read(collectionName: collectionName, key: k);
142-
if (result.isSuccess) {
129+
if (result.hasData) {
143130
data[k] = result.data;
144131
remainingKeys--;
145132
} else if (result.hasError) {
146133
errors.add(result.errors!.first);
147134
}
148135
}
149136
if (errors.isEmpty) {
150-
return StorageResponse(data: data, message: 'Read successful.', isSuccess: true);
137+
return StorageResponse(data: data, message: 'Read successful.');
151138
} else if (remainingKeys == keys.length) {
152139
return StorageResponse(errors: errors);
153-
} else {
154-
return StorageResponse(
155-
data: data,
156-
message: 'Read ${keys.length - remainingKeys}/${keys.length}',
157-
errors: errors,
158-
isPartialSuccess: true,
159-
);
160140
}
161-
} else {
162141
return StorageResponse(
163-
errors: [
164-
StorageError(
165-
message: 'No keys provided',
166-
failedKey: '',
167-
stackTrace: StackTrace.current,
168-
),
169-
],
142+
data: data,
143+
message: 'Read ${keys.length - remainingKeys}/${keys.length}',
144+
errors: errors,
170145
);
171146
}
147+
return StorageResponse(
148+
errors: [
149+
StorageError(
150+
message: 'No keys provided',
151+
failedKey: '',
152+
stackTrace: StackTrace.current,
153+
),
154+
],
155+
);
172156
}
173157

174158
@override
175159
Future<StorageResponse> readAll({String collectionName = ''}) async {
176160
try {
177161
final Map<String, String> result = await _storage.readAll();
178-
return StorageResponse(data: result, message: 'Read successful.', isSuccess: true);
162+
return StorageResponse(data: result, message: 'Read successful.');
179163
} catch (e) {
180164
StorageError error = StorageError(
181165
message: 'Failed to read entries: $e',
@@ -202,18 +186,17 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
202186
),
203187
],
204188
);
205-
} else {
206-
try {
207-
await _storage.write(key: key, value: value);
208-
return StorageResponse(data: key, message: 'Entry updated at key: $key', isSuccess: true);
209-
} catch (e) {
210-
final error = StorageError(
211-
failedKey: key,
212-
message: 'Error while updating the entry: $e',
213-
stackTrace: StackTrace.current,
214-
);
215-
return StorageResponse(errors: [error]);
216-
}
189+
}
190+
try {
191+
await _storage.write(key: key, value: value);
192+
return StorageResponse(data: value, message: 'Entry updated at key: $key');
193+
} catch (e) {
194+
final error = StorageError(
195+
failedKey: key,
196+
message: 'Error while updating the entry: $e',
197+
stackTrace: StackTrace.current,
198+
);
199+
return StorageResponse(errors: [error]);
217200
}
218201
}
219202

@@ -227,25 +210,23 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
227210
List<String> success = [];
228211
for (String k in values.keys) {
229212
final result = await update(collectionName: collectionName, key: k, value: values[k]!);
230-
if (result.isSuccess) {
213+
if (result.hasData) {
231214
remainigEntries--;
232215
success.add(result.data);
233216
} else if (result.hasError) {
234217
errors.add(result.errors!.first);
235218
}
236219
}
237220
if (errors.isEmpty) {
238-
return StorageResponse(data: success, message: 'Updated all given entries.', isSuccess: true);
221+
return StorageResponse(data: success, message: 'Updated all given entries.');
239222
} else if (remainigEntries == values.length) {
240223
return StorageResponse(errors: errors);
241-
} else {
242-
return StorageResponse(
243-
data: success,
244-
message: 'Updated ${values.length - remainigEntries}/${values.length} entries.',
245-
errors: errors,
246-
isPartialSuccess: true,
247-
);
248224
}
225+
return StorageResponse(
226+
data: success,
227+
message: 'Updated ${values.length - remainigEntries}/${values.length} entries.',
228+
errors: errors,
229+
);
249230
}
250231

251232
@override
@@ -256,9 +237,8 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
256237
}) async {
257238
if (!(await _storage.containsKey(key: key))) {
258239
return create(key: key, value: value);
259-
} else {
260-
return update(key: key, value: value);
261240
}
241+
return update(key: key, value: value);
262242
}
263243

264244
@override
@@ -275,25 +255,23 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
275255
key: k,
276256
value: values[k]!,
277257
);
278-
if (result.isSuccess) {
258+
if (result.hasData) {
279259
remainigEntries--;
280260
success.add(result.data);
281261
} else if (result.hasError) {
282262
errors.add(result.errors!.first);
283263
}
284264
}
285265
if (errors.isEmpty) {
286-
return StorageResponse(data: success, message: 'Set all given entries.', isSuccess: true);
266+
return StorageResponse(data: success, message: 'Set all given entries.');
287267
} else if (remainigEntries == values.length) {
288268
return StorageResponse(errors: errors);
289-
} else {
290-
return StorageResponse(
291-
data: success,
292-
message: 'Set ${values.length - remainigEntries}/${values.length} entries.',
293-
errors: errors,
294-
isPartialSuccess: true,
295-
);
296269
}
270+
return StorageResponse(
271+
data: success,
272+
message: 'Set ${values.length - remainigEntries}/${values.length} entries.',
273+
errors: errors,
274+
);
297275
}
298276

299277
@override
@@ -308,18 +286,17 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
308286
),
309287
],
310288
);
311-
} else {
312-
try {
313-
await _storage.delete(key: key);
314-
return StorageResponse(data: key, message: 'Deleted value at key: $key', isSuccess: true);
315-
} catch (e) {
316-
final error = StorageError(
317-
failedKey: key,
318-
message: 'Error while deleting the entry at key: "$key": $e',
319-
stackTrace: StackTrace.current,
320-
);
321-
return StorageResponse(errors: [error]);
322-
}
289+
}
290+
try {
291+
await _storage.delete(key: key);
292+
return StorageResponse(data: key, message: 'Deleted value at key: $key');
293+
} catch (e) {
294+
final error = StorageError(
295+
failedKey: key,
296+
message: 'Error while deleting the entry at key: "$key": $e',
297+
stackTrace: StackTrace.current,
298+
);
299+
return StorageResponse(errors: [error]);
323300
}
324301
}
325302

@@ -334,7 +311,7 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
334311
List<String> success = [];
335312
for (String k in keys) {
336313
final result = await delete(collectionName: collectionName, key: k);
337-
if (result.isSuccess) {
314+
if (result.hasData) {
338315
success.add(result.data);
339316
remainingKeys--;
340317
} else if (result.hasError) {
@@ -345,40 +322,32 @@ class LocalStorageWithFlutterSecureStorage implements LocalStorageService {
345322
return StorageResponse(
346323
data: success,
347324
message: 'Deleted multiple entries with associated keys: $keys',
348-
isSuccess: true,
349325
);
350326
} else if (remainingKeys == keys.length) {
351327
return StorageResponse(errors: errors);
352-
} else {
353-
return StorageResponse(
354-
data: success,
355-
message: 'Deleted ${keys.length - remainingKeys}/${keys.length}',
356-
errors: errors,
357-
isPartialSuccess: true,
358-
);
359328
}
360-
} else {
361329
return StorageResponse(
362-
errors: [
363-
StorageError(
364-
message: 'No keys provided',
365-
failedKey: '',
366-
stackTrace: StackTrace.current,
367-
),
368-
],
330+
data: success,
331+
message: 'Deleted ${keys.length - remainingKeys}/${keys.length}',
332+
errors: errors,
369333
);
370334
}
335+
return StorageResponse(
336+
errors: [
337+
StorageError(
338+
message: 'No keys provided',
339+
failedKey: '',
340+
stackTrace: StackTrace.current,
341+
),
342+
],
343+
);
371344
}
372345

373346
@override
374347
Future<StorageResponse> deleteAll({String collectionName = ''}) async {
375348
try {
376349
await _storage.deleteAll();
377-
return const StorageResponse(
378-
data: null,
379-
message: 'Deleted all entries.',
380-
isSuccess: true,
381-
);
350+
return const StorageResponse(data: null, message: 'Deleted all entries.');
382351
} catch (e) {
383352
return StorageResponse(errors: [
384353
StorageError(

0 commit comments

Comments
 (0)