Rock - Nyckolle L.

Procfile

@@ -0,0 +1 @@
+web: gunicorn 'app:create_app()'

app/__init__.py

@@ -4,31 +4,35 @@
 import os
 from dotenv import load_dotenv
 
-
 db = SQLAlchemy()
 migrate = Migrate()
 load_dotenv()
 
-
 def create_app(test_config=None):
     app = Flask(__name__)
-    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
     if test_config is None:
-        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
-            "SQLALCHEMY_DATABASE_URI")
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get(
+            'SQLALCHEMY_DATABASE_URI')
     else:
-        app.config["TESTING"] = True
-        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
-            "SQLALCHEMY_TEST_DATABASE_URI")
+        app.config['TESTING'] = True
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get(
+            'SQLALCHEMY_TEST_DATABASE_URI')
 
     # Import models here for Alembic setup
     from app.models.task import Task
     from app.models.goal import Goal
 
     db.init_app(app)
     migrate.init_app(app, db)
+    load_dotenv()
 
     # Register Blueprints here
+    from .routes import tasks_bp
+    app.register_blueprint(tasks_bp)
 
+    from .routes import goals_bp
+    app.register_blueprint(goals_bp)
+
     return app

app/models/goal.py

@@ -1,6 +1,14 @@
 from flask import current_app
+from sqlalchemy.orm import backref
 from app import db
 
-
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    goal_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String)
+    tasks = db.relationship('Task', backref='goaltask', lazy=True)
+
+    def goal_json(self):
+        return {
+            "id": self.goal_id,
+            "title": self.title
+        }

app/models/task.py

@@ -1,6 +1,30 @@
 from flask import current_app
 from app import db
-
+from sqlalchemy import DateTime
+from app.models.goal import Goal
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    task_id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String)
+    description = db.Column(db.String)
+    completed_at = db.Column(db.DateTime, nullable=True)
+    goaltask_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+
+    # creates a dictionary of key-value pairs describing the given task
+    def to_json(self):
+        # Wave 6: need to create a conditional for "goal_id"
+        if self.goaltask_id == None:
+            return {
+                "id": self.task_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": False if self.completed_at is None else True
+            }
+        else:
+            return{
+                "id": self.task_id,
+                "goal_id": self.goaltask_id,
+                "title": self.title,
+                "description": self.description,
+                "is_complete": False if self.completed_at is None else True
+            }