Sphinx-Weixi_He, Phoenix- Madina Dzhetegenova

README.md

@@ -56,4 +56,4 @@ For Waves 04, 05, and 06, the new driver may need to setup or update their datab
 1. Activate the virtual environment
 1. Create the database `solar_system_development`
 1. Run `flask db upgrade`
-1. Run `flask run` to confirm that the API is running as expected
+1. Run `flask run` to confirm that the API is running as expected

app/__init__.py

@@ -1,9 +1,20 @@
 from flask import Flask
+from .db import db, migrate
+from .models import planet
 from .routes.routes import solar_system_bp
+import os
 
-def create_app():
+def create_app(config=None):
     app = Flask(__name__)
 
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
+
+    if config:
+        app.config.update(config)
+    db.init_app(app)
+    migrate.init_app(app, db)
+
     app.register_blueprint(solar_system_bp)
 
     return app

app/db.py

@@ -0,0 +1,6 @@
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+from .models.base import Base
+
+db = SQLAlchemy(model_class=Base)
+migrate = Migrate()

app/models/base.py

@@ -0,0 +1,4 @@
+from sqlalchemy.orm import DeclarativeBase
+
+class Base(DeclarativeBase):
+    pass

app/models/planet.py

@@ -1,19 +1,26 @@
+from sqlalchemy.orm import Mapped, mapped_column
+from ..db import db
 
-class Planet:
-    def __init__(self, id, name, description, flag= bool):
-        self.id = id
-        self.name = name
-        self.description = description
-        self.flag = flag
+class Planet(db.Model):
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    name: Mapped[str]
+    description: Mapped[str]
+    flag:Mapped[bool]
 
+# class Planet:
+#     def __init__(self, id, name, description, flag= False):
+#         self.id = id
+#         self.name = name
+#         self.description = description
+#         self.flag = flag
 
-planets = [
-    Planet(1, "Mercury", "The smallest planet in our solar system.", False),
-    Planet(2, "Venus", "The hottest planet in the solar system.", False), 
-    Planet(3, "Earth", "The only planet known to support life.", True ), 
-    Planet(4, "Mars", "Known as the Red Planet.", True ), 
-    Planet(5, "Jupiter", "The largest planet in our solar system.", False),
-    Planet(6, "Saturn", "Famous for its ring system.", False),
-    Planet(7, "Uranus", "An ice giant with a unique tilt.", False),
-    Planet(8, "Neptune", "The farthest planet from the Sun.", False)
-]   
+# planets = [
+#     Planet(1, "Mercury", "The smallest planet in our solar system.", False),
+#     Planet(2, "Venus", "The hottest planet in the solar system.", False), 
+#     Planet(3, "Earth", "The only planet known to support life.", True ), 
+#     Planet(4, "Mars", "Known as the Red Planet.", True ), 
+#     Planet(5, "Jupiter", "The largest planet in our solar system.", False),
+#     Planet(6, "Saturn", "Famous for its ring system.", False),
+#     Planet(7, "Uranus", "An ice giant with a unique tilt.", False),
+#     Planet(8, "Neptune", "The farthest planet from the Sun.", False)
+# ]   

app/routes/routes.py

@@ -1,42 +1,148 @@
-from flask import Blueprint, abort, make_response
-from ..models.planet import planets
+from flask import Blueprint, abort, make_response, request, Response
+from ..models.planet import Planet
+from ..db import db
 
 solar_system_bp = Blueprint("solar_system_bp", __name__, url_prefix="/planets")
 
+@solar_system_bp.post("")
+def create_planet():
+    request_body = request.get_json()
+    name = request_body["name"]
+    description = request_body["description"]
+    flag = request_body["flag"]
+
+    new_planet = Planet(name=name, description=description, flag=flag)
+    db.session.add(new_planet)
+    db.session.commit()
+
+    response = {
+        "id": new_planet.id,
+        "name": new_planet.name,
+        "description": new_planet.description,
+        "flag": new_planet.flag
+    }
+    return response, 201
+
 @solar_system_bp.get("")
 def get_all_planets():
