From 00403a16085e2294e27f4ce96e1aa74011654b35 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 19 Jul 2023 22:44:48 +0300 Subject: [PATCH] Code refactor --- lib/data/repositories/auth_repository.dart | 2 +- lib/data/repositories/client_repository.dart | 16 ++++++++++++---- lib/data/repositories/credit_repository.dart | 4 ++-- lib/data/repositories/expense_repository.dart | 4 ++-- lib/data/repositories/invoice_repository.dart | 4 ++-- lib/data/repositories/payment_repository.dart | 4 ++-- lib/data/repositories/product_repository.dart | 4 ++-- lib/data/repositories/project_repository.dart | 4 ++-- lib/data/repositories/quote_repository.dart | 4 ++-- lib/data/repositories/task_repository.dart | 4 ++-- lib/data/repositories/vendor_repository.dart | 4 ++-- lib/utils/serialization.dart | 4 ++-- 12 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart index f0590d65c..59f287428 100644 --- a/lib/data/repositories/auth_repository.dart +++ b/lib/data/repositories/auth_repository.dart @@ -245,7 +245,7 @@ class AuthRepository { secret: secret, data: json.encode(data)); } - return await compute(SerializationUtils.computeDecode, + return await compute(SerializationUtils.deserializeWith, [LoginResponse.serializer, response]); } diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index f20686e8b..62ff630f9 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -32,7 +32,7 @@ class ClientRepository { final dynamic response = await webClient.get(url, credentials.token); final ClientItemResponse clientResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ClientItemResponse.serializer, response]); return clientResponse.data; @@ -45,11 +45,19 @@ class ClientRepository { final dynamic response = await webClient.get(url, credentials.token); - final ClientListResponse clientResponse = await compute( - SerializationUtils.computeDecode, + // Change this + final ClientListResponse clientResponse1 = + serializers.deserializeWith(ClientListResponse.serializer, response); + + // To this + final ClientListResponse clientResponse2 = await compute( + SerializationUtils.deserializeWith, [ClientListResponse.serializer, response]); - return clientResponse.data; + print(clientResponse1); + print(clientResponse2); + + return clientResponse2.data; } Future> bulkAction( diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart index 18f9f5c3e..16ee0132c 100644 --- a/lib/data/repositories/credit_repository.dart +++ b/lib/data/repositories/credit_repository.dart @@ -31,7 +31,7 @@ class CreditRepository { credentials.token); final InvoiceItemResponse creditResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [InvoiceItemResponse.serializer, response]); return creditResponse.data; @@ -48,7 +48,7 @@ class CreditRepository { final dynamic response = await webClient.get(url, credentials.token); final InvoiceListResponse creditResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [InvoiceListResponse.serializer, response]); return creditResponse.data; diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart index 3c8be73dc..fc0d2d80e 100644 --- a/lib/data/repositories/expense_repository.dart +++ b/lib/data/repositories/expense_repository.dart @@ -30,7 +30,7 @@ class ExpenseRepository { '${credentials.url}/expenses/$entityId', credentials.token); final ExpenseItemResponse expenseResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ExpenseItemResponse.serializer, response]); return expenseResponse.data; @@ -50,7 +50,7 @@ class ExpenseRepository { final dynamic response = await webClient.get(url, credentials.token); final ExpenseListResponse expenseResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ExpenseListResponse.serializer, response]); return expenseResponse.data; diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart index 31b3c5755..e6b6fead3 100644 --- a/lib/data/repositories/invoice_repository.dart +++ b/lib/data/repositories/invoice_repository.dart @@ -31,7 +31,7 @@ class InvoiceRepository { credentials.token); final InvoiceItemResponse invoiceResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [InvoiceItemResponse.serializer, response]); return invoiceResponse.data; @@ -49,7 +49,7 @@ class InvoiceRepository { final dynamic response = await webClient.get(url, credentials.token); final InvoiceListResponse invoiceResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [InvoiceListResponse.serializer, response]); return invoiceResponse.data; diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart index 11da43b4d..3122f97a3 100644 --- a/lib/data/repositories/payment_repository.dart +++ b/lib/data/repositories/payment_repository.dart @@ -30,7 +30,7 @@ class PaymentRepository { final dynamic response = await webClient.get(url, credentials.token); final PaymentItemResponse paymentResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [PaymentItemResponse.serializer, response]); return paymentResponse.data; @@ -48,7 +48,7 @@ class PaymentRepository { final dynamic response = await webClient.get(url, credentials.token); final PaymentListResponse paymentResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [PaymentListResponse.serializer, response]); return paymentResponse.data; diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index 92293be9c..f8eae9b17 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -31,7 +31,7 @@ class ProductRepository { final dynamic response = await webClient.get(url, credentials.token); final ProductItemResponse productResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ProductItemResponse.serializer, response]); return productResponse.data; @@ -45,7 +45,7 @@ class ProductRepository { final dynamic response = await webClient.get(url, credentials.token); final ProductListResponse productResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ProductListResponse.serializer, response]); return productResponse.data; diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart index ef20e1125..b8824ed89 100644 --- a/lib/data/repositories/project_repository.dart +++ b/lib/data/repositories/project_repository.dart @@ -30,7 +30,7 @@ class ProjectRepository { '${credentials.url}/projects/$entityId', credentials.token); final ProjectItemResponse projectResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ProjectItemResponse.serializer, response]); return projectResponse.data; @@ -47,7 +47,7 @@ class ProjectRepository { final dynamic response = await webClient.get(url, credentials.token); final ProjectListResponse projectResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [ProjectListResponse.serializer, response]); return projectResponse.data; diff --git a/lib/data/repositories/quote_repository.dart b/lib/data/repositories/quote_repository.dart index 3dcd8658b..18bd64426 100644 --- a/lib/data/repositories/quote_repository.dart +++ b/lib/data/repositories/quote_repository.dart @@ -31,7 +31,7 @@ class QuoteRepository { credentials.token); final InvoiceItemResponse quoteResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [InvoiceItemResponse.serializer, response]); return quoteResponse.data; @@ -49,7 +49,7 @@ class QuoteRepository { final dynamic response = await webClient.get(url, credentials.token); final InvoiceListResponse quoteResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [InvoiceListResponse.serializer, response]); return quoteResponse.data; diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 50001ee4b..2dae43d7c 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -29,7 +29,7 @@ class TaskRepository { '${credentials.url}/tasks/$entityId', credentials.token); final TaskItemResponse taskResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [TaskItemResponse.serializer, response]); return taskResponse.data; @@ -49,7 +49,7 @@ class TaskRepository { final dynamic response = await webClient.get(url, credentials.token); final TaskListResponse taskResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [TaskListResponse.serializer, response]); return taskResponse.data; diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart index 6703908b0..b084c676d 100644 --- a/lib/data/repositories/vendor_repository.dart +++ b/lib/data/repositories/vendor_repository.dart @@ -31,7 +31,7 @@ class VendorRepository { credentials.token); final VendorItemResponse vendorResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [VendorItemResponse.serializer, response]); return vendorResponse.data; @@ -45,7 +45,7 @@ class VendorRepository { final dynamic response = await webClient.get(url, credentials.token); final VendorListResponse vendorResponse = await compute( - SerializationUtils.computeDecode, + SerializationUtils.deserializeWith, [VendorListResponse.serializer, response]); return vendorResponse.data; diff --git a/lib/utils/serialization.dart b/lib/utils/serialization.dart index 8eddcd9cd..029e1bf03 100644 --- a/lib/utils/serialization.dart +++ b/lib/utils/serialization.dart @@ -2,11 +2,11 @@ import 'package:invoiceninja_flutter/data/models/serializers.dart'; class SerializationUtils { - static dynamic computeDecode(dynamic list) { + static dynamic deserializeWith(dynamic list) { return serializers.deserializeWith(list[0], list[1]); } - static dynamic computeEncode(dynamic list) { + static dynamic serializeWith(dynamic list) { return serializers.serializeWith(list[0], list[1]); } }