Information of the book

.gitignore

@@ -0,0 +1,9 @@
+
+*.ids
+*.xml
+*.xml
+*.ids
+*.xml
+*.xml
+*.pyc
+*.xml

apps/__init__.py

@@ -7,6 +7,7 @@
 from werkzeug.security import generate_password_hash, check_password_hash
 from functools import wraps
 from flask_cors import CORS
+from base64 import b64encode
 
 
 app = Flask(__name__)
@@ -24,15 +25,15 @@
 import apps.api
 
 
-def createDB():
-    engine = sqlalchemy.create_engine('postgresql://postgres:mvjunetwo@localhost') #connects to server
-    conn = engine.connect()
-    conn.execute("commit")
-    conn.execute("create database bookshelf")
-    conn.close()
-
-def createTables():
-    db.create_all()
+# def createDB():
+#     engine = sqlalchemy.create_engine('postgresql://postgres:mvjunetwo@localhost') #connects to server
+#     conn = engine.connect()
+#     conn.execute("commit")
+#     conn.execute("create database bookshelf")
+#     conn.close()
+#
+# def createTables():
+db.create_all()
 
 #createDB()
-createTables()
+# createTables()

apps/api.py

@@ -360,6 +360,40 @@ def viewbooks(current_user):
 
         return jsonify({'book': output})
 
+@app.route('/book/info/<int:book_id>', methods=['GET'])
+def bookDetail(book_id):
+
+    books = Books.query.filter(Books.book_id==book_id).first()
+
+    if books is None:
+        return jsonify({'message': 'No book found!'})
+
+    user_data = {}
+    user_data['title'] = books.title
+    user_data['description'] = books.description
+    user_data['edition'] = books.edition
+    user_data['year'] = books.year_published
+    user_data['isbn'] = books.isbn
+    user_data['types'] = books.types
+    book_author = WrittenByAssociation.query.filter(WrittenByAssociation.book_id==books.book_id).first()
+    author = Author.query.filter(Author.author_id==book_author.author_id).first()
+    publisher = Publisher.query.filter(Publisher.publisher_id==books.publisher_id).first()
+    user_data['publishers'] = publisher.publisher_name
+    user_data['author_name'] = author.author_name
+
+    comments = BookCommentAssociation.query.filter(BookCommentAssociation.book_id==book_id).all()
+    output = []
+    for comment in comments:
+        comment_data = {}
+        user = User.query.filter(User.id==comment.user_id).first()
+        comment_data['first_name'] = user.first_name
+        comment_data['last_name'] = user.last_name
+        comment_data['comment'] = comment.comment
+        comment_data['date'] = comment.date
+        output.append(comment_data)
+
+    return jsonify({'book': user_data, 'comments': output})
+
 @app.route('/category/<string:category>/', methods=['GET'])
 def category(category):
 

apps/models.py

@@ -11,8 +11,7 @@ class User(UserMixin, db.Model):
     contact_number = db.Column(db.String(11))
     birth_date = db.Column(db.DATE, nullable=False)
     gender = db.Column(db.String(6), nullable=False)
-    longitude = db.Column(db.FLOAT)
-    latitude = db.Column(db.FLOAT)
+    address = db.Column(db.String(100))
     profpic = db.Column(db.TEXT)
     bookshelf_user = db.relationship('Bookshelf', uselist=False, backref='user_bookshelf')
     borrow_bookshelfs = db.relationship('BorrowsAssociation', backref='user_borrow')
@@ -106,13 +105,11 @@ class Category(db.Model):
 class Author(db.Model):
     __tablename__ = 'author'
     author_id = db.Column(db.Integer, db.ForeignKey('author.author_id'), primary_key=True)
-    author_first_name = db.Column(db.String(50))
-    author_last_name = db.Column(db.String(50))
+    author_name = db.Column(db.String(50))
     authorBooks = db.relationship('WrittenByAssociation', backref="author_books")
 
-    def __init__(self, author_first_name='', author_last_name=''):
-        self.author_first_name = author_first_name
-        self.author_last_name = author_last_name
+    def __init__(self, author_name=''):
+        self.author_first_name = author_name
 
 
 class WrittenByAssociation(db.Model):
@@ -220,8 +217,9 @@ def __init__(self, user_id='', bookid=''):
 # Rates (book)
 class BookRateAssociation(db.Model):
     __tablename__ = 'bookRate'
+    comment_id = db.Column(db.Integer, primary_key=True)
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
-    book_id = db.Column(db.Integer, db.ForeignKey('books.book_id'), primary_key=True)
+    book_id = db.Column(db.Integer, db.ForeignKey('books.book_id'))
     rating = db.Column(db.Integer)
     comment = db.Column(db.TEXT)
     user = db.relationship('User', backref='user_booksRate')
@@ -282,6 +280,7 @@ class BookCommentAssociation(db.Model):
     user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
     book_id = db.Column(db.Integer, db.ForeignKey('books.book_id'), primary_key=True)
     comment = db.Column(db.TEXT)
+    date = db.Column(db.DATE)
     user = db.relationship('User', backref='user_booksComment')
     books = db.relationship('Books', backref='bookComment')
 

run.py

@@ -2,5 +2,5 @@
 
 if __name__ == '__main__':
     app.run(debug=True)
-#    port = int(os.environ.get("PORT", 5000))
-#    app.run(host="0.0.0.0", port=port)
+   # port = int(os.environ.get("PORT", 5000))
+   # app.run(host="0.0.0.0", port=port)