feat(spp_hazard): CAP vocabulary severity and alert ingestion, with upgrade migration (re-land from #76)#274
feat(spp_hazard): CAP vocabulary severity and alert ingestion, with upgrade migration (re-land from #76)#274gonzalesedwin1123 wants to merge 8 commits into
Conversation
There was a problem hiding this comment.
Code Review
This pull request migrates hazard incident severity tracking from a hardcoded 1-5 Selection to a CAP v1.2 vocabulary code, introducing new CAP-aligned fields (urgency, certainty, message type, and event) and robust alert ingestion methods that automatically create or update incidents and geofences from GeoJSON alerts. It also includes a post-migration script to backfill legacy severity values and updates related tests, views, and demo generators across dependent modules. The review feedback highlights three important improvements: making the _parse_datetime_string helper robust against already-parsed datetime objects, wrapping the PostGIS intersection query in a savepoint to prevent transaction aborts on database errors, and restricting the migration's column existence check to the active schema to avoid false positives.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
…ion (from #76) Re-lands the spp_hazard severity->vocabulary change from reverted PR #76, together with the dependent adaptations in spp_drims, spp_drims_sl_demo and spp_hazard_programs, plus the two fixes the original PR lacked: - migrations/19.0.2.1.0/post-migration.py backfills severity_id / severity_override_id from the legacy 1-5 Selection columns for databases upgrading from v19.0.2.0.x (release Biliran ships the old schema). Mapping: 1->minor, 2->moderate, 3->severe, 4->severe, 5->extreme. - hazard_demo.xml incident-area records now use severity_override_id vocabulary refs; the stale severity_override field broke demo installs. Includes migration regression tests (mapping, area override, idempotency, unmapped values, fresh-install no-op).
…enerate READMEs Semgrep flagged f-string SQL in the severity migration; identifiers were constants but composed SQL via psycopg2.sql removes the pattern entirely. READMEs regenerated from the updated HISTORY fragments (in-scope modules only).
3beb190 to
8a74908
Compare
Applies CI's pinned-renderer output for spp_hazard README/index.html and ruff-format's line join in the migration test, taken verbatim from the CI pre-commit diff.
The flagged query composes identifiers from an in-file constant via psycopg2.sql.Identifier; no external input reaches it.
Replaces psycopg2.sql identifier composition with fully literal queries per target table (only two targets), removing the pattern that pylint-odoo and semgrep flag. Values remain parameterized.
The local generator env renders RST table widths differently; CI's output (taken verbatim from its pre-commit diff) is authoritative. Committed without running local hooks so the README hook cannot rewrite it back.
CI's oca-gen-addon-readme regenerates these five untouched modules on this PR's merge ref (deterministic target blobs across runs). Content is CI's own printed diff, applied verbatim; docs-only, no code changes. Committed without local hooks so the local renderer cannot rewrite it.
- _parse_datetime_string accepts datetime instances (avoids TypeError on programmatic values). - Area-linking query wrapped in a savepoint so an invalid geometry cannot leave the transaction aborted for subsequent operations. - Migration column check scoped to current_schema() to avoid false positives from same-named tables in other schemas.
|
All three gemini-code-assist findings applied (commit 4bf883d):
|
Re-lands the spp_hazard portion of reverted PR #76 (revert: #271), together with the dependent adaptations and the fixes whose absence triggered the revert discussion. Everything listed is contained in THIS PR's diff.
Summary
spp.hazard.incident.severity(1-5 Selection) becomesseverity_id, aspp.vocabulary.codeMany2one on the CAP v1.2 severity vocabulary;severity_overrideon incident areas becomesseverity_override_idlikewise.create_incident_from_alert(creates hazard-zone geofences, auto-links intersecting areas); incidentuuid.spp_drims(effective_severity_id, numeric choropleth severity),spp_drims_sl_demo(scenario severity resolution),spp_hazard_programs(program view).Added on top of #76 (not in the original)
spp_hazard 19.0.2.1.0): backfillsseverity_id/severity_override_idfrom the legacy Selection columns for databases upgrading from v19.0.2.0.x (release Biliran ships the old schema). Label-faithful mapping: 1→minor, 2→moderate, 3→severe (CAP defines severe as 'Significant threat'), 4→severe, 5→extreme. Idempotent; never overwrites values; unmapped values logged and left empty; no-op on fresh installs; column check scoped tocurrent_schema(). Fully literal, value-parameterized SQL. Regression tests included.severity_overridefield, breaking fresh installs with demo data; they now useseverity_override_idvocabulary refs._parse_datetime_stringacceptsdatetimeinstances; the area-linking query runs inside a savepoint so an invalid geometry cannot leave the transaction aborted; migration column check scoped to current schema.spp_api_v2_gis,spp_change_request_v2,spp_drims_sl,spp_gis_indicators,spp_security) carry CI-rendered README/index.html updates — CI's pinned generator demanded them on this ref (deterministic output applied verbatim from its diff). Generated files only, no code.Not in this PR
Other #76 pieces are re-landed separately: #273 (gis/geofence), #275 (cel-domain), #276 (api-v2), #277 (PHL demo), #278 (infra, merged), #279–#282 (waves 2-5).
Verification
./spp t spp_hazard: 87 passed, 0 failed (includes 5 migration regression tests)./spp t spp_drims: 250/0,spp_drims_sl_demo: 8/0,spp_hazard_programs: 24/0