Merge pull request #33 from cloudblue/LITE-27467-fix-filters

LITE-27467: fixed product and marketplace filters tier config request report
cloudblue · May 16, 2023 · 117a5a1 · 117a5a1
2 parents 524da79 + 57a0744
commit 117a5a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/reports/tier_configuration_requests/entrypoint.py b/reports/tier_configuration_requests/entrypoint.py
@@ -61,9 +61,9 @@ def _get_requests(client, parameters):
     query &= R().events.created.at.le(parameters['date']['before'])
 
     if parameters.get('product') and parameters['product']['all'] is False:
-        query &= R().product.id.oneof(parameters['product']['choices'])
+        query &= R().configuration.product.id.oneof(parameters['product']['choices'])
     if parameters.get('mkp') and parameters['mkp']['all'] is False:
-        query &= R().marketplace.id.oneof(parameters['mkp']['choices'])
+        query &= R().configuration.marketplace.id.oneof(parameters['mkp']['choices'])
     if parameters.get('rr_type') and parameters['rr_type']['all'] is False:
         query &= R().type.oneof(parameters['rr_type']['choices'])
     if parameters.get('rr_status') and parameters['rr_status']['all'] is False:

diff --git a/tests/test_tier_configuration_requests.py b/tests/test_tier_configuration_requests.py
@@ -92,7 +92,8 @@ def test_generate_all_params(progress, client_factory, response_factory, tcr_req
     responses.append(
         response_factory(
             query='and(ge(events.created.at,2020-12-01T00:00:00),le(events.created.at,'
-                  '2021-01-01T00:00:00),in(product.id,(PRD-1)),in(marketplace.id,(MKP-1)),'
+                  '2021-01-01T00:00:00),in(configuration.product.id,(PRD-1)),'
+                  'in(configuration.marketplace.id,(MKP-1)),'
                   'in(type,(setup)),in(status,(pending)))',
             value=[tcr_request],
         ),