Merge branch 'master' of https://github.com/CodeForPhilly/paws-data-pipeline

Author: urirot

src/README.md

@@ -19,7 +19,7 @@ _Docker Compose instructions_
 - `docker-compose up -d` to bring up the application.
 - Scheduler docker will not start. To run the scheduler, use profile flag `production-only` as explained in the Production Environment section.
 
-#### Finally - Run The UI on http://localhost:3000
+#### Finally - Run The UI on http://localhost:80
 
 ---------------------------------------
 Production Environment

src/client/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:13.12.0-alpine as builder
+FROM node:16-alpine as builder
 
 # set working directory
 WORKDIR /app

src/client/package-lock.json

@@ -37,7 +37,8 @@ class Adoptions extends Component {
 
     getLatestPets(animals) {
         const latestPets = _.sortBy(animals, animal => {
-            return animal.Events.Time
+            return (animal.Events && animal.Events.Time) ? animal.Events.Time : 1
+            
         }).reverse()
 
         return latestPets.slice(0, PET_COUNT)
@@ -46,11 +47,15 @@ class Adoptions extends Component {
     createRows(data) {
         const result = _.map(data, (row, index) => {
             const photo = row.Photos[0]
+            const eventDate = (row.Events && row.Events.Time) ? moment.unix(row.Events.Time).format("YYYY-MM-DD") : ''
+
+
+
             return (
                 <TableRow key={index}>
                     <TableCell align="center">{row.Name}</TableCell>
                     <TableCell align="center">{row.Type}</TableCell>
-                    <TableCell align="center">{moment.unix(row.Events.Time).format("YYYY-MM-DD")}</TableCell>
+                    <TableCell align="center">{eventDate}</TableCell>
                     <TableCell align="center">{showAnimalAge(row.DOBUnixTime)}</TableCell>
                     <TableCell align="center">{<img src={photo} alt="animal" style={{ "maxWidth": "100px" }} />}</TableCell>
                 </TableRow>

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

@@ -22,10 +22,10 @@ class SupportOverview extends Component {
         }
         const rows = [
             { "title": "First Gift Date", "value": data.first_donation_date },
-            { "title": "First Gift Amount", "value": `$${data.first_gift_amount}`},
-            { "title": "Lifetime Giving", "value": `$${data.total_giving}`},
+            { "title": "First Gift Amount", "value": `$${data.first_gift_amount.toFixed(2)}`},
+            { "title": "Lifetime Giving", "value": `$${data.total_giving.toFixed(2)}`},
             { "title": "Total # of Gifts", "value": data.number_of_gifts},
-            { "title": "Largest Gift", "value": `$${data.largest_gift}`},
+            { "title": "Largest Gift", "value": `$${data.largest_gift.toFixed(2)}`},
             { "title": "Recurring Donor?", "value": data.is_recurring ? "Yes" : "No"},
             { "title": "RFM Score", "value": data.rfm_score }
             // { "title": "PAWS Legacy Society?", "value": "test" }

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

@@ -9,7 +9,6 @@ services:
     volumes:
       - postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: thispasswordisverysecure
       POSTGRES_DB: paws
 
   server:
@@ -53,3 +52,4 @@ services:
 volumes:
   postgres:
   src_archive:
+  server_logs:

src/docker-compose.yml

@@ -9,14 +9,14 @@ server:
     repository: ghcr.io/codeforphilly/paws-data-pipeline/server
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "2.33"
+    tag: "2.34"
 
 client:
   image:
     repository: ghcr.io/codeforphilly/paws-data-pipeline/client
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "2.33"
+    tag: "2.34"
 
 db:
   image:

src/helm-chart/values.yaml

@@ -37,6 +37,8 @@ RUN chmod +x  bin/startServer.sh
 WORKDIR /app
 
 RUN useradd -m pawsapp
+RUN mkdir -p  /app/.pytest_cache/v/cache
+RUN chown -R pawsapp:pawsapp /app/.pytest_cache/v/cache
 USER pawsapp
 
 CMD bin/startServer.sh

src/server/Dockerfile

@@ -321,11 +321,16 @@ def read_rfm_edges() :
     with engine.begin() as connection:   # BEGIN TRANSACTION
         q_result = connection.execute(q)
         if q_result.rowcount == 0:
-            current_app.logger.warning("No rfm_edge entry found in DB")
+            current_app.logger.error("No rfm_edge entry found in DB")
             return None
         else:
             edge_string = q_result.fetchone()[0]
-            edge_dict = json.loads(edge_string)   # Convert stored string to dict
+            try:
+                edge_dict = json.loads(edge_string)   # Convert stored string to dict
+            except json.decoder.JSONDecodeError:
+                current_app.logger.error("rfm_edge entry found in DB was malformed")
+                return None
+                
             return edge_dict
 
 
@@ -406,11 +411,3 @@ def hit_gdrs():
 #     d = read_rfm_edges()        # read it again     
 #     print("round-trip d is : \n " + str(d) )
 #     return "OK"
-
-from rfm_funcs.create_scores import create_scores
-@admin_api.route("/api/admin/test_create_scores", methods=["GET"])
-def hit_create_scores():
-    current_app.logger.info("Hitting create_scores() ")
-    tuple_count = create_scores('2021-07-27')
-    current_app.logger.info("create_scores()  processed " + str(tuple_count) + " scores")
-    return jsonify(200)

src/server/api/admin_api.py

@@ -191,17 +191,17 @@ def get_animals(matching_id):
         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"]
-            person_url = f"http://shelterluv.com/api/v1/people/{shelterluv_id}"
-            person_details = requests.get(person_url, headers={"x-api-key": SHELTERLUV_SECRET_TOKEN}).json()
-            if "ID" in person_details:
-                result["person_details"]["shelterluv_short_id"] = person_details["ID"]
-                animal_ids = person_details["Animal_ids"]
-                for animal_id in animal_ids:
-                    animal_url = f"http://shelterluv.com/api/v1/animals/{animal_id}"
-                    animal_details = requests.get(animal_url, headers={"x-api-key": SHELTERLUV_SECRET_TOKEN}).json()
-                    result["animal_details"][animal_id] = animal_details
+            for row in rows:               
+                shelterluv_id = row["source_id"]
+                person_url = f"http://shelterluv.com/api/v1/people/{shelterluv_id}"
+                person_details = requests.get(person_url, headers={"x-api-key": SHELTERLUV_SECRET_TOKEN}).json()
+                if "ID" in person_details:
+                    result["person_details"]["shelterluv_short_id"] = person_details["ID"]
+                    animal_ids = person_details["Animal_ids"]
+                    for animal_id in animal_ids:
+                        animal_url = f"http://shelterluv.com/api/v1/animals/{animal_id}"
+                        animal_details = requests.get(animal_url, headers={"x-api-key": SHELTERLUV_SECRET_TOKEN}).json()
+                        result["animal_details"][animal_id] = animal_details
 
     return result