Merge branch 'master' into nginx_setup

# Conflicts:
#	src/docker-compose.yml
#	src/server/Dockerfile
#	src/server/app.py

Author: urirot

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

@@ -124,8 +124,8 @@ class DataView360 extends Component {
                             <TableBody>
                                 {
                                     _.map(participantListGrouped, (row_group, index) => {
-                                        return _.map(row_group, row => {
-                                            return <TableRow key={row.source_id}
+                                        return _.map(row_group, (row, idx) => {
+                                            return <TableRow key={`${row.source_id}${idx}`}
                                                             className={tableRowColors[index % _.size(tableRowColors)]}
                                                             onClick={() => this.handleGetParticipant(row.matching_id)}>
                                                 <TableCell align="left">{row.matching_id}</TableCell>
@@ -185,19 +185,19 @@ class DataView360 extends Component {
                 this.state.showParticipant === true) && (
                     <Paper className={styles.main} elevation={1} style={{"padding": "1em"}}>
                         <ContactInfo participant={_.get(this.state, 'participantData.contact_details')}/>
-                        <Container>
-                            <Grid container direction="row" justify="center" alignItems="center" style={{"margin-top": "1em"}}>
-                                <Button variant="contained" color="primary"
-                                    onClick={() => { 
-                                    this.setState({showParticipant: false, showTable: true, showSearchBar: true }) 
-                                    }}>Back to Results
-                                </Button>
+                            <Grid container direction="row" justify="center">
+                                <Grid item style={{"marginTop": "1em", "position": "fixed"}}>
+                                    <Button variant="contained" color="primary"
+                                        onClick={() => { 
+                                        this.setState({showParticipant: false, showTable: true, showSearchBar: true }) 
+                                        }}>Back to Results
+                                    </Button>
+                                </Grid>
                             </Grid>
-                        </Container>
                         <Donations donations={_.get(this.state, 'participantData.donations')}/>
                         <Adoptions adoptions={_.get(this.state, 'participantData.adoptions')}/>
                         <Volunteer volunteer={_.get(this.state, 'participantData.shifts')}
-                                   volunteerShifts={_.get(this.state, 'participantData.volgistics_shifts_results')}/>
+                                   volunteerShifts={_.get(this.state, 'participantData.shifts')}/>
 
                     </Paper>)}
                 {this.state.isDataBusy === true && (

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

@@ -41,19 +41,36 @@ class Adoptions extends Component {
     render() {
         // todo: update when we add pet info
         // todo: clean array of animal_id
+        const numAdoptions = _.size(this.props.adoptions);
         return (<Container className={styles.adoptions} style={{"marginTop":"1em"}}>
-                    <Typography className={styles.adoptions_title} variant='h4'>Adoption/Foster Records (Top 3)</Typography>
+                    <Typography className={styles.adoptions_title} variant='h4'>Adoption/Foster Records {(numAdoptions > 3) && "(Showing latest 3 out of " + numAdoptions + ")"}</Typography>
                     <TableContainer className="main_table_container" style={{"marginTop":"1em"}} component={Paper} variant='outlined'>
                         <Table className="main_table">
                             <TableHead>
                                 <TableRow>
-                                    <StyledTableCell align="center">Number of Adoptions</StyledTableCell>
+                                    <StyledTableCell align="center">Name</StyledTableCell>
+                                    <StyledTableCell align="center">Adoption Type</StyledTableCell>
+                                    <StyledTableCell align="center">Adoption Subtype</StyledTableCell>
+                                    <StyledTableCell align="center">Animal Type</StyledTableCell>
+                                    <StyledTableCell align="center">Breed</StyledTableCell>
+                                    <StyledTableCell align="center">Age</StyledTableCell>
+                                    <StyledTableCell align="center">Photo</StyledTableCell>
                                 </TableRow>
                             </TableHead>
                             <TableBody>
-                                <StyledTableRow>
-                                    <TableCell align="center"> {_.size(this.getAnimalIds())}</TableCell>
+                                {_.map(this.props.adoptions, (adoptionInfo, index) => {
+                                    const photoLink = adoptionInfo["animal_details"]["Photos"][0]
+                                    const photo = <img src={photoLink} style={{"maxWidth": "100px"}}/>;
+                                    return <StyledTableRow key={adoptionInfo["Time"] + index}>
+                                    <TableCell align="center">{adoptionInfo["animal_details"]["Name"]}</TableCell>
+                                    <TableCell align="center">{adoptionInfo["Type"]}</TableCell>
+                                    <TableCell align="center">{adoptionInfo["Subtype"]}</TableCell>
+                                    <TableCell align="center">{adoptionInfo["animal_details"]["Type"]}</TableCell>
+                                    <TableCell align="center">{adoptionInfo["animal_details"]["Breed"]}</TableCell>
+                                    <TableCell align="center">{(parseInt(adoptionInfo["animal_details"]["Age"])/12).toFixed(2)}</TableCell>
+                                    <TableCell align="center">{photo}</TableCell>
                                 </StyledTableRow>
+                                })}
                             </TableBody>
                         </Table>
                    </TableContainer>

src/client/src/pages/DataView360/components/ContactInfo.js

@@ -16,8 +16,19 @@ const StyledContact = withStyles((theme)=>({
 
 class ContactInfo extends Component {
     render() {
-        const participantArray = _.get(this.props, "participant")
-        const participant = participantArray[0]
+        // TODO: move to the backend
+        let participantArray = _.get(this.props, "participant");
+        let participant = {};
+        if (participantArray.length === 1) {
+            participant = participantArray[0];
+        } else {
+            participantArray = _.filter(participantArray, function(p) {
+                if (p["source_type"] === "salesforcecontacts") { 
+                    return p;
+                }
+            });
+            participant = participantArray[0];
+        }
         const phoneStr = participant.mobile;
         let phone = _.isEmpty(phoneStr) ? '-' : phoneStr.split(" ").join("");
         return (<Container className={styles.contact_info}>

src/docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - postgres:/var/lib/postgresql/data
     environment:
       POSTGRES_PASSWORD: thispasswordisverysecure
+      POSTGRES_DB: paws
 
   server:
     container_name: paws-compose-server
@@ -20,6 +21,7 @@ services:
       - db
     volumes:
       - src_archive:/app/static/raw_data
+
     environment:
       - FLASK_ENV=development
 
@@ -35,8 +37,12 @@ services:
       - PAWS_API_HOST=paws-compose-server
     stdin_open: true
 
+
 #using named volumes fixs a windows docker bug relating to container permissions
 #https://stackoverflow.com/questions/49148754/docker-container-shuts-down-giving-data-directory-has-wrong-ownership-error-wh
 volumes:
   postgres:
-  src_archive:
+  src_archive:
+
+
+

src/server/Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.8
 
+RUN apt-get update && apt-get install -y vim
+
 WORKDIR /app
 
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -39,6 +41,15 @@ RUN chmod 777 /paws-data-pipeline/server
 # RUN ufw allow 5000
 WORKDIR /app
 
-# CMD python app.py
 # --uid uwsgi
-CMD uwsgi --http-socket :5000 --plugin python38 --module wsgi:app --chdir /app --pythonpath .
+CMD uwsgi --http-socket :5000 --plugin python38 --module wsgi:app --chdir /app --pythonpath .
+# we may want to switch this to a script which logs output, etc?
+
+RUN set FLASK_APP=server/app.py
+RUN export FLASK_APP
+
+# This abomination ensures that the PG server has finished its restart cycle
+CMD echo "SLEEPING 10"; sleep 10; echo "WAKING"; alembic upgrade head ; 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()
+#TODO: SECURITY - ensure we are not running in debug mode in production

src/server/alembic.ini

@@ -0,0 +1,89 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# timezone to use when rendering the date
+# within the migration file as well as the filename.
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; this defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path
+# version_locations = %(here)s/bar %(here)s/bat alembic/versions
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# Container
+sqlalchemy.url = postgresql://postgres:thispasswordisverysecure@paws-compose-db/paws
+
+# Local
+# sqlalchemy.url = postgresql://postgres:thispasswordisverysecure@localhost/paws
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks=black
+# black.type=console_scripts
+# black.entrypoint=black
+# black.options=-l 79
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

src/server/alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

src/server/alembic/env.py

@@ -0,0 +1,77 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

src/server/alembic/script.py.mako

@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}

src/server/alembic/versions/36c4ecbfd11a_add_pdp_users_full_name.py

@@ -0,0 +1,24 @@
+"""Add pdp_users full_name
+
+Revision ID: 36c4ecbfd11a
+Revises: 7138d52f92d6
+Create Date: 2020-12-18 15:28:17.367718
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "36c4ecbfd11a"
+down_revision = "7138d52f92d6"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("pdp_users", sa.Column("full_name", sa.String))
+
+
+def downgrade():
+    pass