Merge branch 'main' into kc/APP-675-JSON-API-plumbing

Author: krista-skylight

apps/report-execution/src/libraries/nbs_custom.py

@@ -19,7 +19,4 @@ def execute(
 
     header = f'Custom Report For Table: {data_source_name}'
 
-    # TODO: datetimes are formatted '%0m/%0d/%Y %0H:%0M:%0S' in sas. # noqa: FIX002
-    # Should this be a util/post processing/sql step in python land?
-
     return ReportResult(content_type='table', content=content, header=header)

apps/report-execution/tests/integration/assets/tablefaker_schema/dm_inv_std.yaml

@@ -0,0 +1,15 @@
+config:
+  seed: 19
+  nbs:
+    fk_tables: []
+
+tables:
+  - table_name: "[RDB].[dbo].[DM_INV_STD]"
+    row_count: 500
+    columns:
+      - column_name: program_jurisdiction_oid
+        data: random.choice(["1300400010", "1300400011", "1300400008", "1300400009", "1300400014", "1300400015", "1300400012"])
+      - column_name: PATIENT_LOCAL_ID
+        data: random.choice(["PSN20067002GA01", "PSN30076044GA01", "PSN10082059GA01", "PSN10087055GA01", "PSN10087069GA01", "PSN10087071GA01", "PSN10088042GA01", "PSN10089067GA01", "PSN10089161GA01", "PSN10094077GA01", "PSN10094080GA01"])
+      - column_name: EVENT_DATE
+        data: fake.date_between(start_date=date(2018, 5, 5), end_date=date(2025, 1, 5))

apps/report-execution/tests/integration/libraries/nbs_custom.py

@@ -1,34 +1,83 @@
+import datetime
+import decimal
+
 import pytest
+import yaml
 
 from src.execute_report import execute_report
 from src.models import ReportSpec
 
+faker_schema = 'dm_inv_std.yaml'
+
 
-@pytest.mark.usefixtures('setup_containers')
+@pytest.mark.usefixtures('setup_containers', 'fake_db_table')
 @pytest.mark.integration
 class TestIntegrationNbsCustomLibrary:
     """Integration tests for the nbs_custom library."""
 
-    def test_execute_report(self):
+    def test_execute_report_check_data(self, snapshot):
         report_spec = ReportSpec.model_validate(
             {
                 'is_export': True,
                 'is_builtin': True,
                 'report_title': 'NBS Custom',
                 'library_name': 'nbs_custom',
-                # Filter operator is used here as it is a stable, small table
-                'data_source_name': '[NBS_ODSE].[dbo].[Filter_operator]',
-                'subset_query': 'SELECT * FROM [NBS_ODSE].[dbo].[Filter_operator]',
+                'data_source_name': '[NBS_RDB].[dbo].[DM_INV_STD]',
+                'subset_query': """
+                        SELECT PROGRAM_JURISDICTION_OID,
+                               PATIENT_LOCAL_ID,
+                               EVENT_DATE
+                        FROM rdb.dbo.DM_INV_STD
+                        ORDER BY PROGRAM_JURISDICTION_OID,
+                                 PATIENT_LOCAL_ID,
+                                 EVENT_DATE
+                """,
             }
         )
 
         result = execute_report(report_spec)
-        assert result.header == (
-            'Custom Report For Table: [NBS_ODSE].[dbo].[Filter_operator]'
+        assert result.content_type == 'table'
+
+        data = result.content.data
+        assert len(data) == 500
+        assert len(data[0]) == len(result.content.columns)
+        assert result.content.columns == [
+            'PROGRAM_JURISDICTION_OID',
+            'PATIENT_LOCAL_ID',
+            'EVENT_DATE',
+        ]
+
+        snapshot.assert_match(yaml.dump(data), 'snapshot.yml')
+
+        for data in result.content.data:
+            assert isinstance(data[0], decimal.Decimal)
+            assert isinstance(data[1], str)
+            assert isinstance(data[2], datetime.datetime)
+
+    def test_execute_report_no_data(self, snapshot):
+        report_spec = ReportSpec.model_validate(
+            {
+                'is_export': True,
+                'is_builtin': True,
+                'report_title': 'NBS Custom',
+                'library_name': 'nbs_custom',
+                'data_source_name': '[NBS_RDB].[dbo].[DM_INV_STD]',
+                'subset_query': """
+                        SELECT PROGRAM_JURISDICTION_OID,
+                               PATIENT_LOCAL_ID,
+                               EVENT_DATE
+                        FROM rdb.dbo.DM_INV_STD
+                        WHERE 1 = 2
+                """,
+            }
         )
-        assert result.subheader is None
-        assert result.description is None
+
+        result = execute_report(report_spec)
         assert result.content_type == 'table'
 
-        assert len(result.content.data) == 11
-        assert len(result.content.data[0]) == len(result.content.columns)
+        assert len(result.content.data) == 0
+        assert result.content.columns == [
+            'PROGRAM_JURISDICTION_OID',
+            'PATIENT_LOCAL_ID',
+            'EVENT_DATE',
+        ]