Merge branch 'master' into 393-foster-import

Author: cris_gk

.gitignore

@@ -22,4 +22,4 @@ start_env.sh
 /src/server/local_files/
 .mypy_cache/
 *secrets*
-*kustomization*
+*kustomization*

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()
     }
 

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 }}

src/server/alembic/versions/783cabf889d9_inital_schema_setup.py

@@ -5,10 +5,12 @@
 Create Date: 2020-12-16 01:47:43.686881
 
 """
+from sqlalchemy.sql.expression import null
 from alembic import op
 import sqlalchemy as sa
 
 
+
 # revision identifiers, used by Alembic.
 revision = '783cabf889d9'
 down_revision = None
@@ -33,6 +35,5 @@ def upgrade():
         sa.Column('created', sa.DateTime,nullable=False, server_default='now()')
     )
 
-
 def downgrade():
     pass

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

src/server/alembic/versions/fd187937528b_create_pdp_contacts_table.py

@@ -0,0 +1,45 @@
+"""create pdp_contacts table
+
+Revision ID: fd187937528b
+Revises: 57b547e9b464
+Create Date: 2021-08-10 20:16:54.169168
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB
+import datetime
+
+# revision identifiers, used by Alembic.
+revision = 'fd187937528b'
+down_revision = '57b547e9b464'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    
+    op.create_table('pdp_contacts',
+        sa.Column('_id', sa.Integer, primary_key=True, autoincrement=True),
+        sa.Column('matching_id', sa.Integer, primary_key=True),
+        sa.Column('source_type', sa.String, nullable=False),
+        sa.Column('source_id', sa.String, nullable=False),
+        sa.Column('is_organization', sa.Boolean),
+        sa.Column('first_name', sa.String),
+        sa.Column('last_name', sa.String),
+        sa.Column('email', sa.String),
+        sa.Column('mobile', sa.String),
+        sa.Column('street_and_number', sa.String),
+        sa.Column('apartment', sa.String),
+        sa.Column('city', sa.String),
+        sa.Column('state', sa.String),
+        sa.Column('zip', sa.String),
+        sa.Column('json', JSONB),
+        sa.Column('created_date', sa.DateTime, default=datetime.datetime.utcnow),
+        sa.Column('archived_date', sa.DateTime, default=None)
+    )
+
+def downgrade():
+    
+    op.drop_table("pdp_contacts")
+    op.drop_table("pdp_contact_types")

src/server/api/common_api.py

@@ -6,25 +6,22 @@
 import time
 from datetime import datetime
 
+from api.fake_data import sl_mock_data
+
 try:
     from secrets_dict import SHELTERLUV_SECRET_TOKEN
 except ImportError:
     # Not running locally
     print("Couldn't get SHELTERLUV_SECRET_TOKEN from file, trying environment **********")
-    from os import environ
-
-    try:
-        SHELTERLUV_SECRET_TOKEN = environ['SHELTERLUV_SECRET_TOKEN']
-    except KeyError:
-        # Nor in environment
-        # You're SOL for now
-        print("Couldn't get secrets from file or environment")
-
+    from os import getenv
 
+    SHELTERLUV_SECRET_TOKEN = getenv('SHELTERLUV_SECRET_TOKEN')
+    if not SHELTERLUV_SECRET_TOKEN:
+        print("Couldn't get secrets from file or environment",
+            "Defaulting to Fake Data")
 
 from api import jwt_ops
 
-
 @common_api.route('/api/timeout_test/<duration>', methods=['GET'])
 def get_timeout(duration):
     start = datetime.now().strftime("%H:%M:%S");
@@ -178,14 +175,17 @@ def get_360(matching_id):
 
     return jsonify({'result': result})
 
-
 @common_api.route('/api/person/<matching_id>/animals', methods=['GET'])
+@jwt_ops.jwt_required()
 def get_animals(matching_id):
     result = {
         "person_details": {},
         "animal_details": {}
     }
 
+    if not SHELTERLUV_SECRET_TOKEN:
+        return jsonify(sl_mock_data('animals'))
+
     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)
@@ -206,19 +206,15 @@ def get_animals(matching_id):
     return result
 
 
-@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 = []
+
+    if not SHELTERLUV_SECRET_TOKEN:
+        return jsonify(sl_mock_data('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)
@@ -237,6 +233,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 +382,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

src/server/api/fake_data.py

@@ -0,0 +1,48 @@
+""" Fake data that can be returned when an API token is missing for local
+    development, or for running pytest
+
+    Shelterluv Data contains:
+        Matched: Animal & Event End point
+"""
+
+shelterluv_data = {
+    'animals': {
+        "animal_details": {
+            '12345': {
+                "Age": 24,
+                "DOBUnixTime": 1568480456,
+                "Name": "Lola aka Fake Cat",
+                "Type": "Cat",
+                "Photos":
+                ["https://images.unsplash.com/photo-1456926631375-92c8ce872def?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8OHx8YW5pbWFsfGVufDB8fDB8fA%3D%3D&w=1000&q=80"],
+                "Status": "Healthy In Home",
+            },
+        },
+        "person_details": {
+            "shelterluv_short_id": 2,
+        },
+    },
+    'events': {
+        '12345':[
+            {
+            'AssociatedRecords': [
+                {'Id': 12345, 'Type': 'Animal' },
+                {'Id': 12345, 'Type': 'Person'},
+            ],
+            'Subtype': 'Foster Home',
+            'Time': '1602694822',
+            'Type': 'Outcome.Adoption',
+            'User': 'Fake User',
+            },
+        ]
+    },
+}
+
+
+def sl_mock_data(end_point: str)-> dict:
+    """ Shelterluv mock data.
+        Takes the end_point as a str of `animals` or `events` and  returns
+        a dict representing a test data for that end_point.
+    """
+
+    return shelterluv_data.get(end_point)

src/server/bin/export_secrets.sh

@@ -1,7 +1,3 @@
 set -o allexport
- while read k _ v; 
-    do 
-      eval $k=$v;
-      export k;
-    done < 'secrets_dict.py'
- set +o allexport
+source secrets_dict.py
+set +o allexport

src/server/config.py

@@ -31,10 +31,6 @@
 
 engine = db.create_engine(DB)
 
-with engine.connect() as connection:
-    models.Base.metadata.create_all(connection)
-    # This is safe: by default, will check first to ensure tables don't already exist
-
 # Run Alembic to create managed tables
 # from alembic.config import Config
 # from alembic import command