Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/lib/tool/test_profile/importer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,9 @@ List<String> _potentialActiveEmails(TestProfile profile, String packageName) {
profile.generatedPackages.firstWhere((p) => p.name == packageName);

// uploaders
if (testPackage.publisher == null) return testPackage.uploaders!;
if (testPackage.publisher == null) {
return testPackage.uploaders ?? [profile.resolvedDefaultUser];
}

// publisher
final members = profile.publishers
Expand Down
13 changes: 11 additions & 2 deletions app/lib/tool/test_profile/models.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ class TestProfile {
final v = p?.versions?.firstWhereOrNull((v) => v.version == version);
return v != null;
}

/// The [defaultUser] if specified, otherwise:
/// - the first entry in the [users] list,
/// - the first specified member in the [publishers] list,
/// - the first specfied uploader in the [importedPackages] or the [generatedPackages] list.
late final resolvedDefaultUser = defaultUser ??
users.firstOrNull?.email ??
publishers.expand((p) => p.members).map((m) => m.email).firstOrNull ??
importedPackages.expand((p) => p.uploaders ?? <String>[]).firstOrNull ??
generatedPackages.expand((p) => p.uploaders ?? <String>[]).first;
}

@JsonSerializable(explicitToJson: true, includeIfNull: false)
Expand Down Expand Up @@ -108,12 +118,11 @@ class TestPackage {
Map<String, dynamic> toJson() => _$TestPackageToJson(this);

TestPackage change({
List<String>? uploaders,
List<TestVersion>? versions,
}) {
return TestPackage(
name: name,
uploaders: uploaders ?? this.uploaders,
uploaders: uploaders,
publisher: publisher,
versions: versions ?? this.versions,
replacedBy: replacedBy,
Expand Down
23 changes: 3 additions & 20 deletions app/lib/tool/test_profile/normalizer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ TestProfile normalize(
});
});

final defaultUser = profile.defaultUser ?? users.keys.first;

// add missing packages from resolved versions
if (resolvedVersions != null) {
resolvedVersions.forEach((rv) {
Expand All @@ -57,7 +55,7 @@ TestProfile normalize(
versions: [
TestVersion(version: rv.version, created: rv.created),
],
uploaders: [defaultUser],
uploaders: [profile.resolvedDefaultUser],
));
});
// update versions from resolved versions
Expand Down Expand Up @@ -89,27 +87,12 @@ TestProfile normalize(
_createPublisherIfNeeded(
publishers,
publisher,
memberEmail: defaultUser,
memberEmail: profile.resolvedDefaultUser,
);
}

for (final package in importedPackages.values.toList()) {
if (package.publisher == null &&
(package.uploaders == null || package.uploaders!.isEmpty)) {
importedPackages[package.name] = package.change(uploaders: [defaultUser]);
}
}

for (final package in generatedPackages.values.toList()) {
if (package.publisher == null &&
(package.uploaders == null || package.uploaders!.isEmpty)) {
generatedPackages[package.name] =
package.change(uploaders: [defaultUser]);
}
}

return TestProfile(
defaultUser: defaultUser,
defaultUser: profile.resolvedDefaultUser,
users: users.values.toList(),
publishers: publishers.values.toList(),
importedPackages: importedPackages.values.toList(),
Expand Down
2 changes: 0 additions & 2 deletions app/test/tool/test_profile/model_normalization_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ generatedPackages:
'generatedPackages': [
{
'name': 'foo',
'uploaders': ['[email protected]'],
'versions': [
{'version': '1.0.0'},
{'version': '2.0.0'},
Expand Down Expand Up @@ -109,7 +108,6 @@ generatedPackages:
'generatedPackages': [
{
'name': 'foo',
'uploaders': ['[email protected]'],
'versions': [
{'version': '1.1.0', 'created': isNotEmpty},
],
Expand Down