Scissors - Jittania Smith

.gitignore

@@ -138,4 +138,8 @@ dmypy.json
 .pytype/
 
 # Cython debug symbols
-cython_debug/
+cython_debug/
+
+# Xtra Scratch files
+scratch_pad.md 
+scratch_pad.py

Procfile

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

app/__init__.py

@@ -30,5 +30,12 @@ def create_app(test_config=None):
     migrate.init_app(app, db)
 
     # 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

@@ -3,4 +3,20 @@
 
 
 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='goal', lazy=True)
+
+    # This instance method returns a JSON dictionary of attribute values 
+    # with an optional argument if the goal has tasks assigned to it
+    def convert_to_json(self, tasks_list=None):
+
+        response_body = {  
+            "id": self.goal_id,
+            "title": self.title
+        }
+
+        if tasks_list != None:
+            response_body["tasks"] = tasks_list
+
+        return response_body

app/models/task.py

@@ -3,4 +3,25 @@
 
 
 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)
+    match_goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'),nullable=True)
+
+
+    # This instance method checks if a task has been completed, and whether it 
+    # has a matching goal id, then returns a JSON dictionary of attribute values 
+    def convert_to_json(self):
+
+        response_body = { 
+            "id": self.task_id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": bool(self.completed_at)
+            }
+
+        if self.match_goal_id:
+            response_body["goal_id"] = self.match_goal_id
+
+        return response_body