Merge branch 'hotfix/2.2.13'

Author: chrisseto

bots/elasticsearch/util.py

@@ -160,7 +160,7 @@ def fetch_creativework(pks):
                                         FROM share_agentrelation AS affiliation
                                         JOIN share_agent AS affiliated_agent ON affiliation.related_id = affiliated_agent.id
                                         WHERE affiliation.subject_id = agent.id AND affiliated_agent.type != 'share.person'
-                                        ) AS affiliations ON TRUE
+                                        ) AS affiliations ON (agent.type = 'share.person')
                             LEFT JOIN LATERAL (
                                         SELECT json_agg(json_strip_nulls(json_build_object(
                                                                             'id', award.id

providers/gov/nih/normalizer.py

@@ -189,7 +189,15 @@ class PIContactAgent(Parser):
     schema = 'Person'
 
     name = ctx.PI_NAME
-    related_agents = tools.Map(tools.Delegate(FullIsAffiliatedWith), ctx['org_ctx'])
+    related_agents = tools.Concat(
+        tools.Map(tools.Delegate(FullIsAffiliatedWith), ctx['org_ctx']),
+        tools.Map(tools.Delegate(DeptIsAffiliatedWith), RunPython('if_dept', ctx))
+    )
+
+    def if_dept(self, ctx):
+        if ctx['org_ctx']['ORG_DEPT']:
+            return {**ctx['org_ctx'], 'hash_breaker': True}
+        return None
 
     class Extra:
         pi_id = RunPython(filter_nil, ctx.PI_ID)