lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix retrieve Rollout with details (#2435)

Browse Source 
* Fix retrieve Rollout with details

* Rename RolloutManagement method for retrieve Rollout slice with details. Slight refactoring in MgmtRolloutMapper

---------

Co-authored-by: vasilchev <vasil.ilchev@bosch.com>
This commit is contained in:
Vasil Ilchev
2025-06-09 15:38:20 +03:00
committed by GitHub
parent 5a304af165
commit 09a3d3e0c6
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java
View File

@@ -277,8 +277,7 @@ public class JpaRolloutManagement implements RolloutManagement {
final Slice<Rollout> rollouts = JpaManagementHelper.convertPage(
rolloutRepository.findAll(RolloutSpecification.isDeleted(deleted, pageable.getSort()), JpaRollout_.GRAPH_ROLLOUT_DS, pageable),
pageable);
setRolloutStatusDetails(rollouts);
return rollouts;
return getRolloutWithStatusDetails(rollouts);
}
@Override
@@ -295,8 +294,7 @@ public class JpaRolloutManagement implements RolloutManagement {
final boolean deleted) {
final Slice<Rollout> findAll = JpaManagementHelper.findAllWithoutCountBySpec(rolloutRepository, pageable,
Collections.singletonList(RolloutSpecification.likeName(searchText, deleted)));
setRolloutStatusDetails(findAll);
return findAll;
return getRolloutWithStatusDetails(findAll);
}
@Override
@@ -499,7 +497,7 @@ public class JpaRolloutManagement implements RolloutManagement {
}
@Override
public void setRolloutStatusDetails(final Slice<Rollout> rollouts) {
public Slice<Rollout> getRolloutWithStatusDetails(final Slice<Rollout> rollouts) {
final List<Long> rolloutIds = rollouts.getContent().stream().map(Rollout::getId).toList();
final Map<Long, List<TotalTargetCountActionStatus>> allStatesForRollout = getStatusCountItemForRollout(rolloutIds);
@@ -510,6 +508,7 @@ public class JpaRolloutManagement implements RolloutManagement {
((JpaRollout) rollout).setTotalTargetCountStatus(totalTargetCountStatus);
});
}
return rollouts;
}
/**