updating ab chart stats TM-2409 #654

SidelineCory24 · 2022-01-06T19:52:51Z

FE PR

To-Do:

Replace TED with CDO
For the Bureau dropdown only show the OC status and OC Bureau (CDO user only) Note: OC Status is being shown under the Status option
For Post only show Post with 2+ AB (Available Bidders) once a certain amount of Post are shown
For Grade show in numerical order (same order as filters)
For Skill show in alphabetical order

Note: Product Owner okay'd adding the OC Bureau dropdown and keeping the Bureau dropdown as well (current assignment)

SidelineCory24 · 2022-01-11T04:40:29Z

Note: only showing Post with 2+ AB was added to the adding OC Bureau to data structure commit

comment update

talentmap_api/cdo/services/available_bidders.py

…aPhase-Consulting/State-TalentMap-API into update/available-bidders-chart-stats

talentmap_api/cdo/services/available_bidders.py

mjoyce91 · 2022-01-12T13:39:45Z

talentmap_api/cdo/services/available_bidders.py

+            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


Since you already defined ab_oc_bureau_key on line 57, you may as well just use that instead of calling out bidder['available_bidder_details']['oc_bureau'] on line 59 again (also happens twice on line 60 and once on line 61).

getting this error when trying to make the update, this is the code:

ab_oc_bureau_key = pydash.get(bidder, 'available_bidder_details.oc_bureau') if ab_oc_bureau_key: if bidder[ab_oc_bureau_key] not in stats['OC Bureau']: stats['OC Bureau'][bidder[ab_oc_bureau_key]] = {'name': f"{bidder[ab_oc_bureau_key]}", 'value': 0} stats['OC Bureau'][bidder[ab_oc_bureau_key]]['value'] += 1 stats_sum['OC Bureau'] += 1

disregard, I can't copy/paste, the fix has been pushed

mjoyce91 · 2022-01-12T13:40:46Z

talentmap_api/cdo/services/available_bidders.py

+            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


Similar idea with full_name. Let's just set a variable to reference the fullname like bidderFullName = pydash.get(bidder, 'cdo.full_name') and then reference that

mjoyce91 · 2022-01-12T21:04:49Z

talentmap_api/cdo/services/available_bidders.py

+    if len(biddersStats['Post']) > 18:
+        biddersStats['Post'] = filter(lambda post: post['value'] > 1, biddersStats['Post'])
+
+    biddersStats['Grade'] = sorted(biddersStats['Grade'], key = lambda grade: grade['name'])


How does this sorting compare to the search filters?

The sorting matches. I can add all the grades if need be to be safe.

the OO is the only one that doesn't match

Yes let's include all make sure they match

talentmap_api/cdo/services/available_bidders.py

…aPhase-Consulting/State-TalentMap-API into update/available-bidders-chart-stats

talentmap_api/cdo/services/available_bidders.py

comment update

talentmap_api/cdo/services/available_bidders.py

mjoyce91 · 2022-01-18T18:10:49Z

See this comment, as it's probably more API related - MetaPhase-Consulting/State-TalentMAP#1909 (comment)

mjoyce91 · 2022-01-18T19:36:01Z

talentmap_api/cdo/services/available_bidders.py

+            bureau_key = pydash.get(bidder, 'current_assignment.position.bureau_code')
+            if bureau_key not in stats['Bureau']:
+                no_bureau = none_listed
+                bureau = {'name': f"{bureau_key}", 'value': 0}
+                stats['Bureau'][bureau_key] = no_bureau if bureau_key == None else bureau
+            stats['Bureau'][bureau_key]['value'] += 1
            stats_sum['Bureau'] += 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
+            cdo_full_name_key = pydash.get(bidder, 'cdo.full_name')
+            if cdo_full_name_key not in stats['CDO']:
+                no_cdo = none_listed
+                cdo = {'name': f"{cdo_full_name_key}", 'value': 0}
+                stats['CDO'][cdo_full_name_key] = no_cdo if cdo_full_name_key == None else cdo
+            stats['CDO'][cdo_full_name_key]['value'] += 1
+            stats_sum['CDO'] += 1
+
+            grade_key = pydash.get(bidder, 'grade')
+            if grade_key not in stats['Grade']:
+                no_grade = none_listed
+                grade = {'name': f"Grade {grade_key}", 'value': 0}
+                stats['Grade'][grade_key] = no_grade if grade_key == None else grade
+            stats['Grade'][grade_key]['value'] += 1
            stats_sum['Grade'] += 1

