Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def create_app(test_config=None):
db.init_app(app)
migrate.init_app(app, db)

from .routes import task_bp, goal_bp
# Register Blueprints here
app.register_blueprint(task_bp)
app.register_blueprint(goal_bp)

return app
5 changes: 4 additions & 1 deletion app/models/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@


class Task(db.Model):
task_id = db.Column(db.Integer, primary_key=True)
id = db.Column(db.Integer, primary_key=True)
title = db.Column(db.String)
description = db.Column(db.String)
completed_at = db.Column(db.DateTime, nullable = True)
103 changes: 102 additions & 1 deletion app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,103 @@
from flask import Blueprint
from flask import Blueprint, request, jsonify
from flask.helpers import make_response
from app import db
from app.models.goal import Goal
from app.models.task import Task

task_bp = Blueprint("task_bp", __name__, url_prefix="/tasks")
goal_bp = Blueprint("goal_bp", __name__, url_prefix="/goals")

# Create a Task: Valid Task With null completed_at
# As a client, I want to be able to make a POST
# request to /tasks with the following HTTP request body

@task_bp.route("", methods=["POST", "GET"])
def handle_tasks():
request_body = request.get_json()
response_body = []

if request.method == "GET":
tasks = Task.query.all()
#return tasks
# if tasks is None:
# return {
# "details" : "You have no scheduled tasks"
# }, 400

# else:
for task in tasks:
response_body.append({
"id" : task.id,
"title": task.title,
"description": task.description,
"is_complete": False
})
return jsonify(response_body)

elif request.method == "POST":
if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body:
return {
"details": "Invalid data"
}, 400

new_task = Task(
title = request_body["title"],
description = request_body["description"],
completed_at = request_body["completed_at"]
)
#try:
db.session.add(new_task)
db.session.commit()
# except:
# pass
# return # error

return {
"task" : {
"id" : new_task.id,
"title" : new_task.title,
"description" : new_task.description,
"is_complete" : False
}
}, 201

@task_bp.route("/<task_id>", methods=["PUT", "GET", "DELETE"])
def handle_specific_task(task_id):

task = Task.query.get(task_id)
if task is None:
pass

if request.method == "GET":
return {
"task" : {
"id" : task.id,
"description" : task.description,
"title": task.title,
"is_complete" : False
},
}, 200

elif request.method == "PUT":
form_data = request.get_json()

task.description = form_data["description"]
task.title = form_data["title"]

db.session.commit()
return {
"task": {
"id": task.id,
"title": task.title,
"description": task.description,
"is_complete": False
}
}, 200

elif request.method == "DELETE":
db.session.delete(task)
db.session.commit()

return {
"details" : f'Task {task.id} "{task.title}" successfully deleted'
}, 200
1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
45 changes: 45 additions & 0 deletions migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# A generic, single database configuration.

[alembic]
# template used to generate migration files
# file_template = %%(rev)s_%%(slug)s

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false


# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARN
handlers = console
qualname =

[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
96 changes: 96 additions & 0 deletions migrations/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
from __future__ import with_statement

import logging
from logging.config import fileConfig

from sqlalchemy import engine_from_config
from sqlalchemy import pool
from flask import current_app

from alembic import context

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config

# Interpret the config file for Python logging.
# This line sets up loggers basically.
fileConfig(config.config_file_name)
logger = logging.getLogger('alembic.env')

# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
config.set_main_option(
'sqlalchemy.url',
str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
target_metadata = current_app.extensions['migrate'].db.metadata

# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.


def run_migrations_offline():
"""Run migrations in 'offline' mode.

This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.

Calls to context.execute() here emit the given string to the
script output.

"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url, target_metadata=target_metadata, literal_binds=True
)

with context.begin_transaction():
context.run_migrations()


def run_migrations_online():
"""Run migrations in 'online' mode.

In this scenario we need to create an Engine
and associate a connection with the context.

"""

# this callback is used to prevent an auto-migration from being generated
# when there are no changes to the schema
# reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
def process_revision_directives(context, revision, directives):
if getattr(config.cmd_opts, 'autogenerate', False):
script = directives[0]
if script.upgrade_ops.is_empty():
directives[:] = []
logger.info('No changes in schema detected.')

connectable = engine_from_config(
config.get_section(config.config_ini_section),
prefix='sqlalchemy.',
poolclass=pool.NullPool,
)

with connectable.connect() as connection:
context.configure(
connection=connection,
target_metadata=target_metadata,
process_revision_directives=process_revision_directives,
**current_app.extensions['migrate'].configure_args
)

with context.begin_transaction():
context.run_migrations()


if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()
24 changes: 24 additions & 0 deletions migrations/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"""${message}

Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}

"""
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}

# revision identifiers, used by Alembic.
revision = ${repr(up_revision)}
down_revision = ${repr(down_revision)}
branch_labels = ${repr(branch_labels)}
depends_on = ${repr(depends_on)}


def upgrade():
${upgrades if upgrades else "pass"}


def downgrade():
${downgrades if downgrades else "pass"}
36 changes: 36 additions & 0 deletions migrations/versions/7159854885dd_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"""empty message

Revision ID: 7159854885dd
Revises:
Create Date: 2021-12-01 12:48:03.569997

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '7159854885dd'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('goal',
sa.Column('goal_id', sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint('goal_id')
)
op.create_table('task',
sa.Column('task_id', sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint('task_id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('task')
op.drop_table('goal')
# ### end Alembic commands ###
32 changes: 32 additions & 0 deletions migrations/versions/92347091eed1_changes_made_to_task_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"""changes made to task model

Revision ID: 92347091eed1
Revises: 7159854885dd
Create Date: 2021-12-01 12:52:01.043065

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '92347091eed1'
down_revision = '7159854885dd'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('task', sa.Column('completed_at', sa.DateTime(), nullable=True))
op.add_column('task', sa.Column('description', sa.String(), nullable=True))
op.add_column('task', sa.Column('title', sa.String(), nullable=True))
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('task', 'title')
op.drop_column('task', 'description')
op.drop_column('task', 'completed_at')
# ### end Alembic commands ###
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""changes task model attribute from task_id to id

Revision ID: a053b04a2a16
Revises: 92347091eed1
Create Date: 2021-12-01 14:00:52.428375

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'a053b04a2a16'
down_revision = '92347091eed1'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('task', sa.Column('id', sa.Integer(), nullable=False))
op.drop_column('task', 'task_id')
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('task', sa.Column('task_id', sa.INTEGER(), autoincrement=True, nullable=False))
op.drop_column('task', 'id')
# ### end Alembic commands ###
Empty file added tests/test_route.py
Empty file.