Paper-Ruthie Newman

Procfile

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

app/__init__.py

@@ -23,12 +23,22 @@ def create_app(test_config=None):
             "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)
 
     # Register Blueprints here
 
+    #task
+    from .routes import tasks_bp
+    app.register_blueprint(tasks_bp)
+
+    #goal
+    from .routes import goals_bp
+    app.register_blueprint(goals_bp)
+
+    from app.models.task import Task
+    from app.models.goal import Goal
+
+
     return app

app/models/goal.py

@@ -3,4 +3,21 @@
 
 
 class Goal(db.Model):
-    goal_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String(50))
+    tasks = db.relationship('Task', backref='goal', lazy=True)
+
+    def create_goal_json(self):
+
+        return {
+                'id' : self.id,
+                'title' : self.title
+        }
+
+    def from_json(request_dict):
+        # Converts JSON into a new instance of Task
+        new_goal = Goal(
+        title = request_dict["title"]
+        )
+
+        return new_goal

app/models/task.py

@@ -1,6 +1,48 @@
 from flask import current_app
 from app import db
+from flask import Blueprint
 
 
 class Task(db.Model):
-    task_id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    title = db.Column(db.String(50))
+    description = db.Column(db.String(50)) 
+    completed_at = db.Column(db.DateTime, nullable=True)
+    goal_id = db.Column(db.Integer, db.ForeignKey("goal.id"), nullable=True)
+
+
+    def create_json(self):
+        if self.completed_at == None:
+            completed = False
+        else:
+            completed = True
+
+        return {
+                'id' : self.id,
+                'title' : self.title,
+                'description' : self.description,
+                'is_complete' : completed
+        }
+
+    def create_json_with_goal_id(self):
+        if self.completed_at == None:
+            completed = False
+        else:
+            completed = True
+
+        return {
+                'id' : self.id,
+                'goal_id' : self.goal_id,
+                'title' : self.title,
+                'description' : self.description,
+                'is_complete' : completed
+        }
+
+    def from_json(request_dict):
+        new_task = Task(
+        title = request_dict["title"],
+        description = request_dict["description"],
+        completed_at = request_dict["completed_at"]
+        )
+
+        return new_task