change exclusion logic

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

policy/tasks.py

@@ -48,7 +48,7 @@ def evaluate_all_products_rules_task(include_locked=False, product_uuids=None):
     products = get_unsecured_manager(Product).select_related("dataspace")
     if product_uuids is not None:
         products = products.filter(uuid__in=product_uuids)
-    elif not include_locked:
+    if not include_locked:
         products = products.exclude(configuration_status__is_locked=True)
 
     count = products.count()

policy/tests/test_tasks.py

@@ -127,7 +127,7 @@ def test_evaluate_all_products_filters_by_uuids(self, mock_evaluate):
         self.assertNotIn(product_b, evaluated_products)
 
     @patch("policy.tasks.evaluate_rules")
-    def test_evaluate_all_products_uuid_filter_ignores_locked_exclusion(self, mock_evaluate):
+    def test_evaluate_all_products_uuid_filter_still_excludes_locked(self, mock_evaluate):
         mock_evaluate.return_value = ([], 0)
         locked_status = make_product_status(self.dataspace, is_locked=True)
         locked_product = make_product(self.dataspace, configuration_status=locked_status)
@@ -136,4 +136,4 @@ def test_evaluate_all_products_uuid_filter_ignores_locked_exclusion(self, mock_e
         evaluate_all_products_rules_task(product_uuids=[locked_product.uuid])
 
         evaluated_products = [c[0][0] for c in mock_evaluate.call_args_list]
-        self.assertIn(locked_product, evaluated_products)
+        self.assertNotIn(locked_product, evaluated_products)