Apply suggestions from code review

Co-authored-by: Aaron Weeden <31246768+aaronweeden@users.noreply.github.com>
ubccr · Dec 6, 2024 · 659a6fc · 659a6fc
1 parent 9709d5c
commit 659a6fc
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/configuration/etl/etl_action_defs.d/cloud_common/session_records.json b/configuration/etl/etl_action_defs.d/cloud_common/session_records.json
@@ -23,14 +23,14 @@
             "end_day_id": "YEAR(FROM_UNIXTIME(e.end_time_ts)) * 100000 + DAYOFYEAR(FROM_UNIXTIME(e.end_time_ts))",
             "wallduration": "FLOOR(e.end_time_ts) - FLOOR(e.start_time_ts)",
             "person_id": "ev.person_id",
-            "person_organization_id": "p.organization_id",
+            "person_organization_id": "COALESCE(p.organization_id, -1)",
             "systemaccount_id": "ev.systemaccount_id",
             "submission_venue_id": "ev.submission_venue_id",
             "domain_id": "ev.domain_id",
             "service_provider": "ev.service_provider",
             "account_id": "a.account_id",
             "principalinvestigator_person_id": "a.principalinvestigator_person_id",
-            "piperson_organization_id": "pi.organization_id",
+            "piperson_organization_id": "COALESCE(pi.organization_id, -1)",
             "fos_id": "a.fos_id",
             "host_id": "ev.host_id",
             "instance_state_id": "etype.instance_state_id"
@@ -78,13 +78,6 @@
                 "alias": "etype",
                 "on": "e.start_event_id = etype.event_type_id"
             },
-            {
-                "name": "resourcefact",
-                "schema": "${UTILITY_SCHEMA}",
-                "alias": "r",
-                "type": "LEFT",
-                "on": "e.resource_id = r.id"
-            },
             {
                 "name": "person",
                 "schema": "${UTILITY_SCHEMA}",