Merge pull request #7431 from deutschebank/db-contrib/waltz-7429-bulk-upload-rating-for-non-capability-taxonomies

Db contrib/waltz 7429 bulk upload rating for non capability taxonomies

Author: jain-shreyans-db

waltz-service/src/main/java/org/finos/waltz/service/measurable_rating/BulkMeasurableRatingService.java

@@ -129,6 +129,9 @@ public BulkMeasurableRatingValidationResult bulkPreview(EntityReference category
         List<AllocationScheme> allAllocationSchemes = allocationSchemeDao.findAll();
         Map<String, AllocationScheme> allAllocationSchemesByExtId = indexBy(allAllocationSchemes, t -> t.externalId().get());
 
+        boolean categorySupportsAllocations = allAllocationSchemes.stream()
+                .anyMatch(s -> s.measurableCategoryId() == categoryRef.id());
+
         Map<String, Application> allApplicationsByAssetCode = indexBy(allApplications, a -> a.assetCode()
                 .map(ExternalIdValue::value)
                 .map(StringUtilities::lower)
@@ -191,7 +194,7 @@ public BulkMeasurableRatingValidationResult bulkPreview(EntityReference category
                     if (t.v4 != null && !t.v4.userSelectable()) {
                         validationErrors.add(ValidationError.RATING_NOT_USER_SELECTABLE);
                     }
-                    if (t.v5 == null) {
+                    if (categorySupportsAllocations && t.v5 == null) {
                         validationErrors.add(ValidationError.ALLOCATION_SCHEME_NOT_FOUND);
                     }
 
@@ -446,7 +449,13 @@ public BulkMeasurableRatingApplyResult apply(EntityReference categoryRef,
                     return tuple(insertCount, updateCount, removalCount);
                 });
 
-        int allocationsInsertCount = updateAllocation(dsl, categoryRef, preview, userId);
+        int allocationsInsertCount = 0;
+        List<AllocationScheme> allAllocationSchemes = allocationSchemeDao.findAll();
+        boolean categorySupportsAllocations = allAllocationSchemes.stream()
+                .anyMatch(s -> s.measurableCategoryId() == categoryRef.id());
+        if (categorySupportsAllocations) {
+            allocationsInsertCount = updateAllocation(dsl, categoryRef, preview, userId);
+        }
         return ImmutableBulkMeasurableRatingApplyResult
                 .builder()
                 .recordsAdded(transactionResult.v1)