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.

Sign up for GitHub

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

Jump to bottom

Equipment post is modified to use the database. #89

Merged
merged 6 commits into from
Jun 10, 2021
Merged

Equipment post is modified to use the database. #89

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a11cd7
Equipment post is modified to use the database.
Voursstrreds Jun 8, 2021
56f7440
Necessary libraries are imported
Voursstrreds Jun 8, 2021
a20350f
Equipment Post function is debugged.
Voursstrreds Jun 8, 2021
be7c494
Update equipment.py
Voursstrreds Jun 10, 2021
b2a5d7a
d1 changed to the creation_date.
Voursstrreds Jun 10, 2021
63eafb8
Merge branch 'development' into post-equipment
ege-kaya Jun 10, 2021
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
68 changes: 35 additions & 33 deletions practice-app/app/equipment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@
import urllib
from datetime import datetime, timedelta
from math import cos, asin, sqrt, pi
from .dbinit import Answer, session, Eventpost, Comment, Blocking, User, Equipmentpost
from sqlalchemy.orm import sessionmaker
from .dbinit import db, User, Equipmentpost

equipment_api = Blueprint('equipment_api', __name__)
API_KEY = "Google API Key"

Session = sessionmaker(db)
session = Session()

events = [
{
"eventId": 1,
Expand Down Expand Up @@ -116,39 +121,36 @@ def getEquipment(equipmentId):
'link' : equipment.link,
'results' : results(equipment.title)}), 201

@equipment_api.route('/api/v1.0/equipments', methods=['POST'])
@equipment_api.route('/api/v1.0/equipments/', methods=['POST'])
def create_equipment_post():
# Creates the equipment post
if len(equipmentPost) != 0:
new_equipment = {
"postId": equipmentPost[-1]['postId'] + 1,
"ownerId": request.json['ownerId'],
"content": request.json['content'],
"title": request.json['title'],
"creationDate": request.json["creationDate"],
"lastUpdateDate": request.json["lastUpdateDate"],
"numberOfClicks": request.json['numberOfClicks'],
"location": request.json["location"],
"equipmentType": request.json["equipmentType"],
"websiteName": request.json["websiteName"],
"link": request.json["link"]
}
else:
new_equipment = {
"postId": 1,
"ownerId": request.json['ownerId'],
"content": request.json['content'],
"title": request.json['title'],
"creationDate": request.json["creationDate"],
"lastUpdateDate": request.json["lastUpdateDate"],
"numberOfClicks": request.json['numberOfClicks'],
"location": request.json["location"],
"equipmentType": request.json["equipmentType"],
"websiteName": request.json["websiteName"],
"link": request.json["link"]
}
equipmentPost.append(new_equipment)
return jsonify({"equipment": new_equipment}), 201

creation_date = datetime.today()

if "ownerId" not in request.json:
abort(400)
if "title" not in request.json:
abort(400)
if "equipmentType" not in request.json:
abort(400)
if "websiteName" not in request.json:
abort(400)
if "link" not in request.json:
abort(400)

new_equipment = Equipmentpost(ownerID=request.json["ownerId"],
content=request.json["content"],
title=request.json["title"],
creationDate=creation_date,
location=request.json["location"],
equipmentType=request.json["equipmentType"],
websiteName=request.json["websiteName"],
link=request.json["link"])

session.add(new_equipment)
session.commit()

return jsonify({col.name: str(getattr(new_equipment, col.name)) for col in new_equipment.__table__.columns}), 201


@equipment_api.route('/api/v1.0/search-equipment-type/<string:equipmentType>', methods=['GET'])
def search_equipments_by_type(equipmentType):
Expand Down