From 059317d58b30c461ac0d9f64b1c5bc99ed26e50b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 18 Feb 2021 09:49:49 +0200 Subject: [PATCH] Refactor code --- lib/data/repositories/client_repository.dart | 2 +- lib/data/repositories/credit_repository.dart | 2 +- lib/data/repositories/expense_repository.dart | 2 +- lib/data/repositories/group_repository.dart | 2 +- lib/data/repositories/invoice_repository.dart | 2 +- lib/data/repositories/product_repository.dart | 2 +- lib/data/repositories/project_repository.dart | 2 +- lib/data/repositories/quote_repository.dart | 2 +- lib/data/repositories/settings_repository.dart | 4 ++-- lib/data/repositories/task_repository.dart | 2 +- lib/data/repositories/vendor_repository.dart | 2 +- lib/data/web_client.dart | 9 --------- 12 files changed, 12 insertions(+), 21 deletions(-) diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart index d24731b1f..959057d96 100644 --- a/lib/data/repositories/client_repository.dart +++ b/lib/data/repositories/client_repository.dart @@ -89,7 +89,7 @@ class ClientRepository { final dynamic response = await webClient.post( '${credentials.url}/clients/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final ClientItemResponse clientResponse = serializers.deserializeWith(ClientItemResponse.serializer, response); diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart index 35572eacb..42d535918 100644 --- a/lib/data/repositories/credit_repository.dart +++ b/lib/data/repositories/credit_repository.dart @@ -107,7 +107,7 @@ class CreditRepository { final dynamic response = await webClient.post( '${credentials.url}/credits/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final InvoiceItemResponse invoiceResponse = serializers.deserializeWith(InvoiceItemResponse.serializer, response); diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart index 6fd9bd08e..e8ca90d0d 100644 --- a/lib/data/repositories/expense_repository.dart +++ b/lib/data/repositories/expense_repository.dart @@ -82,7 +82,7 @@ class ExpenseRepository { final dynamic response = await webClient.post( '${credentials.url}/expenses/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final ExpenseItemResponse expenseResponse = serializers.deserializeWith(ExpenseItemResponse.serializer, response); diff --git a/lib/data/repositories/group_repository.dart b/lib/data/repositories/group_repository.dart index ef1b8c405..caa444de3 100644 --- a/lib/data/repositories/group_repository.dart +++ b/lib/data/repositories/group_repository.dart @@ -80,7 +80,7 @@ class GroupRepository { '${credentials.url}/group_settings/${entity.id}/upload', credentials.token, data: fields, - multipartFile: multipartFile); + multipartFiles: [multipartFile]); final GroupItemResponse groupResponse = serializers.deserializeWith(GroupItemResponse.serializer, response); diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart index 8b8204455..c25e64e67 100644 --- a/lib/data/repositories/invoice_repository.dart +++ b/lib/data/repositories/invoice_repository.dart @@ -108,7 +108,7 @@ class InvoiceRepository { final dynamic response = await webClient.post( '${credentials.url}/invoices/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final InvoiceItemResponse invoiceResponse = serializers.deserializeWith(InvoiceItemResponse.serializer, response); diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index 0d1d830a1..a8e7ee78c 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -84,7 +84,7 @@ class ProductRepository { final dynamic response = await webClient.post( '${credentials.url}/products/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final ProductItemResponse productResponse = serializers.deserializeWith(ProductItemResponse.serializer, response); diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart index 5c85f27ff..347866bd1 100644 --- a/lib/data/repositories/project_repository.dart +++ b/lib/data/repositories/project_repository.dart @@ -82,7 +82,7 @@ class ProjectRepository { final dynamic response = await webClient.post( '${credentials.url}/projects/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final ProjectItemResponse projectResponse = serializers.deserializeWith(ProjectItemResponse.serializer, response); diff --git a/lib/data/repositories/quote_repository.dart b/lib/data/repositories/quote_repository.dart index bba2c70b2..fda6503c4 100644 --- a/lib/data/repositories/quote_repository.dart +++ b/lib/data/repositories/quote_repository.dart @@ -104,7 +104,7 @@ class QuoteRepository { final dynamic response = await webClient.post( '${credentials.url}/quotes/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final InvoiceItemResponse invoiceResponse = serializers.deserializeWith(InvoiceItemResponse.serializer, response); diff --git a/lib/data/repositories/settings_repository.dart b/lib/data/repositories/settings_repository.dart index 960e853a2..c2cef9aaa 100644 --- a/lib/data/repositories/settings_repository.dart +++ b/lib/data/repositories/settings_repository.dart @@ -77,7 +77,7 @@ class SettingsRepository { final url = '${credentials.url}/$route/$entityId'; final dynamic response = await webClient.post(url, credentials.token, - data: {'_method': 'PUT'}, multipartFile: multipartFile); + data: {'_method': 'PUT'}, multipartFiles: [multipartFile]); if (type == EntityType.client) { return serializers @@ -102,7 +102,7 @@ class SettingsRepository { final dynamic response = await webClient.post( '${credentials.url}/companies/${company.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final CompanyItemResponse companyResponse = serializers.deserializeWith(CompanyItemResponse.serializer, response); diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 597eaf38c..fba578f02 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -81,7 +81,7 @@ class TaskRepository { final dynamic response = await webClient.post( '${credentials.url}/tasks/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final TaskItemResponse taskResponse = serializers.deserializeWith(TaskItemResponse.serializer, response); diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart index c3504c86e..0c02f0aa5 100644 --- a/lib/data/repositories/vendor_repository.dart +++ b/lib/data/repositories/vendor_repository.dart @@ -82,7 +82,7 @@ class VendorRepository { final dynamic response = await webClient.post( '${credentials.url}/vendors/${entity.id}/upload', credentials.token, - data: fields, multipartFile: multipartFile); + data: fields, multipartFiles: [multipartFile]); final VendorItemResponse vendorResponse = serializers.deserializeWith(VendorItemResponse.serializer, response); diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart index 566c73411..eef12c379 100644 --- a/lib/data/web_client.dart +++ b/lib/data/web_client.dart @@ -54,7 +54,6 @@ class WebClient { String url, String token, { dynamic data, - MultipartFile multipartFile, List multipartFiles, String secret, String password, @@ -74,14 +73,6 @@ class WebClient { } http.Response response; - if (multipartFile != null) { - if (multipartFiles == null) { - multipartFiles = [multipartFile]; - } else { - multipartFiles.add(multipartFile); - } - } - if (multipartFiles != null) { response = await _uploadFiles(url, token, multipartFiles, data: data); } else {