From 3b1366baba9b53892188c391ed0334f9826b58d5 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Dec 2019 12:42:59 +0200 Subject: [PATCH] Settings --- lib/data/models/company_gateway_model.dart | 20 ++- lib/data/models/company_gateway_model.g.dart | 106 +++++++++---- lib/data/models/document_model.dart | 28 ++++ lib/data/models/document_model.g.dart | 150 +++++++++++++++++-- lib/data/models/entities.dart | 9 ++ lib/data/models/entities.g.dart | 83 +++++++--- lib/data/models/payment_model.dart | 9 ++ lib/data/models/payment_model.g.dart | 66 ++++++-- lib/data/models/product_model.dart | 8 + lib/data/models/product_model.g.dart | 66 ++++++-- lib/data/models/quote_model.dart | 9 +- lib/data/models/quote_model.g.dart | 80 ++++++---- lib/data/models/task_model.dart | 4 + lib/data/models/task_model.g.dart | 45 ++++-- lib/data/models/user_model.dart | 20 +++ lib/data/models/user_model.g.dart | 105 ++++++++++++- 16 files changed, 674 insertions(+), 134 deletions(-) diff --git a/lib/data/models/company_gateway_model.dart b/lib/data/models/company_gateway_model.dart index 0f000a316..750bf91bc 100644 --- a/lib/data/models/company_gateway_model.dart +++ b/lib/data/models/company_gateway_model.dart @@ -60,10 +60,12 @@ abstract class CompanyGatewayEntity extends Object showBillingAddress: true, showShippingAddress: false, updateDetails: true, - customValue1: '', - customValue2: '', config: '', feesAndLimitsMap: BuiltMap(), + customValue1: '', + customValue2: '', + customValue3: '', + customValue4: '', ); } @@ -92,6 +94,10 @@ abstract class CompanyGatewayEntity extends Object @BuiltValueField(wireName: 'update_details') bool get updateDetails; + + @BuiltValueField(wireName: 'fees_and_limits') + BuiltMap get feesAndLimitsMap; + @nullable @BuiltValueField(wireName: 'custom_value1') String get customValue1; @@ -100,8 +106,14 @@ abstract class CompanyGatewayEntity extends Object @BuiltValueField(wireName: 'custom_value2') String get customValue2; - @BuiltValueField(wireName: 'fees_and_limits') - BuiltMap get feesAndLimitsMap; + @nullable + @BuiltValueField(wireName: 'custom_value3') + String get customValue3; + + @nullable + @BuiltValueField(wireName: 'custom_value4') + String get customValue4; + String get config; diff --git a/lib/data/models/company_gateway_model.g.dart b/lib/data/models/company_gateway_model.g.dart index 1c121421a..3cad2cc89 100644 --- a/lib/data/models/company_gateway_model.g.dart +++ b/lib/data/models/company_gateway_model.g.dart @@ -169,6 +169,18 @@ class _$CompanyGatewayEntitySerializer ..add(serializers.serialize(object.customValue2, specifiedType: const FullType(String))); } + if (object.customValue3 != null) { + result + ..add('custom_value3') + ..add(serializers.serialize(object.customValue3, + specifiedType: const FullType(String))); + } + if (object.customValue4 != null) { + result + ..add('custom_value4') + ..add(serializers.serialize(object.customValue4, + specifiedType: const FullType(String))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -256,6 +268,13 @@ class _$CompanyGatewayEntitySerializer result.updateDetails = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; break; + case 'fees_and_limits': + result.feesAndLimitsMap.replace(serializers.deserialize(value, + specifiedType: const FullType(BuiltMap, const [ + const FullType(String), + const FullType(FeesAndLimitsSettings) + ])) as BuiltMap); + break; case 'custom_value1': result.customValue1 = serializers.deserialize(value, specifiedType: const FullType(String)) as String; @@ -264,12 +283,13 @@ class _$CompanyGatewayEntitySerializer result.customValue2 = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; - case 'fees_and_limits': - result.feesAndLimitsMap.replace(serializers.deserialize(value, - specifiedType: const FullType(BuiltMap, const [ - const FullType(String), - const FullType(FeesAndLimitsSettings) - ])) as BuiltMap); + case 'custom_value3': + result.customValue3 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value4': + result.customValue4 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; break; case 'config': result.config = serializers.deserialize(value, @@ -667,11 +687,15 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity { @override final bool updateDetails; @override + final BuiltMap feesAndLimitsMap; + @override final String customValue1; @override final String customValue2; @override - final BuiltMap feesAndLimitsMap; + final String customValue3; + @override + final String customValue4; @override final String config; @override @@ -702,9 +726,11 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity { this.showBillingAddress, this.showShippingAddress, this.updateDetails, + this.feesAndLimitsMap, this.customValue1, this.customValue2, - this.feesAndLimitsMap, + this.customValue3, + this.customValue4, this.config, this.isChanged, this.createdAt, @@ -762,9 +788,11 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity { showBillingAddress == other.showBillingAddress && showShippingAddress == other.showShippingAddress && updateDetails == other.updateDetails && + feesAndLimitsMap == other.feesAndLimitsMap && customValue1 == other.customValue1 && customValue2 == other.customValue2 && - feesAndLimitsMap == other.feesAndLimitsMap && + customValue3 == other.customValue3 && + customValue4 == other.customValue4 && config == other.config && isChanged == other.isChanged && createdAt == other.createdAt && @@ -796,21 +824,27 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity { $jc( $jc( $jc( - 0, - gateway + $jc( + $jc( + 0, + gateway + .hashCode), + gatewayId + .hashCode), + acceptedCreditCards .hashCode), - gatewayId + showBillingAddress .hashCode), - acceptedCreditCards + showShippingAddress .hashCode), - showBillingAddress + updateDetails .hashCode), - showShippingAddress + feesAndLimitsMap .hashCode), - updateDetails.hashCode), - customValue1.hashCode), - customValue2.hashCode), - feesAndLimitsMap.hashCode), + customValue1.hashCode), + customValue2.hashCode), + customValue3.hashCode), + customValue4.hashCode), config.hashCode), isChanged.hashCode), createdAt.hashCode), @@ -831,9 +865,11 @@ class _$CompanyGatewayEntity extends CompanyGatewayEntity { ..add('showBillingAddress', showBillingAddress) ..add('showShippingAddress', showShippingAddress) ..add('updateDetails', updateDetails) + ..add('feesAndLimitsMap', feesAndLimitsMap) ..add('customValue1', customValue1) ..add('customValue2', customValue2) - ..add('feesAndLimitsMap', feesAndLimitsMap) + ..add('customValue3', customValue3) + ..add('customValue4', customValue4) ..add('config', config) ..add('isChanged', isChanged) ..add('createdAt', createdAt) @@ -880,6 +916,14 @@ class CompanyGatewayEntityBuilder set updateDetails(bool updateDetails) => _$this._updateDetails = updateDetails; + MapBuilder _feesAndLimitsMap; + MapBuilder get feesAndLimitsMap => + _$this._feesAndLimitsMap ??= + new MapBuilder(); + set feesAndLimitsMap( + MapBuilder feesAndLimitsMap) => + _$this._feesAndLimitsMap = feesAndLimitsMap; + String _customValue1; String get customValue1 => _$this._customValue1; set customValue1(String customValue1) => _$this._customValue1 = customValue1; @@ -888,13 +932,13 @@ class CompanyGatewayEntityBuilder String get customValue2 => _$this._customValue2; set customValue2(String customValue2) => _$this._customValue2 = customValue2; - MapBuilder _feesAndLimitsMap; - MapBuilder get feesAndLimitsMap => - _$this._feesAndLimitsMap ??= - new MapBuilder(); - set feesAndLimitsMap( - MapBuilder feesAndLimitsMap) => - _$this._feesAndLimitsMap = feesAndLimitsMap; + String _customValue3; + String get customValue3 => _$this._customValue3; + set customValue3(String customValue3) => _$this._customValue3 = customValue3; + + String _customValue4; + String get customValue4 => _$this._customValue4; + set customValue4(String customValue4) => _$this._customValue4 = customValue4; String _config; String get config => _$this._config; @@ -944,9 +988,11 @@ class CompanyGatewayEntityBuilder _showBillingAddress = _$v.showBillingAddress; _showShippingAddress = _$v.showShippingAddress; _updateDetails = _$v.updateDetails; + _feesAndLimitsMap = _$v.feesAndLimitsMap?.toBuilder(); _customValue1 = _$v.customValue1; _customValue2 = _$v.customValue2; - _feesAndLimitsMap = _$v.feesAndLimitsMap?.toBuilder(); + _customValue3 = _$v.customValue3; + _customValue4 = _$v.customValue4; _config = _$v.config; _isChanged = _$v.isChanged; _createdAt = _$v.createdAt; @@ -986,9 +1032,11 @@ class CompanyGatewayEntityBuilder showBillingAddress: showBillingAddress, showShippingAddress: showShippingAddress, updateDetails: updateDetails, + feesAndLimitsMap: feesAndLimitsMap.build(), customValue1: customValue1, customValue2: customValue2, - feesAndLimitsMap: feesAndLimitsMap.build(), + customValue3: customValue3, + customValue4: customValue4, config: config, isChanged: isChanged, createdAt: createdAt, diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart index d7b2f5197..f3f70f695 100644 --- a/lib/data/models/document_model.dart +++ b/lib/data/models/document_model.dart @@ -60,6 +60,10 @@ abstract class DocumentEntity extends Object width: 0, height: 0, size: 0, + customValue1: '', + customValue2: '', + customValue3: '', + customValue4: '', ); } @@ -90,6 +94,30 @@ abstract class DocumentEntity extends Object @BuiltValueField(wireName: 'is_default') bool get isDefault; + @nullable + @BuiltValueField(wireName: 'custom_value1') + String get customValue1; + + @nullable + @BuiltValueField(wireName: 'custom_value2') + String get customValue2; + + @nullable + @BuiltValueField(wireName: 'custom_value3') + String get customValue3; + + @nullable + @BuiltValueField(wireName: 'custom_value4') + String get customValue4; + + @nullable + @BuiltValueField(wireName: 'project_id') + String get projectId; + + @nullable + @BuiltValueField(wireName: 'vendor_id') + String get vendorId; + DocumentEntity get clone => rebuild((b) => b ..id = BaseEntity.nextId ..isChanged = false diff --git a/lib/data/models/document_model.g.dart b/lib/data/models/document_model.g.dart index 24ddc1470..e54da20c7 100644 --- a/lib/data/models/document_model.g.dart +++ b/lib/data/models/document_model.g.dart @@ -150,6 +150,42 @@ class _$DocumentEntitySerializer ..add(serializers.serialize(object.expenseId, specifiedType: const FullType(String))); } + if (object.customValue1 != null) { + result + ..add('custom_value1') + ..add(serializers.serialize(object.customValue1, + specifiedType: const FullType(String))); + } + if (object.customValue2 != null) { + result + ..add('custom_value2') + ..add(serializers.serialize(object.customValue2, + specifiedType: const FullType(String))); + } + if (object.customValue3 != null) { + result + ..add('custom_value3') + ..add(serializers.serialize(object.customValue3, + specifiedType: const FullType(String))); + } + if (object.customValue4 != null) { + result + ..add('custom_value4') + ..add(serializers.serialize(object.customValue4, + specifiedType: const FullType(String))); + } + if (object.projectId != null) { + result + ..add('project_id') + ..add(serializers.serialize(object.projectId, + specifiedType: const FullType(String))); + } + if (object.vendorId != null) { + result + ..add('vendor_id') + ..add(serializers.serialize(object.vendorId, + specifiedType: const FullType(String))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -253,6 +289,30 @@ class _$DocumentEntitySerializer result.isDefault = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; break; + case 'custom_value1': + result.customValue1 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value2': + result.customValue2 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value3': + result.customValue3 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value4': + result.customValue4 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'project_id': + result.projectId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'vendor_id': + result.vendorId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; case 'isChanged': result.isChanged = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; @@ -504,6 +564,18 @@ class _$DocumentEntity extends DocumentEntity { @override final bool isDefault; @override + final String customValue1; + @override + final String customValue2; + @override + final String customValue3; + @override + final String customValue4; + @override + final String projectId; + @override + final String vendorId; + @override final bool isChanged; @override final int createdAt; @@ -534,6 +606,12 @@ class _$DocumentEntity extends DocumentEntity { this.invoiceId, this.expenseId, this.isDefault, + this.customValue1, + this.customValue2, + this.customValue3, + this.customValue4, + this.projectId, + this.vendorId, this.isChanged, this.createdAt, this.updatedAt, @@ -591,6 +669,12 @@ class _$DocumentEntity extends DocumentEntity { invoiceId == other.invoiceId && expenseId == other.expenseId && isDefault == other.isDefault && + customValue1 == other.customValue1 && + customValue2 == other.customValue2 && + customValue3 == other.customValue3 && + customValue4 == other.customValue4 && + projectId == other.projectId && + vendorId == other.vendorId && isChanged == other.isChanged && createdAt == other.createdAt && updatedAt == other.updatedAt && @@ -620,17 +704,19 @@ class _$DocumentEntity extends DocumentEntity { $jc( $jc( $jc( - $jc(0, - name.hashCode), - type.hashCode), - path.hashCode), - width.hashCode), - height.hashCode), - size.hashCode), - preview.hashCode), - invoiceId.hashCode), - expenseId.hashCode), - isDefault.hashCode), + $jc( + $jc($jc($jc($jc($jc($jc(0, name.hashCode), type.hashCode), path.hashCode), width.hashCode), height.hashCode), + size.hashCode), + preview.hashCode), + invoiceId.hashCode), + expenseId.hashCode), + isDefault.hashCode), + customValue1.hashCode), + customValue2.hashCode), + customValue3.hashCode), + customValue4.hashCode), + projectId.hashCode), + vendorId.hashCode), isChanged.hashCode), createdAt.hashCode), updatedAt.hashCode), @@ -654,6 +740,12 @@ class _$DocumentEntity extends DocumentEntity { ..add('invoiceId', invoiceId) ..add('expenseId', expenseId) ..add('isDefault', isDefault) + ..add('customValue1', customValue1) + ..add('customValue2', customValue2) + ..add('customValue3', customValue3) + ..add('customValue4', customValue4) + ..add('projectId', projectId) + ..add('vendorId', vendorId) ..add('isChanged', isChanged) ..add('createdAt', createdAt) ..add('updatedAt', updatedAt) @@ -710,6 +802,30 @@ class DocumentEntityBuilder bool get isDefault => _$this._isDefault; set isDefault(bool isDefault) => _$this._isDefault = isDefault; + String _customValue1; + String get customValue1 => _$this._customValue1; + set customValue1(String customValue1) => _$this._customValue1 = customValue1; + + String _customValue2; + String get customValue2 => _$this._customValue2; + set customValue2(String customValue2) => _$this._customValue2 = customValue2; + + String _customValue3; + String get customValue3 => _$this._customValue3; + set customValue3(String customValue3) => _$this._customValue3 = customValue3; + + String _customValue4; + String get customValue4 => _$this._customValue4; + set customValue4(String customValue4) => _$this._customValue4 = customValue4; + + String _projectId; + String get projectId => _$this._projectId; + set projectId(String projectId) => _$this._projectId = projectId; + + String _vendorId; + String get vendorId => _$this._vendorId; + set vendorId(String vendorId) => _$this._vendorId = vendorId; + bool _isChanged; bool get isChanged => _$this._isChanged; set isChanged(bool isChanged) => _$this._isChanged = isChanged; @@ -758,6 +874,12 @@ class DocumentEntityBuilder _invoiceId = _$v.invoiceId; _expenseId = _$v.expenseId; _isDefault = _$v.isDefault; + _customValue1 = _$v.customValue1; + _customValue2 = _$v.customValue2; + _customValue3 = _$v.customValue3; + _customValue4 = _$v.customValue4; + _projectId = _$v.projectId; + _vendorId = _$v.vendorId; _isChanged = _$v.isChanged; _createdAt = _$v.createdAt; _updatedAt = _$v.updatedAt; @@ -798,6 +920,12 @@ class DocumentEntityBuilder invoiceId: invoiceId, expenseId: expenseId, isDefault: isDefault, + customValue1: customValue1, + customValue2: customValue2, + customValue3: customValue3, + customValue4: customValue4, + projectId: projectId, + vendorId: vendorId, isChanged: isChanged, createdAt: createdAt, updatedAt: updatedAt, diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index 3caca1144..b8dddc9ea 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -408,6 +408,15 @@ abstract class ActivityEntity @BuiltValueField(wireName: 'task_id') String get taskId; + @nullable + @BuiltValueField(wireName: 'project_id') + String get projectId; + + @nullable + @BuiltValueField(wireName: 'vendor_id') + String get vendorId; + + EntityType get entityType { if (['1', '2', '3', '26'].contains(activityTypeId)) { return EntityType.client; diff --git a/lib/data/models/entities.g.dart b/lib/data/models/entities.g.dart index 3414215ef..9a6bc4595 100644 --- a/lib/data/models/entities.g.dart +++ b/lib/data/models/entities.g.dart @@ -507,6 +507,18 @@ class _$ActivityEntitySerializer ..add(serializers.serialize(object.taskId, specifiedType: const FullType(String))); } + if (object.projectId != null) { + result + ..add('project_id') + ..add(serializers.serialize(object.projectId, + specifiedType: const FullType(String))); + } + if (object.vendorId != null) { + result + ..add('vendor_id') + ..add(serializers.serialize(object.vendorId, + specifiedType: const FullType(String))); + } return result; } @@ -574,6 +586,14 @@ class _$ActivityEntitySerializer result.taskId = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; + case 'project_id': + result.projectId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'vendor_id': + result.vendorId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; } } @@ -797,6 +817,10 @@ class _$ActivityEntity extends ActivityEntity { final String contactId; @override final String taskId; + @override + final String projectId; + @override + final String vendorId; factory _$ActivityEntity([void Function(ActivityEntityBuilder) updates]) => (new ActivityEntityBuilder()..update(updates)).build(); @@ -814,7 +838,9 @@ class _$ActivityEntity extends ActivityEntity { this.expenseId, this.isSystem, this.contactId, - this.taskId}) + this.taskId, + this.projectId, + this.vendorId}) : super._() { if (notes == null) { throw new BuiltValueNullFieldError('ActivityEntity', 'notes'); @@ -857,7 +883,9 @@ class _$ActivityEntity extends ActivityEntity { expenseId == other.expenseId && isSystem == other.isSystem && contactId == other.contactId && - taskId == other.taskId; + taskId == other.taskId && + projectId == other.projectId && + vendorId == other.vendorId; } @override @@ -873,19 +901,26 @@ class _$ActivityEntity extends ActivityEntity { $jc( $jc( $jc( - $jc($jc(0, notes.hashCode), - key.hashCode), - activityTypeId.hashCode), - clientId.hashCode), - userId.hashCode), - invoiceId.hashCode), - paymentId.hashCode), - creditId.hashCode), - updatedAt.hashCode), - expenseId.hashCode), - isSystem.hashCode), - contactId.hashCode), - taskId.hashCode)); + $jc( + $jc( + $jc( + $jc(0, + notes.hashCode), + key.hashCode), + activityTypeId + .hashCode), + clientId.hashCode), + userId.hashCode), + invoiceId.hashCode), + paymentId.hashCode), + creditId.hashCode), + updatedAt.hashCode), + expenseId.hashCode), + isSystem.hashCode), + contactId.hashCode), + taskId.hashCode), + projectId.hashCode), + vendorId.hashCode)); } @override @@ -903,7 +938,9 @@ class _$ActivityEntity extends ActivityEntity { ..add('expenseId', expenseId) ..add('isSystem', isSystem) ..add('contactId', contactId) - ..add('taskId', taskId)) + ..add('taskId', taskId) + ..add('projectId', projectId) + ..add('vendorId', vendorId)) .toString(); } } @@ -965,6 +1002,14 @@ class ActivityEntityBuilder String get taskId => _$this._taskId; set taskId(String taskId) => _$this._taskId = taskId; + String _projectId; + String get projectId => _$this._projectId; + set projectId(String projectId) => _$this._projectId = projectId; + + String _vendorId; + String get vendorId => _$this._vendorId; + set vendorId(String vendorId) => _$this._vendorId = vendorId; + ActivityEntityBuilder(); ActivityEntityBuilder get _$this { @@ -982,6 +1027,8 @@ class ActivityEntityBuilder _isSystem = _$v.isSystem; _contactId = _$v.contactId; _taskId = _$v.taskId; + _projectId = _$v.projectId; + _vendorId = _$v.vendorId; _$v = null; } return this; @@ -1016,7 +1063,9 @@ class ActivityEntityBuilder expenseId: expenseId, isSystem: isSystem, contactId: contactId, - taskId: taskId); + taskId: taskId, + projectId: projectId, + vendorId: vendorId); replace(_$result); return _$result; } diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart index 99dd9834e..5d654d328 100644 --- a/lib/data/models/payment_model.dart +++ b/lib/data/models/payment_model.dart @@ -151,6 +151,15 @@ abstract class PaymentEntity extends Object @BuiltValueField(wireName: 'is_manual') bool get isManual; + @nullable + @BuiltValueField(wireName: 'project_id') + String get projectId; + + @nullable + @BuiltValueField(wireName: 'vendor_id') + String get vendorId; + + int compareTo(PaymentEntity credit, String sortField, bool sortAscending) { int response = 0; final PaymentEntity paymentA = sortAscending ? this : credit; diff --git a/lib/data/models/payment_model.g.dart b/lib/data/models/payment_model.g.dart index 836970e0d..22d849707 100644 --- a/lib/data/models/payment_model.g.dart +++ b/lib/data/models/payment_model.g.dart @@ -202,6 +202,18 @@ class _$PaymentEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.exchangeCurrencyId, specifiedType: const FullType(String))); } + if (object.projectId != null) { + result + ..add('project_id') + ..add(serializers.serialize(object.projectId, + specifiedType: const FullType(String))); + } + if (object.vendorId != null) { + result + ..add('vendor_id') + ..add(serializers.serialize(object.vendorId, + specifiedType: const FullType(String))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -333,6 +345,14 @@ class _$PaymentEntitySerializer implements StructuredSerializer { result.isManual = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; break; + case 'project_id': + result.projectId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'vendor_id': + result.vendorId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; case 'isChanged': result.isChanged = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; @@ -597,6 +617,10 @@ class _$PaymentEntity extends PaymentEntity { @override final bool isManual; @override + final String projectId; + @override + final String vendorId; + @override final bool isChanged; @override final int createdAt; @@ -634,6 +658,8 @@ class _$PaymentEntity extends PaymentEntity { this.exchangeRate, this.exchangeCurrencyId, this.isManual, + this.projectId, + this.vendorId, this.isChanged, this.createdAt, this.updatedAt, @@ -692,6 +718,8 @@ class _$PaymentEntity extends PaymentEntity { exchangeRate == other.exchangeRate && exchangeCurrencyId == other.exchangeCurrencyId && isManual == other.isManual && + projectId == other.projectId && + vendorId == other.vendorId && isChanged == other.isChanged && createdAt == other.createdAt && updatedAt == other.updatedAt && @@ -722,18 +750,18 @@ class _$PaymentEntity extends PaymentEntity { $jc( $jc( $jc( - $jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), refunded.hashCode), number.hashCode), clientId.hashCode), statusId.hashCode), transactionReference.hashCode), - date.hashCode), - typeId.hashCode), - invoiceId.hashCode), - privateNotes.hashCode), - customValue1.hashCode), - customValue2.hashCode), - customValue3.hashCode), - customValue4.hashCode), - exchangeRate.hashCode), - exchangeCurrencyId.hashCode), - isManual.hashCode), + $jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), refunded.hashCode), number.hashCode), clientId.hashCode), statusId.hashCode), transactionReference.hashCode), date.hashCode), typeId.hashCode), + invoiceId.hashCode), + privateNotes.hashCode), + customValue1.hashCode), + customValue2.hashCode), + customValue3.hashCode), + customValue4.hashCode), + exchangeRate.hashCode), + exchangeCurrencyId.hashCode), + isManual.hashCode), + projectId.hashCode), + vendorId.hashCode), isChanged.hashCode), createdAt.hashCode), updatedAt.hashCode), @@ -764,6 +792,8 @@ class _$PaymentEntity extends PaymentEntity { ..add('exchangeRate', exchangeRate) ..add('exchangeCurrencyId', exchangeCurrencyId) ..add('isManual', isManual) + ..add('projectId', projectId) + ..add('vendorId', vendorId) ..add('isChanged', isChanged) ..add('createdAt', createdAt) ..add('updatedAt', updatedAt) @@ -850,6 +880,14 @@ class PaymentEntityBuilder bool get isManual => _$this._isManual; set isManual(bool isManual) => _$this._isManual = isManual; + String _projectId; + String get projectId => _$this._projectId; + set projectId(String projectId) => _$this._projectId = projectId; + + String _vendorId; + String get vendorId => _$this._vendorId; + set vendorId(String vendorId) => _$this._vendorId = vendorId; + bool _isChanged; bool get isChanged => _$this._isChanged; set isChanged(bool isChanged) => _$this._isChanged = isChanged; @@ -905,6 +943,8 @@ class PaymentEntityBuilder _exchangeRate = _$v.exchangeRate; _exchangeCurrencyId = _$v.exchangeCurrencyId; _isManual = _$v.isManual; + _projectId = _$v.projectId; + _vendorId = _$v.vendorId; _isChanged = _$v.isChanged; _createdAt = _$v.createdAt; _updatedAt = _$v.updatedAt; @@ -952,6 +992,8 @@ class PaymentEntityBuilder exchangeRate: exchangeRate, exchangeCurrencyId: exchangeCurrencyId, isManual: isManual, + projectId: projectId, + vendorId: vendorId, isChanged: isChanged, createdAt: createdAt, updatedAt: updatedAt, diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart index d590000b5..e7aeefa19 100644 --- a/lib/data/models/product_model.dart +++ b/lib/data/models/product_model.dart @@ -130,6 +130,14 @@ abstract class ProductEntity extends Object @BuiltValueField(wireName: 'custom_value4') String get customValue4; + @nullable + @BuiltValueField(wireName: 'project_id') + String get projectId; + + @nullable + @BuiltValueField(wireName: 'vendor_id') + String get vendorId; + @override String get listDisplayName { return productKey; diff --git a/lib/data/models/product_model.g.dart b/lib/data/models/product_model.g.dart index a2b0be66b..e93102676 100644 --- a/lib/data/models/product_model.g.dart +++ b/lib/data/models/product_model.g.dart @@ -169,6 +169,18 @@ class _$ProductEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.customValue4, specifiedType: const FullType(String))); } + if (object.projectId != null) { + result + ..add('project_id') + ..add(serializers.serialize(object.projectId, + specifiedType: const FullType(String))); + } + if (object.vendorId != null) { + result + ..add('vendor_id') + ..add(serializers.serialize(object.vendorId, + specifiedType: const FullType(String))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -292,6 +304,14 @@ class _$ProductEntitySerializer implements StructuredSerializer { result.customValue4 = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; + case 'project_id': + result.projectId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'vendor_id': + result.vendorId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; case 'isChanged': result.isChanged = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; @@ -552,6 +572,10 @@ class _$ProductEntity extends ProductEntity { @override final String customValue4; @override + final String projectId; + @override + final String vendorId; + @override final bool isChanged; @override final int createdAt; @@ -587,6 +611,8 @@ class _$ProductEntity extends ProductEntity { this.customValue2, this.customValue3, this.customValue4, + this.projectId, + this.vendorId, this.isChanged, this.createdAt, this.updatedAt, @@ -663,6 +689,8 @@ class _$ProductEntity extends ProductEntity { customValue2 == other.customValue2 && customValue3 == other.customValue3 && customValue4 == other.customValue4 && + projectId == other.projectId && + vendorId == other.vendorId && isChanged == other.isChanged && createdAt == other.createdAt && updatedAt == other.updatedAt && @@ -693,18 +721,18 @@ class _$ProductEntity extends ProductEntity { $jc( $jc( $jc( - $jc($jc($jc($jc($jc(0, productKey.hashCode), notes.hashCode), cost.hashCode), price.hashCode), - quantity.hashCode), - taxName1.hashCode), - taxRate1.hashCode), - taxName2.hashCode), - taxRate2.hashCode), - taxName3.hashCode), - taxRate3.hashCode), - customValue1.hashCode), - customValue2.hashCode), - customValue3.hashCode), - customValue4.hashCode), + $jc($jc($jc($jc($jc($jc($jc(0, productKey.hashCode), notes.hashCode), cost.hashCode), price.hashCode), quantity.hashCode), taxName1.hashCode), + taxRate1.hashCode), + taxName2.hashCode), + taxRate2.hashCode), + taxName3.hashCode), + taxRate3.hashCode), + customValue1.hashCode), + customValue2.hashCode), + customValue3.hashCode), + customValue4.hashCode), + projectId.hashCode), + vendorId.hashCode), isChanged.hashCode), createdAt.hashCode), updatedAt.hashCode), @@ -733,6 +761,8 @@ class _$ProductEntity extends ProductEntity { ..add('customValue2', customValue2) ..add('customValue3', customValue3) ..add('customValue4', customValue4) + ..add('projectId', projectId) + ..add('vendorId', vendorId) ..add('isChanged', isChanged) ..add('createdAt', createdAt) ..add('updatedAt', updatedAt) @@ -809,6 +839,14 @@ class ProductEntityBuilder String get customValue4 => _$this._customValue4; set customValue4(String customValue4) => _$this._customValue4 = customValue4; + String _projectId; + String get projectId => _$this._projectId; + set projectId(String projectId) => _$this._projectId = projectId; + + String _vendorId; + String get vendorId => _$this._vendorId; + set vendorId(String vendorId) => _$this._vendorId = vendorId; + bool _isChanged; bool get isChanged => _$this._isChanged; set isChanged(bool isChanged) => _$this._isChanged = isChanged; @@ -862,6 +900,8 @@ class ProductEntityBuilder _customValue2 = _$v.customValue2; _customValue3 = _$v.customValue3; _customValue4 = _$v.customValue4; + _projectId = _$v.projectId; + _vendorId = _$v.vendorId; _isChanged = _$v.isChanged; _createdAt = _$v.createdAt; _updatedAt = _$v.updatedAt; @@ -907,6 +947,8 @@ class ProductEntityBuilder customValue2: customValue2, customValue3: customValue3, customValue4: customValue4, + projectId: projectId, + vendorId: vendorId, isChanged: isChanged, createdAt: createdAt, updatedAt: updatedAt, diff --git a/lib/data/models/quote_model.dart b/lib/data/models/quote_model.dart index 100eaef04..880b0d263 100644 --- a/lib/data/models/quote_model.dart +++ b/lib/data/models/quote_model.dart @@ -71,7 +71,6 @@ abstract class QuoteEntity extends Object return _$QuoteEntity._( id: id ?? BaseEntity.nextId, isChanged: false, - settings: SettingsEntity(), amount: 0.0, balance: 0.0, clientId: '', @@ -282,7 +281,13 @@ abstract class QuoteEntity extends Object String get filename; - SettingsEntity get settings; + @nullable + @BuiltValueField(wireName: 'project_id') + String get projectId; + + @nullable + @BuiltValueField(wireName: 'vendor_id') + String get vendorId; @override @BuiltValueField(wireName: 'line_items') diff --git a/lib/data/models/quote_model.g.dart b/lib/data/models/quote_model.g.dart index 90682637f..22486e79a 100644 --- a/lib/data/models/quote_model.g.dart +++ b/lib/data/models/quote_model.g.dart @@ -225,9 +225,6 @@ class _$QuoteEntitySerializer implements StructuredSerializer { 'filename', serializers.serialize(object.filename, specifiedType: const FullType(String)), - 'settings', - serializers.serialize(object.settings, - specifiedType: const FullType(SettingsEntity)), 'line_items', serializers.serialize(object.lineItems, specifiedType: const FullType( @@ -249,6 +246,18 @@ class _$QuoteEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.designId, specifiedType: const FullType(String))); } + if (object.projectId != null) { + result + ..add('project_id') + ..add(serializers.serialize(object.projectId, + specifiedType: const FullType(String))); + } + if (object.vendorId != null) { + result + ..add('vendor_id') + ..add(serializers.serialize(object.vendorId, + specifiedType: const FullType(String))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -471,9 +480,13 @@ class _$QuoteEntitySerializer implements StructuredSerializer { result.filename = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; - case 'settings': - result.settings.replace(serializers.deserialize(value, - specifiedType: const FullType(SettingsEntity)) as SettingsEntity); + case 'project_id': + result.projectId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'vendor_id': + result.vendorId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; break; case 'line_items': result.lineItems.replace(serializers.deserialize(value, @@ -940,7 +953,9 @@ class _$QuoteEntity extends QuoteEntity { @override final String filename; @override - final SettingsEntity settings; + final String projectId; + @override + final String vendorId; @override final BuiltList lineItems; @override @@ -1006,7 +1021,8 @@ class _$QuoteEntity extends QuoteEntity { this.hasExpenses, this.quoteInvoiceId, this.filename, - this.settings, + this.projectId, + this.vendorId, this.lineItems, this.invitations, this.isChanged, @@ -1132,9 +1148,6 @@ class _$QuoteEntity extends QuoteEntity { if (filename == null) { throw new BuiltValueNullFieldError('QuoteEntity', 'filename'); } - if (settings == null) { - throw new BuiltValueNullFieldError('QuoteEntity', 'settings'); - } if (lineItems == null) { throw new BuiltValueNullFieldError('QuoteEntity', 'lineItems'); } @@ -1194,7 +1207,8 @@ class _$QuoteEntity extends QuoteEntity { hasExpenses == other.hasExpenses && quoteInvoiceId == other.quoteInvoiceId && filename == other.filename && - settings == other.settings && + projectId == other.projectId && + vendorId == other.vendorId && lineItems == other.lineItems && invitations == other.invitations && isChanged == other.isChanged && @@ -1227,16 +1241,16 @@ class _$QuoteEntity extends QuoteEntity { $jc( $jc( $jc( - $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), balance.hashCode), clientId.hashCode), statusId.hashCode), invoiceNumber.hashCode), discount.hashCode), poNumber.hashCode), invoiceDate.hashCode), dueDate.hashCode), publicNotes.hashCode), privateNotes.hashCode), terms.hashCode), footer.hashCode), designId.hashCode), taxName1.hashCode), taxRate1.hashCode), taxName2.hashCode), taxRate2.hashCode), taxName3.hashCode), taxRate3.hashCode), isAmountDiscount.hashCode), partial.hashCode), partialDueDate.hashCode), hasTasks.hashCode), autoBill.hashCode), customValue1.hashCode), customValue2.hashCode), customValue3.hashCode), customValue4.hashCode), customSurcharge1.hashCode), customSurcharge2.hashCode), customSurcharge3.hashCode), - customSurcharge4.hashCode), - customTaxes1.hashCode), - customTaxes2.hashCode), - customTaxes3.hashCode), - customTaxes4.hashCode), - hasExpenses.hashCode), - quoteInvoiceId.hashCode), - filename.hashCode), - settings.hashCode), + $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), balance.hashCode), clientId.hashCode), statusId.hashCode), invoiceNumber.hashCode), discount.hashCode), poNumber.hashCode), invoiceDate.hashCode), dueDate.hashCode), publicNotes.hashCode), privateNotes.hashCode), terms.hashCode), footer.hashCode), designId.hashCode), taxName1.hashCode), taxRate1.hashCode), taxName2.hashCode), taxRate2.hashCode), taxName3.hashCode), taxRate3.hashCode), isAmountDiscount.hashCode), partial.hashCode), partialDueDate.hashCode), hasTasks.hashCode), autoBill.hashCode), customValue1.hashCode), customValue2.hashCode), customValue3.hashCode), customValue4.hashCode), customSurcharge1.hashCode), customSurcharge2.hashCode), customSurcharge3.hashCode), customSurcharge4.hashCode), + customTaxes1.hashCode), + customTaxes2.hashCode), + customTaxes3.hashCode), + customTaxes4.hashCode), + hasExpenses.hashCode), + quoteInvoiceId.hashCode), + filename.hashCode), + projectId.hashCode), + vendorId.hashCode), lineItems.hashCode), invitations.hashCode), isChanged.hashCode), @@ -1292,7 +1306,8 @@ class _$QuoteEntity extends QuoteEntity { ..add('hasExpenses', hasExpenses) ..add('quoteInvoiceId', quoteInvoiceId) ..add('filename', filename) - ..add('settings', settings) + ..add('projectId', projectId) + ..add('vendorId', vendorId) ..add('lineItems', lineItems) ..add('invitations', invitations) ..add('isChanged', isChanged) @@ -1478,10 +1493,13 @@ class QuoteEntityBuilder implements Builder { String get filename => _$this._filename; set filename(String filename) => _$this._filename = filename; - SettingsEntityBuilder _settings; - SettingsEntityBuilder get settings => - _$this._settings ??= new SettingsEntityBuilder(); - set settings(SettingsEntityBuilder settings) => _$this._settings = settings; + String _projectId; + String get projectId => _$this._projectId; + set projectId(String projectId) => _$this._projectId = projectId; + + String _vendorId; + String get vendorId => _$this._vendorId; + set vendorId(String vendorId) => _$this._vendorId = vendorId; ListBuilder _lineItems; ListBuilder get lineItems => @@ -1573,7 +1591,8 @@ class QuoteEntityBuilder implements Builder { _hasExpenses = _$v.hasExpenses; _quoteInvoiceId = _$v.quoteInvoiceId; _filename = _$v.filename; - _settings = _$v.settings?.toBuilder(); + _projectId = _$v.projectId; + _vendorId = _$v.vendorId; _lineItems = _$v.lineItems?.toBuilder(); _invitations = _$v.invitations?.toBuilder(); _isChanged = _$v.isChanged; @@ -1648,7 +1667,8 @@ class QuoteEntityBuilder implements Builder { hasExpenses: hasExpenses, quoteInvoiceId: quoteInvoiceId, filename: filename, - settings: settings.build(), + projectId: projectId, + vendorId: vendorId, lineItems: lineItems.build(), invitations: invitations.build(), isChanged: isChanged, @@ -1662,8 +1682,6 @@ class QuoteEntityBuilder implements Builder { } catch (_) { String _$failedField; try { - _$failedField = 'settings'; - settings.build(); _$failedField = 'lineItems'; lineItems.build(); _$failedField = 'invitations'; diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart index 5e8770043..c4974b2ed 100644 --- a/lib/data/models/task_model.dart +++ b/lib/data/models/task_model.dart @@ -366,6 +366,10 @@ abstract class TaskEntity extends Object @BuiltValueField(wireName: 'task_status_sort_order') int get taskStatusSortOrder; + @nullable + @BuiltValueField(wireName: 'vendor_id') + String get vendorId; + @override List getActions( {UserCompanyEntity userCompany, diff --git a/lib/data/models/task_model.g.dart b/lib/data/models/task_model.g.dart index 38caa65b9..84ba7cbea 100644 --- a/lib/data/models/task_model.g.dart +++ b/lib/data/models/task_model.g.dart @@ -222,6 +222,12 @@ class _$TaskEntitySerializer implements StructuredSerializer { ..add(serializers.serialize(object.taskStatusSortOrder, specifiedType: const FullType(int))); } + if (object.vendorId != null) { + result + ..add('vendor_id') + ..add(serializers.serialize(object.vendorId, + specifiedType: const FullType(String))); + } if (object.isChanged != null) { result ..add('isChanged') @@ -336,6 +342,10 @@ class _$TaskEntitySerializer implements StructuredSerializer { result.taskStatusSortOrder = serializers.deserialize(value, specifiedType: const FullType(int)) as int; break; + case 'vendor_id': + result.vendorId = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; case 'isChanged': result.isChanged = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; @@ -730,6 +740,8 @@ class _$TaskEntity extends TaskEntity { @override final int taskStatusSortOrder; @override + final String vendorId; + @override final bool isChanged; @override final int createdAt; @@ -763,6 +775,7 @@ class _$TaskEntity extends TaskEntity { this.customValue4, this.taskStatusId, this.taskStatusSortOrder, + this.vendorId, this.isChanged, this.createdAt, this.updatedAt, @@ -816,6 +829,7 @@ class _$TaskEntity extends TaskEntity { customValue4 == other.customValue4 && taskStatusId == other.taskStatusId && taskStatusSortOrder == other.taskStatusSortOrder && + vendorId == other.vendorId && isChanged == other.isChanged && createdAt == other.createdAt && updatedAt == other.updatedAt && @@ -846,18 +860,18 @@ class _$TaskEntity extends TaskEntity { $jc( $jc( $jc( - $jc($jc($jc(0, description.hashCode), duration.hashCode), - invoiceId.hashCode), - clientId.hashCode), - projectId.hashCode), - timeLog.hashCode), - isRunning.hashCode), - customValue1.hashCode), - customValue2.hashCode), - customValue3.hashCode), - customValue4.hashCode), - taskStatusId.hashCode), - taskStatusSortOrder.hashCode), + $jc($jc($jc($jc(0, description.hashCode), duration.hashCode), invoiceId.hashCode), + clientId.hashCode), + projectId.hashCode), + timeLog.hashCode), + isRunning.hashCode), + customValue1.hashCode), + customValue2.hashCode), + customValue3.hashCode), + customValue4.hashCode), + taskStatusId.hashCode), + taskStatusSortOrder.hashCode), + vendorId.hashCode), isChanged.hashCode), createdAt.hashCode), updatedAt.hashCode), @@ -884,6 +898,7 @@ class _$TaskEntity extends TaskEntity { ..add('customValue4', customValue4) ..add('taskStatusId', taskStatusId) ..add('taskStatusSortOrder', taskStatusSortOrder) + ..add('vendorId', vendorId) ..add('isChanged', isChanged) ..add('createdAt', createdAt) ..add('updatedAt', updatedAt) @@ -952,6 +967,10 @@ class TaskEntityBuilder implements Builder { set taskStatusSortOrder(int taskStatusSortOrder) => _$this._taskStatusSortOrder = taskStatusSortOrder; + String _vendorId; + String get vendorId => _$this._vendorId; + set vendorId(String vendorId) => _$this._vendorId = vendorId; + bool _isChanged; bool get isChanged => _$this._isChanged; set isChanged(bool isChanged) => _$this._isChanged = isChanged; @@ -1003,6 +1022,7 @@ class TaskEntityBuilder implements Builder { _customValue4 = _$v.customValue4; _taskStatusId = _$v.taskStatusId; _taskStatusSortOrder = _$v.taskStatusSortOrder; + _vendorId = _$v.vendorId; _isChanged = _$v.isChanged; _createdAt = _$v.createdAt; _updatedAt = _$v.updatedAt; @@ -1046,6 +1066,7 @@ class TaskEntityBuilder implements Builder { customValue4: customValue4, taskStatusId: taskStatusId, taskStatusSortOrder: taskStatusSortOrder, + vendorId: vendorId, isChanged: isChanged, createdAt: createdAt, updatedAt: updatedAt, diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart index e4448629d..b94726cec 100644 --- a/lib/data/models/user_model.dart +++ b/lib/data/models/user_model.dart @@ -57,6 +57,10 @@ abstract class UserEntity extends Object updatedAt: 0, archivedAt: 0, isDeleted: false, + customValue1: '', + customValue2: '', + customValue3: '', + customValue4: '', ); } @@ -77,6 +81,22 @@ abstract class UserEntity extends Object String get phone; + @nullable + @BuiltValueField(wireName: 'custom_value1') + String get customValue1; + + @nullable + @BuiltValueField(wireName: 'custom_value2') + String get customValue2; + + @nullable + @BuiltValueField(wireName: 'custom_value3') + String get customValue3; + + @nullable + @BuiltValueField(wireName: 'custom_value4') + String get customValue4; + @nullable @BuiltValueField(wireName: 'company_user') UserCompanyEntity get userCompany; diff --git a/lib/data/models/user_model.g.dart b/lib/data/models/user_model.g.dart index 6da4e05aa..a54978486 100644 --- a/lib/data/models/user_model.g.dart +++ b/lib/data/models/user_model.g.dart @@ -122,6 +122,30 @@ class _$UserEntitySerializer implements StructuredSerializer { serializers.serialize(object.phone, specifiedType: const FullType(String)), ]; + if (object.customValue1 != null) { + result + ..add('custom_value1') + ..add(serializers.serialize(object.customValue1, + specifiedType: const FullType(String))); + } + if (object.customValue2 != null) { + result + ..add('custom_value2') + ..add(serializers.serialize(object.customValue2, + specifiedType: const FullType(String))); + } + if (object.customValue3 != null) { + result + ..add('custom_value3') + ..add(serializers.serialize(object.customValue3, + specifiedType: const FullType(String))); + } + if (object.customValue4 != null) { + result + ..add('custom_value4') + ..add(serializers.serialize(object.customValue4, + specifiedType: const FullType(String))); + } if (object.userCompany != null) { result ..add('company_user') @@ -206,6 +230,22 @@ class _$UserEntitySerializer implements StructuredSerializer { result.phone = serializers.deserialize(value, specifiedType: const FullType(String)) as String; break; + case 'custom_value1': + result.customValue1 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value2': + result.customValue2 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value3': + result.customValue3 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; + case 'custom_value4': + result.customValue4 = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + break; case 'company_user': result.userCompany.replace(serializers.deserialize(value, specifiedType: const FullType(UserCompanyEntity)) @@ -445,6 +485,14 @@ class _$UserEntity extends UserEntity { @override final String phone; @override + final String customValue1; + @override + final String customValue2; + @override + final String customValue3; + @override + final String customValue4; + @override final UserCompanyEntity userCompany; @override final bool isChanged; @@ -471,6 +519,10 @@ class _$UserEntity extends UserEntity { this.lastName, this.email, this.phone, + this.customValue1, + this.customValue2, + this.customValue3, + this.customValue4, this.userCompany, this.isChanged, this.createdAt, @@ -510,6 +562,10 @@ class _$UserEntity extends UserEntity { lastName == other.lastName && email == other.email && phone == other.phone && + customValue1 == other.customValue1 && + customValue2 == other.customValue2 && + customValue3 == other.customValue3 && + customValue4 == other.customValue4 && userCompany == other.userCompany && isChanged == other.isChanged && createdAt == other.createdAt && @@ -534,10 +590,23 @@ class _$UserEntity extends UserEntity { $jc( $jc( $jc( - $jc($jc(0, firstName.hashCode), - lastName.hashCode), - email.hashCode), - phone.hashCode), + $jc( + $jc( + $jc( + $jc( + $jc( + $jc( + 0, + firstName + .hashCode), + lastName + .hashCode), + email.hashCode), + phone.hashCode), + customValue1.hashCode), + customValue2.hashCode), + customValue3.hashCode), + customValue4.hashCode), userCompany.hashCode), isChanged.hashCode), createdAt.hashCode), @@ -556,6 +625,10 @@ class _$UserEntity extends UserEntity { ..add('lastName', lastName) ..add('email', email) ..add('phone', phone) + ..add('customValue1', customValue1) + ..add('customValue2', customValue2) + ..add('customValue3', customValue3) + ..add('customValue4', customValue4) ..add('userCompany', userCompany) ..add('isChanged', isChanged) ..add('createdAt', createdAt) @@ -588,6 +661,22 @@ class UserEntityBuilder implements Builder { String get phone => _$this._phone; set phone(String phone) => _$this._phone = phone; + String _customValue1; + String get customValue1 => _$this._customValue1; + set customValue1(String customValue1) => _$this._customValue1 = customValue1; + + String _customValue2; + String get customValue2 => _$this._customValue2; + set customValue2(String customValue2) => _$this._customValue2 = customValue2; + + String _customValue3; + String get customValue3 => _$this._customValue3; + set customValue3(String customValue3) => _$this._customValue3 = customValue3; + + String _customValue4; + String get customValue4 => _$this._customValue4; + set customValue4(String customValue4) => _$this._customValue4 = customValue4; + UserCompanyEntityBuilder _userCompany; UserCompanyEntityBuilder get userCompany => _$this._userCompany ??= new UserCompanyEntityBuilder(); @@ -636,6 +725,10 @@ class UserEntityBuilder implements Builder { _lastName = _$v.lastName; _email = _$v.email; _phone = _$v.phone; + _customValue1 = _$v.customValue1; + _customValue2 = _$v.customValue2; + _customValue3 = _$v.customValue3; + _customValue4 = _$v.customValue4; _userCompany = _$v.userCompany?.toBuilder(); _isChanged = _$v.isChanged; _createdAt = _$v.createdAt; @@ -673,6 +766,10 @@ class UserEntityBuilder implements Builder { lastName: lastName, email: email, phone: phone, + customValue1: customValue1, + customValue2: customValue2, + customValue3: customValue3, + customValue4: customValue4, userCompany: _userCompany?.build(), isChanged: isChanged, createdAt: createdAt,