fix merge conflicts

Stephen Poserina · Stephen Poserina · commit 2ed2d87daed5 · 2022-01-23T17:14:06.000-05:00
diff --git a/src/README.md b/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
diff --git a/src/client/Dockerfile b/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
diff --git a/src/client/package-lock.json b/src/client/package-lock.json
diff --git a/src/client/src/pages/Admin.js b/src/client/src/pages/Admin.js
diff --git a/src/client/src/pages/DataView360/View/View360.js b/src/client/src/pages/DataView360/View/View360.js
@@ -68,7 +68,14 @@ class View360 extends Component {
             });
         response = await response.json();
 
-        let shelterluvInfo = await fetch(`/api/person/${this.state.matchId}/animals`);
+        let shelterluvInfo = await fetch(`/api/person/${this.state.matchId}/animals`,
+            {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': 'Bearer ' + this.props.access_token
+                }
+            });
         shelterluvInfo = await shelterluvInfo.json()
         const shelterluvShortId = shelterluvInfo["person_details"]["shelterluv_short_id"]
         let animalInfo = shelterluvInfo["animal_details"]
@@ -89,7 +96,14 @@ class View360 extends Component {
             });
         }
 
-        let supportOverviewData = await fetch(`/api/person/${this.state.matchId}/support`);
+        let supportOverviewData = await fetch(`/api/person/${this.state.matchId}/support`,
+            {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': 'Bearer ' + this.props.access_token
+                }
+            });
         supportOverviewData = await supportOverviewData.json()
         
         this.setState({
@@ -104,7 +118,14 @@ class View360 extends Component {
     }
 
     async getAnimalEvents(animalId, matchId) {
-        let response = await fetch(`/api/person/${matchId}/animal/${animalId}/events`);
+        let response = await fetch(`/api/person/${matchId}/animal/${animalId}/events`,
+            {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': 'Bearer ' + this.props.access_token
+                }
+            });
         return await response.json()
     }
 
diff --git a/src/client/src/pages/DataView360/View/components/Adoptions.js b/src/client/src/pages/DataView360/View/components/Adoptions.js
@@ -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>
diff --git a/src/client/src/pages/DataView360/View/components/SupportOverview.js b/src/client/src/pages/DataView360/View/components/SupportOverview.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" }
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
@@ -9,8 +9,8 @@ services:
     volumes:
       - postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: thispasswordisverysecure
       POSTGRES_DB: paws
+      POSTGRES_PASSWORD: thispasswordisverysecure
 
   server:
     container_name: paws-compose-server
@@ -53,3 +53,4 @@ services:
 volumes:
   postgres:
   src_archive:
+  server_logs:
diff --git a/src/helm-chart/templates/deployment.yaml b/src/helm-chart/templates/deployment.yaml
@@ -8,6 +8,8 @@ spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       {{- include "helm-chart.selectorLabels" . | nindent 6 }}
diff --git a/src/helm-chart/values.yaml b/src/helm-chart/values.yaml
@@ -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:
diff --git a/src/server/Dockerfile b/src/server/Dockerfile
@@ -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
diff --git a/src/server/alembic/versions/fc7325372396_merge_heads.py b/src/server/alembic/versions/fc7325372396_merge_heads.py
@@ -0,0 +1,24 @@
+"""Merges heads '8f4, '28b
+
+Revision ID: fc7325372396
+Revises: a3ba63dee8f4, fd187937528b
+Create Date: 2022-01-17 22:05:05.824901
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'fc7325372396'
+down_revision = ('a3ba63dee8f4', 'fd187937528b')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass
diff --git a/src/server/api/admin_api.py b/src/server/api/admin_api.py
@@ -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)
diff --git a/src/server/api/common_api.py b/src/server/api/common_api.py
@@ -180,6 +180,7 @@ def get_360(matching_id):
 
 
 @common_api.route('/api/person/<matching_id>/animals', methods=['GET'])
+@jwt_ops.jwt_required()
 def get_animals(matching_id):
     result = {
         "person_details": {},
@@ -191,31 +192,23 @@ 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
-
-    return result
-
+            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
 
-@common_api.route('/api/animal/<animal_id>/events', methods=['GET'])
-def get_animal_events(animal_id):
-    result = {}
-    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'])
+@jwt_ops.jwt_required()
 def get_person_animal_events(matching_id, animal_id):
     result = {}
     events = []
@@ -237,6 +230,7 @@ def get_person_animal_events(matching_id, animal_id):
     return result
 
 @common_api.route('/api/person/<matching_id>/support', methods=['GET'])
+@jwt_ops.jwt_required()
 def get_support_oview(matching_id):
     """Return these values for the specified match_id:
         largest gift, date for first donation, total giving, number of gifts,
@@ -385,3 +379,31 @@ def get_support_oview(matching_id):
             current_app.logger.debug('No SF contact IDs found for matching_id ' + str(matching_id))
             oview_fields['number_of_gifts'] = 0  # Marker for no data
             return jsonify(oview_fields)
+
+
+@common_api.route('/api/last_analysis', methods=['GET'])
+@jwt_ops.jwt_required()
+def get_last_analysis():
+    """ Return the UTC string (e.g., '2021-12-11T02:29:14.830371') representing 
+        when the last analysis run succesfully completed. 
+        Returns an empty string if no results.
+    """
+
+    last_run = ''
+
+    last_stamp = """
+                    select update_stamp 
+                    from  execution_status
+                    where stage = 'flow' and status = 'complete'
+                    order by update_stamp desc
+                    limit 1;
+                """
+
+    with engine.connect() as connection:
+        result = connection.execute(last_stamp)
+        if result.rowcount:
+            row = result.fetchone()
+            last_run_dt = row[0]  # We get as a datetime object
+            last_run = last_run_dt.isoformat()
+
+    return last_run
diff --git a/src/server/api/internal_api.py b/src/server/api/internal_api.py
@@ -2,6 +2,7 @@
 from flask import jsonify, current_app
 from datetime import datetime
 from api.API_ingest import ingest_sources_from_api
+from rfm_funcs.create_scores import create_scores
 
 ###   Internal API endpoints can only be accessed from inside the cluster;
 ###   they are blocked by location rule in NGINX config
@@ -29,3 +30,10 @@ def ingest_raw_data():
 
     return jsonify({'outcome': 'OK'}), 200
 
+
+@internal_api.route("/api/internal/create_scores", methods=["GET"])
+def hit_create_scores():
+    current_app.logger.info("Hitting create_scores() ")
+    tuple_count = create_scores()
+    current_app.logger.info("create_scores()  processed " + str(tuple_count) + " scores")
+    return jsonify(200)
diff --git a/src/server/api/user_api.py b/src/server/api/user_api.py
@@ -358,10 +358,10 @@ def check_username():
 def user_update():
     """Update existing user record 
     """
-
-    post_dict = json.loads(request.data)
+  
    
     try:
+        post_dict = json.loads(request.data)
         username = post_dict["username"]
     except:
         return jsonify("Must specify username"), 400
diff --git a/src/server/bin/startServer.sh b/src/server/bin/startServer.sh
@@ -6,7 +6,7 @@ set FLASK_APP=server/app.py
 export FLASK_APP
 source bin/export_secrets.sh
 # This abomination ensures that the PG server has finished its restart cycle
-echo "SLEEPING.. WAITING FOR DB"; sleep 5; echo "WAKING"; alembic upgrade head; echo "DB SETUP";
+echo "SLEEPING.. WAITING FOR DB"; sleep 5; echo "WAKING"; alembic upgrade head; alembic current; echo "DB SETUP";
 #; python -m flask run --host=0.0.0.0 --no-reload
 
 # --no-reload prevents Flask restart, which usually happens in middle of create_base_users()
diff --git a/src/server/pipeline/flow_script.py b/src/server/pipeline/flow_script.py
diff --git a/src/server/pipeline/flow_script.py.orig b/src/server/pipeline/flow_script.py.orig
diff --git a/src/server/rfm-edges.txt b/src/server/rfm-edges.txt
diff --git a/src/server/rfm_funcs/create_scores.py b/src/server/rfm_funcs/create_scores.py
