Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add yard waste to trash request #349

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions mycity/mycity/intents/trash_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@ def get_address_api_info(address, neighborhood):
'service_id': value,
'place_id': value,
'area_id': value,
'name': value
'name': value,
'start_date': value,
'end_date': value
}

"""
Expand All @@ -260,7 +262,7 @@ def get_address_api_info(address, neighborhood):
url_params = {'q': full_address, 'locale': 'en-US'}
request_result = requests.get(base_url, url_params)

if request_result.status_code != requests.codes.ok:
if request_result.status_code != 200:
logger.debug('Error getting ReCollect API info. Got response: {}'
.format(request_result.status_code))
return {}
Expand All @@ -284,14 +286,17 @@ def get_trash_day_data(api_parameters):
:return: JSON object containing all trash data
"""
logger.debug('api_parameters: ' + str(api_parameters))
api_parameters["after"] = '2020-01-02'
api_parameters["before"] = '2020-12-02'
# Rename the default API parameter "name" to "formatted_address"
if "name" in api_parameters:
api_parameters["formatted_address"] = api_parameters.pop("name")

base_url = "https://recollect.net/api/places"
base_url = "https://api.recollect.net/api/places/{}/services/{}/events" \
.format(api_parameters['place_id'], api_parameters['service_id'])
request_result = requests.get(base_url, api_parameters)

if request_result.status_code != requests.codes.ok:
if request_result.status_code != 200:
logger.debug("Error getting trash info from ReCollect API info. " \
"Got response: {}".format(request_result.status_code))
return {}
Expand Down
Empty file modified mycity/run_tests.sh
100755 → 100644
Empty file.