Skip to content

Commit 77da838

Browse files
authored
Non-nullable model fields in task/models.dart (#8469)
1 parent f43044b commit 77da838

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

app/lib/search/backend.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,7 @@ class SearchBackend {
240240
..filter('finished >=', updatedThreshold)
241241
..order('-finished');
242242
await for (final s in q3.run()) {
243-
if (s.finished != null) {
244-
addResult(s.package, s.finished!);
245-
}
243+
addResult(s.package, s.finished);
246244
}
247245

248246
return results;

app/lib/task/backend.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ class TaskBackend {
834834
return await _loadTaskResultIndex(
835835
package: package,
836836
version: version,
837-
runtimeVersion: status.runtimeVersion ?? runtimeVersion,
837+
runtimeVersion: status.runtimeVersion,
838838
);
839839
},
840840
);
@@ -986,9 +986,6 @@ class TaskBackend {
986986
final data = await gzippedTaskResult(package, version, 'log.txt');
987987
if (data == null) {
988988
final status = await packageStatus(package);
989-
if (status.runtimeVersion == null) {
990-
return 'no log - no tracking information';
991-
}
992989
final v = status.versions[version];
993990
if (v == null) {
994991
return 'no log - version is not tracked';

app/lib/task/models.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ class PackageState extends db.ExpandoModel<String> {
132132
DateTime? lastDependencyChanged;
133133

134134
/// The last time the a worker completed with a failure or success.
135-
/// TODO: make it `required: true` after the acceptable runtimes are after 2023.08.18.
136-
@db.DateTimeProperty(required: false, indexed: true)
137-
DateTime? finished;
135+
@db.DateTimeProperty(required: true, indexed: true)
136+
DateTime finished = initialTimestamp;
138137

139138
/// Derive [pendingAt] using [versions] and [lastDependencyChanged].
140139
///
@@ -370,8 +369,7 @@ class PackageVersionStateMapProperty extends db.Property {
370369
/// Status for a package.
371370
@JsonSerializable()
372371
class PackageStateInfo {
373-
// TODO: make this non-nullable after we are past 2023.08.18 as accepted runtimeVersion.
374-
final String? runtimeVersion;
372+
final String runtimeVersion;
375373
final String package;
376374

377375
/// Status for versions.

app/lib/task/models.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)