Merge pull request #54 from nrccua/DS-110-fix-fice-enrolled-logic-error

fix error in EFI code
nrccua · Oct 21, 2021 · 2437c2a · 2437c2a
2 parents ff7b396 + 4178062
commit 2437c2a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@ History
 =======
 
 
+v0.15.2 (2021-10-13)
+
+* Fix error in FICE enrolled logic by setting enrolled field instead of confirmed.
+
+
 v0.15.1 (2021-10-13)
 
 * Improve shared EFI code by creating base functions for Datalab File Upload to use without using a list of one item.

diff --git a/aioradio/file_ingestion.py b/aioradio/file_ingestion.py
@@ -976,7 +976,7 @@ def apply_fice_enrolled_logic_efi(self, records: list[list[str]], fice: str, hea
             canceled = records[header_to_index['Canceled']]
             dropped = records[header_to_index['Dropped']]
             for idx in range(len(records[0])):
-                confirmed[idx] = self.apply_fice_enrolled_logic(fice, confirmed[idx], enrolled[idx], canceled[idx], dropped[idx])
+                enrolled[idx] = self.apply_fice_enrolled_logic(fice, confirmed[idx], enrolled[idx], canceled[idx], dropped[idx])
 
 
 def async_wrapper(func: coroutine) -> Any:

diff --git a/aioradio/requirements.txt b/aioradio/requirements.txt
@@ -6,9 +6,9 @@ ddtrace==0.54.1
 fakeredis==1.6.1
 flask==2.0.2
 flask-cors==3.0.10
-httpx==0.19.0
+httpx==0.20.0
 mandrill==1.0.60
-moto==2.2.9
+moto==2.2.10
 numpy==1.21.2
 orjson==3.6.4
 pre-commit==2.15.0

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     long_description = fileobj.read()
 
 setup(name='aioradio',
-    version='0.15.1',
+    version='0.15.2',
     description='Generic asynchronous i/o python utilities for AWS services (SQS, S3, DynamoDB, Secrets Manager), Redis, MSSQL (pyodbc), JIRA and more',
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -27,7 +27,7 @@
         'fakeredis>=1.6.1',
         'httpx>=0.19.0',
         'mandrill>=1.0.60',
-        'numpy>=1.21.2',
+        'numpy>=1.19',
         'orjson>=3.6.4',
         'psycopg2-binary==2.9.1',
         'pysmb>=1.2.7',