Merge main into QA -- updated patron_home_library_code treatment

Author: aaronfriedman6

.github/workflows/deploy-production.yml

@@ -30,17 +30,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
           aws-region: us-east-1
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push image to Amazon ECR
         env:

.github/workflows/deploy-qa.yml

@@ -30,17 +30,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole
           aws-region: us-east-1
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push image to Amazon ECR
         env:

.github/workflows/run-tests.yml

@@ -1,8 +1,8 @@
 name: Run Python unit tests
 
-on: 
+on:
   pull_request:
-    actions: [ opened ]
+    types: [ labeled, unlabeled, opened, reopened, synchronize ]
 
 jobs:
   changelog:
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v4

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2024-06-21 -- v1.1.0
+### Fixed
+- Handle patron_home_library_code in standardized way (convert empty strings and 'none' to NULL)
+
 ## 2023-07-12 -- v1.0.1
 ### Fixed
 - Increase max Sierra query attempts to 10

Makefile

@@ -8,14 +8,14 @@ help:
 	@echo "make test"
 	@echo "    run associated test suite with pytest"
 	@echo "make lint"
-	@echo "    lint project files using the flake8 linter"
+	@echo "    lint project files using the black linter"
 
 run:
 	export ENVIRONMENT=devel; \
 	python main.py
 
 test:
-	pytest
+	pytest tests
 
 lint:
-	flake8 --exclude *env
+	black ./ --check --exclude="(env/)|(tests/)"

helpers/query_helper.py

@@ -1,29 +1,33 @@
 import os
 
-_ENVISIONWARE_QUERY = '''
+_ENVISIONWARE_QUERY = """
     SELECT
-        pcrKey, pcrUserID, pcrMinutesUsed, pcrDateTime, pcrBranch,
-        pcrArea, pcrUserData1
+        pcrKey, pcrUserID, pcrMinutesUsed, pcrDateTime, pcrBranch, pcrArea, pcrUserData1
     FROM strad_bci
     WHERE pcrDateTime > '{date_time}'
         OR (pcrDateTime = '{date_time}' AND pcrKey > {key})
-    ORDER BY pcrDateTime, pcrKey LIMIT {limit};'''
-
-_SIERRA_QUERY = '''
-    SELECT barcode, id, ptype_code, home_library_code, pcode3
+    ORDER BY pcrDateTime, pcrKey
+    LIMIT {limit};"""
+
+_SIERRA_QUERY = """
+    SELECT 
+        barcode, id, ptype_code, pcode3,
+        CASE WHEN LENGTH(TRIM(home_library_code)) = 0
+            OR TRIM(home_library_code) = 'none' THEN NULL
+            ELSE TRIM(home_library_code) END
     FROM sierra_view.patron_view
-    WHERE barcode IN ({});'''
+    WHERE barcode IN ({});"""
 
-_REDSHIFT_QUERY = '''
+_REDSHIFT_QUERY = """
     SELECT patron_id, postal_code, geoid
     FROM {table}
-    WHERE patron_id IN ({ids});'''
+    WHERE patron_id IN ({ids});"""
 
 
 def build_envisionware_query(date_time, key):
     return _ENVISIONWARE_QUERY.format(
-        date_time=date_time, key=key,
-        limit=os.environ['ENVISIONWARE_BATCH_SIZE'])
+        date_time=date_time, key=key, limit=os.environ["ENVISIONWARE_BATCH_SIZE"]
+    )
 
 
 def build_sierra_query(barcodes):