Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Leticia -Cedar #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
4 changes: 3 additions & 1 deletion app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@ def create_app(test_config=None):
migrate.init_app(app, db)

# Register Blueprints here

from app.models.task import Task
from .routes import tasks_bp
app.register_blueprint(tasks_bp)
return app
23 changes: 23 additions & 0 deletions app/models/task.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
from flask import current_app
import requests, os
from app import db



class Task(db.Model):
task_id = db.Column(db.Integer, primary_key=True)
title = db.Column(db.String)
description = db.Column(db.String)
completed_at = db.Column(db.DateTime)
is_complete = db.Column(db.Boolean)

def to_dict(self):
return {
"id": self.task_id,
"title": self.title,
"description": self.description,
"is_complete": self.completed_at is not None

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a clever way to turn self.completed_at into a boolean!

}

def post_message_on_slack(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work making this a instance method.

url = os.environ.get("URL")
data = {
'token': os.environ.get("KEY"),
'channel': "task_notifications",
'text': f"Someone just completed the task: {self.title}"
}
requests.post(url, data)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like there's a small error here. The syntax for sending a request body is requests.pos(url, data=data) https://docs.python-requests.org/en/latest/user/quickstart/#make-a-request

Suggested change
requests.post(url, data)
requests.post(url, data=data)

113 changes: 113 additions & 0 deletions app/routes.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,115 @@
from flask import Blueprint
from app import db
from app.models.task import Task
from flask import Blueprint, jsonify, make_response, request, abort
import datetime, requests, os
import os

tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")

def valid_int(number, parameter_type):
try:
int(number)
except:
abort(make_response({"error": f"{parameter_type} must be an int"})), 400

def get_task_from_id(task_id):
valid_int(task_id, "task_id")
return Task.query.get_or_404(task_id, description="{task not found}")


@tasks_bp.route("", methods=["POST"])
def create_tasks():
request_body = request.get_json()
if "title" not in request_body or "description" not in request_body or "completed_at" not in request_body:
return make_response({"details": "Invalid data"}), 400

new_task = Task(
title=request_body["title"],
description=request_body["description"],
completed_at=request_body["completed_at"]
)

db.session.add(new_task)
db.session.commit()
return jsonify({"task": new_task.to_dict()}), 201


@tasks_bp.route("/<task_id>", methods=["GET"])
def read_task(task_id):
task = get_task_from_id(task_id)
return {"task": task.to_dict()}


@tasks_bp.route("/<task_id>", methods=["DELETE"])
def delete_task(task_id):
task = get_task_from_id(task_id)
db.session.delete(task)
db.session.commit()
return make_response({"details":f'Task {task.task_id} "{task.title}" successfully deleted'}), 200

@tasks_bp.route("/<task_id>", methods=["PUT"])
def update_task(task_id):
task= get_task_from_id(task_id)
request_body=request.get_json()

if "title" in request_body:
task.title=request_body["title"]
if "description" in request_body:
task.description=request_body["description"]
if "completed_at" in request_body:
task.completed_at=request_body["completed_at"]

db.session.commit()
return make_response({"task":task.to_dict()}), 200


@tasks_bp.route("", methods=["GET"])
def read_all_tasks():

sort_query = request.args.get("sort")

if sort_query == "asc":
tasks = Task.query.order_by(Task.title.asc())
elif sort_query == "desc":
tasks = Task.query.order_by(Task.title.desc())
else:
tasks = Task.query.all()

tasks_response = []
for task in tasks:
tasks_response.append(
task.to_dict()
)
return jsonify(tasks_response)

#### marking tasks complete ####
@tasks_bp.route("/<task_id>/mark_complete", methods=["PATCH"])
def mark_complete_on_incomplete_task(task_id):

task = get_task_from_id(task_id)

task.completed_at = datetime.date.today()
db.session.commit()

task.post_message_on_slack()
####i do not know what is missing here###

@tasks_bp.route("/<task_id>/mark_incomplete", methods=["PATCH"])
def mark_incomplete_on_complete_task(task_id):
task = get_task_from_id(task_id)

task.completed_at = None
db.session.commit()
Comment on lines +87 to +103

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two methods still need to return a response. All route functions are required to return something. It can simply be a response code, but we should look to our tests for what exactly the response should be.













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"}
40 changes: 40 additions & 0 deletions migrations/versions/00c09637dfc9_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
"""empty message

Revision ID: 00c09637dfc9
Revises:
Create Date: 2021-11-04 10:47:01.998328

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '00c09637dfc9'
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.Column('title', sa.String(), nullable=True),
sa.Column('description', sa.String(), nullable=True),
sa.Column('completed_at', sa.DateTime(), nullable=True),
sa.Column('is_complete', sa.Boolean(), nullable=True),
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 ###