From db39b2a4a898e6216f6ff04c7953b0bfa43fa66c Mon Sep 17 00:00:00 2001 From: Carin Gan Date: Wed, 23 Oct 2019 13:11:58 -0400 Subject: [PATCH 1/2] Change imageUrl to imageURL in json results --- server/dining/diningImages.csv | 2 +- server/dining/diningRedis.py | 2 +- server/dining/hours_menus.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/dining/diningImages.csv b/server/dining/diningImages.csv index 78b3aa80..0ec6f015 100644 --- a/server/dining/diningImages.csv +++ b/server/dining/diningImages.csv @@ -1,4 +1,4 @@ -id,imageUrl +id,imageURL 593,https://s3.us-east-2.amazonaws.com/labs.api/dining/1920-commons.jpg 636,https://s3.us-east-2.amazonaws.com/labs.api/dining/Hill+House.jpg 637,https://s3.us-east-2.amazonaws.com/labs.api/dining/kceh.jpg diff --git a/server/dining/diningRedis.py b/server/dining/diningRedis.py index 24788426..ee0050a7 100644 --- a/server/dining/diningRedis.py +++ b/server/dining/diningRedis.py @@ -9,4 +9,4 @@ with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'diningImages.csv')) as f: reader = csv.DictReader(f) for row in reader: - db.set('venue:%s' % (row['id']), json.dumps(row['imageUrl'])) + db.set('venue:%s' % (row['id']), json.dumps(row['imageURL'])) diff --git a/server/dining/hours_menus.py b/server/dining/hours_menus.py index cf2974d8..fae50c0a 100644 --- a/server/dining/hours_menus.py +++ b/server/dining/hours_menus.py @@ -58,9 +58,9 @@ def get_data(): imageUrlJSON = db.get('venue:%s' % (str(venue['id']))) if imageUrlJSON: - venue['imageUrl'] = imageUrlJSON.decode('utf8').replace("'", '') + venue['imageURL'] = imageUrlJSON.decode('utf8').replace("'", '') else: - venue['imageUrl'] = None + venue['imageURL'] = None return json now = datetime.datetime.today() From 19892273ceeaffbda51eabc2ce4cf6d168017681 Mon Sep 17 00:00:00 2001 From: Carin Gan Date: Fri, 25 Oct 2019 16:46:57 -0400 Subject: [PATCH 2/2] Resolve merge conflict --- server/dining/hours_menus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/dining/hours_menus.py b/server/dining/hours_menus.py index fae50c0a..edf92d50 100644 --- a/server/dining/hours_menus.py +++ b/server/dining/hours_menus.py @@ -58,7 +58,7 @@ def get_data(): imageUrlJSON = db.get('venue:%s' % (str(venue['id']))) if imageUrlJSON: - venue['imageURL'] = imageUrlJSON.decode('utf8').replace("'", '') + venue['imageURL'] = imageUrlJSON.decode('utf8').replace('\"', '') else: venue['imageURL'] = None return json