Merge pull request #38 from Amsterdam/pre-release/3.1.2

Pre release/3.1.2
Amsterdam · Jun 12, 2020 · 67b885c · 67b885c
2 parents f8b8a9e + bf8d8aa
commit 67b885c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/deploy/import/docker-import-db.sh b/deploy/import/docker-import-db.sh
@@ -8,13 +8,13 @@ set -x   # log every command.
 python manage.py migrate
 # Do full import. Delete all data
 
-if [ "$BOUWDOSSIERS_OBJECTSTORE_CONTAINER" = "dossiers_acceptance" ]
-then
-   python manage.py run_import --delete --skip_validate_import --skipimport --skip_add_bag_ids
-   python manage.py run_import --skip_validate_import 
-   python manage.py run_import --wabo --skip_validate_import --skip_add_bag_ids
-else
-   python manage.py run_import --delete --skip_validate_import --skipimport --skip_add_bag_ids
-   python manage.py run_import --min_bouwdossiers_count ${MIN_BOUWDOSSIERS_COUNT}
-   python manage.py run_import --wabo --skip_add_bag_ids --min_bouwdossiers_count ${MIN_BOUWDOSSIERS_COUNT}
-fi
+#if [ "$BOUWDOSSIERS_OBJECTSTORE_CONTAINER" = "dossiers_acceptance" ]
+#then
+python manage.py run_import --delete --skip_validate_import --skipimport --skip_add_bag_ids
+python manage.py run_import --skip_validate_import
+python manage.py run_import --wabo --skip_validate_import --skip_add_bag_ids
+#else
+#   python manage.py run_import --delete --skip_validate_import --skipimport --skip_add_bag_ids
+#   python manage.py run_import --min_bouwdossiers_count ${MIN_BOUWDOSSIERS_COUNT}
+#   python manage.py run_import --wabo --skip_add_bag_ids --min_bouwdossiers_count ${MIN_BOUWDOSSIERS_COUNT}
+#fi
diff --git a/src/bouwdossiers/batch.py b/src/bouwdossiers/batch.py
@@ -469,6 +469,11 @@ def validate_import(min_bouwdossiers_count):
                 result['has_openbareruimte_id'] += row[0]
     log.info('Validation import result: ' + str(result))
 
+    log.info(
+        f"{result['has_panden']} number of records of a total of {result['total']} records"
+        f" ({result['has_panden'] / result['total'] * 100}%) has one or more panden."
+        f" The required minimum is {0.8 * result['total']} (80%)."
+    )
     assert result['total'] > min_bouwdossiers_count, \
         f'Imported total of {result["total"]} bouwdossiers is less than the required number {min_bouwdossiers_count}'
     assert result['has_panden'] > 0.8 * result['total'], \