Prioritisation of assignments via mgmt-API (#895)

* Updating the schema for targetfilterquery and rollout
* Updating the weight validation logic and tests
* Make weight optional
* Fix existing multi assignment tests by adding weight, remove weight from TargetFilterQuery
* Add weight validation tests, fix tests
* Add mgmt api tests for assignment and getting action with weight
* Add management layer validation and tests for creating rollouts with weight
* Fix amqp test, add repo level validation to resource tests
* Add weight to rollout mgmt-api and tests
* Add weight to mgmt api target Filter create and update
* Add target filter auto assign weight. disable enforcement of setting a weight in multiassign mode
* Remove ignored tests, fix api doc
* Fix minor findings
* Fix findings
* Remove hardcoded min weight
* Add docu text, fix findings
* Fix api documentation
* Expose weight via DMF
* Expose actions according to weight via ddi
* Fix documentation
* Add method to get actions ordered by weight to deploymentManagement
* Updating the schema for targetfilterquery and rollout
* Updated the indentation
* Updated the helper class, fixed the randomUID in test factory
* Updated the class name with prefix JPA
* Adding the missing License for WeightValidationHelper class
* Adding documentation to the dmf api on weight
* Removed the merger markers
* Updated the class name
* Removed the redundant method
* Addressed final PR comments
* Updated the missing testcase with latest default weight value
* Reverting the default value of weight back to 1000 and updated tests

Signed-off-by: Shruthi Manavalli Ramanna <shruthimanavalli.ramanna@bosch-si.com>
Signed-off-by: Stefan Klotz <stefan.klotz@bosch-si.com>

hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDeploymentRequestMapper.java

@@ -38,7 +38,7 @@ public final class MgmtDeploymentRequestMapper {
             final String targetId) {
 
         return createAssignmentRequest(targetId, dsAssignment.getId(), dsAssignment.getType(),
-                dsAssignment.getForcetime(), dsAssignment.getMaintenanceWindow());
+                dsAssignment.getForcetime(), dsAssignment.getWeight(), dsAssignment.getMaintenanceWindow());
     }
 
     /**
@@ -54,13 +54,14 @@ public final class MgmtDeploymentRequestMapper {
             final Long dsId) {
 
         return createAssignmentRequest(targetAssignment.getId(), dsId, targetAssignment.getType(),
-                targetAssignment.getForcetime(), targetAssignment.getMaintenanceWindow());
+                targetAssignment.getForcetime(), targetAssignment.getWeight(), targetAssignment.getMaintenanceWindow());
     }
 
     private static DeploymentRequest createAssignmentRequest(final String targetId, final Long dsId,
-            final MgmtActionType type, final long forcetime, final MgmtMaintenanceWindowRequestBody maintenanceWindow) {
+            final MgmtActionType type, final long forcetime, final Integer weight,
+            final MgmtMaintenanceWindowRequestBody maintenanceWindow) {
         final DeploymentRequestBuilder request = DeploymentManagement.deploymentRequest(targetId, dsId)
-                .setActionType(MgmtRestModelMapper.convertActionType(type)).setForceTime(forcetime);
+                .setActionType(MgmtRestModelMapper.convertActionType(type)).setForceTime(forcetime).setWeight(weight);
         if (maintenanceWindow != null) {
             final String cronSchedule = maintenanceWindow.getSchedule();
             final String duration = maintenanceWindow.getDuration();
@@ -70,5 +71,4 @@ public final class MgmtDeploymentRequestMapper {
         }
         return request.build();
     }
-
 }

hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java

@@ -266,7 +266,6 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
         final List<DistributionSetAssignmentResult> assignmentResults = deployManagament
                 .assignDistributionSets(deploymentRequests);
         return ResponseEntity.ok(MgmtDistributionSetMapper.toResponse(assignmentResults));
-
     }
 
     @Override

hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java

@@ -79,6 +79,7 @@ final class MgmtRolloutMapper {
         body.setTotalTargets(rollout.getTotalTargets());
         body.setDeleted(rollout.isDeleted());
         body.setType(MgmtRestModelMapper.convertActionType(rollout.getActionType()));
+        rollout.getWeight().ifPresent(body::setWeight);
 
         if (withDetails) {
             for (final TotalTargetCountStatus.Status status : TotalTargetCountStatus.Status.values()) {
@@ -106,7 +107,8 @@ final class MgmtRolloutMapper {
         return entityFactory.rollout().create().name(restRequest.getName()).description(restRequest.getDescription())
                 .set(distributionSet).targetFilterQuery(restRequest.getTargetFilterQuery())
                 .actionType(MgmtRestModelMapper.convertActionType(restRequest.getType()))
-                .forcedTime(restRequest.getForcetime()).startAt(restRequest.getStartAt());
+                .forcedTime(restRequest.getForcetime()).startAt(restRequest.getStartAt())
+                .weight(restRequest.getWeight());
     }
 
     static RolloutGroupCreate fromRequest(final EntityFactory entityFactory, final MgmtRolloutGroup restRequest) {
@@ -249,5 +251,4 @@ final class MgmtRolloutMapper {
     private static String createIllegalArgumentLiteral(final Condition condition) {
         return "Condition " + condition + NOT_SUPPORTED;
     }
-
 }

hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryMapper.java

@@ -15,11 +15,14 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtDistributionSetAutoAssignment;
 import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery;
 import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody;
 import org.eclipse.hawkbit.mgmt.rest.api.MgmtTargetFilterQueryRestApi;
 import org.eclipse.hawkbit.repository.EntityFactory;
+import org.eclipse.hawkbit.repository.builder.AutoAssignDistributionSetUpdate;
 import org.eclipse.hawkbit.repository.builder.TargetFilterQueryCreate;
+import org.eclipse.hawkbit.repository.model.Action.ActionType;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
 import org.springframework.util.CollectionUtils;
@@ -58,6 +61,7 @@ public final class MgmtTargetFilterQueryMapper {
         if (distributionSet != null) {
             targetRest.setAutoAssignDistributionSet(distributionSet.getId());
             targetRest.setAutoAssignActionType(MgmtRestModelMapper.convertActionType(filter.getAutoAssignActionType()));
+            filter.getAutoAssignWeight().ifPresent(targetRest::setAutoAssignWeight);
         }
 
         targetRest.add(linkTo(methodOn(MgmtTargetFilterQueryRestApi.class).getFilter(filter.getId())).withSelfRel());
@@ -76,4 +80,12 @@ public final class MgmtTargetFilterQueryMapper {
         return entityFactory.targetFilterQuery().create().name(filterRest.getName()).query(filterRest.getQuery());
     }
 
+    static AutoAssignDistributionSetUpdate fromRequest(final EntityFactory entityFactory, final long filterId,
+            final MgmtDistributionSetAutoAssignment assignRest) {
+        final ActionType type = MgmtRestModelMapper.convertActionType(assignRest.getType());
+
+        return entityFactory.targetFilterQuery().updateAutoAssign(filterId).ds(assignRest.getId()).actionType(type)
+                .weight(assignRest.getWeight());
+    }
+
 }

hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java

@@ -108,8 +108,9 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA
             @RequestBody final MgmtTargetFilterQueryRequestBody targetFilterRest) {
         LOG.debug("updating target filter query {}", filterId);
 
-        final TargetFilterQuery updateFilter = filterManagement.update(entityFactory.targetFilterQuery()
-                .update(filterId).name(targetFilterRest.getName()).query(targetFilterRest.getQuery()));
+        final TargetFilterQuery updateFilter = filterManagement
+                .update(entityFactory.targetFilterQuery().update(filterId).name(targetFilterRest.getName())
+                        .query(targetFilterRest.getQuery()));
 
         final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(updateFilter);
         MgmtTargetFilterQueryMapper.addLinks(response);
@@ -127,10 +128,10 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA
     @Override
     public ResponseEntity<MgmtTargetFilterQuery> postAssignedDistributionSet(
             @PathVariable("filterId") final Long filterId,
-            @RequestBody final MgmtDistributionSetAutoAssignment dsIdWithActionType) {
+            @RequestBody final MgmtDistributionSetAutoAssignment autoAssignRequest) {
 
-        final TargetFilterQuery updateFilter = filterManagement.updateAutoAssignDSWithActionType(filterId,
-                dsIdWithActionType.getId(), MgmtRestModelMapper.convertActionType(dsIdWithActionType.getType()));
+        final TargetFilterQuery updateFilter = filterManagement.updateAutoAssignDS(
+                MgmtTargetFilterQueryMapper.fromRequest(entityFactory, filterId, autoAssignRequest));
 
         final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(updateFilter);
         MgmtTargetFilterQueryMapper.addLinks(response);
@@ -156,7 +157,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA
 
     @Override
     public ResponseEntity<Void> deleteAssignedDistributionSet(@PathVariable("filterId") final Long filterId) {
-        filterManagement.updateAutoAssignDS(filterId, null);
+        filterManagement.updateAutoAssignDS(entityFactory.targetFilterQuery().updateAutoAssign(filterId).ds(null));
 
         return ResponseEntity.noContent().build();
     }

hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetMapper.java

@@ -206,6 +206,7 @@ public final class MgmtTargetMapper {
         if (ActionType.TIMEFORCED == action.getActionType()) {
             result.setForceTime(action.getForcedTime());
         }
+        action.getWeight().ifPresent(result::setWeight);
         result.setActionType(MgmtRestModelMapper.convertActionType(action.getActionType()));
 
         if (action.isActive()) {
@@ -289,5 +290,4 @@ public final class MgmtTargetMapper {
     static List<MgmtMetadata> toResponseTargetMetadata(final List<TargetMetadata> metadata) {
         return metadata.stream().map(MgmtTargetMapper::toResponseTargetMetadata).collect(Collectors.toList());
     }
-
 }