a

Author: carlosjc03

.github/workflows/starter-no-infra_msdcos-poython-postgres-pap3.yml

@@ -1,18 +1,22 @@
 import os
-from flask import Flask, redirect, render_template, request, send_from_directory, url_for, jsonify
+from datetime import datetime
+
+from flask import Flask, redirect, render_template, request, send_from_directory, url_for
 from flask_migrate import Migrate
 from flask_sqlalchemy import SQLAlchemy
 from flask_wtf.csrf import CSRFProtect
-from datetime import datetime, timezone
-# Main application
+
+
 app = Flask(__name__, static_folder='static')
 csrf = CSRFProtect(app)
 
-# Configuración según entorno
+# WEBSITE_HOSTNAME exists only in production environment
 if 'WEBSITE_HOSTNAME' not in os.environ:
+    # local development, where we'll use environment variables
     print("Loading config.development and environment variables from .env file.")
     app.config.from_object('azureproject.development')
-else: 
+else:
+    # production
     print("Loading config.production.")
     app.config.from_object('azureproject.production')
 
@@ -21,70 +25,99 @@
     SQLALCHEMY_TRACK_MODIFICATIONS=False,
 )
 
-# Inicializar base de datos
+# Initialize the database connection
 db = SQLAlchemy(app)
+
+# Enable Flask-Migrate commands "flask db init/migrate/upgrade" to work
 migrate = Migrate(app, db)
 
-# Importar modelos después de inicializar db
-from models import Restaurant, Review, ImageData
+# The import must be done after db initialization due to circular import issue
+from models import Restaurant, Review
 
 @app.route('/', methods=['GET'])
 def index():
     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):
+    restaurant = Restaurant.query.where(Restaurant.id == id).first()
+    reviews = Review.query.where(Review.restaurant == id)
+    return render_template('details.html', restaurant=restaurant, reviews=reviews)
 
+@app.route('/create', methods=['GET'])
+def create_restaurant():
+    print('Request for add restaurant page received')
+    return render_template('create_restaurant.html')
 
+@app.route('/add', methods=['POST'])
+@csrf.exempt
+def add_restaurant():
+    try:
+        name = request.values.get('restaurant_name')
+        street_address = request.values.get('street_address')
+        description = request.values.get('description')
+    except (KeyError):
+        # Redisplay the question voting form.
+        return render_template('add_restaurant.html', {
+            'error_message': "You must include a restaurant name, address, and description",
+        })
+    else:
+        restaurant = Restaurant()
+        restaurant.name = name
+        restaurant.street_address = street_address
+        restaurant.description = description
+        db.session.add(restaurant)
+        db.session.commit()
 
-@app.route('/images', methods=['GET'])
-def image_table():
-    print('Request for image table page received')
-    images = ImageData.query.order_by(ImageData.upload_time.desc()).all()
-    return render_template('index.html', images=images)
+        return redirect(url_for('details', id=restaurant.id))
 
+@app.route('/review/<int:id>', methods=['POST'])
 @csrf.exempt
-@app.route('/upload_image', methods=['POST'])
-def upload_image():
-    print('Request to upload image received')
-    if not request.is_json:
-        return jsonify({"error": "Request must be JSON"}), 400
-
-    data = request.get_json()
-    filename = data.get('filename')
-    pixel_red = data.get('pixel_red')
-    pixel_green = data.get('pixel_green')
-    pixel_blue = data.get('pixel_blue')
-    username = data.get('username')
-    
-
-    if not all([filename, pixel_red, pixel_green, pixel_blue, username]):
-        return jsonify({"error": "All fields ('filename', 'pixel_red', 'pixel_green', 'pixel_blue', 'username') are required"}), 400
-
+def add_review(id):
     try:
-        new_image = ImageData(
-            filename=filename,
-            pixel_red=pixel_red,
-            pixel_green=pixel_green,
-            pixel_blue=pixel_blue,
-            username=username,
-            upload_time=datetime.now(timezone.utc)
-
-        )
-        #db.session.create_all()
-        #db.session.commit()
-        db.session.add(new_image)
+        user_name = request.values.get('user_name')
+        rating = request.values.get('rating')
+        review_text = request.values.get('review_text')
+    except (KeyError):
+        #Redisplay the question voting form.
+        return render_template('add_review.html', {
+            'error_message': "Error adding review",
+        })
+    else:
+        review = Review()
+        review.restaurant = id
+        review.review_date = datetime.now()
+        review.user_name = user_name
+        review.rating = int(rating)
+        review.review_text = review_text
+        db.session.add(review)
         db.session.commit()
