added customer type to related customers data

inventory_provider/db/ims.py

@@ -148,6 +148,17 @@ IMS_SERVICE_NAMES = {
 }
 
 
+class CustomerType(Enum):
+    COMMERCIAL_PEER = 1
+    CONNECTIVITY_SUPPLIER = 2
+    EU_NREN = 3
+    HOUSING_SUPPLIER = 4
+    IX_SUPPLIER = 5
+    OTHER = 6
+    R_AND_E_PEER = 7
+    UNKNOWN = 'UNKNOWN'
+
+
 class InventoryStatus(Enum):
     PLANNED = 1
     READY_FOR_SERVICE = 2

inventory_provider/db/ims_data.py

@@ -2,8 +2,7 @@ import logging
 import re
 from collections import defaultdict
 from copy import copy
-from itertools import chain, groupby
-from operator import itemgetter
+from itertools import chain
 
 from inventory_provider import environment
 from inventory_provider.db import ims
@@ -127,20 +126,20 @@ def get_customer_service_emails(ds: IMS):
 
 
 def get_circuit_related_customers(ds: IMS):
-    relations = sorted(
-        list(
-            ds.get_filtered_entities(
+
+    return_value = defaultdict(list)
+    for ccr in ds.get_filtered_entities(
                 'CircuitCustomerRelation',
                 'circuit.inventoryStatusId== 3',
-                ims.CIRCUIT_CUSTOMER_RELATION['Customer']
-            )
-        ), key=itemgetter('circuitid'))
-
-    return {k: [{
-        'id': c['customer']['id'],
-        'name': c['customer']['name']
-    } for c in v] for k, v in
-            groupby(relations, key=itemgetter('circuitid'))}
+                ims.CIRCUIT_CUSTOMER_RELATION['Customer']):
+        return_value[ccr['circuitid']].append(
+            {
+                'id': ccr['customer']['id'],
+                'name': ccr['customer']['name'],
+                'type': ccr['customer']['customertypeid']
+            }
+        )
+    return return_value
 
 
 def get_port_id_services(ds: IMS):