Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

7427 cleanup truncata errata #9215

Merged
merged 9 commits into from
Sep 13, 2024
Merged

7427 cleanup truncata errata #9215

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2a1778a
cleanup truncata
Serp1co Aug 22, 2024
49286ee
errata cleanup and ownederrata constructor
Serp1co Aug 27, 2024
6f37a44
checkstyle
Serp1co Aug 27, 2024
8cad695
checklog
Serp1co Aug 27, 2024
81ac6f2
checkstyle fix
Serp1co Aug 27, 2024
c6d846e
refactoring with method for creating ownederrata (cleaner)
Serp1co Aug 27, 2024
a233366
checkstyle fix
Serp1co Aug 27, 2024
1a1b898
fix for deleting the filteredErrata
Serp1co Aug 28, 2024
f4a0625
owned errata constructor from errata
Serp1co Sep 13, 2024
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
15 changes: 12 additions & 3 deletions java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,12 @@ public static void truncateErrata(Set<Errata> srcErrata, Channel tgtChannel, Use
Set<Errata> filteredErrata = tgtErrata.stream().filter(e -> !(srcErrata.contains(e) || asCloned(e)
.map(er -> srcErrata.contains(er.getOriginal())).orElse(false)))
.collect(Collectors.toUnmodifiableSet());

removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user);
List<OwnedErrata> emptyChannelErrata = filteredErrata.stream()
.filter(t -> t.getChannels().isEmpty())
.map(ErrataManager::buildOwnedErrataFromErrata)
.collect(Collectors.toList());
ErrataManager.deleteErrata(user, emptyChannelErrata);
}

private static Optional<ClonedErrata> asCloned(Errata e) {
Expand Down Expand Up @@ -637,11 +641,16 @@ private static void deleteErrata(User user, List<OwnedErrata> erratas) {
*/
public static void deleteErratum(User user, Errata errata) {
List<OwnedErrata> eids = new ArrayList<>();
OwnedErrata oErrata = buildOwnedErrataFromErrata(errata);
eids.add(oErrata);
deleteErrata(user, eids);
}

private static OwnedErrata buildOwnedErrataFromErrata(Errata errata) {
OwnedErrata oErrata = new OwnedErrata();
oErrata.setId(errata.getId());
oErrata.setAdvisory(errata.getAdvisory());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpicking here, but I would move this code into a OwnedErrata construct, so that we can just call new OwnedErrata(errata).

eids.add(oErrata);
deleteErrata(user, eids);
return oErrata;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions java/spacewalk-java.changes.serpico.7427-cleanup-truncata-errata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- ErrataManager.truncateErrata now tries to clean orphan erratas
at the end (erratas with no channel)