From b2b23ebbc518d772085dffbd00b448321fe4fd6d Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Wed, 15 Jan 2025 16:29:11 +0100 Subject: [PATCH] Non-nullable model fields in task/models.dart --- app/lib/search/backend.dart | 4 +--- app/lib/task/backend.dart | 5 +---- app/lib/task/models.dart | 8 +++----- app/lib/task/models.g.dart | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/app/lib/search/backend.dart b/app/lib/search/backend.dart index 3a4a6fe127..f7a5775478 100644 --- a/app/lib/search/backend.dart +++ b/app/lib/search/backend.dart @@ -240,9 +240,7 @@ class SearchBackend { ..filter('finished >=', updatedThreshold) ..order('-finished'); await for (final s in q3.run()) { - if (s.finished != null) { - addResult(s.package, s.finished!); - } + addResult(s.package, s.finished); } return results; diff --git a/app/lib/task/backend.dart b/app/lib/task/backend.dart index 710fcff661..6edc86e1ae 100644 --- a/app/lib/task/backend.dart +++ b/app/lib/task/backend.dart @@ -834,7 +834,7 @@ class TaskBackend { return await _loadTaskResultIndex( package: package, version: version, - runtimeVersion: status.runtimeVersion ?? runtimeVersion, + runtimeVersion: status.runtimeVersion, ); }, ); @@ -986,9 +986,6 @@ class TaskBackend { final data = await gzippedTaskResult(package, version, 'log.txt'); if (data == null) { final status = await packageStatus(package); - if (status.runtimeVersion == null) { - return 'no log - no tracking information'; - } final v = status.versions[version]; if (v == null) { return 'no log - version is not tracked'; diff --git a/app/lib/task/models.dart b/app/lib/task/models.dart index 501446219d..8bac20f885 100644 --- a/app/lib/task/models.dart +++ b/app/lib/task/models.dart @@ -132,9 +132,8 @@ class PackageState extends db.ExpandoModel { DateTime? lastDependencyChanged; /// The last time the a worker completed with a failure or success. - /// TODO: make it `required: true` after the acceptable runtimes are after 2023.08.18. - @db.DateTimeProperty(required: false, indexed: true) - DateTime? finished; + @db.DateTimeProperty(required: true, indexed: true) + DateTime finished = initialTimestamp; /// Derive [pendingAt] using [versions] and [lastDependencyChanged]. /// @@ -370,8 +369,7 @@ class PackageVersionStateMapProperty extends db.Property { /// Status for a package. @JsonSerializable() class PackageStateInfo { - // TODO: make this non-nullable after we are past 2023.08.18 as accepted runtimeVersion. - final String? runtimeVersion; + final String runtimeVersion; final String package; /// Status for versions. diff --git a/app/lib/task/models.g.dart b/app/lib/task/models.g.dart index fed44ac4a1..de704e1cec 100644 --- a/app/lib/task/models.g.dart +++ b/app/lib/task/models.g.dart @@ -34,7 +34,7 @@ Map _$PackageVersionStateInfoToJson( PackageStateInfo _$PackageStateInfoFromJson(Map json) => PackageStateInfo( - runtimeVersion: json['runtimeVersion'] as String?, + runtimeVersion: json['runtimeVersion'] as String, package: json['package'] as String, versions: (json['versions'] as Map).map( (k, e) => MapEntry(