Seaturtles_Ashley_Benson

Procfile

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

app/__init__.py

@@ -12,23 +12,51 @@
 
 def create_app(test_config=None):
     app = Flask(__name__)
-    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
-    if test_config is None:
-        app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
+    if not test_config:
+        app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+        app.config['SQLALCHEMY_DATABASE_URI'] = os.environ.get(
             "SQLALCHEMY_DATABASE_URI")
     else:
         app.config["TESTING"] = True
+        app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
         app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get(
             "SQLALCHEMY_TEST_DATABASE_URI")
 
-    # Import models here for Alembic setup
+    db.init_app(app)
+    migrate.init_app(app, db)
+
     from app.models.task import Task
     from app.models.goal import Goal
+    from app.routes import tasks_bp
+    from app.routes import goals_bp
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+    return app
 
-    db.init_app(app)
-    migrate.init_app(app, db)
 
-    # Register Blueprints here
 
-    return app
+# def create_app(test_config=None):
+#     app = Flask(__name__)
+#     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+
+#     if test_config is None:
+#         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")
+#     print("SQLALCHEMY_DATABASE_URI is " + app.config["SQLALCHEMY_DATABASE_URI"]);
+#     # Import models here for Alembic setup
+#     from app.models.tasks import Task
+#     from app.models.goal import Goal
+
+#     db.init_app(app)
+#     migrate.init_app(app, db)
+
+#     # Register Blueprints here
+#     from .routes import tasks_bp
+#     app.register_blueprint(tasks_bp)
+
+#     return app

app/models/__init__.py

@@ -0,0 +1 @@
+

app/models/goal.py

@@ -1,5 +1,24 @@
 from app import db
+from flask import abort, make_response
 
 
 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)
+    tasks = db.relationship("Task", backref="goal", lazy=True)
+
+
+    def to_json(self):
+        return {
+            "id" : self.goal_id,
+            "title" : self.title
+            }
+
+    @classmethod
+    def create_task(cls, request_body):
+        try:
+            new_task = cls(title=request_body['title'])
+            return new_task
+        except:
+            return abort(make_response({"details": "Invalid data"}, 400))

app/models/task.py

@@ -1,5 +1,73 @@
 from app import db
-
+from flask import jsonify, abort, make_response
+# from requests import requests
 
 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, nullable=False)
+    description = db.Column(db.String, nullable=False)
+    completed_at = db.Column(db.DateTime)
+    goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True)
+    goals = db.relationship("Goal")
+
+    def to_json(self):
+        is_complete = self.completed_at != None
+
+        hash_map = {
+            "id" : self.task_id,
+            "title" : self.title,
+            "description" : self.description,
+            "is_complete" : is_complete
+            }
+        if self.goal_id:
+            hash_map["goal_id"] = self.goal_id
+
+        return hash_map    
+
+
+    @classmethod
+    def create_task(cls, request_body):
+        try:
+            try:
+                new_task = cls(
+                title=request_body['title'],
+                description=request_body['description'],
+                completed_at=request_body['completed_at']
+                )
+            except KeyError: 
+                new_task = cls(
+                title=request_body['title'],
+                description=request_body['description'],
+            )
+            return new_task
+        except:
+            return abort(make_response({"details": "Invalid data"}, 400))
+
+
+    # def to_dict(self):
+    #     return {
+    #     "task": {
+    #         "id": self.id,
+    #         "task_id": self.id,
+    #         "title": self.title,
+    #         "description": self.description,
+    #         "is_complete": self.completed_at
+
+
+
+
+    # @classmethod
+    # def from_dict(cls, data_dict):
+    #     return cls(
+    #         title=data_dict["title"],
+    #         description=data_dict["description"],
+    #         completed_at=data_dict["completed_at"],
+    #     )
+
+
+        #return dict(
+        #     id=self.task_id,
+        #     title = self.title,
+        #     description=self.description,
+        #     is_complete = True if self.completed_at else False
+        # )