Entity Org Summary
@@ -148,7 +148,17 @@
entity-organisation.csv
{{ entity_org_warning }}
- {% else %}
+ {% elif entity_org_overlap_info %}
+
+ {{ entity_org_overlap_info }}
+
+ {% elif entity_org_error_warning %}
+
+
+ {{ entity_org_error_warning }}
+
+
+ {% elif has_entity_org and entity_org_table_params %}
{{ table(entity_org_table_params) }}
diff --git a/config/config.py b/config/config.py
index 2cf1d1d..7648c3e 100644
--- a/config/config.py
+++ b/config/config.py
@@ -101,8 +101,8 @@ def get_request_api_endpoint():
mapping = {
"local": "http://localhost:8000",
"development": "https://pub-async.development.planning.data.gov.uk",
- "staging": "http://staging-pub-async-api-lb-12493311.eu-west-2.elb.amazonaws.com",
- "production": "http://production-pub-async-api-lb-636110663.eu-west-2.elb.amazonaws.com",
+ "staging": "https://pub-async.staging.planning.data.gov.uk",
+ "production": "https://pub-async.planning.data.gov.uk",
}
return mapping.get(env, mapping["local"])
diff --git a/tests/unit/blueprints/datamanager/controllers/test_preview.py b/tests/unit/blueprints/datamanager/controllers/test_preview.py
new file mode 100644
index 0000000..83efff4
--- /dev/null
+++ b/tests/unit/blueprints/datamanager/controllers/test_preview.py
@@ -0,0 +1,126 @@
+from application.blueprints.datamanager.controllers.preview import (
+ _build_entity_organisation_summary,
+)
+
+NEW_ENTITIES = [{"entity": "10100002", "reference": "REF001"}]
+
+
+def test_no_new_entities_hides_section():
+ result = _build_entity_organisation_summary([], True, {"entity-organisation": []})
+
+ assert result == (None, False, None, None, None)
+
+
+def test_non_authoritative_is_informational_only():
+ """Non-authoritative just flags the data as such - nothing needs to be created."""
+ (
+ table_params,
+ has_entity_org,
+ warning,
+ overlap_info,
+ error_warning,
+ ) = _build_entity_organisation_summary(
+ NEW_ENTITIES, False, {"entity-organisation": []}
+ )
+
+ assert table_params is None
+ assert has_entity_org is False
+ assert warning == "Non-authoritative data being submitted"
+ assert overlap_info is None
+ assert error_warning is None
+
+
+def test_authoritative_overlap_shows_info_message_only():
+ """Overlap is informational, not a warning, and the table is skipped."""
+ pipeline_summary = {
+ "entity-organisation": [
+ {
+ "dataset": "nature-improvement-area",
+ "organisation": "government-organisation:PB202",
+ "overlap": True,
+ "error": False,
+ }
+ ]
+ }
+
+ (
+ table_params,
+ has_entity_org,
+ warning,
+ overlap_info,
+ error_warning,
+ ) = _build_entity_organisation_summary(NEW_ENTITIES, True, pipeline_summary)
+
+ assert has_entity_org is False
+ assert table_params is None
+ assert warning is None
+ assert overlap_info == "Entity org already exists - no action needed"
+ assert error_warning is None
+
+
+def test_authoritative_error_shows_error_message_only():
+ """Error skips the table too, since there's no trustworthy range to show."""
+ pipeline_summary = {
+ "entity-organisation": [
+ {
+ "dataset": "nature-improvement-area",
+ "organisation": "government-organisation:PB202",
+ "overlap": False,
+ "error": True,
+ }
+ ]
+ }
+
+ (
+ table_params,
+ has_entity_org,
+ warning,
+ overlap_info,
+ error_warning,
+ ) = _build_entity_organisation_summary(NEW_ENTITIES, True, pipeline_summary)
+
+ assert has_entity_org is False
+ assert table_params is None
+ assert warning is None
+ assert overlap_info is None
+ assert error_warning == (
+ "An error occurred creating the entity-organisation csv, "
+ "please re-run if you believe this is required"
+ )
+
+
+def test_authoritative_no_overlap_or_error_shows_table():
+ pipeline_summary = {
+ "entity-organisation": [
+ {
+ "dataset": "nature-improvement-area",
+ "entity-minimum": 10100002,
+ "entity-maximum": 10100002,
+ "organisation": "government-organisation:PB202",
+ "overlap": False,
+ "error": False,
+ }
+ ]
+ }
+
+ (
+ table_params,
+ has_entity_org,
+ warning,
+ overlap_info,
+ error_warning,
+ ) = _build_entity_organisation_summary(NEW_ENTITIES, True, pipeline_summary)
+
+ assert has_entity_org is True
+ assert table_params is not None
+ assert warning is None
+ assert overlap_info is None
+ assert error_warning is None
+
+
+def test_authoritative_no_entity_organisation_data_hides_section():
+ result = _build_entity_organisation_summary(
+ NEW_ENTITIES, True, {"entity-organisation": []}
+ )
+
+ assert result == (None, False, None, None, None)