Skip to content

High performance self-hosted photo and video management solution.

feat(mobile): add three-state field serialization (#27231)

Timon96d521e149a0
diff --git a/mobile/lib/extensions/asset_extensions.dart b/mobile/lib/extensions/asset_extensions.dart
index 7e1bef1a1c..445af99e79 100644
--- a/mobile/lib/extensions/asset_extensions.dart
+++ b/mobile/lib/extensions/asset_extensions.dart
@@ -18,11 +18,11 @@ extension DTOToAsset on api.AssetResponseDto {
height: height?.toInt(),
width: width?.toInt(),
isFavorite: isFavorite,
- livePhotoVideoId: livePhotoVideoId,
+ livePhotoVideoId: livePhotoVideoId.orElse(null),
thumbHash: thumbhash,
localId: null,
type: type.toAssetType(),
- stackId: stack?.id,
+ stackId: stack.orElse(null)?.id,
isEdited: isEdited,
);
}
@@ -41,13 +41,13 @@ extension DTOToAsset on api.AssetResponseDto {
height: height?.toInt(),
width: width?.toInt(),
isFavorite: isFavorite,
- livePhotoVideoId: livePhotoVideoId,
+ livePhotoVideoId: livePhotoVideoId.orElse(null),
thumbHash: thumbhash,
localId: null,
type: type.toAssetType(),
- stackId: stack?.id,
+ stackId: stack.orElse(null)?.id,
isEdited: isEdited,
- exifInfo: exifInfo != null ? ExifDtoConverter.fromDto(exifInfo!) : const ExifInfo(),
+ exifInfo: exifInfo.orElse(null) != null ? ExifDtoConverter.fromDto(exifInfo.orElse(null)!) : const ExifInfo(),
);
}
}
diff --git a/mobile/lib/infrastructure/repositories/search_api.repository.dart b/mobile/lib/infrastructure/repositories/search_api.repository.dart
index bcfddfce6e..e2f2af17eb 100644
--- a/mobile/lib/infrastructure/repositories/search_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/search_api.repository.dart
@@ -20,50 +20,64 @@ class SearchApiRepository extends ApiRepository {
(filter.assetId != null && filter.assetId!.isNotEmpty)) {
return _api.searchSmart(
SmartSearchDto(
- query: filter.context,
- queryAssetId: filter.assetId,
- language: filter.language,
- country: filter.location.country,
- state: filter.location.state,
- city: filter.location.city,
- make: filter.camera.make,
- model: filter.camera.model,
- takenAfter: filter.date.takenAfter,
- takenBefore: filter.date.takenBefore,
- visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
- rating: filter.rating.rating,
- isFavorite: filter.display.isFavorite ? true : null,
- isNotInAlbum: filter.display.isNotInAlbum ? true : null,
- personIds: filter.people.map((e) => e.id).toList(),
- tagIds: filter.tagIds,
- type: type,
- page: page,
- size: 100,
+ query: filter.context == null ? const Optional.absent() : Optional.present(filter.context!),
+ queryAssetId: filter.assetId == null ? const Optional.absent() : Optional.present(filter.assetId!),
+ language: filter.language == null ? const Optional.absent() : Optional.present(filter.language!),
+ country: filter.location.country == null
+ ? const Optional.absent()
+ : Optional.present(filter.location.country!),
+ state: filter.location.state == null ? const Optional.absent() : Optional.present(filter.location.state!),
+ city: filter.location.city == null ? const Optional.absent() : Optional.present(filter.location.city!),
+ make: filter.camera.make == null ? const Optional.absent() : Optional.present(filter.camera.make!),
+ model: filter.camera.model == null ? const Optional.absent() : Optional.present(filter.camera.model!),
+ takenAfter: filter.date.takenAfter == null
+ ? const Optional.absent()
+ : Optional.present(filter.date.takenAfter!),
+ takenBefore: filter.date.takenBefore == null
+ ? const Optional.absent()
+ : Optional.present(filter.date.takenBefore!),
+ visibility: Optional.present(filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline),
+ rating: filter.rating.rating == null ? const Optional.absent() : Optional.present(filter.rating.rating!),
+ isFavorite: filter.display.isFavorite ? const Optional.present(true) : const Optional.absent(),
+ isNotInAlbum: filter.display.isNotInAlbum ? const Optional.present(true) : const Optional.absent(),
+ personIds: Optional.present(filter.people.map((e) => e.id).toList()),
+ tagIds: filter.tagIds == null ? const Optional.absent() : Optional.present(filter.tagIds!),
+ type: type == null ? const Optional.absent() : Optional.present(type),
+ page: Optional.present(page),
+ size: const Optional.present(100),
),
);
}
return _api.searchAssets(
MetadataSearchDto(
- originalFileName: filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null,
- country: filter.location.country,
- description: filter.description != null && filter.description!.isNotEmpty ? filter.description : null,
- ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null,
- state: filter.location.state,
- city: filter.location.city,
- make: filter.camera.make,
- model: filter.camera.model,
- takenAfter: filter.date.takenAfter,
- takenBefore: filter.date.takenBefore,
- visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
- rating: filter.rating.rating,
- isFavorite: filter.display.isFavorite ? true : null,
- isNotInAlbum: filter.display.isNotInAlbum ? true : null,
- personIds: filter.people.map((e) => e.id).toList(),
- tagIds: filter.tagIds,
- type: type,
- page: page,
- size: 1000,
+ originalFileName: filter.filename != null && filter.filename!.isNotEmpty
+ ? Optional.present(filter.filename!)
+ : const Optional.absent(),
+ country: filter.location.country == null ? const Optional.absent() : Optional.present(filter.location.country!),
+ description: filter.description != null && filter.description!.isNotEmpty
+ ? Optional.present(filter.description!)
+ : const Optional.absent(),
+ ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? Optional.present(filter.ocr!) : const Optional.absent(),
+ state: filter.location.state == null ? const Optional.absent() : Optional.present(filter.location.state!),
+ city: filter.location.city == null ? const Optional.absent() : Optional.present(filter.location.city!),
+ make: filter.camera.make == null ? const Optional.absent() : Optional.present(filter.camera.make!),
+ model: filter.camera.model == null ? const Optional.absent() : Optional.present(filter.camera.model!),
+ takenAfter: filter.date.takenAfter == null
+ ? const Optional.absent()
+ : Optional.present(filter.date.takenAfter!),
+ takenBefore: filter.date.takenBefore == null
+ ? const Optional.absent()
+ : Optional.present(filter.date.takenBefore!),
+ visibility: Optional.present(filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline),
+ rating: filter.rating.rating == null ? const Optional.absent() : Optional.present(filter.rating.rating!),
+ isFavorite: filter.display.isFavorite ? const Optional.present(true) : const Optional.absent(),
+ isNotInAlbum: filter.display.isNotInAlbum ? const Optional.present(true) : const Optional.absent(),
+ personIds: Optional.present(filter.people.map((e) => e.id).toList()),
+ tagIds: filter.tagIds == null ? const Optional.absent() : Optional.present(filter.tagIds!),
+ type: type == null ? const Optional.absent() : Optional.present(type),
+ page: Optional.present(page),
+ size: const Optional.present(1000),
),
);
}
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index d9d262e64f..8b8475d31f 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -20,7 +20,7 @@ class SyncApiRepository {
}
Future<void> deleteSyncAck(List<SyncEntityType> types) {
- return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: types));
+ return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: Optional.present(types)));
}
Future<void> streamChanges(
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index b7593c3202..bd672171bc 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -91,7 +91,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
email: Value(user.email),
hasProfileImage: Value(user.hasProfileImage),
profileChangedAt: Value(user.profileChangedAt),
- avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
+ avatarColor: Value(user.avatarColor.orElse(null)?.toAvatarColor() ?? AvatarColor.primary),
isAdmin: Value(user.isAdmin),
pinCode: Value(user.pinCode),
quotaSizeInBytes: Value(user.quotaSizeInBytes ?? 0),
@@ -133,7 +133,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
email: Value(user.email),
hasProfileImage: Value(user.hasProfileImage),
profileChangedAt: Value(user.profileChangedAt),
- avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
+ avatarColor: Value(user.avatarColor.orElse(null)?.toAvatarColor() ?? AvatarColor.primary),
);
batch.insert(_db.userEntity, companion.copyWith(id: Value(user.id)), onConflict: DoUpdate((_) => companion));
diff --git a/mobile/lib/infrastructure/utils/exif.converter.dart b/mobile/lib/infrastructure/utils/exif.converter.dart
index 50639e8e42..9f9b6f9324 100644
--- a/mobile/lib/infrastructure/utils/exif.converter.dart
+++ b/mobile/lib/infrastructure/utils/exif.converter.dart
@@ -5,24 +5,24 @@ import 'package:openapi/api.dart';
abstract final class ExifDtoConverter {
static ExifInfo fromDto(ExifResponseDto dto) {
return ExifInfo(
- fileSize: dto.fileSizeInByte,
- description: dto.description,
- orientation: dto.orientation,
- timeZone: dto.timeZone,
- dateTimeOriginal: dto.dateTimeOriginal,
- isFlipped: isOrientationFlipped(dto.orientation),
- latitude: dto.latitude?.toDouble(),
- longitude: dto.longitude?.toDouble(),
- city: dto.city,
- state: dto.state,
- country: dto.country,
- make: dto.make,
- model: dto.model,
- lens: dto.lensModel,
- f: dto.fNumber?.toDouble(),
- mm: dto.focalLength?.toDouble(),
- iso: dto.iso?.toInt(),
- exposureSeconds: exposureTimeToSeconds(dto.exposureTime),
+ fileSize: dto.fileSizeInByte.orElse(null),
+ description: dto.description.orElse(null),
+ orientation: dto.orientation.orElse(null),
+ timeZone: dto.timeZone.orElse(null),
+ dateTimeOriginal: dto.dateTimeOriginal.orElse(null),
+ isFlipped: isOrientationFlipped(dto.orientation.orElse(null)),
+ latitude: dto.latitude.orElse(null)?.toDouble(),
+ longitude: dto.longitude.orElse(null)?.toDouble(),
+ city: dto.city.orElse(null),
+ state: dto.state.orElse(null),
+ country: dto.country.orElse(null),
+ make: dto.make.orElse(null),
+ model: dto.model.orElse(null),
+ lens: dto.lensModel.orElse(null),
+ f: dto.fNumber.orElse(null)?.toDouble(),
+ mm: dto.focalLength.orElse(null)?.toDouble(),
+ iso: dto.iso.orElse(null)?.toInt(),
+ exposureSeconds: exposureTimeToSeconds(dto.exposureTime.orElse(null)),
);
}
diff --git a/mobile/lib/infrastructure/utils/user.converter.dart b/mobile/lib/infrastructure/utils/user.converter.dart
index 826649b247..7e8a2c6fcc 100644
--- a/mobile/lib/infrastructure/utils/user.converter.dart
+++ b/mobile/lib/infrastructure/utils/user.converter.dart
@@ -40,7 +40,7 @@ abstract final class UserConverter {
updatedAt: DateTime.now(),
avatarColor: dto.avatarColor.toAvatarColor(),
memoryEnabled: false,
- inTimeline: dto.inTimeline ?? false,
+ inTimeline: dto.inTimeline.orElse(null) ?? false,
isPartnerSharedBy: false,
isPartnerSharedWith: false,
profileChangedAt: dto.profileChangedAt,
diff --git a/mobile/lib/models/shared_link/shared_link.model.dart b/mobile/lib/models/shared_link/shared_link.model.dart
index 4315cf616a..e7b65a96ef 100644
--- a/mobile/lib/models/shared_link/shared_link.model.dart
+++ b/mobile/lib/models/shared_link/shared_link.model.dart
@@ -73,10 +73,10 @@ class SharedLink {
slug = dto.slug,
type = dto.type == SharedLinkType.ALBUM ? SharedLinkSource.album : SharedLinkSource.individual,
title = dto.type == SharedLinkType.ALBUM
- ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
+ ? dto.album.orElse(null)?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
: "INDIVIDUAL SHARE",
thumbAssetId = dto.type == SharedLinkType.ALBUM
- ? dto.album?.albumThumbnailAssetId
+ ? dto.album.orElse(null)?.albumThumbnailAssetId
: dto.assets.isNotEmpty
? dto.assets[0].id
: null;
diff --git a/mobile/lib/providers/search/search_page_state.provider.dart b/mobile/lib/providers/search/search_page_state.provider.dart
index 23d5606922..c6a72c922e 100644
--- a/mobile/lib/providers/search/search_page_state.provider.dart
+++ b/mobile/lib/providers/search/search_page_state.provider.dart
@@ -29,7 +29,7 @@ final getAllPlacesProvider = FutureProvider.autoDispose<List<SearchCuratedConten
}
final curatedContent = assetPlaces
- .map((data) => SearchCuratedContent(label: data.exifInfo!.city!, id: data.id))
+ .map((data) => SearchCuratedContent(label: data.exifInfo.orElse(null)!.city.orElse(null)!, id: data.id))
.toList();
return curatedContent;
diff --git a/mobile/lib/repositories/activity_api.repository.dart b/mobile/lib/repositories/activity_api.repository.dart
index e8f9abc8c8..9ae83b0e7b 100644
--- a/mobile/lib/repositories/activity_api.repository.dart
+++ b/mobile/lib/repositories/activity_api.repository.dart
@@ -23,8 +23,8 @@ class ActivityApiRepository extends ApiRepository {
final dto = ActivityCreateDto(
albumId: albumId,
type: type == ActivityType.comment ? ReactionType.comment : ReactionType.like,
- assetId: assetId,
- comment: comment,
+ assetId: assetId == null ? const Optional.absent() : Optional.present(assetId),
+ comment: comment == null ? const Optional.absent() : Optional.present(comment),
);
final response = await checkNull(_api.createActivity(dto));
return _toActivity(response);
@@ -45,6 +45,6 @@ class ActivityApiRepository extends ApiRepository {
type: dto.type == ReactionType.comment ? ActivityType.comment : ActivityType.like,
user: UserConverter.fromSimpleUserDto(dto.user),
assetId: dto.assetId,
- comment: dto.comment,
+ comment: dto.comment.orElse(null),
);
}
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index fdb4e3323b..4a23ced504 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -24,7 +24,7 @@ class AssetApiRepository extends ApiRepository {
AssetApiRepository(this._api, this._stacksApi, this._trashApi);
Future<void> delete(List<String> ids, bool force) async {
- return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force));
+ return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: Optional.present(force)));
}
Future<void> restoreTrash(List<String> ids) async {
@@ -42,19 +42,27 @@ class AssetApiRepository extends ApiRepository {
}
Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
- return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: _mapVisibility(visibility)));
+ return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: Optional.present(_mapVisibility(visibility))));
}
Future<void> updateFavorite(List<String> ids, bool isFavorite) async {
- return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: isFavorite));
+ return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: Optional.present(isFavorite)));
}
Future<void> updateLocation(List<String> ids, LatLng location) async {
- return _api.updateAssets(AssetBulkUpdateDto(ids: ids, latitude: location.latitude, longitude: location.longitude));
+ return _api.updateAssets(
+ AssetBulkUpdateDto(
+ ids: ids,
+ latitude: Optional.present(location.latitude),
+ longitude: Optional.present(location.longitude),
+ ),
+ );
}
Future<void> updateDateTime(List<String> ids, DateTime dateTime) async {
- return _api.updateAssets(AssetBulkUpdateDto(ids: ids, dateTimeOriginal: dateTime.toIso8601String()));
+ return _api.updateAssets(
+ AssetBulkUpdateDto(ids: ids, dateTimeOriginal: Optional.present(dateTime.toIso8601String())),
+ );
}
Future<StackResponse> stack(List<String> ids) async {
@@ -82,15 +90,15 @@ class AssetApiRepository extends ApiRepository {
final response = await checkNull(_api.getAssetInfo(assetId));
// we need to get the MIME of the thumbnail once that gets added to the API
- return response.originalMimeType;
+ return response.originalMimeType.orElse(null);
}
Future<void> updateDescription(String assetId, String description) {
- return _api.updateAsset(assetId, UpdateAssetDto(description: description));
+ return _api.updateAsset(assetId, UpdateAssetDto(description: Optional.present(description)));
}
Future<void> updateRating(String assetId, int rating) {
- return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
+ return _api.updateAsset(assetId, UpdateAssetDto(rating: Optional.present(rating)));
}
Future<AssetEditsResponseDto?> editAsset(String assetId, List<AssetEdit> edits) {
diff --git a/mobile/lib/repositories/auth_api.repository.dart b/mobile/lib/repositories/auth_api.repository.dart
index 446aba68b3..05dc7f103a 100644
--- a/mobile/lib/repositories/auth_api.repository.dart
+++ b/mobile/lib/repositories/auth_api.repository.dart
@@ -13,7 +13,7 @@ class AuthApiRepository extends ApiRepository {
AuthApiRepository(this._apiService);
Future<void> changePassword(String newPassword) async {
- await _apiService.usersApi.updateMyUser(UserUpdateMeDto(password: newPassword));
+ await _apiService.usersApi.updateMyUser(UserUpdateMeDto(password: Optional.present(newPassword)));
}
Future<LoginResponse> login(String email, String password) async {
@@ -46,7 +46,7 @@ class AuthApiRepository extends ApiRepository {
Future<bool> unlockPinCode(String pinCode) async {
try {
- await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: pinCode));
+ await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: Optional.present(pinCode)));
return true;
} catch (_) {
return false;
diff --git a/mobile/lib/repositories/drift_album_api_repository.dart b/mobile/lib/repositories/drift_album_api_repository.dart
index a0c7a3732a..445f5763a2 100644
--- a/mobile/lib/repositories/drift_album_api_repository.dart
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -22,7 +22,13 @@ class DriftAlbumApiRepository extends ApiRepository {
String? description,
}) async {
final responseDto = await checkNull(
- _api.createAlbum(CreateAlbumDto(albumName: name, description: description, assetIds: assetIds.toList())),
+ _api.createAlbum(
+ CreateAlbumDto(
+ albumName: name,
+ description: description == null ? const Optional.absent() : Optional.present(description),
+ assetIds: Optional.present(assetIds.toList()),
+ ),
+ ),
);
return responseDto.toRemoteAlbum(owner);
@@ -73,11 +79,13 @@ class DriftAlbumApiRepository extends ApiRepository {
_api.updateAlbumInfo(
albumId,
UpdateAlbumDto(
- albumName: name,
- description: description,
- albumThumbnailAssetId: thumbnailAssetId,
- isActivityEnabled: isActivityEnabled,
- order: apiOrder,
+ albumName: name == null ? const Optional.absent() : Optional.present(name),
+ description: description == null ? const Optional.absent() : Optional.present(description),
+ albumThumbnailAssetId: thumbnailAssetId == null
+ ? const Optional.absent()
+ : Optional.present(thumbnailAssetId),
+ isActivityEnabled: isActivityEnabled == null ? const Optional.absent() : Optional.present(isActivityEnabled),
+ order: apiOrder == null ? const Optional.absent() : Optional.present(apiOrder),
),
),
);
@@ -99,7 +107,9 @@ class DriftAlbumApiRepository extends ApiRepository {
}
Future<bool> setActivityStatus(String albumId, bool isEnabled) async {
- final response = await checkNull(_api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: isEnabled)));
+ final response = await checkNull(
+ _api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: Optional.present(isEnabled))),
+ );
return response.isActivityEnabled;
}
}
@@ -116,7 +126,7 @@ extension on AlbumResponseDto {
updatedAt: updatedAt,
thumbnailAssetId: albumThumbnailAssetId,
isActivityEnabled: isActivityEnabled,
- order: order == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
+ order: order.orElse(null) == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
assetCount: assetCount,
isShared: albumUsers.length > 2,
);
diff --git a/mobile/lib/repositories/partner_api.repository.dart b/mobile/lib/repositories/partner_api.repository.dart
index 69b6740cbe..eaca839bfd 100644
--- a/mobile/lib/repositories/partner_api.repository.dart
+++ b/mobile/lib/repositories/partner_api.repository.dart
@@ -16,7 +16,7 @@ class PartnerApiRepository extends ApiRepository {
Future<List<UserDto>> getAll(Direction direction) async {
final response = await checkNull(
- _api.getPartners(direction == Direction.sharedByMe ? PartnerDirection.by : PartnerDirection.with_),
+ _api.getPartners(direction == Direction.sharedByMe ? PartnerDirection.sharedBy : PartnerDirection.sharedWith),
);
return response.map(UserConverter.fromPartnerDto).toList();
}
diff --git a/mobile/lib/repositories/person_api.repository.dart b/mobile/lib/repositories/person_api.repository.dart
index bbf55e674a..26662601b7 100644
--- a/mobile/lib/repositories/person_api.repository.dart
+++ b/mobile/lib/repositories/person_api.repository.dart
@@ -18,7 +18,10 @@ class PersonApiRepository extends ApiRepository {
Future<PersonDto> update(String id, {String? name, DateTime? birthday}) async {
final birthdayUtc = birthday == null ? null : DateTime.utc(birthday.year, birthday.month, birthday.day);
- final dto = PersonUpdateDto(name: name, birthDate: birthdayUtc);
+ final dto = PersonUpdateDto(
+ name: name == null ? const Optional.absent() : Optional.present(name),
+ birthDate: birthdayUtc == null ? const Optional.absent() : Optional.present(birthdayUtc),
+ );
final response = await checkNull(_api.updatePerson(id, dto));
return _toPerson(response);
}
diff --git a/mobile/lib/repositories/sessions_api.repository.dart b/mobile/lib/repositories/sessions_api.repository.dart
index f25e724f19..b2ed54c26c 100644
--- a/mobile/lib/repositories/sessions_api.repository.dart
+++ b/mobile/lib/repositories/sessions_api.repository.dart
@@ -15,7 +15,13 @@ class SessionsAPIRepository extends ApiRepository {
Future<SessionCreateResponse> createSession(String deviceType, String deviceOS, {int? duration}) async {
final dto = await checkNull(
- _api.createSession(SessionCreateDto(deviceType: deviceType, deviceOS: deviceOS, duration: duration)),
+ _api.createSession(
+ SessionCreateDto(
+ deviceType: Optional.present(deviceType),
+ deviceOS: Optional.present(deviceOS),
+ duration: duration == null ? const Optional.absent() : Optional.present(duration),
+ ),
+ ),
);
return SessionCreateResponse(
@@ -23,7 +29,7 @@ class SessionsAPIRepository extends ApiRepository {
current: dto.current,
deviceType: deviceType,
deviceOS: deviceOS,
- expiresAt: dto.expiresAt,
+ expiresAt: dto.expiresAt.orElse(null),
createdAt: dto.createdAt,
updatedAt: dto.updatedAt,
token: dto.token,
diff --git a/mobile/lib/routing/locked_guard.dart b/mobile/lib/routing/locked_guard.dart
index ddb6a7e694..38484538e0 100644
--- a/mobile/lib/routing/locked_guard.dart
+++ b/mobile/lib/routing/locked_guard.dart
@@ -55,7 +55,7 @@ class LockedGuard extends AutoRouteGuard {
return;
}
- await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: securePinCode));
+ await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: Optional.present(securePinCode)));
resolver.next(true);
} on PlatformException catch (error) {
diff --git a/mobile/lib/services/oauth.service.dart b/mobile/lib/services/oauth.service.dart
index 99ceca3229..d8b1604e00 100644
--- a/mobile/lib/services/oauth.service.dart
+++ b/mobile/lib/services/oauth.service.dart
@@ -18,7 +18,11 @@ class OAuthService {
log.info("Starting OAuth flow with redirect URI: $redirectUri");
final dto = await _apiService.oAuthApi.startOAuth(
- OAuthConfigDto(redirectUri: redirectUri, state: state, codeChallenge: codeChallenge),
+ OAuthConfigDto(
+ redirectUri: redirectUri,
+ state: Optional.present(state),
+ codeChallenge: Optional.present(codeChallenge),
+ ),
);
final authUrl = dto?.url;
@@ -37,7 +41,7 @@ class OAuthService {
}
return await _apiService.oAuthApi.finishOAuth(
- OAuthCallbackDto(url: result, state: state, codeVerifier: codeVerifier),
+ OAuthCallbackDto(url: result, state: Optional.present(state), codeVerifier: Optional.present(codeVerifier)),
);
}
}
diff --git a/mobile/lib/services/shared_link.service.dart b/mobile/lib/services/shared_link.service.dart
index 46e83f0fc4..009e922b38 100644
--- a/mobile/lib/services/shared_link.service.dart
+++ b/mobile/lib/services/shared_link.service.dart
@@ -48,26 +48,26 @@ class SharedLinkService {
if (type == SharedLinkType.ALBUM) {
dto = SharedLinkCreateDto(
type: type,
- albumId: albumId,
- showMetadata: showMeta,
- allowDownload: allowDownload,
- allowUpload: allowUpload,
- expiresAt: expiresAt,
- description: description,
- password: password,
- slug: slug,
+ albumId: albumId == null ? const Optional.absent() : Optional.present(albumId),
+ showMetadata: Optional.present(showMeta),
+ allowDownload: Optional.present(allowDownload),
+ allowUpload: Optional.present(allowUpload),
+ expiresAt: expiresAt == null ? const Optional.absent() : Optional.present(expiresAt),
+ description: description == null ? const Optional.absent() : Optional.present(description),
+ password: password == null ? const Optional.absent() : Optional.present(password),
+ slug: slug == null ? const Optional.absent() : Optional.present(slug),
);
} else if (assetIds != null) {
dto = SharedLinkCreateDto(
type: type,
- showMetadata: showMeta,
- allowDownload: allowDownload,
- allowUpload: allowUpload,
- expiresAt: expiresAt,
- description: description,
- password: password,
- slug: slug,
- assetIds: assetIds,
+ showMetadata: Optional.present(showMeta),
+ allowDownload: Optional.present(allowDownload),
+ allowUpload: Optional.present(allowUpload),
+ expiresAt: expiresAt == null ? const Optional.absent() : Optional.present(expiresAt),
+ description: description == null ? const Optional.absent() : Optional.present(description),
+ password: password == null ? const Optional.absent() : Optional.present(password),
+ slug: slug == null ? const Optional.absent() : Optional.present(slug),
+ assetIds: Optional.present(assetIds),
);
}
@@ -98,14 +98,14 @@ class SharedLinkService {
final responseDto = await _apiService.sharedLinksApi.updateSharedLink(
id,
SharedLinkEditDto(
- showMetadata: showMeta,
- allowDownload: allowDownload,
- allowUpload: allowUpload,
- expiresAt: expiresAt,
- description: description,
- password: password,
- slug: slug,
- changeExpiryTime: changeExpiry,
+ showMetadata: showMeta == null ? const Optional.absent() : Optional.present(showMeta),
+ allowDownload: allowDownload == null ? const Optional.absent() : Optional.present(allowDownload),
+ allowUpload: allowUpload == null ? const Optional.absent() : Optional.present(allowUpload),
+ expiresAt: expiresAt == null ? const Optional.absent() : Optional.present(expiresAt),
+ description: description == null ? const Optional.absent() : Optional.present(description),
+ password: password == null ? const Optional.absent() : Optional.present(password),
+ slug: slug == null ? const Optional.absent() : Optional.present(slug),
+ changeExpiryTime: changeExpiry == null ? const Optional.absent() : Optional.present(changeExpiry),
),
);
if (responseDto != null) {
diff --git a/mobile/openapi/.openapi-generator/VERSION b/mobile/openapi/.openapi-generator/VERSION
index 09a6d30847..696eaac5ce 100644
--- a/mobile/openapi/.openapi-generator/VERSION
+++ b/mobile/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-7.8.0
+7.22.0
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index e92b885904..af40910b4d 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -4,7 +4,7 @@ Immich API
This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
- API version: 3.0.0
-- Generator version: 7.8.0
+- Generator version: 7.22.0
- Build package: org.openapitools.codegen.languages.DartClientCodegen
## Requirements
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 3af18e5fe8..1dbe28cc0f 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -29,6 +29,7 @@ part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';
+part 'optional.dart';
part 'api/api_keys_api.dart';
part 'api/activities_api.dart';
diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dart
index 6cf11022c3..6c824d4a86 100644
--- a/mobile/openapi/lib/api_helper.dart
+++ b/mobile/openapi/lib/api_helper.dart
@@ -226,6 +226,9 @@ Future<String> _decodeBodyBytes(Response response) async {
/// Returns a valid [T] value found at the specified Map [key], null otherwise.
T? mapValueOfType<T>(dynamic map, String key) {
final dynamic value = map is Map ? map[key] : null;
+ if (T == double && value is int) {
+ return value.toDouble() as T;
+ }
return value is T ? value : null;
}
diff --git a/mobile/openapi/lib/model/activity_create_dto.dart b/mobile/openapi/lib/model/activity_create_dto.dart
index bc220e64ce..7dbea342c9 100644
--- a/mobile/openapi/lib/model/activity_create_dto.dart
+++ b/mobile/openapi/lib/model/activity_create_dto.dart
@@ -14,8 +14,8 @@ class ActivityCreateDto {
/// Returns a new [ActivityCreateDto] instance.
ActivityCreateDto({
required this.albumId,
- this.assetId,
- this.comment,
+ this.assetId = const Optional.absent(),
+ this.comment = const Optional.absent(),
required this.type,
});
@@ -29,7 +29,7 @@ class ActivityCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? assetId;
+ Optional<String?> assetId;
/// Comment text (required if type is comment)
///
@@ -38,7 +38,7 @@ class ActivityCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? comment;
+ Optional<String?> comment;
ReactionType type;
@@ -63,15 +63,13 @@ class ActivityCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'albumId'] = this.albumId;
- if (this.assetId != null) {
- json[r'assetId'] = this.assetId;
- } else {
- // json[r'assetId'] = null;
+ if (this.assetId.isPresent) {
+ final value = this.assetId.value;
+ json[r'assetId'] = value;
}
- if (this.comment != null) {
- json[r'comment'] = this.comment;
- } else {
- // json[r'comment'] = null;
+ if (this.comment.isPresent) {
+ final value = this.comment.value;
+ json[r'comment'] = value;
}
json[r'type'] = this.type;
return json;
@@ -87,8 +85,8 @@ class ActivityCreateDto {
return ActivityCreateDto(
albumId: mapValueOfType<String>(json, r'albumId')!,
- assetId: mapValueOfType<String>(json, r'assetId'),
- comment: mapValueOfType<String>(json, r'comment'),
+ assetId: json.containsKey(r'assetId') ? Optional.present(mapValueOfType<String>(json, r'assetId')) : const Optional.absent(),
+ comment: json.containsKey(r'comment') ? Optional.present(mapValueOfType<String>(json, r'comment')) : const Optional.absent(),
type: ReactionType.fromJson(json[r'type'])!,
);
}
diff --git a/mobile/openapi/lib/model/activity_response_dto.dart b/mobile/openapi/lib/model/activity_response_dto.dart
index 1b0e279ab7..8a8f807260 100644
--- a/mobile/openapi/lib/model/activity_response_dto.dart
+++ b/mobile/openapi/lib/model/activity_response_dto.dart
@@ -14,7 +14,7 @@ class ActivityResponseDto {
/// Returns a new [ActivityResponseDto] instance.
ActivityResponseDto({
required this.assetId,
- this.comment,
+ this.comment = const Optional.absent(),
required this.createdAt,
required this.id,
required this.type,
@@ -25,7 +25,7 @@ class ActivityResponseDto {
String? assetId;
/// Comment text (for comment activities)
- String? comment;
+ Optional<String?> comment;
/// Creation date
DateTime createdAt;
@@ -64,12 +64,11 @@ class ActivityResponseDto {
if (this.assetId != null) {
json[r'assetId'] = this.assetId;
} else {
- // json[r'assetId'] = null;
+ json[r'assetId'] = null;
}
- if (this.comment != null) {
- json[r'comment'] = this.comment;
- } else {
- // json[r'comment'] = null;
+ if (this.comment.isPresent) {
+ final value = this.comment.value;
+ json[r'comment'] = value;
}
json[r'createdAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.createdAt.millisecondsSinceEpoch
@@ -90,7 +89,7 @@ class ActivityResponseDto {
return ActivityResponseDto(
assetId: mapValueOfType<String>(json, r'assetId'),
- comment: mapValueOfType<String>(json, r'comment'),
+ comment: json.containsKey(r'comment') ? Optional.present(mapValueOfType<String>(json, r'comment')) : const Optional.absent(),
createdAt: mapDateTime(json, r'createdAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
id: mapValueOfType<String>(json, r'id')!,
type: ReactionType.fromJson(json[r'type'])!,
diff --git a/mobile/openapi/lib/model/album_response_dto.dart b/mobile/openapi/lib/model/album_response_dto.dart
index fd90f23e3a..a7e350fd53 100644
--- a/mobile/openapi/lib/model/album_response_dto.dart
+++ b/mobile/openapi/lib/model/album_response_dto.dart
@@ -17,17 +17,17 @@ class AlbumResponseDto {
required this.albumThumbnailAssetId,
this.albumUsers = const [],
required this.assetCount,
- this.contributorCounts = const [],
+ this.contributorCounts = const Optional.present(const []),
required this.createdAt,
required this.description,
- this.endDate,
+ this.endDate = const Optional.absent(),
required this.hasSharedLink,
required this.id,
required this.isActivityEnabled,
- this.lastModifiedAssetTimestamp,
- this.order,
+ this.lastModifiedAssetTimestamp = const Optional.absent(),
+ this.order = const Optional.absent(),
required this.shared,
- this.startDate,
+ this.startDate = const Optional.absent(),
required this.updatedAt,
});
@@ -46,7 +46,7 @@ class AlbumResponseDto {
/// Maximum value: 9007199254740991
int assetCount;
- List<ContributorCountResponseDto> contributorCounts;
+ Optional<List<ContributorCountResponseDto>?> contributorCounts;
/// Creation date
DateTime createdAt;
@@ -61,7 +61,7 @@ class AlbumResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? endDate;
+ Optional<DateTime?> endDate;
/// Has shared link
bool hasSharedLink;
@@ -79,7 +79,7 @@ class AlbumResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? lastModifiedAssetTimestamp;
+ Optional<DateTime?> lastModifiedAssetTimestamp;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -87,7 +87,7 @@ class AlbumResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetOrder? order;
+ Optional<AssetOrder?> order;
/// Is shared album
bool shared;
@@ -99,7 +99,7 @@ class AlbumResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? startDate;
+ Optional<DateTime?> startDate;
/// Last update date
DateTime updatedAt;
@@ -152,36 +152,35 @@ class AlbumResponseDto {
if (this.albumThumbnailAssetId != null) {
json[r'albumThumbnailAssetId'] = this.albumThumbnailAssetId;
} else {
- // json[r'albumThumbnailAssetId'] = null;
+ json[r'albumThumbnailAssetId'] = null;
}
json[r'albumUsers'] = this.albumUsers;
json[r'assetCount'] = this.assetCount;
- json[r'contributorCounts'] = this.contributorCounts;
+ if (this.contributorCounts.isPresent) {
+ final value = this.contributorCounts.value;
+ json[r'contributorCounts'] = value;
+ }
json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
json[r'description'] = this.description;
- if (this.endDate != null) {
- json[r'endDate'] = this.endDate!.toUtc().toIso8601String();
- } else {
- // json[r'endDate'] = null;
+ if (this.endDate.isPresent) {
+ final value = this.endDate.value;
+ json[r'endDate'] = value == null ? null : value.toUtc().toIso8601String();
}
json[r'hasSharedLink'] = this.hasSharedLink;
json[r'id'] = this.id;
json[r'isActivityEnabled'] = this.isActivityEnabled;
- if (this.lastModifiedAssetTimestamp != null) {
- json[r'lastModifiedAssetTimestamp'] = this.lastModifiedAssetTimestamp!.toUtc().toIso8601String();
- } else {
- // json[r'lastModifiedAssetTimestamp'] = null;
+ if (this.lastModifiedAssetTimestamp.isPresent) {
+ final value = this.lastModifiedAssetTimestamp.value;
+ json[r'lastModifiedAssetTimestamp'] = value == null ? null : value.toUtc().toIso8601String();
}
- if (this.order != null) {
- json[r'order'] = this.order;
- } else {
- // json[r'order'] = null;
+ if (this.order.isPresent) {
+ final value = this.order.value;
+ json[r'order'] = value;
}
json[r'shared'] = this.shared;
- if (this.startDate != null) {
- json[r'startDate'] = this.startDate!.toUtc().toIso8601String();
- } else {
- // json[r'startDate'] = null;
+ if (this.startDate.isPresent) {
+ final value = this.startDate.value;
+ json[r'startDate'] = value == null ? null : value.toUtc().toIso8601String();
}
json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
return json;
@@ -200,17 +199,17 @@ class AlbumResponseDto {
albumThumbnailAssetId: mapValueOfType<String>(json, r'albumThumbnailAssetId'),
albumUsers: AlbumUserResponseDto.listFromJson(json[r'albumUsers']),
assetCount: mapValueOfType<int>(json, r'assetCount')!,
- contributorCounts: ContributorCountResponseDto.listFromJson(json[r'contributorCounts']),
+ contributorCounts: json.containsKey(r'contributorCounts') ? Optional.present(ContributorCountResponseDto.listFromJson(json[r'contributorCounts'])) : const Optional.absent(),
createdAt: mapDateTime(json, r'createdAt', r'')!,
description: mapValueOfType<String>(json, r'description')!,
- endDate: mapDateTime(json, r'endDate', r''),
+ endDate: json.containsKey(r'endDate') ? Optional.present(mapDateTime(json, r'endDate', r'')) : const Optional.absent(),
hasSharedLink: mapValueOfType<bool>(json, r'hasSharedLink')!,
id: mapValueOfType<String>(json, r'id')!,
isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled')!,
- lastModifiedAssetTimestamp: mapDateTime(json, r'lastModifiedAssetTimestamp', r''),
- order: AssetOrder.fromJson(json[r'order']),
+ lastModifiedAssetTimestamp: json.containsKey(r'lastModifiedAssetTimestamp') ? Optional.present(mapDateTime(json, r'lastModifiedAssetTimestamp', r'')) : const Optional.absent(),
+ order: json.containsKey(r'order') ? Optional.present(AssetOrder.fromJson(json[r'order'])) : const Optional.absent(),
shared: mapValueOfType<bool>(json, r'shared')!,
- startDate: mapDateTime(json, r'startDate', r''),
+ startDate: json.containsKey(r'startDate') ? Optional.present(mapDateTime(json, r'startDate', r'')) : const Optional.absent(),
updatedAt: mapDateTime(json, r'updatedAt', r'')!,
);
}
diff --git a/mobile/openapi/lib/model/album_user_add_dto.dart b/mobile/openapi/lib/model/album_user_add_dto.dart
index ee457905bd..e47ffc421c 100644
--- a/mobile/openapi/lib/model/album_user_add_dto.dart
+++ b/mobile/openapi/lib/model/album_user_add_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class AlbumUserAddDto {
/// Returns a new [AlbumUserAddDto] instance.
AlbumUserAddDto({
- this.role,
+ this.role = const Optional.absent(),
required this.userId,
});
@@ -23,7 +23,7 @@ class AlbumUserAddDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AlbumUserRole? role;
+ Optional<AlbumUserRole?> role;
/// User ID
String userId;
@@ -44,10 +44,9 @@ class AlbumUserAddDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.role != null) {
- json[r'role'] = this.role;
- } else {
- // json[r'role'] = null;
+ if (this.role.isPresent) {
+ final value = this.role.value;
+ json[r'role'] = value;
}
json[r'userId'] = this.userId;
return json;
@@ -62,7 +61,7 @@ class AlbumUserAddDto {
final json = value.cast<String, dynamic>();
return AlbumUserAddDto(
- role: AlbumUserRole.fromJson(json[r'role']),
+ role: json.containsKey(r'role') ? Optional.present(AlbumUserRole.fromJson(json[r'role'])) : const Optional.absent(),
userId: mapValueOfType<String>(json, r'userId')!,
);
}
diff --git a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
index 99e679222e..943bd30bc5 100644
--- a/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
+++ b/mobile/openapi/lib/model/albums_add_assets_response_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class AlbumsAddAssetsResponseDto {
/// Returns a new [AlbumsAddAssetsResponseDto] instance.
AlbumsAddAssetsResponseDto({
- this.error,
+ this.error = const Optional.absent(),
required this.success,
});
@@ -23,7 +23,7 @@ class AlbumsAddAssetsResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- BulkIdErrorReason? error;
+ Optional<BulkIdErrorReason?> error;
/// Operation success
bool success;
@@ -44,10 +44,9 @@ class AlbumsAddAssetsResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.error != null) {
- json[r'error'] = this.error;
- } else {
- // json[r'error'] = null;
+ if (this.error.isPresent) {
+ final value = this.error.value;
+ json[r'error'] = value;
}
json[r'success'] = this.success;
return json;
@@ -62,7 +61,7 @@ class AlbumsAddAssetsResponseDto {
final json = value.cast<String, dynamic>();
return AlbumsAddAssetsResponseDto(
- error: BulkIdErrorReason.fromJson(json[r'error']),
+ error: json.containsKey(r'error') ? Optional.present(BulkIdErrorReason.fromJson(json[r'error'])) : const Optional.absent(),
success: mapValueOfType<bool>(json, r'success')!,
);
}
diff --git a/mobile/openapi/lib/model/albums_update.dart b/mobile/openapi/lib/model/albums_update.dart
index d61b5c1398..46bb3ef66d 100644
--- a/mobile/openapi/lib/model/albums_update.dart
+++ b/mobile/openapi/lib/model/albums_update.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class AlbumsUpdate {
/// Returns a new [AlbumsUpdate] instance.
AlbumsUpdate({
- this.defaultAssetOrder,
+ this.defaultAssetOrder = const Optional.absent(),
});
///
@@ -22,7 +22,7 @@ class AlbumsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetOrder? defaultAssetOrder;
+ Optional<AssetOrder?> defaultAssetOrder;
@override
bool operator ==(Object other) => identical(this, other) || other is AlbumsUpdate &&
@@ -38,10 +38,9 @@ class AlbumsUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.defaultAssetOrder != null) {
- json[r'defaultAssetOrder'] = this.defaultAssetOrder;
- } else {
- // json[r'defaultAssetOrder'] = null;
+ if (this.defaultAssetOrder.isPresent) {
+ final value = this.defaultAssetOrder.value;
+ json[r'defaultAssetOrder'] = value;
}
return json;
}
@@ -55,7 +54,7 @@ class AlbumsUpdate {
final json = value.cast<String, dynamic>();
return AlbumsUpdate(
- defaultAssetOrder: AssetOrder.fromJson(json[r'defaultAssetOrder']),
+ defaultAssetOrder: json.containsKey(r'defaultAssetOrder') ? Optional.present(AssetOrder.fromJson(json[r'defaultAssetOrder'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/api_key_create_dto.dart b/mobile/openapi/lib/model/api_key_create_dto.dart
index 6d3ffc1eb1..e1a50fecd5 100644
--- a/mobile/openapi/lib/model/api_key_create_dto.dart
+++ b/mobile/openapi/lib/model/api_key_create_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class ApiKeyCreateDto {
/// Returns a new [ApiKeyCreateDto] instance.
ApiKeyCreateDto({
- this.name,
+ this.name = const Optional.absent(),
this.permissions = const [],
});
@@ -24,7 +24,7 @@ class ApiKeyCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
/// List of permissions
List<Permission> permissions;
@@ -45,10 +45,9 @@ class ApiKeyCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
json[r'permissions'] = this.permissions;
return json;
@@ -63,7 +62,7 @@ class ApiKeyCreateDto {
final json = value.cast<String, dynamic>();
return ApiKeyCreateDto(
- name: mapValueOfType<String>(json, r'name'),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
permissions: Permission.listFromJson(json[r'permissions']),
);
}
diff --git a/mobile/openapi/lib/model/api_key_update_dto.dart b/mobile/openapi/lib/model/api_key_update_dto.dart
index c8df4be654..c6b0b5ed3c 100644
--- a/mobile/openapi/lib/model/api_key_update_dto.dart
+++ b/mobile/openapi/lib/model/api_key_update_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class ApiKeyUpdateDto {
/// Returns a new [ApiKeyUpdateDto] instance.
ApiKeyUpdateDto({
- this.name,
- this.permissions = const [],
+ this.name = const Optional.absent(),
+ this.permissions = const Optional.present(const []),
});
/// API key name
@@ -24,10 +24,10 @@ class ApiKeyUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
/// List of permissions
- List<Permission> permissions;
+ Optional<List<Permission>?> permissions;
@override
bool operator ==(Object other) => identical(this, other) || other is ApiKeyUpdateDto &&
@@ -45,12 +45,14 @@ class ApiKeyUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
+ }
+ if (this.permissions.isPresent) {
+ final value = this.permissions.value;
+ json[r'permissions'] = value;
}
- json[r'permissions'] = this.permissions;
return json;
}
@@ -63,8 +65,8 @@ class ApiKeyUpdateDto {
final json = value.cast<String, dynamic>();
return ApiKeyUpdateDto(
- name: mapValueOfType<String>(json, r'name'),
- permissions: Permission.listFromJson(json[r'permissions']),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
+ permissions: json.containsKey(r'permissions') ? Optional.present(Permission.listFromJson(json[r'permissions'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/asset_bulk_delete_dto.dart b/mobile/openapi/lib/model/asset_bulk_delete_dto.dart
index 055ef16015..bfe51e1779 100644
--- a/mobile/openapi/lib/model/asset_bulk_delete_dto.dart
+++ b/mobile/openapi/lib/model/asset_bulk_delete_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class AssetBulkDeleteDto {
/// Returns a new [AssetBulkDeleteDto] instance.
AssetBulkDeleteDto({
- this.force,
+ this.force = const Optional.absent(),
this.ids = const [],
});
@@ -24,7 +24,7 @@ class AssetBulkDeleteDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? force;
+ Optional<bool?> force;
/// IDs to process
List<String> ids;
@@ -45,10 +45,9 @@ class AssetBulkDeleteDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.force != null) {
- json[r'force'] = this.force;
- } else {
- // json[r'force'] = null;
+ if (this.force.isPresent) {
+ final value = this.force.value;
+ json[r'force'] = value;
}
json[r'ids'] = this.ids;
return json;
@@ -63,7 +62,7 @@ class AssetBulkDeleteDto {
final json = value.cast<String, dynamic>();
return AssetBulkDeleteDto(
- force: mapValueOfType<bool>(json, r'force'),
+ force: json.containsKey(r'force') ? Optional.present(mapValueOfType<bool>(json, r'force')) : const Optional.absent(),
ids: json[r'ids'] is Iterable
? (json[r'ids'] as Iterable).cast<String>().toList(growable: false)
: const [],
diff --git a/mobile/openapi/lib/model/asset_bulk_update_dto.dart b/mobile/openapi/lib/model/asset_bulk_update_dto.dart
index f85026f054..4ba1546c44 100644
--- a/mobile/openapi/lib/model/asset_bulk_update_dto.dart
+++ b/mobile/openapi/lib/model/asset_bulk_update_dto.dart
@@ -13,17 +13,17 @@ part of openapi.api;
class AssetBulkUpdateDto {
/// Returns a new [AssetBulkUpdateDto] instance.
AssetBulkUpdateDto({
- this.dateTimeOriginal,
- this.dateTimeRelative,
- this.description,
- this.duplicateId,
+ this.dateTimeOriginal = const Optional.absent(),
+ this.dateTimeRelative = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.duplicateId = const Optional.absent(),
this.ids = const [],
- this.isFavorite,
- this.latitude,
- this.longitude,
- this.rating,
- this.timeZone,
- this.visibility,
+ this.isFavorite = const Optional.absent(),
+ this.latitude = const Optional.absent(),
+ this.longitude = const Optional.absent(),
+ this.rating = const Optional.absent(),
+ this.timeZone = const Optional.absent(),
+ this.visibility = const Optional.absent(),
});
/// Original date and time
@@ -33,7 +33,7 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? dateTimeOriginal;
+ Optional<String?> dateTimeOriginal;
/// Relative time offset in seconds
///
@@ -45,7 +45,7 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? dateTimeRelative;
+ Optional<int?> dateTimeRelative;
/// Asset description
///
@@ -54,10 +54,10 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
/// Duplicate ID
- String? duplicateId;
+ Optional<String?> duplicateId;
/// Asset IDs to update
List<String> ids;
@@ -69,7 +69,7 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Latitude coordinate
///
@@ -81,7 +81,7 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- num? latitude;
+ Optional<num?> latitude;
/// Longitude coordinate
///
@@ -93,13 +93,13 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- num? longitude;
+ Optional<num?> longitude;
/// Rating in range [1-5], or null for unrated
///
/// Minimum value: -1
/// Maximum value: 5
- int? rating;
+ Optional<int?> rating;
/// Time zone (IANA timezone)
///
@@ -108,7 +108,7 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? timeZone;
+ Optional<String?> timeZone;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -116,7 +116,7 @@ class AssetBulkUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetVisibility? visibility;
+ Optional<AssetVisibility?> visibility;
@override
bool operator ==(Object other) => identical(this, other) || other is AssetBulkUpdateDto &&
@@ -152,56 +152,46 @@ class AssetBulkUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.dateTimeOriginal != null) {
- json[r'dateTimeOriginal'] = this.dateTimeOriginal;
- } else {
- // json[r'dateTimeOriginal'] = null;
+ if (this.dateTimeOriginal.isPresent) {
+ final value = this.dateTimeOriginal.value;
+ json[r'dateTimeOriginal'] = value;
}
- if (this.dateTimeRelative != null) {
- json[r'dateTimeRelative'] = this.dateTimeRelative;
- } else {
- // json[r'dateTimeRelative'] = null;
+ if (this.dateTimeRelative.isPresent) {
+ final value = this.dateTimeRelative.value;
+ json[r'dateTimeRelative'] = value;
}
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.duplicateId != null) {
- json[r'duplicateId'] = this.duplicateId;
- } else {
- // json[r'duplicateId'] = null;
+ if (this.duplicateId.isPresent) {
+ final value = this.duplicateId.value;
+ json[r'duplicateId'] = value;
}
json[r'ids'] = this.ids;
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
}
- if (this.latitude != null) {
- json[r'latitude'] = this.latitude;
- } else {
- // json[r'latitude'] = null;
+ if (this.latitude.isPresent) {
+ final value = this.latitude.value;
+ json[r'latitude'] = value;
}
- if (this.longitude != null) {
- json[r'longitude'] = this.longitude;
- } else {
- // json[r'longitude'] = null;
+ if (this.longitude.isPresent) {
+ final value = this.longitude.value;
+ json[r'longitude'] = value;
}
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
}
- if (this.timeZone != null) {
- json[r'timeZone'] = this.timeZone;
- } else {
- // json[r'timeZone'] = null;
+ if (this.timeZone.isPresent) {
+ final value = this.timeZone.value;
+ json[r'timeZone'] = value;
}
- if (this.visibility != null) {
- json[r'visibility'] = this.visibility;
- } else {
- // json[r'visibility'] = null;
+ if (this.visibility.isPresent) {
+ final value = this.visibility.value;
+ json[r'visibility'] = value;
}
return json;
}
@@ -215,19 +205,19 @@ class AssetBulkUpdateDto {
final json = value.cast<String, dynamic>();
return AssetBulkUpdateDto(
- dateTimeOriginal: mapValueOfType<String>(json, r'dateTimeOriginal'),
- dateTimeRelative: mapValueOfType<int>(json, r'dateTimeRelative'),
- description: mapValueOfType<String>(json, r'description'),
- duplicateId: mapValueOfType<String>(json, r'duplicateId'),
+ dateTimeOriginal: json.containsKey(r'dateTimeOriginal') ? Optional.present(mapValueOfType<String>(json, r'dateTimeOriginal')) : const Optional.absent(),
+ dateTimeRelative: json.containsKey(r'dateTimeRelative') ? Optional.present(json[r'dateTimeRelative'] == null ? null : int.parse('${json[r'dateTimeRelative']}')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ duplicateId: json.containsKey(r'duplicateId') ? Optional.present(mapValueOfType<String>(json, r'duplicateId')) : const Optional.absent(),
ids: json[r'ids'] is Iterable
? (json[r'ids'] as Iterable).cast<String>().toList(growable: false)
: const [],
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- latitude: num.parse('${json[r'latitude']}'),
- longitude: num.parse('${json[r'longitude']}'),
- rating: mapValueOfType<int>(json, r'rating'),
- timeZone: mapValueOfType<String>(json, r'timeZone'),
- visibility: AssetVisibility.fromJson(json[r'visibility']),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ latitude: json.containsKey(r'latitude') ? Optional.present(json[r'latitude'] == null ? null : num.parse('${json[r'latitude']}')) : const Optional.absent(),
+ longitude: json.containsKey(r'longitude') ? Optional.present(json[r'longitude'] == null ? null : num.parse('${json[r'longitude']}')) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ timeZone: json.containsKey(r'timeZone') ? Optional.present(mapValueOfType<String>(json, r'timeZone')) : const Optional.absent(),
+ visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/asset_bulk_upload_check_result.dart b/mobile/openapi/lib/model/asset_bulk_upload_check_result.dart
index bf3ee8e244..ed7508b18e 100644
--- a/mobile/openapi/lib/model/asset_bulk_upload_check_result.dart
+++ b/mobile/openapi/lib/model/asset_bulk_upload_check_result.dart
@@ -14,10 +14,10 @@ class AssetBulkUploadCheckResult {
/// Returns a new [AssetBulkUploadCheckResult] instance.
AssetBulkUploadCheckResult({
required this.action,
- this.assetId,
+ this.assetId = const Optional.absent(),
required this.id,
- this.isTrashed,
- this.reason,
+ this.isTrashed = const Optional.absent(),
+ this.reason = const Optional.absent(),
});
AssetUploadAction action;
@@ -29,7 +29,7 @@ class AssetBulkUploadCheckResult {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? assetId;
+ Optional<String?> assetId;
/// Asset ID
String id;
@@ -41,7 +41,7 @@ class AssetBulkUploadCheckResult {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isTrashed;
+ Optional<bool?> isTrashed;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -49,7 +49,7 @@ class AssetBulkUploadCheckResult {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetRejectReason? reason;
+ Optional<AssetRejectReason?> reason;
@override
bool operator ==(Object other) => identical(this, other) || other is AssetBulkUploadCheckResult &&
@@ -74,21 +74,18 @@ class AssetBulkUploadCheckResult {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'action'] = this.action;
- if (this.assetId != null) {
- json[r'assetId'] = this.assetId;
- } else {
- // json[r'assetId'] = null;
+ if (this.assetId.isPresent) {
+ final value = this.assetId.value;
+ json[r'assetId'] = value;
}
json[r'id'] = this.id;
- if (this.isTrashed != null) {
- json[r'isTrashed'] = this.isTrashed;
- } else {
- // json[r'isTrashed'] = null;
+ if (this.isTrashed.isPresent) {
+ final value = this.isTrashed.value;
+ json[r'isTrashed'] = value;
}
- if (this.reason != null) {
- json[r'reason'] = this.reason;
- } else {
- // json[r'reason'] = null;
+ if (this.reason.isPresent) {
+ final value = this.reason.value;
+ json[r'reason'] = value;
}
return json;
}
@@ -103,10 +100,10 @@ class AssetBulkUploadCheckResult {
return AssetBulkUploadCheckResult(
action: AssetUploadAction.fromJson(json[r'action'])!,
- assetId: mapValueOfType<String>(json, r'assetId'),
+ assetId: json.containsKey(r'assetId') ? Optional.present(mapValueOfType<String>(json, r'assetId')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
- isTrashed: mapValueOfType<bool>(json, r'isTrashed'),
- reason: AssetRejectReason.fromJson(json[r'reason']),
+ isTrashed: json.containsKey(r'isTrashed') ? Optional.present(mapValueOfType<bool>(json, r'isTrashed')) : const Optional.absent(),
+ reason: json.containsKey(r'reason') ? Optional.present(AssetRejectReason.fromJson(json[r'reason'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/asset_copy_dto.dart b/mobile/openapi/lib/model/asset_copy_dto.dart
index 2e68c5c113..577ba9ffa6 100644
--- a/mobile/openapi/lib/model/asset_copy_dto.dart
+++ b/mobile/openapi/lib/model/asset_copy_dto.dart
@@ -13,32 +13,32 @@ part of openapi.api;
class AssetCopyDto {
/// Returns a new [AssetCopyDto] instance.
AssetCopyDto({
- this.albums = true,
- this.favorite = true,
- this.sharedLinks = true,
- this.sidecar = true,
+ this.albums = const Optional.present(true),
+ this.favorite = const Optional.present(true),
+ this.sharedLinks = const Optional.present(true),
+ this.sidecar = const Optional.present(true),
required this.sourceId,
- this.stack = true,
+ this.stack = const Optional.present(true),
required this.targetId,
});
/// Copy album associations
- bool albums;
+ Optional<bool?> albums;
/// Copy favorite status
- bool favorite;
+ Optional<bool?> favorite;
/// Copy shared links
- bool sharedLinks;
+ Optional<bool?> sharedLinks;
/// Copy sidecar file
- bool sidecar;
+ Optional<bool?> sidecar;
/// Source asset ID
String sourceId;
/// Copy stack association
- bool stack;
+ Optional<bool?> stack;
/// Target asset ID
String targetId;
@@ -69,12 +69,27 @@ class AssetCopyDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'albums'] = this.albums;
- json[r'favorite'] = this.favorite;
- json[r'sharedLinks'] = this.sharedLinks;
- json[r'sidecar'] = this.sidecar;
+ if (this.albums.isPresent) {
+ final value = this.albums.value;
+ json[r'albums'] = value;
+ }
+ if (this.favorite.isPresent) {
+ final value = this.favorite.value;
+ json[r'favorite'] = value;
+ }
+ if (this.sharedLinks.isPresent) {
+ final value = this.sharedLinks.value;
+ json[r'sharedLinks'] = value;
+ }
+ if (this.sidecar.isPresent) {
+ final value = this.sidecar.value;
+ json[r'sidecar'] = value;
+ }
json[r'sourceId'] = this.sourceId;
- json[r'stack'] = this.stack;
+ if (this.stack.isPresent) {
+ final value = this.stack.value;
+ json[r'stack'] = value;
+ }
json[r'targetId'] = this.targetId;
return json;
}
@@ -88,12 +103,12 @@ class AssetCopyDto {
final json = value.cast<String, dynamic>();
return AssetCopyDto(
- albums: mapValueOfType<bool>(json, r'albums') ?? true,
- favorite: mapValueOfType<bool>(json, r'favorite') ?? true,
- sharedLinks: mapValueOfType<bool>(json, r'sharedLinks') ?? true,
- sidecar: mapValueOfType<bool>(json, r'sidecar') ?? true,
+ albums: json.containsKey(r'albums') ? Optional.present(mapValueOfType<bool>(json, r'albums')) : const Optional.absent(),
+ favorite: json.containsKey(r'favorite') ? Optional.present(mapValueOfType<bool>(json, r'favorite')) : const Optional.absent(),
+ sharedLinks: json.containsKey(r'sharedLinks') ? Optional.present(mapValueOfType<bool>(json, r'sharedLinks')) : const Optional.absent(),
+ sidecar: json.containsKey(r'sidecar') ? Optional.present(mapValueOfType<bool>(json, r'sidecar')) : const Optional.absent(),
sourceId: mapValueOfType<String>(json, r'sourceId')!,
- stack: mapValueOfType<bool>(json, r'stack') ?? true,
+ stack: json.containsKey(r'stack') ? Optional.present(mapValueOfType<bool>(json, r'stack')) : const Optional.absent(),
targetId: mapValueOfType<String>(json, r'targetId')!,
);
}
diff --git a/mobile/openapi/lib/model/asset_face_response_dto.dart b/mobile/openapi/lib/model/asset_face_response_dto.dart
index 21b86dfe4e..aa7b8b65f0 100644
--- a/mobile/openapi/lib/model/asset_face_response_dto.dart
+++ b/mobile/openapi/lib/model/asset_face_response_dto.dart
@@ -21,7 +21,7 @@ class AssetFaceResponseDto {
required this.imageHeight,
required this.imageWidth,
required this.person,
- this.sourceType,
+ this.sourceType = const Optional.absent(),
});
/// Bounding box X1 coordinate
@@ -71,7 +71,7 @@ class AssetFaceResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- SourceType? sourceType;
+ Optional<SourceType?> sourceType;
@override
bool operator ==(Object other) => identical(this, other) || other is AssetFaceResponseDto &&
@@ -113,12 +113,11 @@ class AssetFaceResponseDto {
if (this.person != null) {
json[r'person'] = this.person;
} else {
- // json[r'person'] = null;
+ json[r'person'] = null;
}
- if (this.sourceType != null) {
- json[r'sourceType'] = this.sourceType;
- } else {
- // json[r'sourceType'] = null;
+ if (this.sourceType.isPresent) {
+ final value = this.sourceType.value;
+ json[r'sourceType'] = value;
}
return json;
}
@@ -140,7 +139,7 @@ class AssetFaceResponseDto {
imageHeight: mapValueOfType<int>(json, r'imageHeight')!,
imageWidth: mapValueOfType<int>(json, r'imageWidth')!,
person: PersonResponseDto.fromJson(json[r'person']),
- sourceType: SourceType.fromJson(json[r'sourceType']),
+ sourceType: json.containsKey(r'sourceType') ? Optional.present(SourceType.fromJson(json[r'sourceType'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/asset_ids_response_dto.dart b/mobile/openapi/lib/model/asset_ids_response_dto.dart
index cafe1b21b9..6d8076952e 100644
--- a/mobile/openapi/lib/model/asset_ids_response_dto.dart
+++ b/mobile/openapi/lib/model/asset_ids_response_dto.dart
@@ -14,7 +14,7 @@ class AssetIdsResponseDto {
/// Returns a new [AssetIdsResponseDto] instance.
AssetIdsResponseDto({
required this.assetId,
- this.error,
+ this.error = const Optional.absent(),
required this.success,
});
@@ -27,7 +27,7 @@ class AssetIdsResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetIdErrorReason? error;
+ Optional<AssetIdErrorReason?> error;
/// Whether operation succeeded
bool success;
@@ -51,10 +51,9 @@ class AssetIdsResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'assetId'] = this.assetId;
- if (this.error != null) {
- json[r'error'] = this.error;
- } else {
- // json[r'error'] = null;
+ if (this.error.isPresent) {
+ final value = this.error.value;
+ json[r'error'] = value;
}
json[r'success'] = this.success;
return json;
@@ -70,7 +69,7 @@ class AssetIdsResponseDto {
return AssetIdsResponseDto(
assetId: mapValueOfType<String>(json, r'assetId')!,
- error: AssetIdErrorReason.fromJson(json[r'error']),
+ error: json.containsKey(r'error') ? Optional.present(AssetIdErrorReason.fromJson(json[r'error'])) : const Optional.absent(),
success: mapValueOfType<bool>(json, r'success')!,
);
}
diff --git a/mobile/openapi/lib/model/asset_ocr_response_dto.dart b/mobile/openapi/lib/model/asset_ocr_response_dto.dart
index c7937c6eb2..23c51f054c 100644
--- a/mobile/openapi/lib/model/asset_ocr_response_dto.dart
+++ b/mobile/openapi/lib/model/asset_ocr_response_dto.dart
@@ -129,18 +129,18 @@ class AssetOcrResponseDto {
return AssetOcrResponseDto(
assetId: mapValueOfType<String>(json, r'assetId')!,
- boxScore: (mapValueOfType<num>(json, r'boxScore')!).toDouble(),
+ boxScore: mapValueOfType<double>(json, r'boxScore')!,
id: mapValueOfType<String>(json, r'id')!,
text: mapValueOfType<String>(json, r'text')!,
- textScore: (mapValueOfType<num>(json, r'textScore')!).toDouble(),
- x1: (mapValueOfType<num>(json, r'x1')!).toDouble(),
- x2: (mapValueOfType<num>(json, r'x2')!).toDouble(),
- x3: (mapValueOfType<num>(json, r'x3')!).toDouble(),
- x4: (mapValueOfType<num>(json, r'x4')!).toDouble(),
- y1: (mapValueOfType<num>(json, r'y1')!).toDouble(),
- y2: (mapValueOfType<num>(json, r'y2')!).toDouble(),
- y3: (mapValueOfType<num>(json, r'y3')!).toDouble(),
- y4: (mapValueOfType<num>(json, r'y4')!).toDouble(),
+ textScore: mapValueOfType<double>(json, r'textScore')!,
+ x1: mapValueOfType<double>(json, r'x1')!,
+ x2: mapValueOfType<double>(json, r'x2')!,
+ x3: mapValueOfType<double>(json, r'x3')!,
+ x4: mapValueOfType<double>(json, r'x4')!,
+ y1: mapValueOfType<double>(json, r'y1')!,
+ y2: mapValueOfType<double>(json, r'y2')!,
+ y3: mapValueOfType<double>(json, r'y3')!,
+ y4: mapValueOfType<double>(json, r'y4')!,
);
}
return null;
diff --git a/mobile/openapi/lib/model/asset_response_dto.dart b/mobile/openapi/lib/model/asset_response_dto.dart
index eca87789ce..3c09de3f15 100644
--- a/mobile/openapi/lib/model/asset_response_dto.dart
+++ b/mobile/openapi/lib/model/asset_response_dto.dart
@@ -15,9 +15,9 @@ class AssetResponseDto {
AssetResponseDto({
required this.checksum,
required this.createdAt,
- this.duplicateId,
+ this.duplicateId = const Optional.absent(),
required this.duration,
- this.exifInfo,
+ this.exifInfo = const Optional.absent(),
required this.fileCreatedAt,
required this.fileModifiedAt,
required this.hasMetadata,
@@ -28,18 +28,18 @@ class AssetResponseDto {
required this.isFavorite,
required this.isOffline,
required this.isTrashed,
- this.libraryId,
- this.livePhotoVideoId,
+ this.libraryId = const Optional.absent(),
+ this.livePhotoVideoId = const Optional.absent(),
required this.localDateTime,
required this.originalFileName,
- this.originalMimeType,
+ this.originalMimeType = const Optional.absent(),
required this.originalPath,
- this.owner,
+ this.owner = const Optional.absent(),
required this.ownerId,
- this.people = const [],
- this.resized,
- this.stack,
- this.tags = const [],
+ this.people = const Optional.present(const []),
+ this.resized = const Optional.absent(),
+ this.stack = const Optional.absent(),
+ this.tags = const Optional.present(const []),
required this.thumbhash,
required this.type,
required this.updatedAt,
@@ -54,7 +54,7 @@ class AssetResponseDto {
DateTime createdAt;
/// Duplicate group ID
- String? duplicateId;
+ Optional<String?> duplicateId;
/// Video/gif duration in milliseconds (null for static images)
///
@@ -68,7 +68,7 @@ class AssetResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- ExifResponseDto? exifInfo;
+ Optional<ExifResponseDto?> exifInfo;
/// The actual UTC timestamp when the file was created/captured, preserving timezone information. This is the authoritative timestamp for chronological sorting within timeline groups. Combined with timezone data, this can be used to determine the exact moment the photo was taken.
DateTime fileCreatedAt;
@@ -104,10 +104,10 @@ class AssetResponseDto {
bool isTrashed;
/// Library ID
- String? libraryId;
+ Optional<String?> libraryId;
/// Live photo video ID
- String? livePhotoVideoId;
+ Optional<String?> livePhotoVideoId;
/// The local date and time when the photo/video was taken, derived from EXIF metadata. This represents the photographer's local time regardless of timezone, stored as a timezone-agnostic timestamp. Used for timeline grouping by \"local\" days and months.
DateTime localDateTime;
@@ -122,7 +122,7 @@ class AssetResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? originalMimeType;
+ Optional<String?> originalMimeType;
/// Original file path
String originalPath;
@@ -133,12 +133,12 @@ class AssetResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- UserResponseDto? owner;
+ Optional<UserResponseDto?> owner;
/// Owner user ID
String ownerId;
- List<PersonResponseDto> people;
+ Optional<List<PersonResponseDto>?> people;
/// Is resized
///
@@ -147,11 +147,11 @@ class AssetResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? resized;
+ Optional<bool?> resized;
- AssetStackResponseDto? stack;
+ Optional<AssetStackResponseDto?> stack;
- List<TagResponseDto> tags;
+ Optional<List<TagResponseDto>?> tags;
/// Thumbhash for thumbnail generation (base64) also used as the c query param for thumbnail cache busting.
String? thumbhash;
@@ -247,20 +247,18 @@ class AssetResponseDto {
final json = <String, dynamic>{};
json[r'checksum'] = this.checksum;
json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
- if (this.duplicateId != null) {
- json[r'duplicateId'] = this.duplicateId;
- } else {
- // json[r'duplicateId'] = null;
+ if (this.duplicateId.isPresent) {
+ final value = this.duplicateId.value;
+ json[r'duplicateId'] = value;
}
if (this.duration != null) {
json[r'duration'] = this.duration;
} else {
- // json[r'duration'] = null;
+ json[r'duration'] = null;
}
- if (this.exifInfo != null) {
- json[r'exifInfo'] = this.exifInfo;
- } else {
- // json[r'exifInfo'] = null;
+ if (this.exifInfo.isPresent) {
+ final value = this.exifInfo.value;
+ json[r'exifInfo'] = value;
}
json[r'fileCreatedAt'] = this.fileCreatedAt.toUtc().toIso8601String();
json[r'fileModifiedAt'] = this.fileModifiedAt.toUtc().toIso8601String();
@@ -268,7 +266,7 @@ class AssetResponseDto {
if (this.height != null) {
json[r'height'] = this.height;
} else {
- // json[r'height'] = null;
+ json[r'height'] = null;
}
json[r'id'] = this.id;
json[r'isArchived'] = this.isArchived;
@@ -276,46 +274,46 @@ class AssetResponseDto {
json[r'isFavorite'] = this.isFavorite;
json[r'isOffline'] = this.isOffline;
json[r'isTrashed'] = this.isTrashed;
- if (this.libraryId != null) {
- json[r'libraryId'] = this.libraryId;
- } else {
- // json[r'libraryId'] = null;
+ if (this.libraryId.isPresent) {
+ final value = this.libraryId.value;
+ json[r'libraryId'] = value;
}
- if (this.livePhotoVideoId != null) {
- json[r'livePhotoVideoId'] = this.livePhotoVideoId;
- } else {
- // json[r'livePhotoVideoId'] = null;
+ if (this.livePhotoVideoId.isPresent) {
+ final value = this.livePhotoVideoId.value;
+ json[r'livePhotoVideoId'] = value;
}
json[r'localDateTime'] = this.localDateTime.toUtc().toIso8601String();
json[r'originalFileName'] = this.originalFileName;
- if (this.originalMimeType != null) {
- json[r'originalMimeType'] = this.originalMimeType;
- } else {
- // json[r'originalMimeType'] = null;
+ if (this.originalMimeType.isPresent) {
+ final value = this.originalMimeType.value;
+ json[r'originalMimeType'] = value;
}
json[r'originalPath'] = this.originalPath;
- if (this.owner != null) {
- json[r'owner'] = this.owner;
- } else {
- // json[r'owner'] = null;
+ if (this.owner.isPresent) {
+ final value = this.owner.value;
+ json[r'owner'] = value;
}
json[r'ownerId'] = this.ownerId;
- json[r'people'] = this.people;
- if (this.resized != null) {
- json[r'resized'] = this.resized;
- } else {
- // json[r'resized'] = null;
+ if (this.people.isPresent) {
+ final value = this.people.value;
+ json[r'people'] = value;
}
- if (this.stack != null) {
- json[r'stack'] = this.stack;
- } else {
- // json[r'stack'] = null;
+ if (this.resized.isPresent) {
+ final value = this.resized.value;
+ json[r'resized'] = value;
+ }
+ if (this.stack.isPresent) {
+ final value = this.stack.value;
+ json[r'stack'] = value;
+ }
+ if (this.tags.isPresent) {
+ final value = this.tags.value;
+ json[r'tags'] = value;
}
- json[r'tags'] = this.tags;
if (this.thumbhash != null) {
json[r'thumbhash'] = this.thumbhash;
} else {
- // json[r'thumbhash'] = null;
+ json[r'thumbhash'] = null;
}
json[r'type'] = this.type;
json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
@@ -323,7 +321,7 @@ class AssetResponseDto {
if (this.width != null) {
json[r'width'] = this.width;
} else {
- // json[r'width'] = null;
+ json[r'width'] = null;
}
return json;
}
@@ -339,9 +337,9 @@ class AssetResponseDto {
return AssetResponseDto(
checksum: mapValueOfType<String>(json, r'checksum')!,
createdAt: mapDateTime(json, r'createdAt', r'')!,
- duplicateId: mapValueOfType<String>(json, r'duplicateId'),
+ duplicateId: json.containsKey(r'duplicateId') ? Optional.present(mapValueOfType<String>(json, r'duplicateId')) : const Optional.absent(),
duration: mapValueOfType<int>(json, r'duration'),
- exifInfo: ExifResponseDto.fromJson(json[r'exifInfo']),
+ exifInfo: json.containsKey(r'exifInfo') ? Optional.present(ExifResponseDto.fromJson(json[r'exifInfo'])) : const Optional.absent(),
fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r'')!,
fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r'')!,
hasMetadata: mapValueOfType<bool>(json, r'hasMetadata')!,
@@ -352,18 +350,18 @@ class AssetResponseDto {
isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
isOffline: mapValueOfType<bool>(json, r'isOffline')!,
isTrashed: mapValueOfType<bool>(json, r'isTrashed')!,
- libraryId: mapValueOfType<String>(json, r'libraryId'),
- livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
+ libraryId: json.containsKey(r'libraryId') ? Optional.present(mapValueOfType<String>(json, r'libraryId')) : const Optional.absent(),
+ livePhotoVideoId: json.containsKey(r'livePhotoVideoId') ? Optional.present(mapValueOfType<String>(json, r'livePhotoVideoId')) : const Optional.absent(),
localDateTime: mapDateTime(json, r'localDateTime', r'')!,
originalFileName: mapValueOfType<String>(json, r'originalFileName')!,
- originalMimeType: mapValueOfType<String>(json, r'originalMimeType'),
+ originalMimeType: json.containsKey(r'originalMimeType') ? Optional.present(mapValueOfType<String>(json, r'originalMimeType')) : const Optional.absent(),
originalPath: mapValueOfType<String>(json, r'originalPath')!,
- owner: UserResponseDto.fromJson(json[r'owner']),
+ owner: json.containsKey(r'owner') ? Optional.present(UserResponseDto.fromJson(json[r'owner'])) : const Optional.absent(),
ownerId: mapValueOfType<String>(json, r'ownerId')!,
- people: PersonResponseDto.listFromJson(json[r'people']),
- resized: mapValueOfType<bool>(json, r'resized'),
- stack: AssetStackResponseDto.fromJson(json[r'stack']),
- tags: TagResponseDto.listFromJson(json[r'tags']),
+ people: json.containsKey(r'people') ? Optional.present(PersonResponseDto.listFromJson(json[r'people'])) : const Optional.absent(),
+ resized: json.containsKey(r'resized') ? Optional.present(mapValueOfType<bool>(json, r'resized')) : const Optional.absent(),
+ stack: json.containsKey(r'stack') ? Optional.present(AssetStackResponseDto.fromJson(json[r'stack'])) : const Optional.absent(),
+ tags: json.containsKey(r'tags') ? Optional.present(TagResponseDto.listFromJson(json[r'tags'])) : const Optional.absent(),
thumbhash: mapValueOfType<String>(json, r'thumbhash'),
type: AssetTypeEnum.fromJson(json[r'type'])!,
updatedAt: mapDateTime(json, r'updatedAt', r'')!,
diff --git a/mobile/openapi/lib/model/auth_status_response_dto.dart b/mobile/openapi/lib/model/auth_status_response_dto.dart
index 23b9d40525..f0dc61215e 100644
--- a/mobile/openapi/lib/model/auth_status_response_dto.dart
+++ b/mobile/openapi/lib/model/auth_status_response_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class AuthStatusResponseDto {
/// Returns a new [AuthStatusResponseDto] instance.
AuthStatusResponseDto({
- this.expiresAt,
+ this.expiresAt = const Optional.absent(),
required this.isElevated,
required this.password,
required this.pinCode,
- this.pinExpiresAt,
+ this.pinExpiresAt = const Optional.absent(),
});
/// Session expiration date
@@ -27,7 +27,7 @@ class AuthStatusResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? expiresAt;
+ Optional<String?> expiresAt;
/// Is elevated session
bool isElevated;
@@ -45,7 +45,7 @@ class AuthStatusResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? pinExpiresAt;
+ Optional<String?> pinExpiresAt;
@override
bool operator ==(Object other) => identical(this, other) || other is AuthStatusResponseDto &&
@@ -69,18 +69,16 @@ class AuthStatusResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.expiresAt != null) {
- json[r'expiresAt'] = this.expiresAt;
- } else {
- // json[r'expiresAt'] = null;
+ if (this.expiresAt.isPresent) {
+ final value = this.expiresAt.value;
+ json[r'expiresAt'] = value;
}
json[r'isElevated'] = this.isElevated;
json[r'password'] = this.password;
json[r'pinCode'] = this.pinCode;
- if (this.pinExpiresAt != null) {
- json[r'pinExpiresAt'] = this.pinExpiresAt;
- } else {
- // json[r'pinExpiresAt'] = null;
+ if (this.pinExpiresAt.isPresent) {
+ final value = this.pinExpiresAt.value;
+ json[r'pinExpiresAt'] = value;
}
return json;
}
@@ -94,11 +92,11 @@ class AuthStatusResponseDto {
final json = value.cast<String, dynamic>();
return AuthStatusResponseDto(
- expiresAt: mapValueOfType<String>(json, r'expiresAt'),
+ expiresAt: json.containsKey(r'expiresAt') ? Optional.present(mapValueOfType<String>(json, r'expiresAt')) : const Optional.absent(),
isElevated: mapValueOfType<bool>(json, r'isElevated')!,
password: mapValueOfType<bool>(json, r'password')!,
pinCode: mapValueOfType<bool>(json, r'pinCode')!,
- pinExpiresAt: mapValueOfType<String>(json, r'pinExpiresAt'),
+ pinExpiresAt: json.containsKey(r'pinExpiresAt') ? Optional.present(mapValueOfType<String>(json, r'pinExpiresAt')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/avatar_update.dart b/mobile/openapi/lib/model/avatar_update.dart
index 875eb138a8..1075f0df46 100644
--- a/mobile/openapi/lib/model/avatar_update.dart
+++ b/mobile/openapi/lib/model/avatar_update.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class AvatarUpdate {
/// Returns a new [AvatarUpdate] instance.
AvatarUpdate({
- this.color,
+ this.color = const Optional.absent(),
});
///
@@ -22,7 +22,7 @@ class AvatarUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- UserAvatarColor? color;
+ Optional<UserAvatarColor?> color;
@override
bool operator ==(Object other) => identical(this, other) || other is AvatarUpdate &&
@@ -38,10 +38,9 @@ class AvatarUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
return json;
}
@@ -55,7 +54,7 @@ class AvatarUpdate {
final json = value.cast<String, dynamic>();
return AvatarUpdate(
- color: UserAvatarColor.fromJson(json[r'color']),
+ color: json.containsKey(r'color') ? Optional.present(UserAvatarColor.fromJson(json[r'color'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/bulk_id_response_dto.dart b/mobile/openapi/lib/model/bulk_id_response_dto.dart
index bb3f1d8856..301400fa5e 100644
--- a/mobile/openapi/lib/model/bulk_id_response_dto.dart
+++ b/mobile/openapi/lib/model/bulk_id_response_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class BulkIdResponseDto {
/// Returns a new [BulkIdResponseDto] instance.
BulkIdResponseDto({
- this.error,
- this.errorMessage,
+ this.error = const Optional.absent(),
+ this.errorMessage = const Optional.absent(),
required this.id,
required this.success,
});
@@ -25,7 +25,7 @@ class BulkIdResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- BulkIdErrorReason? error;
+ Optional<BulkIdErrorReason?> error;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -33,7 +33,7 @@ class BulkIdResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? errorMessage;
+ Optional<String?> errorMessage;
/// ID
String id;
@@ -61,15 +61,13 @@ class BulkIdResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.error != null) {
- json[r'error'] = this.error;
- } else {
- // json[r'error'] = null;
+ if (this.error.isPresent) {
+ final value = this.error.value;
+ json[r'error'] = value;
}
- if (this.errorMessage != null) {
- json[r'errorMessage'] = this.errorMessage;
- } else {
- // json[r'errorMessage'] = null;
+ if (this.errorMessage.isPresent) {
+ final value = this.errorMessage.value;
+ json[r'errorMessage'] = value;
}
json[r'id'] = this.id;
json[r'success'] = this.success;
@@ -85,8 +83,8 @@ class BulkIdResponseDto {
final json = value.cast<String, dynamic>();
return BulkIdResponseDto(
- error: BulkIdErrorReason.fromJson(json[r'error']),
- errorMessage: mapValueOfType<String>(json, r'errorMessage'),
+ error: json.containsKey(r'error') ? Optional.present(BulkIdErrorReason.fromJson(json[r'error'])) : const Optional.absent(),
+ errorMessage: json.containsKey(r'errorMessage') ? Optional.present(mapValueOfType<String>(json, r'errorMessage')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
success: mapValueOfType<bool>(json, r'success')!,
);
diff --git a/mobile/openapi/lib/model/cast_update.dart b/mobile/openapi/lib/model/cast_update.dart
index 8dbf80f171..f9eb5be382 100644
--- a/mobile/openapi/lib/model/cast_update.dart
+++ b/mobile/openapi/lib/model/cast_update.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class CastUpdate {
/// Returns a new [CastUpdate] instance.
CastUpdate({
- this.gCastEnabled,
+ this.gCastEnabled = const Optional.absent(),
});
/// Whether Google Cast is enabled
@@ -23,7 +23,7 @@ class CastUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? gCastEnabled;
+ Optional<bool?> gCastEnabled;
@override
bool operator ==(Object other) => identical(this, other) || other is CastUpdate &&
@@ -39,10 +39,9 @@ class CastUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.gCastEnabled != null) {
- json[r'gCastEnabled'] = this.gCastEnabled;
- } else {
- // json[r'gCastEnabled'] = null;
+ if (this.gCastEnabled.isPresent) {
+ final value = this.gCastEnabled.value;
+ json[r'gCastEnabled'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class CastUpdate {
final json = value.cast<String, dynamic>();
return CastUpdate(
- gCastEnabled: mapValueOfType<bool>(json, r'gCastEnabled'),
+ gCastEnabled: json.containsKey(r'gCastEnabled') ? Optional.present(mapValueOfType<bool>(json, r'gCastEnabled')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/change_password_dto.dart b/mobile/openapi/lib/model/change_password_dto.dart
index 3dd6e437da..369e960dac 100644
--- a/mobile/openapi/lib/model/change_password_dto.dart
+++ b/mobile/openapi/lib/model/change_password_dto.dart
@@ -13,13 +13,13 @@ part of openapi.api;
class ChangePasswordDto {
/// Returns a new [ChangePasswordDto] instance.
ChangePasswordDto({
- this.invalidateSessions = false,
+ this.invalidateSessions = const Optional.present(false),
required this.newPassword,
required this.password,
});
/// Invalidate all other sessions
- bool invalidateSessions;
+ Optional<bool?> invalidateSessions;
/// New password (min 8 characters)
String newPassword;
@@ -45,7 +45,10 @@ class ChangePasswordDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'invalidateSessions'] = this.invalidateSessions;
+ if (this.invalidateSessions.isPresent) {
+ final value = this.invalidateSessions.value;
+ json[r'invalidateSessions'] = value;
+ }
json[r'newPassword'] = this.newPassword;
json[r'password'] = this.password;
return json;
@@ -60,7 +63,7 @@ class ChangePasswordDto {
final json = value.cast<String, dynamic>();
return ChangePasswordDto(
- invalidateSessions: mapValueOfType<bool>(json, r'invalidateSessions') ?? false,
+ invalidateSessions: json.containsKey(r'invalidateSessions') ? Optional.present(mapValueOfType<bool>(json, r'invalidateSessions')) : const Optional.absent(),
newPassword: mapValueOfType<String>(json, r'newPassword')!,
password: mapValueOfType<String>(json, r'password')!,
);
diff --git a/mobile/openapi/lib/model/create_album_dto.dart b/mobile/openapi/lib/model/create_album_dto.dart
index 183a41c772..a028146964 100644
--- a/mobile/openapi/lib/model/create_album_dto.dart
+++ b/mobile/openapi/lib/model/create_album_dto.dart
@@ -14,19 +14,19 @@ class CreateAlbumDto {
/// Returns a new [CreateAlbumDto] instance.
CreateAlbumDto({
required this.albumName,
- this.albumUsers = const [],
- this.assetIds = const [],
- this.description,
+ this.albumUsers = const Optional.present(const []),
+ this.assetIds = const Optional.present(const []),
+ this.description = const Optional.absent(),
});
/// Album name
String albumName;
/// Album users
- List<AlbumUserCreateDto> albumUsers;
+ Optional<List<AlbumUserCreateDto>?> albumUsers;
/// Initial asset IDs
- List<String> assetIds;
+ Optional<List<String>?> assetIds;
/// Album description
///
@@ -35,7 +35,7 @@ class CreateAlbumDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
@override
bool operator ==(Object other) => identical(this, other) || other is CreateAlbumDto &&
@@ -58,12 +58,17 @@ class CreateAlbumDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'albumName'] = this.albumName;
- json[r'albumUsers'] = this.albumUsers;
- json[r'assetIds'] = this.assetIds;
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.albumUsers.isPresent) {
+ final value = this.albumUsers.value;
+ json[r'albumUsers'] = value;
+ }
+ if (this.assetIds.isPresent) {
+ final value = this.assetIds.value;
+ json[r'assetIds'] = value;
+ }
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
return json;
}
@@ -78,11 +83,11 @@ class CreateAlbumDto {
return CreateAlbumDto(
albumName: mapValueOfType<String>(json, r'albumName')!,
- albumUsers: AlbumUserCreateDto.listFromJson(json[r'albumUsers']),
- assetIds: json[r'assetIds'] is Iterable
+ albumUsers: json.containsKey(r'albumUsers') ? Optional.present(AlbumUserCreateDto.listFromJson(json[r'albumUsers'])) : const Optional.absent(),
+ assetIds: json.containsKey(r'assetIds') ? Optional.present(json[r'assetIds'] is Iterable
? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- description: mapValueOfType<String>(json, r'description'),
+ : const []) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/create_library_dto.dart b/mobile/openapi/lib/model/create_library_dto.dart
index ba12c62d76..61eb9867b8 100644
--- a/mobile/openapi/lib/model/create_library_dto.dart
+++ b/mobile/openapi/lib/model/create_library_dto.dart
@@ -13,17 +13,17 @@ part of openapi.api;
class CreateLibraryDto {
/// Returns a new [CreateLibraryDto] instance.
CreateLibraryDto({
- this.exclusionPatterns = const [],
- this.importPaths = const [],
- this.name,
+ this.exclusionPatterns = const Optional.present(const []),
+ this.importPaths = const Optional.present(const []),
+ this.name = const Optional.absent(),
required this.ownerId,
});
/// Exclusion patterns (max 128)
- List<String> exclusionPatterns;
+ Optional<List<String>?> exclusionPatterns;
/// Import paths (max 128)
- List<String> importPaths;
+ Optional<List<String>?> importPaths;
/// Library name
///
@@ -32,7 +32,7 @@ class CreateLibraryDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
/// Owner user ID
String ownerId;
@@ -57,12 +57,17 @@ class CreateLibraryDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'exclusionPatterns'] = this.exclusionPatterns;
- json[r'importPaths'] = this.importPaths;
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.exclusionPatterns.isPresent) {
+ final value = this.exclusionPatterns.value;
+ json[r'exclusionPatterns'] = value;
+ }
+ if (this.importPaths.isPresent) {
+ final value = this.importPaths.value;
+ json[r'importPaths'] = value;
+ }
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
json[r'ownerId'] = this.ownerId;
return json;
@@ -77,13 +82,13 @@ class CreateLibraryDto {
final json = value.cast<String, dynamic>();
return CreateLibraryDto(
- exclusionPatterns: json[r'exclusionPatterns'] is Iterable
+ exclusionPatterns: json.containsKey(r'exclusionPatterns') ? Optional.present(json[r'exclusionPatterns'] is Iterable
? (json[r'exclusionPatterns'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- importPaths: json[r'importPaths'] is Iterable
+ : const []) : const Optional.absent(),
+ importPaths: json.containsKey(r'importPaths') ? Optional.present(json[r'importPaths'] is Iterable
? (json[r'importPaths'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- name: mapValueOfType<String>(json, r'name'),
+ : const []) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
ownerId: mapValueOfType<String>(json, r'ownerId')!,
);
}
diff --git a/mobile/openapi/lib/model/download_archive_dto.dart b/mobile/openapi/lib/model/download_archive_dto.dart
index 20e8527f18..f89ac8c867 100644
--- a/mobile/openapi/lib/model/download_archive_dto.dart
+++ b/mobile/openapi/lib/model/download_archive_dto.dart
@@ -14,7 +14,7 @@ class DownloadArchiveDto {
/// Returns a new [DownloadArchiveDto] instance.
DownloadArchiveDto({
this.assetIds = const [],
- this.edited,
+ this.edited = const Optional.absent(),
});
/// Asset IDs
@@ -27,7 +27,7 @@ class DownloadArchiveDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? edited;
+ Optional<bool?> edited;
@override
bool operator ==(Object other) => identical(this, other) || other is DownloadArchiveDto &&
@@ -46,10 +46,9 @@ class DownloadArchiveDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'assetIds'] = this.assetIds;
- if (this.edited != null) {
- json[r'edited'] = this.edited;
- } else {
- // json[r'edited'] = null;
+ if (this.edited.isPresent) {
+ final value = this.edited.value;
+ json[r'edited'] = value;
}
return json;
}
@@ -66,7 +65,7 @@ class DownloadArchiveDto {
assetIds: json[r'assetIds'] is Iterable
? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
: const [],
- edited: mapValueOfType<bool>(json, r'edited'),
+ edited: json.containsKey(r'edited') ? Optional.present(mapValueOfType<bool>(json, r'edited')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/download_info_dto.dart b/mobile/openapi/lib/model/download_info_dto.dart
index 8a0cebd945..47e09de05a 100644
--- a/mobile/openapi/lib/model/download_info_dto.dart
+++ b/mobile/openapi/lib/model/download_info_dto.dart
@@ -13,10 +13,10 @@ part of openapi.api;
class DownloadInfoDto {
/// Returns a new [DownloadInfoDto] instance.
DownloadInfoDto({
- this.albumId,
- this.archiveSize,
- this.assetIds = const [],
- this.userId,
+ this.albumId = const Optional.absent(),
+ this.archiveSize = const Optional.absent(),
+ this.assetIds = const Optional.present(const []),
+ this.userId = const Optional.absent(),
});
/// Album ID to download
@@ -26,7 +26,7 @@ class DownloadInfoDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? albumId;
+ Optional<String?> albumId;
/// Archive size limit in bytes
///
@@ -38,10 +38,10 @@ class DownloadInfoDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? archiveSize;
+ Optional<int?> archiveSize;
/// Asset IDs to download
- List<String> assetIds;
+ Optional<List<String>?> assetIds;
/// User ID to download assets from
///
@@ -50,7 +50,7 @@ class DownloadInfoDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? userId;
+ Optional<String?> userId;
@override
bool operator ==(Object other) => identical(this, other) || other is DownloadInfoDto &&
@@ -72,21 +72,21 @@ class DownloadInfoDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.albumId != null) {
- json[r'albumId'] = this.albumId;
- } else {
- // json[r'albumId'] = null;
+ if (this.albumId.isPresent) {
+ final value = this.albumId.value;
+ json[r'albumId'] = value;
}
- if (this.archiveSize != null) {
- json[r'archiveSize'] = this.archiveSize;
- } else {
- // json[r'archiveSize'] = null;
+ if (this.archiveSize.isPresent) {
+ final value = this.archiveSize.value;
+ json[r'archiveSize'] = value;
}
- json[r'assetIds'] = this.assetIds;
- if (this.userId != null) {
- json[r'userId'] = this.userId;
- } else {
- // json[r'userId'] = null;
+ if (this.assetIds.isPresent) {
+ final value = this.assetIds.value;
+ json[r'assetIds'] = value;
+ }
+ if (this.userId.isPresent) {
+ final value = this.userId.value;
+ json[r'userId'] = value;
}
return json;
}
@@ -100,12 +100,12 @@ class DownloadInfoDto {
final json = value.cast<String, dynamic>();
return DownloadInfoDto(
- albumId: mapValueOfType<String>(json, r'albumId'),
- archiveSize: mapValueOfType<int>(json, r'archiveSize'),
- assetIds: json[r'assetIds'] is Iterable
+ albumId: json.containsKey(r'albumId') ? Optional.present(mapValueOfType<String>(json, r'albumId')) : const Optional.absent(),
+ archiveSize: json.containsKey(r'archiveSize') ? Optional.present(json[r'archiveSize'] == null ? null : int.parse('${json[r'archiveSize']}')) : const Optional.absent(),
+ assetIds: json.containsKey(r'assetIds') ? Optional.present(json[r'assetIds'] is Iterable
? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- userId: mapValueOfType<String>(json, r'userId'),
+ : const []) : const Optional.absent(),
+ userId: json.containsKey(r'userId') ? Optional.present(mapValueOfType<String>(json, r'userId')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/download_update.dart b/mobile/openapi/lib/model/download_update.dart
index c5feb9df43..08369ef0fb 100644
--- a/mobile/openapi/lib/model/download_update.dart
+++ b/mobile/openapi/lib/model/download_update.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class DownloadUpdate {
/// Returns a new [DownloadUpdate] instance.
DownloadUpdate({
- this.archiveSize,
- this.includeEmbeddedVideos,
+ this.archiveSize = const Optional.absent(),
+ this.includeEmbeddedVideos = const Optional.absent(),
});
/// Maximum archive size in bytes
@@ -27,7 +27,7 @@ class DownloadUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? archiveSize;
+ Optional<int?> archiveSize;
/// Whether to include embedded videos in downloads
///
@@ -36,7 +36,7 @@ class DownloadUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? includeEmbeddedVideos;
+ Optional<bool?> includeEmbeddedVideos;
@override
bool operator ==(Object other) => identical(this, other) || other is DownloadUpdate &&
@@ -54,15 +54,13 @@ class DownloadUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.archiveSize != null) {
- json[r'archiveSize'] = this.archiveSize;
- } else {
- // json[r'archiveSize'] = null;
+ if (this.archiveSize.isPresent) {
+ final value = this.archiveSize.value;
+ json[r'archiveSize'] = value;
}
- if (this.includeEmbeddedVideos != null) {
- json[r'includeEmbeddedVideos'] = this.includeEmbeddedVideos;
- } else {
- // json[r'includeEmbeddedVideos'] = null;
+ if (this.includeEmbeddedVideos.isPresent) {
+ final value = this.includeEmbeddedVideos.value;
+ json[r'includeEmbeddedVideos'] = value;
}
return json;
}
@@ -76,8 +74,8 @@ class DownloadUpdate {
final json = value.cast<String, dynamic>();
return DownloadUpdate(
- archiveSize: mapValueOfType<int>(json, r'archiveSize'),
- includeEmbeddedVideos: mapValueOfType<bool>(json, r'includeEmbeddedVideos'),
+ archiveSize: json.containsKey(r'archiveSize') ? Optional.present(json[r'archiveSize'] == null ? null : int.parse('${json[r'archiveSize']}')) : const Optional.absent(),
+ includeEmbeddedVideos: json.containsKey(r'includeEmbeddedVideos') ? Optional.present(mapValueOfType<bool>(json, r'includeEmbeddedVideos')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/duplicate_detection_config.dart b/mobile/openapi/lib/model/duplicate_detection_config.dart
index 43233826ef..d0f016a4f3 100644
--- a/mobile/openapi/lib/model/duplicate_detection_config.dart
+++ b/mobile/openapi/lib/model/duplicate_detection_config.dart
@@ -57,7 +57,7 @@ class DuplicateDetectionConfig {
return DuplicateDetectionConfig(
enabled: mapValueOfType<bool>(json, r'enabled')!,
- maxDistance: (mapValueOfType<num>(json, r'maxDistance')!).toDouble(),
+ maxDistance: mapValueOfType<double>(json, r'maxDistance')!,
);
}
return null;
diff --git a/mobile/openapi/lib/model/email_notifications_update.dart b/mobile/openapi/lib/model/email_notifications_update.dart
index e158e45598..89724e0552 100644
--- a/mobile/openapi/lib/model/email_notifications_update.dart
+++ b/mobile/openapi/lib/model/email_notifications_update.dart
@@ -13,9 +13,9 @@ part of openapi.api;
class EmailNotificationsUpdate {
/// Returns a new [EmailNotificationsUpdate] instance.
EmailNotificationsUpdate({
- this.albumInvite,
- this.albumUpdate,
- this.enabled,
+ this.albumInvite = const Optional.absent(),
+ this.albumUpdate = const Optional.absent(),
+ this.enabled = const Optional.absent(),
});
/// Whether to receive email notifications for album invites
@@ -25,7 +25,7 @@ class EmailNotificationsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? albumInvite;
+ Optional<bool?> albumInvite;
/// Whether to receive email notifications for album updates
///
@@ -34,7 +34,7 @@ class EmailNotificationsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? albumUpdate;
+ Optional<bool?> albumUpdate;
/// Whether email notifications are enabled
///
@@ -43,7 +43,7 @@ class EmailNotificationsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
@override
bool operator ==(Object other) => identical(this, other) || other is EmailNotificationsUpdate &&
@@ -63,20 +63,17 @@ class EmailNotificationsUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.albumInvite != null) {
- json[r'albumInvite'] = this.albumInvite;
- } else {
- // json[r'albumInvite'] = null;
+ if (this.albumInvite.isPresent) {
+ final value = this.albumInvite.value;
+ json[r'albumInvite'] = value;
}
- if (this.albumUpdate != null) {
- json[r'albumUpdate'] = this.albumUpdate;
- } else {
- // json[r'albumUpdate'] = null;
+ if (this.albumUpdate.isPresent) {
+ final value = this.albumUpdate.value;
+ json[r'albumUpdate'] = value;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
return json;
}
@@ -90,9 +87,9 @@ class EmailNotificationsUpdate {
final json = value.cast<String, dynamic>();
return EmailNotificationsUpdate(
- albumInvite: mapValueOfType<bool>(json, r'albumInvite'),
- albumUpdate: mapValueOfType<bool>(json, r'albumUpdate'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
+ albumInvite: json.containsKey(r'albumInvite') ? Optional.present(mapValueOfType<bool>(json, r'albumInvite')) : const Optional.absent(),
+ albumUpdate: json.containsKey(r'albumUpdate') ? Optional.present(mapValueOfType<bool>(json, r'albumUpdate')) : const Optional.absent(),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/exif_response_dto.dart b/mobile/openapi/lib/model/exif_response_dto.dart
index ed5ffd2958..8a0ac0909c 100644
--- a/mobile/openapi/lib/model/exif_response_dto.dart
+++ b/mobile/openapi/lib/model/exif_response_dto.dart
@@ -13,110 +13,110 @@ part of openapi.api;
class ExifResponseDto {
/// Returns a new [ExifResponseDto] instance.
ExifResponseDto({
- this.city,
- this.country,
- this.dateTimeOriginal,
- this.description,
- this.exifImageHeight,
- this.exifImageWidth,
- this.exposureTime,
- this.fNumber,
- this.fileSizeInByte,
- this.focalLength,
- this.iso,
- this.latitude,
- this.lensModel,
- this.longitude,
- this.make,
- this.model,
- this.modifyDate,
- this.orientation,
- this.projectionType,
- this.rating,
- this.state,
- this.timeZone,
+ this.city = const Optional.absent(),
+ this.country = const Optional.absent(),
+ this.dateTimeOriginal = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.exifImageHeight = const Optional.absent(),
+ this.exifImageWidth = const Optional.absent(),
+ this.exposureTime = const Optional.absent(),
+ this.fNumber = const Optional.absent(),
+ this.fileSizeInByte = const Optional.absent(),
+ this.focalLength = const Optional.absent(),
+ this.iso = const Optional.absent(),
+ this.latitude = const Optional.absent(),
+ this.lensModel = const Optional.absent(),
+ this.longitude = const Optional.absent(),
+ this.make = const Optional.absent(),
+ this.model = const Optional.absent(),
+ this.modifyDate = const Optional.absent(),
+ this.orientation = const Optional.absent(),
+ this.projectionType = const Optional.absent(),
+ this.rating = const Optional.absent(),
+ this.state = const Optional.absent(),
+ this.timeZone = const Optional.absent(),
});
/// City name
- String? city;
+ Optional<String?> city;
/// Country name
- String? country;
+ Optional<String?> country;
/// Original date/time
- DateTime? dateTimeOriginal;
+ Optional<DateTime?> dateTimeOriginal;
/// Image description
- String? description;
+ Optional<String?> description;
/// Image height in pixels
///
/// Minimum value: 0
/// Maximum value: 9007199254740991
- int? exifImageHeight;
+ Optional<int?> exifImageHeight;
/// Image width in pixels
///
/// Minimum value: 0
/// Maximum value: 9007199254740991
- int? exifImageWidth;
+ Optional<int?> exifImageWidth;
/// Exposure time
- String? exposureTime;
+ Optional<String?> exposureTime;
/// F-number (aperture)
- num? fNumber;
+ Optional<num?> fNumber;
/// File size in bytes
///
/// Minimum value: 0
/// Maximum value: 9007199254740991
- int? fileSizeInByte;
+ Optional<int?> fileSizeInByte;
/// Focal length in mm
- num? focalLength;
+ Optional<num?> focalLength;
/// ISO sensitivity
///
/// Minimum value: -9007199254740991
/// Maximum value: 9007199254740991
- int? iso;
+ Optional<int?> iso;
/// GPS latitude
- num? latitude;
+ Optional<num?> latitude;
/// Lens model
- String? lensModel;
+ Optional<String?> lensModel;
/// GPS longitude
- num? longitude;
+ Optional<num?> longitude;
/// Camera make
- String? make;
+ Optional<String?> make;
/// Camera model
- String? model;
+ Optional<String?> model;
/// Modification date/time
- DateTime? modifyDate;
+ Optional<DateTime?> modifyDate;
/// Image orientation
- String? orientation;
+ Optional<String?> orientation;
/// Projection type
- String? projectionType;
+ Optional<String?> projectionType;
/// Rating
///
/// Minimum value: -9007199254740991
/// Maximum value: 9007199254740991
- int? rating;
+ Optional<int?> rating;
/// State/province name
- String? state;
+ Optional<String?> state;
/// Time zone
- String? timeZone;
+ Optional<String?> timeZone;
@override
bool operator ==(Object other) => identical(this, other) || other is ExifResponseDto &&
@@ -174,115 +174,93 @@ class ExifResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.city != null) {
- json[r'city'] = this.city;
- } else {
- // json[r'city'] = null;
+ if (this.city.isPresent) {
+ final value = this.city.value;
+ json[r'city'] = value;
}
- if (this.country != null) {
- json[r'country'] = this.country;
- } else {
- // json[r'country'] = null;
+ if (this.country.isPresent) {
+ final value = this.country.value;
+ json[r'country'] = value;
}
- if (this.dateTimeOriginal != null) {
- json[r'dateTimeOriginal'] = this.dateTimeOriginal!.toUtc().toIso8601String();
- } else {
- // json[r'dateTimeOriginal'] = null;
+ if (this.dateTimeOriginal.isPresent) {
+ final value = this.dateTimeOriginal.value;
+ json[r'dateTimeOriginal'] = value == null ? null : value.toUtc().toIso8601String();
}
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.exifImageHeight != null) {
- json[r'exifImageHeight'] = this.exifImageHeight;
- } else {
- // json[r'exifImageHeight'] = null;
+ if (this.exifImageHeight.isPresent) {
+ final value = this.exifImageHeight.value;
+ json[r'exifImageHeight'] = value;
}
- if (this.exifImageWidth != null) {
- json[r'exifImageWidth'] = this.exifImageWidth;
- } else {
- // json[r'exifImageWidth'] = null;
+ if (this.exifImageWidth.isPresent) {
+ final value = this.exifImageWidth.value;
+ json[r'exifImageWidth'] = value;
}
- if (this.exposureTime != null) {
- json[r'exposureTime'] = this.exposureTime;
- } else {
- // json[r'exposureTime'] = null;
+ if (this.exposureTime.isPresent) {
+ final value = this.exposureTime.value;
+ json[r'exposureTime'] = value;
}
- if (this.fNumber != null) {
- json[r'fNumber'] = this.fNumber;
- } else {
- // json[r'fNumber'] = null;
+ if (this.fNumber.isPresent) {
+ final value = this.fNumber.value;
+ json[r'fNumber'] = value;
}
- if (this.fileSizeInByte != null) {
- json[r'fileSizeInByte'] = this.fileSizeInByte;
- } else {
- // json[r'fileSizeInByte'] = null;
+ if (this.fileSizeInByte.isPresent) {
+ final value = this.fileSizeInByte.value;
+ json[r'fileSizeInByte'] = value;
}
- if (this.focalLength != null) {
- json[r'focalLength'] = this.focalLength;
- } else {
- // json[r'focalLength'] = null;
+ if (this.focalLength.isPresent) {
+ final value = this.focalLength.value;
+ json[r'focalLength'] = value;
}
- if (this.iso != null) {
- json[r'iso'] = this.iso;
- } else {
- // json[r'iso'] = null;
+ if (this.iso.isPresent) {
+ final value = this.iso.value;
+ json[r'iso'] = value;
}
- if (this.latitude != null) {
- json[r'latitude'] = this.latitude;
- } else {
- // json[r'latitude'] = null;
+ if (this.latitude.isPresent) {
+ final value = this.latitude.value;
+ json[r'latitude'] = value;
}
- if (this.lensModel != null) {
- json[r'lensModel'] = this.lensModel;
- } else {
- // json[r'lensModel'] = null;
+ if (this.lensModel.isPresent) {
+ final value = this.lensModel.value;
+ json[r'lensModel'] = value;
}
- if (this.longitude != null) {
- json[r'longitude'] = this.longitude;
- } else {
- // json[r'longitude'] = null;
+ if (this.longitude.isPresent) {
+ final value = this.longitude.value;
+ json[r'longitude'] = value;
}
- if (this.make != null) {
- json[r'make'] = this.make;
- } else {
- // json[r'make'] = null;
+ if (this.make.isPresent) {
+ final value = this.make.value;
+ json[r'make'] = value;
}
- if (this.model != null) {
- json[r'model'] = this.model;
- } else {
- // json[r'model'] = null;
+ if (this.model.isPresent) {
+ final value = this.model.value;
+ json[r'model'] = value;
}
- if (this.modifyDate != null) {
- json[r'modifyDate'] = this.modifyDate!.toUtc().toIso8601String();
- } else {
- // json[r'modifyDate'] = null;
+ if (this.modifyDate.isPresent) {
+ final value = this.modifyDate.value;
+ json[r'modifyDate'] = value == null ? null : value.toUtc().toIso8601String();
}
- if (this.orientation != null) {
- json[r'orientation'] = this.orientation;
- } else {
- // json[r'orientation'] = null;
+ if (this.orientation.isPresent) {
+ final value = this.orientation.value;
+ json[r'orientation'] = value;
}
- if (this.projectionType != null) {
- json[r'projectionType'] = this.projectionType;
- } else {
- // json[r'projectionType'] = null;
+ if (this.projectionType.isPresent) {
+ final value = this.projectionType.value;
+ json[r'projectionType'] = value;
}
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
}
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
}
- if (this.timeZone != null) {
- json[r'timeZone'] = this.timeZone;
- } else {
- // json[r'timeZone'] = null;
+ if (this.timeZone.isPresent) {
+ final value = this.timeZone.value;
+ json[r'timeZone'] = value;
}
return json;
}
@@ -296,36 +274,28 @@ class ExifResponseDto {
final json = value.cast<String, dynamic>();
return ExifResponseDto(
- city: mapValueOfType<String>(json, r'city'),
- country: mapValueOfType<String>(json, r'country'),
- dateTimeOriginal: mapDateTime(json, r'dateTimeOriginal', r''),
- description: mapValueOfType<String>(json, r'description'),
- exifImageHeight: mapValueOfType<int>(json, r'exifImageHeight'),
- exifImageWidth: mapValueOfType<int>(json, r'exifImageWidth'),
- exposureTime: mapValueOfType<String>(json, r'exposureTime'),
- fNumber: json[r'fNumber'] == null
- ? null
- : num.parse('${json[r'fNumber']}'),
- fileSizeInByte: mapValueOfType<int>(json, r'fileSizeInByte'),
- focalLength: json[r'focalLength'] == null
- ? null
- : num.parse('${json[r'focalLength']}'),
- iso: mapValueOfType<int>(json, r'iso'),
- latitude: json[r'latitude'] == null
- ? null
- : num.parse('${json[r'latitude']}'),
- lensModel: mapValueOfType<String>(json, r'lensModel'),
- longitude: json[r'longitude'] == null
- ? null
- : num.parse('${json[r'longitude']}'),
- make: mapValueOfType<String>(json, r'make'),
- model: mapValueOfType<String>(json, r'model'),
- modifyDate: mapDateTime(json, r'modifyDate', r''),
- orientation: mapValueOfType<String>(json, r'orientation'),
- projectionType: mapValueOfType<String>(json, r'projectionType'),
- rating: mapValueOfType<int>(json, r'rating'),
- state: mapValueOfType<String>(json, r'state'),
- timeZone: mapValueOfType<String>(json, r'timeZone'),
+ city: json.containsKey(r'city') ? Optional.present(mapValueOfType<String>(json, r'city')) : const Optional.absent(),
+ country: json.containsKey(r'country') ? Optional.present(mapValueOfType<String>(json, r'country')) : const Optional.absent(),
+ dateTimeOriginal: json.containsKey(r'dateTimeOriginal') ? Optional.present(mapDateTime(json, r'dateTimeOriginal', r'')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ exifImageHeight: json.containsKey(r'exifImageHeight') ? Optional.present(json[r'exifImageHeight'] == null ? null : int.parse('${json[r'exifImageHeight']}')) : const Optional.absent(),
+ exifImageWidth: json.containsKey(r'exifImageWidth') ? Optional.present(json[r'exifImageWidth'] == null ? null : int.parse('${json[r'exifImageWidth']}')) : const Optional.absent(),
+ exposureTime: json.containsKey(r'exposureTime') ? Optional.present(mapValueOfType<String>(json, r'exposureTime')) : const Optional.absent(),
+ fNumber: json.containsKey(r'fNumber') ? Optional.present(json[r'fNumber'] == null ? null : num.parse('${json[r'fNumber']}')) : const Optional.absent(),
+ fileSizeInByte: json.containsKey(r'fileSizeInByte') ? Optional.present(json[r'fileSizeInByte'] == null ? null : int.parse('${json[r'fileSizeInByte']}')) : const Optional.absent(),
+ focalLength: json.containsKey(r'focalLength') ? Optional.present(json[r'focalLength'] == null ? null : num.parse('${json[r'focalLength']}')) : const Optional.absent(),
+ iso: json.containsKey(r'iso') ? Optional.present(json[r'iso'] == null ? null : int.parse('${json[r'iso']}')) : const Optional.absent(),
+ latitude: json.containsKey(r'latitude') ? Optional.present(json[r'latitude'] == null ? null : num.parse('${json[r'latitude']}')) : const Optional.absent(),
+ lensModel: json.containsKey(r'lensModel') ? Optional.present(mapValueOfType<String>(json, r'lensModel')) : const Optional.absent(),
+ longitude: json.containsKey(r'longitude') ? Optional.present(json[r'longitude'] == null ? null : num.parse('${json[r'longitude']}')) : const Optional.absent(),
+ make: json.containsKey(r'make') ? Optional.present(mapValueOfType<String>(json, r'make')) : const Optional.absent(),
+ model: json.containsKey(r'model') ? Optional.present(mapValueOfType<String>(json, r'model')) : const Optional.absent(),
+ modifyDate: json.containsKey(r'modifyDate') ? Optional.present(mapDateTime(json, r'modifyDate', r'')) : const Optional.absent(),
+ orientation: json.containsKey(r'orientation') ? Optional.present(mapValueOfType<String>(json, r'orientation')) : const Optional.absent(),
+ projectionType: json.containsKey(r'projectionType') ? Optional.present(mapValueOfType<String>(json, r'projectionType')) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
+ timeZone: json.containsKey(r'timeZone') ? Optional.present(mapValueOfType<String>(json, r'timeZone')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/facial_recognition_config.dart b/mobile/openapi/lib/model/facial_recognition_config.dart
index 66cb542ccf..c5f477e1d5 100644
--- a/mobile/openapi/lib/model/facial_recognition_config.dart
+++ b/mobile/openapi/lib/model/facial_recognition_config.dart
@@ -84,9 +84,9 @@ class FacialRecognitionConfig {
return FacialRecognitionConfig(
enabled: mapValueOfType<bool>(json, r'enabled')!,
- maxDistance: (mapValueOfType<num>(json, r'maxDistance')!).toDouble(),
+ maxDistance: mapValueOfType<double>(json, r'maxDistance')!,
minFaces: mapValueOfType<int>(json, r'minFaces')!,
- minScore: (mapValueOfType<num>(json, r'minScore')!).toDouble(),
+ minScore: mapValueOfType<double>(json, r'minScore')!,
modelName: mapValueOfType<String>(json, r'modelName')!,
);
}
diff --git a/mobile/openapi/lib/model/folders_update.dart b/mobile/openapi/lib/model/folders_update.dart
index edd58014d4..2ce0cde807 100644
--- a/mobile/openapi/lib/model/folders_update.dart
+++ b/mobile/openapi/lib/model/folders_update.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class FoldersUpdate {
/// Returns a new [FoldersUpdate] instance.
FoldersUpdate({
- this.enabled,
- this.sidebarWeb,
+ this.enabled = const Optional.absent(),
+ this.sidebarWeb = const Optional.absent(),
});
/// Whether folders are enabled
@@ -24,7 +24,7 @@ class FoldersUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Whether folders appear in web sidebar
///
@@ -33,7 +33,7 @@ class FoldersUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? sidebarWeb;
+ Optional<bool?> sidebarWeb;
@override
bool operator ==(Object other) => identical(this, other) || other is FoldersUpdate &&
@@ -51,15 +51,13 @@ class FoldersUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
- if (this.sidebarWeb != null) {
- json[r'sidebarWeb'] = this.sidebarWeb;
- } else {
- // json[r'sidebarWeb'] = null;
+ if (this.sidebarWeb.isPresent) {
+ final value = this.sidebarWeb.value;
+ json[r'sidebarWeb'] = value;
}
return json;
}
@@ -73,8 +71,8 @@ class FoldersUpdate {
final json = value.cast<String, dynamic>();
return FoldersUpdate(
- enabled: mapValueOfType<bool>(json, r'enabled'),
- sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
+ sidebarWeb: json.containsKey(r'sidebarWeb') ? Optional.present(mapValueOfType<bool>(json, r'sidebarWeb')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/library_response_dto.dart b/mobile/openapi/lib/model/library_response_dto.dart
index 88ebceae24..e52a752656 100644
--- a/mobile/openapi/lib/model/library_response_dto.dart
+++ b/mobile/openapi/lib/model/library_response_dto.dart
@@ -98,7 +98,7 @@ class LibraryResponseDto {
? this.refreshedAt!.millisecondsSinceEpoch
: this.refreshedAt!.toUtc().toIso8601String();
} else {
- // json[r'refreshedAt'] = null;
+ json[r'refreshedAt'] = null;
}
json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.updatedAt.millisecondsSinceEpoch
diff --git a/mobile/openapi/lib/model/maintenance_login_dto.dart b/mobile/openapi/lib/model/maintenance_login_dto.dart
index 64cf6b234b..eaa91ae738 100644
--- a/mobile/openapi/lib/model/maintenance_login_dto.dart
+++ b/mobile/openapi/lib/model/maintenance_login_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class MaintenanceLoginDto {
/// Returns a new [MaintenanceLoginDto] instance.
MaintenanceLoginDto({
- this.token,
+ this.token = const Optional.absent(),
});
/// Maintenance token
@@ -23,7 +23,7 @@ class MaintenanceLoginDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? token;
+ Optional<String?> token;
@override
bool operator ==(Object other) => identical(this, other) || other is MaintenanceLoginDto &&
@@ -39,10 +39,9 @@ class MaintenanceLoginDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.token != null) {
- json[r'token'] = this.token;
- } else {
- // json[r'token'] = null;
+ if (this.token.isPresent) {
+ final value = this.token.value;
+ json[r'token'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class MaintenanceLoginDto {
final json = value.cast<String, dynamic>();
return MaintenanceLoginDto(
- token: mapValueOfType<String>(json, r'token'),
+ token: json.containsKey(r'token') ? Optional.present(mapValueOfType<String>(json, r'token')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/maintenance_status_response_dto.dart b/mobile/openapi/lib/model/maintenance_status_response_dto.dart
index c1c94acd91..82ad12d340 100644
--- a/mobile/openapi/lib/model/maintenance_status_response_dto.dart
+++ b/mobile/openapi/lib/model/maintenance_status_response_dto.dart
@@ -15,9 +15,9 @@ class MaintenanceStatusResponseDto {
MaintenanceStatusResponseDto({
required this.action,
required this.active,
- this.error,
- this.progress,
- this.task,
+ this.error = const Optional.absent(),
+ this.progress = const Optional.absent(),
+ this.task = const Optional.absent(),
});
MaintenanceAction action;
@@ -30,7 +30,7 @@ class MaintenanceStatusResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? error;
+ Optional<String?> error;
/// Minimum value: -9007199254740991
/// Maximum value: 9007199254740991
@@ -40,7 +40,7 @@ class MaintenanceStatusResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? progress;
+ Optional<int?> progress;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -48,7 +48,7 @@ class MaintenanceStatusResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? task;
+ Optional<String?> task;
@override
bool operator ==(Object other) => identical(this, other) || other is MaintenanceStatusResponseDto &&
@@ -74,20 +74,17 @@ class MaintenanceStatusResponseDto {
final json = <String, dynamic>{};
json[r'action'] = this.action;
json[r'active'] = this.active;
- if (this.error != null) {
- json[r'error'] = this.error;
- } else {
- // json[r'error'] = null;
+ if (this.error.isPresent) {
+ final value = this.error.value;
+ json[r'error'] = value;
}
- if (this.progress != null) {
- json[r'progress'] = this.progress;
- } else {
- // json[r'progress'] = null;
+ if (this.progress.isPresent) {
+ final value = this.progress.value;
+ json[r'progress'] = value;
}
- if (this.task != null) {
- json[r'task'] = this.task;
- } else {
- // json[r'task'] = null;
+ if (this.task.isPresent) {
+ final value = this.task.value;
+ json[r'task'] = value;
}
return json;
}
@@ -103,9 +100,9 @@ class MaintenanceStatusResponseDto {
return MaintenanceStatusResponseDto(
action: MaintenanceAction.fromJson(json[r'action'])!,
active: mapValueOfType<bool>(json, r'active')!,
- error: mapValueOfType<String>(json, r'error'),
- progress: mapValueOfType<int>(json, r'progress'),
- task: mapValueOfType<String>(json, r'task'),
+ error: json.containsKey(r'error') ? Optional.present(mapValueOfType<String>(json, r'error')) : const Optional.absent(),
+ progress: json.containsKey(r'progress') ? Optional.present(json[r'progress'] == null ? null : int.parse('${json[r'progress']}')) : const Optional.absent(),
+ task: json.containsKey(r'task') ? Optional.present(mapValueOfType<String>(json, r'task')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/map_marker_response_dto.dart b/mobile/openapi/lib/model/map_marker_response_dto.dart
index c0a47a5458..3f19c21b6b 100644
--- a/mobile/openapi/lib/model/map_marker_response_dto.dart
+++ b/mobile/openapi/lib/model/map_marker_response_dto.dart
@@ -66,12 +66,12 @@ class MapMarkerResponseDto {
if (this.city != null) {
json[r'city'] = this.city;
} else {
- // json[r'city'] = null;
+ json[r'city'] = null;
}
if (this.country != null) {
json[r'country'] = this.country;
} else {
- // json[r'country'] = null;
+ json[r'country'] = null;
}
json[r'id'] = this.id;
json[r'lat'] = this.lat;
@@ -79,7 +79,7 @@ class MapMarkerResponseDto {
if (this.state != null) {
json[r'state'] = this.state;
} else {
- // json[r'state'] = null;
+ json[r'state'] = null;
}
return json;
}
@@ -96,8 +96,8 @@ class MapMarkerResponseDto {
city: mapValueOfType<String>(json, r'city'),
country: mapValueOfType<String>(json, r'country'),
id: mapValueOfType<String>(json, r'id')!,
- lat: (mapValueOfType<num>(json, r'lat')!).toDouble(),
- lon: (mapValueOfType<num>(json, r'lon')!).toDouble(),
+ lat: mapValueOfType<double>(json, r'lat')!,
+ lon: mapValueOfType<double>(json, r'lon')!,
state: mapValueOfType<String>(json, r'state'),
);
}
diff --git a/mobile/openapi/lib/model/map_reverse_geocode_response_dto.dart b/mobile/openapi/lib/model/map_reverse_geocode_response_dto.dart
index 85435485e6..0fc30f2b88 100644
--- a/mobile/openapi/lib/model/map_reverse_geocode_response_dto.dart
+++ b/mobile/openapi/lib/model/map_reverse_geocode_response_dto.dart
@@ -48,17 +48,17 @@ class MapReverseGeocodeResponseDto {
if (this.city != null) {
json[r'city'] = this.city;
} else {
- // json[r'city'] = null;
+ json[r'city'] = null;
}
if (this.country != null) {
json[r'country'] = this.country;
} else {
- // json[r'country'] = null;
+ json[r'country'] = null;
}
if (this.state != null) {
json[r'state'] = this.state;
} else {
- // json[r'state'] = null;
+ json[r'state'] = null;
}
return json;
}
diff --git a/mobile/openapi/lib/model/memories_update.dart b/mobile/openapi/lib/model/memories_update.dart
index ede9910d74..350cf19182 100644
--- a/mobile/openapi/lib/model/memories_update.dart
+++ b/mobile/openapi/lib/model/memories_update.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class MemoriesUpdate {
/// Returns a new [MemoriesUpdate] instance.
MemoriesUpdate({
- this.duration,
- this.enabled,
+ this.duration = const Optional.absent(),
+ this.enabled = const Optional.absent(),
});
/// Memory duration in seconds
@@ -27,7 +27,7 @@ class MemoriesUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? duration;
+ Optional<int?> duration;
/// Whether memories are enabled
///
@@ -36,7 +36,7 @@ class MemoriesUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
@override
bool operator ==(Object other) => identical(this, other) || other is MemoriesUpdate &&
@@ -54,15 +54,13 @@ class MemoriesUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.duration != null) {
- json[r'duration'] = this.duration;
- } else {
- // json[r'duration'] = null;
+ if (this.duration.isPresent) {
+ final value = this.duration.value;
+ json[r'duration'] = value;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
return json;
}
@@ -76,8 +74,8 @@ class MemoriesUpdate {
final json = value.cast<String, dynamic>();
return MemoriesUpdate(
- duration: mapValueOfType<int>(json, r'duration'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
+ duration: json.containsKey(r'duration') ? Optional.present(json[r'duration'] == null ? null : int.parse('${json[r'duration']}')) : const Optional.absent(),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/memory_create_dto.dart b/mobile/openapi/lib/model/memory_create_dto.dart
index b906f6dd1d..a7be9bf70d 100644
--- a/mobile/openapi/lib/model/memory_create_dto.dart
+++ b/mobile/openapi/lib/model/memory_create_dto.dart
@@ -13,18 +13,18 @@ part of openapi.api;
class MemoryCreateDto {
/// Returns a new [MemoryCreateDto] instance.
MemoryCreateDto({
- this.assetIds = const [],
+ this.assetIds = const Optional.present(const []),
required this.data,
- this.hideAt,
- this.isSaved,
+ this.hideAt = const Optional.absent(),
+ this.isSaved = const Optional.absent(),
required this.memoryAt,
- this.seenAt,
- this.showAt,
+ this.seenAt = const Optional.absent(),
+ this.showAt = const Optional.absent(),
required this.type,
});
/// Asset IDs to associate with memory
- List<String> assetIds;
+ Optional<List<String>?> assetIds;
OnThisDayDto data;
@@ -35,7 +35,7 @@ class MemoryCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? hideAt;
+ Optional<DateTime?> hideAt;
/// Is memory saved
///
@@ -44,7 +44,7 @@ class MemoryCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isSaved;
+ Optional<bool?> isSaved;
/// Memory date
DateTime memoryAt;
@@ -56,7 +56,7 @@ class MemoryCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? seenAt;
+ Optional<DateTime?> seenAt;
/// Date when memory should be shown
///
@@ -65,7 +65,7 @@ class MemoryCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? showAt;
+ Optional<DateTime?> showAt;
MemoryType type;
@@ -97,36 +97,35 @@ class MemoryCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'assetIds'] = this.assetIds;
+ if (this.assetIds.isPresent) {
+ final value = this.assetIds.value;
+ json[r'assetIds'] = value;
+ }
json[r'data'] = this.data;
- if (this.hideAt != null) {
- json[r'hideAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.hideAt!.millisecondsSinceEpoch
- : this.hideAt!.toUtc().toIso8601String();
- } else {
- // json[r'hideAt'] = null;
+ if (this.hideAt.isPresent) {
+ final value = this.hideAt.value;
+ json[r'hideAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
- if (this.isSaved != null) {
- json[r'isSaved'] = this.isSaved;
- } else {
- // json[r'isSaved'] = null;
+ if (this.isSaved.isPresent) {
+ final value = this.isSaved.value;
+ json[r'isSaved'] = value;
}
json[r'memoryAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.memoryAt.millisecondsSinceEpoch
: this.memoryAt.toUtc().toIso8601String();
- if (this.seenAt != null) {
- json[r'seenAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.seenAt!.millisecondsSinceEpoch
- : this.seenAt!.toUtc().toIso8601String();
- } else {
- // json[r'seenAt'] = null;
+ if (this.seenAt.isPresent) {
+ final value = this.seenAt.value;
+ json[r'seenAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
- if (this.showAt != null) {
- json[r'showAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.showAt!.millisecondsSinceEpoch
- : this.showAt!.toUtc().toIso8601String();
- } else {
- // json[r'showAt'] = null;
+ if (this.showAt.isPresent) {
+ final value = this.showAt.value;
+ json[r'showAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
json[r'type'] = this.type;
return json;
@@ -141,15 +140,15 @@ class MemoryCreateDto {
final json = value.cast<String, dynamic>();
return MemoryCreateDto(
- assetIds: json[r'assetIds'] is Iterable
+ assetIds: json.containsKey(r'assetIds') ? Optional.present(json[r'assetIds'] is Iterable
? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
+ : const []) : const Optional.absent(),
data: OnThisDayDto.fromJson(json[r'data'])!,
- hideAt: mapDateTime(json, r'hideAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- isSaved: mapValueOfType<bool>(json, r'isSaved'),
+ hideAt: json.containsKey(r'hideAt') ? Optional.present(mapDateTime(json, r'hideAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ isSaved: json.containsKey(r'isSaved') ? Optional.present(mapValueOfType<bool>(json, r'isSaved')) : const Optional.absent(),
memoryAt: mapDateTime(json, r'memoryAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
- seenAt: mapDateTime(json, r'seenAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- showAt: mapDateTime(json, r'showAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ seenAt: json.containsKey(r'seenAt') ? Optional.present(mapDateTime(json, r'seenAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ showAt: json.containsKey(r'showAt') ? Optional.present(mapDateTime(json, r'showAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
type: MemoryType.fromJson(json[r'type'])!,
);
}
diff --git a/mobile/openapi/lib/model/memory_response_dto.dart b/mobile/openapi/lib/model/memory_response_dto.dart
index e736667d57..799c692955 100644
--- a/mobile/openapi/lib/model/memory_response_dto.dart
+++ b/mobile/openapi/lib/model/memory_response_dto.dart
@@ -16,14 +16,14 @@ class MemoryResponseDto {
this.assets = const [],
required this.createdAt,
required this.data,
- this.deletedAt,
- this.hideAt,
+ this.deletedAt = const Optional.absent(),
+ this.hideAt = const Optional.absent(),
required this.id,
required this.isSaved,
required this.memoryAt,
required this.ownerId,
- this.seenAt,
- this.showAt,
+ this.seenAt = const Optional.absent(),
+ this.showAt = const Optional.absent(),
required this.type,
required this.updatedAt,
});
@@ -42,7 +42,7 @@ class MemoryResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? deletedAt;
+ Optional<DateTime?> deletedAt;
/// Date when memory should be hidden
///
@@ -51,7 +51,7 @@ class MemoryResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? hideAt;
+ Optional<DateTime?> hideAt;
/// Memory ID
String id;
@@ -72,7 +72,7 @@ class MemoryResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? seenAt;
+ Optional<DateTime?> seenAt;
/// Date when memory should be shown
///
@@ -81,7 +81,7 @@ class MemoryResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? showAt;
+ Optional<DateTime?> showAt;
MemoryType type;
@@ -131,19 +131,17 @@ class MemoryResponseDto {
? this.createdAt.millisecondsSinceEpoch
: this.createdAt.toUtc().toIso8601String();
json[r'data'] = this.data;
- if (this.deletedAt != null) {
- json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.deletedAt!.millisecondsSinceEpoch
- : this.deletedAt!.toUtc().toIso8601String();
- } else {
- // json[r'deletedAt'] = null;
+ if (this.deletedAt.isPresent) {
+ final value = this.deletedAt.value;
+ json[r'deletedAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
- if (this.hideAt != null) {
- json[r'hideAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.hideAt!.millisecondsSinceEpoch
- : this.hideAt!.toUtc().toIso8601String();
- } else {
- // json[r'hideAt'] = null;
+ if (this.hideAt.isPresent) {
+ final value = this.hideAt.value;
+ json[r'hideAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
json[r'id'] = this.id;
json[r'isSaved'] = this.isSaved;
@@ -151,19 +149,17 @@ class MemoryResponseDto {
? this.memoryAt.millisecondsSinceEpoch
: this.memoryAt.toUtc().toIso8601String();
json[r'ownerId'] = this.ownerId;
- if (this.seenAt != null) {
- json[r'seenAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.seenAt!.millisecondsSinceEpoch
- : this.seenAt!.toUtc().toIso8601String();
- } else {
- // json[r'seenAt'] = null;
+ if (this.seenAt.isPresent) {
+ final value = this.seenAt.value;
+ json[r'seenAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
- if (this.showAt != null) {
- json[r'showAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.showAt!.millisecondsSinceEpoch
- : this.showAt!.toUtc().toIso8601String();
- } else {
- // json[r'showAt'] = null;
+ if (this.showAt.isPresent) {
+ final value = this.showAt.value;
+ json[r'showAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
json[r'type'] = this.type;
json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
@@ -184,14 +180,14 @@ class MemoryResponseDto {
assets: AssetResponseDto.listFromJson(json[r'assets']),
createdAt: mapDateTime(json, r'createdAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
data: OnThisDayDto.fromJson(json[r'data'])!,
- deletedAt: mapDateTime(json, r'deletedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- hideAt: mapDateTime(json, r'hideAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ deletedAt: json.containsKey(r'deletedAt') ? Optional.present(mapDateTime(json, r'deletedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ hideAt: json.containsKey(r'hideAt') ? Optional.present(mapDateTime(json, r'hideAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
isSaved: mapValueOfType<bool>(json, r'isSaved')!,
memoryAt: mapDateTime(json, r'memoryAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
ownerId: mapValueOfType<String>(json, r'ownerId')!,
- seenAt: mapDateTime(json, r'seenAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- showAt: mapDateTime(json, r'showAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ seenAt: json.containsKey(r'seenAt') ? Optional.present(mapDateTime(json, r'seenAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ showAt: json.containsKey(r'showAt') ? Optional.present(mapDateTime(json, r'showAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
type: MemoryType.fromJson(json[r'type'])!,
updatedAt: mapDateTime(json, r'updatedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
);
diff --git a/mobile/openapi/lib/model/memory_update_dto.dart b/mobile/openapi/lib/model/memory_update_dto.dart
index d8d7e9643b..e39506b78e 100644
--- a/mobile/openapi/lib/model/memory_update_dto.dart
+++ b/mobile/openapi/lib/model/memory_update_dto.dart
@@ -13,9 +13,9 @@ part of openapi.api;
class MemoryUpdateDto {
/// Returns a new [MemoryUpdateDto] instance.
MemoryUpdateDto({
- this.isSaved,
- this.memoryAt,
- this.seenAt,
+ this.isSaved = const Optional.absent(),
+ this.memoryAt = const Optional.absent(),
+ this.seenAt = const Optional.absent(),
});
/// Is memory saved
@@ -25,7 +25,7 @@ class MemoryUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isSaved;
+ Optional<bool?> isSaved;
/// Memory date
///
@@ -34,7 +34,7 @@ class MemoryUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? memoryAt;
+ Optional<DateTime?> memoryAt;
/// Date when memory was seen
///
@@ -43,7 +43,7 @@ class MemoryUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? seenAt;
+ Optional<DateTime?> seenAt;
@override
bool operator ==(Object other) => identical(this, other) || other is MemoryUpdateDto &&
@@ -63,24 +63,21 @@ class MemoryUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.isSaved != null) {
- json[r'isSaved'] = this.isSaved;
- } else {
- // json[r'isSaved'] = null;
+ if (this.isSaved.isPresent) {
+ final value = this.isSaved.value;
+ json[r'isSaved'] = value;
}
- if (this.memoryAt != null) {
- json[r'memoryAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.memoryAt!.millisecondsSinceEpoch
- : this.memoryAt!.toUtc().toIso8601String();
- } else {
- // json[r'memoryAt'] = null;
+ if (this.memoryAt.isPresent) {
+ final value = this.memoryAt.value;
+ json[r'memoryAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
- if (this.seenAt != null) {
- json[r'seenAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.seenAt!.millisecondsSinceEpoch
- : this.seenAt!.toUtc().toIso8601String();
- } else {
- // json[r'seenAt'] = null;
+ if (this.seenAt.isPresent) {
+ final value = this.seenAt.value;
+ json[r'seenAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
return json;
}
@@ -94,9 +91,9 @@ class MemoryUpdateDto {
final json = value.cast<String, dynamic>();
return MemoryUpdateDto(
- isSaved: mapValueOfType<bool>(json, r'isSaved'),
- memoryAt: mapDateTime(json, r'memoryAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- seenAt: mapDateTime(json, r'seenAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ isSaved: json.containsKey(r'isSaved') ? Optional.present(mapValueOfType<bool>(json, r'isSaved')) : const Optional.absent(),
+ memoryAt: json.containsKey(r'memoryAt') ? Optional.present(mapDateTime(json, r'memoryAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ seenAt: json.containsKey(r'seenAt') ? Optional.present(mapDateTime(json, r'seenAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/metadata_search_dto.dart b/mobile/openapi/lib/model/metadata_search_dto.dart
index 29b1d5b68d..0d93ed3173 100644
--- a/mobile/openapi/lib/model/metadata_search_dto.dart
+++ b/mobile/openapi/lib/model/metadata_search_dto.dart
@@ -13,52 +13,52 @@ part of openapi.api;
class MetadataSearchDto {
/// Returns a new [MetadataSearchDto] instance.
MetadataSearchDto({
- this.albumIds = const [],
- this.checksum,
- this.city,
- this.country,
- this.createdAfter,
- this.createdBefore,
- this.description,
- this.encodedVideoPath,
- this.id,
- this.isEncoded,
- this.isFavorite,
- this.isMotion,
- this.isNotInAlbum,
- this.isOffline,
- this.lensModel,
- this.libraryId,
- this.make,
- this.model,
- this.ocr,
- this.order,
- this.originalFileName,
- this.originalPath,
- this.page,
- this.personIds = const [],
- this.previewPath,
- this.rating,
- this.size,
- this.state,
- this.tagIds = const [],
- this.takenAfter,
- this.takenBefore,
- this.thumbnailPath,
- this.trashedAfter,
- this.trashedBefore,
- this.type,
- this.updatedAfter,
- this.updatedBefore,
- this.visibility,
- this.withDeleted,
- this.withExif,
- this.withPeople,
- this.withStacked,
+ this.albumIds = const Optional.present(const []),
+ this.checksum = const Optional.absent(),
+ this.city = const Optional.absent(),
+ this.country = const Optional.absent(),
+ this.createdAfter = const Optional.absent(),
+ this.createdBefore = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.encodedVideoPath = const Optional.absent(),
+ this.id = const Optional.absent(),
+ this.isEncoded = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.isMotion = const Optional.absent(),
+ this.isNotInAlbum = const Optional.absent(),
+ this.isOffline = const Optional.absent(),
+ this.lensModel = const Optional.absent(),
+ this.libraryId = const Optional.absent(),
+ this.make = const Optional.absent(),
+ this.model = const Optional.absent(),
+ this.ocr = const Optional.absent(),
+ this.order = const Optional.absent(),
+ this.originalFileName = const Optional.absent(),
+ this.originalPath = const Optional.absent(),
+ this.page = const Optional.absent(),
+ this.personIds = const Optional.present(const []),
+ this.previewPath = const Optional.absent(),
+ this.rating = const Optional.absent(),
+ this.size = const Optional.absent(),
+ this.state = const Optional.absent(),
+ this.tagIds = const Optional.present(const []),
+ this.takenAfter = const Optional.absent(),
+ this.takenBefore = const Optional.absent(),
+ this.thumbnailPath = const Optional.absent(),
+ this.trashedAfter = const Optional.absent(),
+ this.trashedBefore = const Optional.absent(),
+ this.type = const Optional.absent(),
+ this.updatedAfter = const Optional.absent(),
+ this.updatedBefore = const Optional.absent(),
+ this.visibility = const Optional.absent(),
+ this.withDeleted = const Optional.absent(),
+ this.withExif = const Optional.absent(),
+ this.withPeople = const Optional.absent(),
+ this.withStacked = const Optional.absent(),
});
/// Filter by album IDs
- List<String> albumIds;
+ Optional<List<String>?> albumIds;
/// Filter by file checksum
///
@@ -67,13 +67,13 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? checksum;
+ Optional<String?> checksum;
/// Filter by city name
- String? city;
+ Optional<String?> city;
/// Filter by country name
- String? country;
+ Optional<String?> country;
/// Filter by creation date (after)
///
@@ -82,7 +82,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdAfter;
+ Optional<DateTime?> createdAfter;
/// Filter by creation date (before)
///
@@ -91,7 +91,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdBefore;
+ Optional<DateTime?> createdBefore;
/// Filter by description text
///
@@ -100,7 +100,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
/// Filter by encoded video file path
///
@@ -109,7 +109,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? encodedVideoPath;
+ Optional<String?> encodedVideoPath;
/// Filter by asset ID
///
@@ -118,7 +118,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? id;
+ Optional<String?> id;
/// Filter by encoded status
///
@@ -127,7 +127,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isEncoded;
+ Optional<bool?> isEncoded;
/// Filter by favorite status
///
@@ -136,7 +136,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Filter by motion photo status
///
@@ -145,7 +145,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isMotion;
+ Optional<bool?> isMotion;
/// Filter assets not in any album
///
@@ -154,7 +154,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isNotInAlbum;
+ Optional<bool?> isNotInAlbum;
/// Filter by offline status
///
@@ -163,19 +163,19 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isOffline;
+ Optional<bool?> isOffline;
/// Filter by lens model
- String? lensModel;
+ Optional<String?> lensModel;
/// Library ID to filter by
- String? libraryId;
+ Optional<String?> libraryId;
/// Filter by camera make
- String? make;
+ Optional<String?> make;
/// Filter by camera model
- String? model;
+ Optional<String?> model;
/// Filter by OCR text content
///
@@ -184,7 +184,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? ocr;
+ Optional<String?> ocr;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -192,7 +192,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetOrder? order;
+ Optional<AssetOrder?> order;
/// Filter by original file name
///
@@ -201,7 +201,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? originalFileName;
+ Optional<String?> originalFileName;
/// Filter by original file path
///
@@ -210,7 +210,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? originalPath;
+ Optional<String?> originalPath;
/// Page number
///
@@ -222,10 +222,10 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? page;
+ Optional<int?> page;
/// Filter by person IDs
- List<String> personIds;
+ Optional<List<String>?> personIds;
/// Filter by preview file path
///
@@ -234,13 +234,13 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? previewPath;
+ Optional<String?> previewPath;
/// Filter by rating [1-5], or null for unrated
///
/// Minimum value: -1
/// Maximum value: 5
- int? rating;
+ Optional<int?> rating;
/// Number of results to return
///
@@ -252,13 +252,13 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? size;
+ Optional<int?> size;
/// Filter by state/province name
- String? state;
+ Optional<String?> state;
/// Filter by tag IDs
- List<String>? tagIds;
+ Optional<List<String>?> tagIds;
/// Filter by taken date (after)
///
@@ -267,7 +267,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenAfter;
+ Optional<DateTime?> takenAfter;
/// Filter by taken date (before)
///
@@ -276,7 +276,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenBefore;
+ Optional<DateTime?> takenBefore;
/// Filter by thumbnail file path
///
@@ -285,7 +285,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? thumbnailPath;
+ Optional<String?> thumbnailPath;
/// Filter by trash date (after)
///
@@ -294,7 +294,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedAfter;
+ Optional<DateTime?> trashedAfter;
/// Filter by trash date (before)
///
@@ -303,7 +303,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedBefore;
+ Optional<DateTime?> trashedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -311,7 +311,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetTypeEnum? type;
+ Optional<AssetTypeEnum?> type;
/// Filter by update date (after)
///
@@ -320,7 +320,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedAfter;
+ Optional<DateTime?> updatedAfter;
/// Filter by update date (before)
///
@@ -329,7 +329,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedBefore;
+ Optional<DateTime?> updatedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -337,7 +337,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetVisibility? visibility;
+ Optional<AssetVisibility?> visibility;
/// Include deleted assets
///
@@ -346,7 +346,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withDeleted;
+ Optional<bool?> withDeleted;
/// Include EXIF data in response
///
@@ -355,7 +355,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withExif;
+ Optional<bool?> withExif;
/// Include people data in response
///
@@ -364,7 +364,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withPeople;
+ Optional<bool?> withPeople;
/// Include stacked assets
///
@@ -373,7 +373,7 @@ class MetadataSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withStacked;
+ Optional<bool?> withStacked;
@override
bool operator ==(Object other) => identical(this, other) || other is MetadataSearchDto &&
@@ -471,223 +471,189 @@ class MetadataSearchDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'albumIds'] = this.albumIds;
- if (this.checksum != null) {
- json[r'checksum'] = this.checksum;
- } else {
- // json[r'checksum'] = null;
- }
- if (this.city != null) {
- json[r'city'] = this.city;
- } else {
- // json[r'city'] = null;
- }
- if (this.country != null) {
- json[r'country'] = this.country;
- } else {
- // json[r'country'] = null;
- }
- if (this.createdAfter != null) {
- json[r'createdAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdAfter!.millisecondsSinceEpoch
- : this.createdAfter!.toUtc().toIso8601String();
- } else {
- // json[r'createdAfter'] = null;
- }
- if (this.createdBefore != null) {
- json[r'createdBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdBefore!.millisecondsSinceEpoch
- : this.createdBefore!.toUtc().toIso8601String();
- } else {
- // json[r'createdBefore'] = null;
- }
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
- }
- if (this.encodedVideoPath != null) {
- json[r'encodedVideoPath'] = this.encodedVideoPath;
- } else {
- // json[r'encodedVideoPath'] = null;
- }
- if (this.id != null) {
- json[r'id'] = this.id;
- } else {
- // json[r'id'] = null;
- }
- if (this.isEncoded != null) {
- json[r'isEncoded'] = this.isEncoded;
- } else {
- // json[r'isEncoded'] = null;
- }
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
- }
- if (this.isMotion != null) {
- json[r'isMotion'] = this.isMotion;
- } else {
- // json[r'isMotion'] = null;
- }
- if (this.isNotInAlbum != null) {
- json[r'isNotInAlbum'] = this.isNotInAlbum;
- } else {
- // json[r'isNotInAlbum'] = null;
- }
- if (this.isOffline != null) {
- json[r'isOffline'] = this.isOffline;
- } else {
- // json[r'isOffline'] = null;
- }
- if (this.lensModel != null) {
- json[r'lensModel'] = this.lensModel;
- } else {
- // json[r'lensModel'] = null;
- }
- if (this.libraryId != null) {
- json[r'libraryId'] = this.libraryId;
- } else {
- // json[r'libraryId'] = null;
- }
- if (this.make != null) {
- json[r'make'] = this.make;
- } else {
- // json[r'make'] = null;
- }
- if (this.model != null) {
- json[r'model'] = this.model;
- } else {
- // json[r'model'] = null;
- }
- if (this.ocr != null) {
- json[r'ocr'] = this.ocr;
- } else {
- // json[r'ocr'] = null;
- }
- if (this.order != null) {
- json[r'order'] = this.order;
- } else {
- // json[r'order'] = null;
- }
- if (this.originalFileName != null) {
- json[r'originalFileName'] = this.originalFileName;
- } else {
- // json[r'originalFileName'] = null;
- }
- if (this.originalPath != null) {
- json[r'originalPath'] = this.originalPath;
- } else {
- // json[r'originalPath'] = null;
- }
- if (this.page != null) {
- json[r'page'] = this.page;
- } else {
- // json[r'page'] = null;
- }
- json[r'personIds'] = this.personIds;
- if (this.previewPath != null) {
- json[r'previewPath'] = this.previewPath;
- } else {
- // json[r'previewPath'] = null;
- }
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
- }
- if (this.size != null) {
- json[r'size'] = this.size;
- } else {
- // json[r'size'] = null;
- }
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
- }
- if (this.tagIds != null) {
- json[r'tagIds'] = this.tagIds;
- } else {
- // json[r'tagIds'] = null;
- }
- if (this.takenAfter != null) {
- json[r'takenAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenAfter!.millisecondsSinceEpoch
- : this.takenAfter!.toUtc().toIso8601String();
- } else {
- // json[r'takenAfter'] = null;
- }
- if (this.takenBefore != null) {
- json[r'takenBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenBefore!.millisecondsSinceEpoch
- : this.takenBefore!.toUtc().toIso8601String();
- } else {
- // json[r'takenBefore'] = null;
- }
- if (this.thumbnailPath != null) {
- json[r'thumbnailPath'] = this.thumbnailPath;
- } else {
- // json[r'thumbnailPath'] = null;
- }
- if (this.trashedAfter != null) {
- json[r'trashedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedAfter!.millisecondsSinceEpoch
- : this.trashedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'trashedAfter'] = null;
- }
- if (this.trashedBefore != null) {
- json[r'trashedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedBefore!.millisecondsSinceEpoch
- : this.trashedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'trashedBefore'] = null;
- }
- if (this.type != null) {
- json[r'type'] = this.type;
- } else {
- // json[r'type'] = null;
- }
- if (this.updatedAfter != null) {
- json[r'updatedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedAfter!.millisecondsSinceEpoch
- : this.updatedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'updatedAfter'] = null;
- }
- if (this.updatedBefore != null) {
- json[r'updatedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedBefore!.millisecondsSinceEpoch
- : this.updatedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'updatedBefore'] = null;
- }
- if (this.visibility != null) {
- json[r'visibility'] = this.visibility;
- } else {
- // json[r'visibility'] = null;
- }
- if (this.withDeleted != null) {
- json[r'withDeleted'] = this.withDeleted;
- } else {
- // json[r'withDeleted'] = null;
- }
- if (this.withExif != null) {
- json[r'withExif'] = this.withExif;
- } else {
- // json[r'withExif'] = null;
- }
- if (this.withPeople != null) {
- json[r'withPeople'] = this.withPeople;
- } else {
- // json[r'withPeople'] = null;
- }
- if (this.withStacked != null) {
- json[r'withStacked'] = this.withStacked;
- } else {
- // json[r'withStacked'] = null;
+ if (this.albumIds.isPresent) {
+ final value = this.albumIds.value;
+ json[r'albumIds'] = value;
+ }
+ if (this.checksum.isPresent) {
+ final value = this.checksum.value;
+ json[r'checksum'] = value;
+ }
+ if (this.city.isPresent) {
+ final value = this.city.value;
+ json[r'city'] = value;
+ }
+ if (this.country.isPresent) {
+ final value = this.country.value;
+ json[r'country'] = value;
+ }
+ if (this.createdAfter.isPresent) {
+ final value = this.createdAfter.value;
+ json[r'createdAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.createdBefore.isPresent) {
+ final value = this.createdBefore.value;
+ json[r'createdBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
+ }
+ if (this.encodedVideoPath.isPresent) {
+ final value = this.encodedVideoPath.value;
+ json[r'encodedVideoPath'] = value;
+ }
+ if (this.id.isPresent) {
+ final value = this.id.value;
+ json[r'id'] = value;
+ }
+ if (this.isEncoded.isPresent) {
+ final value = this.isEncoded.value;
+ json[r'isEncoded'] = value;
+ }
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
+ }
+ if (this.isMotion.isPresent) {
+ final value = this.isMotion.value;
+ json[r'isMotion'] = value;
+ }
+ if (this.isNotInAlbum.isPresent) {
+ final value = this.isNotInAlbum.value;
+ json[r'isNotInAlbum'] = value;
+ }
+ if (this.isOffline.isPresent) {
+ final value = this.isOffline.value;
+ json[r'isOffline'] = value;
+ }
+ if (this.lensModel.isPresent) {
+ final value = this.lensModel.value;
+ json[r'lensModel'] = value;
+ }
+ if (this.libraryId.isPresent) {
+ final value = this.libraryId.value;
+ json[r'libraryId'] = value;
+ }
+ if (this.make.isPresent) {
+ final value = this.make.value;
+ json[r'make'] = value;
+ }
+ if (this.model.isPresent) {
+ final value = this.model.value;
+ json[r'model'] = value;
+ }
+ if (this.ocr.isPresent) {
+ final value = this.ocr.value;
+ json[r'ocr'] = value;
+ }
+ if (this.order.isPresent) {
+ final value = this.order.value;
+ json[r'order'] = value;
+ }
+ if (this.originalFileName.isPresent) {
+ final value = this.originalFileName.value;
+ json[r'originalFileName'] = value;
+ }
+ if (this.originalPath.isPresent) {
+ final value = this.originalPath.value;
+ json[r'originalPath'] = value;
+ }
+ if (this.page.isPresent) {
+ final value = this.page.value;
+ json[r'page'] = value;
+ }
+ if (this.personIds.isPresent) {
+ final value = this.personIds.value;
+ json[r'personIds'] = value;
+ }
+ if (this.previewPath.isPresent) {
+ final value = this.previewPath.value;
+ json[r'previewPath'] = value;
+ }
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
+ }
+ if (this.size.isPresent) {
+ final value = this.size.value;
+ json[r'size'] = value;
+ }
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
+ }
+ if (this.tagIds.isPresent) {
+ final value = this.tagIds.value;
+ json[r'tagIds'] = value;
+ }
+ if (this.takenAfter.isPresent) {
+ final value = this.takenAfter.value;
+ json[r'takenAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.takenBefore.isPresent) {
+ final value = this.takenBefore.value;
+ json[r'takenBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.thumbnailPath.isPresent) {
+ final value = this.thumbnailPath.value;
+ json[r'thumbnailPath'] = value;
+ }
+ if (this.trashedAfter.isPresent) {
+ final value = this.trashedAfter.value;
+ json[r'trashedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedBefore.isPresent) {
+ final value = this.trashedBefore.value;
+ json[r'trashedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.type.isPresent) {
+ final value = this.type.value;
+ json[r'type'] = value;
+ }
+ if (this.updatedAfter.isPresent) {
+ final value = this.updatedAfter.value;
+ json[r'updatedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.updatedBefore.isPresent) {
+ final value = this.updatedBefore.value;
+ json[r'updatedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.visibility.isPresent) {
+ final value = this.visibility.value;
+ json[r'visibility'] = value;
+ }
+ if (this.withDeleted.isPresent) {
+ final value = this.withDeleted.value;
+ json[r'withDeleted'] = value;
+ }
+ if (this.withExif.isPresent) {
+ final value = this.withExif.value;
+ json[r'withExif'] = value;
+ }
+ if (this.withPeople.isPresent) {
+ final value = this.withPeople.value;
+ json[r'withPeople'] = value;
+ }
+ if (this.withStacked.isPresent) {
+ final value = this.withStacked.value;
+ json[r'withStacked'] = value;
}
return json;
}
@@ -701,54 +667,54 @@ class MetadataSearchDto {
final json = value.cast<String, dynamic>();
return MetadataSearchDto(
- albumIds: json[r'albumIds'] is Iterable
+ albumIds: json.containsKey(r'albumIds') ? Optional.present(json[r'albumIds'] is Iterable
? (json[r'albumIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- checksum: mapValueOfType<String>(json, r'checksum'),
- city: mapValueOfType<String>(json, r'city'),
- country: mapValueOfType<String>(json, r'country'),
- createdAfter: mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- createdBefore: mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- description: mapValueOfType<String>(json, r'description'),
- encodedVideoPath: mapValueOfType<String>(json, r'encodedVideoPath'),
- id: mapValueOfType<String>(json, r'id'),
- isEncoded: mapValueOfType<bool>(json, r'isEncoded'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isMotion: mapValueOfType<bool>(json, r'isMotion'),
- isNotInAlbum: mapValueOfType<bool>(json, r'isNotInAlbum'),
- isOffline: mapValueOfType<bool>(json, r'isOffline'),
- lensModel: mapValueOfType<String>(json, r'lensModel'),
- libraryId: mapValueOfType<String>(json, r'libraryId'),
- make: mapValueOfType<String>(json, r'make'),
- model: mapValueOfType<String>(json, r'model'),
- ocr: mapValueOfType<String>(json, r'ocr'),
- order: AssetOrder.fromJson(json[r'order']),
- originalFileName: mapValueOfType<String>(json, r'originalFileName'),
- originalPath: mapValueOfType<String>(json, r'originalPath'),
- page: mapValueOfType<int>(json, r'page'),
- personIds: json[r'personIds'] is Iterable
+ : const []) : const Optional.absent(),
+ checksum: json.containsKey(r'checksum') ? Optional.present(mapValueOfType<String>(json, r'checksum')) : const Optional.absent(),
+ city: json.containsKey(r'city') ? Optional.present(mapValueOfType<String>(json, r'city')) : const Optional.absent(),
+ country: json.containsKey(r'country') ? Optional.present(mapValueOfType<String>(json, r'country')) : const Optional.absent(),
+ createdAfter: json.containsKey(r'createdAfter') ? Optional.present(mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ createdBefore: json.containsKey(r'createdBefore') ? Optional.present(mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ encodedVideoPath: json.containsKey(r'encodedVideoPath') ? Optional.present(mapValueOfType<String>(json, r'encodedVideoPath')) : const Optional.absent(),
+ id: json.containsKey(r'id') ? Optional.present(mapValueOfType<String>(json, r'id')) : const Optional.absent(),
+ isEncoded: json.containsKey(r'isEncoded') ? Optional.present(mapValueOfType<bool>(json, r'isEncoded')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isMotion: json.containsKey(r'isMotion') ? Optional.present(mapValueOfType<bool>(json, r'isMotion')) : const Optional.absent(),
+ isNotInAlbum: json.containsKey(r'isNotInAlbum') ? Optional.present(mapValueOfType<bool>(json, r'isNotInAlbum')) : const Optional.absent(),
+ isOffline: json.containsKey(r'isOffline') ? Optional.present(mapValueOfType<bool>(json, r'isOffline')) : const Optional.absent(),
+ lensModel: json.containsKey(r'lensModel') ? Optional.present(mapValueOfType<String>(json, r'lensModel')) : const Optional.absent(),
+ libraryId: json.containsKey(r'libraryId') ? Optional.present(mapValueOfType<String>(json, r'libraryId')) : const Optional.absent(),
+ make: json.containsKey(r'make') ? Optional.present(mapValueOfType<String>(json, r'make')) : const Optional.absent(),
+ model: json.containsKey(r'model') ? Optional.present(mapValueOfType<String>(json, r'model')) : const Optional.absent(),
+ ocr: json.containsKey(r'ocr') ? Optional.present(mapValueOfType<String>(json, r'ocr')) : const Optional.absent(),
+ order: json.containsKey(r'order') ? Optional.present(AssetOrder.fromJson(json[r'order'])) : const Optional.absent(),
+ originalFileName: json.containsKey(r'originalFileName') ? Optional.present(mapValueOfType<String>(json, r'originalFileName')) : const Optional.absent(),
+ originalPath: json.containsKey(r'originalPath') ? Optional.present(mapValueOfType<String>(json, r'originalPath')) : const Optional.absent(),
+ page: json.containsKey(r'page') ? Optional.present(json[r'page'] == null ? null : int.parse('${json[r'page']}')) : const Optional.absent(),
+ personIds: json.containsKey(r'personIds') ? Optional.present(json[r'personIds'] is Iterable
? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- previewPath: mapValueOfType<String>(json, r'previewPath'),
- rating: mapValueOfType<int>(json, r'rating'),
- size: mapValueOfType<int>(json, r'size'),
- state: mapValueOfType<String>(json, r'state'),
- tagIds: json[r'tagIds'] is Iterable
+ : const []) : const Optional.absent(),
+ previewPath: json.containsKey(r'previewPath') ? Optional.present(mapValueOfType<String>(json, r'previewPath')) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ size: json.containsKey(r'size') ? Optional.present(json[r'size'] == null ? null : int.parse('${json[r'size']}')) : const Optional.absent(),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
+ tagIds: json.containsKey(r'tagIds') ? Optional.present(json[r'tagIds'] is Iterable
? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- takenAfter: mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- takenBefore: mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- thumbnailPath: mapValueOfType<String>(json, r'thumbnailPath'),
- trashedAfter: mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedBefore: mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- type: AssetTypeEnum.fromJson(json[r'type']),
- updatedAfter: mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- updatedBefore: mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- visibility: AssetVisibility.fromJson(json[r'visibility']),
- withDeleted: mapValueOfType<bool>(json, r'withDeleted'),
- withExif: mapValueOfType<bool>(json, r'withExif'),
- withPeople: mapValueOfType<bool>(json, r'withPeople'),
- withStacked: mapValueOfType<bool>(json, r'withStacked'),
+ : const []) : const Optional.absent(),
+ takenAfter: json.containsKey(r'takenAfter') ? Optional.present(mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ takenBefore: json.containsKey(r'takenBefore') ? Optional.present(mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ thumbnailPath: json.containsKey(r'thumbnailPath') ? Optional.present(mapValueOfType<String>(json, r'thumbnailPath')) : const Optional.absent(),
+ trashedAfter: json.containsKey(r'trashedAfter') ? Optional.present(mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedBefore: json.containsKey(r'trashedBefore') ? Optional.present(mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ type: json.containsKey(r'type') ? Optional.present(AssetTypeEnum.fromJson(json[r'type'])) : const Optional.absent(),
+ updatedAfter: json.containsKey(r'updatedAfter') ? Optional.present(mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ updatedBefore: json.containsKey(r'updatedBefore') ? Optional.present(mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
+ withDeleted: json.containsKey(r'withDeleted') ? Optional.present(mapValueOfType<bool>(json, r'withDeleted')) : const Optional.absent(),
+ withExif: json.containsKey(r'withExif') ? Optional.present(mapValueOfType<bool>(json, r'withExif')) : const Optional.absent(),
+ withPeople: json.containsKey(r'withPeople') ? Optional.present(mapValueOfType<bool>(json, r'withPeople')) : const Optional.absent(),
+ withStacked: json.containsKey(r'withStacked') ? Optional.present(mapValueOfType<bool>(json, r'withStacked')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/notification_create_dto.dart b/mobile/openapi/lib/model/notification_create_dto.dart
index f9771246f9..c6e7c02231 100644
--- a/mobile/openapi/lib/model/notification_create_dto.dart
+++ b/mobile/openapi/lib/model/notification_create_dto.dart
@@ -13,20 +13,20 @@ part of openapi.api;
class NotificationCreateDto {
/// Returns a new [NotificationCreateDto] instance.
NotificationCreateDto({
- this.data = const {},
- this.description,
- this.level,
- this.readAt,
+ this.data = const Optional.present(const {}),
+ this.description = const Optional.absent(),
+ this.level = const Optional.absent(),
+ this.readAt = const Optional.absent(),
required this.title,
- this.type,
+ this.type = const Optional.absent(),
required this.userId,
});
/// Additional notification data
- Map<String, Object> data;
+ Optional<Map<String, Object>?> data;
/// Notification description
- String? description;
+ Optional<String?> description;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -34,10 +34,10 @@ class NotificationCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- NotificationLevel? level;
+ Optional<NotificationLevel?> level;
/// Date when notification was read
- DateTime? readAt;
+ Optional<DateTime?> readAt;
/// Notification title
String title;
@@ -48,7 +48,7 @@ class NotificationCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- NotificationType? type;
+ Optional<NotificationType?> type;
/// User ID to send notification to
String userId;
@@ -79,29 +79,28 @@ class NotificationCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'data'] = this.data;
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.data.isPresent) {
+ final value = this.data.value;
+ json[r'data'] = value;
}
- if (this.level != null) {
- json[r'level'] = this.level;
- } else {
- // json[r'level'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.readAt != null) {
- json[r'readAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.readAt!.millisecondsSinceEpoch
- : this.readAt!.toUtc().toIso8601String();
- } else {
- // json[r'readAt'] = null;
+ if (this.level.isPresent) {
+ final value = this.level.value;
+ json[r'level'] = value;
+ }
+ if (this.readAt.isPresent) {
+ final value = this.readAt.value;
+ json[r'readAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
json[r'title'] = this.title;
- if (this.type != null) {
- json[r'type'] = this.type;
- } else {
- // json[r'type'] = null;
+ if (this.type.isPresent) {
+ final value = this.type.value;
+ json[r'type'] = value;
}
json[r'userId'] = this.userId;
return json;
@@ -116,12 +115,12 @@ class NotificationCreateDto {
final json = value.cast<String, dynamic>();
return NotificationCreateDto(
- data: mapCastOfType<String, Object>(json, r'data') ?? const {},
- description: mapValueOfType<String>(json, r'description'),
- level: NotificationLevel.fromJson(json[r'level']),
- readAt: mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ data: json.containsKey(r'data') ? Optional.present(mapCastOfType<String, Object>(json, r'data')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ level: json.containsKey(r'level') ? Optional.present(NotificationLevel.fromJson(json[r'level'])) : const Optional.absent(),
+ readAt: json.containsKey(r'readAt') ? Optional.present(mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
title: mapValueOfType<String>(json, r'title')!,
- type: NotificationType.fromJson(json[r'type']),
+ type: json.containsKey(r'type') ? Optional.present(NotificationType.fromJson(json[r'type'])) : const Optional.absent(),
userId: mapValueOfType<String>(json, r'userId')!,
);
}
diff --git a/mobile/openapi/lib/model/notification_dto.dart b/mobile/openapi/lib/model/notification_dto.dart
index ad0e79cb27..4e4fab8ee6 100644
--- a/mobile/openapi/lib/model/notification_dto.dart
+++ b/mobile/openapi/lib/model/notification_dto.dart
@@ -14,11 +14,11 @@ class NotificationDto {
/// Returns a new [NotificationDto] instance.
NotificationDto({
required this.createdAt,
- this.data = const {},
- this.description,
+ this.data = const Optional.present(const {}),
+ this.description = const Optional.absent(),
required this.id,
required this.level,
- this.readAt,
+ this.readAt = const Optional.absent(),
required this.title,
required this.type,
});
@@ -27,7 +27,7 @@ class NotificationDto {
DateTime createdAt;
/// Additional notification data
- Map<String, Object> data;
+ Optional<Map<String, Object>?> data;
/// Notification description
///
@@ -36,7 +36,7 @@ class NotificationDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
/// Notification ID
String id;
@@ -50,7 +50,7 @@ class NotificationDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? readAt;
+ Optional<DateTime?> readAt;
/// Notification title
String title;
@@ -88,20 +88,21 @@ class NotificationDto {
json[r'createdAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.createdAt.millisecondsSinceEpoch
: this.createdAt.toUtc().toIso8601String();
- json[r'data'] = this.data;
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.data.isPresent) {
+ final value = this.data.value;
+ json[r'data'] = value;
+ }
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
json[r'id'] = this.id;
json[r'level'] = this.level;
- if (this.readAt != null) {
- json[r'readAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.readAt!.millisecondsSinceEpoch
- : this.readAt!.toUtc().toIso8601String();
- } else {
- // json[r'readAt'] = null;
+ if (this.readAt.isPresent) {
+ final value = this.readAt.value;
+ json[r'readAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
json[r'title'] = this.title;
json[r'type'] = this.type;
@@ -118,11 +119,11 @@ class NotificationDto {
return NotificationDto(
createdAt: mapDateTime(json, r'createdAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
- data: mapCastOfType<String, Object>(json, r'data') ?? const {},
- description: mapValueOfType<String>(json, r'description'),
+ data: json.containsKey(r'data') ? Optional.present(mapCastOfType<String, Object>(json, r'data')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
level: NotificationLevel.fromJson(json[r'level'])!,
- readAt: mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ readAt: json.containsKey(r'readAt') ? Optional.present(mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
title: mapValueOfType<String>(json, r'title')!,
type: NotificationType.fromJson(json[r'type'])!,
);
diff --git a/mobile/openapi/lib/model/notification_update_all_dto.dart b/mobile/openapi/lib/model/notification_update_all_dto.dart
index 5ac61ededc..1a95e2647a 100644
--- a/mobile/openapi/lib/model/notification_update_all_dto.dart
+++ b/mobile/openapi/lib/model/notification_update_all_dto.dart
@@ -14,14 +14,14 @@ class NotificationUpdateAllDto {
/// Returns a new [NotificationUpdateAllDto] instance.
NotificationUpdateAllDto({
this.ids = const [],
- this.readAt,
+ this.readAt = const Optional.absent(),
});
/// Notification IDs to update
List<String> ids;
/// Date when notifications were read
- DateTime? readAt;
+ Optional<DateTime?> readAt;
@override
bool operator ==(Object other) => identical(this, other) || other is NotificationUpdateAllDto &&
@@ -40,12 +40,11 @@ class NotificationUpdateAllDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'ids'] = this.ids;
- if (this.readAt != null) {
- json[r'readAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.readAt!.millisecondsSinceEpoch
- : this.readAt!.toUtc().toIso8601String();
- } else {
- // json[r'readAt'] = null;
+ if (this.readAt.isPresent) {
+ final value = this.readAt.value;
+ json[r'readAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
return json;
}
@@ -62,7 +61,7 @@ class NotificationUpdateAllDto {
ids: json[r'ids'] is Iterable
? (json[r'ids'] as Iterable).cast<String>().toList(growable: false)
: const [],
- readAt: mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ readAt: json.containsKey(r'readAt') ? Optional.present(mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/notification_update_dto.dart b/mobile/openapi/lib/model/notification_update_dto.dart
index c5d949d7b2..4fa0cd5e97 100644
--- a/mobile/openapi/lib/model/notification_update_dto.dart
+++ b/mobile/openapi/lib/model/notification_update_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class NotificationUpdateDto {
/// Returns a new [NotificationUpdateDto] instance.
NotificationUpdateDto({
- this.readAt,
+ this.readAt = const Optional.absent(),
});
/// Date when notification was read
- DateTime? readAt;
+ Optional<DateTime?> readAt;
@override
bool operator ==(Object other) => identical(this, other) || other is NotificationUpdateDto &&
@@ -33,12 +33,11 @@ class NotificationUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.readAt != null) {
- json[r'readAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.readAt!.millisecondsSinceEpoch
- : this.readAt!.toUtc().toIso8601String();
- } else {
- // json[r'readAt'] = null;
+ if (this.readAt.isPresent) {
+ final value = this.readAt.value;
+ json[r'readAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
return json;
}
@@ -52,7 +51,7 @@ class NotificationUpdateDto {
final json = value.cast<String, dynamic>();
return NotificationUpdateDto(
- readAt: mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
+ readAt: json.containsKey(r'readAt') ? Optional.present(mapDateTime(json, r'readAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/o_auth_callback_dto.dart b/mobile/openapi/lib/model/o_auth_callback_dto.dart
index d94374935a..61de33e1a6 100644
--- a/mobile/openapi/lib/model/o_auth_callback_dto.dart
+++ b/mobile/openapi/lib/model/o_auth_callback_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class OAuthCallbackDto {
/// Returns a new [OAuthCallbackDto] instance.
OAuthCallbackDto({
- this.codeVerifier,
- this.state,
+ this.codeVerifier = const Optional.absent(),
+ this.state = const Optional.absent(),
required this.url,
});
@@ -25,7 +25,7 @@ class OAuthCallbackDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? codeVerifier;
+ Optional<String?> codeVerifier;
/// OAuth state parameter
///
@@ -34,7 +34,7 @@ class OAuthCallbackDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? state;
+ Optional<String?> state;
/// OAuth callback URL
String url;
@@ -57,15 +57,13 @@ class OAuthCallbackDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.codeVerifier != null) {
- json[r'codeVerifier'] = this.codeVerifier;
- } else {
- // json[r'codeVerifier'] = null;
+ if (this.codeVerifier.isPresent) {
+ final value = this.codeVerifier.value;
+ json[r'codeVerifier'] = value;
}
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
}
json[r'url'] = this.url;
return json;
@@ -80,8 +78,8 @@ class OAuthCallbackDto {
final json = value.cast<String, dynamic>();
return OAuthCallbackDto(
- codeVerifier: mapValueOfType<String>(json, r'codeVerifier'),
- state: mapValueOfType<String>(json, r'state'),
+ codeVerifier: json.containsKey(r'codeVerifier') ? Optional.present(mapValueOfType<String>(json, r'codeVerifier')) : const Optional.absent(),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
url: mapValueOfType<String>(json, r'url')!,
);
}
diff --git a/mobile/openapi/lib/model/o_auth_config_dto.dart b/mobile/openapi/lib/model/o_auth_config_dto.dart
index 1c9ce8d5b8..fb9f95dd92 100644
--- a/mobile/openapi/lib/model/o_auth_config_dto.dart
+++ b/mobile/openapi/lib/model/o_auth_config_dto.dart
@@ -13,9 +13,9 @@ part of openapi.api;
class OAuthConfigDto {
/// Returns a new [OAuthConfigDto] instance.
OAuthConfigDto({
- this.codeChallenge,
+ this.codeChallenge = const Optional.absent(),
required this.redirectUri,
- this.state,
+ this.state = const Optional.absent(),
});
/// OAuth code challenge (PKCE)
@@ -25,7 +25,7 @@ class OAuthConfigDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? codeChallenge;
+ Optional<String?> codeChallenge;
/// OAuth redirect URI
String redirectUri;
@@ -37,7 +37,7 @@ class OAuthConfigDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? state;
+ Optional<String?> state;
@override
bool operator ==(Object other) => identical(this, other) || other is OAuthConfigDto &&
@@ -57,16 +57,14 @@ class OAuthConfigDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.codeChallenge != null) {
- json[r'codeChallenge'] = this.codeChallenge;
- } else {
- // json[r'codeChallenge'] = null;
+ if (this.codeChallenge.isPresent) {
+ final value = this.codeChallenge.value;
+ json[r'codeChallenge'] = value;
}
json[r'redirectUri'] = this.redirectUri;
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
}
return json;
}
@@ -80,9 +78,9 @@ class OAuthConfigDto {
final json = value.cast<String, dynamic>();
return OAuthConfigDto(
- codeChallenge: mapValueOfType<String>(json, r'codeChallenge'),
+ codeChallenge: json.containsKey(r'codeChallenge') ? Optional.present(mapValueOfType<String>(json, r'codeChallenge')) : const Optional.absent(),
redirectUri: mapValueOfType<String>(json, r'redirectUri')!,
- state: mapValueOfType<String>(json, r'state'),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/o_auth_token_endpoint_auth_method.dart b/mobile/openapi/lib/model/o_auth_token_endpoint_auth_method.dart
index b63f027af7..414108068a 100644
--- a/mobile/openapi/lib/model/o_auth_token_endpoint_auth_method.dart
+++ b/mobile/openapi/lib/model/o_auth_token_endpoint_auth_method.dart
@@ -23,13 +23,13 @@ class OAuthTokenEndpointAuthMethod {
String toJson() => value;
- static const post = OAuthTokenEndpointAuthMethod._(r'client_secret_post');
- static const basic = OAuthTokenEndpointAuthMethod._(r'client_secret_basic');
+ static const clientSecretPost = OAuthTokenEndpointAuthMethod._(r'client_secret_post');
+ static const clientSecretBasic = OAuthTokenEndpointAuthMethod._(r'client_secret_basic');
/// List of all possible values in this [enum][OAuthTokenEndpointAuthMethod].
static const values = <OAuthTokenEndpointAuthMethod>[
- post,
- basic,
+ clientSecretPost,
+ clientSecretBasic,
];
static OAuthTokenEndpointAuthMethod? fromJson(dynamic value) => OAuthTokenEndpointAuthMethodTypeTransformer().decode(value);
@@ -68,8 +68,8 @@ class OAuthTokenEndpointAuthMethodTypeTransformer {
OAuthTokenEndpointAuthMethod? decode(dynamic data, {bool allowNull = true}) {
if (data != null) {
switch (data) {
- case r'client_secret_post': return OAuthTokenEndpointAuthMethod.post;
- case r'client_secret_basic': return OAuthTokenEndpointAuthMethod.basic;
+ case r'client_secret_post': return OAuthTokenEndpointAuthMethod.clientSecretPost;
+ case r'client_secret_basic': return OAuthTokenEndpointAuthMethod.clientSecretBasic;
default:
if (!allowNull) {
throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/mobile/openapi/lib/model/ocr_config.dart b/mobile/openapi/lib/model/ocr_config.dart
index 2ce5646731..d58c8af3ee 100644
--- a/mobile/openapi/lib/model/ocr_config.dart
+++ b/mobile/openapi/lib/model/ocr_config.dart
@@ -85,8 +85,8 @@ class OcrConfig {
return OcrConfig(
enabled: mapValueOfType<bool>(json, r'enabled')!,
maxResolution: mapValueOfType<int>(json, r'maxResolution')!,
- minDetectionScore: (mapValueOfType<num>(json, r'minDetectionScore')!).toDouble(),
- minRecognitionScore: (mapValueOfType<num>(json, r'minRecognitionScore')!).toDouble(),
+ minDetectionScore: mapValueOfType<double>(json, r'minDetectionScore')!,
+ minRecognitionScore: mapValueOfType<double>(json, r'minRecognitionScore')!,
modelName: mapValueOfType<String>(json, r'modelName')!,
);
}
diff --git a/mobile/openapi/lib/model/partner_direction.dart b/mobile/openapi/lib/model/partner_direction.dart
index c5e3b308ac..c1e38b8dfe 100644
--- a/mobile/openapi/lib/model/partner_direction.dart
+++ b/mobile/openapi/lib/model/partner_direction.dart
@@ -23,13 +23,13 @@ class PartnerDirection {
String toJson() => value;
- static const by = PartnerDirection._(r'shared-by');
- static const with_ = PartnerDirection._(r'shared-with');
+ static const sharedBy = PartnerDirection._(r'shared-by');
+ static const sharedWith = PartnerDirection._(r'shared-with');
/// List of all possible values in this [enum][PartnerDirection].
static const values = <PartnerDirection>[
- by,
- with_,
+ sharedBy,
+ sharedWith,
];
static PartnerDirection? fromJson(dynamic value) => PartnerDirectionTypeTransformer().decode(value);
@@ -68,8 +68,8 @@ class PartnerDirectionTypeTransformer {
PartnerDirection? decode(dynamic data, {bool allowNull = true}) {
if (data != null) {
switch (data) {
- case r'shared-by': return PartnerDirection.by;
- case r'shared-with': return PartnerDirection.with_;
+ case r'shared-by': return PartnerDirection.sharedBy;
+ case r'shared-with': return PartnerDirection.sharedWith;
default:
if (!allowNull) {
throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/mobile/openapi/lib/model/partner_response_dto.dart b/mobile/openapi/lib/model/partner_response_dto.dart
index f4612cc98a..967c5b930b 100644
--- a/mobile/openapi/lib/model/partner_response_dto.dart
+++ b/mobile/openapi/lib/model/partner_response_dto.dart
@@ -16,7 +16,7 @@ class PartnerResponseDto {
required this.avatarColor,
required this.email,
required this.id,
- this.inTimeline,
+ this.inTimeline = const Optional.absent(),
required this.name,
required this.profileChangedAt,
required this.profileImagePath,
@@ -37,7 +37,7 @@ class PartnerResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? inTimeline;
+ Optional<bool?> inTimeline;
/// User name
String name;
@@ -77,10 +77,9 @@ class PartnerResponseDto {
json[r'avatarColor'] = this.avatarColor;
json[r'email'] = this.email;
json[r'id'] = this.id;
- if (this.inTimeline != null) {
- json[r'inTimeline'] = this.inTimeline;
- } else {
- // json[r'inTimeline'] = null;
+ if (this.inTimeline.isPresent) {
+ final value = this.inTimeline.value;
+ json[r'inTimeline'] = value;
}
json[r'name'] = this.name;
json[r'profileChangedAt'] = this.profileChangedAt.toUtc().toIso8601String();
@@ -100,7 +99,7 @@ class PartnerResponseDto {
avatarColor: UserAvatarColor.fromJson(json[r'avatarColor'])!,
email: mapValueOfType<String>(json, r'email')!,
id: mapValueOfType<String>(json, r'id')!,
- inTimeline: mapValueOfType<bool>(json, r'inTimeline'),
+ inTimeline: json.containsKey(r'inTimeline') ? Optional.present(mapValueOfType<bool>(json, r'inTimeline')) : const Optional.absent(),
name: mapValueOfType<String>(json, r'name')!,
profileChangedAt: mapDateTime(json, r'profileChangedAt', r'')!,
profileImagePath: mapValueOfType<String>(json, r'profileImagePath')!,
diff --git a/mobile/openapi/lib/model/people_response.dart b/mobile/openapi/lib/model/people_response.dart
index ba7128d932..838d1e2324 100644
--- a/mobile/openapi/lib/model/people_response.dart
+++ b/mobile/openapi/lib/model/people_response.dart
@@ -14,7 +14,7 @@ class PeopleResponse {
/// Returns a new [PeopleResponse] instance.
PeopleResponse({
required this.enabled,
- this.minimumFaces,
+ this.minimumFaces = const Optional.absent(),
required this.sidebarWeb,
});
@@ -31,7 +31,7 @@ class PeopleResponse {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? minimumFaces;
+ Optional<int?> minimumFaces;
/// Whether people appear in web sidebar
bool sidebarWeb;
@@ -55,10 +55,9 @@ class PeopleResponse {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'enabled'] = this.enabled;
- if (this.minimumFaces != null) {
- json[r'minimumFaces'] = this.minimumFaces;
- } else {
- // json[r'minimumFaces'] = null;
+ if (this.minimumFaces.isPresent) {
+ final value = this.minimumFaces.value;
+ json[r'minimumFaces'] = value;
}
json[r'sidebarWeb'] = this.sidebarWeb;
return json;
@@ -74,7 +73,7 @@ class PeopleResponse {
return PeopleResponse(
enabled: mapValueOfType<bool>(json, r'enabled')!,
- minimumFaces: mapValueOfType<int>(json, r'minimumFaces'),
+ minimumFaces: json.containsKey(r'minimumFaces') ? Optional.present(json[r'minimumFaces'] == null ? null : int.parse('${json[r'minimumFaces']}')) : const Optional.absent(),
sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb')!,
);
}
diff --git a/mobile/openapi/lib/model/people_response_dto.dart b/mobile/openapi/lib/model/people_response_dto.dart
index 87edc6b4a7..f9fc157239 100644
--- a/mobile/openapi/lib/model/people_response_dto.dart
+++ b/mobile/openapi/lib/model/people_response_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class PeopleResponseDto {
/// Returns a new [PeopleResponseDto] instance.
PeopleResponseDto({
- this.hasNextPage,
+ this.hasNextPage = const Optional.absent(),
required this.hidden,
this.people = const [],
required this.total,
@@ -26,7 +26,7 @@ class PeopleResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? hasNextPage;
+ Optional<bool?> hasNextPage;
/// Number of hidden people
///
@@ -62,10 +62,9 @@ class PeopleResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.hasNextPage != null) {
- json[r'hasNextPage'] = this.hasNextPage;
- } else {
- // json[r'hasNextPage'] = null;
+ if (this.hasNextPage.isPresent) {
+ final value = this.hasNextPage.value;
+ json[r'hasNextPage'] = value;
}
json[r'hidden'] = this.hidden;
json[r'people'] = this.people;
@@ -82,7 +81,7 @@ class PeopleResponseDto {
final json = value.cast<String, dynamic>();
return PeopleResponseDto(
- hasNextPage: mapValueOfType<bool>(json, r'hasNextPage'),
+ hasNextPage: json.containsKey(r'hasNextPage') ? Optional.present(mapValueOfType<bool>(json, r'hasNextPage')) : const Optional.absent(),
hidden: mapValueOfType<int>(json, r'hidden')!,
people: PersonResponseDto.listFromJson(json[r'people']),
total: mapValueOfType<int>(json, r'total')!,
diff --git a/mobile/openapi/lib/model/people_update.dart b/mobile/openapi/lib/model/people_update.dart
index 05459f19f3..ea8ae73138 100644
--- a/mobile/openapi/lib/model/people_update.dart
+++ b/mobile/openapi/lib/model/people_update.dart
@@ -13,9 +13,9 @@ part of openapi.api;
class PeopleUpdate {
/// Returns a new [PeopleUpdate] instance.
PeopleUpdate({
- this.enabled,
- this.minimumFaces,
- this.sidebarWeb,
+ this.enabled = const Optional.absent(),
+ this.minimumFaces = const Optional.absent(),
+ this.sidebarWeb = const Optional.absent(),
});
/// Whether people are enabled
@@ -25,7 +25,7 @@ class PeopleUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// People face threshold
///
@@ -37,7 +37,7 @@ class PeopleUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? minimumFaces;
+ Optional<int?> minimumFaces;
/// Whether people appear in web sidebar
///
@@ -46,7 +46,7 @@ class PeopleUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? sidebarWeb;
+ Optional<bool?> sidebarWeb;
@override
bool operator ==(Object other) => identical(this, other) || other is PeopleUpdate &&
@@ -66,20 +66,17 @@ class PeopleUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
- if (this.minimumFaces != null) {
- json[r'minimumFaces'] = this.minimumFaces;
- } else {
- // json[r'minimumFaces'] = null;
+ if (this.minimumFaces.isPresent) {
+ final value = this.minimumFaces.value;
+ json[r'minimumFaces'] = value;
}
- if (this.sidebarWeb != null) {
- json[r'sidebarWeb'] = this.sidebarWeb;
- } else {
- // json[r'sidebarWeb'] = null;
+ if (this.sidebarWeb.isPresent) {
+ final value = this.sidebarWeb.value;
+ json[r'sidebarWeb'] = value;
}
return json;
}
@@ -93,9 +90,9 @@ class PeopleUpdate {
final json = value.cast<String, dynamic>();
return PeopleUpdate(
- enabled: mapValueOfType<bool>(json, r'enabled'),
- minimumFaces: mapValueOfType<int>(json, r'minimumFaces'),
- sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
+ minimumFaces: json.containsKey(r'minimumFaces') ? Optional.present(json[r'minimumFaces'] == null ? null : int.parse('${json[r'minimumFaces']}')) : const Optional.absent(),
+ sidebarWeb: json.containsKey(r'sidebarWeb') ? Optional.present(mapValueOfType<bool>(json, r'sidebarWeb')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/people_update_item.dart b/mobile/openapi/lib/model/people_update_item.dart
index 5e20aeb464..9ebbd93e28 100644
--- a/mobile/openapi/lib/model/people_update_item.dart
+++ b/mobile/openapi/lib/model/people_update_item.dart
@@ -13,20 +13,20 @@ part of openapi.api;
class PeopleUpdateItem {
/// Returns a new [PeopleUpdateItem] instance.
PeopleUpdateItem({
- this.birthDate,
- this.color,
- this.featureFaceAssetId,
+ this.birthDate = const Optional.absent(),
+ this.color = const Optional.absent(),
+ this.featureFaceAssetId = const Optional.absent(),
required this.id,
- this.isFavorite,
- this.isHidden,
- this.name,
+ this.isFavorite = const Optional.absent(),
+ this.isHidden = const Optional.absent(),
+ this.name = const Optional.absent(),
});
/// Person date of birth
- DateTime? birthDate;
+ Optional<DateTime?> birthDate;
/// Person color (hex)
- String? color;
+ Optional<String?> color;
/// Asset ID used for feature face thumbnail
///
@@ -35,7 +35,7 @@ class PeopleUpdateItem {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? featureFaceAssetId;
+ Optional<String?> featureFaceAssetId;
/// Person ID
String id;
@@ -47,7 +47,7 @@ class PeopleUpdateItem {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Person visibility (hidden)
///
@@ -56,7 +56,7 @@ class PeopleUpdateItem {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isHidden;
+ Optional<bool?> isHidden;
/// Person name
///
@@ -65,7 +65,7 @@ class PeopleUpdateItem {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
@override
bool operator ==(Object other) => identical(this, other) || other is PeopleUpdateItem &&
@@ -93,36 +93,30 @@ class PeopleUpdateItem {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.birthDate != null) {
- json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
- } else {
- // json[r'birthDate'] = null;
+ if (this.birthDate.isPresent) {
+ final value = this.birthDate.value;
+ json[r'birthDate'] = value == null ? null : _dateFormatter.format(value.toUtc());
}
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
- if (this.featureFaceAssetId != null) {
- json[r'featureFaceAssetId'] = this.featureFaceAssetId;
- } else {
- // json[r'featureFaceAssetId'] = null;
+ if (this.featureFaceAssetId.isPresent) {
+ final value = this.featureFaceAssetId.value;
+ json[r'featureFaceAssetId'] = value;
}
json[r'id'] = this.id;
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
}
- if (this.isHidden != null) {
- json[r'isHidden'] = this.isHidden;
- } else {
- // json[r'isHidden'] = null;
+ if (this.isHidden.isPresent) {
+ final value = this.isHidden.value;
+ json[r'isHidden'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
return json;
}
@@ -136,13 +130,13 @@ class PeopleUpdateItem {
final json = value.cast<String, dynamic>();
return PeopleUpdateItem(
- birthDate: mapDateTime(json, r'birthDate', r''),
- color: mapValueOfType<String>(json, r'color'),
- featureFaceAssetId: mapValueOfType<String>(json, r'featureFaceAssetId'),
+ birthDate: json.containsKey(r'birthDate') ? Optional.present(mapDateTime(json, r'birthDate', r'')) : const Optional.absent(),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
+ featureFaceAssetId: json.containsKey(r'featureFaceAssetId') ? Optional.present(mapValueOfType<String>(json, r'featureFaceAssetId')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isHidden: mapValueOfType<bool>(json, r'isHidden'),
- name: mapValueOfType<String>(json, r'name'),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isHidden: json.containsKey(r'isHidden') ? Optional.present(mapValueOfType<bool>(json, r'isHidden')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/person_create_dto.dart b/mobile/openapi/lib/model/person_create_dto.dart
index f2ba702c2f..22c9d2fb4c 100644
--- a/mobile/openapi/lib/model/person_create_dto.dart
+++ b/mobile/openapi/lib/model/person_create_dto.dart
@@ -13,18 +13,18 @@ part of openapi.api;
class PersonCreateDto {
/// Returns a new [PersonCreateDto] instance.
PersonCreateDto({
- this.birthDate,
- this.color,
- this.isFavorite,
- this.isHidden,
- this.name,
+ this.birthDate = const Optional.absent(),
+ this.color = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.isHidden = const Optional.absent(),
+ this.name = const Optional.absent(),
});
/// Person date of birth
- DateTime? birthDate;
+ Optional<DateTime?> birthDate;
/// Person color (hex)
- String? color;
+ Optional<String?> color;
/// Mark as favorite
///
@@ -33,7 +33,7 @@ class PersonCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Person visibility (hidden)
///
@@ -42,7 +42,7 @@ class PersonCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isHidden;
+ Optional<bool?> isHidden;
/// Person name
///
@@ -51,7 +51,7 @@ class PersonCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
@override
bool operator ==(Object other) => identical(this, other) || other is PersonCreateDto &&
@@ -75,30 +75,25 @@ class PersonCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.birthDate != null) {
- json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
- } else {
- // json[r'birthDate'] = null;
+ if (this.birthDate.isPresent) {
+ final value = this.birthDate.value;
+ json[r'birthDate'] = value == null ? null : _dateFormatter.format(value.toUtc());
}
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
}
- if (this.isHidden != null) {
- json[r'isHidden'] = this.isHidden;
- } else {
- // json[r'isHidden'] = null;
+ if (this.isHidden.isPresent) {
+ final value = this.isHidden.value;
+ json[r'isHidden'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
return json;
}
@@ -112,11 +107,11 @@ class PersonCreateDto {
final json = value.cast<String, dynamic>();
return PersonCreateDto(
- birthDate: mapDateTime(json, r'birthDate', r''),
- color: mapValueOfType<String>(json, r'color'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isHidden: mapValueOfType<bool>(json, r'isHidden'),
- name: mapValueOfType<String>(json, r'name'),
+ birthDate: json.containsKey(r'birthDate') ? Optional.present(mapDateTime(json, r'birthDate', r'')) : const Optional.absent(),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isHidden: json.containsKey(r'isHidden') ? Optional.present(mapValueOfType<bool>(json, r'isHidden')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/person_response_dto.dart b/mobile/openapi/lib/model/person_response_dto.dart
index 455dfb98d6..a99f465236 100644
--- a/mobile/openapi/lib/model/person_response_dto.dart
+++ b/mobile/openapi/lib/model/person_response_dto.dart
@@ -14,13 +14,13 @@ class PersonResponseDto {
/// Returns a new [PersonResponseDto] instance.
PersonResponseDto({
required this.birthDate,
- this.color,
+ this.color = const Optional.absent(),
required this.id,
- this.isFavorite,
+ this.isFavorite = const Optional.absent(),
required this.isHidden,
required this.name,
required this.thumbnailPath,
- this.updatedAt,
+ this.updatedAt = const Optional.absent(),
});
/// Person date of birth
@@ -33,7 +33,7 @@ class PersonResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? color;
+ Optional<String?> color;
/// Person ID
String id;
@@ -45,7 +45,7 @@ class PersonResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Is hidden
bool isHidden;
@@ -63,7 +63,7 @@ class PersonResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedAt;
+ Optional<DateTime?> updatedAt;
@override
bool operator ==(Object other) => identical(this, other) || other is PersonResponseDto &&
@@ -96,26 +96,23 @@ class PersonResponseDto {
if (this.birthDate != null) {
json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
} else {
- // json[r'birthDate'] = null;
+ json[r'birthDate'] = null;
}
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
json[r'id'] = this.id;
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
}
json[r'isHidden'] = this.isHidden;
json[r'name'] = this.name;
json[r'thumbnailPath'] = this.thumbnailPath;
- if (this.updatedAt != null) {
- json[r'updatedAt'] = this.updatedAt!.toUtc().toIso8601String();
- } else {
- // json[r'updatedAt'] = null;
+ if (this.updatedAt.isPresent) {
+ final value = this.updatedAt.value;
+ json[r'updatedAt'] = value == null ? null : value.toUtc().toIso8601String();
}
return json;
}
@@ -130,13 +127,13 @@ class PersonResponseDto {
return PersonResponseDto(
birthDate: mapDateTime(json, r'birthDate', r''),
- color: mapValueOfType<String>(json, r'color'),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
isHidden: mapValueOfType<bool>(json, r'isHidden')!,
name: mapValueOfType<String>(json, r'name')!,
thumbnailPath: mapValueOfType<String>(json, r'thumbnailPath')!,
- updatedAt: mapDateTime(json, r'updatedAt', r''),
+ updatedAt: json.containsKey(r'updatedAt') ? Optional.present(mapDateTime(json, r'updatedAt', r'')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/person_update_dto.dart b/mobile/openapi/lib/model/person_update_dto.dart
index b56940e51d..56b99606ee 100644
--- a/mobile/openapi/lib/model/person_update_dto.dart
+++ b/mobile/openapi/lib/model/person_update_dto.dart
@@ -13,19 +13,19 @@ part of openapi.api;
class PersonUpdateDto {
/// Returns a new [PersonUpdateDto] instance.
PersonUpdateDto({
- this.birthDate,
- this.color,
- this.featureFaceAssetId,
- this.isFavorite,
- this.isHidden,
- this.name,
+ this.birthDate = const Optional.absent(),
+ this.color = const Optional.absent(),
+ this.featureFaceAssetId = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.isHidden = const Optional.absent(),
+ this.name = const Optional.absent(),
});
/// Person date of birth
- DateTime? birthDate;
+ Optional<DateTime?> birthDate;
/// Person color (hex)
- String? color;
+ Optional<String?> color;
/// Asset ID used for feature face thumbnail
///
@@ -34,7 +34,7 @@ class PersonUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? featureFaceAssetId;
+ Optional<String?> featureFaceAssetId;
/// Mark as favorite
///
@@ -43,7 +43,7 @@ class PersonUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Person visibility (hidden)
///
@@ -52,7 +52,7 @@ class PersonUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isHidden;
+ Optional<bool?> isHidden;
/// Person name
///
@@ -61,7 +61,7 @@ class PersonUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
@override
bool operator ==(Object other) => identical(this, other) || other is PersonUpdateDto &&
@@ -87,35 +87,29 @@ class PersonUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.birthDate != null) {
- json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
- } else {
- // json[r'birthDate'] = null;
+ if (this.birthDate.isPresent) {
+ final value = this.birthDate.value;
+ json[r'birthDate'] = value == null ? null : _dateFormatter.format(value.toUtc());
}
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
- if (this.featureFaceAssetId != null) {
- json[r'featureFaceAssetId'] = this.featureFaceAssetId;
- } else {
- // json[r'featureFaceAssetId'] = null;
+ if (this.featureFaceAssetId.isPresent) {
+ final value = this.featureFaceAssetId.value;
+ json[r'featureFaceAssetId'] = value;
}
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
}
- if (this.isHidden != null) {
- json[r'isHidden'] = this.isHidden;
- } else {
- // json[r'isHidden'] = null;
+ if (this.isHidden.isPresent) {
+ final value = this.isHidden.value;
+ json[r'isHidden'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
return json;
}
@@ -129,12 +123,12 @@ class PersonUpdateDto {
final json = value.cast<String, dynamic>();
return PersonUpdateDto(
- birthDate: mapDateTime(json, r'birthDate', r''),
- color: mapValueOfType<String>(json, r'color'),
- featureFaceAssetId: mapValueOfType<String>(json, r'featureFaceAssetId'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isHidden: mapValueOfType<bool>(json, r'isHidden'),
- name: mapValueOfType<String>(json, r'name'),
+ birthDate: json.containsKey(r'birthDate') ? Optional.present(mapDateTime(json, r'birthDate', r'')) : const Optional.absent(),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
+ featureFaceAssetId: json.containsKey(r'featureFaceAssetId') ? Optional.present(mapValueOfType<String>(json, r'featureFaceAssetId')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isHidden: json.containsKey(r'isHidden') ? Optional.present(mapValueOfType<bool>(json, r'isHidden')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/pin_code_change_dto.dart b/mobile/openapi/lib/model/pin_code_change_dto.dart
index 068cc9e91b..42c244933f 100644
--- a/mobile/openapi/lib/model/pin_code_change_dto.dart
+++ b/mobile/openapi/lib/model/pin_code_change_dto.dart
@@ -14,8 +14,8 @@ class PinCodeChangeDto {
/// Returns a new [PinCodeChangeDto] instance.
PinCodeChangeDto({
required this.newPinCode,
- this.password,
- this.pinCode,
+ this.password = const Optional.absent(),
+ this.pinCode = const Optional.absent(),
});
/// New PIN code (4-6 digits)
@@ -28,7 +28,7 @@ class PinCodeChangeDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? password;
+ Optional<String?> password;
/// New PIN code (4-6 digits)
///
@@ -37,7 +37,7 @@ class PinCodeChangeDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? pinCode;
+ Optional<String?> pinCode;
@override
bool operator ==(Object other) => identical(this, other) || other is PinCodeChangeDto &&
@@ -58,15 +58,13 @@ class PinCodeChangeDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'newPinCode'] = this.newPinCode;
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
}
- if (this.pinCode != null) {
- json[r'pinCode'] = this.pinCode;
- } else {
- // json[r'pinCode'] = null;
+ if (this.pinCode.isPresent) {
+ final value = this.pinCode.value;
+ json[r'pinCode'] = value;
}
return json;
}
@@ -81,8 +79,8 @@ class PinCodeChangeDto {
return PinCodeChangeDto(
newPinCode: mapValueOfType<String>(json, r'newPinCode')!,
- password: mapValueOfType<String>(json, r'password'),
- pinCode: mapValueOfType<String>(json, r'pinCode'),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
+ pinCode: json.containsKey(r'pinCode') ? Optional.present(mapValueOfType<String>(json, r'pinCode')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/pin_code_reset_dto.dart b/mobile/openapi/lib/model/pin_code_reset_dto.dart
index c37be76f18..04ad61eeeb 100644
--- a/mobile/openapi/lib/model/pin_code_reset_dto.dart
+++ b/mobile/openapi/lib/model/pin_code_reset_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class PinCodeResetDto {
/// Returns a new [PinCodeResetDto] instance.
PinCodeResetDto({
- this.password,
- this.pinCode,
+ this.password = const Optional.absent(),
+ this.pinCode = const Optional.absent(),
});
/// User password (required if PIN code is not provided)
@@ -24,7 +24,7 @@ class PinCodeResetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? password;
+ Optional<String?> password;
/// New PIN code (4-6 digits)
///
@@ -33,7 +33,7 @@ class PinCodeResetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? pinCode;
+ Optional<String?> pinCode;
@override
bool operator ==(Object other) => identical(this, other) || other is PinCodeResetDto &&
@@ -51,15 +51,13 @@ class PinCodeResetDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
}
- if (this.pinCode != null) {
- json[r'pinCode'] = this.pinCode;
- } else {
- // json[r'pinCode'] = null;
+ if (this.pinCode.isPresent) {
+ final value = this.pinCode.value;
+ json[r'pinCode'] = value;
}
return json;
}
@@ -73,8 +71,8 @@ class PinCodeResetDto {
final json = value.cast<String, dynamic>();
return PinCodeResetDto(
- password: mapValueOfType<String>(json, r'password'),
- pinCode: mapValueOfType<String>(json, r'pinCode'),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
+ pinCode: json.containsKey(r'pinCode') ? Optional.present(mapValueOfType<String>(json, r'pinCode')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/places_response_dto.dart b/mobile/openapi/lib/model/places_response_dto.dart
index 94aa58eba4..f222c33dba 100644
--- a/mobile/openapi/lib/model/places_response_dto.dart
+++ b/mobile/openapi/lib/model/places_response_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class PlacesResponseDto {
/// Returns a new [PlacesResponseDto] instance.
PlacesResponseDto({
- this.admin1name,
- this.admin2name,
+ this.admin1name = const Optional.absent(),
+ this.admin2name = const Optional.absent(),
required this.latitude,
required this.longitude,
required this.name,
@@ -27,7 +27,7 @@ class PlacesResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? admin1name;
+ Optional<String?> admin1name;
/// Administrative level 2 name (county/district)
///
@@ -36,7 +36,7 @@ class PlacesResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? admin2name;
+ Optional<String?> admin2name;
/// Latitude coordinate
num latitude;
@@ -69,15 +69,13 @@ class PlacesResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.admin1name != null) {
- json[r'admin1name'] = this.admin1name;
- } else {
- // json[r'admin1name'] = null;
+ if (this.admin1name.isPresent) {
+ final value = this.admin1name.value;
+ json[r'admin1name'] = value;
}
- if (this.admin2name != null) {
- json[r'admin2name'] = this.admin2name;
- } else {
- // json[r'admin2name'] = null;
+ if (this.admin2name.isPresent) {
+ final value = this.admin2name.value;
+ json[r'admin2name'] = value;
}
json[r'latitude'] = this.latitude;
json[r'longitude'] = this.longitude;
@@ -94,8 +92,8 @@ class PlacesResponseDto {
final json = value.cast<String, dynamic>();
return PlacesResponseDto(
- admin1name: mapValueOfType<String>(json, r'admin1name'),
- admin2name: mapValueOfType<String>(json, r'admin2name'),
+ admin1name: json.containsKey(r'admin1name') ? Optional.present(mapValueOfType<String>(json, r'admin1name')) : const Optional.absent(),
+ admin2name: json.containsKey(r'admin2name') ? Optional.present(mapValueOfType<String>(json, r'admin2name')) : const Optional.absent(),
latitude: num.parse('${json[r'latitude']}'),
longitude: num.parse('${json[r'longitude']}'),
name: mapValueOfType<String>(json, r'name')!,
diff --git a/mobile/openapi/lib/model/plugin_method_response_dto.dart b/mobile/openapi/lib/model/plugin_method_response_dto.dart
index 2887f4cc16..1d6f9c1331 100644
--- a/mobile/openapi/lib/model/plugin_method_response_dto.dart
+++ b/mobile/openapi/lib/model/plugin_method_response_dto.dart
@@ -17,7 +17,7 @@ class PluginMethodResponseDto {
required this.hostFunctions,
required this.key,
required this.name,
- this.schema,
+ this.schema = const Optional.absent(),
required this.title,
this.types = const [],
this.uiHints = const [],
@@ -40,7 +40,7 @@ class PluginMethodResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- Object? schema;
+ Optional<Object?> schema;
/// Title
String title;
@@ -83,10 +83,9 @@ class PluginMethodResponseDto {
json[r'hostFunctions'] = this.hostFunctions;
json[r'key'] = this.key;
json[r'name'] = this.name;
- if (this.schema != null) {
- json[r'schema'] = this.schema;
- } else {
- // json[r'schema'] = null;
+ if (this.schema.isPresent) {
+ final value = this.schema.value;
+ json[r'schema'] = value;
}
json[r'title'] = this.title;
json[r'types'] = this.types;
@@ -107,7 +106,7 @@ class PluginMethodResponseDto {
hostFunctions: mapValueOfType<bool>(json, r'hostFunctions')!,
key: mapValueOfType<String>(json, r'key')!,
name: mapValueOfType<String>(json, r'name')!,
- schema: mapValueOfType<Object>(json, r'schema'),
+ schema: json.containsKey(r'schema') ? Optional.present(mapValueOfType<Object>(json, r'schema')) : const Optional.absent(),
title: mapValueOfType<String>(json, r'title')!,
types: WorkflowType.listFromJson(json[r'types']),
uiHints: json[r'uiHints'] is Iterable
diff --git a/mobile/openapi/lib/model/plugin_template_step_response_dto.dart b/mobile/openapi/lib/model/plugin_template_step_response_dto.dart
index b58884d1cd..3e82c029d2 100644
--- a/mobile/openapi/lib/model/plugin_template_step_response_dto.dart
+++ b/mobile/openapi/lib/model/plugin_template_step_response_dto.dart
@@ -14,7 +14,7 @@ class PluginTemplateStepResponseDto {
/// Returns a new [PluginTemplateStepResponseDto] instance.
PluginTemplateStepResponseDto({
this.config = const {},
- this.enabled,
+ this.enabled = const Optional.absent(),
required this.method,
});
@@ -28,7 +28,7 @@ class PluginTemplateStepResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Step plugin method
String method;
@@ -54,12 +54,11 @@ class PluginTemplateStepResponseDto {
if (this.config != null) {
json[r'config'] = this.config;
} else {
- // json[r'config'] = null;
+ json[r'config'] = null;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
json[r'method'] = this.method;
return json;
@@ -75,7 +74,7 @@ class PluginTemplateStepResponseDto {
return PluginTemplateStepResponseDto(
config: mapCastOfType<String, Object>(json, r'config'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
method: mapValueOfType<String>(json, r'method')!,
);
}
diff --git a/mobile/openapi/lib/model/purchase_update.dart b/mobile/openapi/lib/model/purchase_update.dart
index 913faf9bc4..8a0fb0d1b6 100644
--- a/mobile/openapi/lib/model/purchase_update.dart
+++ b/mobile/openapi/lib/model/purchase_update.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class PurchaseUpdate {
/// Returns a new [PurchaseUpdate] instance.
PurchaseUpdate({
- this.hideBuyButtonUntil,
- this.showSupportBadge,
+ this.hideBuyButtonUntil = const Optional.absent(),
+ this.showSupportBadge = const Optional.absent(),
});
/// Date until which to hide buy button
@@ -24,7 +24,7 @@ class PurchaseUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? hideBuyButtonUntil;
+ Optional<String?> hideBuyButtonUntil;
/// Whether to show support badge
///
@@ -33,7 +33,7 @@ class PurchaseUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? showSupportBadge;
+ Optional<bool?> showSupportBadge;
@override
bool operator ==(Object other) => identical(this, other) || other is PurchaseUpdate &&
@@ -51,15 +51,13 @@ class PurchaseUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.hideBuyButtonUntil != null) {
- json[r'hideBuyButtonUntil'] = this.hideBuyButtonUntil;
- } else {
- // json[r'hideBuyButtonUntil'] = null;
+ if (this.hideBuyButtonUntil.isPresent) {
+ final value = this.hideBuyButtonUntil.value;
+ json[r'hideBuyButtonUntil'] = value;
}
- if (this.showSupportBadge != null) {
- json[r'showSupportBadge'] = this.showSupportBadge;
- } else {
- // json[r'showSupportBadge'] = null;
+ if (this.showSupportBadge.isPresent) {
+ final value = this.showSupportBadge.value;
+ json[r'showSupportBadge'] = value;
}
return json;
}
@@ -73,8 +71,8 @@ class PurchaseUpdate {
final json = value.cast<String, dynamic>();
return PurchaseUpdate(
- hideBuyButtonUntil: mapValueOfType<String>(json, r'hideBuyButtonUntil'),
- showSupportBadge: mapValueOfType<bool>(json, r'showSupportBadge'),
+ hideBuyButtonUntil: json.containsKey(r'hideBuyButtonUntil') ? Optional.present(mapValueOfType<String>(json, r'hideBuyButtonUntil')) : const Optional.absent(),
+ showSupportBadge: json.containsKey(r'showSupportBadge') ? Optional.present(mapValueOfType<bool>(json, r'showSupportBadge')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/queue_command_dto.dart b/mobile/openapi/lib/model/queue_command_dto.dart
index fb68d85583..e8a600923f 100644
--- a/mobile/openapi/lib/model/queue_command_dto.dart
+++ b/mobile/openapi/lib/model/queue_command_dto.dart
@@ -14,7 +14,7 @@ class QueueCommandDto {
/// Returns a new [QueueCommandDto] instance.
QueueCommandDto({
required this.command,
- this.force,
+ this.force = const Optional.absent(),
});
QueueCommand command;
@@ -26,7 +26,7 @@ class QueueCommandDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? force;
+ Optional<bool?> force;
@override
bool operator ==(Object other) => identical(this, other) || other is QueueCommandDto &&
@@ -45,10 +45,9 @@ class QueueCommandDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'command'] = this.command;
- if (this.force != null) {
- json[r'force'] = this.force;
- } else {
- // json[r'force'] = null;
+ if (this.force.isPresent) {
+ final value = this.force.value;
+ json[r'force'] = value;
}
return json;
}
@@ -63,7 +62,7 @@ class QueueCommandDto {
return QueueCommandDto(
command: QueueCommand.fromJson(json[r'command'])!,
- force: mapValueOfType<bool>(json, r'force'),
+ force: json.containsKey(r'force') ? Optional.present(mapValueOfType<bool>(json, r'force')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/queue_delete_dto.dart b/mobile/openapi/lib/model/queue_delete_dto.dart
index d319238f92..9511313f01 100644
--- a/mobile/openapi/lib/model/queue_delete_dto.dart
+++ b/mobile/openapi/lib/model/queue_delete_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class QueueDeleteDto {
/// Returns a new [QueueDeleteDto] instance.
QueueDeleteDto({
- this.failed,
+ this.failed = const Optional.absent(),
});
/// If true, will also remove failed jobs from the queue.
@@ -23,7 +23,7 @@ class QueueDeleteDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? failed;
+ Optional<bool?> failed;
@override
bool operator ==(Object other) => identical(this, other) || other is QueueDeleteDto &&
@@ -39,10 +39,9 @@ class QueueDeleteDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.failed != null) {
- json[r'failed'] = this.failed;
- } else {
- // json[r'failed'] = null;
+ if (this.failed.isPresent) {
+ final value = this.failed.value;
+ json[r'failed'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class QueueDeleteDto {
final json = value.cast<String, dynamic>();
return QueueDeleteDto(
- failed: mapValueOfType<bool>(json, r'failed'),
+ failed: json.containsKey(r'failed') ? Optional.present(mapValueOfType<bool>(json, r'failed')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/queue_job_response_dto.dart b/mobile/openapi/lib/model/queue_job_response_dto.dart
index 06d433edad..ca26361a3e 100644
--- a/mobile/openapi/lib/model/queue_job_response_dto.dart
+++ b/mobile/openapi/lib/model/queue_job_response_dto.dart
@@ -14,7 +14,7 @@ class QueueJobResponseDto {
/// Returns a new [QueueJobResponseDto] instance.
QueueJobResponseDto({
this.data = const {},
- this.id,
+ this.id = const Optional.absent(),
required this.name,
required this.timestamp,
});
@@ -29,7 +29,7 @@ class QueueJobResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? id;
+ Optional<String?> id;
JobName name;
@@ -60,10 +60,9 @@ class QueueJobResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'data'] = this.data;
- if (this.id != null) {
- json[r'id'] = this.id;
- } else {
- // json[r'id'] = null;
+ if (this.id.isPresent) {
+ final value = this.id.value;
+ json[r'id'] = value;
}
json[r'name'] = this.name;
json[r'timestamp'] = this.timestamp;
@@ -80,7 +79,7 @@ class QueueJobResponseDto {
return QueueJobResponseDto(
data: mapCastOfType<String, Object>(json, r'data')!,
- id: mapValueOfType<String>(json, r'id'),
+ id: json.containsKey(r'id') ? Optional.present(mapValueOfType<String>(json, r'id')) : const Optional.absent(),
name: JobName.fromJson(json[r'name'])!,
timestamp: mapValueOfType<int>(json, r'timestamp')!,
);
diff --git a/mobile/openapi/lib/model/queue_update_dto.dart b/mobile/openapi/lib/model/queue_update_dto.dart
index 28aafe95f7..189fc219f1 100644
--- a/mobile/openapi/lib/model/queue_update_dto.dart
+++ b/mobile/openapi/lib/model/queue_update_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class QueueUpdateDto {
/// Returns a new [QueueUpdateDto] instance.
QueueUpdateDto({
- this.isPaused,
+ this.isPaused = const Optional.absent(),
});
/// Whether to pause the queue
@@ -23,7 +23,7 @@ class QueueUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isPaused;
+ Optional<bool?> isPaused;
@override
bool operator ==(Object other) => identical(this, other) || other is QueueUpdateDto &&
@@ -39,10 +39,9 @@ class QueueUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.isPaused != null) {
- json[r'isPaused'] = this.isPaused;
- } else {
- // json[r'isPaused'] = null;
+ if (this.isPaused.isPresent) {
+ final value = this.isPaused.value;
+ json[r'isPaused'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class QueueUpdateDto {
final json = value.cast<String, dynamic>();
return QueueUpdateDto(
- isPaused: mapValueOfType<bool>(json, r'isPaused'),
+ isPaused: json.containsKey(r'isPaused') ? Optional.present(mapValueOfType<bool>(json, r'isPaused')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/random_search_dto.dart b/mobile/openapi/lib/model/random_search_dto.dart
index 728072639c..89d0fd4d35 100644
--- a/mobile/openapi/lib/model/random_search_dto.dart
+++ b/mobile/openapi/lib/model/random_search_dto.dart
@@ -13,48 +13,48 @@ part of openapi.api;
class RandomSearchDto {
/// Returns a new [RandomSearchDto] instance.
RandomSearchDto({
- this.albumIds = const [],
- this.city,
- this.country,
- this.createdAfter,
- this.createdBefore,
- this.isEncoded,
- this.isFavorite,
- this.isMotion,
- this.isNotInAlbum,
- this.isOffline,
- this.lensModel,
- this.libraryId,
- this.make,
- this.model,
- this.ocr,
- this.personIds = const [],
- this.rating,
- this.size,
- this.state,
- this.tagIds = const [],
- this.takenAfter,
- this.takenBefore,
- this.trashedAfter,
- this.trashedBefore,
- this.type,
- this.updatedAfter,
- this.updatedBefore,
- this.visibility,
- this.withDeleted,
- this.withExif,
- this.withPeople,
- this.withStacked,
+ this.albumIds = const Optional.present(const []),
+ this.city = const Optional.absent(),
+ this.country = const Optional.absent(),
+ this.createdAfter = const Optional.absent(),
+ this.createdBefore = const Optional.absent(),
+ this.isEncoded = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.isMotion = const Optional.absent(),
+ this.isNotInAlbum = const Optional.absent(),
+ this.isOffline = const Optional.absent(),
+ this.lensModel = const Optional.absent(),
+ this.libraryId = const Optional.absent(),
+ this.make = const Optional.absent(),
+ this.model = const Optional.absent(),
+ this.ocr = const Optional.absent(),
+ this.personIds = const Optional.present(const []),
+ this.rating = const Optional.absent(),
+ this.size = const Optional.absent(),
+ this.state = const Optional.absent(),
+ this.tagIds = const Optional.present(const []),
+ this.takenAfter = const Optional.absent(),
+ this.takenBefore = const Optional.absent(),
+ this.trashedAfter = const Optional.absent(),
+ this.trashedBefore = const Optional.absent(),
+ this.type = const Optional.absent(),
+ this.updatedAfter = const Optional.absent(),
+ this.updatedBefore = const Optional.absent(),
+ this.visibility = const Optional.absent(),
+ this.withDeleted = const Optional.absent(),
+ this.withExif = const Optional.absent(),
+ this.withPeople = const Optional.absent(),
+ this.withStacked = const Optional.absent(),
});
/// Filter by album IDs
- List<String> albumIds;
+ Optional<List<String>?> albumIds;
/// Filter by city name
- String? city;
+ Optional<String?> city;
/// Filter by country name
- String? country;
+ Optional<String?> country;
/// Filter by creation date (after)
///
@@ -63,7 +63,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdAfter;
+ Optional<DateTime?> createdAfter;
/// Filter by creation date (before)
///
@@ -72,7 +72,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdBefore;
+ Optional<DateTime?> createdBefore;
/// Filter by encoded status
///
@@ -81,7 +81,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isEncoded;
+ Optional<bool?> isEncoded;
/// Filter by favorite status
///
@@ -90,7 +90,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Filter by motion photo status
///
@@ -99,7 +99,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isMotion;
+ Optional<bool?> isMotion;
/// Filter assets not in any album
///
@@ -108,7 +108,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isNotInAlbum;
+ Optional<bool?> isNotInAlbum;
/// Filter by offline status
///
@@ -117,19 +117,19 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isOffline;
+ Optional<bool?> isOffline;
/// Filter by lens model
- String? lensModel;
+ Optional<String?> lensModel;
/// Library ID to filter by
- String? libraryId;
+ Optional<String?> libraryId;
/// Filter by camera make
- String? make;
+ Optional<String?> make;
/// Filter by camera model
- String? model;
+ Optional<String?> model;
/// Filter by OCR text content
///
@@ -138,16 +138,16 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? ocr;
+ Optional<String?> ocr;
/// Filter by person IDs
- List<String> personIds;
+ Optional<List<String>?> personIds;
/// Filter by rating [1-5], or null for unrated
///
/// Minimum value: -1
/// Maximum value: 5
- int? rating;
+ Optional<int?> rating;
/// Number of results to return
///
@@ -159,13 +159,13 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? size;
+ Optional<int?> size;
/// Filter by state/province name
- String? state;
+ Optional<String?> state;
/// Filter by tag IDs
- List<String>? tagIds;
+ Optional<List<String>?> tagIds;
/// Filter by taken date (after)
///
@@ -174,7 +174,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenAfter;
+ Optional<DateTime?> takenAfter;
/// Filter by taken date (before)
///
@@ -183,7 +183,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenBefore;
+ Optional<DateTime?> takenBefore;
/// Filter by trash date (after)
///
@@ -192,7 +192,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedAfter;
+ Optional<DateTime?> trashedAfter;
/// Filter by trash date (before)
///
@@ -201,7 +201,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedBefore;
+ Optional<DateTime?> trashedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -209,7 +209,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetTypeEnum? type;
+ Optional<AssetTypeEnum?> type;
/// Filter by update date (after)
///
@@ -218,7 +218,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedAfter;
+ Optional<DateTime?> updatedAfter;
/// Filter by update date (before)
///
@@ -227,7 +227,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedBefore;
+ Optional<DateTime?> updatedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -235,7 +235,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetVisibility? visibility;
+ Optional<AssetVisibility?> visibility;
/// Include deleted assets
///
@@ -244,7 +244,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withDeleted;
+ Optional<bool?> withDeleted;
/// Include EXIF data in response
///
@@ -253,7 +253,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withExif;
+ Optional<bool?> withExif;
/// Include people data in response
///
@@ -262,7 +262,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withPeople;
+ Optional<bool?> withPeople;
/// Include stacked assets
///
@@ -271,7 +271,7 @@ class RandomSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withStacked;
+ Optional<bool?> withStacked;
@override
bool operator ==(Object other) => identical(this, other) || other is RandomSearchDto &&
@@ -349,173 +349,149 @@ class RandomSearchDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'albumIds'] = this.albumIds;
- if (this.city != null) {
- json[r'city'] = this.city;
- } else {
- // json[r'city'] = null;
- }
- if (this.country != null) {
- json[r'country'] = this.country;
- } else {
- // json[r'country'] = null;
- }
- if (this.createdAfter != null) {
- json[r'createdAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdAfter!.millisecondsSinceEpoch
- : this.createdAfter!.toUtc().toIso8601String();
- } else {
- // json[r'createdAfter'] = null;
- }
- if (this.createdBefore != null) {
- json[r'createdBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdBefore!.millisecondsSinceEpoch
- : this.createdBefore!.toUtc().toIso8601String();
- } else {
- // json[r'createdBefore'] = null;
- }
- if (this.isEncoded != null) {
- json[r'isEncoded'] = this.isEncoded;
- } else {
- // json[r'isEncoded'] = null;
- }
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
- }
- if (this.isMotion != null) {
- json[r'isMotion'] = this.isMotion;
- } else {
- // json[r'isMotion'] = null;
- }
- if (this.isNotInAlbum != null) {
- json[r'isNotInAlbum'] = this.isNotInAlbum;
- } else {
- // json[r'isNotInAlbum'] = null;
- }
- if (this.isOffline != null) {
- json[r'isOffline'] = this.isOffline;
- } else {
- // json[r'isOffline'] = null;
- }
- if (this.lensModel != null) {
- json[r'lensModel'] = this.lensModel;
- } else {
- // json[r'lensModel'] = null;
- }
- if (this.libraryId != null) {
- json[r'libraryId'] = this.libraryId;
- } else {
- // json[r'libraryId'] = null;
- }
- if (this.make != null) {
- json[r'make'] = this.make;
- } else {
- // json[r'make'] = null;
- }
- if (this.model != null) {
- json[r'model'] = this.model;
- } else {
- // json[r'model'] = null;
- }
- if (this.ocr != null) {
- json[r'ocr'] = this.ocr;
- } else {
- // json[r'ocr'] = null;
- }
- json[r'personIds'] = this.personIds;
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
- }
- if (this.size != null) {
- json[r'size'] = this.size;
- } else {
- // json[r'size'] = null;
- }
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
- }
- if (this.tagIds != null) {
- json[r'tagIds'] = this.tagIds;
- } else {
- // json[r'tagIds'] = null;
- }
- if (this.takenAfter != null) {
- json[r'takenAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenAfter!.millisecondsSinceEpoch
- : this.takenAfter!.toUtc().toIso8601String();
- } else {
- // json[r'takenAfter'] = null;
- }
- if (this.takenBefore != null) {
- json[r'takenBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenBefore!.millisecondsSinceEpoch
- : this.takenBefore!.toUtc().toIso8601String();
- } else {
- // json[r'takenBefore'] = null;
- }
- if (this.trashedAfter != null) {
- json[r'trashedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedAfter!.millisecondsSinceEpoch
- : this.trashedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'trashedAfter'] = null;
- }
- if (this.trashedBefore != null) {
- json[r'trashedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedBefore!.millisecondsSinceEpoch
- : this.trashedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'trashedBefore'] = null;
- }
- if (this.type != null) {
- json[r'type'] = this.type;
- } else {
- // json[r'type'] = null;
- }
- if (this.updatedAfter != null) {
- json[r'updatedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedAfter!.millisecondsSinceEpoch
- : this.updatedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'updatedAfter'] = null;
- }
- if (this.updatedBefore != null) {
- json[r'updatedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedBefore!.millisecondsSinceEpoch
- : this.updatedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'updatedBefore'] = null;
- }
- if (this.visibility != null) {
- json[r'visibility'] = this.visibility;
- } else {
- // json[r'visibility'] = null;
- }
- if (this.withDeleted != null) {
- json[r'withDeleted'] = this.withDeleted;
- } else {
- // json[r'withDeleted'] = null;
- }
- if (this.withExif != null) {
- json[r'withExif'] = this.withExif;
- } else {
- // json[r'withExif'] = null;
- }
- if (this.withPeople != null) {
- json[r'withPeople'] = this.withPeople;
- } else {
- // json[r'withPeople'] = null;
- }
- if (this.withStacked != null) {
- json[r'withStacked'] = this.withStacked;
- } else {
- // json[r'withStacked'] = null;
+ if (this.albumIds.isPresent) {
+ final value = this.albumIds.value;
+ json[r'albumIds'] = value;
+ }
+ if (this.city.isPresent) {
+ final value = this.city.value;
+ json[r'city'] = value;
+ }
+ if (this.country.isPresent) {
+ final value = this.country.value;
+ json[r'country'] = value;
+ }
+ if (this.createdAfter.isPresent) {
+ final value = this.createdAfter.value;
+ json[r'createdAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.createdBefore.isPresent) {
+ final value = this.createdBefore.value;
+ json[r'createdBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.isEncoded.isPresent) {
+ final value = this.isEncoded.value;
+ json[r'isEncoded'] = value;
+ }
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
+ }
+ if (this.isMotion.isPresent) {
+ final value = this.isMotion.value;
+ json[r'isMotion'] = value;
+ }
+ if (this.isNotInAlbum.isPresent) {
+ final value = this.isNotInAlbum.value;
+ json[r'isNotInAlbum'] = value;
+ }
+ if (this.isOffline.isPresent) {
+ final value = this.isOffline.value;
+ json[r'isOffline'] = value;
+ }
+ if (this.lensModel.isPresent) {
+ final value = this.lensModel.value;
+ json[r'lensModel'] = value;
+ }
+ if (this.libraryId.isPresent) {
+ final value = this.libraryId.value;
+ json[r'libraryId'] = value;
+ }
+ if (this.make.isPresent) {
+ final value = this.make.value;
+ json[r'make'] = value;
+ }
+ if (this.model.isPresent) {
+ final value = this.model.value;
+ json[r'model'] = value;
+ }
+ if (this.ocr.isPresent) {
+ final value = this.ocr.value;
+ json[r'ocr'] = value;
+ }
+ if (this.personIds.isPresent) {
+ final value = this.personIds.value;
+ json[r'personIds'] = value;
+ }
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
+ }
+ if (this.size.isPresent) {
+ final value = this.size.value;
+ json[r'size'] = value;
+ }
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
+ }
+ if (this.tagIds.isPresent) {
+ final value = this.tagIds.value;
+ json[r'tagIds'] = value;
+ }
+ if (this.takenAfter.isPresent) {
+ final value = this.takenAfter.value;
+ json[r'takenAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.takenBefore.isPresent) {
+ final value = this.takenBefore.value;
+ json[r'takenBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedAfter.isPresent) {
+ final value = this.trashedAfter.value;
+ json[r'trashedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedBefore.isPresent) {
+ final value = this.trashedBefore.value;
+ json[r'trashedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.type.isPresent) {
+ final value = this.type.value;
+ json[r'type'] = value;
+ }
+ if (this.updatedAfter.isPresent) {
+ final value = this.updatedAfter.value;
+ json[r'updatedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.updatedBefore.isPresent) {
+ final value = this.updatedBefore.value;
+ json[r'updatedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.visibility.isPresent) {
+ final value = this.visibility.value;
+ json[r'visibility'] = value;
+ }
+ if (this.withDeleted.isPresent) {
+ final value = this.withDeleted.value;
+ json[r'withDeleted'] = value;
+ }
+ if (this.withExif.isPresent) {
+ final value = this.withExif.value;
+ json[r'withExif'] = value;
+ }
+ if (this.withPeople.isPresent) {
+ final value = this.withPeople.value;
+ json[r'withPeople'] = value;
+ }
+ if (this.withStacked.isPresent) {
+ final value = this.withStacked.value;
+ json[r'withStacked'] = value;
}
return json;
}
@@ -529,44 +505,44 @@ class RandomSearchDto {
final json = value.cast<String, dynamic>();
return RandomSearchDto(
- albumIds: json[r'albumIds'] is Iterable
+ albumIds: json.containsKey(r'albumIds') ? Optional.present(json[r'albumIds'] is Iterable
? (json[r'albumIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- city: mapValueOfType<String>(json, r'city'),
- country: mapValueOfType<String>(json, r'country'),
- createdAfter: mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- createdBefore: mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- isEncoded: mapValueOfType<bool>(json, r'isEncoded'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isMotion: mapValueOfType<bool>(json, r'isMotion'),
- isNotInAlbum: mapValueOfType<bool>(json, r'isNotInAlbum'),
- isOffline: mapValueOfType<bool>(json, r'isOffline'),
- lensModel: mapValueOfType<String>(json, r'lensModel'),
- libraryId: mapValueOfType<String>(json, r'libraryId'),
- make: mapValueOfType<String>(json, r'make'),
- model: mapValueOfType<String>(json, r'model'),
- ocr: mapValueOfType<String>(json, r'ocr'),
- personIds: json[r'personIds'] is Iterable
+ : const []) : const Optional.absent(),
+ city: json.containsKey(r'city') ? Optional.present(mapValueOfType<String>(json, r'city')) : const Optional.absent(),
+ country: json.containsKey(r'country') ? Optional.present(mapValueOfType<String>(json, r'country')) : const Optional.absent(),
+ createdAfter: json.containsKey(r'createdAfter') ? Optional.present(mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ createdBefore: json.containsKey(r'createdBefore') ? Optional.present(mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ isEncoded: json.containsKey(r'isEncoded') ? Optional.present(mapValueOfType<bool>(json, r'isEncoded')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isMotion: json.containsKey(r'isMotion') ? Optional.present(mapValueOfType<bool>(json, r'isMotion')) : const Optional.absent(),
+ isNotInAlbum: json.containsKey(r'isNotInAlbum') ? Optional.present(mapValueOfType<bool>(json, r'isNotInAlbum')) : const Optional.absent(),
+ isOffline: json.containsKey(r'isOffline') ? Optional.present(mapValueOfType<bool>(json, r'isOffline')) : const Optional.absent(),
+ lensModel: json.containsKey(r'lensModel') ? Optional.present(mapValueOfType<String>(json, r'lensModel')) : const Optional.absent(),
+ libraryId: json.containsKey(r'libraryId') ? Optional.present(mapValueOfType<String>(json, r'libraryId')) : const Optional.absent(),
+ make: json.containsKey(r'make') ? Optional.present(mapValueOfType<String>(json, r'make')) : const Optional.absent(),
+ model: json.containsKey(r'model') ? Optional.present(mapValueOfType<String>(json, r'model')) : const Optional.absent(),
+ ocr: json.containsKey(r'ocr') ? Optional.present(mapValueOfType<String>(json, r'ocr')) : const Optional.absent(),
+ personIds: json.containsKey(r'personIds') ? Optional.present(json[r'personIds'] is Iterable
? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- rating: mapValueOfType<int>(json, r'rating'),
- size: mapValueOfType<int>(json, r'size'),
- state: mapValueOfType<String>(json, r'state'),
- tagIds: json[r'tagIds'] is Iterable
+ : const []) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ size: json.containsKey(r'size') ? Optional.present(json[r'size'] == null ? null : int.parse('${json[r'size']}')) : const Optional.absent(),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
+ tagIds: json.containsKey(r'tagIds') ? Optional.present(json[r'tagIds'] is Iterable
? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- takenAfter: mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- takenBefore: mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedAfter: mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedBefore: mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- type: AssetTypeEnum.fromJson(json[r'type']),
- updatedAfter: mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- updatedBefore: mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- visibility: AssetVisibility.fromJson(json[r'visibility']),
- withDeleted: mapValueOfType<bool>(json, r'withDeleted'),
- withExif: mapValueOfType<bool>(json, r'withExif'),
- withPeople: mapValueOfType<bool>(json, r'withPeople'),
- withStacked: mapValueOfType<bool>(json, r'withStacked'),
+ : const []) : const Optional.absent(),
+ takenAfter: json.containsKey(r'takenAfter') ? Optional.present(mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ takenBefore: json.containsKey(r'takenBefore') ? Optional.present(mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedAfter: json.containsKey(r'trashedAfter') ? Optional.present(mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedBefore: json.containsKey(r'trashedBefore') ? Optional.present(mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ type: json.containsKey(r'type') ? Optional.present(AssetTypeEnum.fromJson(json[r'type'])) : const Optional.absent(),
+ updatedAfter: json.containsKey(r'updatedAfter') ? Optional.present(mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ updatedBefore: json.containsKey(r'updatedBefore') ? Optional.present(mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
+ withDeleted: json.containsKey(r'withDeleted') ? Optional.present(mapValueOfType<bool>(json, r'withDeleted')) : const Optional.absent(),
+ withExif: json.containsKey(r'withExif') ? Optional.present(mapValueOfType<bool>(json, r'withExif')) : const Optional.absent(),
+ withPeople: json.containsKey(r'withPeople') ? Optional.present(mapValueOfType<bool>(json, r'withPeople')) : const Optional.absent(),
+ withStacked: json.containsKey(r'withStacked') ? Optional.present(mapValueOfType<bool>(json, r'withStacked')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/ratings_update.dart b/mobile/openapi/lib/model/ratings_update.dart
index 8079172e21..085efd97e6 100644
--- a/mobile/openapi/lib/model/ratings_update.dart
+++ b/mobile/openapi/lib/model/ratings_update.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class RatingsUpdate {
/// Returns a new [RatingsUpdate] instance.
RatingsUpdate({
- this.enabled,
+ this.enabled = const Optional.absent(),
});
/// Whether ratings are enabled
@@ -23,7 +23,7 @@ class RatingsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
@override
bool operator ==(Object other) => identical(this, other) || other is RatingsUpdate &&
@@ -39,10 +39,9 @@ class RatingsUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class RatingsUpdate {
final json = value.cast<String, dynamic>();
return RatingsUpdate(
- enabled: mapValueOfType<bool>(json, r'enabled'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/reverse_geocoding_state_response_dto.dart b/mobile/openapi/lib/model/reverse_geocoding_state_response_dto.dart
index 6ad8c1a7b9..07bb226ac0 100644
--- a/mobile/openapi/lib/model/reverse_geocoding_state_response_dto.dart
+++ b/mobile/openapi/lib/model/reverse_geocoding_state_response_dto.dart
@@ -42,12 +42,12 @@ class ReverseGeocodingStateResponseDto {
if (this.lastImportFileName != null) {
json[r'lastImportFileName'] = this.lastImportFileName;
} else {
- // json[r'lastImportFileName'] = null;
+ json[r'lastImportFileName'] = null;
}
if (this.lastUpdate != null) {
json[r'lastUpdate'] = this.lastUpdate;
} else {
- // json[r'lastUpdate'] = null;
+ json[r'lastUpdate'] = null;
}
return json;
}
diff --git a/mobile/openapi/lib/model/search_asset_response_dto.dart b/mobile/openapi/lib/model/search_asset_response_dto.dart
index f4ffade26b..82971c3c49 100644
--- a/mobile/openapi/lib/model/search_asset_response_dto.dart
+++ b/mobile/openapi/lib/model/search_asset_response_dto.dart
@@ -67,7 +67,7 @@ class SearchAssetResponseDto {
if (this.nextPage != null) {
json[r'nextPage'] = this.nextPage;
} else {
- // json[r'nextPage'] = null;
+ json[r'nextPage'] = null;
}
json[r'total'] = this.total;
return json;
diff --git a/mobile/openapi/lib/model/server_about_response_dto.dart b/mobile/openapi/lib/model/server_about_response_dto.dart
index 1ae53763fe..dcfb279204 100644
--- a/mobile/openapi/lib/model/server_about_response_dto.dart
+++ b/mobile/openapi/lib/model/server_about_response_dto.dart
@@ -13,25 +13,25 @@ part of openapi.api;
class ServerAboutResponseDto {
/// Returns a new [ServerAboutResponseDto] instance.
ServerAboutResponseDto({
- this.build,
- this.buildImage,
- this.buildImageUrl,
- this.buildUrl,
- this.exiftool,
- this.ffmpeg,
- this.imagemagick,
- this.libvips,
+ this.build = const Optional.absent(),
+ this.buildImage = const Optional.absent(),
+ this.buildImageUrl = const Optional.absent(),
+ this.buildUrl = const Optional.absent(),
+ this.exiftool = const Optional.absent(),
+ this.ffmpeg = const Optional.absent(),
+ this.imagemagick = const Optional.absent(),
+ this.libvips = const Optional.absent(),
required this.licensed,
- this.nodejs,
- this.repository,
- this.repositoryUrl,
- this.sourceCommit,
- this.sourceRef,
- this.sourceUrl,
- this.thirdPartyBugFeatureUrl,
- this.thirdPartyDocumentationUrl,
- this.thirdPartySourceUrl,
- this.thirdPartySupportUrl,
+ this.nodejs = const Optional.absent(),
+ this.repository = const Optional.absent(),
+ this.repositoryUrl = const Optional.absent(),
+ this.sourceCommit = const Optional.absent(),
+ this.sourceRef = const Optional.absent(),
+ this.sourceUrl = const Optional.absent(),
+ this.thirdPartyBugFeatureUrl = const Optional.absent(),
+ this.thirdPartyDocumentationUrl = const Optional.absent(),
+ this.thirdPartySourceUrl = const Optional.absent(),
+ this.thirdPartySupportUrl = const Optional.absent(),
required this.version,
required this.versionUrl,
});
@@ -43,7 +43,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? build;
+ Optional<String?> build;
/// Build image name
///
@@ -52,7 +52,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? buildImage;
+ Optional<String?> buildImage;
/// Build image URL
///
@@ -61,7 +61,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? buildImageUrl;
+ Optional<String?> buildImageUrl;
/// Build URL
///
@@ -70,7 +70,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? buildUrl;
+ Optional<String?> buildUrl;
/// ExifTool version
///
@@ -79,7 +79,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? exiftool;
+ Optional<String?> exiftool;
/// FFmpeg version
///
@@ -88,7 +88,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? ffmpeg;
+ Optional<String?> ffmpeg;
/// ImageMagick version
///
@@ -97,7 +97,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? imagemagick;
+ Optional<String?> imagemagick;
/// libvips version
///
@@ -106,7 +106,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? libvips;
+ Optional<String?> libvips;
/// Whether the server is licensed
bool licensed;
@@ -118,7 +118,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? nodejs;
+ Optional<String?> nodejs;
/// Repository name
///
@@ -127,7 +127,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? repository;
+ Optional<String?> repository;
/// Repository URL
///
@@ -136,7 +136,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? repositoryUrl;
+ Optional<String?> repositoryUrl;
/// Source commit hash
///
@@ -145,7 +145,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? sourceCommit;
+ Optional<String?> sourceCommit;
/// Source reference (branch/tag)
///
@@ -154,7 +154,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? sourceRef;
+ Optional<String?> sourceRef;
/// Source URL
///
@@ -163,7 +163,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? sourceUrl;
+ Optional<String?> sourceUrl;
/// Third-party bug/feature URL
///
@@ -172,7 +172,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? thirdPartyBugFeatureUrl;
+ Optional<String?> thirdPartyBugFeatureUrl;
/// Third-party documentation URL
///
@@ -181,7 +181,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? thirdPartyDocumentationUrl;
+ Optional<String?> thirdPartyDocumentationUrl;
/// Third-party source URL
///
@@ -190,7 +190,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? thirdPartySourceUrl;
+ Optional<String?> thirdPartySourceUrl;
/// Third-party support URL
///
@@ -199,7 +199,7 @@ class ServerAboutResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? thirdPartySupportUrl;
+ Optional<String?> thirdPartySupportUrl;
/// Server version
String version;
@@ -261,96 +261,78 @@ class ServerAboutResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.build != null) {
- json[r'build'] = this.build;
- } else {
- // json[r'build'] = null;
+ if (this.build.isPresent) {
+ final value = this.build.value;
+ json[r'build'] = value;
}
- if (this.buildImage != null) {
- json[r'buildImage'] = this.buildImage;
- } else {
- // json[r'buildImage'] = null;
+ if (this.buildImage.isPresent) {
+ final value = this.buildImage.value;
+ json[r'buildImage'] = value;
}
- if (this.buildImageUrl != null) {
- json[r'buildImageUrl'] = this.buildImageUrl;
- } else {
- // json[r'buildImageUrl'] = null;
+ if (this.buildImageUrl.isPresent) {
+ final value = this.buildImageUrl.value;
+ json[r'buildImageUrl'] = value;
}
- if (this.buildUrl != null) {
- json[r'buildUrl'] = this.buildUrl;
- } else {
- // json[r'buildUrl'] = null;
+ if (this.buildUrl.isPresent) {
+ final value = this.buildUrl.value;
+ json[r'buildUrl'] = value;
}
- if (this.exiftool != null) {
- json[r'exiftool'] = this.exiftool;
- } else {
- // json[r'exiftool'] = null;
+ if (this.exiftool.isPresent) {
+ final value = this.exiftool.value;
+ json[r'exiftool'] = value;
}
- if (this.ffmpeg != null) {
- json[r'ffmpeg'] = this.ffmpeg;
- } else {
- // json[r'ffmpeg'] = null;
+ if (this.ffmpeg.isPresent) {
+ final value = this.ffmpeg.value;
+ json[r'ffmpeg'] = value;
}
- if (this.imagemagick != null) {
- json[r'imagemagick'] = this.imagemagick;
- } else {
- // json[r'imagemagick'] = null;
+ if (this.imagemagick.isPresent) {
+ final value = this.imagemagick.value;
+ json[r'imagemagick'] = value;
}
- if (this.libvips != null) {
- json[r'libvips'] = this.libvips;
- } else {
- // json[r'libvips'] = null;
+ if (this.libvips.isPresent) {
+ final value = this.libvips.value;
+ json[r'libvips'] = value;
}
json[r'licensed'] = this.licensed;
- if (this.nodejs != null) {
- json[r'nodejs'] = this.nodejs;
- } else {
- // json[r'nodejs'] = null;
+ if (this.nodejs.isPresent) {
+ final value = this.nodejs.value;
+ json[r'nodejs'] = value;
}
- if (this.repository != null) {
- json[r'repository'] = this.repository;
- } else {
- // json[r'repository'] = null;
+ if (this.repository.isPresent) {
+ final value = this.repository.value;
+ json[r'repository'] = value;
}
- if (this.repositoryUrl != null) {
- json[r'repositoryUrl'] = this.repositoryUrl;
- } else {
- // json[r'repositoryUrl'] = null;
+ if (this.repositoryUrl.isPresent) {
+ final value = this.repositoryUrl.value;
+ json[r'repositoryUrl'] = value;
}
- if (this.sourceCommit != null) {
- json[r'sourceCommit'] = this.sourceCommit;
- } else {
- // json[r'sourceCommit'] = null;
+ if (this.sourceCommit.isPresent) {
+ final value = this.sourceCommit.value;
+ json[r'sourceCommit'] = value;
}
- if (this.sourceRef != null) {
- json[r'sourceRef'] = this.sourceRef;
- } else {
- // json[r'sourceRef'] = null;
+ if (this.sourceRef.isPresent) {
+ final value = this.sourceRef.value;
+ json[r'sourceRef'] = value;
}
- if (this.sourceUrl != null) {
- json[r'sourceUrl'] = this.sourceUrl;
- } else {
- // json[r'sourceUrl'] = null;
+ if (this.sourceUrl.isPresent) {
+ final value = this.sourceUrl.value;
+ json[r'sourceUrl'] = value;
}
- if (this.thirdPartyBugFeatureUrl != null) {
- json[r'thirdPartyBugFeatureUrl'] = this.thirdPartyBugFeatureUrl;
- } else {
- // json[r'thirdPartyBugFeatureUrl'] = null;
+ if (this.thirdPartyBugFeatureUrl.isPresent) {
+ final value = this.thirdPartyBugFeatureUrl.value;
+ json[r'thirdPartyBugFeatureUrl'] = value;
}
- if (this.thirdPartyDocumentationUrl != null) {
- json[r'thirdPartyDocumentationUrl'] = this.thirdPartyDocumentationUrl;
- } else {
- // json[r'thirdPartyDocumentationUrl'] = null;
+ if (this.thirdPartyDocumentationUrl.isPresent) {
+ final value = this.thirdPartyDocumentationUrl.value;
+ json[r'thirdPartyDocumentationUrl'] = value;
}
- if (this.thirdPartySourceUrl != null) {
- json[r'thirdPartySourceUrl'] = this.thirdPartySourceUrl;
- } else {
- // json[r'thirdPartySourceUrl'] = null;
+ if (this.thirdPartySourceUrl.isPresent) {
+ final value = this.thirdPartySourceUrl.value;
+ json[r'thirdPartySourceUrl'] = value;
}
- if (this.thirdPartySupportUrl != null) {
- json[r'thirdPartySupportUrl'] = this.thirdPartySupportUrl;
- } else {
- // json[r'thirdPartySupportUrl'] = null;
+ if (this.thirdPartySupportUrl.isPresent) {
+ final value = this.thirdPartySupportUrl.value;
+ json[r'thirdPartySupportUrl'] = value;
}
json[r'version'] = this.version;
json[r'versionUrl'] = this.versionUrl;
@@ -366,25 +348,25 @@ class ServerAboutResponseDto {
final json = value.cast<String, dynamic>();
return ServerAboutResponseDto(
- build: mapValueOfType<String>(json, r'build'),
- buildImage: mapValueOfType<String>(json, r'buildImage'),
- buildImageUrl: mapValueOfType<String>(json, r'buildImageUrl'),
- buildUrl: mapValueOfType<String>(json, r'buildUrl'),
- exiftool: mapValueOfType<String>(json, r'exiftool'),
- ffmpeg: mapValueOfType<String>(json, r'ffmpeg'),
- imagemagick: mapValueOfType<String>(json, r'imagemagick'),
- libvips: mapValueOfType<String>(json, r'libvips'),
+ build: json.containsKey(r'build') ? Optional.present(mapValueOfType<String>(json, r'build')) : const Optional.absent(),
+ buildImage: json.containsKey(r'buildImage') ? Optional.present(mapValueOfType<String>(json, r'buildImage')) : const Optional.absent(),
+ buildImageUrl: json.containsKey(r'buildImageUrl') ? Optional.present(mapValueOfType<String>(json, r'buildImageUrl')) : const Optional.absent(),
+ buildUrl: json.containsKey(r'buildUrl') ? Optional.present(mapValueOfType<String>(json, r'buildUrl')) : const Optional.absent(),
+ exiftool: json.containsKey(r'exiftool') ? Optional.present(mapValueOfType<String>(json, r'exiftool')) : const Optional.absent(),
+ ffmpeg: json.containsKey(r'ffmpeg') ? Optional.present(mapValueOfType<String>(json, r'ffmpeg')) : const Optional.absent(),
+ imagemagick: json.containsKey(r'imagemagick') ? Optional.present(mapValueOfType<String>(json, r'imagemagick')) : const Optional.absent(),
+ libvips: json.containsKey(r'libvips') ? Optional.present(mapValueOfType<String>(json, r'libvips')) : const Optional.absent(),
licensed: mapValueOfType<bool>(json, r'licensed')!,
- nodejs: mapValueOfType<String>(json, r'nodejs'),
- repository: mapValueOfType<String>(json, r'repository'),
- repositoryUrl: mapValueOfType<String>(json, r'repositoryUrl'),
- sourceCommit: mapValueOfType<String>(json, r'sourceCommit'),
- sourceRef: mapValueOfType<String>(json, r'sourceRef'),
- sourceUrl: mapValueOfType<String>(json, r'sourceUrl'),
- thirdPartyBugFeatureUrl: mapValueOfType<String>(json, r'thirdPartyBugFeatureUrl'),
- thirdPartyDocumentationUrl: mapValueOfType<String>(json, r'thirdPartyDocumentationUrl'),
- thirdPartySourceUrl: mapValueOfType<String>(json, r'thirdPartySourceUrl'),
- thirdPartySupportUrl: mapValueOfType<String>(json, r'thirdPartySupportUrl'),
+ nodejs: json.containsKey(r'nodejs') ? Optional.present(mapValueOfType<String>(json, r'nodejs')) : const Optional.absent(),
+ repository: json.containsKey(r'repository') ? Optional.present(mapValueOfType<String>(json, r'repository')) : const Optional.absent(),
+ repositoryUrl: json.containsKey(r'repositoryUrl') ? Optional.present(mapValueOfType<String>(json, r'repositoryUrl')) : const Optional.absent(),
+ sourceCommit: json.containsKey(r'sourceCommit') ? Optional.present(mapValueOfType<String>(json, r'sourceCommit')) : const Optional.absent(),
+ sourceRef: json.containsKey(r'sourceRef') ? Optional.present(mapValueOfType<String>(json, r'sourceRef')) : const Optional.absent(),
+ sourceUrl: json.containsKey(r'sourceUrl') ? Optional.present(mapValueOfType<String>(json, r'sourceUrl')) : const Optional.absent(),
+ thirdPartyBugFeatureUrl: json.containsKey(r'thirdPartyBugFeatureUrl') ? Optional.present(mapValueOfType<String>(json, r'thirdPartyBugFeatureUrl')) : const Optional.absent(),
+ thirdPartyDocumentationUrl: json.containsKey(r'thirdPartyDocumentationUrl') ? Optional.present(mapValueOfType<String>(json, r'thirdPartyDocumentationUrl')) : const Optional.absent(),
+ thirdPartySourceUrl: json.containsKey(r'thirdPartySourceUrl') ? Optional.present(mapValueOfType<String>(json, r'thirdPartySourceUrl')) : const Optional.absent(),
+ thirdPartySupportUrl: json.containsKey(r'thirdPartySupportUrl') ? Optional.present(mapValueOfType<String>(json, r'thirdPartySupportUrl')) : const Optional.absent(),
version: mapValueOfType<String>(json, r'version')!,
versionUrl: mapValueOfType<String>(json, r'versionUrl')!,
);
diff --git a/mobile/openapi/lib/model/server_storage_response_dto.dart b/mobile/openapi/lib/model/server_storage_response_dto.dart
index 4a66d54e37..f4f77c7f9b 100644
--- a/mobile/openapi/lib/model/server_storage_response_dto.dart
+++ b/mobile/openapi/lib/model/server_storage_response_dto.dart
@@ -101,7 +101,7 @@ class ServerStorageResponseDto {
diskAvailableRaw: mapValueOfType<int>(json, r'diskAvailableRaw')!,
diskSize: mapValueOfType<String>(json, r'diskSize')!,
diskSizeRaw: mapValueOfType<int>(json, r'diskSizeRaw')!,
- diskUsagePercentage: (mapValueOfType<num>(json, r'diskUsagePercentage')!).toDouble(),
+ diskUsagePercentage: mapValueOfType<double>(json, r'diskUsagePercentage')!,
diskUse: mapValueOfType<String>(json, r'diskUse')!,
diskUseRaw: mapValueOfType<int>(json, r'diskUseRaw')!,
);
diff --git a/mobile/openapi/lib/model/server_version_response_dto.dart b/mobile/openapi/lib/model/server_version_response_dto.dart
index eae574f335..8f4a192920 100644
--- a/mobile/openapi/lib/model/server_version_response_dto.dart
+++ b/mobile/openapi/lib/model/server_version_response_dto.dart
@@ -69,7 +69,7 @@ class ServerVersionResponseDto {
if (this.prerelease != null) {
json[r'prerelease'] = this.prerelease;
} else {
- // json[r'prerelease'] = null;
+ json[r'prerelease'] = null;
}
return json;
}
diff --git a/mobile/openapi/lib/model/session_create_dto.dart b/mobile/openapi/lib/model/session_create_dto.dart
index 37c07955cd..8033bb7f71 100644
--- a/mobile/openapi/lib/model/session_create_dto.dart
+++ b/mobile/openapi/lib/model/session_create_dto.dart
@@ -13,9 +13,9 @@ part of openapi.api;
class SessionCreateDto {
/// Returns a new [SessionCreateDto] instance.
SessionCreateDto({
- this.deviceOS,
- this.deviceType,
- this.duration,
+ this.deviceOS = const Optional.absent(),
+ this.deviceType = const Optional.absent(),
+ this.duration = const Optional.absent(),
});
/// Device OS
@@ -25,7 +25,7 @@ class SessionCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? deviceOS;
+ Optional<String?> deviceOS;
/// Device type
///
@@ -34,7 +34,7 @@ class SessionCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? deviceType;
+ Optional<String?> deviceType;
/// Session duration in seconds
///
@@ -46,7 +46,7 @@ class SessionCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? duration;
+ Optional<int?> duration;
@override
bool operator ==(Object other) => identical(this, other) || other is SessionCreateDto &&
@@ -66,20 +66,17 @@ class SessionCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.deviceOS != null) {
- json[r'deviceOS'] = this.deviceOS;
- } else {
- // json[r'deviceOS'] = null;
+ if (this.deviceOS.isPresent) {
+ final value = this.deviceOS.value;
+ json[r'deviceOS'] = value;
}
- if (this.deviceType != null) {
- json[r'deviceType'] = this.deviceType;
- } else {
- // json[r'deviceType'] = null;
+ if (this.deviceType.isPresent) {
+ final value = this.deviceType.value;
+ json[r'deviceType'] = value;
}
- if (this.duration != null) {
- json[r'duration'] = this.duration;
- } else {
- // json[r'duration'] = null;
+ if (this.duration.isPresent) {
+ final value = this.duration.value;
+ json[r'duration'] = value;
}
return json;
}
@@ -93,9 +90,9 @@ class SessionCreateDto {
final json = value.cast<String, dynamic>();
return SessionCreateDto(
- deviceOS: mapValueOfType<String>(json, r'deviceOS'),
- deviceType: mapValueOfType<String>(json, r'deviceType'),
- duration: mapValueOfType<int>(json, r'duration'),
+ deviceOS: json.containsKey(r'deviceOS') ? Optional.present(mapValueOfType<String>(json, r'deviceOS')) : const Optional.absent(),
+ deviceType: json.containsKey(r'deviceType') ? Optional.present(mapValueOfType<String>(json, r'deviceType')) : const Optional.absent(),
+ duration: json.containsKey(r'duration') ? Optional.present(json[r'duration'] == null ? null : int.parse('${json[r'duration']}')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/session_create_response_dto.dart b/mobile/openapi/lib/model/session_create_response_dto.dart
index f35232b0e8..497da9afe8 100644
--- a/mobile/openapi/lib/model/session_create_response_dto.dart
+++ b/mobile/openapi/lib/model/session_create_response_dto.dart
@@ -18,7 +18,7 @@ class SessionCreateResponseDto {
required this.current,
required this.deviceOS,
required this.deviceType,
- this.expiresAt,
+ this.expiresAt = const Optional.absent(),
required this.id,
required this.isPendingSyncReset,
required this.token,
@@ -47,7 +47,7 @@ class SessionCreateResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? expiresAt;
+ Optional<String?> expiresAt;
/// Session ID
String id;
@@ -96,16 +96,15 @@ class SessionCreateResponseDto {
if (this.appVersion != null) {
json[r'appVersion'] = this.appVersion;
} else {
- // json[r'appVersion'] = null;
+ json[r'appVersion'] = null;
}
json[r'createdAt'] = this.createdAt;
json[r'current'] = this.current;
json[r'deviceOS'] = this.deviceOS;
json[r'deviceType'] = this.deviceType;
- if (this.expiresAt != null) {
- json[r'expiresAt'] = this.expiresAt;
- } else {
- // json[r'expiresAt'] = null;
+ if (this.expiresAt.isPresent) {
+ final value = this.expiresAt.value;
+ json[r'expiresAt'] = value;
}
json[r'id'] = this.id;
json[r'isPendingSyncReset'] = this.isPendingSyncReset;
@@ -128,7 +127,7 @@ class SessionCreateResponseDto {
current: mapValueOfType<bool>(json, r'current')!,
deviceOS: mapValueOfType<String>(json, r'deviceOS')!,
deviceType: mapValueOfType<String>(json, r'deviceType')!,
- expiresAt: mapValueOfType<String>(json, r'expiresAt'),
+ expiresAt: json.containsKey(r'expiresAt') ? Optional.present(mapValueOfType<String>(json, r'expiresAt')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
isPendingSyncReset: mapValueOfType<bool>(json, r'isPendingSyncReset')!,
token: mapValueOfType<String>(json, r'token')!,
diff --git a/mobile/openapi/lib/model/session_response_dto.dart b/mobile/openapi/lib/model/session_response_dto.dart
index ed84160827..e1e20619cb 100644
--- a/mobile/openapi/lib/model/session_response_dto.dart
+++ b/mobile/openapi/lib/model/session_response_dto.dart
@@ -18,7 +18,7 @@ class SessionResponseDto {
required this.current,
required this.deviceOS,
required this.deviceType,
- this.expiresAt,
+ this.expiresAt = const Optional.absent(),
required this.id,
required this.isPendingSyncReset,
required this.updatedAt,
@@ -46,7 +46,7 @@ class SessionResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? expiresAt;
+ Optional<String?> expiresAt;
/// Session ID
String id;
@@ -90,16 +90,15 @@ class SessionResponseDto {
if (this.appVersion != null) {
json[r'appVersion'] = this.appVersion;
} else {
- // json[r'appVersion'] = null;
+ json[r'appVersion'] = null;
}
json[r'createdAt'] = this.createdAt;
json[r'current'] = this.current;
json[r'deviceOS'] = this.deviceOS;
json[r'deviceType'] = this.deviceType;
- if (this.expiresAt != null) {
- json[r'expiresAt'] = this.expiresAt;
- } else {
- // json[r'expiresAt'] = null;
+ if (this.expiresAt.isPresent) {
+ final value = this.expiresAt.value;
+ json[r'expiresAt'] = value;
}
json[r'id'] = this.id;
json[r'isPendingSyncReset'] = this.isPendingSyncReset;
@@ -121,7 +120,7 @@ class SessionResponseDto {
current: mapValueOfType<bool>(json, r'current')!,
deviceOS: mapValueOfType<String>(json, r'deviceOS')!,
deviceType: mapValueOfType<String>(json, r'deviceType')!,
- expiresAt: mapValueOfType<String>(json, r'expiresAt'),
+ expiresAt: json.containsKey(r'expiresAt') ? Optional.present(mapValueOfType<String>(json, r'expiresAt')) : const Optional.absent(),
id: mapValueOfType<String>(json, r'id')!,
isPendingSyncReset: mapValueOfType<bool>(json, r'isPendingSyncReset')!,
updatedAt: mapValueOfType<String>(json, r'updatedAt')!,
diff --git a/mobile/openapi/lib/model/session_unlock_dto.dart b/mobile/openapi/lib/model/session_unlock_dto.dart
index 48ee75fb05..960b58acf0 100644
--- a/mobile/openapi/lib/model/session_unlock_dto.dart
+++ b/mobile/openapi/lib/model/session_unlock_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class SessionUnlockDto {
/// Returns a new [SessionUnlockDto] instance.
SessionUnlockDto({
- this.password,
- this.pinCode,
+ this.password = const Optional.absent(),
+ this.pinCode = const Optional.absent(),
});
/// User password (required if PIN code is not provided)
@@ -24,7 +24,7 @@ class SessionUnlockDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? password;
+ Optional<String?> password;
/// New PIN code (4-6 digits)
///
@@ -33,7 +33,7 @@ class SessionUnlockDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? pinCode;
+ Optional<String?> pinCode;
@override
bool operator ==(Object other) => identical(this, other) || other is SessionUnlockDto &&
@@ -51,15 +51,13 @@ class SessionUnlockDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
}
- if (this.pinCode != null) {
- json[r'pinCode'] = this.pinCode;
- } else {
- // json[r'pinCode'] = null;
+ if (this.pinCode.isPresent) {
+ final value = this.pinCode.value;
+ json[r'pinCode'] = value;
}
return json;
}
@@ -73,8 +71,8 @@ class SessionUnlockDto {
final json = value.cast<String, dynamic>();
return SessionUnlockDto(
- password: mapValueOfType<String>(json, r'password'),
- pinCode: mapValueOfType<String>(json, r'pinCode'),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
+ pinCode: json.containsKey(r'pinCode') ? Optional.present(mapValueOfType<String>(json, r'pinCode')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/session_update_dto.dart b/mobile/openapi/lib/model/session_update_dto.dart
index 3ab430deaa..90cbaffaf4 100644
--- a/mobile/openapi/lib/model/session_update_dto.dart
+++ b/mobile/openapi/lib/model/session_update_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class SessionUpdateDto {
/// Returns a new [SessionUpdateDto] instance.
SessionUpdateDto({
- this.isPendingSyncReset,
+ this.isPendingSyncReset = const Optional.absent(),
});
/// Reset pending sync state
@@ -23,7 +23,7 @@ class SessionUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isPendingSyncReset;
+ Optional<bool?> isPendingSyncReset;
@override
bool operator ==(Object other) => identical(this, other) || other is SessionUpdateDto &&
@@ -39,10 +39,9 @@ class SessionUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.isPendingSyncReset != null) {
- json[r'isPendingSyncReset'] = this.isPendingSyncReset;
- } else {
- // json[r'isPendingSyncReset'] = null;
+ if (this.isPendingSyncReset.isPresent) {
+ final value = this.isPendingSyncReset.value;
+ json[r'isPendingSyncReset'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class SessionUpdateDto {
final json = value.cast<String, dynamic>();
return SessionUpdateDto(
- isPendingSyncReset: mapValueOfType<bool>(json, r'isPendingSyncReset'),
+ isPendingSyncReset: json.containsKey(r'isPendingSyncReset') ? Optional.present(mapValueOfType<bool>(json, r'isPendingSyncReset')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/set_maintenance_mode_dto.dart b/mobile/openapi/lib/model/set_maintenance_mode_dto.dart
index e7c9dc0d63..21f123bb84 100644
--- a/mobile/openapi/lib/model/set_maintenance_mode_dto.dart
+++ b/mobile/openapi/lib/model/set_maintenance_mode_dto.dart
@@ -14,7 +14,7 @@ class SetMaintenanceModeDto {
/// Returns a new [SetMaintenanceModeDto] instance.
SetMaintenanceModeDto({
required this.action,
- this.restoreBackupFilename,
+ this.restoreBackupFilename = const Optional.absent(),
});
MaintenanceAction action;
@@ -26,7 +26,7 @@ class SetMaintenanceModeDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? restoreBackupFilename;
+ Optional<String?> restoreBackupFilename;
@override
bool operator ==(Object other) => identical(this, other) || other is SetMaintenanceModeDto &&
@@ -45,10 +45,9 @@ class SetMaintenanceModeDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'action'] = this.action;
- if (this.restoreBackupFilename != null) {
- json[r'restoreBackupFilename'] = this.restoreBackupFilename;
- } else {
- // json[r'restoreBackupFilename'] = null;
+ if (this.restoreBackupFilename.isPresent) {
+ final value = this.restoreBackupFilename.value;
+ json[r'restoreBackupFilename'] = value;
}
return json;
}
@@ -63,7 +62,7 @@ class SetMaintenanceModeDto {
return SetMaintenanceModeDto(
action: MaintenanceAction.fromJson(json[r'action'])!,
- restoreBackupFilename: mapValueOfType<String>(json, r'restoreBackupFilename'),
+ restoreBackupFilename: json.containsKey(r'restoreBackupFilename') ? Optional.present(mapValueOfType<String>(json, r'restoreBackupFilename')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/shared_link_create_dto.dart b/mobile/openapi/lib/model/shared_link_create_dto.dart
index a32714d556..239db7f811 100644
--- a/mobile/openapi/lib/model/shared_link_create_dto.dart
+++ b/mobile/openapi/lib/model/shared_link_create_dto.dart
@@ -13,15 +13,15 @@ part of openapi.api;
class SharedLinkCreateDto {
/// Returns a new [SharedLinkCreateDto] instance.
SharedLinkCreateDto({
- this.albumId,
- this.allowDownload = true,
- this.allowUpload,
- this.assetIds = const [],
- this.description,
- this.expiresAt,
- this.password,
- this.showMetadata = true,
- this.slug,
+ this.albumId = const Optional.absent(),
+ this.allowDownload = const Optional.present(true),
+ this.allowUpload = const Optional.absent(),
+ this.assetIds = const Optional.present(const []),
+ this.description = const Optional.absent(),
+ this.expiresAt = const Optional.absent(),
+ this.password = const Optional.absent(),
+ this.showMetadata = const Optional.present(true),
+ this.slug = const Optional.absent(),
required this.type,
});
@@ -32,10 +32,10 @@ class SharedLinkCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? albumId;
+ Optional<String?> albumId;
/// Allow downloads
- bool allowDownload;
+ Optional<bool?> allowDownload;
/// Allow uploads
///
@@ -44,25 +44,25 @@ class SharedLinkCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? allowUpload;
+ Optional<bool?> allowUpload;
/// Asset IDs (for individual assets)
- List<String> assetIds;
+ Optional<List<String>?> assetIds;
/// Link description
- String? description;
+ Optional<String?> description;
/// Expiration date
- DateTime? expiresAt;
+ Optional<DateTime?> expiresAt;
/// Link password
- String? password;
+ Optional<String?> password;
/// Show metadata
- bool showMetadata;
+ Optional<bool?> showMetadata;
/// Custom URL slug
- String? slug;
+ Optional<String?> slug;
SharedLinkType type;
@@ -98,40 +98,43 @@ class SharedLinkCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.albumId != null) {
- json[r'albumId'] = this.albumId;
- } else {
- // json[r'albumId'] = null;
+ if (this.albumId.isPresent) {
+ final value = this.albumId.value;
+ json[r'albumId'] = value;
}
- json[r'allowDownload'] = this.allowDownload;
- if (this.allowUpload != null) {
- json[r'allowUpload'] = this.allowUpload;
- } else {
- // json[r'allowUpload'] = null;
+ if (this.allowDownload.isPresent) {
+ final value = this.allowDownload.value;
+ json[r'allowDownload'] = value;
}
- json[r'assetIds'] = this.assetIds;
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.allowUpload.isPresent) {
+ final value = this.allowUpload.value;
+ json[r'allowUpload'] = value;
}
- if (this.expiresAt != null) {
- json[r'expiresAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.expiresAt!.millisecondsSinceEpoch
- : this.expiresAt!.toUtc().toIso8601String();
- } else {
- // json[r'expiresAt'] = null;
+ if (this.assetIds.isPresent) {
+ final value = this.assetIds.value;
+ json[r'assetIds'] = value;
}
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- json[r'showMetadata'] = this.showMetadata;
- if (this.slug != null) {
- json[r'slug'] = this.slug;
- } else {
- // json[r'slug'] = null;
+ if (this.expiresAt.isPresent) {
+ final value = this.expiresAt.value;
+ json[r'expiresAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
+ }
+ if (this.showMetadata.isPresent) {
+ final value = this.showMetadata.value;
+ json[r'showMetadata'] = value;
+ }
+ if (this.slug.isPresent) {
+ final value = this.slug.value;
+ json[r'slug'] = value;
}
json[r'type'] = this.type;
return json;
@@ -146,17 +149,17 @@ class SharedLinkCreateDto {
final json = value.cast<String, dynamic>();
return SharedLinkCreateDto(
- albumId: mapValueOfType<String>(json, r'albumId'),
- allowDownload: mapValueOfType<bool>(json, r'allowDownload') ?? true,
- allowUpload: mapValueOfType<bool>(json, r'allowUpload'),
- assetIds: json[r'assetIds'] is Iterable
+ albumId: json.containsKey(r'albumId') ? Optional.present(mapValueOfType<String>(json, r'albumId')) : const Optional.absent(),
+ allowDownload: json.containsKey(r'allowDownload') ? Optional.present(mapValueOfType<bool>(json, r'allowDownload')) : const Optional.absent(),
+ allowUpload: json.containsKey(r'allowUpload') ? Optional.present(mapValueOfType<bool>(json, r'allowUpload')) : const Optional.absent(),
+ assetIds: json.containsKey(r'assetIds') ? Optional.present(json[r'assetIds'] is Iterable
? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- description: mapValueOfType<String>(json, r'description'),
- expiresAt: mapDateTime(json, r'expiresAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- password: mapValueOfType<String>(json, r'password'),
- showMetadata: mapValueOfType<bool>(json, r'showMetadata') ?? true,
- slug: mapValueOfType<String>(json, r'slug'),
+ : const []) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ expiresAt: json.containsKey(r'expiresAt') ? Optional.present(mapDateTime(json, r'expiresAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
+ showMetadata: json.containsKey(r'showMetadata') ? Optional.present(mapValueOfType<bool>(json, r'showMetadata')) : const Optional.absent(),
+ slug: json.containsKey(r'slug') ? Optional.present(mapValueOfType<String>(json, r'slug')) : const Optional.absent(),
type: SharedLinkType.fromJson(json[r'type'])!,
);
}
diff --git a/mobile/openapi/lib/model/shared_link_edit_dto.dart b/mobile/openapi/lib/model/shared_link_edit_dto.dart
index 11d6cdd52e..0d6df3c8f9 100644
--- a/mobile/openapi/lib/model/shared_link_edit_dto.dart
+++ b/mobile/openapi/lib/model/shared_link_edit_dto.dart
@@ -13,14 +13,14 @@ part of openapi.api;
class SharedLinkEditDto {
/// Returns a new [SharedLinkEditDto] instance.
SharedLinkEditDto({
- this.allowDownload,
- this.allowUpload,
- this.changeExpiryTime,
- this.description,
- this.expiresAt,
- this.password,
- this.showMetadata,
- this.slug,
+ this.allowDownload = const Optional.absent(),
+ this.allowUpload = const Optional.absent(),
+ this.changeExpiryTime = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.expiresAt = const Optional.absent(),
+ this.password = const Optional.absent(),
+ this.showMetadata = const Optional.absent(),
+ this.slug = const Optional.absent(),
});
/// Allow downloads
@@ -30,7 +30,7 @@ class SharedLinkEditDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? allowDownload;
+ Optional<bool?> allowDownload;
/// Allow uploads
///
@@ -39,7 +39,7 @@ class SharedLinkEditDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? allowUpload;
+ Optional<bool?> allowUpload;
/// Whether to change the expiry time. Few clients cannot send null to set the expiryTime to never. Setting this flag and not sending expiryAt is considered as null instead. Clients that can send null values can ignore this.
///
@@ -48,16 +48,16 @@ class SharedLinkEditDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? changeExpiryTime;
+ Optional<bool?> changeExpiryTime;
/// Link description
- String? description;
+ Optional<String?> description;
/// Expiration date
- DateTime? expiresAt;
+ Optional<DateTime?> expiresAt;
/// Link password
- String? password;
+ Optional<String?> password;
/// Show metadata
///
@@ -66,10 +66,10 @@ class SharedLinkEditDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? showMetadata;
+ Optional<bool?> showMetadata;
/// Custom URL slug
- String? slug;
+ Optional<String?> slug;
@override
bool operator ==(Object other) => identical(this, other) || other is SharedLinkEditDto &&
@@ -99,47 +99,39 @@ class SharedLinkEditDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.allowDownload != null) {
- json[r'allowDownload'] = this.allowDownload;
- } else {
- // json[r'allowDownload'] = null;
+ if (this.allowDownload.isPresent) {
+ final value = this.allowDownload.value;
+ json[r'allowDownload'] = value;
}
- if (this.allowUpload != null) {
- json[r'allowUpload'] = this.allowUpload;
- } else {
- // json[r'allowUpload'] = null;
+ if (this.allowUpload.isPresent) {
+ final value = this.allowUpload.value;
+ json[r'allowUpload'] = value;
}
- if (this.changeExpiryTime != null) {
- json[r'changeExpiryTime'] = this.changeExpiryTime;
- } else {
- // json[r'changeExpiryTime'] = null;
+ if (this.changeExpiryTime.isPresent) {
+ final value = this.changeExpiryTime.value;
+ json[r'changeExpiryTime'] = value;
}
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.expiresAt != null) {
- json[r'expiresAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.expiresAt!.millisecondsSinceEpoch
- : this.expiresAt!.toUtc().toIso8601String();
- } else {
- // json[r'expiresAt'] = null;
+ if (this.expiresAt.isPresent) {
+ final value = this.expiresAt.value;
+ json[r'expiresAt'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
}
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
}
- if (this.showMetadata != null) {
- json[r'showMetadata'] = this.showMetadata;
- } else {
- // json[r'showMetadata'] = null;
+ if (this.showMetadata.isPresent) {
+ final value = this.showMetadata.value;
+ json[r'showMetadata'] = value;
}
- if (this.slug != null) {
- json[r'slug'] = this.slug;
- } else {
- // json[r'slug'] = null;
+ if (this.slug.isPresent) {
+ final value = this.slug.value;
+ json[r'slug'] = value;
}
return json;
}
@@ -153,14 +145,14 @@ class SharedLinkEditDto {
final json = value.cast<String, dynamic>();
return SharedLinkEditDto(
- allowDownload: mapValueOfType<bool>(json, r'allowDownload'),
- allowUpload: mapValueOfType<bool>(json, r'allowUpload'),
- changeExpiryTime: mapValueOfType<bool>(json, r'changeExpiryTime'),
- description: mapValueOfType<String>(json, r'description'),
- expiresAt: mapDateTime(json, r'expiresAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- password: mapValueOfType<String>(json, r'password'),
- showMetadata: mapValueOfType<bool>(json, r'showMetadata'),
- slug: mapValueOfType<String>(json, r'slug'),
+ allowDownload: json.containsKey(r'allowDownload') ? Optional.present(mapValueOfType<bool>(json, r'allowDownload')) : const Optional.absent(),
+ allowUpload: json.containsKey(r'allowUpload') ? Optional.present(mapValueOfType<bool>(json, r'allowUpload')) : const Optional.absent(),
+ changeExpiryTime: json.containsKey(r'changeExpiryTime') ? Optional.present(mapValueOfType<bool>(json, r'changeExpiryTime')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ expiresAt: json.containsKey(r'expiresAt') ? Optional.present(mapDateTime(json, r'expiresAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
+ showMetadata: json.containsKey(r'showMetadata') ? Optional.present(mapValueOfType<bool>(json, r'showMetadata')) : const Optional.absent(),
+ slug: json.containsKey(r'slug') ? Optional.present(mapValueOfType<String>(json, r'slug')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/shared_link_response_dto.dart b/mobile/openapi/lib/model/shared_link_response_dto.dart
index bad0966ca2..8d7cb74eca 100644
--- a/mobile/openapi/lib/model/shared_link_response_dto.dart
+++ b/mobile/openapi/lib/model/shared_link_response_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class SharedLinkResponseDto {
/// Returns a new [SharedLinkResponseDto] instance.
SharedLinkResponseDto({
- this.album,
+ this.album = const Optional.absent(),
required this.allowDownload,
required this.allowUpload,
this.assets = const [],
@@ -35,7 +35,7 @@ class SharedLinkResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AlbumResponseDto? album;
+ Optional<AlbumResponseDto?> album;
/// Allow downloads
bool allowDownload;
@@ -114,10 +114,9 @@ class SharedLinkResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.album != null) {
- json[r'album'] = this.album;
- } else {
- // json[r'album'] = null;
+ if (this.album.isPresent) {
+ final value = this.album.value;
+ json[r'album'] = value;
}
json[r'allowDownload'] = this.allowDownload;
json[r'allowUpload'] = this.allowUpload;
@@ -128,27 +127,27 @@ class SharedLinkResponseDto {
if (this.description != null) {
json[r'description'] = this.description;
} else {
- // json[r'description'] = null;
+ json[r'description'] = null;
}
if (this.expiresAt != null) {
json[r'expiresAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.expiresAt!.millisecondsSinceEpoch
: this.expiresAt!.toUtc().toIso8601String();
} else {
- // json[r'expiresAt'] = null;
+ json[r'expiresAt'] = null;
}
json[r'id'] = this.id;
json[r'key'] = this.key;
if (this.password != null) {
json[r'password'] = this.password;
} else {
- // json[r'password'] = null;
+ json[r'password'] = null;
}
json[r'showMetadata'] = this.showMetadata;
if (this.slug != null) {
json[r'slug'] = this.slug;
} else {
- // json[r'slug'] = null;
+ json[r'slug'] = null;
}
json[r'type'] = this.type;
json[r'userId'] = this.userId;
@@ -164,7 +163,7 @@ class SharedLinkResponseDto {
final json = value.cast<String, dynamic>();
return SharedLinkResponseDto(
- album: AlbumResponseDto.fromJson(json[r'album']),
+ album: json.containsKey(r'album') ? Optional.present(AlbumResponseDto.fromJson(json[r'album'])) : const Optional.absent(),
allowDownload: mapValueOfType<bool>(json, r'allowDownload')!,
allowUpload: mapValueOfType<bool>(json, r'allowUpload')!,
assets: AssetResponseDto.listFromJson(json[r'assets']),
diff --git a/mobile/openapi/lib/model/shared_links_update.dart b/mobile/openapi/lib/model/shared_links_update.dart
index 8e792b4f49..7c5761e343 100644
--- a/mobile/openapi/lib/model/shared_links_update.dart
+++ b/mobile/openapi/lib/model/shared_links_update.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class SharedLinksUpdate {
/// Returns a new [SharedLinksUpdate] instance.
SharedLinksUpdate({
- this.enabled,
- this.sidebarWeb,
+ this.enabled = const Optional.absent(),
+ this.sidebarWeb = const Optional.absent(),
});
/// Whether shared links are enabled
@@ -24,7 +24,7 @@ class SharedLinksUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Whether shared links appear in web sidebar
///
@@ -33,7 +33,7 @@ class SharedLinksUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? sidebarWeb;
+ Optional<bool?> sidebarWeb;
@override
bool operator ==(Object other) => identical(this, other) || other is SharedLinksUpdate &&
@@ -51,15 +51,13 @@ class SharedLinksUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
- if (this.sidebarWeb != null) {
- json[r'sidebarWeb'] = this.sidebarWeb;
- } else {
- // json[r'sidebarWeb'] = null;
+ if (this.sidebarWeb.isPresent) {
+ final value = this.sidebarWeb.value;
+ json[r'sidebarWeb'] = value;
}
return json;
}
@@ -73,8 +71,8 @@ class SharedLinksUpdate {
final json = value.cast<String, dynamic>();
return SharedLinksUpdate(
- enabled: mapValueOfType<bool>(json, r'enabled'),
- sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
+ sidebarWeb: json.containsKey(r'sidebarWeb') ? Optional.present(mapValueOfType<bool>(json, r'sidebarWeb')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/smart_search_dto.dart b/mobile/openapi/lib/model/smart_search_dto.dart
index 9bbb4a25f0..aff0030102 100644
--- a/mobile/openapi/lib/model/smart_search_dto.dart
+++ b/mobile/openapi/lib/model/smart_search_dto.dart
@@ -13,50 +13,50 @@ part of openapi.api;
class SmartSearchDto {
/// Returns a new [SmartSearchDto] instance.
SmartSearchDto({
- this.albumIds = const [],
- this.city,
- this.country,
- this.createdAfter,
- this.createdBefore,
- this.isEncoded,
- this.isFavorite,
- this.isMotion,
- this.isNotInAlbum,
- this.isOffline,
- this.language,
- this.lensModel,
- this.libraryId,
- this.make,
- this.model,
- this.ocr,
- this.page,
- this.personIds = const [],
- this.query,
- this.queryAssetId,
- this.rating,
- this.size,
- this.state,
- this.tagIds = const [],
- this.takenAfter,
- this.takenBefore,
- this.trashedAfter,
- this.trashedBefore,
- this.type,
- this.updatedAfter,
- this.updatedBefore,
- this.visibility,
- this.withDeleted,
- this.withExif,
+ this.albumIds = const Optional.present(const []),
+ this.city = const Optional.absent(),
+ this.country = const Optional.absent(),
+ this.createdAfter = const Optional.absent(),
+ this.createdBefore = const Optional.absent(),
+ this.isEncoded = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.isMotion = const Optional.absent(),
+ this.isNotInAlbum = const Optional.absent(),
+ this.isOffline = const Optional.absent(),
+ this.language = const Optional.absent(),
+ this.lensModel = const Optional.absent(),
+ this.libraryId = const Optional.absent(),
+ this.make = const Optional.absent(),
+ this.model = const Optional.absent(),
+ this.ocr = const Optional.absent(),
+ this.page = const Optional.absent(),
+ this.personIds = const Optional.present(const []),
+ this.query = const Optional.absent(),
+ this.queryAssetId = const Optional.absent(),
+ this.rating = const Optional.absent(),
+ this.size = const Optional.absent(),
+ this.state = const Optional.absent(),
+ this.tagIds = const Optional.present(const []),
+ this.takenAfter = const Optional.absent(),
+ this.takenBefore = const Optional.absent(),
+ this.trashedAfter = const Optional.absent(),
+ this.trashedBefore = const Optional.absent(),
+ this.type = const Optional.absent(),
+ this.updatedAfter = const Optional.absent(),
+ this.updatedBefore = const Optional.absent(),
+ this.visibility = const Optional.absent(),
+ this.withDeleted = const Optional.absent(),
+ this.withExif = const Optional.absent(),
});
/// Filter by album IDs
- List<String> albumIds;
+ Optional<List<String>?> albumIds;
/// Filter by city name
- String? city;
+ Optional<String?> city;
/// Filter by country name
- String? country;
+ Optional<String?> country;
/// Filter by creation date (after)
///
@@ -65,7 +65,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdAfter;
+ Optional<DateTime?> createdAfter;
/// Filter by creation date (before)
///
@@ -74,7 +74,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdBefore;
+ Optional<DateTime?> createdBefore;
/// Filter by encoded status
///
@@ -83,7 +83,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isEncoded;
+ Optional<bool?> isEncoded;
/// Filter by favorite status
///
@@ -92,7 +92,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Filter by motion photo status
///
@@ -101,7 +101,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isMotion;
+ Optional<bool?> isMotion;
/// Filter assets not in any album
///
@@ -110,7 +110,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isNotInAlbum;
+ Optional<bool?> isNotInAlbum;
/// Filter by offline status
///
@@ -119,7 +119,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isOffline;
+ Optional<bool?> isOffline;
/// Search language code
///
@@ -128,19 +128,19 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? language;
+ Optional<String?> language;
/// Filter by lens model
- String? lensModel;
+ Optional<String?> lensModel;
/// Library ID to filter by
- String? libraryId;
+ Optional<String?> libraryId;
/// Filter by camera make
- String? make;
+ Optional<String?> make;
/// Filter by camera model
- String? model;
+ Optional<String?> model;
/// Filter by OCR text content
///
@@ -149,7 +149,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? ocr;
+ Optional<String?> ocr;
/// Page number
///
@@ -161,10 +161,10 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? page;
+ Optional<int?> page;
/// Filter by person IDs
- List<String> personIds;
+ Optional<List<String>?> personIds;
/// Natural language search query
///
@@ -173,7 +173,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? query;
+ Optional<String?> query;
/// Asset ID to use as search reference
///
@@ -182,13 +182,13 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? queryAssetId;
+ Optional<String?> queryAssetId;
/// Filter by rating [1-5], or null for unrated
///
/// Minimum value: -1
/// Maximum value: 5
- int? rating;
+ Optional<int?> rating;
/// Number of results to return
///
@@ -200,13 +200,13 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- int? size;
+ Optional<int?> size;
/// Filter by state/province name
- String? state;
+ Optional<String?> state;
/// Filter by tag IDs
- List<String>? tagIds;
+ Optional<List<String>?> tagIds;
/// Filter by taken date (after)
///
@@ -215,7 +215,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenAfter;
+ Optional<DateTime?> takenAfter;
/// Filter by taken date (before)
///
@@ -224,7 +224,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenBefore;
+ Optional<DateTime?> takenBefore;
/// Filter by trash date (after)
///
@@ -233,7 +233,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedAfter;
+ Optional<DateTime?> trashedAfter;
/// Filter by trash date (before)
///
@@ -242,7 +242,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedBefore;
+ Optional<DateTime?> trashedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -250,7 +250,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetTypeEnum? type;
+ Optional<AssetTypeEnum?> type;
/// Filter by update date (after)
///
@@ -259,7 +259,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedAfter;
+ Optional<DateTime?> updatedAfter;
/// Filter by update date (before)
///
@@ -268,7 +268,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedBefore;
+ Optional<DateTime?> updatedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -276,7 +276,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetVisibility? visibility;
+ Optional<AssetVisibility?> visibility;
/// Include deleted assets
///
@@ -285,7 +285,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withDeleted;
+ Optional<bool?> withDeleted;
/// Include EXIF data in response
///
@@ -294,7 +294,7 @@ class SmartSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? withExif;
+ Optional<bool?> withExif;
@override
bool operator ==(Object other) => identical(this, other) || other is SmartSearchDto &&
@@ -376,183 +376,157 @@ class SmartSearchDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'albumIds'] = this.albumIds;
- if (this.city != null) {
- json[r'city'] = this.city;
- } else {
- // json[r'city'] = null;
- }
- if (this.country != null) {
- json[r'country'] = this.country;
- } else {
- // json[r'country'] = null;
- }
- if (this.createdAfter != null) {
- json[r'createdAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdAfter!.millisecondsSinceEpoch
- : this.createdAfter!.toUtc().toIso8601String();
- } else {
- // json[r'createdAfter'] = null;
- }
- if (this.createdBefore != null) {
- json[r'createdBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdBefore!.millisecondsSinceEpoch
- : this.createdBefore!.toUtc().toIso8601String();
- } else {
- // json[r'createdBefore'] = null;
- }
- if (this.isEncoded != null) {
- json[r'isEncoded'] = this.isEncoded;
- } else {
- // json[r'isEncoded'] = null;
- }
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
- }
- if (this.isMotion != null) {
- json[r'isMotion'] = this.isMotion;
- } else {
- // json[r'isMotion'] = null;
- }
- if (this.isNotInAlbum != null) {
- json[r'isNotInAlbum'] = this.isNotInAlbum;
- } else {
- // json[r'isNotInAlbum'] = null;
- }
- if (this.isOffline != null) {
- json[r'isOffline'] = this.isOffline;
- } else {
- // json[r'isOffline'] = null;
- }
- if (this.language != null) {
- json[r'language'] = this.language;
- } else {
- // json[r'language'] = null;
- }
- if (this.lensModel != null) {
- json[r'lensModel'] = this.lensModel;
- } else {
- // json[r'lensModel'] = null;
- }
- if (this.libraryId != null) {
- json[r'libraryId'] = this.libraryId;
- } else {
- // json[r'libraryId'] = null;
- }
- if (this.make != null) {
- json[r'make'] = this.make;
- } else {
- // json[r'make'] = null;
- }
- if (this.model != null) {
- json[r'model'] = this.model;
- } else {
- // json[r'model'] = null;
- }
- if (this.ocr != null) {
- json[r'ocr'] = this.ocr;
- } else {
- // json[r'ocr'] = null;
- }
- if (this.page != null) {
- json[r'page'] = this.page;
- } else {
- // json[r'page'] = null;
- }
- json[r'personIds'] = this.personIds;
- if (this.query != null) {
- json[r'query'] = this.query;
- } else {
- // json[r'query'] = null;
- }
- if (this.queryAssetId != null) {
- json[r'queryAssetId'] = this.queryAssetId;
- } else {
- // json[r'queryAssetId'] = null;
- }
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
- }
- if (this.size != null) {
- json[r'size'] = this.size;
- } else {
- // json[r'size'] = null;
- }
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
- }
- if (this.tagIds != null) {
- json[r'tagIds'] = this.tagIds;
- } else {
- // json[r'tagIds'] = null;
- }
- if (this.takenAfter != null) {
- json[r'takenAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenAfter!.millisecondsSinceEpoch
- : this.takenAfter!.toUtc().toIso8601String();
- } else {
- // json[r'takenAfter'] = null;
- }
- if (this.takenBefore != null) {
- json[r'takenBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenBefore!.millisecondsSinceEpoch
- : this.takenBefore!.toUtc().toIso8601String();
- } else {
- // json[r'takenBefore'] = null;
- }
- if (this.trashedAfter != null) {
- json[r'trashedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedAfter!.millisecondsSinceEpoch
- : this.trashedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'trashedAfter'] = null;
- }
- if (this.trashedBefore != null) {
- json[r'trashedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedBefore!.millisecondsSinceEpoch
- : this.trashedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'trashedBefore'] = null;
- }
- if (this.type != null) {
- json[r'type'] = this.type;
- } else {
- // json[r'type'] = null;
- }
- if (this.updatedAfter != null) {
- json[r'updatedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedAfter!.millisecondsSinceEpoch
- : this.updatedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'updatedAfter'] = null;
- }
- if (this.updatedBefore != null) {
- json[r'updatedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedBefore!.millisecondsSinceEpoch
- : this.updatedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'updatedBefore'] = null;
- }
- if (this.visibility != null) {
- json[r'visibility'] = this.visibility;
- } else {
- // json[r'visibility'] = null;
- }
- if (this.withDeleted != null) {
- json[r'withDeleted'] = this.withDeleted;
- } else {
- // json[r'withDeleted'] = null;
- }
- if (this.withExif != null) {
- json[r'withExif'] = this.withExif;
- } else {
- // json[r'withExif'] = null;
+ if (this.albumIds.isPresent) {
+ final value = this.albumIds.value;
+ json[r'albumIds'] = value;
+ }
+ if (this.city.isPresent) {
+ final value = this.city.value;
+ json[r'city'] = value;
+ }
+ if (this.country.isPresent) {
+ final value = this.country.value;
+ json[r'country'] = value;
+ }
+ if (this.createdAfter.isPresent) {
+ final value = this.createdAfter.value;
+ json[r'createdAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.createdBefore.isPresent) {
+ final value = this.createdBefore.value;
+ json[r'createdBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.isEncoded.isPresent) {
+ final value = this.isEncoded.value;
+ json[r'isEncoded'] = value;
+ }
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
+ }
+ if (this.isMotion.isPresent) {
+ final value = this.isMotion.value;
+ json[r'isMotion'] = value;
+ }
+ if (this.isNotInAlbum.isPresent) {
+ final value = this.isNotInAlbum.value;
+ json[r'isNotInAlbum'] = value;
+ }
+ if (this.isOffline.isPresent) {
+ final value = this.isOffline.value;
+ json[r'isOffline'] = value;
+ }
+ if (this.language.isPresent) {
+ final value = this.language.value;
+ json[r'language'] = value;
+ }
+ if (this.lensModel.isPresent) {
+ final value = this.lensModel.value;
+ json[r'lensModel'] = value;
+ }
+ if (this.libraryId.isPresent) {
+ final value = this.libraryId.value;
+ json[r'libraryId'] = value;
+ }
+ if (this.make.isPresent) {
+ final value = this.make.value;
+ json[r'make'] = value;
+ }
+ if (this.model.isPresent) {
+ final value = this.model.value;
+ json[r'model'] = value;
+ }
+ if (this.ocr.isPresent) {
+ final value = this.ocr.value;
+ json[r'ocr'] = value;
+ }
+ if (this.page.isPresent) {
+ final value = this.page.value;
+ json[r'page'] = value;
+ }
+ if (this.personIds.isPresent) {
+ final value = this.personIds.value;
+ json[r'personIds'] = value;
+ }
+ if (this.query.isPresent) {
+ final value = this.query.value;
+ json[r'query'] = value;
+ }
+ if (this.queryAssetId.isPresent) {
+ final value = this.queryAssetId.value;
+ json[r'queryAssetId'] = value;
+ }
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
+ }
+ if (this.size.isPresent) {
+ final value = this.size.value;
+ json[r'size'] = value;
+ }
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
+ }
+ if (this.tagIds.isPresent) {
+ final value = this.tagIds.value;
+ json[r'tagIds'] = value;
+ }
+ if (this.takenAfter.isPresent) {
+ final value = this.takenAfter.value;
+ json[r'takenAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.takenBefore.isPresent) {
+ final value = this.takenBefore.value;
+ json[r'takenBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedAfter.isPresent) {
+ final value = this.trashedAfter.value;
+ json[r'trashedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedBefore.isPresent) {
+ final value = this.trashedBefore.value;
+ json[r'trashedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.type.isPresent) {
+ final value = this.type.value;
+ json[r'type'] = value;
+ }
+ if (this.updatedAfter.isPresent) {
+ final value = this.updatedAfter.value;
+ json[r'updatedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.updatedBefore.isPresent) {
+ final value = this.updatedBefore.value;
+ json[r'updatedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.visibility.isPresent) {
+ final value = this.visibility.value;
+ json[r'visibility'] = value;
+ }
+ if (this.withDeleted.isPresent) {
+ final value = this.withDeleted.value;
+ json[r'withDeleted'] = value;
+ }
+ if (this.withExif.isPresent) {
+ final value = this.withExif.value;
+ json[r'withExif'] = value;
}
return json;
}
@@ -566,46 +540,46 @@ class SmartSearchDto {
final json = value.cast<String, dynamic>();
return SmartSearchDto(
- albumIds: json[r'albumIds'] is Iterable
+ albumIds: json.containsKey(r'albumIds') ? Optional.present(json[r'albumIds'] is Iterable
? (json[r'albumIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- city: mapValueOfType<String>(json, r'city'),
- country: mapValueOfType<String>(json, r'country'),
- createdAfter: mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- createdBefore: mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- isEncoded: mapValueOfType<bool>(json, r'isEncoded'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isMotion: mapValueOfType<bool>(json, r'isMotion'),
- isNotInAlbum: mapValueOfType<bool>(json, r'isNotInAlbum'),
- isOffline: mapValueOfType<bool>(json, r'isOffline'),
- language: mapValueOfType<String>(json, r'language'),
- lensModel: mapValueOfType<String>(json, r'lensModel'),
- libraryId: mapValueOfType<String>(json, r'libraryId'),
- make: mapValueOfType<String>(json, r'make'),
- model: mapValueOfType<String>(json, r'model'),
- ocr: mapValueOfType<String>(json, r'ocr'),
- page: mapValueOfType<int>(json, r'page'),
- personIds: json[r'personIds'] is Iterable
+ : const []) : const Optional.absent(),
+ city: json.containsKey(r'city') ? Optional.present(mapValueOfType<String>(json, r'city')) : const Optional.absent(),
+ country: json.containsKey(r'country') ? Optional.present(mapValueOfType<String>(json, r'country')) : const Optional.absent(),
+ createdAfter: json.containsKey(r'createdAfter') ? Optional.present(mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ createdBefore: json.containsKey(r'createdBefore') ? Optional.present(mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ isEncoded: json.containsKey(r'isEncoded') ? Optional.present(mapValueOfType<bool>(json, r'isEncoded')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isMotion: json.containsKey(r'isMotion') ? Optional.present(mapValueOfType<bool>(json, r'isMotion')) : const Optional.absent(),
+ isNotInAlbum: json.containsKey(r'isNotInAlbum') ? Optional.present(mapValueOfType<bool>(json, r'isNotInAlbum')) : const Optional.absent(),
+ isOffline: json.containsKey(r'isOffline') ? Optional.present(mapValueOfType<bool>(json, r'isOffline')) : const Optional.absent(),
+ language: json.containsKey(r'language') ? Optional.present(mapValueOfType<String>(json, r'language')) : const Optional.absent(),
+ lensModel: json.containsKey(r'lensModel') ? Optional.present(mapValueOfType<String>(json, r'lensModel')) : const Optional.absent(),
+ libraryId: json.containsKey(r'libraryId') ? Optional.present(mapValueOfType<String>(json, r'libraryId')) : const Optional.absent(),
+ make: json.containsKey(r'make') ? Optional.present(mapValueOfType<String>(json, r'make')) : const Optional.absent(),
+ model: json.containsKey(r'model') ? Optional.present(mapValueOfType<String>(json, r'model')) : const Optional.absent(),
+ ocr: json.containsKey(r'ocr') ? Optional.present(mapValueOfType<String>(json, r'ocr')) : const Optional.absent(),
+ page: json.containsKey(r'page') ? Optional.present(json[r'page'] == null ? null : int.parse('${json[r'page']}')) : const Optional.absent(),
+ personIds: json.containsKey(r'personIds') ? Optional.present(json[r'personIds'] is Iterable
? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- query: mapValueOfType<String>(json, r'query'),
- queryAssetId: mapValueOfType<String>(json, r'queryAssetId'),
- rating: mapValueOfType<int>(json, r'rating'),
- size: mapValueOfType<int>(json, r'size'),
- state: mapValueOfType<String>(json, r'state'),
- tagIds: json[r'tagIds'] is Iterable
+ : const []) : const Optional.absent(),
+ query: json.containsKey(r'query') ? Optional.present(mapValueOfType<String>(json, r'query')) : const Optional.absent(),
+ queryAssetId: json.containsKey(r'queryAssetId') ? Optional.present(mapValueOfType<String>(json, r'queryAssetId')) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ size: json.containsKey(r'size') ? Optional.present(json[r'size'] == null ? null : int.parse('${json[r'size']}')) : const Optional.absent(),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
+ tagIds: json.containsKey(r'tagIds') ? Optional.present(json[r'tagIds'] is Iterable
? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- takenAfter: mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- takenBefore: mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedAfter: mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedBefore: mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- type: AssetTypeEnum.fromJson(json[r'type']),
- updatedAfter: mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- updatedBefore: mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- visibility: AssetVisibility.fromJson(json[r'visibility']),
- withDeleted: mapValueOfType<bool>(json, r'withDeleted'),
- withExif: mapValueOfType<bool>(json, r'withExif'),
+ : const []) : const Optional.absent(),
+ takenAfter: json.containsKey(r'takenAfter') ? Optional.present(mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ takenBefore: json.containsKey(r'takenBefore') ? Optional.present(mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedAfter: json.containsKey(r'trashedAfter') ? Optional.present(mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedBefore: json.containsKey(r'trashedBefore') ? Optional.present(mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ type: json.containsKey(r'type') ? Optional.present(AssetTypeEnum.fromJson(json[r'type'])) : const Optional.absent(),
+ updatedAfter: json.containsKey(r'updatedAfter') ? Optional.present(mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ updatedBefore: json.containsKey(r'updatedBefore') ? Optional.present(mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
+ withDeleted: json.containsKey(r'withDeleted') ? Optional.present(mapValueOfType<bool>(json, r'withDeleted')) : const Optional.absent(),
+ withExif: json.containsKey(r'withExif') ? Optional.present(mapValueOfType<bool>(json, r'withExif')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/stack_update_dto.dart b/mobile/openapi/lib/model/stack_update_dto.dart
index e81c204f97..98787f3a43 100644
--- a/mobile/openapi/lib/model/stack_update_dto.dart
+++ b/mobile/openapi/lib/model/stack_update_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class StackUpdateDto {
/// Returns a new [StackUpdateDto] instance.
StackUpdateDto({
- this.primaryAssetId,
+ this.primaryAssetId = const Optional.absent(),
});
/// Primary asset ID
@@ -23,7 +23,7 @@ class StackUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? primaryAssetId;
+ Optional<String?> primaryAssetId;
@override
bool operator ==(Object other) => identical(this, other) || other is StackUpdateDto &&
@@ -39,10 +39,9 @@ class StackUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.primaryAssetId != null) {
- json[r'primaryAssetId'] = this.primaryAssetId;
- } else {
- // json[r'primaryAssetId'] = null;
+ if (this.primaryAssetId.isPresent) {
+ final value = this.primaryAssetId.value;
+ json[r'primaryAssetId'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class StackUpdateDto {
final json = value.cast<String, dynamic>();
return StackUpdateDto(
- primaryAssetId: mapValueOfType<String>(json, r'primaryAssetId'),
+ primaryAssetId: json.containsKey(r'primaryAssetId') ? Optional.present(mapValueOfType<String>(json, r'primaryAssetId')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/statistics_search_dto.dart b/mobile/openapi/lib/model/statistics_search_dto.dart
index f276e3717b..5b88d136bb 100644
--- a/mobile/openapi/lib/model/statistics_search_dto.dart
+++ b/mobile/openapi/lib/model/statistics_search_dto.dart
@@ -13,44 +13,44 @@ part of openapi.api;
class StatisticsSearchDto {
/// Returns a new [StatisticsSearchDto] instance.
StatisticsSearchDto({
- this.albumIds = const [],
- this.city,
- this.country,
- this.createdAfter,
- this.createdBefore,
- this.description,
- this.isEncoded,
- this.isFavorite,
- this.isMotion,
- this.isNotInAlbum,
- this.isOffline,
- this.lensModel,
- this.libraryId,
- this.make,
- this.model,
- this.ocr,
- this.personIds = const [],
- this.rating,
- this.state,
- this.tagIds = const [],
- this.takenAfter,
- this.takenBefore,
- this.trashedAfter,
- this.trashedBefore,
- this.type,
- this.updatedAfter,
- this.updatedBefore,
- this.visibility,
+ this.albumIds = const Optional.present(const []),
+ this.city = const Optional.absent(),
+ this.country = const Optional.absent(),
+ this.createdAfter = const Optional.absent(),
+ this.createdBefore = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.isEncoded = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.isMotion = const Optional.absent(),
+ this.isNotInAlbum = const Optional.absent(),
+ this.isOffline = const Optional.absent(),
+ this.lensModel = const Optional.absent(),
+ this.libraryId = const Optional.absent(),
+ this.make = const Optional.absent(),
+ this.model = const Optional.absent(),
+ this.ocr = const Optional.absent(),
+ this.personIds = const Optional.present(const []),
+ this.rating = const Optional.absent(),
+ this.state = const Optional.absent(),
+ this.tagIds = const Optional.present(const []),
+ this.takenAfter = const Optional.absent(),
+ this.takenBefore = const Optional.absent(),
+ this.trashedAfter = const Optional.absent(),
+ this.trashedBefore = const Optional.absent(),
+ this.type = const Optional.absent(),
+ this.updatedAfter = const Optional.absent(),
+ this.updatedBefore = const Optional.absent(),
+ this.visibility = const Optional.absent(),
});
/// Filter by album IDs
- List<String> albumIds;
+ Optional<List<String>?> albumIds;
/// Filter by city name
- String? city;
+ Optional<String?> city;
/// Filter by country name
- String? country;
+ Optional<String?> country;
/// Filter by creation date (after)
///
@@ -59,7 +59,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdAfter;
+ Optional<DateTime?> createdAfter;
/// Filter by creation date (before)
///
@@ -68,7 +68,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? createdBefore;
+ Optional<DateTime?> createdBefore;
/// Filter by description text
///
@@ -77,7 +77,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
/// Filter by encoded status
///
@@ -86,7 +86,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isEncoded;
+ Optional<bool?> isEncoded;
/// Filter by favorite status
///
@@ -95,7 +95,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Filter by motion photo status
///
@@ -104,7 +104,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isMotion;
+ Optional<bool?> isMotion;
/// Filter assets not in any album
///
@@ -113,7 +113,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isNotInAlbum;
+ Optional<bool?> isNotInAlbum;
/// Filter by offline status
///
@@ -122,19 +122,19 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isOffline;
+ Optional<bool?> isOffline;
/// Filter by lens model
- String? lensModel;
+ Optional<String?> lensModel;
/// Library ID to filter by
- String? libraryId;
+ Optional<String?> libraryId;
/// Filter by camera make
- String? make;
+ Optional<String?> make;
/// Filter by camera model
- String? model;
+ Optional<String?> model;
/// Filter by OCR text content
///
@@ -143,22 +143,22 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? ocr;
+ Optional<String?> ocr;
/// Filter by person IDs
- List<String> personIds;
+ Optional<List<String>?> personIds;
/// Filter by rating [1-5], or null for unrated
///
/// Minimum value: -1
/// Maximum value: 5
- int? rating;
+ Optional<int?> rating;
/// Filter by state/province name
- String? state;
+ Optional<String?> state;
/// Filter by tag IDs
- List<String>? tagIds;
+ Optional<List<String>?> tagIds;
/// Filter by taken date (after)
///
@@ -167,7 +167,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenAfter;
+ Optional<DateTime?> takenAfter;
/// Filter by taken date (before)
///
@@ -176,7 +176,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? takenBefore;
+ Optional<DateTime?> takenBefore;
/// Filter by trash date (after)
///
@@ -185,7 +185,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedAfter;
+ Optional<DateTime?> trashedAfter;
/// Filter by trash date (before)
///
@@ -194,7 +194,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? trashedBefore;
+ Optional<DateTime?> trashedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -202,7 +202,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetTypeEnum? type;
+ Optional<AssetTypeEnum?> type;
/// Filter by update date (after)
///
@@ -211,7 +211,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedAfter;
+ Optional<DateTime?> updatedAfter;
/// Filter by update date (before)
///
@@ -220,7 +220,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DateTime? updatedBefore;
+ Optional<DateTime?> updatedBefore;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -228,7 +228,7 @@ class StatisticsSearchDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetVisibility? visibility;
+ Optional<AssetVisibility?> visibility;
@override
bool operator ==(Object other) => identical(this, other) || other is StatisticsSearchDto &&
@@ -298,153 +298,133 @@ class StatisticsSearchDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'albumIds'] = this.albumIds;
- if (this.city != null) {
- json[r'city'] = this.city;
- } else {
- // json[r'city'] = null;
- }
- if (this.country != null) {
- json[r'country'] = this.country;
- } else {
- // json[r'country'] = null;
- }
- if (this.createdAfter != null) {
- json[r'createdAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdAfter!.millisecondsSinceEpoch
- : this.createdAfter!.toUtc().toIso8601String();
- } else {
- // json[r'createdAfter'] = null;
- }
- if (this.createdBefore != null) {
- json[r'createdBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.createdBefore!.millisecondsSinceEpoch
- : this.createdBefore!.toUtc().toIso8601String();
- } else {
- // json[r'createdBefore'] = null;
- }
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
- }
- if (this.isEncoded != null) {
- json[r'isEncoded'] = this.isEncoded;
- } else {
- // json[r'isEncoded'] = null;
- }
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
- }
- if (this.isMotion != null) {
- json[r'isMotion'] = this.isMotion;
- } else {
- // json[r'isMotion'] = null;
- }
- if (this.isNotInAlbum != null) {
- json[r'isNotInAlbum'] = this.isNotInAlbum;
- } else {
- // json[r'isNotInAlbum'] = null;
- }
- if (this.isOffline != null) {
- json[r'isOffline'] = this.isOffline;
- } else {
- // json[r'isOffline'] = null;
- }
- if (this.lensModel != null) {
- json[r'lensModel'] = this.lensModel;
- } else {
- // json[r'lensModel'] = null;
- }
- if (this.libraryId != null) {
- json[r'libraryId'] = this.libraryId;
- } else {
- // json[r'libraryId'] = null;
- }
- if (this.make != null) {
- json[r'make'] = this.make;
- } else {
- // json[r'make'] = null;
- }
- if (this.model != null) {
- json[r'model'] = this.model;
- } else {
- // json[r'model'] = null;
- }
- if (this.ocr != null) {
- json[r'ocr'] = this.ocr;
- } else {
- // json[r'ocr'] = null;
- }
- json[r'personIds'] = this.personIds;
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
- }
- if (this.state != null) {
- json[r'state'] = this.state;
- } else {
- // json[r'state'] = null;
- }
- if (this.tagIds != null) {
- json[r'tagIds'] = this.tagIds;
- } else {
- // json[r'tagIds'] = null;
- }
- if (this.takenAfter != null) {
- json[r'takenAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenAfter!.millisecondsSinceEpoch
- : this.takenAfter!.toUtc().toIso8601String();
- } else {
- // json[r'takenAfter'] = null;
- }
- if (this.takenBefore != null) {
- json[r'takenBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.takenBefore!.millisecondsSinceEpoch
- : this.takenBefore!.toUtc().toIso8601String();
- } else {
- // json[r'takenBefore'] = null;
- }
- if (this.trashedAfter != null) {
- json[r'trashedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedAfter!.millisecondsSinceEpoch
- : this.trashedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'trashedAfter'] = null;
- }
- if (this.trashedBefore != null) {
- json[r'trashedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.trashedBefore!.millisecondsSinceEpoch
- : this.trashedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'trashedBefore'] = null;
- }
- if (this.type != null) {
- json[r'type'] = this.type;
- } else {
- // json[r'type'] = null;
- }
- if (this.updatedAfter != null) {
- json[r'updatedAfter'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedAfter!.millisecondsSinceEpoch
- : this.updatedAfter!.toUtc().toIso8601String();
- } else {
- // json[r'updatedAfter'] = null;
- }
- if (this.updatedBefore != null) {
- json[r'updatedBefore'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
- ? this.updatedBefore!.millisecondsSinceEpoch
- : this.updatedBefore!.toUtc().toIso8601String();
- } else {
- // json[r'updatedBefore'] = null;
- }
- if (this.visibility != null) {
- json[r'visibility'] = this.visibility;
- } else {
- // json[r'visibility'] = null;
+ if (this.albumIds.isPresent) {
+ final value = this.albumIds.value;
+ json[r'albumIds'] = value;
+ }
+ if (this.city.isPresent) {
+ final value = this.city.value;
+ json[r'city'] = value;
+ }
+ if (this.country.isPresent) {
+ final value = this.country.value;
+ json[r'country'] = value;
+ }
+ if (this.createdAfter.isPresent) {
+ final value = this.createdAfter.value;
+ json[r'createdAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.createdBefore.isPresent) {
+ final value = this.createdBefore.value;
+ json[r'createdBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
+ }
+ if (this.isEncoded.isPresent) {
+ final value = this.isEncoded.value;
+ json[r'isEncoded'] = value;
+ }
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
+ }
+ if (this.isMotion.isPresent) {
+ final value = this.isMotion.value;
+ json[r'isMotion'] = value;
+ }
+ if (this.isNotInAlbum.isPresent) {
+ final value = this.isNotInAlbum.value;
+ json[r'isNotInAlbum'] = value;
+ }
+ if (this.isOffline.isPresent) {
+ final value = this.isOffline.value;
+ json[r'isOffline'] = value;
+ }
+ if (this.lensModel.isPresent) {
+ final value = this.lensModel.value;
+ json[r'lensModel'] = value;
+ }
+ if (this.libraryId.isPresent) {
+ final value = this.libraryId.value;
+ json[r'libraryId'] = value;
+ }
+ if (this.make.isPresent) {
+ final value = this.make.value;
+ json[r'make'] = value;
+ }
+ if (this.model.isPresent) {
+ final value = this.model.value;
+ json[r'model'] = value;
+ }
+ if (this.ocr.isPresent) {
+ final value = this.ocr.value;
+ json[r'ocr'] = value;
+ }
+ if (this.personIds.isPresent) {
+ final value = this.personIds.value;
+ json[r'personIds'] = value;
+ }
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
+ }
+ if (this.state.isPresent) {
+ final value = this.state.value;
+ json[r'state'] = value;
+ }
+ if (this.tagIds.isPresent) {
+ final value = this.tagIds.value;
+ json[r'tagIds'] = value;
+ }
+ if (this.takenAfter.isPresent) {
+ final value = this.takenAfter.value;
+ json[r'takenAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.takenBefore.isPresent) {
+ final value = this.takenBefore.value;
+ json[r'takenBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedAfter.isPresent) {
+ final value = this.trashedAfter.value;
+ json[r'trashedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.trashedBefore.isPresent) {
+ final value = this.trashedBefore.value;
+ json[r'trashedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.type.isPresent) {
+ final value = this.type.value;
+ json[r'type'] = value;
+ }
+ if (this.updatedAfter.isPresent) {
+ final value = this.updatedAfter.value;
+ json[r'updatedAfter'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.updatedBefore.isPresent) {
+ final value = this.updatedBefore.value;
+ json[r'updatedBefore'] = value == null ? null : (_isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ }
+ if (this.visibility.isPresent) {
+ final value = this.visibility.value;
+ json[r'visibility'] = value;
}
return json;
}
@@ -458,40 +438,40 @@ class StatisticsSearchDto {
final json = value.cast<String, dynamic>();
return StatisticsSearchDto(
- albumIds: json[r'albumIds'] is Iterable
+ albumIds: json.containsKey(r'albumIds') ? Optional.present(json[r'albumIds'] is Iterable
? (json[r'albumIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- city: mapValueOfType<String>(json, r'city'),
- country: mapValueOfType<String>(json, r'country'),
- createdAfter: mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- createdBefore: mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- description: mapValueOfType<String>(json, r'description'),
- isEncoded: mapValueOfType<bool>(json, r'isEncoded'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isMotion: mapValueOfType<bool>(json, r'isMotion'),
- isNotInAlbum: mapValueOfType<bool>(json, r'isNotInAlbum'),
- isOffline: mapValueOfType<bool>(json, r'isOffline'),
- lensModel: mapValueOfType<String>(json, r'lensModel'),
- libraryId: mapValueOfType<String>(json, r'libraryId'),
- make: mapValueOfType<String>(json, r'make'),
- model: mapValueOfType<String>(json, r'model'),
- ocr: mapValueOfType<String>(json, r'ocr'),
- personIds: json[r'personIds'] is Iterable
+ : const []) : const Optional.absent(),
+ city: json.containsKey(r'city') ? Optional.present(mapValueOfType<String>(json, r'city')) : const Optional.absent(),
+ country: json.containsKey(r'country') ? Optional.present(mapValueOfType<String>(json, r'country')) : const Optional.absent(),
+ createdAfter: json.containsKey(r'createdAfter') ? Optional.present(mapDateTime(json, r'createdAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ createdBefore: json.containsKey(r'createdBefore') ? Optional.present(mapDateTime(json, r'createdBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ isEncoded: json.containsKey(r'isEncoded') ? Optional.present(mapValueOfType<bool>(json, r'isEncoded')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ isMotion: json.containsKey(r'isMotion') ? Optional.present(mapValueOfType<bool>(json, r'isMotion')) : const Optional.absent(),
+ isNotInAlbum: json.containsKey(r'isNotInAlbum') ? Optional.present(mapValueOfType<bool>(json, r'isNotInAlbum')) : const Optional.absent(),
+ isOffline: json.containsKey(r'isOffline') ? Optional.present(mapValueOfType<bool>(json, r'isOffline')) : const Optional.absent(),
+ lensModel: json.containsKey(r'lensModel') ? Optional.present(mapValueOfType<String>(json, r'lensModel')) : const Optional.absent(),
+ libraryId: json.containsKey(r'libraryId') ? Optional.present(mapValueOfType<String>(json, r'libraryId')) : const Optional.absent(),
+ make: json.containsKey(r'make') ? Optional.present(mapValueOfType<String>(json, r'make')) : const Optional.absent(),
+ model: json.containsKey(r'model') ? Optional.present(mapValueOfType<String>(json, r'model')) : const Optional.absent(),
+ ocr: json.containsKey(r'ocr') ? Optional.present(mapValueOfType<String>(json, r'ocr')) : const Optional.absent(),
+ personIds: json.containsKey(r'personIds') ? Optional.present(json[r'personIds'] is Iterable
? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- rating: mapValueOfType<int>(json, r'rating'),
- state: mapValueOfType<String>(json, r'state'),
- tagIds: json[r'tagIds'] is Iterable
+ : const []) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ state: json.containsKey(r'state') ? Optional.present(mapValueOfType<String>(json, r'state')) : const Optional.absent(),
+ tagIds: json.containsKey(r'tagIds') ? Optional.present(json[r'tagIds'] is Iterable
? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- takenAfter: mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- takenBefore: mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedAfter: mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- trashedBefore: mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- type: AssetTypeEnum.fromJson(json[r'type']),
- updatedAfter: mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- updatedBefore: mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
- visibility: AssetVisibility.fromJson(json[r'visibility']),
+ : const []) : const Optional.absent(),
+ takenAfter: json.containsKey(r'takenAfter') ? Optional.present(mapDateTime(json, r'takenAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ takenBefore: json.containsKey(r'takenBefore') ? Optional.present(mapDateTime(json, r'takenBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedAfter: json.containsKey(r'trashedAfter') ? Optional.present(mapDateTime(json, r'trashedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ trashedBefore: json.containsKey(r'trashedBefore') ? Optional.present(mapDateTime(json, r'trashedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ type: json.containsKey(r'type') ? Optional.present(AssetTypeEnum.fromJson(json[r'type'])) : const Optional.absent(),
+ updatedAfter: json.containsKey(r'updatedAfter') ? Optional.present(mapDateTime(json, r'updatedAfter', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ updatedBefore: json.containsKey(r'updatedBefore') ? Optional.present(mapDateTime(json, r'updatedBefore', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')) : const Optional.absent(),
+ visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/sync_ack_delete_dto.dart b/mobile/openapi/lib/model/sync_ack_delete_dto.dart
index b72ae8c5a6..76e2b780a7 100644
--- a/mobile/openapi/lib/model/sync_ack_delete_dto.dart
+++ b/mobile/openapi/lib/model/sync_ack_delete_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class SyncAckDeleteDto {
/// Returns a new [SyncAckDeleteDto] instance.
SyncAckDeleteDto({
- this.types = const [],
+ this.types = const Optional.present(const []),
});
/// Sync entity types to delete acks for
- List<SyncEntityType> types;
+ Optional<List<SyncEntityType>?> types;
@override
bool operator ==(Object other) => identical(this, other) || other is SyncAckDeleteDto &&
@@ -33,7 +33,10 @@ class SyncAckDeleteDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'types'] = this.types;
+ if (this.types.isPresent) {
+ final value = this.types.value;
+ json[r'types'] = value;
+ }
return json;
}
@@ -46,7 +49,7 @@ class SyncAckDeleteDto {
final json = value.cast<String, dynamic>();
return SyncAckDeleteDto(
- types: SyncEntityType.listFromJson(json[r'types']),
+ types: json.containsKey(r'types') ? Optional.present(SyncEntityType.listFromJson(json[r'types'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/sync_album_v1.dart b/mobile/openapi/lib/model/sync_album_v1.dart
index 17b2bda02b..0a216cd93d 100644
--- a/mobile/openapi/lib/model/sync_album_v1.dart
+++ b/mobile/openapi/lib/model/sync_album_v1.dart
@@ -92,7 +92,7 @@ class SyncAlbumV1 {
if (this.thumbnailAssetId != null) {
json[r'thumbnailAssetId'] = this.thumbnailAssetId;
} else {
- // json[r'thumbnailAssetId'] = null;
+ json[r'thumbnailAssetId'] = null;
}
json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.updatedAt.millisecondsSinceEpoch
diff --git a/mobile/openapi/lib/model/sync_album_v2.dart b/mobile/openapi/lib/model/sync_album_v2.dart
index 67c65a190b..c0d0cf339b 100644
--- a/mobile/openapi/lib/model/sync_album_v2.dart
+++ b/mobile/openapi/lib/model/sync_album_v2.dart
@@ -85,7 +85,7 @@ class SyncAlbumV2 {
if (this.thumbnailAssetId != null) {
json[r'thumbnailAssetId'] = this.thumbnailAssetId;
} else {
- // json[r'thumbnailAssetId'] = null;
+ json[r'thumbnailAssetId'] = null;
}
json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.updatedAt.millisecondsSinceEpoch
diff --git a/mobile/openapi/lib/model/sync_asset_exif_v1.dart b/mobile/openapi/lib/model/sync_asset_exif_v1.dart
index caaeed7fb3..fb806322c9 100644
--- a/mobile/openapi/lib/model/sync_asset_exif_v1.dart
+++ b/mobile/openapi/lib/model/sync_asset_exif_v1.dart
@@ -196,126 +196,126 @@ class SyncAssetExifV1 {
if (this.city != null) {
json[r'city'] = this.city;
} else {
- // json[r'city'] = null;
+ json[r'city'] = null;
}
if (this.country != null) {
json[r'country'] = this.country;
} else {
- // json[r'country'] = null;
+ json[r'country'] = null;
}
if (this.dateTimeOriginal != null) {
json[r'dateTimeOriginal'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.dateTimeOriginal!.millisecondsSinceEpoch
: this.dateTimeOriginal!.toUtc().toIso8601String();
} else {
- // json[r'dateTimeOriginal'] = null;
+ json[r'dateTimeOriginal'] = null;
}
if (this.description != null) {
json[r'description'] = this.description;
} else {
- // json[r'description'] = null;
+ json[r'description'] = null;
}
if (this.exifImageHeight != null) {
json[r'exifImageHeight'] = this.exifImageHeight;
} else {
- // json[r'exifImageHeight'] = null;
+ json[r'exifImageHeight'] = null;
}
if (this.exifImageWidth != null) {
json[r'exifImageWidth'] = this.exifImageWidth;
} else {
- // json[r'exifImageWidth'] = null;
+ json[r'exifImageWidth'] = null;
}
if (this.exposureTime != null) {
json[r'exposureTime'] = this.exposureTime;
} else {
- // json[r'exposureTime'] = null;
+ json[r'exposureTime'] = null;
}
if (this.fNumber != null) {
json[r'fNumber'] = this.fNumber;
} else {
- // json[r'fNumber'] = null;
+ json[r'fNumber'] = null;
}
if (this.fileSizeInByte != null) {
json[r'fileSizeInByte'] = this.fileSizeInByte;
} else {
- // json[r'fileSizeInByte'] = null;
+ json[r'fileSizeInByte'] = null;
}
if (this.focalLength != null) {
json[r'focalLength'] = this.focalLength;
} else {
- // json[r'focalLength'] = null;
+ json[r'focalLength'] = null;
}
if (this.fps != null) {
json[r'fps'] = this.fps;
} else {
- // json[r'fps'] = null;
+ json[r'fps'] = null;
}
if (this.iso != null) {
json[r'iso'] = this.iso;
} else {
- // json[r'iso'] = null;
+ json[r'iso'] = null;
}
if (this.latitude != null) {
json[r'latitude'] = this.latitude;
} else {
- // json[r'latitude'] = null;
+ json[r'latitude'] = null;
}
if (this.lensModel != null) {
json[r'lensModel'] = this.lensModel;
} else {
- // json[r'lensModel'] = null;
+ json[r'lensModel'] = null;
}
if (this.longitude != null) {
json[r'longitude'] = this.longitude;
} else {
- // json[r'longitude'] = null;
+ json[r'longitude'] = null;
}
if (this.make != null) {
json[r'make'] = this.make;
} else {
- // json[r'make'] = null;
+ json[r'make'] = null;
}
if (this.model != null) {
json[r'model'] = this.model;
} else {
- // json[r'model'] = null;
+ json[r'model'] = null;
}
if (this.modifyDate != null) {
json[r'modifyDate'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.modifyDate!.millisecondsSinceEpoch
: this.modifyDate!.toUtc().toIso8601String();
} else {
- // json[r'modifyDate'] = null;
+ json[r'modifyDate'] = null;
}
if (this.orientation != null) {
json[r'orientation'] = this.orientation;
} else {
- // json[r'orientation'] = null;
+ json[r'orientation'] = null;
}
if (this.profileDescription != null) {
json[r'profileDescription'] = this.profileDescription;
} else {
- // json[r'profileDescription'] = null;
+ json[r'profileDescription'] = null;
}
if (this.projectionType != null) {
json[r'projectionType'] = this.projectionType;
} else {
- // json[r'projectionType'] = null;
+ json[r'projectionType'] = null;
}
if (this.rating != null) {
json[r'rating'] = this.rating;
} else {
- // json[r'rating'] = null;
+ json[r'rating'] = null;
}
if (this.state != null) {
json[r'state'] = this.state;
} else {
- // json[r'state'] = null;
+ json[r'state'] = null;
}
if (this.timeZone != null) {
json[r'timeZone'] = this.timeZone;
} else {
- // json[r'timeZone'] = null;
+ json[r'timeZone'] = null;
}
return json;
}
@@ -337,14 +337,14 @@ class SyncAssetExifV1 {
exifImageHeight: mapValueOfType<int>(json, r'exifImageHeight'),
exifImageWidth: mapValueOfType<int>(json, r'exifImageWidth'),
exposureTime: mapValueOfType<String>(json, r'exposureTime'),
- fNumber: (mapValueOfType<num>(json, r'fNumber'))?.toDouble(),
+ fNumber: mapValueOfType<double>(json, r'fNumber'),
fileSizeInByte: mapValueOfType<int>(json, r'fileSizeInByte'),
- focalLength: (mapValueOfType<num>(json, r'focalLength'))?.toDouble(),
- fps: (mapValueOfType<num>(json, r'fps'))?.toDouble(),
+ focalLength: mapValueOfType<double>(json, r'focalLength'),
+ fps: mapValueOfType<double>(json, r'fps'),
iso: mapValueOfType<int>(json, r'iso'),
- latitude: (mapValueOfType<num>(json, r'latitude'))?.toDouble(),
+ latitude: mapValueOfType<double>(json, r'latitude'),
lensModel: mapValueOfType<String>(json, r'lensModel'),
- longitude: (mapValueOfType<num>(json, r'longitude'))?.toDouble(),
+ longitude: mapValueOfType<double>(json, r'longitude'),
make: mapValueOfType<String>(json, r'make'),
model: mapValueOfType<String>(json, r'model'),
modifyDate: mapDateTime(json, r'modifyDate', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
diff --git a/mobile/openapi/lib/model/sync_asset_face_v1.dart b/mobile/openapi/lib/model/sync_asset_face_v1.dart
index c3f74ff2cd..7ccc455f47 100644
--- a/mobile/openapi/lib/model/sync_asset_face_v1.dart
+++ b/mobile/openapi/lib/model/sync_asset_face_v1.dart
@@ -116,7 +116,7 @@ class SyncAssetFaceV1 {
if (this.personId != null) {
json[r'personId'] = this.personId;
} else {
- // json[r'personId'] = null;
+ json[r'personId'] = null;
}
json[r'sourceType'] = this.sourceType;
return json;
diff --git a/mobile/openapi/lib/model/sync_asset_face_v2.dart b/mobile/openapi/lib/model/sync_asset_face_v2.dart
index aeefc2ece9..aa5f016176 100644
--- a/mobile/openapi/lib/model/sync_asset_face_v2.dart
+++ b/mobile/openapi/lib/model/sync_asset_face_v2.dart
@@ -127,7 +127,7 @@ class SyncAssetFaceV2 {
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
json[r'id'] = this.id;
json[r'imageHeight'] = this.imageHeight;
@@ -136,7 +136,7 @@ class SyncAssetFaceV2 {
if (this.personId != null) {
json[r'personId'] = this.personId;
} else {
- // json[r'personId'] = null;
+ json[r'personId'] = null;
}
json[r'sourceType'] = this.sourceType;
return json;
diff --git a/mobile/openapi/lib/model/sync_asset_v1.dart b/mobile/openapi/lib/model/sync_asset_v1.dart
index 9a7a3a1f16..a9b8ca30cb 100644
--- a/mobile/openapi/lib/model/sync_asset_v1.dart
+++ b/mobile/openapi/lib/model/sync_asset_v1.dart
@@ -157,38 +157,38 @@ class SyncAssetV1 {
? this.createdAt!.millisecondsSinceEpoch
: this.createdAt!.toUtc().toIso8601String();
} else {
- // json[r'createdAt'] = null;
+ json[r'createdAt'] = null;
}
if (this.deletedAt != null) {
json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
if (this.duration != null) {
json[r'duration'] = this.duration;
} else {
- // json[r'duration'] = null;
+ json[r'duration'] = null;
}
if (this.fileCreatedAt != null) {
json[r'fileCreatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.fileCreatedAt!.millisecondsSinceEpoch
: this.fileCreatedAt!.toUtc().toIso8601String();
} else {
- // json[r'fileCreatedAt'] = null;
+ json[r'fileCreatedAt'] = null;
}
if (this.fileModifiedAt != null) {
json[r'fileModifiedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.fileModifiedAt!.millisecondsSinceEpoch
: this.fileModifiedAt!.toUtc().toIso8601String();
} else {
- // json[r'fileModifiedAt'] = null;
+ json[r'fileModifiedAt'] = null;
}
if (this.height != null) {
json[r'height'] = this.height;
} else {
- // json[r'height'] = null;
+ json[r'height'] = null;
}
json[r'id'] = this.id;
json[r'isEdited'] = this.isEdited;
@@ -196,38 +196,38 @@ class SyncAssetV1 {
if (this.libraryId != null) {
json[r'libraryId'] = this.libraryId;
} else {
- // json[r'libraryId'] = null;
+ json[r'libraryId'] = null;
}
if (this.livePhotoVideoId != null) {
json[r'livePhotoVideoId'] = this.livePhotoVideoId;
} else {
- // json[r'livePhotoVideoId'] = null;
+ json[r'livePhotoVideoId'] = null;
}
if (this.localDateTime != null) {
json[r'localDateTime'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.localDateTime!.millisecondsSinceEpoch
: this.localDateTime!.toUtc().toIso8601String();
} else {
- // json[r'localDateTime'] = null;
+ json[r'localDateTime'] = null;
}
json[r'originalFileName'] = this.originalFileName;
json[r'ownerId'] = this.ownerId;
if (this.stackId != null) {
json[r'stackId'] = this.stackId;
} else {
- // json[r'stackId'] = null;
+ json[r'stackId'] = null;
}
if (this.thumbhash != null) {
json[r'thumbhash'] = this.thumbhash;
} else {
- // json[r'thumbhash'] = null;
+ json[r'thumbhash'] = null;
}
json[r'type'] = this.type;
json[r'visibility'] = this.visibility;
if (this.width != null) {
json[r'width'] = this.width;
} else {
- // json[r'width'] = null;
+ json[r'width'] = null;
}
return json;
}
diff --git a/mobile/openapi/lib/model/sync_asset_v2.dart b/mobile/openapi/lib/model/sync_asset_v2.dart
index 7d1dfa298e..987f8ded93 100644
--- a/mobile/openapi/lib/model/sync_asset_v2.dart
+++ b/mobile/openapi/lib/model/sync_asset_v2.dart
@@ -160,38 +160,38 @@ class SyncAssetV2 {
? this.createdAt!.millisecondsSinceEpoch
: this.createdAt!.toUtc().toIso8601String();
} else {
- // json[r'createdAt'] = null;
+ json[r'createdAt'] = null;
}
if (this.deletedAt != null) {
json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
if (this.duration != null) {
json[r'duration'] = this.duration;
} else {
- // json[r'duration'] = null;
+ json[r'duration'] = null;
}
if (this.fileCreatedAt != null) {
json[r'fileCreatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.fileCreatedAt!.millisecondsSinceEpoch
: this.fileCreatedAt!.toUtc().toIso8601String();
} else {
- // json[r'fileCreatedAt'] = null;
+ json[r'fileCreatedAt'] = null;
}
if (this.fileModifiedAt != null) {
json[r'fileModifiedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.fileModifiedAt!.millisecondsSinceEpoch
: this.fileModifiedAt!.toUtc().toIso8601String();
} else {
- // json[r'fileModifiedAt'] = null;
+ json[r'fileModifiedAt'] = null;
}
if (this.height != null) {
json[r'height'] = this.height;
} else {
- // json[r'height'] = null;
+ json[r'height'] = null;
}
json[r'id'] = this.id;
json[r'isEdited'] = this.isEdited;
@@ -199,38 +199,38 @@ class SyncAssetV2 {
if (this.libraryId != null) {
json[r'libraryId'] = this.libraryId;
} else {
- // json[r'libraryId'] = null;
+ json[r'libraryId'] = null;
}
if (this.livePhotoVideoId != null) {
json[r'livePhotoVideoId'] = this.livePhotoVideoId;
} else {
- // json[r'livePhotoVideoId'] = null;
+ json[r'livePhotoVideoId'] = null;
}
if (this.localDateTime != null) {
json[r'localDateTime'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.localDateTime!.millisecondsSinceEpoch
: this.localDateTime!.toUtc().toIso8601String();
} else {
- // json[r'localDateTime'] = null;
+ json[r'localDateTime'] = null;
}
json[r'originalFileName'] = this.originalFileName;
json[r'ownerId'] = this.ownerId;
if (this.stackId != null) {
json[r'stackId'] = this.stackId;
} else {
- // json[r'stackId'] = null;
+ json[r'stackId'] = null;
}
if (this.thumbhash != null) {
json[r'thumbhash'] = this.thumbhash;
} else {
- // json[r'thumbhash'] = null;
+ json[r'thumbhash'] = null;
}
json[r'type'] = this.type;
json[r'visibility'] = this.visibility;
if (this.width != null) {
json[r'width'] = this.width;
} else {
- // json[r'width'] = null;
+ json[r'width'] = null;
}
return json;
}
diff --git a/mobile/openapi/lib/model/sync_auth_user_v1.dart b/mobile/openapi/lib/model/sync_auth_user_v1.dart
index c64d82bfbd..0eac7cf9b4 100644
--- a/mobile/openapi/lib/model/sync_auth_user_v1.dart
+++ b/mobile/openapi/lib/model/sync_auth_user_v1.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class SyncAuthUserV1 {
/// Returns a new [SyncAuthUserV1] instance.
SyncAuthUserV1({
- this.avatarColor,
+ this.avatarColor = const Optional.absent(),
required this.deletedAt,
required this.email,
required this.hasProfileImage,
@@ -28,7 +28,7 @@ class SyncAuthUserV1 {
required this.storageLabel,
});
- UserAvatarColor? avatarColor;
+ Optional<UserAvatarColor?> avatarColor;
/// User deleted at
DateTime? deletedAt;
@@ -110,17 +110,16 @@ class SyncAuthUserV1 {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.avatarColor != null) {
- json[r'avatarColor'] = this.avatarColor;
- } else {
- // json[r'avatarColor'] = null;
+ if (this.avatarColor.isPresent) {
+ final value = this.avatarColor.value;
+ json[r'avatarColor'] = value;
}
if (this.deletedAt != null) {
json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
json[r'email'] = this.email;
json[r'hasProfileImage'] = this.hasProfileImage;
@@ -131,7 +130,7 @@ class SyncAuthUserV1 {
if (this.pinCode != null) {
json[r'pinCode'] = this.pinCode;
} else {
- // json[r'pinCode'] = null;
+ json[r'pinCode'] = null;
}
json[r'profileChangedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.profileChangedAt.millisecondsSinceEpoch
@@ -139,13 +138,13 @@ class SyncAuthUserV1 {
if (this.quotaSizeInBytes != null) {
json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
} else {
- // json[r'quotaSizeInBytes'] = null;
+ json[r'quotaSizeInBytes'] = null;
}
json[r'quotaUsageInBytes'] = this.quotaUsageInBytes;
if (this.storageLabel != null) {
json[r'storageLabel'] = this.storageLabel;
} else {
- // json[r'storageLabel'] = null;
+ json[r'storageLabel'] = null;
}
return json;
}
@@ -159,7 +158,7 @@ class SyncAuthUserV1 {
final json = value.cast<String, dynamic>();
return SyncAuthUserV1(
- avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
+ avatarColor: json.containsKey(r'avatarColor') ? Optional.present(UserAvatarColor.fromJson(json[r'avatarColor'])) : const Optional.absent(),
deletedAt: mapDateTime(json, r'deletedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
email: mapValueOfType<String>(json, r'email')!,
hasProfileImage: mapValueOfType<bool>(json, r'hasProfileImage')!,
diff --git a/mobile/openapi/lib/model/sync_memory_v1.dart b/mobile/openapi/lib/model/sync_memory_v1.dart
index 855340f4d7..f78ad0e7ba 100644
--- a/mobile/openapi/lib/model/sync_memory_v1.dart
+++ b/mobile/openapi/lib/model/sync_memory_v1.dart
@@ -107,14 +107,14 @@ class SyncMemoryV1 {
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
if (this.hideAt != null) {
json[r'hideAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.hideAt!.millisecondsSinceEpoch
: this.hideAt!.toUtc().toIso8601String();
} else {
- // json[r'hideAt'] = null;
+ json[r'hideAt'] = null;
}
json[r'id'] = this.id;
json[r'isSaved'] = this.isSaved;
@@ -127,14 +127,14 @@ class SyncMemoryV1 {
? this.seenAt!.millisecondsSinceEpoch
: this.seenAt!.toUtc().toIso8601String();
} else {
- // json[r'seenAt'] = null;
+ json[r'seenAt'] = null;
}
if (this.showAt != null) {
json[r'showAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.showAt!.millisecondsSinceEpoch
: this.showAt!.toUtc().toIso8601String();
} else {
- // json[r'showAt'] = null;
+ json[r'showAt'] = null;
}
json[r'type'] = this.type;
json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
diff --git a/mobile/openapi/lib/model/sync_person_v1.dart b/mobile/openapi/lib/model/sync_person_v1.dart
index 1bd6f4a160..e79b7cfe16 100644
--- a/mobile/openapi/lib/model/sync_person_v1.dart
+++ b/mobile/openapi/lib/model/sync_person_v1.dart
@@ -92,12 +92,12 @@ class SyncPersonV1 {
? this.birthDate!.millisecondsSinceEpoch
: this.birthDate!.toUtc().toIso8601String();
} else {
- // json[r'birthDate'] = null;
+ json[r'birthDate'] = null;
}
if (this.color != null) {
json[r'color'] = this.color;
} else {
- // json[r'color'] = null;
+ json[r'color'] = null;
}
json[r'createdAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.createdAt.millisecondsSinceEpoch
@@ -105,7 +105,7 @@ class SyncPersonV1 {
if (this.faceAssetId != null) {
json[r'faceAssetId'] = this.faceAssetId;
} else {
- // json[r'faceAssetId'] = null;
+ json[r'faceAssetId'] = null;
}
json[r'id'] = this.id;
json[r'isFavorite'] = this.isFavorite;
diff --git a/mobile/openapi/lib/model/sync_stream_dto.dart b/mobile/openapi/lib/model/sync_stream_dto.dart
index 932477cb15..12dcfb4b84 100644
--- a/mobile/openapi/lib/model/sync_stream_dto.dart
+++ b/mobile/openapi/lib/model/sync_stream_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class SyncStreamDto {
/// Returns a new [SyncStreamDto] instance.
SyncStreamDto({
- this.reset,
+ this.reset = const Optional.absent(),
this.types = const [],
});
@@ -24,7 +24,7 @@ class SyncStreamDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? reset;
+ Optional<bool?> reset;
/// Sync request types
List<SyncRequestType> types;
@@ -45,10 +45,9 @@ class SyncStreamDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.reset != null) {
- json[r'reset'] = this.reset;
- } else {
- // json[r'reset'] = null;
+ if (this.reset.isPresent) {
+ final value = this.reset.value;
+ json[r'reset'] = value;
}
json[r'types'] = this.types;
return json;
@@ -63,7 +62,7 @@ class SyncStreamDto {
final json = value.cast<String, dynamic>();
return SyncStreamDto(
- reset: mapValueOfType<bool>(json, r'reset'),
+ reset: json.containsKey(r'reset') ? Optional.present(mapValueOfType<bool>(json, r'reset')) : const Optional.absent(),
types: SyncRequestType.listFromJson(json[r'types']),
);
}
diff --git a/mobile/openapi/lib/model/sync_user_v1.dart b/mobile/openapi/lib/model/sync_user_v1.dart
index 0a81593547..2fda2fbefa 100644
--- a/mobile/openapi/lib/model/sync_user_v1.dart
+++ b/mobile/openapi/lib/model/sync_user_v1.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class SyncUserV1 {
/// Returns a new [SyncUserV1] instance.
SyncUserV1({
- this.avatarColor,
+ this.avatarColor = const Optional.absent(),
required this.deletedAt,
required this.email,
required this.hasProfileImage,
@@ -22,7 +22,7 @@ class SyncUserV1 {
required this.profileChangedAt,
});
- UserAvatarColor? avatarColor;
+ Optional<UserAvatarColor?> avatarColor;
/// User deleted at
DateTime? deletedAt;
@@ -68,17 +68,16 @@ class SyncUserV1 {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.avatarColor != null) {
- json[r'avatarColor'] = this.avatarColor;
- } else {
- // json[r'avatarColor'] = null;
+ if (this.avatarColor.isPresent) {
+ final value = this.avatarColor.value;
+ json[r'avatarColor'] = value;
}
if (this.deletedAt != null) {
json[r'deletedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
json[r'email'] = this.email;
json[r'hasProfileImage'] = this.hasProfileImage;
@@ -99,7 +98,7 @@ class SyncUserV1 {
final json = value.cast<String, dynamic>();
return SyncUserV1(
- avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
+ avatarColor: json.containsKey(r'avatarColor') ? Optional.present(UserAvatarColor.fromJson(json[r'avatarColor'])) : const Optional.absent(),
deletedAt: mapDateTime(json, r'deletedAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/'),
email: mapValueOfType<String>(json, r'email')!,
hasProfileImage: mapValueOfType<bool>(json, r'hasProfileImage')!,
diff --git a/mobile/openapi/lib/model/system_config_generated_fullsize_image_dto.dart b/mobile/openapi/lib/model/system_config_generated_fullsize_image_dto.dart
index d78f8fadd5..f0d27ffa85 100644
--- a/mobile/openapi/lib/model/system_config_generated_fullsize_image_dto.dart
+++ b/mobile/openapi/lib/model/system_config_generated_fullsize_image_dto.dart
@@ -15,7 +15,7 @@ class SystemConfigGeneratedFullsizeImageDto {
SystemConfigGeneratedFullsizeImageDto({
required this.enabled,
required this.format,
- this.progressive,
+ this.progressive = const Optional.absent(),
required this.quality,
});
@@ -31,7 +31,7 @@ class SystemConfigGeneratedFullsizeImageDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? progressive;
+ Optional<bool?> progressive;
/// Quality
///
@@ -61,10 +61,9 @@ class SystemConfigGeneratedFullsizeImageDto {
final json = <String, dynamic>{};
json[r'enabled'] = this.enabled;
json[r'format'] = this.format;
- if (this.progressive != null) {
- json[r'progressive'] = this.progressive;
- } else {
- // json[r'progressive'] = null;
+ if (this.progressive.isPresent) {
+ final value = this.progressive.value;
+ json[r'progressive'] = value;
}
json[r'quality'] = this.quality;
return json;
@@ -81,7 +80,7 @@ class SystemConfigGeneratedFullsizeImageDto {
return SystemConfigGeneratedFullsizeImageDto(
enabled: mapValueOfType<bool>(json, r'enabled')!,
format: ImageFormat.fromJson(json[r'format'])!,
- progressive: mapValueOfType<bool>(json, r'progressive'),
+ progressive: json.containsKey(r'progressive') ? Optional.present(mapValueOfType<bool>(json, r'progressive')) : const Optional.absent(),
quality: mapValueOfType<int>(json, r'quality')!,
);
}
diff --git a/mobile/openapi/lib/model/system_config_generated_image_dto.dart b/mobile/openapi/lib/model/system_config_generated_image_dto.dart
index 2571c0cab0..6aff16322c 100644
--- a/mobile/openapi/lib/model/system_config_generated_image_dto.dart
+++ b/mobile/openapi/lib/model/system_config_generated_image_dto.dart
@@ -14,7 +14,7 @@ class SystemConfigGeneratedImageDto {
/// Returns a new [SystemConfigGeneratedImageDto] instance.
SystemConfigGeneratedImageDto({
required this.format,
- this.progressive,
+ this.progressive = const Optional.absent(),
required this.quality,
required this.size,
});
@@ -28,7 +28,7 @@ class SystemConfigGeneratedImageDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? progressive;
+ Optional<bool?> progressive;
/// Quality
///
@@ -63,10 +63,9 @@ class SystemConfigGeneratedImageDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'format'] = this.format;
- if (this.progressive != null) {
- json[r'progressive'] = this.progressive;
- } else {
- // json[r'progressive'] = null;
+ if (this.progressive.isPresent) {
+ final value = this.progressive.value;
+ json[r'progressive'] = value;
}
json[r'quality'] = this.quality;
json[r'size'] = this.size;
@@ -83,7 +82,7 @@ class SystemConfigGeneratedImageDto {
return SystemConfigGeneratedImageDto(
format: ImageFormat.fromJson(json[r'format'])!,
- progressive: mapValueOfType<bool>(json, r'progressive'),
+ progressive: json.containsKey(r'progressive') ? Optional.present(mapValueOfType<bool>(json, r'progressive')) : const Optional.absent(),
quality: mapValueOfType<int>(json, r'quality')!,
size: mapValueOfType<int>(json, r'size')!,
);
diff --git a/mobile/openapi/lib/model/system_config_o_auth_dto.dart b/mobile/openapi/lib/model/system_config_o_auth_dto.dart
index c65de03391..44eefe605c 100644
--- a/mobile/openapi/lib/model/system_config_o_auth_dto.dart
+++ b/mobile/openapi/lib/model/system_config_o_auth_dto.dart
@@ -167,7 +167,7 @@ class SystemConfigOAuthDto {
if (this.defaultStorageQuota != null) {
json[r'defaultStorageQuota'] = this.defaultStorageQuota;
} else {
- // json[r'defaultStorageQuota'] = null;
+ json[r'defaultStorageQuota'] = null;
}
json[r'enabled'] = this.enabled;
json[r'endSessionEndpoint'] = this.endSessionEndpoint;
diff --git a/mobile/openapi/lib/model/tag_create_dto.dart b/mobile/openapi/lib/model/tag_create_dto.dart
index e05b29f1ed..e46f3fc8b6 100644
--- a/mobile/openapi/lib/model/tag_create_dto.dart
+++ b/mobile/openapi/lib/model/tag_create_dto.dart
@@ -13,19 +13,19 @@ part of openapi.api;
class TagCreateDto {
/// Returns a new [TagCreateDto] instance.
TagCreateDto({
- this.color,
+ this.color = const Optional.absent(),
required this.name,
- this.parentId,
+ this.parentId = const Optional.absent(),
});
/// Tag color (hex)
- String? color;
+ Optional<String?> color;
/// Tag name
String name;
/// Parent tag ID
- String? parentId;
+ Optional<String?> parentId;
@override
bool operator ==(Object other) => identical(this, other) || other is TagCreateDto &&
@@ -45,16 +45,14 @@ class TagCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
json[r'name'] = this.name;
- if (this.parentId != null) {
- json[r'parentId'] = this.parentId;
- } else {
- // json[r'parentId'] = null;
+ if (this.parentId.isPresent) {
+ final value = this.parentId.value;
+ json[r'parentId'] = value;
}
return json;
}
@@ -68,9 +66,9 @@ class TagCreateDto {
final json = value.cast<String, dynamic>();
return TagCreateDto(
- color: mapValueOfType<String>(json, r'color'),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
name: mapValueOfType<String>(json, r'name')!,
- parentId: mapValueOfType<String>(json, r'parentId'),
+ parentId: json.containsKey(r'parentId') ? Optional.present(mapValueOfType<String>(json, r'parentId')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/tag_response_dto.dart b/mobile/openapi/lib/model/tag_response_dto.dart
index 9a71912153..79a89f6d33 100644
--- a/mobile/openapi/lib/model/tag_response_dto.dart
+++ b/mobile/openapi/lib/model/tag_response_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class TagResponseDto {
/// Returns a new [TagResponseDto] instance.
TagResponseDto({
- this.color,
+ this.color = const Optional.absent(),
required this.createdAt,
required this.id,
required this.name,
- this.parentId,
+ this.parentId = const Optional.absent(),
required this.updatedAt,
required this.value,
});
@@ -29,7 +29,7 @@ class TagResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? color;
+ Optional<String?> color;
/// Creation date
DateTime createdAt;
@@ -47,7 +47,7 @@ class TagResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? parentId;
+ Optional<String?> parentId;
/// Last update date
DateTime updatedAt;
@@ -81,18 +81,16 @@ class TagResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
json[r'id'] = this.id;
json[r'name'] = this.name;
- if (this.parentId != null) {
- json[r'parentId'] = this.parentId;
- } else {
- // json[r'parentId'] = null;
+ if (this.parentId.isPresent) {
+ final value = this.parentId.value;
+ json[r'parentId'] = value;
}
json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
json[r'value'] = this.value;
@@ -108,11 +106,11 @@ class TagResponseDto {
final json = value.cast<String, dynamic>();
return TagResponseDto(
- color: mapValueOfType<String>(json, r'color'),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
createdAt: mapDateTime(json, r'createdAt', r'')!,
id: mapValueOfType<String>(json, r'id')!,
name: mapValueOfType<String>(json, r'name')!,
- parentId: mapValueOfType<String>(json, r'parentId'),
+ parentId: json.containsKey(r'parentId') ? Optional.present(mapValueOfType<String>(json, r'parentId')) : const Optional.absent(),
updatedAt: mapDateTime(json, r'updatedAt', r'')!,
value: mapValueOfType<String>(json, r'value')!,
);
diff --git a/mobile/openapi/lib/model/tag_update_dto.dart b/mobile/openapi/lib/model/tag_update_dto.dart
index 98cb6af523..d66bb9097e 100644
--- a/mobile/openapi/lib/model/tag_update_dto.dart
+++ b/mobile/openapi/lib/model/tag_update_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class TagUpdateDto {
/// Returns a new [TagUpdateDto] instance.
TagUpdateDto({
- this.color,
+ this.color = const Optional.absent(),
});
/// Tag color (hex)
- String? color;
+ Optional<String?> color;
@override
bool operator ==(Object other) => identical(this, other) || other is TagUpdateDto &&
@@ -33,10 +33,9 @@ class TagUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.color != null) {
- json[r'color'] = this.color;
- } else {
- // json[r'color'] = null;
+ if (this.color.isPresent) {
+ final value = this.color.value;
+ json[r'color'] = value;
}
return json;
}
@@ -50,7 +49,7 @@ class TagUpdateDto {
final json = value.cast<String, dynamic>();
return TagUpdateDto(
- color: mapValueOfType<String>(json, r'color'),
+ color: json.containsKey(r'color') ? Optional.present(mapValueOfType<String>(json, r'color')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/tags_update.dart b/mobile/openapi/lib/model/tags_update.dart
index e42357e3d4..9a9e78f1d3 100644
--- a/mobile/openapi/lib/model/tags_update.dart
+++ b/mobile/openapi/lib/model/tags_update.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class TagsUpdate {
/// Returns a new [TagsUpdate] instance.
TagsUpdate({
- this.enabled,
- this.sidebarWeb,
+ this.enabled = const Optional.absent(),
+ this.sidebarWeb = const Optional.absent(),
});
/// Whether tags are enabled
@@ -24,7 +24,7 @@ class TagsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Whether tags appear in web sidebar
///
@@ -33,7 +33,7 @@ class TagsUpdate {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? sidebarWeb;
+ Optional<bool?> sidebarWeb;
@override
bool operator ==(Object other) => identical(this, other) || other is TagsUpdate &&
@@ -51,15 +51,13 @@ class TagsUpdate {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
- if (this.sidebarWeb != null) {
- json[r'sidebarWeb'] = this.sidebarWeb;
- } else {
- // json[r'sidebarWeb'] = null;
+ if (this.sidebarWeb.isPresent) {
+ final value = this.sidebarWeb.value;
+ json[r'sidebarWeb'] = value;
}
return json;
}
@@ -73,8 +71,8 @@ class TagsUpdate {
final json = value.cast<String, dynamic>();
return TagsUpdate(
- enabled: mapValueOfType<bool>(json, r'enabled'),
- sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
+ sidebarWeb: json.containsKey(r'sidebarWeb') ? Optional.present(mapValueOfType<bool>(json, r'sidebarWeb')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/time_bucket_asset_response_dto.dart b/mobile/openapi/lib/model/time_bucket_asset_response_dto.dart
index 32e08a9ea0..154ca97504 100644
--- a/mobile/openapi/lib/model/time_bucket_asset_response_dto.dart
+++ b/mobile/openapi/lib/model/time_bucket_asset_response_dto.dart
@@ -13,8 +13,8 @@ part of openapi.api;
class TimeBucketAssetResponseDto {
/// Returns a new [TimeBucketAssetResponseDto] instance.
TimeBucketAssetResponseDto({
- this.city = const [],
- this.country = const [],
+ this.city = const Optional.present(const []),
+ this.country = const Optional.present(const []),
this.createdAt = const [],
this.duration = const [],
this.fileCreatedAt = const [],
@@ -22,29 +22,29 @@ class TimeBucketAssetResponseDto {
this.isFavorite = const [],
this.isImage = const [],
this.isTrashed = const [],
- this.latitude = const [],
+ this.latitude = const Optional.present(const []),
this.livePhotoVideoId = const [],
this.localOffsetHours = const [],
- this.longitude = const [],
+ this.longitude = const Optional.present(const []),
this.ownerId = const [],
this.projectionType = const [],
this.ratio = const [],
- this.stack = const [],
+ this.stack = const Optional.present(const []),
this.thumbhash = const [],
this.visibility = const [],
});
/// Array of city names extracted from EXIF GPS data
- List<String?> city;
+ Optional<List<String>?> city;
/// Array of country names extracted from EXIF GPS data
- List<String?> country;
+ Optional<List<String>?> country;
/// Array of UTC timestamps when each asset was originally uploaded to Immich
List<String> createdAt;
/// Array of video/gif durations in milliseconds (null for static images)
- List<int?> duration;
+ List<int> duration;
/// Array of file creation timestamps in UTC
List<String> fileCreatedAt;
@@ -62,31 +62,31 @@ class TimeBucketAssetResponseDto {
List<bool> isTrashed;
/// Array of latitude coordinates extracted from EXIF GPS data
- List<num?> latitude;
+ Optional<List<num>?> latitude;
/// Array of live photo video asset IDs (null for non-live photos)
- List<String?> livePhotoVideoId;
+ List<String> livePhotoVideoId;
/// Array of UTC offset hours at the time each photo was taken. Positive values are east of UTC, negative values are west of UTC. Values may be fractional (e.g., 5.5 for +05:30, -9.75 for -09:45). Applying this offset to 'fileCreatedAt' will give you the time the photo was taken from the photographer's perspective.
List<num> localOffsetHours;
/// Array of longitude coordinates extracted from EXIF GPS data
- List<num?> longitude;
+ Optional<List<num>?> longitude;
/// Array of owner IDs for each asset
List<String> ownerId;
/// Array of projection types for 360° content (e.g., \"EQUIRECTANGULAR\", \"CUBEFACE\", \"CYLINDRICAL\")
- List<String?> projectionType;
+ List<String> projectionType;
/// Array of aspect ratios (width/height) for each asset
List<num> ratio;
/// Array of stack information as [stackId, assetCount] tuples (null for non-stacked assets)
- List<List<String>?> stack;
+ Optional<List<List<String>?>?> stack;
/// Array of BlurHash strings for generating asset previews (base64 encoded)
- List<String?> thumbhash;
+ List<String> thumbhash;
/// Array of visibility statuses for each asset (e.g., ARCHIVE, TIMELINE, HIDDEN, LOCKED)
List<AssetVisibility> visibility;
@@ -141,8 +141,14 @@ class TimeBucketAssetResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'city'] = this.city;
- json[r'country'] = this.country;
+ if (this.city.isPresent) {
+ final value = this.city.value;
+ json[r'city'] = value;
+ }
+ if (this.country.isPresent) {
+ final value = this.country.value;
+ json[r'country'] = value;
+ }
json[r'createdAt'] = this.createdAt;
json[r'duration'] = this.duration;
json[r'fileCreatedAt'] = this.fileCreatedAt;
@@ -150,14 +156,23 @@ class TimeBucketAssetResponseDto {
json[r'isFavorite'] = this.isFavorite;
json[r'isImage'] = this.isImage;
json[r'isTrashed'] = this.isTrashed;
- json[r'latitude'] = this.latitude;
+ if (this.latitude.isPresent) {
+ final value = this.latitude.value;
+ json[r'latitude'] = value;
+ }
json[r'livePhotoVideoId'] = this.livePhotoVideoId;
json[r'localOffsetHours'] = this.localOffsetHours;
- json[r'longitude'] = this.longitude;
+ if (this.longitude.isPresent) {
+ final value = this.longitude.value;
+ json[r'longitude'] = value;
+ }
json[r'ownerId'] = this.ownerId;
json[r'projectionType'] = this.projectionType;
json[r'ratio'] = this.ratio;
- json[r'stack'] = this.stack;
+ if (this.stack.isPresent) {
+ final value = this.stack.value;
+ json[r'stack'] = value;
+ }
json[r'thumbhash'] = this.thumbhash;
json[r'visibility'] = this.visibility;
return json;
@@ -172,12 +187,12 @@ class TimeBucketAssetResponseDto {
final json = value.cast<String, dynamic>();
return TimeBucketAssetResponseDto(
- city: json[r'city'] is Iterable
+ city: json.containsKey(r'city') ? Optional.present(json[r'city'] is Iterable
? (json[r'city'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- country: json[r'country'] is Iterable
+ : const []) : const Optional.absent(),
+ country: json.containsKey(r'country') ? Optional.present(json[r'country'] is Iterable
? (json[r'country'] as Iterable).cast<String>().toList(growable: false)
- : const [],
+ : const []) : const Optional.absent(),
createdAt: json[r'createdAt'] is Iterable
? (json[r'createdAt'] as Iterable).cast<String>().toList(growable: false)
: const [],
@@ -199,18 +214,18 @@ class TimeBucketAssetResponseDto {
isTrashed: json[r'isTrashed'] is Iterable
? (json[r'isTrashed'] as Iterable).cast<bool>().toList(growable: false)
: const [],
- latitude: json[r'latitude'] is Iterable
+ latitude: json.containsKey(r'latitude') ? Optional.present(json[r'latitude'] is Iterable
? (json[r'latitude'] as Iterable).cast<num>().toList(growable: false)
- : const [],
+ : const []) : const Optional.absent(),
livePhotoVideoId: json[r'livePhotoVideoId'] is Iterable
? (json[r'livePhotoVideoId'] as Iterable).cast<String>().toList(growable: false)
: const [],
localOffsetHours: json[r'localOffsetHours'] is Iterable
? (json[r'localOffsetHours'] as Iterable).cast<num>().toList(growable: false)
: const [],
- longitude: json[r'longitude'] is Iterable
+ longitude: json.containsKey(r'longitude') ? Optional.present(json[r'longitude'] is Iterable
? (json[r'longitude'] as Iterable).cast<num>().toList(growable: false)
- : const [],
+ : const []) : const Optional.absent(),
ownerId: json[r'ownerId'] is Iterable
? (json[r'ownerId'] as Iterable).cast<String>().toList(growable: false)
: const [],
@@ -220,11 +235,11 @@ class TimeBucketAssetResponseDto {
ratio: json[r'ratio'] is Iterable
? (json[r'ratio'] as Iterable).cast<num>().toList(growable: false)
: const [],
- stack: json[r'stack'] is List
+ stack: json.containsKey(r'stack') ? Optional.present(json[r'stack'] is List
? (json[r'stack'] as List).map((e) =>
- e == null ? null : (e as List).cast<String>()
+ e == null ? null : (e as List).map((value) => value as String).toList(growable: false)
).toList()
- : const [],
+ : const []) : const Optional.absent(),
thumbhash: json[r'thumbhash'] is Iterable
? (json[r'thumbhash'] as Iterable).cast<String>().toList(growable: false)
: const [],
diff --git a/mobile/openapi/lib/model/update_album_dto.dart b/mobile/openapi/lib/model/update_album_dto.dart
index ae4a5c1f87..8995a69656 100644
--- a/mobile/openapi/lib/model/update_album_dto.dart
+++ b/mobile/openapi/lib/model/update_album_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class UpdateAlbumDto {
/// Returns a new [UpdateAlbumDto] instance.
UpdateAlbumDto({
- this.albumName,
- this.albumThumbnailAssetId,
- this.description,
- this.isActivityEnabled,
- this.order,
+ this.albumName = const Optional.absent(),
+ this.albumThumbnailAssetId = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.isActivityEnabled = const Optional.absent(),
+ this.order = const Optional.absent(),
});
/// Album name
@@ -27,7 +27,7 @@ class UpdateAlbumDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? albumName;
+ Optional<String?> albumName;
/// Album thumbnail asset ID
///
@@ -36,7 +36,7 @@ class UpdateAlbumDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? albumThumbnailAssetId;
+ Optional<String?> albumThumbnailAssetId;
/// Album description
///
@@ -45,7 +45,7 @@ class UpdateAlbumDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
/// Enable activity feed
///
@@ -54,7 +54,7 @@ class UpdateAlbumDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isActivityEnabled;
+ Optional<bool?> isActivityEnabled;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -62,7 +62,7 @@ class UpdateAlbumDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetOrder? order;
+ Optional<AssetOrder?> order;
@override
bool operator ==(Object other) => identical(this, other) || other is UpdateAlbumDto &&
@@ -86,30 +86,25 @@ class UpdateAlbumDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.albumName != null) {
- json[r'albumName'] = this.albumName;
- } else {
- // json[r'albumName'] = null;
+ if (this.albumName.isPresent) {
+ final value = this.albumName.value;
+ json[r'albumName'] = value;
}
- if (this.albumThumbnailAssetId != null) {
- json[r'albumThumbnailAssetId'] = this.albumThumbnailAssetId;
- } else {
- // json[r'albumThumbnailAssetId'] = null;
+ if (this.albumThumbnailAssetId.isPresent) {
+ final value = this.albumThumbnailAssetId.value;
+ json[r'albumThumbnailAssetId'] = value;
}
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.isActivityEnabled != null) {
- json[r'isActivityEnabled'] = this.isActivityEnabled;
- } else {
- // json[r'isActivityEnabled'] = null;
+ if (this.isActivityEnabled.isPresent) {
+ final value = this.isActivityEnabled.value;
+ json[r'isActivityEnabled'] = value;
}
- if (this.order != null) {
- json[r'order'] = this.order;
- } else {
- // json[r'order'] = null;
+ if (this.order.isPresent) {
+ final value = this.order.value;
+ json[r'order'] = value;
}
return json;
}
@@ -123,11 +118,11 @@ class UpdateAlbumDto {
final json = value.cast<String, dynamic>();
return UpdateAlbumDto(
- albumName: mapValueOfType<String>(json, r'albumName'),
- albumThumbnailAssetId: mapValueOfType<String>(json, r'albumThumbnailAssetId'),
- description: mapValueOfType<String>(json, r'description'),
- isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled'),
- order: AssetOrder.fromJson(json[r'order']),
+ albumName: json.containsKey(r'albumName') ? Optional.present(mapValueOfType<String>(json, r'albumName')) : const Optional.absent(),
+ albumThumbnailAssetId: json.containsKey(r'albumThumbnailAssetId') ? Optional.present(mapValueOfType<String>(json, r'albumThumbnailAssetId')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ isActivityEnabled: json.containsKey(r'isActivityEnabled') ? Optional.present(mapValueOfType<bool>(json, r'isActivityEnabled')) : const Optional.absent(),
+ order: json.containsKey(r'order') ? Optional.present(AssetOrder.fromJson(json[r'order'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/update_asset_dto.dart b/mobile/openapi/lib/model/update_asset_dto.dart
index 2c4c3352ea..bd64124673 100644
--- a/mobile/openapi/lib/model/update_asset_dto.dart
+++ b/mobile/openapi/lib/model/update_asset_dto.dart
@@ -13,14 +13,14 @@ part of openapi.api;
class UpdateAssetDto {
/// Returns a new [UpdateAssetDto] instance.
UpdateAssetDto({
- this.dateTimeOriginal,
- this.description,
- this.isFavorite,
- this.latitude,
- this.livePhotoVideoId,
- this.longitude,
- this.rating,
- this.visibility,
+ this.dateTimeOriginal = const Optional.absent(),
+ this.description = const Optional.absent(),
+ this.isFavorite = const Optional.absent(),
+ this.latitude = const Optional.absent(),
+ this.livePhotoVideoId = const Optional.absent(),
+ this.longitude = const Optional.absent(),
+ this.rating = const Optional.absent(),
+ this.visibility = const Optional.absent(),
});
/// Original date and time
@@ -30,7 +30,7 @@ class UpdateAssetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? dateTimeOriginal;
+ Optional<String?> dateTimeOriginal;
/// Asset description
///
@@ -39,7 +39,7 @@ class UpdateAssetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? description;
+ Optional<String?> description;
/// Mark as favorite
///
@@ -48,7 +48,7 @@ class UpdateAssetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isFavorite;
+ Optional<bool?> isFavorite;
/// Latitude coordinate
///
@@ -60,10 +60,10 @@ class UpdateAssetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- num? latitude;
+ Optional<num?> latitude;
/// Live photo video ID
- String? livePhotoVideoId;
+ Optional<String?> livePhotoVideoId;
/// Longitude coordinate
///
@@ -75,13 +75,13 @@ class UpdateAssetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- num? longitude;
+ Optional<num?> longitude;
/// Rating in range [1-5], or null for unrated
///
/// Minimum value: -1
/// Maximum value: 5
- int? rating;
+ Optional<int?> rating;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -89,7 +89,7 @@ class UpdateAssetDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AssetVisibility? visibility;
+ Optional<AssetVisibility?> visibility;
@override
bool operator ==(Object other) => identical(this, other) || other is UpdateAssetDto &&
@@ -119,45 +119,37 @@ class UpdateAssetDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.dateTimeOriginal != null) {
- json[r'dateTimeOriginal'] = this.dateTimeOriginal;
- } else {
- // json[r'dateTimeOriginal'] = null;
+ if (this.dateTimeOriginal.isPresent) {
+ final value = this.dateTimeOriginal.value;
+ json[r'dateTimeOriginal'] = value;
}
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
+ if (this.isFavorite.isPresent) {
+ final value = this.isFavorite.value;
+ json[r'isFavorite'] = value;
}
- if (this.latitude != null) {
- json[r'latitude'] = this.latitude;
- } else {
- // json[r'latitude'] = null;
+ if (this.latitude.isPresent) {
+ final value = this.latitude.value;
+ json[r'latitude'] = value;
}
- if (this.livePhotoVideoId != null) {
- json[r'livePhotoVideoId'] = this.livePhotoVideoId;
- } else {
- // json[r'livePhotoVideoId'] = null;
+ if (this.livePhotoVideoId.isPresent) {
+ final value = this.livePhotoVideoId.value;
+ json[r'livePhotoVideoId'] = value;
}
- if (this.longitude != null) {
- json[r'longitude'] = this.longitude;
- } else {
- // json[r'longitude'] = null;
+ if (this.longitude.isPresent) {
+ final value = this.longitude.value;
+ json[r'longitude'] = value;
}
- if (this.rating != null) {
- json[r'rating'] = this.rating;
- } else {
- // json[r'rating'] = null;
+ if (this.rating.isPresent) {
+ final value = this.rating.value;
+ json[r'rating'] = value;
}
- if (this.visibility != null) {
- json[r'visibility'] = this.visibility;
- } else {
- // json[r'visibility'] = null;
+ if (this.visibility.isPresent) {
+ final value = this.visibility.value;
+ json[r'visibility'] = value;
}
return json;
}
@@ -171,14 +163,14 @@ class UpdateAssetDto {
final json = value.cast<String, dynamic>();
return UpdateAssetDto(
- dateTimeOriginal: mapValueOfType<String>(json, r'dateTimeOriginal'),
- description: mapValueOfType<String>(json, r'description'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- latitude: num.parse('${json[r'latitude']}'),
- livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
- longitude: num.parse('${json[r'longitude']}'),
- rating: mapValueOfType<int>(json, r'rating'),
- visibility: AssetVisibility.fromJson(json[r'visibility']),
+ dateTimeOriginal: json.containsKey(r'dateTimeOriginal') ? Optional.present(mapValueOfType<String>(json, r'dateTimeOriginal')) : const Optional.absent(),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+ latitude: json.containsKey(r'latitude') ? Optional.present(json[r'latitude'] == null ? null : num.parse('${json[r'latitude']}')) : const Optional.absent(),
+ livePhotoVideoId: json.containsKey(r'livePhotoVideoId') ? Optional.present(mapValueOfType<String>(json, r'livePhotoVideoId')) : const Optional.absent(),
+ longitude: json.containsKey(r'longitude') ? Optional.present(json[r'longitude'] == null ? null : num.parse('${json[r'longitude']}')) : const Optional.absent(),
+ rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+ visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/update_library_dto.dart b/mobile/openapi/lib/model/update_library_dto.dart
index 276d43ecd9..44aa042f35 100644
--- a/mobile/openapi/lib/model/update_library_dto.dart
+++ b/mobile/openapi/lib/model/update_library_dto.dart
@@ -13,16 +13,16 @@ part of openapi.api;
class UpdateLibraryDto {
/// Returns a new [UpdateLibraryDto] instance.
UpdateLibraryDto({
- this.exclusionPatterns = const [],
- this.importPaths = const [],
- this.name,
+ this.exclusionPatterns = const Optional.present(const []),
+ this.importPaths = const Optional.present(const []),
+ this.name = const Optional.absent(),
});
/// Exclusion patterns (max 128)
- List<String> exclusionPatterns;
+ Optional<List<String>?> exclusionPatterns;
/// Import paths (max 128)
- List<String> importPaths;
+ Optional<List<String>?> importPaths;
/// Library name
///
@@ -31,7 +31,7 @@ class UpdateLibraryDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
@override
bool operator ==(Object other) => identical(this, other) || other is UpdateLibraryDto &&
@@ -51,12 +51,17 @@ class UpdateLibraryDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'exclusionPatterns'] = this.exclusionPatterns;
- json[r'importPaths'] = this.importPaths;
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.exclusionPatterns.isPresent) {
+ final value = this.exclusionPatterns.value;
+ json[r'exclusionPatterns'] = value;
+ }
+ if (this.importPaths.isPresent) {
+ final value = this.importPaths.value;
+ json[r'importPaths'] = value;
+ }
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
return json;
}
@@ -70,13 +75,13 @@ class UpdateLibraryDto {
final json = value.cast<String, dynamic>();
return UpdateLibraryDto(
- exclusionPatterns: json[r'exclusionPatterns'] is Iterable
+ exclusionPatterns: json.containsKey(r'exclusionPatterns') ? Optional.present(json[r'exclusionPatterns'] is Iterable
? (json[r'exclusionPatterns'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- importPaths: json[r'importPaths'] is Iterable
+ : const []) : const Optional.absent(),
+ importPaths: json.containsKey(r'importPaths') ? Optional.present(json[r'importPaths'] is Iterable
? (json[r'importPaths'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- name: mapValueOfType<String>(json, r'name'),
+ : const []) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/usage_by_user_dto.dart b/mobile/openapi/lib/model/usage_by_user_dto.dart
index 462b82c3e0..fbf2cc02e4 100644
--- a/mobile/openapi/lib/model/usage_by_user_dto.dart
+++ b/mobile/openapi/lib/model/usage_by_user_dto.dart
@@ -97,7 +97,7 @@ class UsageByUserDto {
if (this.quotaSizeInBytes != null) {
json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
} else {
- // json[r'quotaSizeInBytes'] = null;
+ json[r'quotaSizeInBytes'] = null;
}
json[r'usage'] = this.usage;
json[r'usagePhotos'] = this.usagePhotos;
diff --git a/mobile/openapi/lib/model/user_admin_create_dto.dart b/mobile/openapi/lib/model/user_admin_create_dto.dart
index 54da0b0566..8ed867c2cf 100644
--- a/mobile/openapi/lib/model/user_admin_create_dto.dart
+++ b/mobile/openapi/lib/model/user_admin_create_dto.dart
@@ -13,19 +13,19 @@ part of openapi.api;
class UserAdminCreateDto {
/// Returns a new [UserAdminCreateDto] instance.
UserAdminCreateDto({
- this.avatarColor,
+ this.avatarColor = const Optional.absent(),
required this.email,
- this.isAdmin,
+ this.isAdmin = const Optional.absent(),
required this.name,
- this.notify,
+ this.notify = const Optional.absent(),
required this.password,
- this.pinCode,
- this.quotaSizeInBytes,
- this.shouldChangePassword,
- this.storageLabel,
+ this.pinCode = const Optional.absent(),
+ this.quotaSizeInBytes = const Optional.absent(),
+ this.shouldChangePassword = const Optional.absent(),
+ this.storageLabel = const Optional.absent(),
});
- UserAvatarColor? avatarColor;
+ Optional<UserAvatarColor?> avatarColor;
/// User email
String email;
@@ -37,7 +37,7 @@ class UserAdminCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isAdmin;
+ Optional<bool?> isAdmin;
/// User name
String name;
@@ -49,19 +49,19 @@ class UserAdminCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? notify;
+ Optional<bool?> notify;
/// User password
String password;
/// PIN code
- String? pinCode;
+ Optional<String?> pinCode;
/// Storage quota in bytes
///
/// Minimum value: 0
/// Maximum value: 9007199254740991
- int? quotaSizeInBytes;
+ Optional<int?> quotaSizeInBytes;
/// Require password change on next login
///
@@ -70,10 +70,10 @@ class UserAdminCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? shouldChangePassword;
+ Optional<bool?> shouldChangePassword;
/// Storage label
- String? storageLabel;
+ Optional<String?> storageLabel;
@override
bool operator ==(Object other) => identical(this, other) || other is UserAdminCreateDto &&
@@ -107,43 +107,36 @@ class UserAdminCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.avatarColor != null) {
- json[r'avatarColor'] = this.avatarColor;
- } else {
- // json[r'avatarColor'] = null;
+ if (this.avatarColor.isPresent) {
+ final value = this.avatarColor.value;
+ json[r'avatarColor'] = value;
}
json[r'email'] = this.email;
- if (this.isAdmin != null) {
- json[r'isAdmin'] = this.isAdmin;
- } else {
- // json[r'isAdmin'] = null;
+ if (this.isAdmin.isPresent) {
+ final value = this.isAdmin.value;
+ json[r'isAdmin'] = value;
}
json[r'name'] = this.name;
- if (this.notify != null) {
- json[r'notify'] = this.notify;
- } else {
- // json[r'notify'] = null;
+ if (this.notify.isPresent) {
+ final value = this.notify.value;
+ json[r'notify'] = value;
}
json[r'password'] = this.password;
- if (this.pinCode != null) {
- json[r'pinCode'] = this.pinCode;
- } else {
- // json[r'pinCode'] = null;
+ if (this.pinCode.isPresent) {
+ final value = this.pinCode.value;
+ json[r'pinCode'] = value;
}
- if (this.quotaSizeInBytes != null) {
- json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
- } else {
- // json[r'quotaSizeInBytes'] = null;
+ if (this.quotaSizeInBytes.isPresent) {
+ final value = this.quotaSizeInBytes.value;
+ json[r'quotaSizeInBytes'] = value;
}
- if (this.shouldChangePassword != null) {
- json[r'shouldChangePassword'] = this.shouldChangePassword;
- } else {
- // json[r'shouldChangePassword'] = null;
+ if (this.shouldChangePassword.isPresent) {
+ final value = this.shouldChangePassword.value;
+ json[r'shouldChangePassword'] = value;
}
- if (this.storageLabel != null) {
- json[r'storageLabel'] = this.storageLabel;
- } else {
- // json[r'storageLabel'] = null;
+ if (this.storageLabel.isPresent) {
+ final value = this.storageLabel.value;
+ json[r'storageLabel'] = value;
}
return json;
}
@@ -157,16 +150,16 @@ class UserAdminCreateDto {
final json = value.cast<String, dynamic>();
return UserAdminCreateDto(
- avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
+ avatarColor: json.containsKey(r'avatarColor') ? Optional.present(UserAvatarColor.fromJson(json[r'avatarColor'])) : const Optional.absent(),
email: mapValueOfType<String>(json, r'email')!,
- isAdmin: mapValueOfType<bool>(json, r'isAdmin'),
+ isAdmin: json.containsKey(r'isAdmin') ? Optional.present(mapValueOfType<bool>(json, r'isAdmin')) : const Optional.absent(),
name: mapValueOfType<String>(json, r'name')!,
- notify: mapValueOfType<bool>(json, r'notify'),
+ notify: json.containsKey(r'notify') ? Optional.present(mapValueOfType<bool>(json, r'notify')) : const Optional.absent(),
password: mapValueOfType<String>(json, r'password')!,
- pinCode: mapValueOfType<String>(json, r'pinCode'),
- quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
- shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword'),
- storageLabel: mapValueOfType<String>(json, r'storageLabel'),
+ pinCode: json.containsKey(r'pinCode') ? Optional.present(mapValueOfType<String>(json, r'pinCode')) : const Optional.absent(),
+ quotaSizeInBytes: json.containsKey(r'quotaSizeInBytes') ? Optional.present(json[r'quotaSizeInBytes'] == null ? null : int.parse('${json[r'quotaSizeInBytes']}')) : const Optional.absent(),
+ shouldChangePassword: json.containsKey(r'shouldChangePassword') ? Optional.present(mapValueOfType<bool>(json, r'shouldChangePassword')) : const Optional.absent(),
+ storageLabel: json.containsKey(r'storageLabel') ? Optional.present(mapValueOfType<String>(json, r'storageLabel')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/user_admin_delete_dto.dart b/mobile/openapi/lib/model/user_admin_delete_dto.dart
index 6be70f37b7..8d7ab73076 100644
--- a/mobile/openapi/lib/model/user_admin_delete_dto.dart
+++ b/mobile/openapi/lib/model/user_admin_delete_dto.dart
@@ -13,7 +13,7 @@ part of openapi.api;
class UserAdminDeleteDto {
/// Returns a new [UserAdminDeleteDto] instance.
UserAdminDeleteDto({
- this.force,
+ this.force = const Optional.absent(),
});
/// Force delete even if user has assets
@@ -23,7 +23,7 @@ class UserAdminDeleteDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? force;
+ Optional<bool?> force;
@override
bool operator ==(Object other) => identical(this, other) || other is UserAdminDeleteDto &&
@@ -39,10 +39,9 @@ class UserAdminDeleteDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.force != null) {
- json[r'force'] = this.force;
- } else {
- // json[r'force'] = null;
+ if (this.force.isPresent) {
+ final value = this.force.value;
+ json[r'force'] = value;
}
return json;
}
@@ -56,7 +55,7 @@ class UserAdminDeleteDto {
final json = value.cast<String, dynamic>();
return UserAdminDeleteDto(
- force: mapValueOfType<bool>(json, r'force'),
+ force: json.containsKey(r'force') ? Optional.present(mapValueOfType<bool>(json, r'force')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/user_admin_response_dto.dart b/mobile/openapi/lib/model/user_admin_response_dto.dart
index 09f8cedce4..733f217b68 100644
--- a/mobile/openapi/lib/model/user_admin_response_dto.dart
+++ b/mobile/openapi/lib/model/user_admin_response_dto.dart
@@ -141,7 +141,7 @@ class UserAdminResponseDto {
? this.deletedAt!.millisecondsSinceEpoch
: this.deletedAt!.toUtc().toIso8601String();
} else {
- // json[r'deletedAt'] = null;
+ json[r'deletedAt'] = null;
}
json[r'email'] = this.email;
json[r'id'] = this.id;
@@ -149,7 +149,7 @@ class UserAdminResponseDto {
if (this.license != null) {
json[r'license'] = this.license;
} else {
- // json[r'license'] = null;
+ json[r'license'] = null;
}
json[r'name'] = this.name;
json[r'oauthId'] = this.oauthId;
@@ -158,19 +158,19 @@ class UserAdminResponseDto {
if (this.quotaSizeInBytes != null) {
json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
} else {
- // json[r'quotaSizeInBytes'] = null;
+ json[r'quotaSizeInBytes'] = null;
}
if (this.quotaUsageInBytes != null) {
json[r'quotaUsageInBytes'] = this.quotaUsageInBytes;
} else {
- // json[r'quotaUsageInBytes'] = null;
+ json[r'quotaUsageInBytes'] = null;
}
json[r'shouldChangePassword'] = this.shouldChangePassword;
json[r'status'] = this.status;
if (this.storageLabel != null) {
json[r'storageLabel'] = this.storageLabel;
} else {
- // json[r'storageLabel'] = null;
+ json[r'storageLabel'] = null;
}
json[r'updatedAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
? this.updatedAt.millisecondsSinceEpoch
diff --git a/mobile/openapi/lib/model/user_admin_update_dto.dart b/mobile/openapi/lib/model/user_admin_update_dto.dart
index 0c33a46139..f1b91d8e61 100644
--- a/mobile/openapi/lib/model/user_admin_update_dto.dart
+++ b/mobile/openapi/lib/model/user_admin_update_dto.dart
@@ -13,18 +13,18 @@ part of openapi.api;
class UserAdminUpdateDto {
/// Returns a new [UserAdminUpdateDto] instance.
UserAdminUpdateDto({
- this.avatarColor,
- this.email,
- this.isAdmin,
- this.name,
- this.password,
- this.pinCode,
- this.quotaSizeInBytes,
- this.shouldChangePassword,
- this.storageLabel,
+ this.avatarColor = const Optional.absent(),
+ this.email = const Optional.absent(),
+ this.isAdmin = const Optional.absent(),
+ this.name = const Optional.absent(),
+ this.password = const Optional.absent(),
+ this.pinCode = const Optional.absent(),
+ this.quotaSizeInBytes = const Optional.absent(),
+ this.shouldChangePassword = const Optional.absent(),
+ this.storageLabel = const Optional.absent(),
});
- UserAvatarColor? avatarColor;
+ Optional<UserAvatarColor?> avatarColor;
/// User email
///
@@ -33,7 +33,7 @@ class UserAdminUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? email;
+ Optional<String?> email;
/// Grant admin privileges
///
@@ -42,7 +42,7 @@ class UserAdminUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? isAdmin;
+ Optional<bool?> isAdmin;
/// User name
///
@@ -51,7 +51,7 @@ class UserAdminUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
/// User password
///
@@ -60,16 +60,16 @@ class UserAdminUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? password;
+ Optional<String?> password;
/// PIN code
- String? pinCode;
+ Optional<String?> pinCode;
/// Storage quota in bytes
///
/// Minimum value: 0
/// Maximum value: 9007199254740991
- int? quotaSizeInBytes;
+ Optional<int?> quotaSizeInBytes;
/// Require password change on next login
///
@@ -78,10 +78,10 @@ class UserAdminUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? shouldChangePassword;
+ Optional<bool?> shouldChangePassword;
/// Storage label
- String? storageLabel;
+ Optional<String?> storageLabel;
@override
bool operator ==(Object other) => identical(this, other) || other is UserAdminUpdateDto &&
@@ -113,50 +113,41 @@ class UserAdminUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.avatarColor != null) {
- json[r'avatarColor'] = this.avatarColor;
- } else {
- // json[r'avatarColor'] = null;
+ if (this.avatarColor.isPresent) {
+ final value = this.avatarColor.value;
+ json[r'avatarColor'] = value;
}
- if (this.email != null) {
- json[r'email'] = this.email;
- } else {
- // json[r'email'] = null;
+ if (this.email.isPresent) {
+ final value = this.email.value;
+ json[r'email'] = value;
}
- if (this.isAdmin != null) {
- json[r'isAdmin'] = this.isAdmin;
- } else {
- // json[r'isAdmin'] = null;
+ if (this.isAdmin.isPresent) {
+ final value = this.isAdmin.value;
+ json[r'isAdmin'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
}
- if (this.pinCode != null) {
- json[r'pinCode'] = this.pinCode;
- } else {
- // json[r'pinCode'] = null;
+ if (this.pinCode.isPresent) {
+ final value = this.pinCode.value;
+ json[r'pinCode'] = value;
}
- if (this.quotaSizeInBytes != null) {
- json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
- } else {
- // json[r'quotaSizeInBytes'] = null;
+ if (this.quotaSizeInBytes.isPresent) {
+ final value = this.quotaSizeInBytes.value;
+ json[r'quotaSizeInBytes'] = value;
}
- if (this.shouldChangePassword != null) {
- json[r'shouldChangePassword'] = this.shouldChangePassword;
- } else {
- // json[r'shouldChangePassword'] = null;
+ if (this.shouldChangePassword.isPresent) {
+ final value = this.shouldChangePassword.value;
+ json[r'shouldChangePassword'] = value;
}
- if (this.storageLabel != null) {
- json[r'storageLabel'] = this.storageLabel;
- } else {
- // json[r'storageLabel'] = null;
+ if (this.storageLabel.isPresent) {
+ final value = this.storageLabel.value;
+ json[r'storageLabel'] = value;
}
return json;
}
@@ -170,15 +161,15 @@ class UserAdminUpdateDto {
final json = value.cast<String, dynamic>();
return UserAdminUpdateDto(
- avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
- email: mapValueOfType<String>(json, r'email'),
- isAdmin: mapValueOfType<bool>(json, r'isAdmin'),
- name: mapValueOfType<String>(json, r'name'),
- password: mapValueOfType<String>(json, r'password'),
- pinCode: mapValueOfType<String>(json, r'pinCode'),
- quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
- shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword'),
- storageLabel: mapValueOfType<String>(json, r'storageLabel'),
+ avatarColor: json.containsKey(r'avatarColor') ? Optional.present(UserAvatarColor.fromJson(json[r'avatarColor'])) : const Optional.absent(),
+ email: json.containsKey(r'email') ? Optional.present(mapValueOfType<String>(json, r'email')) : const Optional.absent(),
+ isAdmin: json.containsKey(r'isAdmin') ? Optional.present(mapValueOfType<bool>(json, r'isAdmin')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
+ pinCode: json.containsKey(r'pinCode') ? Optional.present(mapValueOfType<String>(json, r'pinCode')) : const Optional.absent(),
+ quotaSizeInBytes: json.containsKey(r'quotaSizeInBytes') ? Optional.present(json[r'quotaSizeInBytes'] == null ? null : int.parse('${json[r'quotaSizeInBytes']}')) : const Optional.absent(),
+ shouldChangePassword: json.containsKey(r'shouldChangePassword') ? Optional.present(mapValueOfType<bool>(json, r'shouldChangePassword')) : const Optional.absent(),
+ storageLabel: json.containsKey(r'storageLabel') ? Optional.present(mapValueOfType<String>(json, r'storageLabel')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/user_preferences_update_dto.dart b/mobile/openapi/lib/model/user_preferences_update_dto.dart
index 3b9b178b55..f3f2d85bdf 100644
--- a/mobile/openapi/lib/model/user_preferences_update_dto.dart
+++ b/mobile/openapi/lib/model/user_preferences_update_dto.dart
@@ -13,18 +13,18 @@ part of openapi.api;
class UserPreferencesUpdateDto {
/// Returns a new [UserPreferencesUpdateDto] instance.
UserPreferencesUpdateDto({
- this.albums,
- this.avatar,
- this.cast,
- this.download,
- this.emailNotifications,
- this.folders,
- this.memories,
- this.people,
- this.purchase,
- this.ratings,
- this.sharedLinks,
- this.tags,
+ this.albums = const Optional.absent(),
+ this.avatar = const Optional.absent(),
+ this.cast = const Optional.absent(),
+ this.download = const Optional.absent(),
+ this.emailNotifications = const Optional.absent(),
+ this.folders = const Optional.absent(),
+ this.memories = const Optional.absent(),
+ this.people = const Optional.absent(),
+ this.purchase = const Optional.absent(),
+ this.ratings = const Optional.absent(),
+ this.sharedLinks = const Optional.absent(),
+ this.tags = const Optional.absent(),
});
///
@@ -33,7 +33,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AlbumsUpdate? albums;
+ Optional<AlbumsUpdate?> albums;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -41,7 +41,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- AvatarUpdate? avatar;
+ Optional<AvatarUpdate?> avatar;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -49,7 +49,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- CastUpdate? cast;
+ Optional<CastUpdate?> cast;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -57,7 +57,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- DownloadUpdate? download;
+ Optional<DownloadUpdate?> download;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -65,7 +65,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- EmailNotificationsUpdate? emailNotifications;
+ Optional<EmailNotificationsUpdate?> emailNotifications;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -73,7 +73,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- FoldersUpdate? folders;
+ Optional<FoldersUpdate?> folders;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -81,7 +81,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- MemoriesUpdate? memories;
+ Optional<MemoriesUpdate?> memories;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -89,7 +89,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- PeopleUpdate? people;
+ Optional<PeopleUpdate?> people;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -97,7 +97,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- PurchaseUpdate? purchase;
+ Optional<PurchaseUpdate?> purchase;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -105,7 +105,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- RatingsUpdate? ratings;
+ Optional<RatingsUpdate?> ratings;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -113,7 +113,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- SharedLinksUpdate? sharedLinks;
+ Optional<SharedLinksUpdate?> sharedLinks;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -121,7 +121,7 @@ class UserPreferencesUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- TagsUpdate? tags;
+ Optional<TagsUpdate?> tags;
@override
bool operator ==(Object other) => identical(this, other) || other is UserPreferencesUpdateDto &&
@@ -159,65 +159,53 @@ class UserPreferencesUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.albums != null) {
- json[r'albums'] = this.albums;
- } else {
- // json[r'albums'] = null;
+ if (this.albums.isPresent) {
+ final value = this.albums.value;
+ json[r'albums'] = value;
}
- if (this.avatar != null) {
- json[r'avatar'] = this.avatar;
- } else {
- // json[r'avatar'] = null;
+ if (this.avatar.isPresent) {
+ final value = this.avatar.value;
+ json[r'avatar'] = value;
}
- if (this.cast != null) {
- json[r'cast'] = this.cast;
- } else {
- // json[r'cast'] = null;
+ if (this.cast.isPresent) {
+ final value = this.cast.value;
+ json[r'cast'] = value;
}
- if (this.download != null) {
- json[r'download'] = this.download;
- } else {
- // json[r'download'] = null;
+ if (this.download.isPresent) {
+ final value = this.download.value;
+ json[r'download'] = value;
}
- if (this.emailNotifications != null) {
- json[r'emailNotifications'] = this.emailNotifications;
- } else {
- // json[r'emailNotifications'] = null;
+ if (this.emailNotifications.isPresent) {
+ final value = this.emailNotifications.value;
+ json[r'emailNotifications'] = value;
}
- if (this.folders != null) {
- json[r'folders'] = this.folders;
- } else {
- // json[r'folders'] = null;
+ if (this.folders.isPresent) {
+ final value = this.folders.value;
+ json[r'folders'] = value;
}
- if (this.memories != null) {
- json[r'memories'] = this.memories;
- } else {
- // json[r'memories'] = null;
+ if (this.memories.isPresent) {
+ final value = this.memories.value;
+ json[r'memories'] = value;
}
- if (this.people != null) {
- json[r'people'] = this.people;
- } else {
- // json[r'people'] = null;
+ if (this.people.isPresent) {
+ final value = this.people.value;
+ json[r'people'] = value;
}
- if (this.purchase != null) {
- json[r'purchase'] = this.purchase;
- } else {
- // json[r'purchase'] = null;
+ if (this.purchase.isPresent) {
+ final value = this.purchase.value;
+ json[r'purchase'] = value;
}
- if (this.ratings != null) {
- json[r'ratings'] = this.ratings;
- } else {
- // json[r'ratings'] = null;
+ if (this.ratings.isPresent) {
+ final value = this.ratings.value;
+ json[r'ratings'] = value;
}
- if (this.sharedLinks != null) {
- json[r'sharedLinks'] = this.sharedLinks;
- } else {
- // json[r'sharedLinks'] = null;
+ if (this.sharedLinks.isPresent) {
+ final value = this.sharedLinks.value;
+ json[r'sharedLinks'] = value;
}
- if (this.tags != null) {
- json[r'tags'] = this.tags;
- } else {
- // json[r'tags'] = null;
+ if (this.tags.isPresent) {
+ final value = this.tags.value;
+ json[r'tags'] = value;
}
return json;
}
@@ -231,18 +219,18 @@ class UserPreferencesUpdateDto {
final json = value.cast<String, dynamic>();
return UserPreferencesUpdateDto(
- albums: AlbumsUpdate.fromJson(json[r'albums']),
- avatar: AvatarUpdate.fromJson(json[r'avatar']),
- cast: CastUpdate.fromJson(json[r'cast']),
- download: DownloadUpdate.fromJson(json[r'download']),
- emailNotifications: EmailNotificationsUpdate.fromJson(json[r'emailNotifications']),
- folders: FoldersUpdate.fromJson(json[r'folders']),
- memories: MemoriesUpdate.fromJson(json[r'memories']),
- people: PeopleUpdate.fromJson(json[r'people']),
- purchase: PurchaseUpdate.fromJson(json[r'purchase']),
- ratings: RatingsUpdate.fromJson(json[r'ratings']),
- sharedLinks: SharedLinksUpdate.fromJson(json[r'sharedLinks']),
- tags: TagsUpdate.fromJson(json[r'tags']),
+ albums: json.containsKey(r'albums') ? Optional.present(AlbumsUpdate.fromJson(json[r'albums'])) : const Optional.absent(),
+ avatar: json.containsKey(r'avatar') ? Optional.present(AvatarUpdate.fromJson(json[r'avatar'])) : const Optional.absent(),
+ cast: json.containsKey(r'cast') ? Optional.present(CastUpdate.fromJson(json[r'cast'])) : const Optional.absent(),
+ download: json.containsKey(r'download') ? Optional.present(DownloadUpdate.fromJson(json[r'download'])) : const Optional.absent(),
+ emailNotifications: json.containsKey(r'emailNotifications') ? Optional.present(EmailNotificationsUpdate.fromJson(json[r'emailNotifications'])) : const Optional.absent(),
+ folders: json.containsKey(r'folders') ? Optional.present(FoldersUpdate.fromJson(json[r'folders'])) : const Optional.absent(),
+ memories: json.containsKey(r'memories') ? Optional.present(MemoriesUpdate.fromJson(json[r'memories'])) : const Optional.absent(),
+ people: json.containsKey(r'people') ? Optional.present(PeopleUpdate.fromJson(json[r'people'])) : const Optional.absent(),
+ purchase: json.containsKey(r'purchase') ? Optional.present(PurchaseUpdate.fromJson(json[r'purchase'])) : const Optional.absent(),
+ ratings: json.containsKey(r'ratings') ? Optional.present(RatingsUpdate.fromJson(json[r'ratings'])) : const Optional.absent(),
+ sharedLinks: json.containsKey(r'sharedLinks') ? Optional.present(SharedLinksUpdate.fromJson(json[r'sharedLinks'])) : const Optional.absent(),
+ tags: json.containsKey(r'tags') ? Optional.present(TagsUpdate.fromJson(json[r'tags'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/user_update_me_dto.dart b/mobile/openapi/lib/model/user_update_me_dto.dart
index 0751d4096b..c4859747a6 100644
--- a/mobile/openapi/lib/model/user_update_me_dto.dart
+++ b/mobile/openapi/lib/model/user_update_me_dto.dart
@@ -13,13 +13,13 @@ part of openapi.api;
class UserUpdateMeDto {
/// Returns a new [UserUpdateMeDto] instance.
UserUpdateMeDto({
- this.avatarColor,
- this.email,
- this.name,
- this.password,
+ this.avatarColor = const Optional.absent(),
+ this.email = const Optional.absent(),
+ this.name = const Optional.absent(),
+ this.password = const Optional.absent(),
});
- UserAvatarColor? avatarColor;
+ Optional<UserAvatarColor?> avatarColor;
/// User email
///
@@ -28,7 +28,7 @@ class UserUpdateMeDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? email;
+ Optional<String?> email;
/// User name
///
@@ -37,7 +37,7 @@ class UserUpdateMeDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? name;
+ Optional<String?> name;
/// User password (deprecated, use change password endpoint)
///
@@ -46,7 +46,7 @@ class UserUpdateMeDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? password;
+ Optional<String?> password;
@override
bool operator ==(Object other) => identical(this, other) || other is UserUpdateMeDto &&
@@ -68,25 +68,21 @@ class UserUpdateMeDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.avatarColor != null) {
- json[r'avatarColor'] = this.avatarColor;
- } else {
- // json[r'avatarColor'] = null;
+ if (this.avatarColor.isPresent) {
+ final value = this.avatarColor.value;
+ json[r'avatarColor'] = value;
}
- if (this.email != null) {
- json[r'email'] = this.email;
- } else {
- // json[r'email'] = null;
+ if (this.email.isPresent) {
+ final value = this.email.value;
+ json[r'email'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
- if (this.password != null) {
- json[r'password'] = this.password;
- } else {
- // json[r'password'] = null;
+ if (this.password.isPresent) {
+ final value = this.password.value;
+ json[r'password'] = value;
}
return json;
}
@@ -100,10 +96,10 @@ class UserUpdateMeDto {
final json = value.cast<String, dynamic>();
return UserUpdateMeDto(
- avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
- email: mapValueOfType<String>(json, r'email'),
- name: mapValueOfType<String>(json, r'name'),
- password: mapValueOfType<String>(json, r'password'),
+ avatarColor: json.containsKey(r'avatarColor') ? Optional.present(UserAvatarColor.fromJson(json[r'avatarColor'])) : const Optional.absent(),
+ email: json.containsKey(r'email') ? Optional.present(mapValueOfType<String>(json, r'email')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
+ password: json.containsKey(r'password') ? Optional.present(mapValueOfType<String>(json, r'password')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/validate_library_dto.dart b/mobile/openapi/lib/model/validate_library_dto.dart
index 68fb0e9fe2..6d85712191 100644
--- a/mobile/openapi/lib/model/validate_library_dto.dart
+++ b/mobile/openapi/lib/model/validate_library_dto.dart
@@ -13,15 +13,15 @@ part of openapi.api;
class ValidateLibraryDto {
/// Returns a new [ValidateLibraryDto] instance.
ValidateLibraryDto({
- this.exclusionPatterns = const [],
- this.importPaths = const [],
+ this.exclusionPatterns = const Optional.present(const []),
+ this.importPaths = const Optional.present(const []),
});
/// Exclusion patterns (max 128)
- List<String> exclusionPatterns;
+ Optional<List<String>?> exclusionPatterns;
/// Import paths to validate (max 128)
- List<String> importPaths;
+ Optional<List<String>?> importPaths;
@override
bool operator ==(Object other) => identical(this, other) || other is ValidateLibraryDto &&
@@ -39,8 +39,14 @@ class ValidateLibraryDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'exclusionPatterns'] = this.exclusionPatterns;
- json[r'importPaths'] = this.importPaths;
+ if (this.exclusionPatterns.isPresent) {
+ final value = this.exclusionPatterns.value;
+ json[r'exclusionPatterns'] = value;
+ }
+ if (this.importPaths.isPresent) {
+ final value = this.importPaths.value;
+ json[r'importPaths'] = value;
+ }
return json;
}
@@ -53,12 +59,12 @@ class ValidateLibraryDto {
final json = value.cast<String, dynamic>();
return ValidateLibraryDto(
- exclusionPatterns: json[r'exclusionPatterns'] is Iterable
+ exclusionPatterns: json.containsKey(r'exclusionPatterns') ? Optional.present(json[r'exclusionPatterns'] is Iterable
? (json[r'exclusionPatterns'] as Iterable).cast<String>().toList(growable: false)
- : const [],
- importPaths: json[r'importPaths'] is Iterable
+ : const []) : const Optional.absent(),
+ importPaths: json.containsKey(r'importPaths') ? Optional.present(json[r'importPaths'] is Iterable
? (json[r'importPaths'] as Iterable).cast<String>().toList(growable: false)
- : const [],
+ : const []) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/validate_library_import_path_response_dto.dart b/mobile/openapi/lib/model/validate_library_import_path_response_dto.dart
index ebcb881935..3c8d7c58cd 100644
--- a/mobile/openapi/lib/model/validate_library_import_path_response_dto.dart
+++ b/mobile/openapi/lib/model/validate_library_import_path_response_dto.dart
@@ -15,7 +15,7 @@ class ValidateLibraryImportPathResponseDto {
ValidateLibraryImportPathResponseDto({
required this.importPath,
required this.isValid,
- this.message,
+ this.message = const Optional.absent(),
});
/// Import path
@@ -31,7 +31,7 @@ class ValidateLibraryImportPathResponseDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- String? message;
+ Optional<String?> message;
@override
bool operator ==(Object other) => identical(this, other) || other is ValidateLibraryImportPathResponseDto &&
@@ -53,10 +53,9 @@ class ValidateLibraryImportPathResponseDto {
final json = <String, dynamic>{};
json[r'importPath'] = this.importPath;
json[r'isValid'] = this.isValid;
- if (this.message != null) {
- json[r'message'] = this.message;
- } else {
- // json[r'message'] = null;
+ if (this.message.isPresent) {
+ final value = this.message.value;
+ json[r'message'] = value;
}
return json;
}
@@ -72,7 +71,7 @@ class ValidateLibraryImportPathResponseDto {
return ValidateLibraryImportPathResponseDto(
importPath: mapValueOfType<String>(json, r'importPath')!,
isValid: mapValueOfType<bool>(json, r'isValid')!,
- message: mapValueOfType<String>(json, r'message'),
+ message: json.containsKey(r'message') ? Optional.present(mapValueOfType<String>(json, r'message')) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/validate_library_response_dto.dart b/mobile/openapi/lib/model/validate_library_response_dto.dart
index 37f6ad07d1..5106b93ca8 100644
--- a/mobile/openapi/lib/model/validate_library_response_dto.dart
+++ b/mobile/openapi/lib/model/validate_library_response_dto.dart
@@ -13,11 +13,11 @@ part of openapi.api;
class ValidateLibraryResponseDto {
/// Returns a new [ValidateLibraryResponseDto] instance.
ValidateLibraryResponseDto({
- this.importPaths = const [],
+ this.importPaths = const Optional.present(const []),
});
/// Validation results for import paths
- List<ValidateLibraryImportPathResponseDto> importPaths;
+ Optional<List<ValidateLibraryImportPathResponseDto>?> importPaths;
@override
bool operator ==(Object other) => identical(this, other) || other is ValidateLibraryResponseDto &&
@@ -33,7 +33,10 @@ class ValidateLibraryResponseDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- json[r'importPaths'] = this.importPaths;
+ if (this.importPaths.isPresent) {
+ final value = this.importPaths.value;
+ json[r'importPaths'] = value;
+ }
return json;
}
@@ -46,7 +49,7 @@ class ValidateLibraryResponseDto {
final json = value.cast<String, dynamic>();
return ValidateLibraryResponseDto(
- importPaths: ValidateLibraryImportPathResponseDto.listFromJson(json[r'importPaths']),
+ importPaths: json.containsKey(r'importPaths') ? Optional.present(ValidateLibraryImportPathResponseDto.listFromJson(json[r'importPaths'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/model/version_check_state_response_dto.dart b/mobile/openapi/lib/model/version_check_state_response_dto.dart
index 71075a681c..4ad9458a1b 100644
--- a/mobile/openapi/lib/model/version_check_state_response_dto.dart
+++ b/mobile/openapi/lib/model/version_check_state_response_dto.dart
@@ -42,12 +42,12 @@ class VersionCheckStateResponseDto {
if (this.checkedAt != null) {
json[r'checkedAt'] = this.checkedAt;
} else {
- // json[r'checkedAt'] = null;
+ json[r'checkedAt'] = null;
}
if (this.releaseVersion != null) {
json[r'releaseVersion'] = this.releaseVersion;
} else {
- // json[r'releaseVersion'] = null;
+ json[r'releaseVersion'] = null;
}
return json;
}
diff --git a/mobile/openapi/lib/model/workflow_create_dto.dart b/mobile/openapi/lib/model/workflow_create_dto.dart
index dfd2d51290..e84554e8c9 100644
--- a/mobile/openapi/lib/model/workflow_create_dto.dart
+++ b/mobile/openapi/lib/model/workflow_create_dto.dart
@@ -13,15 +13,15 @@ part of openapi.api;
class WorkflowCreateDto {
/// Returns a new [WorkflowCreateDto] instance.
WorkflowCreateDto({
- this.description,
- this.enabled,
- this.name,
- this.steps = const [],
+ this.description = const Optional.absent(),
+ this.enabled = const Optional.absent(),
+ this.name = const Optional.absent(),
+ this.steps = const Optional.present(const []),
required this.trigger,
});
/// Workflow description
- String? description;
+ Optional<String?> description;
/// Workflow enabled
///
@@ -30,12 +30,12 @@ class WorkflowCreateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Workflow name
- String? name;
+ Optional<String?> name;
- List<WorkflowStepDto> steps;
+ Optional<List<WorkflowStepDto>?> steps;
WorkflowTrigger trigger;
@@ -61,22 +61,22 @@ class WorkflowCreateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
+ }
+ if (this.steps.isPresent) {
+ final value = this.steps.value;
+ json[r'steps'] = value;
}
- json[r'steps'] = this.steps;
json[r'trigger'] = this.trigger;
return json;
}
@@ -90,10 +90,10 @@ class WorkflowCreateDto {
final json = value.cast<String, dynamic>();
return WorkflowCreateDto(
- description: mapValueOfType<String>(json, r'description'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
- name: mapValueOfType<String>(json, r'name'),
- steps: WorkflowStepDto.listFromJson(json[r'steps']),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
+ steps: json.containsKey(r'steps') ? Optional.present(WorkflowStepDto.listFromJson(json[r'steps'])) : const Optional.absent(),
trigger: WorkflowTrigger.fromJson(json[r'trigger'])!,
);
}
diff --git a/mobile/openapi/lib/model/workflow_response_dto.dart b/mobile/openapi/lib/model/workflow_response_dto.dart
index f44506d69d..b2b5586601 100644
--- a/mobile/openapi/lib/model/workflow_response_dto.dart
+++ b/mobile/openapi/lib/model/workflow_response_dto.dart
@@ -78,14 +78,14 @@ class WorkflowResponseDto {
if (this.description != null) {
json[r'description'] = this.description;
} else {
- // json[r'description'] = null;
+ json[r'description'] = null;
}
json[r'enabled'] = this.enabled;
json[r'id'] = this.id;
if (this.name != null) {
json[r'name'] = this.name;
} else {
- // json[r'name'] = null;
+ json[r'name'] = null;
}
json[r'steps'] = this.steps;
json[r'trigger'] = this.trigger;
diff --git a/mobile/openapi/lib/model/workflow_share_response_dto.dart b/mobile/openapi/lib/model/workflow_share_response_dto.dart
index 336e8503c5..d7e90085c2 100644
--- a/mobile/openapi/lib/model/workflow_share_response_dto.dart
+++ b/mobile/openapi/lib/model/workflow_share_response_dto.dart
@@ -53,12 +53,12 @@ class WorkflowShareResponseDto {
if (this.description != null) {
json[r'description'] = this.description;
} else {
- // json[r'description'] = null;
+ json[r'description'] = null;
}
if (this.name != null) {
json[r'name'] = this.name;
} else {
- // json[r'name'] = null;
+ json[r'name'] = null;
}
json[r'steps'] = this.steps;
json[r'trigger'] = this.trigger;
diff --git a/mobile/openapi/lib/model/workflow_share_step_dto.dart b/mobile/openapi/lib/model/workflow_share_step_dto.dart
index 79c55ef716..eeb6ba4e51 100644
--- a/mobile/openapi/lib/model/workflow_share_step_dto.dart
+++ b/mobile/openapi/lib/model/workflow_share_step_dto.dart
@@ -14,7 +14,7 @@ class WorkflowShareStepDto {
/// Returns a new [WorkflowShareStepDto] instance.
WorkflowShareStepDto({
this.config = const {},
- this.enabled,
+ this.enabled = const Optional.absent(),
required this.method,
});
@@ -28,7 +28,7 @@ class WorkflowShareStepDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Step plugin method
String method;
@@ -54,12 +54,11 @@ class WorkflowShareStepDto {
if (this.config != null) {
json[r'config'] = this.config;
} else {
- // json[r'config'] = null;
+ json[r'config'] = null;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
json[r'method'] = this.method;
return json;
@@ -75,7 +74,7 @@ class WorkflowShareStepDto {
return WorkflowShareStepDto(
config: mapCastOfType<String, Object>(json, r'config'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
method: mapValueOfType<String>(json, r'method')!,
);
}
diff --git a/mobile/openapi/lib/model/workflow_step_dto.dart b/mobile/openapi/lib/model/workflow_step_dto.dart
index e881ad3150..c01e8e6b44 100644
--- a/mobile/openapi/lib/model/workflow_step_dto.dart
+++ b/mobile/openapi/lib/model/workflow_step_dto.dart
@@ -14,7 +14,7 @@ class WorkflowStepDto {
/// Returns a new [WorkflowStepDto] instance.
WorkflowStepDto({
this.config = const {},
- this.enabled,
+ this.enabled = const Optional.absent(),
required this.method,
});
@@ -28,7 +28,7 @@ class WorkflowStepDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Step plugin method
String method;
@@ -54,12 +54,11 @@ class WorkflowStepDto {
if (this.config != null) {
json[r'config'] = this.config;
} else {
- // json[r'config'] = null;
+ json[r'config'] = null;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
json[r'method'] = this.method;
return json;
@@ -75,7 +74,7 @@ class WorkflowStepDto {
return WorkflowStepDto(
config: mapCastOfType<String, Object>(json, r'config'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
method: mapValueOfType<String>(json, r'method')!,
);
}
diff --git a/mobile/openapi/lib/model/workflow_update_dto.dart b/mobile/openapi/lib/model/workflow_update_dto.dart
index 0bce75283a..32759b6395 100644
--- a/mobile/openapi/lib/model/workflow_update_dto.dart
+++ b/mobile/openapi/lib/model/workflow_update_dto.dart
@@ -13,15 +13,15 @@ part of openapi.api;
class WorkflowUpdateDto {
/// Returns a new [WorkflowUpdateDto] instance.
WorkflowUpdateDto({
- this.description,
- this.enabled,
- this.name,
- this.steps = const [],
- this.trigger,
+ this.description = const Optional.absent(),
+ this.enabled = const Optional.absent(),
+ this.name = const Optional.absent(),
+ this.steps = const Optional.present(const []),
+ this.trigger = const Optional.absent(),
});
/// Workflow description
- String? description;
+ Optional<String?> description;
/// Workflow enabled
///
@@ -30,12 +30,12 @@ class WorkflowUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- bool? enabled;
+ Optional<bool?> enabled;
/// Workflow name
- String? name;
+ Optional<String?> name;
- List<WorkflowStepDto> steps;
+ Optional<List<WorkflowStepDto>?> steps;
///
/// Please note: This property should have been non-nullable! Since the specification file
@@ -43,7 +43,7 @@ class WorkflowUpdateDto {
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
- WorkflowTrigger? trigger;
+ Optional<WorkflowTrigger?> trigger;
@override
bool operator ==(Object other) => identical(this, other) || other is WorkflowUpdateDto &&
@@ -67,26 +67,25 @@ class WorkflowUpdateDto {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
- if (this.description != null) {
- json[r'description'] = this.description;
- } else {
- // json[r'description'] = null;
+ if (this.description.isPresent) {
+ final value = this.description.value;
+ json[r'description'] = value;
}
- if (this.enabled != null) {
- json[r'enabled'] = this.enabled;
- } else {
- // json[r'enabled'] = null;
+ if (this.enabled.isPresent) {
+ final value = this.enabled.value;
+ json[r'enabled'] = value;
}
- if (this.name != null) {
- json[r'name'] = this.name;
- } else {
- // json[r'name'] = null;
+ if (this.name.isPresent) {
+ final value = this.name.value;
+ json[r'name'] = value;
}
- json[r'steps'] = this.steps;
- if (this.trigger != null) {
- json[r'trigger'] = this.trigger;
- } else {
- // json[r'trigger'] = null;
+ if (this.steps.isPresent) {
+ final value = this.steps.value;
+ json[r'steps'] = value;
+ }
+ if (this.trigger.isPresent) {
+ final value = this.trigger.value;
+ json[r'trigger'] = value;
}
return json;
}
@@ -100,11 +99,11 @@ class WorkflowUpdateDto {
final json = value.cast<String, dynamic>();
return WorkflowUpdateDto(
- description: mapValueOfType<String>(json, r'description'),
- enabled: mapValueOfType<bool>(json, r'enabled'),
- name: mapValueOfType<String>(json, r'name'),
- steps: WorkflowStepDto.listFromJson(json[r'steps']),
- trigger: WorkflowTrigger.fromJson(json[r'trigger']),
+ description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+ enabled: json.containsKey(r'enabled') ? Optional.present(mapValueOfType<bool>(json, r'enabled')) : const Optional.absent(),
+ name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
+ steps: json.containsKey(r'steps') ? Optional.present(WorkflowStepDto.listFromJson(json[r'steps'])) : const Optional.absent(),
+ trigger: json.containsKey(r'trigger') ? Optional.present(WorkflowTrigger.fromJson(json[r'trigger'])) : const Optional.absent(),
);
}
return null;
diff --git a/mobile/openapi/lib/optional.dart b/mobile/openapi/lib/optional.dart
new file mode 100644
index 0000000000..f260ec4a84
--- /dev/null
+++ b/mobile/openapi/lib/optional.dart
@@ -0,0 +1,119 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+/// Represents an optional value that can be either absent or present.
+///
+/// This is used to distinguish between three states in PATCH operations:
+/// - Absent: Field is not set (omitted from JSON)
+/// - Present with null: Field is explicitly set to null
+/// - Present with value: Field has a value
+///
+/// Example usage:
+/// ```dart
+/// // Field absent - not sent in request
+/// final patch1 = Model();
+///
+/// // Field explicitly null - sends {"field": null}
+/// final patch2 = Model(field: const Optional.present(null));
+///
+/// // Field has value - sends {"field": "value"}
+/// final patch3 = Model(field: const Optional.present('value'));
+/// ```
+abstract class Optional<T> {
+ const Optional();
+
+ /// Creates an Optional with an absent value (not set).
+ const factory Optional.absent() = Absent<T>;
+
+ /// Creates an Optional with a present value (can be null).
+ const factory Optional.present(T value) = Present<T>;
+
+ /// Returns true if this Optional has a value (even if that value is null).
+ bool get isPresent;
+
+ /// Returns true if this Optional does not have a value.
+ bool get isEmpty => !isPresent;
+
+ /// Returns the value if present, throws if absent.
+ T get value;
+
+ /// Returns the value if present, otherwise returns [defaultValue].
+ T orElse(T defaultValue);
+
+ /// Returns the value if present, otherwise returns the result of calling [defaultValue].
+ T orElseGet(T Function() defaultValue);
+
+ /// Maps the value if present using [transform], otherwise returns an absent Optional.
+ Optional<R> map<R>(R Function(T value) transform);
+}
+
+/// Represents an absent Optional value.
+class Absent<T> extends Optional<T> {
+ const Absent();
+
+ @override
+ bool get isPresent => false;
+
+ @override
+ T get value => throw StateError('No value present');
+
+ @override
+ T orElse(T defaultValue) => defaultValue;
+
+ @override
+ T orElseGet(T Function() defaultValue) => defaultValue();
+
+ @override
+ Optional<R> map<R>(R Function(T value) transform) => const Absent();
+
+ @override
+ bool operator ==(Object other) => other is Absent<T>;
+
+ @override
+ int get hashCode => 0;
+
+ @override
+ String toString() => 'Optional.absent()';
+}
+
+/// Represents a present Optional value.
+class Present<T> extends Optional<T> {
+ const Present(this._value);
+
+ final T _value;
+
+ @override
+ bool get isPresent => true;
+
+ @override
+ T get value => _value;
+
+ @override
+ T orElse(T defaultValue) => _value;
+
+ @override
+ T orElseGet(T Function() defaultValue) => _value;
+
+ @override
+ Optional<R> map<R>(R Function(T value) transform) => Optional.present(transform(_value));
+
+ @override
+ bool operator ==(Object other) =>
+ identical(this, other) ||
+ (other is Present<T> && _value == other._value);
+
+ @override
+ int get hashCode => _value.hashCode;
+
+ @override
+ String toString() => 'Optional.present($_value)';
+}
diff --git a/mobile/test/domain/repositories/sync_stream_repository_test.dart b/mobile/test/domain/repositories/sync_stream_repository_test.dart
index 4199a5b756..bd47f63da5 100644
--- a/mobile/test/domain/repositories/sync_stream_repository_test.dart
+++ b/mobile/test/domain/repositories/sync_stream_repository_test.dart
@@ -15,7 +15,7 @@ SyncUserV1 _createUser({String id = 'user-1'}) {
name: 'Test User',
deletedAt: null,
- avatarColor: null,
+ avatarColor: const Optional.absent(),
hasProfileImage: false,
profileChangedAt: DateTime(2024, 1, 1),
);
diff --git a/mobile/test/fixtures/sync_stream.stub.dart b/mobile/test/fixtures/sync_stream.stub.dart
index 6d8c0bfdf2..1691fbdc49 100644
--- a/mobile/test/fixtures/sync_stream.stub.dart
+++ b/mobile/test/fixtures/sync_stream.stub.dart
@@ -9,7 +9,7 @@ abstract final class SyncStreamStub {
email: "admin@admin",
id: "1",
name: "Admin",
- avatarColor: null,
+ avatarColor: const Optional.absent(),
hasProfileImage: false,
profileChangedAt: DateTime(2025),
),
@@ -22,7 +22,7 @@ abstract final class SyncStreamStub {
email: "user@user",
id: "5",
name: "User",
- avatarColor: null,
+ avatarColor: const Optional.absent(),
hasProfileImage: false,
profileChangedAt: DateTime(2025),
),
diff --git a/open-api/bin/generate-dart-sdk.sh b/open-api/bin/generate-dart-sdk.sh
index e81d28096f..793c1f8df3 100755
--- a/open-api/bin/generate-dart-sdk.sh
+++ b/open-api/bin/generate-dart-sdk.sh
@@ -1,28 +1,29 @@
#!/usr/bin/env bash
-OPENAPI_GENERATOR_VERSION=v7.12.0
+OPENAPI_GENERATOR_VERSION=v7.22.0
set -euo pipefail
# usage: ./bin/generate-dart-sdk.sh
rm -rf ../mobile/openapi
+
cd ./templates/mobile/serialization/native
wget -O native_class.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/$OPENAPI_GENERATOR_VERSION/modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
patch --no-backup-if-mismatch -u native_class.mustache <native_class.mustache.patch
-patch --no-backup-if-mismatch -u native_class.mustache <native_class_nullable_items_in_arrays.patch
cd ../../
wget -O api.mustache https://raw.githubusercontent.com/OpenAPITools/openapi-generator/$OPENAPI_GENERATOR_VERSION/modules/openapi-generator/src/main/resources/dart2/api.mustache
patch --no-backup-if-mismatch -u api.mustache <api.mustache.patch
cd ../../
-pnpm dlx --allow-build="" @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile/openapi -t ./templates/mobile
+pnpm dlx --allow-build="" @openapitools/openapi-generator-cli generate -g dart -i ./immich-openapi-specs.json -o ../mobile/openapi -t ./templates/mobile --additional-properties=useOptional=true
# Post generate patches
patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/api_client.dart.patch
patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
patch --no-backup-if-mismatch -u ../mobile/openapi/pubspec.yaml <./patch/pubspec_immich_mobile.yaml.patch
patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/asset_edit_action_item_dto.dart <./patch/asset_edit_action_item_dto.dart.patch
+patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/time_bucket_asset_response_dto.dart <./patch/time_bucket_asset_response_dto.dart.patch
# Don't include analysis_options.yaml for the generated openapi files
# so that language servers can properly exclude the mobile/openapi directory
rm ../mobile/openapi/analysis_options.yaml
diff --git a/open-api/openapitools.json b/open-api/openapitools.json
index 2f4612ceda..0f7e625af8 100644
--- a/open-api/openapitools.json
+++ b/open-api/openapitools.json
@@ -2,6 +2,6 @@
"$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
"spaces": 2,
"generator-cli": {
- "version": "7.8.0"
+ "version": "7.22.0"
}
}
diff --git a/open-api/patch/time_bucket_asset_response_dto.dart.patch b/open-api/patch/time_bucket_asset_response_dto.dart.patch
new file mode 100644
index 0000000000..0ff420c4eb
--- /dev/null
+++ b/open-api/patch/time_bucket_asset_response_dto.dart.patch
@@ -0,0 +1,9 @@
+@@ -83,7 +83,7 @@
+ List<num> ratio;
+
+ /// Array of stack information as [stackId, assetCount] tuples (null for non-stacked assets)
+- Optional<List<List<String>>?> stack;
++ Optional<List<List<String>?>?> stack;
+
+ /// Array of BlurHash strings for generating asset previews (base64 encoded)
+ List<String> thumbhash;
diff --git a/open-api/templates/mobile/api.mustache b/open-api/templates/mobile/api.mustache
index 2cd4c0f04e..8c6d2bb96e 100644
--- a/open-api/templates/mobile/api.mustache
+++ b/open-api/templates/mobile/api.mustache
@@ -1,5 +1,6 @@
{{>header}}
{{>part_of}}
+
{{#operations}}
class {{{classname}}} {
diff --git a/open-api/templates/mobile/serialization/native/native_class.mustache b/open-api/templates/mobile/serialization/native/native_class.mustache
index 2d6e6d24f3..973c5d9462 100644
--- a/open-api/templates/mobile/serialization/native/native_class.mustache
+++ b/open-api/templates/mobile/serialization/native/native_class.mustache
@@ -1,5 +1,6 @@
class {{{classname}}} {
{{>dart_constructor}}
+
{{#vars}}
{{#description}}
/// {{{.}}}
@@ -32,7 +33,17 @@ class {{{classname}}} {
{{/required}}
{{/isNullable}}
{{/isEnum}}
- {{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}<{{{items.dataType}}}{{#items.isNullable}}?{{/items.isNullable}}>{{/isArray}}{{^isArray}}{{{datatypeWithEnum}}}{{/isArray}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isNullable}} {{{name}}};
+ {{#required}}
+ {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{{name}}};
+ {{/required}}
+ {{^required}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{datatypeWithEnum}}} {{{name}}};
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
+ {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^defaultValue}}?{{/defaultValue}}{{/isNullable}} {{{name}}};
+ {{/vendorExtensions.x-is-optional}}
+ {{/required}}
{{/vars}}
@override
@@ -54,6 +65,37 @@ class {{{classname}}} {
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
{{#vars}}
+ {{#vendorExtensions.x-is-optional}}
+ if (this.{{{name}}}.isPresent) {
+ final value = this.{{{name}}}.value;
+ {{#isDateTime}}
+ {{#pattern}}
+ json[r'{{{baseName}}}'] = value == null ? null : (_isEpochMarker(r'{{{pattern}}}')
+ ? value.millisecondsSinceEpoch
+ : value.toUtc().toIso8601String());
+ {{/pattern}}
+ {{^pattern}}
+ json[r'{{{baseName}}}'] = value == null ? null : value.toUtc().toIso8601String();
+ {{/pattern}}
+ {{/isDateTime}}
+ {{#isDate}}
+ {{#pattern}}
+ json[r'{{{baseName}}}'] = value == null ? null : (_isEpochMarker(r'{{{pattern}}}')
+ ? value.millisecondsSinceEpoch
+ : _dateFormatter.format(value.toUtc()));
+ {{/pattern}}
+ {{^pattern}}
+ json[r'{{{baseName}}}'] = value == null ? null : _dateFormatter.format(value.toUtc());
+ {{/pattern}}
+ {{/isDate}}
+ {{^isDateTime}}
+ {{^isDate}}
+ json[r'{{{baseName}}}'] = value{{#isArray}}{{#uniqueItems}} == null ? null : value.toList(growable: false){{/uniqueItems}}{{/isArray}};
+ {{/isDate}}
+ {{/isDateTime}}
+ }
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{#isNullable}}
if (this.{{{name}}} != null) {
{{/isNullable}}
@@ -91,18 +133,19 @@ class {{{classname}}} {
{{/isDateTime}}
{{#isNullable}}
} else {
- // json[r'{{{baseName}}}'] = null;
+ json[r'{{{baseName}}}'] = null;
}
{{/isNullable}}
{{^isNullable}}
{{^required}}
{{^defaultValue}}
} else {
- // json[r'{{{baseName}}}'] = null;
+ json[r'{{{baseName}}}'] = null;
}
{{/defaultValue}}
{{/required}}
{{/isNullable}}
+ {{/vendorExtensions.x-is-optional}}
{{/vars}}
return json;
}
@@ -118,58 +161,118 @@ class {{{classname}}} {
return {{{classname}}}(
{{#vars}}
{{#isDateTime}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapDateTime(json, r'{{{baseName}}}', r'{{{pattern}}}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: mapDateTime(json, r'{{{baseName}}}', r'{{{pattern}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
{{/isDateTime}}
{{#isDate}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapDateTime(json, r'{{{baseName}}}', r'{{{pattern}}}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: mapDateTime(json, r'{{{baseName}}}', r'{{{pattern}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
{{/isDate}}
{{^isDateTime}}
{{^isDate}}
{{#complexType}}
{{#isArray}}
{{#items.isArray}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is List
+ ? (json[r'{{{baseName}}}'] as List).map((e) =>
+ {{#items.complexType}}
+ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
+ {{/items.complexType}}
+ {{^items.complexType}}
+ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
+ {{/items.complexType}}
+ ).toList()
+ : {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}}) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: json[r'{{{baseName}}}'] is List
? (json[r'{{{baseName}}}'] as List).map((e) =>
{{#items.complexType}}
- {{items.complexType}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}
+ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
{{/items.complexType}}
{{^items.complexType}}
- e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (e as List).cast<{{items.items.dataType}}>()
+ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
{{/items.complexType}}
).toList()
: {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}},
+ {{/vendorExtensions.x-is-optional}}
{{/items.isArray}}
{{^items.isArray}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
+ {{/vendorExtensions.x-is-optional}}
{{/items.isArray}}
{{/isArray}}
{{^isArray}}
{{#isMap}}
{{#items.isArray}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null
+ {{#items.complexType}}
+ : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
+ {{/items.complexType}}
+ {{^items.complexType}}
+ : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)))) : const Optional.absent(),
+ {{/items.complexType}}
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: json[r'{{{baseName}}}'] == null
? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
- {{#items.complexType}}
+ {{#items.complexType}}
: {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}']),
- {{/items.complexType}}
- {{^items.complexType}}
- : mapCastOfType<String, List>(json, r'{{{baseName}}}'),
- {{/items.complexType}}
+ {{/items.complexType}}
+ {{^items.complexType}}
+ : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false))),
+ {{/items.complexType}}
+ {{/vendorExtensions.x-is-optional}}
{{/items.isArray}}
{{^items.isArray}}
{{#items.isMap}}
{{#items.complexType}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{items.complexType}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
+ {{/vendorExtensions.x-is-optional}}
{{/items.complexType}}
{{^items.complexType}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, dynamic>(json, r'{{{baseName}}}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: mapCastOfType<String, dynamic>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
{{/items.complexType}}
{{/items.isMap}}
{{^items.isMap}}
{{#items.complexType}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: {{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}']),
+ {{/vendorExtensions.x-is-optional}}
{{/items.complexType}}
{{^items.complexType}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
{{/items.complexType}}
{{/items.isMap}}
{{/items.isArray}}
@@ -179,7 +282,12 @@ class {{{classname}}} {
{{{name}}}: null, // No support for decoding binary content from JSON
{{/isBinary}}
{{^isBinary}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{complexType}}}.fromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: {{{complexType}}}.fromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
{{/isBinary}}
{{/isMap}}
{{/isArray}}
@@ -187,37 +295,74 @@ class {{{classname}}} {
{{^complexType}}
{{#isArray}}
{{#isEnum}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: {{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
+ {{/vendorExtensions.x-is-optional}}
{{/isEnum}}
{{^isEnum}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is Iterable
+ ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
+ : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: json[r'{{{baseName}}}'] is Iterable
? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
: {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}},
+ {{/vendorExtensions.x-is-optional}}
{{/isEnum}}
{{/isArray}}
{{^isArray}}
{{#isMap}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
{{/isMap}}
{{^isMap}}
{{#isNumber}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : num.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: {{#isNullable}}json[r'{{{baseName}}}'] == null
? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
: {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
+ {{/vendorExtensions.x-is-optional}}
{{/isNumber}}
- {{#isDouble}}
- {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}){{#isNullable}}?{{/isNullable}}.toDouble(),
- {{/isDouble}}
- {{^isDouble}}
{{^isNumber}}
- {{^isEnum}}
+ {{#vendorExtensions.x-original-is-integer}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : int.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
+ {{/vendorExtensions.x-original-is-integer}}
+ {{^vendorExtensions.x-original-is-integer}}
+ {{#vendorExtensions.x-original-is-number}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : num.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
+ {{/vendorExtensions.x-original-is-number}}
+ {{^vendorExtensions.x-original-is-number}}
+ {{^isEnum}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapValueOfType<{{#vendorExtensions.x-unwrapped-datatype}}{{{vendorExtensions.x-unwrapped-datatype}}}{{/vendorExtensions.x-unwrapped-datatype}}{{^vendorExtensions.x-unwrapped-datatype}}{{{datatypeWithEnum}}}{{/vendorExtensions.x-unwrapped-datatype}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
{{{name}}}: mapValueOfType<{{{datatypeWithEnum}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
- {{/isEnum}}
- {{#isEnum}}
- {{{name}}}: {{{enumName}}}.fromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
- {{/isEnum}}
+ {{/vendorExtensions.x-is-optional}}
+ {{/isEnum}}
+ {{#isEnum}}
+ {{#vendorExtensions.x-is-optional}}
+ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{enumName}}}.fromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
+ {{/vendorExtensions.x-is-optional}}
+ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: {{{enumName}}}.fromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? const {{{enumName}}}._({{{.}}}){{/defaultValue}}{{/required}},
+ {{/vendorExtensions.x-is-optional}}
+ {{/isEnum}}
+ {{/vendorExtensions.x-original-is-number}}
+ {{/vendorExtensions.x-original-is-integer}}
{{/isNumber}}
- {{/isDouble}}
{{/isMap}}
{{/isArray}}
{{/complexType}}
@@ -284,11 +429,13 @@ class {{{classname}}} {
{{^isContainer}}
{{>serialization/native/native_enum_inline}}
+
{{/isContainer}}
{{#isContainer}}
{{#mostInnerItems}}
{{>serialization/native/native_enum_inline}}
+
{{/mostInnerItems}}
{{/isContainer}}
{{/isEnum}}
diff --git a/open-api/templates/mobile/serialization/native/native_class.mustache.patch b/open-api/templates/mobile/serialization/native/native_class.mustache.patch
index 8eeefdad97..6ab7a5228f 100644
--- a/open-api/templates/mobile/serialization/native/native_class.mustache.patch
+++ b/open-api/templates/mobile/serialization/native/native_class.mustache.patch
@@ -1,60 +1,180 @@
---- native_class.mustache 2025-07-01 08:29:23.968133163 +0800
-+++ native_class_temp.mustache 2025-07-01 08:29:44.225850583 +0800
-@@ -91,14 +91,14 @@
- {{/isDateTime}}
- {{#isNullable}}
- } else {
-- json[r'{{{baseName}}}'] = null;
-+ // json[r'{{{baseName}}}'] = null;
- }
- {{/isNullable}}
- {{^isNullable}}
- {{^required}}
- {{^defaultValue}}
- } else {
-- json[r'{{{baseName}}}'] = null;
-+ // json[r'{{{baseName}}}'] = null;
- }
- {{/defaultValue}}
- {{/required}}
-@@ -111,20 +111,10 @@
+--- native_class.mustache 2026-06-03 12:23:39
++++ native_class.mustache 2026-06-03 12:21:49
+@@ -154,24 +154,10 @@
/// [value] if it's a [Map], null otherwise.
// ignore: prefer_constructors_over_static_methods
static {{{classname}}}? fromJson(dynamic value) {
+ upgradeDto(value, "{{{classname}}}");
if (value is Map) {
final json = value.cast<String, dynamic>();
-
+
- // Ensure that the map contains the required keys.
- // Note 1: the values aren't checked for validity beyond being non-null.
- // Note 2: this code is stripped in release mode!
- assert(() {
-- requiredKeys.forEach((key) {
-- assert(json.containsKey(key), 'Required key "{{{classname}}}[$key]" is missing from JSON.');
-- assert(json[key] != null, 'Required key "{{{classname}}}[$key]" has a null value in JSON.');
-- });
+- {{#vars}}
+- {{#required}}
+- assert(json.containsKey(r'{{{baseName}}}'), 'Required key "{{{classname}}}[{{{baseName}}}]" is missing from JSON.');
+- {{^isNullable}}
+- assert(json[r'{{{baseName}}}'] != null, 'Required key "{{{classname}}}[{{{baseName}}}]" has a null value in JSON.');
+- {{/isNullable}}
+- {{/required}}
+- {{/vars}}
- return true;
- }());
-
return {{{classname}}}(
{{#vars}}
{{#isDateTime}}
-@@ -215,6 +205,10 @@
+@@ -195,48 +181,98 @@
+ {{#complexType}}
+ {{#isArray}}
+ {{#items.isArray}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is List
++ ? (json[r'{{{baseName}}}'] as List).map((e) =>
++ {{#items.complexType}}
++ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
++ {{/items.complexType}}
++ {{^items.complexType}}
++ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
++ {{/items.complexType}}
++ ).toList()
++ : {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}}) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: json[r'{{{baseName}}}'] is List
+ ? (json[r'{{{baseName}}}'] as List).map((e) =>
+ {{#items.complexType}}
+- {{items.complexType}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}
++ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
+ {{/items.complexType}}
+ {{^items.complexType}}
+- e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (e as List).cast<{{items.items.dataType}}>()
++ e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
+ {{/items.complexType}}
+ ).toList()
+ : {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.isArray}}
+ {{^items.isArray}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.isArray}}
+ {{/isArray}}
+ {{^isArray}}
+ {{#isMap}}
+ {{#items.isArray}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null
++ {{#items.complexType}}
++ : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
++ {{/items.complexType}}
++ {{^items.complexType}}
++ : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)))) : const Optional.absent(),
++ {{/items.complexType}}
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: json[r'{{{baseName}}}'] == null
+ ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
+- {{#items.complexType}}
++ {{#items.complexType}}
+ : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}']),
+- {{/items.complexType}}
+- {{^items.complexType}}
+- : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (v as List).cast<{{items.items.dataType}}>())),
+- {{/items.complexType}}
++ {{/items.complexType}}
++ {{^items.complexType}}
++ : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false))),
++ {{/items.complexType}}
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.isArray}}
+ {{^items.isArray}}
+ {{#items.isMap}}
+ {{#items.complexType}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{items.complexType}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.complexType}}
+ {{^items.complexType}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, dynamic>(json, r'{{{baseName}}}')) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: mapCastOfType<String, dynamic>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.complexType}}
+ {{/items.isMap}}
+ {{^items.isMap}}
+ {{#items.complexType}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: {{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}']),
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.complexType}}
+ {{^items.complexType}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/items.complexType}}
+ {{/items.isMap}}
+ {{/items.isArray}}
+@@ -259,23 +295,45 @@
+ {{^complexType}}
+ {{#isArray}}
+ {{#isEnum}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: {{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/isEnum}}
+ {{^isEnum}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is Iterable
++ ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
++ : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: json[r'{{{baseName}}}'] is Iterable
+ ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
+ : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/isEnum}}
+ {{/isArray}}
+ {{^isArray}}
+ {{#isMap}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
++ {{/vendorExtensions.x-is-optional}}
+ {{/isMap}}
+ {{^isMap}}
+ {{#isNumber}}
++ {{#vendorExtensions.x-is-optional}}
++ {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : num.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
++ {{/vendorExtensions.x-is-optional}}
++ {{^vendorExtensions.x-is-optional}}
+ {{{name}}}: {{#isNullable}}json[r'{{{baseName}}}'] == null
? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
: {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
++ {{/vendorExtensions.x-is-optional}}
{{/isNumber}}
-+ {{#isDouble}}
-+ {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}){{#isNullable}}?{{/isNullable}}.toDouble(),
-+ {{/isDouble}}
-+ {{^isDouble}}
{{^isNumber}}
- {{^isEnum}}
- {{{name}}}: mapValueOfType<{{{datatypeWithEnum}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-@@ -223,6 +217,7 @@
- {{{name}}}: {{{enumName}}}.fromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
- {{/isEnum}}
- {{/isNumber}}
-+ {{/isDouble}}
- {{/isMap}}
- {{/isArray}}
- {{/complexType}}
+ {{#vendorExtensions.x-original-is-integer}}
diff --git a/open-api/templates/mobile/serialization/native/native_class_nullable_items_in_arrays.patch b/open-api/templates/mobile/serialization/native/native_class_nullable_items_in_arrays.patch
deleted file mode 100644
index a59e300913..0000000000
--- a/open-api/templates/mobile/serialization/native/native_class_nullable_items_in_arrays.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/open-api/templates/mobile/serialization/native/native_class.mustache b/open-api/templates/mobile/serialization/native/native_class.mustache
-index 9a7b1439b..9f40d5b0b 100644
---- a/open-api/templates/mobile/serialization/native/native_class.mustache
-+++ b/open-api/templates/mobile/serialization/native/native_class.mustache
-@@ -32,7 +32,7 @@ class {{{classname}}} {
- {{/required}}
- {{/isNullable}}
- {{/isEnum}}
-- {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isNullable}} {{{name}}};
-+ {{#isArray}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}<{{{items.dataType}}}{{#items.isNullable}}?{{/items.isNullable}}>{{/isArray}}{{^isArray}}{{{datatypeWithEnum}}}{{/isArray}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isNullable}} {{{name}}};
-
- {{/vars}}
- @override