-            if bidder['pos_location'] not in stats['Post']:
-                stats['Post'][bidder['pos_location']] = {'name': f"{bidder['pos_location']}", 'value': 0}
-            stats['Post'][bidder['pos_location']]['value'] += 1
+            oc_bureau_key = pydash.get(bidder, 'available_bidder_details.oc_bureau')
+            if oc_bureau_key not in stats['OC Bureau']:
+                no_oc_bureau = none_listed
+                oc_bureau = {'name': f"{oc_bureau_key}", 'value': 0}
+                stats['OC Bureau'][oc_bureau_key] = no_oc_bureau if oc_bureau_key == None else oc_bureau
+            stats['OC Bureau'][oc_bureau_key]['value'] += 1
+            stats_sum['OC Bureau'] += 1
+
+            post_key = pydash.get(bidder, 'pos_location')
+            if post_key not in stats['Post']:
+                no_post = none_listed
+                post = {'name': f"{post_key}", 'value': 0}
+                stats['Post'][post_key] = no_post if post_key == None else post
+            stats['Post'][post_key]['value'] += 1
            stats_sum['Post'] += 1

            skill = list(deepcopy(filter(None, bidder['skills'])))
            skill_key = skill[0]['code']
            if skill_key not in stats['Skill']:
-                stats['Skill'][skill_key] = {'name': f"{skill[0]['description']}", 'value': 0}
+                no_skill = none_listed
+                skill = {'name': f"{skill[0]['description']}", 'value': 0}
+                stats['Skill'][skill_key] = no_skill if skill_key == None else skill
            stats['Skill'][skill_key]['value'] += 1
            stats_sum['Skill'] += 1

-            ab_status_key = pydash.get(bidder, 'available_bidder_details.status')
-            if ab_status_key:
-                if ab_status_key not in stats['Status']:
-                    stats['Status'][ab_status_key] = {'name': f"{ab_status_key}", 'value': 0}
-                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
+            status_key = pydash.get(bidder, 'available_bidder_details.status')
+            if status_key not in stats['Status']:
+                no_status = none_listed
+                status = {'name': f"{status_key}", 'value': 0}
+                stats['Status'][status_key] = no_status if status_key == None else status
+            stats['Status'][status_key]['value'] += 1
+            stats_sum['Status'] += 1


All of these blocks of code are doing basically the same thing. What if we abstracted away the differences to a config object to make this more DRY?

