nn

README.md

@@ -157,6 +157,8 @@ No known bugs at this time.
 Alexa Orrico - [Github](https://github.com/alexaorrico) / [Twitter](https://twitter.com/alexa_orrico)  
 Jennifer Huang - [Github](https://github.com/jhuang10123) / [Twitter](https://twitter.com/earthtojhuang)
 
+Favour Idowu - [Github](https://github.com/favouridowu02) / [Twitter](https://twitter.com/favour_eng)
+
 Second part of Airbnb: Joann Vuong
 ## License
 Public Domain. No copy write protection. 

Testing/main_1.py

@@ -0,0 +1,18 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    print(type(r_j))
+    print(len(r_j))
+    for amenity_j in r_j:
+        if amenity_j.get('name') in ["Wifi", "Ethernet", "Soap", "Bed"]:
+            print("OK")
+        else:
+            print("Missing: {}".format(amenity_j.get('name')))
+        if amenity_j.get('id') is None:
+            print("Missing ID for Amenity: {}".format(amenity_j.get('name')))

Testing/main_2.py

@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ Get one amenity
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    amenity_id = r_j[0].get('id')
+
+    """ GET /api/v1/amenities/<amenity_id>
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities/{}".format(amenity_id))
+    print(r.status_code)
+    r_j = r.json()
+    print(r_j.get('id') == amenity_id)
+    print(r_j.get('name') is None)

Testing/main_3.py

@@ -0,0 +1,27 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ Get one amenity
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    amenity_id = r_j[0].get('id')
+
+    """ DELETE /api/v1/amenities/<amenity_id>
+    """
+    r = requests.delete("http://0.0.0.0:5050/api/v1/amenities/{}".format(amenity_id))
+    print(r.status_code)
+
+    """ Verify if the deleted amenity is not present anymore
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    for amenity_j in r_j:
+        if amenity_j.get('id') == amenity_id:
+            print("amenitie is not deleted")
+        else:
+            print("OK")

Testing/main_4.py

@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ POST /api/v1/amenities/
+    """
+    r = requests.post("http://0.0.0.0:5050/api/v1/amenities/", data=json.dumps({ 'name': "Fridge" }), headers={ 'Content-Type': "application/json" })
+    print(r.status_code)
+    r_j = r.json()
+    print(r_j.get('id') is None)
+    print(r_j.get('name') == "Fridge")

Testing/main_5.py

@@ -0,0 +1,11 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ POST /api/v1/amenities
+    """
+    r = requests.post("http://0.0.0.0:5050/api/v1/amenities/", data={ 'name': "Fridge" }, headers={ 'Content-Type': "application/x-www-form-urlencoded" })
+    print(r.status_code)

Testing/main_6.py

@@ -0,0 +1,11 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ POST /api/v1/amenities
+    """
+    r = requests.post("http://0.0.0.0:5050/api/v1/amenities/", data=json.dumps({ 'fake_name': "Fridge" }), headers={ 'Content-Type': "application/json" })
+    print(r.status_code)

Testing/main_7.py

@@ -0,0 +1,29 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ Get one amenity
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    amenity_id = r_j[0].get('id')
+
+    """ PUT /api/v1/amenities/<amenity_id>
+    """
+    r = requests.put("http://0.0.0.0:5050/api/v1/amenities/{}".format(amenity_id), data=json.dumps({ 'name': "NewAmenityName" }), headers={ 'Content-Type': "application/json" })
+    print(r.status_code)
+    r_j = r.json()
+    print(r_j.get('id') == amenity_id)
+    print(r_j.get('name') == "NewAmenityName")
+
+    """ Verify if the state is updated
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    for amenity_j in r_j:
+        if amenity_j.get('id') == amenity_id:
+            print(amenity_j.get('name') == "NewAmenityName")
+

Testing/main_8.py

@@ -0,0 +1,17 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ Get one amenity
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/amenities")
+    r_j = r.json()
+    amenity_id = r_j[0].get('id')
+
+    """ PUT /api/v1/amenities/<amenity_id>
+    """
+    r = requests.put("http://0.0.0.0:5050/api/v1/amenities/{}".format(amenity_id), data={ 'name': "NewAmenityName" }, headers={ 'Content-Type': "application/x-www-form-urlencoded" })
+    print(r.status_code)

Testing/places/main_1.py

@@ -0,0 +1,45 @@
+#!/usr/bin/python3
+"""Testing file
+"""
+import json
+import requests
+
+if __name__ == "__main__":
+    """ get the state with cities
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/states")
+    r_j = r.json()
+
+    state_id = None
+    for state_j in r_j:
+        rs = requests.get("http://0.0.0.0:5050/api/v1/states/{}/cities".format(state_j.get('id')))
+        rs_j = rs.json()
+        if len(rs_j) != 0:
+            state_id = state_j.get('id')
+            break
+
+    if state_id is None:
+        print("State with cities not found")
+
+    """ get city
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/states/{}/cities".format(state_id))
+    r_j = r.json()
+    city_id = None
+    for city_j in r_j:
+        rc = requests.get("http://0.0.0.0:5050/api/v1/cities/{}/places".format(city_j.get('id')))
+        rc_j = rc.json()
+        if len(rc_j) == 0:
+            city_id = city_j.get('id')
+            break
+
+    if city_id is None:
+        print("City without places not found")
+
+
+    """ Fetch places
+    """
+    r = requests.get("http://0.0.0.0:5050/api/v1/cities/{}/places".format(city_id))
+    r_j = r.json()
+    print(type(r_j))
+    print(len(r_j))

api.pid

@@ -0,0 +1 @@
+106561

api/v1/app.py

@@ -0,0 +1,38 @@
+#!/usr/bin/python3
+"""
+    This Module Contains the api using flask
+"""
+from flask import Flask, jsonify
+from os import getenv
+from models import storage
+from api.v1.views import app_views
+
+app = Flask(__name__)
+
+app.config['JSONIFY_PRETTYPRINT_REGULAR'] = True
+app.register_blueprint(blueprint=app_views)
+
+
+@app.route('/')
+def home():
+    return "Home"
+
+
+@app.errorhandler(404)
+def page_not_found(error):
+    return jsonify({"error": "Not found"}), 404
+
+
+@app.teardown_appcontext
+def close(exception=True):
+    return storage.close()
+
+
+if __name__ == "__main__":
+    HBNB_API_HOST = getenv("HBNB_API_HOST")
+    HBNB_API_PORT = getenv("HBNB_API_PORT")
+    if not getenv("HBNB_API_HOST"):
+        HBNB_API_HOST = '0.0.0.0'
+    if not getenv("HBNB_API_PORT"):
+        HBNB_API_PORT = '5000'
+    app.run(host=HBNB_API_HOST, port=HBNB_API_PORT, threaded=True, debug=True)

api/v1/views/__init__.py

@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+"""
+    This Module contains the v1 of the api
+
+    Content:
+        app_views = A Blueprint with prefix /api/v1
+"""
+from flask import Blueprint
+
+app_views = Blueprint('app_views', __name__, url_prefix='/api/v1')
+
+from api.v1.views.index import *
+from api.v1.views.states import *
+from api.v1.views.cities import *
+from api.v1.views.amenities import *
+from api.v1.views.users import *
+from api.v1.views.places import *
+from api.v1.views.places_reviews import *
+
+# print("\n\n",app_views)

api/v1/views/amenities.py

@@ -0,0 +1,92 @@
+#!/usr/bin/python3
+"""
+    This Module contains all the Amenities Routes
+"""
+from api.v1.views import app_views
+from models.amenity import Amenity
+from models import storage
+from flask import abort, jsonify, request
+
+
+@app_views.route('/amenities', strict_slashes=True, methods=['GET'])
+@app_views.route('/amenities/<amenity_id>', strict_slashes=True,
+                 methods=['GET'])
+def get_amenities(amenity_id=None):
+    """
+        This Method returns all the Amenities
+
+        Arguments:
+            amenity_id: the amenity Id to be returned or None.
+
+        Return:
+            this method returns the amenity value to be returned or All
+            if the amenit_id is None.
+    """
+    amenities = []
+    if amenity_id is None:
+        for amenity in storage.all(Amenity).values():
+            amenities.append(amenity.to_dict())
+        return jsonify(amenities), 200
+    else:
+        amenity = storage.get(Amenity, amenity_id)
+        if not amenity:
+            abort(404)
+        return jsonify(amenity.to_dict()), 200
+
+
+@app_views.route('/amenities/<amenity_id>', strict_slashes=True,
+                 methods=['DELETE'])
+def delete_amenity(amenity_id):
+    """
+        This Method deletes the amenity instance
+    """
+    amenity = storage.get(Amenity, amenity_id)
+    if not amenity:
+        abort(404)
+    storage.delete(amenity)
+    storage.save()
+    return jsonify({}), 200
+
+
+@app_views.route('/amenities/', strict_slashes=True, methods=['POST'])
+def post_amenity():
+    """
+        This method creates an instances of amenities
+    """
+    if request.content_type != 'application/json':
+        return jsonify({"error": "Not a JSON"}), 400
+    data = request.get_json()
+    if "name" not in data.keys():
+        return jsonify({"error": "Missing name"}), 400
+    new_amenity = Amenity(**data)
+    storage.new(new_amenity)
+    storage.save()
+    return jsonify(new_amenity.to_dict()), 201
+
+
+@app_views.route('/amenities/<amenity_id>', strict_slashes=True,
+                 methods=['PUT'])
+def put_amenity(amenity_id):
+    """
+        This method creates Updates the Attributes of an instance of a class
+
+        Argument:
+            amenity_id: This is the amenity id
+        Return: a jsonify object of the updated instance with a status code of
+            200 when succesful
+    """
+    amenity = storage.get(Amenity, amenity_id)
+    if not amenity:
+        abort(404)
+    if request.content_type != "application/json":
+        return jsonify({"error": "Not a JSON"}), 400
+    data = request.get_json()
+    if not data:
+        return jsonify({"error": "Not a JSON"}), 400
+    if "name" not in data:
+        return jsonify({"error": "Missing name"}), 400
+    for key, value in data.items():
+        if key not in ["id", "created_at", "updated_at"]:
+            setattr(amenity, key, value)
+    amenity.save()
+    return jsonify(amenity.to_dict()), 200