Merge pull request #29 from cloudblue/remove-templates-for-requests

Improve performance by not selecting templates

Author: marcserrat

reports/executive_fullfilment_requests/entrypoint.py

@@ -40,7 +40,12 @@ def _get_requests(client, parameters):
         query &= R().asset.product.id.oneof(parameters['product']['choices'])
     if parameters.get('rr_type') and parameters['rr_type']['all'] is False:
         query &= R().type.oneof(parameters['rr_type']['choices'])
-    return client.requests.filter(query).select('-asset.params', '-asset.configuration')
+    return client.requests.filter(query).select(
+        '-asset.params',
+        '-asset.configuration',
+        '-activation_key',
+        '-template',
+    )
 
 
 def _get_request_count_group_by_type(client, parameters):

reports/fulfillment_requests/entrypoint.py

@@ -75,6 +75,8 @@ def _get_requests(client, parameters):
         '-asset.items',
         '-asset.params',
         '-asset.configuration',
+        '-activation_key',
+        '-template',
     )
 
 

reports/fulfillment_requests_failed/entrypoint.py

@@ -67,6 +67,8 @@ def _get_requests(client, parameters):
         '-asset.items',
         '-asset.params,'
         '-asset.configuration',
+        '-activation_key',
+        '-template',
     )
 
 

reports/fulfillment_requests_line_item/entrypoint.py

@@ -72,7 +72,12 @@ def _get_requests(client, parameters):
     if parameters.get('hub') and parameters['hub']['all'] is False:
         query &= R().asset.connection.hub.id.oneof(parameters['hub']['choices'])
 
-    return client.requests.filter(query).all()
+    return client.requests.filter(query).select(
+        '-asset.params,'
+        '-asset.configuration',
+        '-activation_key',
+        '-template',
+    )
 
 
 def _process_line(item, request, connection):

reports/sla/entrypoint.py

@@ -37,6 +37,8 @@ def generate(
         '-asset.items',
         '-asset.params',
         '-asset.configuration',
+        '-activation_key',
+        '-template',
     ).order_by('created')
 
     total = requests.count()