Pass stats to the template regardless of upload success

diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py
index d1a439089f21d6c18e6ed1c45a1fc417f59f486f..55ec65a775039f1e2f4de2c42e03a028b07661c2 100644 (file)
--- a/src/pgwui_bulk_upload/views/bulk_upload.py
+++ b/src/pgwui_bulk_upload/views/bulk_upload.py
@@ -581,7 +581,9 @@ class BulkTableUploadHandler(BaseTableUploadHandler):
         return SaveBulkLine(self.ue, self, self.insert_map())
 
     def stats(self):
-        return self.data.stats()
+        if self.data:
+            return self.data.stats()
+        return []
 
 
 def statmap(stats):
@@ -596,7 +598,9 @@ def statmap(stats):
 def inserted_rows(stats, response):
     '''Return the number of rows inserted
     '''
-    return response['lines'] - len(stats)
+    if stats:
+        return response['lines'] - len(stats)
+    return 0
 
 
 def relation_stats(stats, quote_columns):
@@ -644,15 +648,15 @@ def log_success(response, stats, i_rows, r_stats):
 
 
 def analyze_results(uh, response):
-    if response['db_changed']:
-        stats = list(uh.stats())
-        response['stats'] = stats
-        response['statmap'] = statmap(stats)
-        i_rows = inserted_rows(stats, response)
-        response['inserted_rows'] = i_rows
-        r_stats = relation_stats(stats, uh.quote_columns())
-        response['relation_stats'] = r_stats
+    stats = list(uh.stats())
+    response['stats'] = stats
+    response['statmap'] = statmap(stats)
+    i_rows = inserted_rows(stats, response)
+    response['inserted_rows'] = i_rows
+    r_stats = relation_stats(stats, uh.quote_columns())
+    response['relation_stats'] = r_stats
 
+    if response['db_changed']:
         log_success(response, stats, i_rows, r_stats)
 
     return response

diff --git a/tests/views/test_bulk_upload.py b/tests/views/test_bulk_upload.py
index 4dc063a02e5a950469b88a41efd7cd8905943cde..d6c7ad2650fbdc22df9ad81169d541ed38d2b239 100644 (file)
--- a/tests/views/test_bulk_upload.py
+++ b/tests/views/test_bulk_upload.py
@@ -141,33 +141,17 @@ mock_log_success = testing.make_mock_fixture(
 # analyze_results()
 
 
-def test_analyze_results_unchanged(
-        mock_log_success, mock_relation_stats, mock_inserted_rows,
-        mock_statmap, mock_stats, mock_quote_columns):
-    '''Response is returned unchanged, nothing is logged
-    '''
-    response = UNCHANGED_RESPONSE
-
-    uh = bulk_upload.BulkTableUploadHandler(response)
-    mocked_stats = mock_stats(uh)
-    mocked_quote_columns = mock_quote_columns(uh)
-
-    result = bulk_upload.analyze_results(uh, response)
-
-    assert mock_log_success.call_count == 0
-    assert mock_relation_stats.call_count == 0
-    assert mock_inserted_rows.call_count == 0
-    assert mocked_stats.call_count == 0
-    assert mocked_quote_columns.call_count == 0
-    assert result == response
-
-
-def test_analyze_results_changed(
+@pytest.mark.parametrize(
+    ('response', 'log_calls'), [
+        (UNCHANGED_RESPONSE, 0),
+        (CHANGED_RESPONSE, 1)])
+def test_analyze_results(
+        response, log_calls,
         mock_log_success, mock_relation_stats, mock_inserted_rows,
         mock_statmap, mock_stats, mock_quote_columns):
     '''Response is returned unchanged, nothing is logged
     '''
-    response = copy.deepcopy(CHANGED_RESPONSE)
+    response = copy.deepcopy(response)
 
     uh = bulk_upload.BulkTableUploadHandler(response)
     mocked_stats = mock_stats(uh)
@@ -176,17 +160,23 @@ def test_analyze_results_changed(
 
     result = bulk_upload.analyze_results(uh, response)
 
-    assert mock_log_success.call_count == 1
+    assert mock_log_success.call_count == log_calls
     assert mock_relation_stats.call_count == 1
     assert mock_inserted_rows.call_count == 1
     assert mocked_stats.call_count == 1
-    assert mock_statmap.call_count == 1
     assert mocked_quote_columns.call_count == 1
 
     assert 'stats' in result
+    assert 'statmap' in result
     assert 'inserted_rows' in result
     assert 'relation_stats' in result
 
+    del result['stats']
+    del result['statmap']
+    del result['inserted_rows']
+    del result['relation_stats']
+    assert result == response
+
 
 mock_analyze_results = testing.make_mock_fixture(
     bulk_upload, 'analyze_results')