C22 Phoenix - Liubov D.

README.md

@@ -55,3 +55,14 @@ This project is designed to fulfill the features described in detail in each wav
 1. [Wave 6: Establishing a one-to-many relationship between two models](ada-project-docs/wave_06.md)
 1. [Wave 7: Deployment](ada-project-docs/wave_07.md)
 1. [Optional Enhancements](ada-project-docs/optional-enhancements.md)
+
+psql -U postgres postgres
+drop database task_list_api_development;
+create database task_list_api_development;
+drop database task_list_api_test;
+create database task_list_api_test;
+\q
+rm -rf migrations
+flask db init
+flask db migrate -m "Recreate model migrations"
+flask db upgrade

ada-project-docs/setup.md

@@ -61,7 +61,7 @@ SQLALCHEMY_TEST_DATABASE_URI=postgresql+psycopg2://postgres:postgres@localhost:5
 
 Run `$ flask db init`.
 
-**_After you make your first model in Wave 1_**, run the other commands `migrate` and `upgrade`.
+**_After you make your first model in Wave 1_**, run the other commands `$ flask db migrate` and `$ flask db upgrade`.
 
 ## Run `$ flask run` or `$ flask run --debug`
 

ada-project-docs/wave_01.md

@@ -40,8 +40,8 @@ Tasks should contain these attributes. **The tests require the following columns
 
 ### Tips
 
-- Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any mispellings.
-  - That said, remember that dictionaries do not have an implied order. This is still true in JSON with objects. When you make Postman requests, the order of the key/value pairings within the response JSON object does not need to match the order specified in this document. (The term "object" in JSON is analagous to "dictionary" in Python.)
+- Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any misspellings.
+  - That said, remember that dictionaries do not have an implied order. This is still true in JSON with objects. When you make Postman requests, the order of the key/value pairings within the response JSON object does not need to match the order specified in this document. (The term "object" in JSON is analogous to "dictionary" in Python.)
 - Use the tests in `tests/test_wave_01.py` to guide your implementation.
 - You may feel that there are missing tests and missing edge cases considered in this wave. This is intentional.
   - You have fulfilled wave 1 requirements if all of the wave 1 tests pass.

ada-project-docs/wave_02.md

@@ -10,7 +10,7 @@ The following are required routes for wave 2. Feel free to implement the routes
 
 ### Tips
 
-- Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any mispellings.
+- Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any misspellings.
 - Use the tests in `tests/test_wave_02.py` to guide your implementation.
 - You may feel that there are missing tests and missing edge cases considered in this wave. This is intentional.
   - You have fulfilled wave 2 requirements if all of the wave 2 tests pass.

ada-project-docs/wave_05.md

@@ -17,7 +17,7 @@ This wave requires more test writing.
 - The tests you need to write are scaffolded in the `test_wave_05.py` file. 
   - These tests are currently skipped with `@pytest.mark.skip(reason="test to be completed by student")` and the function body has `pass` in it. Once you implement these tests you should remove the `skip` decorator and the `pass`.
 - For the tests you write, use the requirements in this document to guide your test writing. 
