Madina_Dzhetegenova_Ada_C22_Phoenix

README.md

@@ -55,3 +55,7 @@ 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)
+
+
+
+

app/__init__.py

@@ -1,13 +1,16 @@
 from flask import Flask
 from .db import db, migrate
 from .models import task, goal
+from .routes.task_routes import tasks_bp
+from .routes.goal_routes import goals_bp
 import os
 
 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')
+    # app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get('SLACK_API_TOKEN')
 
     if config:
         # Merge `config` into the app's configuration
@@ -19,4 +22,7 @@ def create_app(config=None):
 
     # Register Blueprints here
 
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+
     return app

app/models/goal.py

@@ -1,5 +1,9 @@
-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")
+
+

app/models/task.py

@@ -1,5 +1,14 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from ..db import db
-
+from datetime import datetime
+from typing import Optional
+from sqlalchemy import ForeignKey
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]
+    description: Mapped[str]
+    completed_at: Mapped[Optional[datetime]]
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+

app/routes/goal_routes.py

@@ -1 +1,145 @@
-from flask import Blueprint
+from flask import Blueprint, abort, make_response, request, Response
+from app.models.goal import Goal
+from app.models.task import Task
+from datetime import datetime
+from ..db import db
+from .task_routes import validate_task
+
+goals_bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@goals_bp.post("")
+def create_goal():
+    request_body = request.get_json()
+
+    if "title" not in request_body:
+        return {"details": "Invalid data"}, 400
+
+    title = request_body["title"]
+
+
+    new_goal = Goal(title=title)
+    db.session.add(new_goal)
+    db.session.commit()
+
+
+    response = { "goal" : {
+        "id": new_goal.id,
+        "title": new_goal.title
+    }
+    }
+    return response, 201
+
+@goals_bp.get("")
+def get_all_goals():
+    query = db.select(Goal)
+    goals = db.session.scalars(query)
+
+    goals_response = []
+    for goal in goals:
+        goals_response.append(
+            {
+                "id": goal.id,
+                "title": goal.title
+            }
+        )
+    return goals_response, 200
+
+@goals_bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    return { "goal" : {
+                "id": goal.id,
+                "title": goal.title
+            }
+    }
+
+def validate_goal(goal_id):
+    try:
+        goal_id = int(goal_id)
+    except:
+        response = {"message": f"goal {goal_id} invalid"}
+        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
+
+
+@goals_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
+
+
+@goals_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
+
+
+
+@goals_bp.post("/<goal_id>/tasks")
+def create_task_with_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    request_data = request.get_json()
+    task_ids = request_data.get("task_ids")
+
+    if not task_ids:
+        response = {"message": "No task_ids provided"}
+        abort(make_response(response, 400))
+
+    for task_id in task_ids:
+        task = validate_task(task_id)
+        task.goal = goal  
+
+    db.session.commit()
+
+    response_body = {
+        "id": goal.id,
+        "task_ids": task_ids
+    }
+    return response_body, 200
+
+@goals_bp.get("/<goal_id>/tasks")
+def get_tasks_of_goal(goal_id):
+    goal = validate_goal(goal_id)
+
+    tasks = [{
+        "id": task.id,
+        "goal_id": goal.id,
+        "title": task.title,
+        "description": task.description,
+        "is_complete": task.completed_at is not None
+    } for task in goal.tasks]
+
+    response_body = {"id": goal.id,
+        "title": goal.title,
+        "tasks": tasks}
+
+    return response_body, 200
+

app/routes/task_routes.py

