Bugfix: Adoptions and Fosters now show only relevant events

Author: dcstlouis

src/client/src/pages/DataView360/View/View.js

@@ -67,7 +67,7 @@ class View360 extends Component {
         let fosterEvents = {};
 
         for (let id of animalIds) {
-            this.getAnimalEvents(id).then((events) => {
+            this.getAnimalEvents(id, this.state.matchId).then((events) => {
                 adoptionEvents[id] = _.filter(events[id], function(e) {
                     return e["Type"] && e["Type"].toLowerCase().includes("adopt");
                 });
@@ -86,8 +86,8 @@ class View360 extends Component {
         });
     }
 
-    async getAnimalEvents(animalId) {
-        let response = await fetch(`/api/animal/${animalId}/events`);
+    async getAnimalEvents(animalId, matchId) {
+        let response = await fetch(`/api/person/${matchId}/animal/${animalId}/events`);
         return await response.json()
     }
 

src/client/src/pages/DataView360/View/components/AnimalInfo.js

@@ -37,19 +37,17 @@ const PET_COUNT = 5;
 class AnimalInfo extends Component {
 
     getLatestPets(petObject, events) {
+
         function customizer(objValue, srcValue) {
             if (_.isObject(objValue) && _.isObject(srcValue)) {
                 // sort according to date of most recent event
                 return _.set(objValue, 'Events', _.orderBy(srcValue, ['Time'], ['desc']));
             }
         }
-        // force null values to back of list because
-        // _.orderBy descending places null values first
-        // see: https://github.com/lodash/lodash/issues/4169
+
         let result = _.mergeWith(petObject, events, customizer);
-        let emptyEvents = _.filter(result, function(pet) { return pet["Events"] && pet["Events"].length === 0 });
         let nonEmptyEvents = _.filter(result, function(pet) { return pet["Events"] && pet["Events"].length > 0 });
-        result = [..._.orderBy(nonEmptyEvents, ['Events[0].Time'], ['desc']), ...emptyEvents]
+        result = [..._.orderBy(nonEmptyEvents, ['Events[0].Time'], ['desc'])]
         return result.slice(0, PET_COUNT);
     }
 

src/server/api/common_api.py

@@ -109,4 +109,26 @@ def get_animal_events(animal_id):
     animal_url = f"http://shelterluv.com/api/v1/animals/{animal_id}/events"
     event_details = requests.get(animal_url, headers={"x-api-key": SHELTERLUV_SECRET_TOKEN}).json()
     result[animal_id] = event_details["events"]
+    return result
+
+
+@common_api.route('/api/person/<matching_id>/animal/<animal_id>/events', methods=['GET'])
+def get_person_animal_events(matching_id, animal_id):
+    result = {}
+    events = []
+    with engine.connect() as connection:
+        query = text("select * from pdp_contacts where matching_id = :matching_id and source_type = 'shelterluvpeople' and archived_date is null")
+        query_result = connection.execute(query, matching_id=matching_id)
+        rows = [dict(row) for row in query_result]
+        if len(rows) > 0:
+            row = rows[0]
+            shelterluv_id = row["source_id"]
+            animal_url = f"http://shelterluv.com/api/v1/animals/{animal_id}/events"
+            event_details = requests.get(animal_url, headers={"x-api-key": SHELTERLUV_SECRET_TOKEN}).json()
+            for event in event_details["events"]:
+                for record in event["AssociatedRecords"]:
+                    if record["Type"] == "Person" and record["Id"] == shelterluv_id:
+                        events.append(event)
+            result[animal_id] = events
+
     return result