Merge remote-tracking branch 'origin/bug/fix-updated-data-query' into feat/batched-platform-message

Author: sposerina

src/server/api/API_ingest/updated_data.py

@@ -11,64 +11,51 @@ def get_updated_contact_data():
     Session = sessionmaker(engine)
 
     qry = """ -- Collect latest foster/volunteer dates
-        with ev_dates as 
-        (select 
-            person_id, 
+    select json_agg (upd)  as "cd" 
+    from (
+        select
+        sf.source_id as "Id" ,  -- long salesforce string
+        sle.person_id   as  "Person_Id__c",           -- short PAWS-local shelterluv id
+        --case
+        --    when
+        --        (extract(epoch from now())::bigint - foster_out < 365*86400)  -- foster out in last year
+        --        or (extract(epoch from now())::bigint - foster_return < 365*86400) -- foster return
+        --    then 'Active'
+        --    else 'Inactive'
+        --end  as "Updated_Recent_Foster_Activity__c",
+        foster_out as "Updated_Foster_Start_Date__c",
+        foster_return as "Updated_Foster_End_Date__c",
+        vol.first_date "Updated_First_Volunteer_Date__c",
+        vol.last_date "Updated_Last_Volunteer_Date__c",
+        vol.hours as "Updated_Total_Volunteer_Hours__c",
+        vc.source_id::integer as   "Volgistics_Id__c"
+        from (
+            select source_id, matching_id from pdp_contacts sf
+            where sf.source_type = 'salesforcecontacts'
+        ) sf
+        left join pdp_contacts sl on sl.matching_id = sf.matching_id and sl.source_type = 'shelterluvpeople'
+        left join (
+            select
+            person_id,
             max(case when event_type=1 then time else null end) * 1000 adopt,
             max(case when event_type=2 then time else null end) * 1000 foster_out,
-           --  max(case when event_type=3 then time else null end) rto,
+            --  max(case when event_type=3 then time else null end) rto,
             max(case when event_type=5 then time else null end) * 1000 foster_return
-           
-        from 
-            sl_animal_events sla
-            left join sl_event_types sle on sle.id = sla.event_type
-            
-        where sle.id in (1,2,5)
-        group by person_id
-        order by person_id
-        )
-  
-
-    select json_agg (upd)  as "cd" from (
+            from sl_animal_events
+            group by person_id
+        ) sle on sle.person_id::text = sl.source_id
+        left join pdp_contacts vc on vc.matching_id = sf.matching_id and vc.source_type = 'volgistics'
+        left join (
             select
-            slsf.source_id as "Contact_Record_Id__c" ,  -- long salesforce string
-            slp.internal_id   as  "Person_Id__c" ,           -- short PAWS-local shelterluv id
-        
-            --case
-            --    when 
-            --        (extract(epoch from now())::bigint - foster_out < 365*86400)  -- foster out in last year 
-            --        or (extract(epoch from now())::bigint - foster_return < 365*86400) -- foster return 
-            --    then 'Active'
-            --    else 'Inactive'
-            --end  as "Updated_Recent_Foster_Activity__c",
-        
-            foster_out as "Updated_Foster_Start_Date__c",
-            foster_return as "Updated_Foster_End_Date__c",
-
-            extract(epoch from min(vs.from_date)) * 1000 as "Updated_First_Volunteer_Date__c",
-            extract(epoch from max(vs.from_date)) * 1000 as "Updated_Last_Volunteer_Date__c",
-            sum(vs.hours) as "Updated_Total_Volunteer_Hours__c",
-            vc.source_id::integer as   "Volgistics_Id__c" 
-            
-        from 
-            ev_dates
-            left join pdp_contacts slc on slc.source_id = person_id::text and slc.source_type = 'shelterluvpeople'
-            left join pdp_contacts slsf on slsf.matching_id = slc.matching_id and slsf.source_type = 'salesforcecontacts'
-            left join shelterluvpeople slp on slp.internal_id = person_id::text
-            left join pdp_contacts vc on vc.matching_id = slc.matching_id and vc.source_type = 'volgistics'
-            left join volgisticsshifts vs on vs.volg_id::text = vc.source_id 
-
-    where 
-        slsf.source_id is not null
-
-        group by
-            slsf.source_id,
-            slp.internal_id,
-            vc.source_id,
-            foster_out ,
-            foster_return
-        
-    ) upd ;
+            volg_id,
+            sum(hours) as hours,
+            extract(epoch from min(from_date)) * 1000 as first_date,
+            extract(epoch from max(from_date)) * 1000 as last_date
+            from volgisticsshifts
+            group by volg_id
+        ) vol on vol.volg_id::text = vc.source_id
+        where sl.matching_id is not null or vc.matching_id is not null
+    ) upd;
     """
 
     with Session() as session: