| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
|
|
|
| |
Some of these were occasional failures due to timing issues.
One was due to a hard coded body id meaning the addition of bodies in
other tests meant this was creating two bodies with the same id, which
happened to be used in a test which depended on the bodies having
different ids.
|
|
|
|
|
|
|
| |
- Group wasn’t being set correctly by open311-populate-service-list as cobrand attribute
not being updated for each body.
- Extra metadata was being persisted to the DB every time even if nothing had changed,
causing lots of duplicate entries in contacts_history.
|
| |
|
|
|
|
|
| |
Allows creating scripts that fetch comments for a single body, e.g for
batch updating or because they require special setup.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* Stop red warning being output by S3 bucket creation failure test
* Make sure 'num_old_reports' is always a number on /around pages
* Stop 'category_extra' being generated when unnecessary
* Prevent warning printed in getservicerequestupdates.t
* Prevent info lines from being output in develop.t
* Remove line of #s in root.t
* And an ID diag in zurich.t
|
|
|
|
|
| |
If an Open311 update has a customer_reference property then add that to
the metadata for the problem.
|
| |
|
|
|
|
|
|
| |
A move between fixed states (presumably from fixed-user to fixed-council)
should not count as a state change for the purposes of generating comment
text from templates.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Open311 specification has two values for a report's status:
- open: it has been reported.
- closed: it has been resolved.
FixMyStreet previously mapped 'closed' to 'fixed - council', but this
has been causing issues with Open311 endpoints that want to mark a FMS
report as closed but not fixed. The mySociety Open311 additions
introduce extended statuses, some of which represent a 'closed' state
e.g. duplicate, no_further_action, but there are times when a report
should simply be closed without any indication why - for example, if
open311-adapter is being used to integrate with a council system which
has a closed state not represented by the extended statuses. Marking a
report as 'closed' on a council system and displaying that as 'fixed'
on the FixMyStreet front end is not an ideal situation.
This commit changes the mapping of the Open311 'closed' status to the
'closed' FMS state when extended_statuses is enabled.
|
|
|
|
|
|
|
|
|
|
| |
As Oxfordshire uses local time and not UTC use that when calling the get
update script. Also handle a date with a timezone being passed on the
server side.
And add some tests in for the oxfordshire open311 endpoint
Fixes mysociety/fixmystreet-commercial#1062
|
| |
|
|
|
|
| |
If no text, photo, or state change, hide the update from display.
|
|
|
|
| |
This hopefully works around some odd test failures on Travis.
|
|
|
|
|
|
|
| |
Response templates won't be triggered unless the problem state or
external status code is changed.
Fixes #2075
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, an update's problem_state was set via an Open311 update if:
* the update timestamp was equal or greater to the report's last update;
* the new state was visible, and not equal to the report's current state;
* the update wouldn't change the report from a fixed state to another fixed state;
* (Oxfordshire) the update wouldn't change the report from any open state to Open.
It would also set the report's state to match if the report was currently visible.
This mostly worked, but could lead to issues if e.g. the report started life in
a non-confirmed state (e.g. we pulled it in already fixed from an external
source), as then the update did not record its state and the update display got
confused as to the state history. However it did mean there wasn't confusion if
a later update than the Open311 update was made on the site itself.
This new code will set an update's problem_state if:
* the new state is visible;
* the update wouldn't change the report from a fixed state to another fixed state;
* (Oxfordshire) the update wouldn't change the report from any open state to Open.
It will also set the report's state to match if the report is currently
visible, changing state, and the update timestamp is equal or greater to the
report's last update.
So when the report state changes is unchanged, all the conditions still apply,
but the update's problem_state is set more often (it will be set regardless of
whether the timestamps align, or whether the state matches the report's current
state).
This could theoretically lead to issues elsewhere, e.g. if an update is left on
a report on FixMyStreet and then an Open311 update is pulled in later (but with
an earlier timestamp) that changes the state, the report state will not be
updated due to the later update being made, though the Open311 update will list
the state change, and then the later update might say it changed it back (if it
recorded the current state in its problem_state), even though it technically
did not. I think this issue is less worrying than the current situation, which
can state that a random update has fixed a report when it was the previous
update that did, and there will always be such issues with multiple sources of
truth for a report status. An alternative would be to allow the Open311 update
to override.
|
|/
|
|
|
|
|
|
|
| |
If a body has a `fetch_all_reports` setting in the extra metadata then
all reports are fetched over Open311 and processed regardless of age.
This is useful for bodies where the API endpoint always returns all the
reports as it suppresses the error messages you would otherwise get
about reports with invalid dates.
|
|
|
|
|
|
|
|
| |
FMS uses the Contact->email field for the Open311 service code,
and the Contact->category field is the user-friendly service name.
The wrong value was being compared previously, resulting in all
fetched problems being assigned to the 'Other' category.
|
|
|
|
| |
Also adds script for fetching the last 24hrs of reports
|
| |
|
|
|
|
|
|
|
| |
When pulling reports in over Open311 it's sometimes useful to be able to
accept reports with Easting/Northing rather than latitude/longitude.
This adds an option to GetServiceRequests to convert them as they
come in.
|
| |
|
|
|
|
|
|
|
| |
If the Open311 endpoint provides the external_status_code field
in servicerequestupdates.xml output, it’s stored in each comment’s
extra field as well as the problem’s extra field. This will make it
possible to trigger response templates based on this value.
|
|
|
|
|
| |
We do need to store them, so that the sending knows which fields are being
requested, but we do not want them output to the client at all.
|
|
|
|
|
| |
Add a per body configuration option to allow Open311 updates to contain
only a status change, rather than emitting a warning when this happens.
|
|
|
|
|
|
| |
This is part of the integration with our open311-adapter. The automated
property indicates that it's an expected value but either it's going to
be set by the server, or appear as a hidden field.
|
|
|
|
|
|
|
|
|
|
| |
This enables the display of existing reports from the back end on FMS
if the body is configured to do this.
Reports will not be created if they are missing an id, a lat or a long,
if the lat/long is outside the area covered by the body, if there is
already a report with a matching id, or if we can't parse out the
request time.
|
| |
|
|
|
|
|
|
|
| |
If an Open311 service request update with an empty description field is
received and there is a matching ResponseTemplate for the problem's
category & state (and it's marked as auto-response) then the text from
that ResponseTemplate will be used for the created update.
|
| |
|
|
|
|
|
| |
A new 'state' column replaces confirmed and deleted, allowing
categories to be unconfirmed, confirmed, deleted or inactive.
|
|
|
|
| |
This means that the tests can be run in parallel.
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
jhead 3.00 considers 0 an invalid value for EXIF orientation and will replace it
with 1 when run with the -autorot flag. This was causing a test failure as the
SHA hash of the sample image was being changed.
|
|
|
|
|
| |
Parse the XML in such a way other parts of the code do not have to worry
about single-value folding or the like.
|
|
|
|
|
| |
Even when we ask for a specific range of dates, we sometimes get given
more in the response.
|
|
|
|
|
|
|
| |
Store image type along with hash in photo column, and use that when
outputting images / generating URLs. Make sure all public photo URL
generation goes through appropriate functions, and change temp URLs
so the filename can be output directly from the list.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The following modules had bugs that have been fixed for working in
recent perls:
* List::MoreUtils
* Guard
* PadWalker
* aliased
* URI
* Convert::NLS_DATE_FORMAT
The CGI module was removed from core in 5.20, so include it in the
snapshot (I don't think it's actually used, but is a dependency).
"{" needs to be escaped in regular expressions, and ~~ should not be
used.
Fix some tests that expect e.g. a certain hash ordering, to use sorted
output or better comparisons.
|
| |
|
|
|
|
| |
Fixes #1315.
|
|
|
|
| |
Command line scripts don't need a full blown app, just database.
|
|
|
|
|
|
|
| |
Make dashboard work properly in two-tier councils, showing reports sent
to both. Create an index on the array of the bodies_str column to speed
up performance, and use that throughout the code replacing all LIKE
scans. This also enables a simplifying tidy of the restriction code.
|
|
|
|
|
| |
This override is not used anywhere, it dates from a very old long-gone
test script, and causes issues with database query planning.
|
|
|
|
|
|
|
|
|
| |
Historically, the extra field has been used in two different ways by
different cobrands, both as a list (e.g. Open311 category fields) and a
hash (e.g. the Zurich cobrand).
This commit consolidates usage, adding an API to make use of the field
easier and always returning a hash for the code to use. Fixes #1018.
|
|
|
|
|
| |
This is now handled by normal bodies in the admin. In order to remove
references in send_reports, tidy up (unused) EmptyHomes code a bit.
|