-        return jsonify({"message": "Image uploaded successfully"}), 201
-    except Exception as e:
-        db.session.rollback()
-        return jsonify({"error": str(e)}), 500
+
+    return redirect(url_for('details', id=id))
+
+@app.context_processor
+def utility_processor():
+    def star_rating(id):
+        reviews = Review.query.where(Review.restaurant == id)
+
+        ratings = []
+        review_count = 0
+        for review in reviews:
+            ratings += [review.rating]
+            review_count += 1
+
+        avg_rating = sum(ratings) / len(ratings) if ratings else 0
+        stars_percent = round((avg_rating / 5.0) * 100) if review_count > 0 else 0
+        return {'avg_rating': avg_rating, 'review_count': review_count, 'stars_percent': stars_percent}
+
+    return dict(star_rating=star_rating)
 
 @app.route('/favicon.ico')
 def favicon():
     return send_from_directory(os.path.join(app.root_path, 'static'),
                                'favicon.ico', mimetype='image/vnd.microsoft.icon')
 
-
 if __name__ == '__main__':
-    app.run()
+    app.run()

app.py

@@ -1,8 +1,8 @@
 import os
 
-DATABASE_URI = 'postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}'.format(
-    dbuser=os.getenv('AZURE_POSTGRESQL_USER'),
-     dbpass=os.getenv('AZURE_POSTGRESQL_PASSWORD'),
-     dbhost=os.getenv('AZURE_POSTGRESQL_HOST'),
-     dbname=os.getenv('AZURE_POSTGRESQL_NAME')
- )
+# DATABASE_URI = 'postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}'.format(
+#     dbuser=os.getenv('AZURE_POSTGRESQL_USER'),
+#     dbpass=os.getenv('AZURE_POSTGRESQL_PASSWORD'),
+#     dbhost=os.getenv('AZURE_POSTGRESQL_HOST'),
+#     dbname=os.getenv('AZURE_POSTGRESQL_NAME')
+# )

azureproject/production.py

@@ -1,3 +1,5 @@
+from __future__ import with_statement
+
 import logging
 from logging.config import fileConfig
 
@@ -14,43 +16,22 @@
 fileConfig(config.config_file_name)
 logger = logging.getLogger('alembic.env')
 
-
-def get_engine():
-    try:
-        # this works with Flask-SQLAlchemy<3 and Alchemical
-        return current_app.extensions['migrate'].db.get_engine()
-    except (TypeError, AttributeError):
-        # this works with Flask-SQLAlchemy>=3
-        return current_app.extensions['migrate'].db.engine
-
-
-def get_engine_url():
-    try:
-        return get_engine().url.render_as_string(hide_password=False).replace(
-            '%', '%%')
-    except AttributeError:
-        return str(get_engine().url).replace('%', '%%')
-
-
 # add your model's MetaData object here
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-config.set_main_option('sqlalchemy.url', get_engine_url())
-target_db = current_app.extensions['migrate'].db
+config.set_main_option(
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.get_engine().url).replace(
+        '%', '%%'))
+target_metadata = current_app.extensions['migrate'].db.metadata
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 
 
-def get_metadata():
-    if hasattr(target_db, 'metadatas'):
-        return target_db.metadatas[None]
-    return target_db.metadata
-
-
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
 
@@ -65,7 +46,7 @@ def run_migrations_offline():
     """
     url = config.get_main_option("sqlalchemy.url")
     context.configure(
-        url=url, target_metadata=get_metadata(), literal_binds=True
+        url=url, target_metadata=target_metadata, literal_binds=True
     )
 
     with context.begin_transaction():
@@ -90,17 +71,14 @@ def process_revision_directives(context, revision, directives):
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
-    conf_args = current_app.extensions['migrate'].configure_args
-    if conf_args.get("process_revision_directives") is None:
-        conf_args["process_revision_directives"] = process_revision_directives
-
-    connectable = get_engine()
+    connectable = current_app.extensions['migrate'].db.get_engine()
 
     with connectable.connect() as connection:
         context.configure(
             connection=connection,
-            target_metadata=get_metadata(),
-            **conf_args
+            target_metadata=target_metadata,
+            process_revision_directives=process_revision_directives,
+            **current_app.extensions['migrate'].configure_args
         )
 
         with context.begin_transaction():