-  - Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any mispellings.
+  - Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any misspellings.
 - You can model your tests off of the Wave 1 tests for Tasks.
 - Some tests use a [fixture](https://docs.pytest.org/en/6.2.x/fixture.html) named `one_goal` that is defined in `tests/conftest.py`. This fixture saves a specific goal to the test database.
 

ada-project-docs/wave_06.md

@@ -18,7 +18,7 @@ Secondly, we should create our new route, `/goals/<goal_id>/tasks`, so that our
 
 - Use lesson materials and independent research to review how to set up a one-to-many relationship in Flask.
 - Remember to run `flask db migrate` and `flask db upgrade` whenever there is a change to the model.
-- Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any mispellings.
+- Pay attention to the exact shape of the expected JSON. Double-check nested data structures and the names of the keys for any misspellings.
 - Use the tests in `tests/test_wave_06.py` to guide your implementation.
 - Some tests use a fixture named `one_task_belongs_to_one_goal` that is defined in `tests/conftest.py`. This fixture saves a task and a goal to the test database, and uses SQLAlchemy to associate the goal and task together.
 

app/__init__.py

@@ -1,11 +1,17 @@
 from flask import Flask
 from .db import db, migrate
-from .models import task, goal
+from .models import goal, task
+from .routes.task_routes import bp as tasks_bp
+from .routes.goal_routes import bp as goals_bp
 import os
+from flask_cors import CORS
 
 def create_app(config=None):
     app = Flask(__name__)
 
+    CORS(app)
+    app.config['CORS_HEADERS'] = 'Content-Type'
+
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SQLALCHEMY_DATABASE_URI')
 
@@ -18,5 +24,8 @@ def create_app(config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+
 
     return app

app/models/goal.py

@@ -1,5 +1,23 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
 
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    tasks: Mapped[list["Task"]] = relationship(back_populates="goal")
+
+
+    def to_dict(self):
+        return dict(
+            goal=dict(
+                id=self.id,
+                title=self.title
+                )
+        )
+
+    # from JSON to model
+    @classmethod
+    def from_dict(cls, goal_data):
+        return cls(
+            title=goal_data["title"]
+        )

app/models/task.py

@@ -1,5 +1,47 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import ForeignKey
 from ..db import db
+from datetime import datetime
+from typing import Optional
 
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    description: Mapped[str]
+    completed_at: Mapped[Optional[str]]
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+
+    # from model to JSON
+    def to_dict(self):
+        if self.goal_id is None:
+            return dict(
+                    id=self.id,
+                    title=self.title,
+                    description=self.description,
+                    is_complete=self.completed_at!=None
+                    )
+        else:
+            return dict(
+                    id=self.id,
+                    title=self.title,
+                    description=self.description,
+                    is_complete=self.completed_at!=None,
+                    goal_id=self.goal_id
+                    )
+
+    # from JSON to model
+    @classmethod
+    def from_dict(cls, task_data):
+        return cls(
+            title=task_data["title"],
+            description=task_data["description"]
+        )
+
+
+
+
+
+
+

app/routes/goal_routes.py

@@ -1 +1,146 @@
-from flask import Blueprint
+from flask import Blueprint, request, Response, make_response, abort
+from app.models.goal import Goal
+from ..db import db
+from ..models.task import Task
+from ..routes.task_routes import validate_task
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals" )
+
+@bp.post("")
+def create_goal():
+    request_body = request.get_json()
+
+    try:
+        new_goal = Goal.from_dict(request_body)
+
+    except KeyError as e:
+        response = {
+            "details": "Invalid data"
+        }
+        abort(make_response(response, 400))
+
+    db.session.add(new_goal)
+    db.session.commit()
+
+    return new_goal.to_dict(), 201
+
+@bp.get("")
+def get_all_goals():
+    query = db.select(Goal)
+
+    title_param = request.args.get("title")
+    if title_param:
+        query = query.where(Goal.title.ilike(f"%{title_param}%"))
+
+    sort_param = request.args.get("sort")
+    if sort_param:
+        if sort_param == "asc":
+            query = query.order_by(Goal.title.asc())
+        elif sort_param == "desc":
+            query = query.order_by(Goal.title.desc())
+
+    query = query.order_by(Goal.id)
+    goals = db.session.scalars(query)
+
+    goals_response = []
+    for goal in goals:
+        goals_response.append(
+            {
+                "id": goal.id,
+                "title": goal.title
+            }
+        )
+
+    return goals_response
+
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    return goal.to_dict()
+
+
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    goal = validate_goal(goal_id)
+    request_body = request.get_json()
+
+    goal.title = request_body["title"]
+
+    db.session.commit()
+
+    response = {
+    "goal": {
+        "id": goal.id,
+        "title": goal.title
+        }   
+    }
+
+    return response, 200
+
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    goal = validate_goal(goal_id)
+    db.session.delete(goal)
+    db.session.commit()
+
+    response = {
+        "details": f"Goal {goal_id} \"{goal.title}\" successfully deleted"
+    }
+
+    return response, 200
+
+def validate_goal(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except:
+        response = {"details": "Invalid data"}
+
+        abort(make_response(response , 400))
+
+    query = db.select(Goal).where(Goal.id == goal_id)
+    goal = db.session.scalar(query)
+
+    if not goal:
+        response = {"message": f"Goal {goal_id} not found"}
+        abort(make_response(response, 404))
+
+    return goal
+
+@bp.post("/<goal_id>/tasks")
+def assign_tasks_to_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    request_body = request.get_json()
+    task_ids = request_body["task_ids"]
+
+    for task_id in task_ids:
+        task = validate_task(task_id)
+        task.goal_id = goal_id
+        db.session.add(task)
+
+    db.session.commit()
+
+    response = {
+        "id": int(goal_id),
+        "task_ids": task_ids
+    }
+
+    return response, 200
+
+@bp.get("/<goal_id>/tasks")
+def get_goal_with_assigned_tasks(goal_id):
+    goal = validate_goal(goal_id)
+
+    query = db.select(Task).where(Goal.id == goal_id)
+
+    tasks = db.session.scalars(query)
+
+    response = {}
+    response["id"] = goal.id
+    response["title"] = goal.title
+    response["tasks"] = []
+
+    response["tasks"] = [task.to_dict() for task in tasks]
+
+    return response, 200