mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-01 07:35:34 -05:00
Reject unapproved broadcast upon cancel API request
When a service sends us a cancel broadcast XML via API, if that broadcast was not approved yet, reject it.
This commit is contained in:
@@ -35,6 +35,41 @@ WAINFLEET = """
|
||||
</alert>
|
||||
"""
|
||||
|
||||
WAINFLEET_CANCEL = """
|
||||
<alert xmlns="urn:oasis:names:tc:emergency:cap:1.2">
|
||||
<identifier>5fc99d720abb86020b233422a503af78E</identifier>
|
||||
<sender>www.gov.uk/environment-agency</sender>
|
||||
<sent>2020-02-16T23:02:26-00:00</sent>
|
||||
<status>Actual</status>
|
||||
<msgType>Cancel</msgType>
|
||||
<source>Flood warning service</source>
|
||||
<scope>Public</scope>
|
||||
<code></code>
|
||||
<references>www.gov.uk/environment-agency,50385fcb0ab7aa447bbd46d848ce8466E,2020-02-16T23:01:13-00:00</references>
|
||||
<info>
|
||||
<language>en-GB</language>
|
||||
<category>Met</category>
|
||||
<event><![CDATA[Remove Severe Flood Warning - Cell Broadcast]]></event>
|
||||
<urgency>Immediate</urgency>
|
||||
<severity>Severe</severity>
|
||||
<certainty>Likely</certainty>
|
||||
<expires>2020-02-16T23:30:13-00:00</expires>
|
||||
<senderName>Environment Agency</senderName>
|
||||
<description>Cancel Warning</description>
|
||||
<web>https://flood-warning-information.service.gov.uk</web>
|
||||
<contact>0345 988 1188</contact>
|
||||
<area>
|
||||
<areaDesc>River Steeping in Wainfleet All Saints</areaDesc>
|
||||
<polygon>53.10569,0.24453 53.10593,0.24430 53.10601,0.24375 53.10615,0.24349 53.10629,0.24356 53.10656,0.24336 53.10697,0.24354 53.10684,0.24298 53.10694,0.24264 53.10721,0.24302 53.10752,0.24310 53.10777,0.24308 53.10805,0.24320 53.10803,0.24187 53.10776,0.24085 53.10774,0.24062 53.10702,0.24056 53.10679,0.24088 53.10658,0.24071 53.10651,0.24049 53.10656,0.24022 53.10642,0.24022 53.10632,0.24052 53.10629,0.24082 53.10612,0.24093 53.10583,0.24133 53.10564,0.24178 53.10541,0.24282 53.10569,0.24453</polygon>
|
||||
<geocode>
|
||||
<valueName>TargetAreaCode</valueName>
|
||||
<value>053FWFSTEEP4</value>
|
||||
</geocode>
|
||||
</area>
|
||||
</info>
|
||||
</alert>
|
||||
"""
|
||||
|
||||
UPDATE = """
|
||||
<alert xmlns="urn:oasis:names:tc:emergency:cap:1.2">
|
||||
<identifier>PAAQ-4-mg5a94</identifier>
|
||||
@@ -118,89 +153,6 @@ UPDATE = """
|
||||
</alert>
|
||||
"""
|
||||
|
||||
CANCEL = """
|
||||
<alert xmlns="urn:oasis:names:tc:emergency:cap:1.2">
|
||||
<identifier>PAAQ-4-mg5a94</identifier>
|
||||
<sender>wcatwc@noaa.gov</sender>
|
||||
<sent>2013-01-05T10:58:23-00:00</sent>
|
||||
<status>Actual</status>
|
||||
<msgType>Cancel</msgType>
|
||||
<source>WCATWC</source>
|
||||
<scope>Public</scope>
|
||||
<code>IPAWSv1.0</code>
|
||||
<references>wcatwc@noaa.gov,PAAQ-1-mg5a94,2013-01-05T09:01:16-00:00 wcatwc@noaa.gov,PAAQ-2-mg5a94,2013-01-05T09:30:16-00:00 wcatwc@noaa.gov,PAAQ-3-mg5a94,2013-01-05T10:17:31-00:00</references>
|
||||
<incidents>mg5a94</incidents>
|
||||
<info>
|
||||
<category>Geo</category>
|
||||
<event>Tsunami Cancellation</event>
|
||||
<responseType>None</responseType>
|
||||
<urgency>Past</urgency>
|
||||
<severity>Unknown</severity>
|
||||
<certainty>Unlikely</certainty>
|
||||
<onset>2013-01-05T10:58:23-00:00</onset>
|
||||
<expires>2013-01-05T10:58:23-00:00</expires>
|
||||
<senderName>NWS West Coast/Alaska Tsunami Warning Center Palmer AK</senderName>
|
||||
<headline>The tsunami Warning is canceled for the coastal areas of British Columbia and Alaska from the north tip of Vancouver Island, British Columbia to Cape Fairweather, Alaska (80 miles SE of Yakutat).</headline>
|
||||
<description>The tsunami Warning is canceled for the coastal areas of British Columbia and Alaska from the north tip of Vancouver Island, British Columbia to Cape Fairweather, Alaska (80 miles SE of Yakutat). - Event details: Preliminary magnitude 7.5 (Mw) earthquake / Lat: 55.300, Lon: -134.900 at 2013-01-05T08:58:20Z Tsunami cancellations indicate the end of the damaging tsunami threat. A cancellation is issued after an evaluation of sea level data confirms that a destructive tsunami will not impact the alerted region, or after tsunami levels have subsided to non-damaging levels. </description>
|
||||
<instruction>Recommended Actions: Do not re-occupy hazard zones until local emergency officials indicate it is safe to do so. This will be the last West Coast/Alaska Tsunami Warning Center message issued for this event. Refer to the internet site ntwc.arh.noaa.gov for more information. </instruction>
|
||||
<web>http://ntwc.arh.noaa.gov/events/PAAQ/2013/01/05/mg5a94/4/WEAK51/WEAK51.txt</web>
|
||||
<parameter>
|
||||
<valueName>EventLocationName</valueName>
|
||||
<value>95 miles NW of Dixon Entrance, Alaska</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>EventPreliminaryMagnitude</valueName>
|
||||
<value>7.5</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>EventPreliminaryMagnitudeType</valueName>
|
||||
<value>Mw</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>EventOriginTime</valueName>
|
||||
<value>2013-01-05T08:58:20-00:00</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>EventDepth</valueName>
|
||||
<value>5 kilometers</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>EventLatLon</valueName>
|
||||
<value>55.300,-134.900 0.000</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>VTEC</valueName>
|
||||
<value>/O.CAN.PAAQ.TS.W.0001.000000T0000Z-000000T0000Z/</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>NWSUGC</valueName>
|
||||
<value>BCZ220-210-922-912-921-911-110-AKZ026>029-023-024-019>022-025-051258-</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>ProductDefinition</valueName>
|
||||
<value>Tsunami cancellations indicate the end of the damaging tsunami threat. A cancellation is issued after an evaluation of sea level data confirms that a destructive tsunami will not impact the alerted region, or after tsunami levels have subsided to non-damaging levels. </value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>WEAK51</valueName>
|
||||
<value>Public Tsunami Warnings, Watches, and Advisories for AK, BC, and US West Coast</value>
|
||||
</parameter>
|
||||
<parameter>
|
||||
<valueName>EAS-ORG</valueName>
|
||||
<value>WXR</value>
|
||||
</parameter>
|
||||
<resource>
|
||||
<resourceDesc>Event Data as a JSON document</resourceDesc>
|
||||
<mimeType>application/json</mimeType>
|
||||
<uri>http://ntwc.arh.noaa.gov/events/PAAQ/2013/01/05/mg5a94/4/WEAK51/PAAQ.json</uri>
|
||||
</resource>
|
||||
<area>
|
||||
<areaDesc>95 miles NW of Dixon Entrance, Alaska</areaDesc>
|
||||
<circle>55.3,-134.9 0.0</circle>
|
||||
</area>
|
||||
</info>
|
||||
</alert>
|
||||
"""
|
||||
|
||||
WITH_PLACEHOLDER_FOR_CONTENT = """
|
||||
<alert xmlns="urn:oasis:names:tc:emergency:cap:1.2">
|
||||
<identifier>50385fcb0ab7aa447bbd46d848ce8466E</identifier>
|
||||
|
||||
@@ -119,6 +119,50 @@ def test_valid_post_cap_xml_broadcast_returns_201(
|
||||
assert response_json['updated_at'] is None
|
||||
|
||||
|
||||
def test_valid_cancel_broadcast_request_rejects_unapproved_alert_and_returns_201(
|
||||
client,
|
||||
sample_broadcast_service,
|
||||
):
|
||||
auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id)
|
||||
|
||||
# create a broadcast
|
||||
response_for_create = client.post(
|
||||
path='/v2/broadcast',
|
||||
data=sample_cap_xml_documents.WAINFLEET,
|
||||
headers=[('Content-Type', 'application/cap+xml'), auth_header],
|
||||
)
|
||||
assert response_for_create.status_code == 201
|
||||
|
||||
response_json_for_create = json.loads(response_for_create.get_data(as_text=True))
|
||||
|
||||
assert response_json_for_create['cancelled_at'] is None
|
||||
assert response_json_for_create['cancelled_by_id'] is None
|
||||
assert response_json_for_create['reference'] == '50385fcb0ab7aa447bbd46d848ce8466E'
|
||||
assert response_json_for_create['status'] == 'pending-approval'
|
||||
|
||||
# cancel broadcast
|
||||
response_for_cancel = client.post(
|
||||
path='/v2/broadcast',
|
||||
data=sample_cap_xml_documents.WAINFLEET_CANCEL,
|
||||
headers=[('Content-Type', 'application/cap+xml'), auth_header],
|
||||
)
|
||||
assert response_for_cancel.status_code == 201
|
||||
|
||||
response_json_for_reject = json.loads(response_for_cancel.get_data(as_text=True))
|
||||
|
||||
assert response_json_for_reject['reference'] == response_json_for_create['reference']
|
||||
assert response_json_for_reject['status'] == 'rejected'
|
||||
assert response_json_for_reject['updated_at'] is not None
|
||||
|
||||
|
||||
def test_valid_cancel_broadcast_request_cancels_active_alert_and_returns_201():
|
||||
pass
|
||||
|
||||
|
||||
def test_cancel_request_does_not_cancel_broadcast_if_reference_does_not_match():
|
||||
pass
|
||||
|
||||
|
||||
def test_large_polygon_is_simplified(
|
||||
client,
|
||||
sample_broadcast_service,
|
||||
@@ -191,32 +235,22 @@ def test_invalid_post_cap_xml_broadcast_returns_400(
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.parametrize('xml_document, expected_error_message', (
|
||||
(sample_cap_xml_documents.CANCEL, (
|
||||
'msgType Cancel is not one of [Alert]'
|
||||
)),
|
||||
(sample_cap_xml_documents.UPDATE, (
|
||||
'msgType Update is not one of [Alert]'
|
||||
)),
|
||||
))
|
||||
def test_unsupported_message_types_400(
|
||||
client,
|
||||
sample_broadcast_service,
|
||||
xml_document,
|
||||
expected_error_message,
|
||||
):
|
||||
auth_header = create_service_authorization_header(service_id=sample_broadcast_service.id)
|
||||
|
||||
response = client.post(
|
||||
path='/v2/broadcast',
|
||||
data=xml_document,
|
||||
data=sample_cap_xml_documents.UPDATE,
|
||||
headers=[('Content-Type', 'application/cap+xml'), auth_header],
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert {
|
||||
'error': 'ValidationError',
|
||||
'message': expected_error_message,
|
||||
'message': 'msgType Update is not one of [Alert, Cancel]',
|
||||
} in (
|
||||
json.loads(response.get_data(as_text=True))['errors']
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user