From 87e83aa461eee0d23f7fc6ba31f231f272e2e4d5 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 3 Sep 2018 12:41:42 -0700 Subject: [PATCH] Refactor --- lib/data/repositories/credit_repository.dart | 23 +++++------ lib/data/repositories/expense_repository.dart | 23 +++++------ lib/data/repositories/payment_repository.dart | 2 +- lib/data/repositories/project_repository.dart | 23 +++++------ lib/data/repositories/task_repository.dart | 23 +++++------ lib/data/repositories/vendor_repository.dart | 23 +++++------ lib/redux/client/client_middleware.dart | 8 ++-- lib/redux/invoice/invoice_middleware.dart | 6 +-- lib/redux/payment/payment_middleware.dart | 14 +++---- lib/redux/payment/payment_reducer.dart | 39 ++++++++++++------- lib/redux/product/product_middleware.dart | 8 ++-- lib/redux/quote/quote_middleware.dart | 6 +-- stubs/redux/stub/stub_middleware | 8 ++-- 13 files changed, 110 insertions(+), 96 deletions(-) diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart index 8f1f37b0c..a1716c72a 100644 --- a/lib/data/repositories/credit_repository.dart +++ b/lib/data/repositories/credit_repository.dart @@ -15,19 +15,20 @@ class CreditsRepository { this.webClient = const WebClient(), }); - Future> loadList(CompanyEntity company, AuthState auth) async { + Future> loadList( + CompanyEntity company, AuthState auth) async { + final dynamic response = + await webClient.get(auth.url + '/credits?per_page=500', company.token); - final dynamic response = await webClient.get( - auth.url + '/credits?per_page=500', company.token); - - final CreditListResponse creditResponse = serializers.deserializeWith( - CreditListResponse.serializer, response); + final CreditListResponse creditResponse = + serializers.deserializeWith(CreditListResponse.serializer, response); return creditResponse.data; } - Future saveData(CompanyEntity company, AuthState auth, CreditEntity credit, [EntityAction action]) async { - + Future saveData( + CompanyEntity company, AuthState auth, CreditEntity credit, + [EntityAction action]) async { final data = serializers.serializeWith(CreditEntity.serializer, credit); dynamic response; @@ -42,9 +43,9 @@ class CreditsRepository { response = await webClient.put(url, company.token, json.encode(data)); } - final CreditItemResponse creditResponse = serializers.deserializeWith( - CreditItemResponse.serializer, response); + final CreditItemResponse creditResponse = + serializers.deserializeWith(CreditItemResponse.serializer, response); return creditResponse.data; } -} \ No newline at end of file +} diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart index 129bc1a2b..b0034cc34 100644 --- a/lib/data/repositories/expense_repository.dart +++ b/lib/data/repositories/expense_repository.dart @@ -15,19 +15,20 @@ class ExpenseRepository { this.webClient = const WebClient(), }); - Future> loadList(CompanyEntity company, AuthState auth) async { + Future> loadList( + CompanyEntity company, AuthState auth) async { + final dynamic response = + await webClient.get(auth.url + '/expenses?per_page=500', company.token); - final dynamic response = await webClient.get( - auth.url + '/expenses?per_page=500', company.token); - - final ExpenseListResponse expenseResponse = serializers.deserializeWith( - ExpenseListResponse.serializer, response); + final ExpenseListResponse expenseResponse = + serializers.deserializeWith(ExpenseListResponse.serializer, response); return expenseResponse.data; } - Future saveData(CompanyEntity company, AuthState auth, ExpenseEntity expense, [EntityAction action]) async { - + Future saveData( + CompanyEntity company, AuthState auth, ExpenseEntity expense, + [EntityAction action]) async { final data = serializers.serializeWith(ExpenseEntity.serializer, expense); dynamic response; @@ -42,9 +43,9 @@ class ExpenseRepository { response = await webClient.put(url, company.token, json.encode(data)); } - final ExpenseItemResponse expenseResponse = serializers.deserializeWith( - ExpenseItemResponse.serializer, response); + final ExpenseItemResponse expenseResponse = + serializers.deserializeWith(ExpenseItemResponse.serializer, response); return expenseResponse.data; } -} \ No newline at end of file +} diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart index a03014e76..96638f2c1 100644 --- a/lib/data/repositories/payment_repository.dart +++ b/lib/data/repositories/payment_repository.dart @@ -33,7 +33,7 @@ class PaymentRepository { return paymentResponse.data; } - Future saveData(CompanyEntity company, AuthState auth, PaymentEntity payment, + Future saveData(CompanyEntity company, AuthState auth, PaymentEntity payment, [EntityAction action]) async { final data = serializers.serializeWith(PaymentEntity.serializer, payment); dynamic response; diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart index f63ce86e6..919761531 100644 --- a/lib/data/repositories/project_repository.dart +++ b/lib/data/repositories/project_repository.dart @@ -15,19 +15,20 @@ class ProjectsRepository { this.webClient = const WebClient(), }); - Future> loadList(CompanyEntity company, AuthState auth) async { + Future> loadList( + CompanyEntity company, AuthState auth) async { + final dynamic response = + await webClient.get(auth.url + '/projects?per_page=500', company.token); - final dynamic response = await webClient.get( - auth.url + '/projects?per_page=500', company.token); - - final ProjectListResponse projectResponse = serializers.deserializeWith( - ProjectListResponse.serializer, response); + final ProjectListResponse projectResponse = + serializers.deserializeWith(ProjectListResponse.serializer, response); return projectResponse.data; } - Future saveData(CompanyEntity company, AuthState auth, ProjectEntity project, [EntityAction action]) async { - + Future saveData( + CompanyEntity company, AuthState auth, ProjectEntity project, + [EntityAction action]) async { final data = serializers.serializeWith(ProjectEntity.serializer, project); dynamic response; @@ -42,9 +43,9 @@ class ProjectsRepository { response = await webClient.put(url, company.token, json.encode(data)); } - final ProjectItemResponse projectResponse = serializers.deserializeWith( - ProjectItemResponse.serializer, response); + final ProjectItemResponse projectResponse = + serializers.deserializeWith(ProjectItemResponse.serializer, response); return projectResponse.data; } -} \ No newline at end of file +} diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 041bb0de1..837073d5d 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -15,19 +15,20 @@ class TasksRepository { this.webClient = const WebClient(), }); - Future> loadList(CompanyEntity company, AuthState auth) async { + Future> loadList( + CompanyEntity company, AuthState auth) async { + final dynamic response = + await webClient.get(auth.url + '/tasks?per_page=500', company.token); - final dynamic response = await webClient.get( - auth.url + '/tasks?per_page=500', company.token); - - final TaskListResponse taskResponse = serializers.deserializeWith( - TaskListResponse.serializer, response); + final TaskListResponse taskResponse = + serializers.deserializeWith(TaskListResponse.serializer, response); return taskResponse.data; } - Future saveData(CompanyEntity company, AuthState auth, TaskEntity task, [EntityAction action]) async { - + Future saveData( + CompanyEntity company, AuthState auth, TaskEntity task, + [EntityAction action]) async { final data = serializers.serializeWith(TaskEntity.serializer, task); dynamic response; @@ -42,9 +43,9 @@ class TasksRepository { response = await webClient.put(url, company.token, json.encode(data)); } - final TaskItemResponse taskResponse = serializers.deserializeWith( - TaskItemResponse.serializer, response); + final TaskItemResponse taskResponse = + serializers.deserializeWith(TaskItemResponse.serializer, response); return taskResponse.data; } -} \ No newline at end of file +} diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart index 85bbde201..39821ddc1 100644 --- a/lib/data/repositories/vendor_repository.dart +++ b/lib/data/repositories/vendor_repository.dart @@ -15,19 +15,20 @@ class VendorRepository { this.webClient = const WebClient(), }); - Future> loadList(CompanyEntity company, AuthState auth) async { + Future> loadList( + CompanyEntity company, AuthState auth) async { + final dynamic response = + await webClient.get(auth.url + '/vendors?per_page=500', company.token); - final dynamic response = await webClient.get( - auth.url + '/vendors?per_page=500', company.token); - - final VendorListResponse vendorResponse = serializers.deserializeWith( - VendorListResponse.serializer, response); + final VendorListResponse vendorResponse = + serializers.deserializeWith(VendorListResponse.serializer, response); return vendorResponse.data; } - Future saveData(CompanyEntity company, AuthState auth, VendorEntity vendor, [EntityAction action]) async { - + Future saveData( + CompanyEntity company, AuthState auth, VendorEntity vendor, + [EntityAction action]) async { final data = serializers.serializeWith(VendorEntity.serializer, vendor); dynamic response; @@ -42,9 +43,9 @@ class VendorRepository { response = await webClient.put(url, company.token, json.encode(data)); } - final VendorItemResponse vendorResponse = serializers.deserializeWith( - VendorItemResponse.serializer, response); + final VendorItemResponse vendorResponse = + serializers.deserializeWith(VendorItemResponse.serializer, response); return vendorResponse.data; } -} \ No newline at end of file +} diff --git a/lib/redux/client/client_middleware.dart b/lib/redux/client/client_middleware.dart index aad44bcf2..4daed138e 100644 --- a/lib/redux/client/client_middleware.dart +++ b/lib/redux/client/client_middleware.dart @@ -82,7 +82,7 @@ Middleware _archiveClient(ClientRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origClient, EntityAction.archive) - .then((dynamic client) { + .then((ClientEntity client) { store.dispatch(ArchiveClientSuccess(client)); if (action.completer != null) { action.completer.complete(null); @@ -105,7 +105,7 @@ Middleware _deleteClient(ClientRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origClient, EntityAction.delete) - .then((dynamic client) { + .then((ClientEntity client) { store.dispatch(DeleteClientSuccess(client)); if (action.completer != null) { action.completer.complete(null); @@ -128,7 +128,7 @@ Middleware _restoreClient(ClientRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origClient, EntityAction.restore) - .then((dynamic client) { + .then((ClientEntity client) { store.dispatch(RestoreClientSuccess(client)); if (action.completer != null) { action.completer.complete(null); @@ -150,7 +150,7 @@ Middleware _saveClient(ClientRepository repository) { repository .saveData( store.state.selectedCompany, store.state.authState, action.client) - .then((dynamic client) { + .then((ClientEntity client) { if (action.client.isNew) { store.dispatch(AddClientSuccess(client)); } else { diff --git a/lib/redux/invoice/invoice_middleware.dart b/lib/redux/invoice/invoice_middleware.dart index 88cf0a8de..69cde9c2d 100644 --- a/lib/redux/invoice/invoice_middleware.dart +++ b/lib/redux/invoice/invoice_middleware.dart @@ -95,7 +95,7 @@ Middleware _archiveInvoice(InvoiceRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origInvoice, EntityAction.archive) - .then((dynamic invoice) { + .then((InvoiceEntity invoice) { store.dispatch(ArchiveInvoiceSuccess(invoice)); if (action.completer != null) { action.completer.complete(null); @@ -166,7 +166,7 @@ Middleware _markSentInvoice(InvoiceRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origInvoice, EntityAction.markSent) - .then((dynamic invoice) { + .then((InvoiceEntity invoice) { store.dispatch(MarkSentInvoiceSuccess(invoice)); store.dispatch(LoadClient(clientId: invoice.clientId)); if (action.completer != null) { @@ -213,7 +213,7 @@ Middleware _saveInvoice(InvoiceRepository repository) { repository .saveData( store.state.selectedCompany, store.state.authState, action.invoice) - .then((dynamic invoice) { + .then((InvoiceEntity invoice) { if (action.invoice.isNew) { store.dispatch(AddInvoiceSuccess(invoice)); } else { diff --git a/lib/redux/payment/payment_middleware.dart b/lib/redux/payment/payment_middleware.dart index b8cee5a59..8378e7bb0 100644 --- a/lib/redux/payment/payment_middleware.dart +++ b/lib/redux/payment/payment_middleware.dart @@ -80,7 +80,7 @@ Middleware _archivePayment(PaymentRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origPayment, EntityAction.archive) - .then((dynamic payment) { + .then((PaymentEntity payment) { store.dispatch(ArchivePaymentSuccess(payment)); if (action.completer != null) { action.completer.complete(null); @@ -103,10 +103,10 @@ Middleware _deletePayment(PaymentRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origPayment, EntityAction.delete) - .then((dynamic payment) { + .then((PaymentEntity payment) { store.dispatch(DeletePaymentSuccess(payment)); store.dispatch(LoadClient( - clientId: paymentInvoiceSelector(payment, store.state).clientId)); + clientId: paymentInvoiceSelector(payment.id, store.state).clientId)); if (action.completer != null) { action.completer.complete(null); } @@ -128,10 +128,10 @@ Middleware _restorePayment(PaymentRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origPayment, EntityAction.restore) - .then((dynamic payment) { + .then((PaymentEntity payment) { store.dispatch(RestorePaymentSuccess(payment)); store.dispatch(LoadClient( - clientId: paymentInvoiceSelector(payment, store.state).clientId)); + clientId: paymentInvoiceSelector(payment.id, store.state).clientId)); if (action.completer != null) { action.completer.complete(null); } @@ -152,14 +152,14 @@ Middleware _savePayment(PaymentRepository repository) { repository .saveData( store.state.selectedCompany, store.state.authState, action.payment) - .then((dynamic payment) { + .then((PaymentEntity payment) { if (action.payment.isNew) { store.dispatch(AddPaymentSuccess(payment)); } else { store.dispatch(SavePaymentSuccess(payment)); } store.dispatch(LoadClient( - clientId: paymentInvoiceSelector(payment, store.state).clientId)); + clientId: paymentInvoiceSelector(payment.id, store.state).clientId)); action.completer.complete(null); }).catchError((Object error) { print(error); diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart index 86ee62070..4ecfbd3cd 100644 --- a/lib/redux/payment/payment_reducer.dart +++ b/lib/redux/payment/payment_reducer.dart @@ -39,7 +39,6 @@ PaymentEntity _updateEditing(PaymentEntity payment, dynamic action) { return action.payment; } - final paymentListReducer = combineReducers([ TypedReducer(_sortPayments), TypedReducer(_filterPaymentsByState), @@ -77,13 +76,15 @@ ListUIState _filterPaymentsByCustom2( ListUIState _filterPaymentsByState( ListUIState paymentListState, FilterPaymentsByState action) { if (paymentListState.stateFilters.contains(action.state)) { - return paymentListState.rebuild((b) => b..stateFilters.remove(action.state)); + return paymentListState + .rebuild((b) => b..stateFilters.remove(action.state)); } else { return paymentListState.rebuild((b) => b..stateFilters.add(action.state)); } } -ListUIState _filterPayments(ListUIState paymentListState, FilterPayments action) { +ListUIState _filterPayments( + ListUIState paymentListState, FilterPayments action) { return paymentListState.rebuild((b) => b..filter = action.filter); } @@ -120,12 +121,14 @@ PaymentState _archivePaymentRequest( PaymentState _archivePaymentSuccess( PaymentState paymentState, ArchivePaymentSuccess action) { - return paymentState.rebuild((b) => b..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _archivePaymentFailure( PaymentState paymentState, ArchivePaymentFailure action) { - return paymentState.rebuild((b) => b..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _deletePaymentRequest( @@ -139,12 +142,14 @@ PaymentState _deletePaymentRequest( PaymentState _deletePaymentSuccess( PaymentState paymentState, DeletePaymentSuccess action) { - return paymentState.rebuild((b) => b..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _deletePaymentFailure( PaymentState paymentState, DeletePaymentFailure action) { - return paymentState.rebuild((b) => b..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _restorePaymentRequest( @@ -157,12 +162,14 @@ PaymentState _restorePaymentRequest( PaymentState _restorePaymentSuccess( PaymentState paymentState, RestorePaymentSuccess action) { - return paymentState.rebuild((b) => b..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _restorePaymentFailure( PaymentState paymentState, RestorePaymentFailure action) { - return paymentState.rebuild((b) => b..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _addPayment(PaymentState paymentState, AddPaymentSuccess action) { @@ -171,18 +178,20 @@ PaymentState _addPayment(PaymentState paymentState, AddPaymentSuccess action) { ..list.add(action.payment.id)); } -PaymentState _updatePayment(PaymentState paymentState, SavePaymentSuccess action) { - return paymentState.rebuild((b) => b - ..map[action.payment.id] = action.payment); +PaymentState _updatePayment( + PaymentState paymentState, SavePaymentSuccess action) { + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } PaymentState _setLoadedPayment( PaymentState paymentState, LoadPaymentSuccess action) { - return paymentState.rebuild((b) => b - ..map[action.payment.id] = action.payment); + return paymentState + .rebuild((b) => b..map[action.payment.id] = action.payment); } -PaymentState _setNoPayments(PaymentState paymentState, LoadPaymentsFailure action) { +PaymentState _setNoPayments( + PaymentState paymentState, LoadPaymentsFailure action) { return paymentState; } diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index 76674965a..a5bfc74b8 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -56,7 +56,7 @@ Middleware _archiveProduct(ProductRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origProduct, EntityAction.archive) - .then((dynamic product) { + .then((ProductEntity product) { store.dispatch(ArchiveProductSuccess(product)); if (action.completer != null) { action.completer.complete(null); @@ -79,7 +79,7 @@ Middleware _deleteProduct(ProductRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origProduct, EntityAction.delete) - .then((dynamic product) { + .then((ProductEntity product) { store.dispatch(DeleteProductSuccess(product)); if (action.completer != null) { action.completer.complete(null); @@ -102,7 +102,7 @@ Middleware _restoreProduct(ProductRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origProduct, EntityAction.restore) - .then((dynamic product) { + .then((ProductEntity product) { store.dispatch(RestoreProductSuccess(product)); if (action.completer != null) { action.completer.complete(null); @@ -124,7 +124,7 @@ Middleware _saveProduct(ProductRepository repository) { repository .saveData( store.state.selectedCompany, store.state.authState, action.product) - .then((dynamic product) { + .then((ProductEntity product) { if (action.product.isNew) { store.dispatch(AddProductSuccess(product)); } else { diff --git a/lib/redux/quote/quote_middleware.dart b/lib/redux/quote/quote_middleware.dart index 4708167d3..13983adf9 100644 --- a/lib/redux/quote/quote_middleware.dart +++ b/lib/redux/quote/quote_middleware.dart @@ -96,7 +96,7 @@ Middleware _archiveQuote(QuoteRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origQuote, EntityAction.archive) - .then((dynamic quote) { + .then((InvoiceEntity quote) { store.dispatch(ArchiveQuoteSuccess(quote)); if (action.completer != null) { action.completer.complete(null); @@ -167,7 +167,7 @@ Middleware _markSentQuote(QuoteRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origQuote, EntityAction.markSent) - .then((dynamic quote) { + .then((InvoiceEntity quote) { store.dispatch(MarkSentQuoteSuccess(quote)); store.dispatch(LoadClient(clientId: quote.clientId)); if (action.completer != null) { @@ -214,7 +214,7 @@ Middleware _saveQuote(QuoteRepository repository) { repository .saveData( store.state.selectedCompany, store.state.authState, action.quote) - .then((dynamic quote) { + .then((InvoiceEntity quote) { if (action.quote.isNew) { store.dispatch(AddQuoteSuccess(quote)); } else { diff --git a/stubs/redux/stub/stub_middleware b/stubs/redux/stub/stub_middleware index aad9d64cf..dd12e5239 100644 --- a/stubs/redux/stub/stub_middleware +++ b/stubs/redux/stub/stub_middleware @@ -75,7 +75,7 @@ Middleware _archiveStub(StubRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origStub, EntityAction.archive) - .then((dynamic stub) { + .then((StubEntity stub) { store.dispatch(ArchiveStubSuccess(stub)); if (action.completer != null) { action.completer.complete(null); @@ -98,7 +98,7 @@ Middleware _deleteStub(StubRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origStub, EntityAction.delete) - .then((dynamic stub) { + .then((StubEntity stub) { store.dispatch(DeleteStubSuccess(stub)); if (action.completer != null) { action.completer.complete(null); @@ -121,7 +121,7 @@ Middleware _restoreStub(StubRepository repository) { repository .saveData(store.state.selectedCompany, store.state.authState, origStub, EntityAction.restore) - .then((dynamic stub) { + .then((StubEntity stub) { store.dispatch(RestoreStubSuccess(stub)); if (action.completer != null) { action.completer.complete(null); @@ -143,7 +143,7 @@ Middleware _saveStub(StubRepository repository) { repository .saveData( store.state.selectedCompany, store.state.authState, action.stub) - .then((dynamic stub) { + .then((StubEntity stub) { if (action.stub.isNew) { store.dispatch(AddStubSuccess(stub)); } else {