updating ab chart stats TM-2409

talentmap_api/cdo/services/available_bidders.py

@@ -28,19 +28,21 @@ def get_available_bidders_stats(data):
     '''
     stats = {
         'Bureau': {},  # comes through, but only with the short name/acronym
+        'CDO': {},
         'Grade': {},
+        'OC Bureau': {},
         'Post': {},
         'Skill': {},
         'Status': {},
-        'TED': {},
     }
     stats_sum = {
         'Bureau': 0,
+        'CDO': 0,
         'Grade': 0,
+        'OC Bureau': 0,
         'Post': 0,
         'Skill': 0,
         'Status': 0,
-        'TED': 0,
     }
 
     if data:
@@ -50,7 +52,20 @@ def get_available_bidders_stats(data):
                 stats['Bureau'][bidder['current_assignment']['position']['bureau_code']] = {'name': f"{bidder['current_assignment']['position']['bureau_code']}", 'value': 0}
             stats['Bureau'][bidder['current_assignment']['position']['bureau_code']]['value'] += 1
             stats_sum['Bureau'] += 1
-
+
+            # may need to remove, will follow up with product owners
+            ab_oc_bureau_key = pydash.get(bidder, 'available_bidder_details.oc_bureau')
+            if ab_oc_bureau_key:
+                if bidder['available_bidder_details']['oc_bureau'] not in stats['OC Bureau']:
+                    stats['OC Bureau'][bidder['available_bidder_details']['oc_bureau']] = {'name': f"{bidder['available_bidder_details']['oc_bureau']}", 'value': 0}
+                stats['OC Bureau'][bidder['available_bidder_details']['oc_bureau']]['value'] += 1
+                stats_sum['OC Bureau'] += 1
+
+            if bidder['cdo']['full_name'] not in stats['CDO']:
+                stats['CDO'][bidder['cdo']['full_name']] = {'name': f"CDO {bidder['cdo']['full_name']}", 'value': 0}
+            stats['CDO'][bidder['cdo']['full_name']]['value'] += 1
+            stats_sum['CDO'] += 1
+
             if bidder['grade'] not in stats['Grade']:
                 stats['Grade'][bidder['grade']] = {'name': f"Grade {bidder['grade']}", 'value': 0}
             stats['Grade'][bidder['grade']]['value'] += 1
@@ -75,13 +90,6 @@ def get_available_bidders_stats(data):
                 stats['Status'][ab_status_key]['value'] += 1
                 stats_sum['Status'] += 1
 
-            ted_key = ensure_date(pydash.get(bidder, "current_assignment.end_date"), utc_offset=-5) or 'None listed'
-            ted_key = "None listed" if ted_key is "None listed" else smart_str(maya.parse(ted_key).datetime().strftime('%m/%d/%Y'))
-            if ted_key not in stats['TED']:
-                stats['TED'][ted_key] = {'name': f"{ted_key}", 'value': 0}
-            stats['TED'][ted_key]['value'] += 1
-            stats_sum['TED'] += 1
-
     # adding percentage & creating final data structure to pass to FE
     biddersStats = {}
     for stat in stats:
@@ -91,6 +99,15 @@ def get_available_bidders_stats(data):
             stat_value = stats[stat][s]['value']
             biddersStats[stat].append({**stats[stat][s], 'percent': "{:.0%}".format(stat_value / stat_sum)})
 
+    if len(biddersStats['Post']) > 18:
+        multiplePost = []
+        for post in biddersStats['Post']:
+            if post['value'] > 1:
+                multiplePost.append(post)
+        biddersStats['Post'] = multiplePost
+
+    biddersStats['Grade'] = sorted(biddersStats['Grade'], key = lambda bidder: bidder['name'])
+    biddersStats['Skill'] = sorted(biddersStats['Skill'], key = lambda bidder: bidder['name'])
     biddersStats['Sum'] = stats_sum
 
     return {