-    results_list = []
-    for planet in planets:
-        results_list.append(dict(
-            id=planet.id,
-            name=planet.name,
-            description=planet.description,
-            flag=planet.flag
-        ))
+    query = db.select(Planet)
+
+    description_param = request.args.get("description")
+    if description_param:
+        query = query.where(Planet.description.ilike(f"%{description_param}%"))
+
+
+    flag_param = request.args.get("flag")
+    if flag_param is not None:
+        # Convert flag_param to a boolean
+        flag_value = flag_param.lower() == "true"
+        query = query.where(Planet.flag == flag_value)
 
-    return results_list
+    sort_param = request.args.get("sort")
+    if sort_param == "name":
+        query = query.order_by(Planet.name)
+    elif sort_param == "description":
+        query = query.order_by(Planet.description)
+    elif sort_param == "flag":
+        query = query.order_by(Planet.flag)
+    else:
+        # Default sorting by id
+        query = query.order_by(Planet.id)
+
+    planets = db.session.scalars(query.order_by(Planet.id))
+
+    planet_response = []
+    for planet in planets:
+        planet_response.append(
+            {
+                "id": planet.id,
+                "name": planet.name,
+                "description": planet.description,
+                "flag": planet.flag
+            }
+        )
+    return planet_response
 
 @solar_system_bp.get("/<planet_id>")
 def get_one_planet(planet_id):
     planet = validate_planet(planet_id)
 
-    return{
-        "id":planet.id,
-        "name":planet.name,
-        "description":planet.description,
-        "flag":planet.flag
+    return {
+        "id": planet.id,
+        "name": planet.name,
+        "description": planet.description,
+        "flag": planet.flag
     }
-        
+
 def validate_planet(planet_id):
     try:
         planet_id = int(planet_id)
     except:
         response = {"message": f"planet {planet_id} invalid"}
-        abort(make_response(response, 400))
+        abort(make_response(response , 400))
 
-    for planet in planets:
-        if planet.id == planet_id:
-            return planet
+    query = db.select(Planet).where(Planet.id == planet_id)
+    planet = db.session.scalar(query)
+
+    if not planet:
+        response = {"message": f"planet {planet_id} not found"}
+        abort(make_response(response, 404))
+    return planet
+
+@solar_system_bp.put("/<planet_id>")
+def update_planet(planet_id):
+    planet = validate_planet(planet_id)
+    request_body = request.get_json()
+
+    planet.name= request_body["name"]
+    planet.description = request_body["description"]
+    planet.flag = request_body["flag"]
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+@solar_system_bp.delete("/<planet_id>")
+def delete_planet(planet_id):
+    planet = validate_planet(planet_id)
+    db.session.delete(planet)
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+# @solar_system_bp.get("")
+# def get_all_planets():
+#     results_list = []
+#     for planet in planets:
+#         results_list.append(dict(
+#             id=planet.id,
+#             name=planet.name,
+#             description=planet.description,
+#             flag=planet.flag
+#         ))
+
+#     return results_list
+
+# @solar_system_bp.get("/<planet_id>")
+# def get_one_planet(planet_id):
+#     planet = validate_planet(planet_id)
+
+#     return{
+#         "id":planet.id,
+#         "name":planet.name,
+#         "description":planet.description,
+#         "flag":planet.flag
+#     }
+
+# def validate_planet(planet_id):
+#     try:
+#         planet_id = int(planet_id)
+#     except:
+#         response = {"message": f"planet {planet_id} invalid"}
+#         abort(make_response(response, 400))
+
+#     for planet in planets:
+#         if planet.id == planet_id:
+#             return planet
 
-    response = {"message": f"planet {planet_id} not found"}
-    abort(make_response(response, 404))
+#     response = {"message": f"planet {planet_id} not found"}
+#     abort(make_response(response, 404))

migrations/README

@@ -0,0 +1 @@
+Single-database configuration for Flask.

migrations/alembic.ini

@@ -0,0 +1,50 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic,flask_migrate
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[logger_flask_migrate]
+level = INFO
+handlers =
+qualname = flask_migrate
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S