# HG changeset patch # User Tom Gottfried # Date 1585156202 -3600 # Node ID e21cbb9768a25c658ed4c3e131b04153d9b19a7c # Parent f59ba73ff6924c72590e5b4edaeeef6f541342b5 Prevent duplicate fairway areas In principal, there can be only one or no fairway area at each point on the map. Since polygons from real data will often be topologically inexact, just disallow equal geometries. This will also help to avoid importing duplicates with concurrent imports, once the history of fairway dimensions will be preserved. diff -r f59ba73ff692 -r e21cbb9768a2 pkg/pgxutils/errors.go --- a/pkg/pgxutils/errors.go Wed Mar 25 09:37:04 2020 +0100 +++ b/pkg/pgxutils/errors.go Wed Mar 25 18:10:02 2020 +0100 @@ -132,6 +132,13 @@ c = http.StatusConflict return } + case "fairway_dimensions": + switch err.ConstraintName { + case "fairway_dimensions_area_unique": + m = "Duplicate fairway area" + c = http.StatusConflict + return + } } } case exclusionViolation: diff -r f59ba73ff692 -r e21cbb9768a2 schema/gemma.sql --- a/schema/gemma.sql Wed Mar 25 09:37:04 2020 +0100 +++ b/schema/gemma.sql Wed Mar 25 18:10:02 2020 +0100 @@ -721,6 +721,9 @@ CREATE TRIGGER fairway_dimensions_date_info BEFORE UPDATE ON fairway_dimensions FOR EACH ROW EXECUTE PROCEDURE update_date_info() + CREATE CONSTRAINT TRIGGER fairway_dimensions_area_unique + AFTER INSERT OR UPDATE OF area, staging_done ON fairway_dimensions + FOR EACH ROW EXECUTE FUNCTION prevent_st_equals('area', 'staging_done') -- -- Bottlenecks diff -r f59ba73ff692 -r e21cbb9768a2 schema/gemma_tests.sql --- a/schema/gemma_tests.sql Wed Mar 25 09:37:04 2020 +0100 +++ b/schema/gemma_tests.sql Wed Mar 25 18:10:02 2020 +0100 @@ -52,3 +52,38 @@ $$, 23505, NULL, 'No duplicate geometries can be inserted into waterway_area'); + +SELECT throws_ok($$ + INSERT INTO waterway.fairway_dimensions ( + area, level_of_service, + min_width, max_width, min_depth, source_organization + ) VALUES ( + ST_GeogFromText('MULTIPOLYGON(((0 0, 1 1, 1 0, 0 0)))'), 3, + 100, 200, 2, 'test' + ), ( + ST_GeogFromText('MULTIPOLYGON(((0 0, 1 1, 1 0, 0 0)))'), 3, + 100, 200, 2, 'test' + ) + $$, + 23505, NULL, + 'No duplicate geometries can be inserted into fairway_dimensions'); + +SELECT lives_ok($$ + INSERT INTO waterway.fairway_dimensions ( + area, level_of_service, + min_width, max_width, min_depth, source_organization, staging_done + ) VALUES ( + ST_GeogFromText('MULTIPOLYGON(((0 0, 1 1, 1 0, 0 0)))'), 3, + 100, 200, 2, 'test', false + ), ( + ST_GeogFromText('MULTIPOLYGON(((0 0, 1 1, 1 0, 0 0)))'), 3, + 100, 200, 2, 'test', true + ) + $$, + 'Duplicate fairway area can be inserted if stage_done differs'); + +SELECT throws_ok($$ + UPDATE waterway.fairway_dimensions SET staging_done = true + $$, + 23505, NULL, + 'No duplicate fairway area can be released from staging area'); diff -r f59ba73ff692 -r e21cbb9768a2 schema/run_tests.sh --- a/schema/run_tests.sh Wed Mar 25 09:37:04 2020 +0100 +++ b/schema/run_tests.sh Wed Mar 25 18:10:02 2020 +0100 @@ -80,7 +80,7 @@ -c 'SET client_min_messages TO WARNING' \ -c "DROP ROLE IF EXISTS $TEST_ROLES" \ -f "$BASEDIR"/tap_tests_data.sql \ - -c "SELECT plan(85 + ( + -c "SELECT plan(88 + ( SELECT count(*)::int FROM information_schema.tables WHERE table_schema = 'waterway'))" \ diff -r f59ba73ff692 -r e21cbb9768a2 schema/updates/1431/01.prevent_equal_fairway_areas.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1431/01.prevent_equal_fairway_areas.sql Wed Mar 25 18:10:02 2020 +0100 @@ -0,0 +1,4 @@ +CREATE CONSTRAINT TRIGGER fairway_dimensions_area_unique + AFTER INSERT OR UPDATE OF area, staging_done + ON waterway.fairway_dimensions + FOR EACH ROW EXECUTE FUNCTION prevent_st_equals('area', 'staging_done'); diff -r f59ba73ff692 -r e21cbb9768a2 schema/version.sql --- a/schema/version.sql Wed Mar 25 09:37:04 2020 +0100 +++ b/schema/version.sql Wed Mar 25 18:10:02 2020 +0100 @@ -1,1 +1,1 @@ -INSERT INTO gemma_schema_version(version) VALUES (1430); +INSERT INTO gemma_schema_version(version) VALUES (1431);