Merge pull request #17 from hack4impact-uiuc/url-name

added url name

Author: shreyshrey1

api/models.py

@@ -117,13 +117,14 @@ class AdditionalLinks(db.Model):
 
     id = db.Column (db.Integer, unique=True, primary_key=True)
     url = db.Column(db.String)
+    url_name = db.Column(db.String)
     poi_id = db.Column(db.Integer, db.ForeignKey('poi.id', ondelete='SET NULL'), nullable=True)
 
     def __repr__(self):
         return '<additional_links poi_id = {}>'.format(self.poi_id)
 
     def toDict(self):
-        return {'id':self.id,'url': self.url, 'poi_id': self.poi_id}
+        return {'id':self.id,'url': self.url, 'url_name': self.url_name, 'poi_id': self.poi_id}
 
 class InvalidUsage(Exception):
     status_code = 400

api/views/POIS.py

@@ -77,6 +77,7 @@ def poi():
             for link in json_dict['additional_links']:
                 result = AdditionalLinks(
                     url=(link['url']),
+                    url_name=(link['url_name']),
                     poi_id=new_poi_id
                 )
                 db.session.add(result)
@@ -138,6 +139,7 @@ def poi_delete(poi_id):
             for link in json_dict['additional_links']:
                 result = AdditionalLinks(
                     url=(link['url']),
+                    url_name=(link['url_name'])
                 )
                 db.session.add(result)
             db.session.commit()

tests/poi_unit_tests.py

@@ -4,7 +4,7 @@
 from flask import jsonify
 from api import app, db
 from flask import Flask, request
-
+from models import PointsOfInterest
 import requests
 from flask import jsonify
 import json
@@ -52,6 +52,28 @@ def test_add_multiple_poi(self):
 
         r = requests.post('http://127.0.0.1:5000/pois', data=json.dumps(poi_add_json))
         r = requests.post('http://127.0.0.1:5000/pois', data=json.dumps(poi_add_json))
+
+
+    def test_get_poi_by_id(self):
+        r = requests.get('http://127.0.0.1:5000/pois/60')
+        self.assertEqual(r.status_code,200)
+        json_dict = r.json()
+        poi = PointsOfInterest.query.get(60)
+        print("POI name")
+        print(poi)
+        name = poi.name
+        print(name)
+        self.assertEqual(json_dict['data'][0]["name"], name)
+
+    def test_delete_poi(self):
+        r2 = requests.post('http://127.0.0.1:5000/pois', data=json.dumps(poi_add_json))
+        self.assertEqual(r.status_code,200)
+        json_dict = r2.json()
+        ID = json_dict['data']['id']
+        r = requests.delete('http://127.0.0.1:5000/pois/' + ID)
+        self.assertEqual(r.status_code,200)
+        json_dict = r.json()
+        self.assertEqual(json_dict['status'], "success")
     # def get_poi_with_id(self):