@@ -1 +1,177 @@
-from flask import Blueprint
+from flask import Blueprint, abort, make_response, request, Response
+from app.models.task import Task
+from app.models.goal import Goal
+from datetime import datetime
+from ..db import db
+import requests
+import os
+
+
+tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+@tasks_bp.post("")
+def create_task():
+    request_body = request.get_json()
+    if "title" not in request_body:
+        return {"details": "Invalid data"}, 400
+    if "description" not in request_body:
+        return {"details": "Invalid data"}, 400
+
+    title = request_body["title"]
+    description = request_body["description"]
+    completed_at= request_body.get("completed_at")
+
+    new_task = Task(title=title, description=description, completed_at= None if completed_at is None else datetime.datetime(completed_at)
+    )
+    db.session.add(new_task)
+    db.session.commit()
+
+
+    response = { "task" : {
+        "id": new_task.id,
+        "title": new_task.title,
+        "description": new_task.description,
+        "is_complete": new_task.completed_at is not None 
+    }
+    }
+    return response, 201
+
+@tasks_bp.get("")
+def get_all_tasks():
+    sort_order = request.args.get("sort")
+
+    if sort_order == "asc":
+        query = db.select(Task).order_by(Task.title.asc())
+    elif sort_order == "desc":
+        query = db.select(Task).order_by(Task.title.desc())
+    else:
+        query = db.select(Task).order_by(Task.id)
+
+    tasks = db.session.scalars(query)
+
+    tasks_response = []
+    for task in tasks:
+        tasks_response.append(
+            {
+                "id": task.id,
+                # "goal_id": task.goal_id is not None,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": task.completed_at is not None
+            }
+        )
+    return tasks_response, 200
+
+@tasks_bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = validate_task(task_id)
+
+    if task.goal_id is not None:
+        return {
+            "task": {
+                "id": task.id,
+                "goal_id": task.goal_id,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": task.completed_at is not None
+            }
+        }
+    else:
+        return {
+            "task": {
+                "id": task.id,
+                "title": task.title,
+                "description": task.description,
+                "is_complete": task.completed_at is not None
+            }
+        }
+
+def validate_task(task_id):
+    try:
+        task_id = int(task_id)
+    except:
+        response = {"message": f"task {task_id} invalid"}
+        abort(make_response(response , 400))
+
+    query = db.select(Task).where(Task.id == task_id)
+    task = db.session.scalar(query)
+
+    if not task:
+        response = {"message": f"task {task_id} not found"}
+        abort(make_response(response, 404))
+    return task
+
+@tasks_bp.put("/<task_id>")
+def update_task(task_id):
+    task = validate_task(task_id)
+    request_body = request.get_json()
+
+    task.title = request_body["title"]
+    task.description = request_body["description"]
+    task.completed_at= request_body.get("completed_at")
+    # task.goal_id= request_body.get("goal_id")
+    db.session.commit()
+
+
+    response = { "task" : {
+        "id": task.id,
+        "title": task.title,
+        "description": task.description,
+        "is_complete": task.completed_at is not None
+    }
+    }
+    return response, 200
+
+@tasks_bp.delete("/<task_id>")
+def delete_task(task_id):
+    task = validate_task(task_id)
+
+    db.session.delete(task)
+    db.session.commit()
+
+    response = {
+        "details": f"Task {task.id} \"{task.title}\" successfully deleted"
+    }
+
+    return response, 200
+
+@tasks_bp.patch("/<task_id>/mark_complete")
+def update_task_to_complete(task_id):
+    task = validate_task(task_id)
+    task.completed_at = datetime.now()
+    db.session.commit()
+    token = os.environ.get('SLACK_API_TOKEN')
+    headers = {
+        "Authorization": f"Bearer {token}" 
+    }
+    url = "https://slack.com/api/chat.postMessage"
+
+    message = {"channel": "D07V10LPBM4",
+            "text": f"Someone just completed the task {task.title}"}
+
+    response = requests.post(url, headers=headers, data=message)
+
+    print(response.text)
+    response = { "task": {
+        "id": task.id,
+        "title": task.title,
+        "description": task.description,
+        "is_complete": task.completed_at is not None
+    }
+    }
+    return response, 200
+
+@tasks_bp.patch("/<task_id>/mark_incomplete")
+def update_task_to_incomplete(task_id):
+    task = validate_task(task_id)
+    task.completed_at = None
+    db.session.commit()
+
+    response_body = { "task": {
+        "id": task.id,
+        "title": task.title,
+        "description": task.description,
+        "is_complete": task.completed_at is not None
+    }
+    }
+    return response_body, 200

migrations/README

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