config = [ { 'key': 'current_assignment.position.bureau_code', 'statsKey': 'Bureau' }, ... ] def map_object(x): key = pydash.get(bidder, x['key']) if key not in stats[x['statsKey']]: fallback_text = none_listed obj = {'name': f"{key}", 'value': 0} stats[(x['statsKey'])[key] = fallback_text if key == None else obj stats[x['statsKey']][key]['value'] += 1 stats_sum[x['statsKey']] += 1 pydash.for_each(config, map_object)

Had to make a few edits, also this is not tested

done, except for handling the skill

SidelineCory24 · 2022-01-18T20:45:39Z

Looks like this is causing the improper adding, @mjoyce91 @elizabeth-jimenez
none_listed = {'name': 'None listed', 'value': 0} stats['CDO'][cdo_full_name_key] = none_listed if cdo_full_name_key == None else {'name': f"{cdo_full_name_key}", 'value': 0}

would this make more sense
stats['Grade'][grade_key] = {'name': 'None listed', 'value': 0} if grade_key == None else {'name': f"Grade {grade_key}", 'value': 0}

Mike I saw your comment about the config/function to do all of this code as well

…aPhase-Consulting/State-TalentMap-API into update/available-bidders-chart-stats

mjoyce91 · 2022-01-20T17:13:55Z

talentmap_api/cdo/services/available_bidders.py

+                    if stat['key'] == 'skills':
+                        skill = list(deepcopy(filter(None, bidder[stat['key']])))
+                        skill_key = skill[0]['code']
+                        if skill_key not in stats['Skill']:
+                            stats['Skill'][skill_key] = deepcopy(none_listed) if skill_key == None else {'name': f"{skill[0]['description']}", 'value': 0}
+                        stats['Skill'][skill_key]['value'] += 1
+                        stats_sum[stat['statsKey']] += 1
+                    else:
+                        key = pydash.get(bidder, stat['key'])
+                        if key not in stats[stat['statsKey']]:
+                            stats[stat['statsKey']][key] = deepcopy(none_listed) if key == None else {'name': f"{key}", 'value': 0}
+                        stats[stat['statsKey']][key]['value'] += 1
+                        stats_sum[stat['statsKey']] += 1


You're still duplicating a lot of the same code. For example, we always run stats_sum[stat['statsKey']] += 1 regardless of which path the if/else takes, so why have that in both blocks?

simplified skill code has been pushed

updating ab chart stats

c17672a

SidelineCory24 added do not merge WIP Work in progress labels Jan 6, 2022

SidelineCory24 mentioned this pull request Jan 6, 2022

updating ab chart stats TM-2409 MetaPhase-Consulting/State-TalentMAP#1909

Merged

1 task

Merge branch 'dev' into update/available-bidders-chart-stats

48e86a8

SidelineCory24 changed the title ~~updating ab chart stats~~ updating ab chart stats TM-2409 Jan 7, 2022

SidelineCory24 and others added 3 commits January 7, 2022 19:11

sorting grade & skill

cf13d0b

adding OC Bureau to data structure

082df98

Merge branch 'dev' into update/available-bidders-chart-stats

823656c

Update available_bidders.py

b46b772

comment update

SidelineCory24 removed do not merge WIP Work in progress labels Jan 11, 2022

SidelineCory24 requested review from elizabeth-jimenez, mjoyce91 and scott062 January 11, 2022 12:31

elizabeth-jimenez reviewed Jan 11, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

elizabeth-jimenez reviewed Jan 11, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

elizabeth-jimenez reviewed Jan 11, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

SidelineCory24 added 2 commits January 11, 2022 10:54

updating comments

9820d8c

Merge branch 'update/available-bidders-chart-stats' of github.com:Met…

b424a4e

…aPhase-Consulting/State-TalentMap-API into update/available-bidders-chart-stats

SidelineCory24 commented Jan 11, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

SidelineCory24 added 3 commits January 11, 2022 12:06

updating filter code

f2528b6

cleaning up test

55796d7

variable naming updates

e0d7bcd

mjoyce91 reviewed Jan 12, 2022

View reviewed changes

code simplification

3dfa9f8

mjoyce91 reviewed Jan 12, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

SidelineCory24 and others added 3 commits January 14, 2022 11:58

Merge branch 'dev' into update/available-bidders-chart-stats

193a419

handling edge case of showing no posts at all

90054fc

Merge branch 'update/available-bidders-chart-stats' of github.com:Met…

4af22b2

…aPhase-Consulting/State-TalentMap-API into update/available-bidders-chart-stats

SidelineCory24 commented Jan 14, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

SidelineCory24 and others added 2 commits January 14, 2022 13:47

Update available_bidders.py

229ee0a

comment update

post not posts

941d47e

SidelineCory24 added the dual merge label Jan 18, 2022

elizabeth-jimenez reviewed Jan 18, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

elizabeth-jimenez reviewed Jan 18, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

elizabeth-jimenez reviewed Jan 18, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

elizabeth-jimenez reviewed Jan 18, 2022

View reviewed changes

talentmap_api/cdo/services/available_bidders.py Outdated Show resolved Hide resolved

SidelineCory24 added 3 commits January 18, 2022 10:45

updating variables

3fa3564

updating none listed variable

76aed83

removing instanceOf check

f5365fb

code simplification

8678285

mjoyce91 reviewed Jan 18, 2022

View reviewed changes

SidelineCory24 and others added 7 commits January 18, 2022 15:59

fixing none listed sum bug

d391a66

Merge branch 'dev' into update/available-bidders-chart-stats

32814c7

removing grade text

4ade1db

Merge branch 'update/available-bidders-chart-stats' of github.com:Met…

7f3882a

…aPhase-Consulting/State-TalentMap-API into update/available-bidders-chart-stats

simplifying stat creation

c218122

updating variable naming

96f7975

adding skill to stat creation function

eb3bd84

mjoyce91 reviewed Jan 20, 2022

View reviewed changes

SidelineCory24 and others added 2 commits January 20, 2022 13:31

simplfying skill stat

9af955c

Merge branch 'dev' into update/available-bidders-chart-stats

7972cef

mjoyce91 approved these changes Jan 20, 2022

View reviewed changes

SidelineCory24 merged commit 057cf30 into dev Jan 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

updating ab chart stats TM-2409 #654

updating ab chart stats TM-2409 #654

SidelineCory24 commented Jan 6, 2022 •

edited

Loading

SidelineCory24 commented Jan 11, 2022

mjoyce91 Jan 12, 2022

SidelineCory24 Jan 12, 2022

SidelineCory24 Jan 12, 2022 •

edited

Loading

mjoyce91 Jan 12, 2022

SidelineCory24 Jan 12, 2022

mjoyce91 Jan 12, 2022

SidelineCory24 Jan 12, 2022

elizabeth-jimenez Jan 14, 2022

mjoyce91 Jan 18, 2022

mjoyce91 commented Jan 18, 2022

mjoyce91 Jan 18, 2022 •

edited

Loading

mjoyce91 Jan 18, 2022

SidelineCory24 Jan 19, 2022

SidelineCory24 commented Jan 18, 2022 •

edited

Loading

mjoyce91 Jan 20, 2022 •

edited

Loading

SidelineCory24 Jan 20, 2022

updating ab chart stats TM-2409 #654

updating ab chart stats TM-2409 #654

Conversation

SidelineCory24 commented Jan 6, 2022 • edited Loading

SidelineCory24 commented Jan 11, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SidelineCory24 Jan 12, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mjoyce91 commented Jan 18, 2022

mjoyce91 Jan 18, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SidelineCory24 commented Jan 18, 2022 • edited Loading

mjoyce91 Jan 20, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SidelineCory24 commented Jan 6, 2022 •

edited

Loading

SidelineCory24 Jan 12, 2022 •

edited

Loading

mjoyce91 Jan 18, 2022 •

edited

Loading

SidelineCory24 commented Jan 18, 2022 •

edited

Loading

mjoyce91 Jan 20, 2022 •

edited

Loading