From 7635577b26b1127b2ee7156dce7cef1a0cb416e2 Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Fri, 22 Dec 2023 16:03:57 +0100 Subject: [PATCH] update service generation --- manager_api/doc/ConfigurationDTO.md | 1 - manager_api/doc/ContentGeoPoint.md | 2 +- manager_api/doc/ExportConfigurationDTO.md | 1 - manager_api/lib/model/configuration_dto.dart | 19 +------------------ manager_api/lib/model/content_geo_point.dart | 18 +++++++++--------- .../lib/model/export_configuration_dto.dart | 19 +------------------ manager_api/lib/model/section_dto.dart | 6 ------ 7 files changed, 12 insertions(+), 54 deletions(-) diff --git a/manager_api/doc/ConfigurationDTO.md b/manager_api/doc/ConfigurationDTO.md index ecf00ad..4184c42 100644 --- a/manager_api/doc/ConfigurationDTO.md +++ b/manager_api/doc/ConfigurationDTO.md @@ -22,7 +22,6 @@ Name | Type | Description | Notes **isOffline** | **bool** | | [optional] **instanceId** | **String** | | [optional] **sectionIds** | **List** | | [optional] [default to const []] -**pinCode** | **int** | | [optional] **loaderImageId** | **String** | | [optional] **loaderImageUrl** | **String** | | [optional] **weatherCity** | **String** | | [optional] diff --git a/manager_api/doc/ContentGeoPoint.md b/manager_api/doc/ContentGeoPoint.md index 95ac850..adb2867 100644 --- a/manager_api/doc/ContentGeoPoint.md +++ b/manager_api/doc/ContentGeoPoint.md @@ -11,7 +11,7 @@ Name | Type | Description | Notes **resourceId** | **String** | | [optional] **resourceType** | [**ResourceType**](ResourceType.md) | | [optional] **resourceUrl** | **String** | | [optional] -**latitude** | **String** | | [optional] +**resourceName** | **String** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/manager_api/doc/ExportConfigurationDTO.md b/manager_api/doc/ExportConfigurationDTO.md index 5821e63..732381d 100644 --- a/manager_api/doc/ExportConfigurationDTO.md +++ b/manager_api/doc/ExportConfigurationDTO.md @@ -22,7 +22,6 @@ Name | Type | Description | Notes **isOffline** | **bool** | | [optional] **instanceId** | **String** | | [optional] **sectionIds** | **List** | | [optional] [default to const []] -**pinCode** | **int** | | [optional] **loaderImageId** | **String** | | [optional] **loaderImageUrl** | **String** | | [optional] **weatherCity** | **String** | | [optional] diff --git a/manager_api/lib/model/configuration_dto.dart b/manager_api/lib/model/configuration_dto.dart index f99c484..a7196bd 100644 --- a/manager_api/lib/model/configuration_dto.dart +++ b/manager_api/lib/model/configuration_dto.dart @@ -27,7 +27,6 @@ class ConfigurationDTO { this.isOffline, this.instanceId, this.sectionIds = const [], - this.pinCode, this.loaderImageId, this.loaderImageUrl, this.weatherCity, @@ -85,14 +84,6 @@ class ConfigurationDTO { List? sectionIds; - /// - /// Please note: This property should have been non-nullable! Since the specification file - /// does not include a default value (using the "default:" property), however, the generated - /// source code must fall back to having a nullable type. - /// Consider adding a "default:" property in the specification file to hide this note. - /// - int? pinCode; - String? loaderImageId; String? loaderImageUrl; @@ -115,7 +106,6 @@ class ConfigurationDTO { other.isOffline == isOffline && other.instanceId == instanceId && other.sectionIds == sectionIds && - other.pinCode == pinCode && other.loaderImageId == loaderImageId && other.loaderImageUrl == loaderImageUrl && other.weatherCity == weatherCity; @@ -137,13 +127,12 @@ class ConfigurationDTO { (isOffline == null ? 0 : isOffline!.hashCode) + (instanceId == null ? 0 : instanceId!.hashCode) + (sectionIds == null ? 0 : sectionIds!.hashCode) + - (pinCode == null ? 0 : pinCode!.hashCode) + (loaderImageId == null ? 0 : loaderImageId!.hashCode) + (loaderImageUrl == null ? 0 : loaderImageUrl!.hashCode) + (weatherCity == null ? 0 : weatherCity!.hashCode); @override - String toString() => 'ConfigurationDTO[id=$id, label=$label, title=$title, imageId=$imageId, imageSource=$imageSource, primaryColor=$primaryColor, secondaryColor=$secondaryColor, languages=$languages, dateCreation=$dateCreation, isMobile=$isMobile, isTablet=$isTablet, isOffline=$isOffline, instanceId=$instanceId, sectionIds=$sectionIds, pinCode=$pinCode, loaderImageId=$loaderImageId, loaderImageUrl=$loaderImageUrl, weatherCity=$weatherCity]'; + String toString() => 'ConfigurationDTO[id=$id, label=$label, title=$title, imageId=$imageId, imageSource=$imageSource, primaryColor=$primaryColor, secondaryColor=$secondaryColor, languages=$languages, dateCreation=$dateCreation, isMobile=$isMobile, isTablet=$isTablet, isOffline=$isOffline, instanceId=$instanceId, sectionIds=$sectionIds, loaderImageId=$loaderImageId, loaderImageUrl=$loaderImageUrl, weatherCity=$weatherCity]'; Map toJson() { final json = {}; @@ -217,11 +206,6 @@ class ConfigurationDTO { } else { json[r'sectionIds'] = null; } - if (this.pinCode != null) { - json[r'pinCode'] = this.pinCode; - } else { - json[r'pinCode'] = null; - } if (this.loaderImageId != null) { json[r'loaderImageId'] = this.loaderImageId; } else { @@ -277,7 +261,6 @@ class ConfigurationDTO { sectionIds: json[r'sectionIds'] is List ? (json[r'sectionIds'] as List).cast() : const [], - pinCode: mapValueOfType(json, r'pinCode'), loaderImageId: mapValueOfType(json, r'loaderImageId'), loaderImageUrl: mapValueOfType(json, r'loaderImageUrl'), weatherCity: mapValueOfType(json, r'weatherCity'), diff --git a/manager_api/lib/model/content_geo_point.dart b/manager_api/lib/model/content_geo_point.dart index e8fe80f..d299f8a 100644 --- a/manager_api/lib/model/content_geo_point.dart +++ b/manager_api/lib/model/content_geo_point.dart @@ -16,7 +16,7 @@ class ContentGeoPoint { this.resourceId, this.resourceType, this.resourceUrl, - this.latitude, + this.resourceName, }); String? resourceId; @@ -31,14 +31,14 @@ class ContentGeoPoint { String? resourceUrl; - String? latitude; + String? resourceName; @override bool operator ==(Object other) => identical(this, other) || other is ContentGeoPoint && other.resourceId == resourceId && other.resourceType == resourceType && other.resourceUrl == resourceUrl && - other.latitude == latitude; + other.resourceName == resourceName; @override int get hashCode => @@ -46,10 +46,10 @@ class ContentGeoPoint { (resourceId == null ? 0 : resourceId!.hashCode) + (resourceType == null ? 0 : resourceType!.hashCode) + (resourceUrl == null ? 0 : resourceUrl!.hashCode) + - (latitude == null ? 0 : latitude!.hashCode); + (resourceName == null ? 0 : resourceName!.hashCode); @override - String toString() => 'ContentGeoPoint[resourceId=$resourceId, resourceType=$resourceType, resourceUrl=$resourceUrl, latitude=$latitude]'; + String toString() => 'ContentGeoPoint[resourceId=$resourceId, resourceType=$resourceType, resourceUrl=$resourceUrl, resourceName=$resourceName]'; Map toJson() { final json = {}; @@ -68,10 +68,10 @@ class ContentGeoPoint { } else { json[r'resourceUrl'] = null; } - if (this.latitude != null) { - json[r'latitude'] = this.latitude; + if (this.resourceName != null) { + json[r'resourceName'] = this.resourceName; } else { - json[r'latitude'] = null; + json[r'resourceName'] = null; } return json; } @@ -98,7 +98,7 @@ class ContentGeoPoint { resourceId: mapValueOfType(json, r'resourceId'), resourceType: ResourceType.fromJson(json[r'resourceType']), resourceUrl: mapValueOfType(json, r'resourceUrl'), - latitude: mapValueOfType(json, r'latitude'), + resourceName: mapValueOfType(json, r'resourceName'), ); } return null; diff --git a/manager_api/lib/model/export_configuration_dto.dart b/manager_api/lib/model/export_configuration_dto.dart index c5d6fd7..dd16d90 100644 --- a/manager_api/lib/model/export_configuration_dto.dart +++ b/manager_api/lib/model/export_configuration_dto.dart @@ -27,7 +27,6 @@ class ExportConfigurationDTO { this.isOffline, this.instanceId, this.sectionIds = const [], - this.pinCode, this.loaderImageId, this.loaderImageUrl, this.weatherCity, @@ -87,14 +86,6 @@ class ExportConfigurationDTO { List? sectionIds; - /// - /// Please note: This property should have been non-nullable! Since the specification file - /// does not include a default value (using the "default:" property), however, the generated - /// source code must fall back to having a nullable type. - /// Consider adding a "default:" property in the specification file to hide this note. - /// - int? pinCode; - String? loaderImageId; String? loaderImageUrl; @@ -121,7 +112,6 @@ class ExportConfigurationDTO { other.isOffline == isOffline && other.instanceId == instanceId && other.sectionIds == sectionIds && - other.pinCode == pinCode && other.loaderImageId == loaderImageId && other.loaderImageUrl == loaderImageUrl && other.weatherCity == weatherCity && @@ -145,7 +135,6 @@ class ExportConfigurationDTO { (isOffline == null ? 0 : isOffline!.hashCode) + (instanceId == null ? 0 : instanceId!.hashCode) + (sectionIds == null ? 0 : sectionIds!.hashCode) + - (pinCode == null ? 0 : pinCode!.hashCode) + (loaderImageId == null ? 0 : loaderImageId!.hashCode) + (loaderImageUrl == null ? 0 : loaderImageUrl!.hashCode) + (weatherCity == null ? 0 : weatherCity!.hashCode) + @@ -153,7 +142,7 @@ class ExportConfigurationDTO { (resources == null ? 0 : resources!.hashCode); @override - String toString() => 'ExportConfigurationDTO[id=$id, label=$label, title=$title, imageId=$imageId, imageSource=$imageSource, primaryColor=$primaryColor, secondaryColor=$secondaryColor, languages=$languages, dateCreation=$dateCreation, isMobile=$isMobile, isTablet=$isTablet, isOffline=$isOffline, instanceId=$instanceId, sectionIds=$sectionIds, pinCode=$pinCode, loaderImageId=$loaderImageId, loaderImageUrl=$loaderImageUrl, weatherCity=$weatherCity, sections=$sections, resources=$resources]'; + String toString() => 'ExportConfigurationDTO[id=$id, label=$label, title=$title, imageId=$imageId, imageSource=$imageSource, primaryColor=$primaryColor, secondaryColor=$secondaryColor, languages=$languages, dateCreation=$dateCreation, isMobile=$isMobile, isTablet=$isTablet, isOffline=$isOffline, instanceId=$instanceId, sectionIds=$sectionIds, loaderImageId=$loaderImageId, loaderImageUrl=$loaderImageUrl, weatherCity=$weatherCity, sections=$sections, resources=$resources]'; Map toJson() { final json = {}; @@ -227,11 +216,6 @@ class ExportConfigurationDTO { } else { json[r'sectionIds'] = null; } - if (this.pinCode != null) { - json[r'pinCode'] = this.pinCode; - } else { - json[r'pinCode'] = null; - } if (this.loaderImageId != null) { json[r'loaderImageId'] = this.loaderImageId; } else { @@ -297,7 +281,6 @@ class ExportConfigurationDTO { sectionIds: json[r'sectionIds'] is List ? (json[r'sectionIds'] as List).cast() : const [], - pinCode: mapValueOfType(json, r'pinCode'), loaderImageId: mapValueOfType(json, r'loaderImageId'), loaderImageUrl: mapValueOfType(json, r'loaderImageUrl'), weatherCity: mapValueOfType(json, r'weatherCity'), diff --git a/manager_api/lib/model/section_dto.dart b/manager_api/lib/model/section_dto.dart index 977995c..b3c097e 100644 --- a/manager_api/lib/model/section_dto.dart +++ b/manager_api/lib/model/section_dto.dart @@ -76,12 +76,6 @@ class SectionDTO { /// DateTime? dateCreation; - /// - /// Please note: This property should have been non-nullable! Since the specification file - /// does not include a default value (using the "default:" property), however, the generated - /// source code must fall back to having a nullable type. - /// Consider adding a "default:" property in the specification file to hide this note. - /// int? order; String? instanceId;