Merge pull request #11 from pamelafox/parent-changes

Make code compatible with Alembic

Author: vmagelo

app.py

@@ -1,9 +1,11 @@
+from datetime import datetime
+import os
+
 from flask import Flask, render_template, request, redirect, url_for, send_from_directory
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_wtf.csrf import CSRFProtect
-from datetime import datetime
-import os
+
 
 app = Flask(__name__, static_folder='static')
 csrf = CSRFProtect(app)
@@ -29,22 +31,17 @@
 # Enable Flask-Migrate commands "flask db init/migrate/upgrade" to work
 migrate = Migrate(app, db)
 
-# Create databases, if databases exists doesn't issue create
-# For schema changes, run "flask db migrate"
+# The import must be done after db initialization due to circular import issue
 from models import Restaurant, Review
-db.create_all()
-db.session.commit()
 
 @app.route('/', methods=['GET'])
 def index():
-    from models import Restaurant
     print('Request for index page received')
     restaurants = Restaurant.query.all()    
     return render_template('index.html', restaurants=restaurants)
 
 @app.route('/<int:id>', methods=['GET'])
 def details(id):
-    from models import Restaurant, Review
     restaurant = Restaurant.query.where(Restaurant.id == id).first()
     reviews = Review.query.where(Review.restaurant==id)
     return render_template('details.html', restaurant=restaurant, reviews=reviews)
@@ -57,7 +54,6 @@ def create_restaurant():
 @app.route('/add', methods=['POST'])
 @csrf.exempt
 def add_restaurant():
-    from models import Restaurant
     try:
         name = request.values.get('restaurant_name')
         street_address = request.values.get('street_address')
@@ -80,7 +76,6 @@ def add_restaurant():
 @app.route('/review/<int:id>', methods=['POST'])
 @csrf.exempt
 def add_review(id):
-    from models import Review
     try:
         user_name = request.values.get('user_name')
         rating = request.values.get('rating')
@@ -105,7 +100,6 @@ def add_review(id):
 @app.context_processor
 def utility_processor():
     def star_rating(id):
-        from models import Review
         reviews = Review.query.where(Review.restaurant==id)
 
         ratings = []

migrations/versions/d0c7b8e4b57c_initial_migration.py

@@ -0,0 +1,45 @@
+"""Initial migration.
+
+Revision ID: d0c7b8e4b57c
+Revises: 
+Create Date: 2022-11-08 17:00:02.151921
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd0c7b8e4b57c'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('restaurant',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(length=50), nullable=True),
+    sa.Column('street_address', sa.String(length=50), nullable=True),
+    sa.Column('description', sa.String(length=250), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('review',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('restaurant', sa.Integer(), nullable=True),
+    sa.Column('user_name', sa.String(length=30), nullable=True),
+    sa.Column('rating', sa.Integer(), nullable=True),
+    sa.Column('review_text', sa.String(length=500), nullable=True),
+    sa.Column('review_date', sa.DateTime(), nullable=True),
+    sa.ForeignKeyConstraint(['restaurant'], ['restaurant.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('review')
+    op.drop_table('restaurant')
+    # ### end Alembic commands ###

models.py

@@ -1,9 +1,8 @@
-from app import db
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
-from sqlalchemy.orm import declarative_base, validates
+from sqlalchemy.orm import validates
+
+from app import db
 
-# declarative base class
-Base = declarative_base()
 
 class Restaurant(db.Model):
     __tablename__ = 'restaurant'
@@ -29,4 +28,4 @@ def validate_rating(self, key, value):
         return value
 
     def __str__(self):
-        return self.restaurant.name + " (" + self.review_date.strftime("%x") +")"
+        return self.restaurant.name + " (" + self.review_date.strftime("%x") +")"