From cadd644176b094e8d2a2f1536bf2d41d77309a93 Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Tue, 8 Nov 2022 00:44:12 -0500 Subject: [PATCH 01/10] Created routes for wave 1. test_create_task test is not passed --- app/__init__.py | 2 + app/models/task.py | 5 +- app/routes.py | 111 ++++++++++++++++++++++++++- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++ migrations/env.py | 96 +++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++ migrations/versions/a54563bf2819_.py | 39 ++++++++++ tests/test_wave_01.py | 42 +++++----- 9 files changed, 345 insertions(+), 20 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/a54563bf2819_.py diff --git a/app/__init__.py b/app/__init__.py index 2764c4cc8..30052751d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,5 +30,7 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here + from .routes import tasks_bp + app.register_blueprint(tasks_bp) return app diff --git a/app/models/task.py b/app/models/task.py index c91ab281f..6cdc71724 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -2,4 +2,7 @@ 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) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index 3aae38d49..e2ceeeb99 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1 +1,110 @@ -from flask import Blueprint \ No newline at end of file +from flask import Blueprint, request, make_response, jsonify, abort +from app.models.task import Task +from app import db + + +tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") + +def validate_task(task_id): + try: + task_id = int(task_id) + except: + abort(make_response({"message":f"Task {task_id} invalid"}, 400)) + + task = Task.query.get(task_id) + + if not task: + abort(make_response({"message":f"Task {task_id} not found"}, 404)) + + return task + + +@tasks_bp.route("", methods=["GET"]) +def read_all_tasks(): + title_query = request.args.get("title") + + if title_query: + tasks = Task.query.filter_by(title=title_query) + else: + tasks = Task.query.all() + + tasks_response = [] + for task in tasks: + tasks_response.append( + { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + ) + return jsonify(tasks_response) + + +@tasks_bp.route("/", methods=["GET"]) +def read_one_task(task_id): + task = validate_task(task_id) + return {"task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + } + + +@tasks_bp.route("", methods=["POST"]) +def create_task(): + request_body = request.get_json() + + if "title" not in request_body or "description" 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 make_response({ + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": False + } + }, 201) + + +@tasks_bp.route("/", methods=["PUT"]) +def update_task(task_id): + task = validate_task(task_id) + + request_body = request.get_json() + + task.title = request_body["title"] + task.description = request_body["description"] + + db.session.commit() + + return make_response({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }, 200) + + +@tasks_bp.route("/", methods=["DELETE"]) +def delete_task(task_id): + task = validate_task(task_id) + + db.session.delete(task) + db.session.commit() + + return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) diff --git a/migrations/README b/migrations/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 000000000..f8ed4801f --- /dev/null +++ b/migrations/alembic.ini @@ -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 diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 000000000..8b3fb3353 --- /dev/null +++ b/migrations/env.py @@ -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() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 000000000..2c0156303 --- /dev/null +++ b/migrations/script.py.mako @@ -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"} diff --git a/migrations/versions/a54563bf2819_.py b/migrations/versions/a54563bf2819_.py new file mode 100644 index 000000000..78d32c1b8 --- /dev/null +++ b/migrations/versions/a54563bf2819_.py @@ -0,0 +1,39 @@ +"""empty message + +Revision ID: a54563bf2819 +Revises: +Create Date: 2022-11-07 21:15:46.684413 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a54563bf2819' +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.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 ### diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index dca626d78..3356a50a9 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_no_saved_tasks(client): # Act response = client.get("/tasks") @@ -13,7 +13,7 @@ def test_get_tasks_no_saved_tasks(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_one_saved_tasks(client, one_task): # Act response = client.get("/tasks") @@ -32,7 +32,7 @@ def test_get_tasks_one_saved_tasks(client, one_task): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task(client, one_task): # Act response = client.get("/tasks/1") @@ -51,7 +51,7 @@ def test_get_task(client, one_task): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_not_found(client): # Act response = client.get("/tasks/1") @@ -59,14 +59,16 @@ def test_get_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == { + "message" : "Task 1 not found" + } + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ @@ -93,7 +95,7 @@ def test_create_task(client): assert new_task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task(client, one_task): # Act response = client.put("/tasks/1", json={ @@ -119,7 +121,7 @@ def test_update_task(client, one_task): assert task.completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_update_task_not_found(client): # Act response = client.put("/tasks/1", json={ @@ -130,14 +132,16 @@ def test_update_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") - # ***************************************************************** + assert response_body == { + "message" : "Task 1 not found" + } + # raise Exception("Complete test with assertion about response body") + # # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task(client, one_task): # Act response = client.delete("/tasks/1") @@ -152,7 +156,7 @@ def test_delete_task(client, one_task): assert Task.query.get(1) == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_task_not_found(client): # Act response = client.delete("/tasks/1") @@ -160,8 +164,10 @@ def test_delete_task_not_found(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == { + "message" : "Task 1 not found" + } + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** @@ -169,7 +175,7 @@ def test_delete_task_not_found(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_title(client): # Act response = client.post("/tasks", json={ @@ -186,7 +192,7 @@ def test_create_task_must_contain_title(client): assert Task.query.all() == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task_must_contain_description(client): # Act response = client.post("/tasks", json={ From e5bf69c38adc6c73633ff76d6fdffe20cd07a15d Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Tue, 8 Nov 2022 09:35:13 -0500 Subject: [PATCH 02/10] Solved wave 3 --- app/__init__.py | 12 ++++++++++ app/models/task.py | 2 +- app/routes.py | 54 ++++++++++++++++++++++++++++++++++++++++++- tests/test_wave_01.py | 2 +- tests/test_wave_03.py | 24 +++++++++++-------- 5 files changed, 81 insertions(+), 13 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 30052751d..d152bc79e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,6 +3,7 @@ from flask_migrate import Migrate import os from dotenv import load_dotenv +import requests db = SQLAlchemy() @@ -34,3 +35,14 @@ def create_app(test_config=None): app.register_blueprint(tasks_bp) return app + +def slack_bot_message(message): + PATH = "https://slack.com/api/chat.postMessage" + SLACK_API_KEY = os.environ.get('API_KEY') + + query_params = { + "channel": "task-notifications", + "text": message + } + + requests.post(PATH, params=query_params, headers={"Authorization": SLACK_API_KEY}) diff --git a/app/models/task.py b/app/models/task.py index 6cdc71724..569493509 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -5,4 +5,4 @@ class Task(db.Model): 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) \ No newline at end of file + completed_at = db.Column(db.DateTime, nullable=True) diff --git a/app/routes.py b/app/routes.py index e2ceeeb99..b8e5193e2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,8 @@ from flask import Blueprint, request, make_response, jsonify, abort from app.models.task import Task from app import db +import datetime + tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") @@ -22,7 +24,8 @@ def validate_task(task_id): @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): title_query = request.args.get("title") - + # sort_query = request.args.get("sort") + if title_query: tasks = Task.query.filter_by(title=title_query) else: @@ -38,6 +41,10 @@ def read_all_tasks(): "is_complete": False } ) + # if sort_query == "asc" and tasks_response: + # return jsonify(tasks_response).order_by(task.title.asc()) + # else: + # return jsonify(tasks_response).order_by(task.title.desc()) return jsonify(tasks_response) @@ -108,3 +115,48 @@ def delete_task(task_id): db.session.commit() return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) + + +@tasks_bp.route("//mark_complete", methods=["PATCH"]) +def update_incompleted_task_to_complete(task_id): + task = validate_task(task_id) + + task.completed_at = datetime.datetime.utcnow() + + db.session.commit() + + slack_bot_message(f"Someone just completed the task {task.title}") + + return make_response(jsonify({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": True + } + }), 200) + + +@tasks_bp.route("//mark_incomplete", methods=["PATCH"]) +def update_completed_task_to_incomplete(task_id): + task = validate_task(task_id) + + task.completed_at = None + + db.session.commit() + + return make_response(jsonify({ + "task": { + "id": task.task_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + }), 200) + +# def is_complete(): +# request_body = request.get_json() +# if request_body["completed_at"] is not None: +# return True +# else: +# return False \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 3356a50a9..f02d84cdf 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -68,7 +68,7 @@ def test_get_task_not_found(client): # ***************************************************************** -# @pytest.mark.skip(reason="No way to test this feature yet") +@pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 32d379822..5eb097ad3 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -5,7 +5,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_incomplete_task(client, one_task): # Arrange """ @@ -42,7 +42,7 @@ def test_mark_complete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_complete_task(client, completed_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -62,7 +62,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_on_completed_task(client, completed_task): # Arrange """ @@ -99,7 +99,7 @@ def test_mark_complete_on_completed_task(client, completed_task): assert Task.query.get(1).completed_at -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_on_incomplete_task(client, one_task): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -119,7 +119,7 @@ def test_mark_incomplete_on_incomplete_task(client, one_task): assert Task.query.get(1).completed_at == None -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_complete_missing_task(client): # Act response = client.patch("/tasks/1/mark_complete") @@ -127,14 +127,16 @@ def test_mark_complete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == { + "message" : "Task 1 not found" + } + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_mark_incomplete_missing_task(client): # Act response = client.patch("/tasks/1/mark_incomplete") @@ -142,8 +144,10 @@ def test_mark_incomplete_missing_task(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == { + "message" : "Task 1 not found" + } + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** From c80c97b23e4bfcae89a6fb07a3af9cbd02d2ad0d Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Wed, 9 Nov 2022 01:43:39 -0500 Subject: [PATCH 03/10] Tests for waves 1, 2 and 3 passed --- app/__init__.py | 9 -- app/models/task.py | 16 ++++ app/routes.py | 190 +++++++++++++++++++++++++++--------------- tests/test_wave_01.py | 2 +- tests/test_wave_02.py | 4 +- 5 files changed, 142 insertions(+), 79 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index d152bc79e..fcf35a4fc 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -36,13 +36,4 @@ def create_app(test_config=None): return app -def slack_bot_message(message): - PATH = "https://slack.com/api/chat.postMessage" - SLACK_API_KEY = os.environ.get('API_KEY') - query_params = { - "channel": "task-notifications", - "text": message - } - - requests.post(PATH, params=query_params, headers={"Authorization": SLACK_API_KEY}) diff --git a/app/models/task.py b/app/models/task.py index 569493509..e876b0b8a 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -6,3 +6,19 @@ class Task(db.Model): title = db.Column(db.String) description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + + + def to_dict(self): + planet_as_dict = {} + planet_as_dict["id"] = self.task_id + planet_as_dict["title"] = self.title + planet_as_dict["description"] = self.description + planet_as_dict["completed_at"] = self.completed_at + + return planet_as_dict + + @classmethod + def from_dict(cls, req_body): + return cls(title=req_body["title"], + description=req_body["description"], + completed_at=req_body["completed_at"]) \ No newline at end of file diff --git a/app/routes.py b/app/routes.py index b8e5193e2..7531f4981 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,37 +1,54 @@ from flask import Blueprint, request, make_response, jsonify, abort +from sqlalchemy import asc, desc from app.models.task import Task from app import db -import datetime +from datetime import datetime +import os -tasks_bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks") +tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -def validate_task(task_id): +# def validate_task(task_id): +# try: +# task_id = int(task_id) +# except: +# abort(make_response({"message":f"Task {task_id} invalid"}, 400)) + +# task = Task.query.get(task_id) + +# if not task: +# abort(make_response({"message":f"Task {task_id} not found"}, 404)) + +# return task + +def get_validate_model(cls, model_id): try: - task_id = int(task_id) + model_id = int(model_id) except: - abort(make_response({"message":f"Task {task_id} invalid"}, 400)) + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) - task = Task.query.get(task_id) + model = cls.query.get(model_id) - if not task: - abort(make_response({"message":f"Task {task_id} not found"}, 404)) + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) - return task + return model @tasks_bp.route("", methods=["GET"]) def read_all_tasks(): - title_query = request.args.get("title") - # sort_query = request.args.get("sort") + order_by = request.args.get("sort") - if title_query: - tasks = Task.query.filter_by(title=title_query) + if order_by == 'asc': + tasks = Task.query.order_by(asc('title')).all() + elif order_by == 'desc': + tasks = Task.query.order_by(desc('title')).all() else: tasks = Task.query.all() tasks_response = [] + for task in tasks: tasks_response.append( { @@ -41,17 +58,14 @@ def read_all_tasks(): "is_complete": False } ) - # if sort_query == "asc" and tasks_response: - # return jsonify(tasks_response).order_by(task.title.asc()) - # else: - # return jsonify(tasks_response).order_by(task.title.desc()) - return jsonify(tasks_response) + + return make_response(jsonify(tasks_response), 200) @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): - task = validate_task(task_id) - return {"task": { + task = get_validate_model(Task, task_id) + task_response = {"task": { "id": task.task_id, "title": task.title, "description": task.description, @@ -59,6 +73,8 @@ def read_one_task(task_id): } } + return make_response(jsonify(task_response), 200) + @tasks_bp.route("", methods=["POST"]) def create_task(): @@ -68,95 +84,135 @@ def create_task(): return make_response({ "details": "Invalid data" }, 400) - + + # try: + # new_task = Task.from_dict(request_body) + # except KeyError: + # abort(make_response({ + # "details": "Invalid data" + # }, 400)) + # new_task = Task.from_dict(request_body) new_task = Task(title=request_body["title"], - description=request_body["description"], - completed_at=request_body["completed_at"]) + description=request_body["description"], + completed_at=None) - db.session.add(new_task) - db.session.commit() + db.session.add(new_task) # track this object + db.session.commit() # any changes that are pending commit those changes as data written in SQL - return make_response({ - "task": { - "id": new_task.task_id, - "title": new_task.title, - "description": new_task.description, - "is_complete": False - } - }, 201) + return make_response(jsonify({ + "task": { + "id": new_task.task_id, + "title": new_task.title, + "description": new_task.description, + "is_complete": False + } + }), 201) @tasks_bp.route("/", methods=["PUT"]) def update_task(task_id): - task = validate_task(task_id) + # task_model = get_validate_model(Task, task_id) request_body = request.get_json() - task.title = request_body["title"] - task.description = request_body["description"] + task_model = Task.query.get(task_id) + + if not task_model: + return make_response({"message":f"Task {task_id} not found"}, 404) + + task_model.title = request_body["title"] + task_model.description = request_body["description"] db.session.commit() return make_response({ - "task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False - } - }, 200) + "task": { + "id": task_model.task_id, + "title": task_model.title, + "description": task_model.description, + "is_complete": False + } + }, 200) + @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): - task = validate_task(task_id) + # task = get_validate_model(Task, task_id) + + task_model = Task.query.get(task_id) + + if not task_model: + return make_response({"message":f"Task {task_id} not found"}, 404) - db.session.delete(task) + db.session.delete(task_model) db.session.commit() - return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) + return make_response({"details": f'Task {task_id} {task_model.title} successfully deleted'}, 200) @tasks_bp.route("//mark_complete", methods=["PATCH"]) def update_incompleted_task_to_complete(task_id): - task = validate_task(task_id) + # task = get_validate_model(Task, task_id) + task_model = Task.query.get(task_id) - task.completed_at = datetime.datetime.utcnow() + if not task_model: + return make_response({"message":f"Task {task_id} not found"}, 404) - db.session.commit() + task_model.completed_at = datetime.now() - slack_bot_message(f"Someone just completed the task {task.title}") + db.session.commit() + # slack_bot(task) + # return make_response(jsonify({"task": task_response}), 200) return make_response(jsonify({ - "task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": True - } - }), 200) + "task": { + "id": task_model.task_id, + "title": task_model.title, + "description": task_model.description, + "is_complete": True + } + }), 200) @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def update_completed_task_to_incomplete(task_id): - task = validate_task(task_id) + # task = get_validate_model(Task, task_id) + task_model = Task.query.get(task_id) - task.completed_at = None + if not task_model: + return make_response({"message":f"Task {task_id} not found"}, 404) + + task_model.completed_at = None db.session.commit() + # slack_bot(task) + # return make_response(jsonify({"task": task_response}), 200) return make_response(jsonify({ - "task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False - } - }), 200) + "task": { + "id": task_model.task_id, + "title": task_model.title, + "description": task_model.description, + "is_complete": False + } + }), 200) # def is_complete(): # request_body = request.get_json() # if request_body["completed_at"] is not None: # return True # else: -# return False \ No newline at end of file +# return False + + +# def slack_bot(task): +# PATH = "https://slack.com/api/chat.postMessage" +# SLACK_API_KEY = os.environ.get('SLACK_API_KEY') + +# query_params = { +# "channel": "task-notifications", +# "text": f"Someone just completed the task {task.title}" +# } + +# requests.post(PATH, params=query_params, headers={"Authorization": SLACK_API_KEY}) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index f02d84cdf..3356a50a9 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -68,7 +68,7 @@ def test_get_task_not_found(client): # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_task(client): # Act response = client.post("/tasks", json={ diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index a087e0909..651e3aebd 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -1,7 +1,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_asc(client, three_tasks): # Act response = client.get("/tasks?sort=asc") @@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_sorted_desc(client, three_tasks): # Act response = client.get("/tasks?sort=desc") From ef23af0e9eab19fec257110046e656f0cc34165a Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Wed, 9 Nov 2022 09:52:28 -0500 Subject: [PATCH 04/10] Small changes in DELETE route --- app/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.py b/app/routes.py index 7531f4981..7bd000881 100644 --- a/app/routes.py +++ b/app/routes.py @@ -148,7 +148,7 @@ def delete_task(task_id): db.session.delete(task_model) db.session.commit() - return make_response({"details": f'Task {task_id} {task_model.title} successfully deleted'}, 200) + return make_response({"details": f'Task {task_id} "{task_model.title}" successfully deleted'}, 200) @tasks_bp.route("//mark_complete", methods=["PATCH"]) From e70d1743ddb22d5ba0e9cb427ad975186a206e0c Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Wed, 9 Nov 2022 12:57:50 -0500 Subject: [PATCH 05/10] Wave 4. Post message into Slack successfully --- app/__init__.py | 1 - app/models/goal.py | 1 + app/models/task.py | 12 ++++++------ app/routes.py | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index fcf35a4fc..af3130f1a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,7 +3,6 @@ from flask_migrate import Migrate import os from dotenv import load_dotenv -import requests db = SQLAlchemy() diff --git a/app/models/goal.py b/app/models/goal.py index b0ed11dd8..b7dbe5434 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,3 +3,4 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index e876b0b8a..f42b5f756 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -9,13 +9,13 @@ class Task(db.Model): def to_dict(self): - planet_as_dict = {} - planet_as_dict["id"] = self.task_id - planet_as_dict["title"] = self.title - planet_as_dict["description"] = self.description - planet_as_dict["completed_at"] = self.completed_at + task_dict = {} + task_dict["id"] = self.task_id + task_dict["title"] = self.title + task_dict["description"] = self.description + task_dict["completed_at"] = self.completed_at - return planet_as_dict + return task_dict @classmethod def from_dict(cls, req_body): diff --git a/app/routes.py b/app/routes.py index 7bd000881..a9d6c5357 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,6 +4,7 @@ from app import db from datetime import datetime import os +import requests @@ -163,7 +164,7 @@ def update_incompleted_task_to_complete(task_id): db.session.commit() - # slack_bot(task) + slack_bot(task_model) # return make_response(jsonify({"task": task_response}), 200) return make_response(jsonify({ "task": { @@ -187,7 +188,6 @@ def update_completed_task_to_incomplete(task_id): db.session.commit() - # slack_bot(task) # return make_response(jsonify({"task": task_response}), 200) return make_response(jsonify({ "task": { @@ -206,13 +206,13 @@ def update_completed_task_to_incomplete(task_id): # return False -# def slack_bot(task): -# PATH = "https://slack.com/api/chat.postMessage" -# SLACK_API_KEY = os.environ.get('SLACK_API_KEY') +def slack_bot(task): + PATH = "https://slack.com/api/chat.postMessage" + SLACK_API_KEY = os.environ.get("SLACK_API") -# query_params = { -# "channel": "task-notifications", -# "text": f"Someone just completed the task {task.title}" -# } + bot_params = { + "channel": "task-notifications", + "text": f"Someone just completed the task {task.title}" + } -# requests.post(PATH, params=query_params, headers={"Authorization": SLACK_API_KEY}) \ No newline at end of file + requests.post(PATH, data=bot_params, headers={"Authorization": SLACK_API_KEY}) From bcdb11384df03ea76f832b8b207a886f165ec196 Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Thu, 10 Nov 2022 10:39:15 -0500 Subject: [PATCH 06/10] Waves 4&5 solved. Tests passed --- app/__init__.py | 5 +- app/goal_routes.py | 154 +++++++++++++++++++++++++++ app/models/goal.py | 3 +- app/models/task.py | 16 +-- app/{routes.py => task_routes.py} | 4 +- migrations/versions/2a26934f185e_.py | 30 ++++++ migrations/versions/87b209d4a883_.py | 28 +++++ tests/test_wave_05.py | 79 +++++++++----- tests/test_wave_06.py | 18 ++-- 9 files changed, 291 insertions(+), 46 deletions(-) create mode 100644 app/goal_routes.py rename app/{routes.py => task_routes.py} (98%) create mode 100644 migrations/versions/2a26934f185e_.py create mode 100644 migrations/versions/87b209d4a883_.py diff --git a/app/__init__.py b/app/__init__.py index af3130f1a..a7095868d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -30,9 +30,12 @@ def create_app(test_config=None): migrate.init_app(app, db) # Register Blueprints here - from .routes import tasks_bp + from .task_routes import tasks_bp app.register_blueprint(tasks_bp) + from .goal_routes import goals_bp + app.register_blueprint(goals_bp) + return app diff --git a/app/goal_routes.py b/app/goal_routes.py new file mode 100644 index 000000000..432a6a9d4 --- /dev/null +++ b/app/goal_routes.py @@ -0,0 +1,154 @@ +from flask import Blueprint, request, make_response, jsonify, abort +from app.models.goal import Goal +from app.models.task import Task +from app import db + + +goals_bp = Blueprint("goals", __name__, url_prefix="/goals") + +def get_validate_model(cls, model_id): + try: + model_id = int(model_id) + except: + abort(make_response({"message":f"{cls.__name__} {model_id} invalid"}, 400)) + + model = cls.query.get(model_id) + + if not model: + abort(make_response({"message":f"{cls.__name__} {model_id} not found"}, 404)) + + return model + + +@goals_bp.route("", methods=["POST"]) +def create_goal(): + request_body = request.get_json() + + if "title" not in request_body: + return make_response({ + "details": "Invalid data" + }, 400) + + new_goal = Goal(title=request_body["title"]) + + db.session.add(new_goal) # track this object + db.session.commit() # any changes that are pending commit those changes as data written in SQL + return make_response(jsonify({ + "goal": { + "id": new_goal.goal_id, + "title": new_goal.title, + } + }), 201) + + +@goals_bp.route("", methods=["GET"]) +def read_all_goals(): + goals = Goal.query.all() + + goals_response = [] + + for goal in goals: + goals_response.append( + { + "id": goal.goal_id, + "title": goal.title + } + ) + + return make_response(jsonify(goals_response), 200) + + +@goals_bp.route("/", methods=["GET"]) +def read_one_goal(goal_id): + goal = get_validate_model(Goal, goal_id) + return make_response(jsonify({ + "goal": { + "id": goal.goal_id, + "title": goal.title, + } + }), 200) + + +@goals_bp.route("/", methods=["PUT"]) +def update_goal(goal_id): + goal_model = get_validate_model(Goal, goal_id) + + request_body = request.get_json() + + if not goal_model: + return make_response({"message":f"Goal {goal_model} not found"}, 404) + + goal_model.title = request_body["title"] + + db.session.commit() + + return make_response({ + "goal": { + "id": goal_model.goal_id, + "title": goal_model.title + } + }, 200) + + +@goals_bp.route("/", methods=["DELETE"]) +def delete_goal(goal_id): + task = get_validate_model(Goal, goal_id) + + goal_model = Goal.query.get(goal_id) + + if not goal_model: + return make_response({"message":f"Task {goal_id} not found"}, 404) + + db.session.delete(goal_model) + db.session.commit() + + return make_response({"details": f'Goal {goal_id} "{goal_model.title}" successfully deleted'}, 200) + + +@goals_bp.route("//tasks", methods=["POST"]) +def sending_list_of_task_ids_to_goal(goal_id): + goal = get_validate_model(Goal, goal_id) + request_body = request.get_json() + task_ids = request_body["task_ids"] + + goal.tasks = [] + for task_id in task_ids: + goal.tasks.append(Task.query.get(task_id)) + + db.session.commit() # any changes that are pending commit those changes as data written in SQL + + return make_response(jsonify({ + "id": goal.goal_id, + "task_ids": task_ids + }), 200) + + +@goals_bp.route("//tasks", methods=["GET"]) +def getting_list_of_tasks_by_goal(goal_id): + goal = get_validate_model(Goal, goal_id) + print('HELLO!!!!!!!') + tasks_list = [] + for task in goal.tasks: + # task_dict = {} + # task_dict["id"] = task.task_id + # task_dict["title"] = task.title + # task_dict["description"] = task.description + # task_dict["is_complete"] = False + # tasks_list.append(task_dict) + tasks_list.append( + { + "id": task.task_id, + "goal_id": task.goal_id, + "title": task.title, + "description": task.description, + "is_complete": False + } + ) + + # db.session.commit() # any changes that are pending commit those changes as data written in SQL + + return make_response(jsonify({ + "id": goal.goal_id, + "title": goal.title, + "tasks": tasks_list + }), 200) diff --git a/app/models/goal.py b/app/models/goal.py index b7dbe5434..b0c0cfbd3 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -3,4 +3,5 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) - title = db.Column(db.String) \ No newline at end of file + title = db.Column(db.String) + tasks = db.relationship("Task", back_populates="goal", lazy=True) \ No newline at end of file diff --git a/app/models/task.py b/app/models/task.py index f42b5f756..3897fbd60 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -7,15 +7,19 @@ class Task(db.Model): description = db.Column(db.String) completed_at = db.Column(db.DateTime, nullable=True) + # Many tasks to one goal + goal_id = db.Column(db.Integer, db.ForeignKey('goal.goal_id'), nullable=True) + goal = db.relationship("Goal", back_populates="tasks") + def to_dict(self): - task_dict = {} - task_dict["id"] = self.task_id - task_dict["title"] = self.title - task_dict["description"] = self.description - task_dict["completed_at"] = self.completed_at + result_dict = {} + result_dict["id"] = self.task_id + result_dict["title"] = self.title + result_dict["description"] = self.description + result_dict["completed_at"] = self.completed_at - return task_dict + return result_dict @classmethod def from_dict(cls, req_body): diff --git a/app/routes.py b/app/task_routes.py similarity index 98% rename from app/routes.py rename to app/task_routes.py index a9d6c5357..ff17705fa 100644 --- a/app/routes.py +++ b/app/task_routes.py @@ -65,6 +65,7 @@ def read_all_tasks(): @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): + print('!!!!!') task = get_validate_model(Task, task_id) task_response = {"task": { "id": task.task_id, @@ -73,7 +74,8 @@ def read_one_task(task_id): "is_complete": False } } - + if task.goal_id: + task_response["task"]["goal_id"] = task.goal_id return make_response(jsonify(task_response), 200) diff --git a/migrations/versions/2a26934f185e_.py b/migrations/versions/2a26934f185e_.py new file mode 100644 index 000000000..c856f1013 --- /dev/null +++ b/migrations/versions/2a26934f185e_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 2a26934f185e +Revises: 87b209d4a883 +Create Date: 2022-11-09 15:06:58.961189 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2a26934f185e' +down_revision = '87b209d4a883' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('task', sa.Column('goal_id', sa.Integer(), nullable=True)) + op.create_foreign_key(None, 'task', 'goal', ['goal_id'], ['goal_id']) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint(None, 'task', type_='foreignkey') + op.drop_column('task', 'goal_id') + # ### end Alembic commands ### diff --git a/migrations/versions/87b209d4a883_.py b/migrations/versions/87b209d4a883_.py new file mode 100644 index 000000000..e748727a0 --- /dev/null +++ b/migrations/versions/87b209d4a883_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 87b209d4a883 +Revises: a54563bf2819 +Create Date: 2022-11-09 12:58:51.565691 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '87b209d4a883' +down_revision = 'a54563bf2819' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('goal', sa.Column('title', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('goal', 'title') + # ### end Alembic commands ### diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index aee7c52a1..cefbed9ce 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,7 +1,8 @@ +from app.models.goal import Goal import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_no_saved_goals(client): # Act response = client.get("/goals") @@ -12,7 +13,7 @@ def test_get_goals_no_saved_goals(client): assert response_body == [] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goals_one_saved_goal(client, one_goal): # Act response = client.get("/goals") @@ -29,7 +30,7 @@ def test_get_goals_one_saved_goal(client, one_goal): ] -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_goal(client, one_goal): # Act response = client.get("/goals/1") @@ -46,22 +47,24 @@ def test_get_goal(client, one_goal): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_get_goal_not_found(client): - pass + # pass # Act response = client.get("/goals/1") response_body = response.get_json() - raise Exception("Complete test") + # raise Exception("Complete test") # Assert # ---- Complete Test ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "message" : "Goal 1 not found" + } # ---- Complete Test ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal(client): # Act response = client.post("/goals", json={ @@ -80,34 +83,49 @@ def test_create_goal(client): } -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal(client, one_goal): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here - # assertion 3 goes here + assert response.status_code == 200 + assert "goal" in response_body + assert response_body == { + "goal": { + "id": 1, + "title": "Updated Goal Title" + } + } + goal = Goal.query.get(1) + assert goal.title == "Updated Goal Title" # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_update_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.put("/goals/1", json={ + "title": "Updated Goal Title" + }) + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "message" : "Goal 1 not found" + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_delete_goal(client, one_goal): # Act response = client.delete("/goals/1") @@ -123,28 +141,31 @@ def test_delete_goal(client, one_goal): # Check that the goal was deleted response = client.get("/goals/1") assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert Goal.query.get(1) == None + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="test to be completed by student") +# @pytest.mark.skip(reason="test to be completed by student") def test_delete_goal_not_found(client): - raise Exception("Complete test") + # raise Exception("Complete test") # Act # ---- Complete Act Here ---- - + response = client.delete("/goals/1") + response_body = response.get_json() # Assert # ---- Complete Assertions Here ---- - # assertion 1 goes here - # assertion 2 goes here + assert response.status_code == 404 + assert response_body == { + "message" : "Goal 1 not found" + } # ---- Complete Assertions Here ---- -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_create_goal_missing_title(client): # Act response = client.post("/goals", json={}) diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py index 8afa4325e..2b385256a 100644 --- a/tests/test_wave_06.py +++ b/tests/test_wave_06.py @@ -2,7 +2,7 @@ import pytest -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal(client, one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -23,7 +23,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks): assert len(Goal.query.get(1).tasks) == 3 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_one_goal, three_tasks): # Act response = client.post("/goals/1/tasks", json={ @@ -42,7 +42,7 @@ def test_post_task_ids_to_goal_already_with_goals(client, one_task_belongs_to_on assert len(Goal.query.get(1).tasks) == 2 -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_goal(client): # Act response = client.get("/goals/1/tasks") @@ -50,14 +50,16 @@ def test_get_tasks_for_specific_goal_no_goal(client): # Assert assert response.status_code == 404 - - raise Exception("Complete test with assertion about response body") + assert response_body == { + "message": "Goal 1 not found" + } + # raise Exception("Complete test with assertion about response body") # ***************************************************************** # **Complete test with assertion about response body*************** # ***************************************************************** -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): # Act response = client.get("/goals/1/tasks") @@ -74,7 +76,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): # Act response = client.get("/goals/1/tasks") @@ -99,7 +101,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal): } -@pytest.mark.skip(reason="No way to test this feature yet") +# @pytest.mark.skip(reason="No way to test this feature yet") def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal): response = client.get("/tasks/1") response_body = response.get_json() From 5110faff75749f5a4d59926a90b9d0a90886f8df Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Thu, 10 Nov 2022 11:13:33 -0500 Subject: [PATCH 07/10] Some refactorings in task_routes.py and task.py --- app/models/task.py | 10 ++- app/task_routes.py | 147 ++++++++------------------------------------- 2 files changed, 30 insertions(+), 127 deletions(-) diff --git a/app/models/task.py b/app/models/task.py index 3897fbd60..a730e0b5e 100644 --- a/app/models/task.py +++ b/app/models/task.py @@ -17,12 +17,10 @@ def to_dict(self): result_dict["id"] = self.task_id result_dict["title"] = self.title result_dict["description"] = self.description - result_dict["completed_at"] = self.completed_at + result_dict["is_complete"] = bool(self.completed_at) # False if completed_at is null + + if self.goal_id: + result_dict["goal_id"] = self.goal_id return result_dict - @classmethod - def from_dict(cls, req_body): - return cls(title=req_body["title"], - description=req_body["description"], - completed_at=req_body["completed_at"]) \ No newline at end of file diff --git a/app/task_routes.py b/app/task_routes.py index ff17705fa..ace4216cf 100644 --- a/app/task_routes.py +++ b/app/task_routes.py @@ -7,22 +7,8 @@ import requests - tasks_bp = Blueprint("tasks", __name__, url_prefix="/tasks") -# def validate_task(task_id): -# try: -# task_id = int(task_id) -# except: -# abort(make_response({"message":f"Task {task_id} invalid"}, 400)) - -# task = Task.query.get(task_id) - -# if not task: -# abort(make_response({"message":f"Task {task_id} not found"}, 404)) - -# return task - def get_validate_model(cls, model_id): try: model_id = int(model_id) @@ -48,35 +34,16 @@ def read_all_tasks(): else: tasks = Task.query.all() - tasks_response = [] - - for task in tasks: - tasks_response.append( - { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False - } - ) - - return make_response(jsonify(tasks_response), 200) + tasks_list = [task.to_dict() for task in tasks] + return make_response(jsonify(tasks_list), 200) @tasks_bp.route("/", methods=["GET"]) def read_one_task(task_id): - print('!!!!!') task = get_validate_model(Task, task_id) - task_response = {"task": { - "id": task.task_id, - "title": task.title, - "description": task.description, - "is_complete": False - } - } - if task.goal_id: - task_response["task"]["goal_id"] = task.goal_id - return make_response(jsonify(task_response), 200) + current_task_response = {"task": task.to_dict()} + + return make_response(jsonify(current_task_response), 200) @tasks_bp.route("", methods=["POST"]) @@ -88,124 +55,61 @@ def create_task(): "details": "Invalid data" }, 400) - # try: - # new_task = Task.from_dict(request_body) - # except KeyError: - # abort(make_response({ - # "details": "Invalid data" - # }, 400)) - # new_task = Task.from_dict(request_body) new_task = Task(title=request_body["title"], - description=request_body["description"], - completed_at=None) + description=request_body["description"]) db.session.add(new_task) # track this object db.session.commit() # any changes that are pending commit those changes as data written in SQL - - return make_response(jsonify({ - "task": { - "id": new_task.task_id, - "title": new_task.title, - "description": new_task.description, - "is_complete": False - } - }), 201) + current_task_response = {"task": new_task.to_dict()} + return make_response(jsonify(current_task_response), 201) @tasks_bp.route("/", methods=["PUT"]) def update_task(task_id): - # task_model = get_validate_model(Task, task_id) + task = get_validate_model(Task, task_id) request_body = request.get_json() - - task_model = Task.query.get(task_id) - - if not task_model: - return make_response({"message":f"Task {task_id} not found"}, 404) - - task_model.title = request_body["title"] - task_model.description = request_body["description"] + task.title = request_body["title"] + task.description = request_body["description"] db.session.commit() - return make_response({ - "task": { - "id": task_model.task_id, - "title": task_model.title, - "description": task_model.description, - "is_complete": False - } - }, 200) - + current_task_response = {"task": task.to_dict()} + return make_response(jsonify(current_task_response), 200) @tasks_bp.route("/", methods=["DELETE"]) def delete_task(task_id): - # task = get_validate_model(Task, task_id) - - task_model = Task.query.get(task_id) - - if not task_model: - return make_response({"message":f"Task {task_id} not found"}, 404) + task = get_validate_model(Task, task_id) - db.session.delete(task_model) + db.session.delete(task) db.session.commit() - return make_response({"details": f'Task {task_id} "{task_model.title}" successfully deleted'}, 200) + return make_response({"details": f'Task {task_id} "{task.title}" successfully deleted'}, 200) @tasks_bp.route("//mark_complete", methods=["PATCH"]) def update_incompleted_task_to_complete(task_id): - # task = get_validate_model(Task, task_id) - task_model = Task.query.get(task_id) - - if not task_model: - return make_response({"message":f"Task {task_id} not found"}, 404) + task = get_validate_model(Task, task_id) - task_model.completed_at = datetime.now() + task.completed_at = datetime.now() db.session.commit() - slack_bot(task_model) - # return make_response(jsonify({"task": task_response}), 200) - return make_response(jsonify({ - "task": { - "id": task_model.task_id, - "title": task_model.title, - "description": task_model.description, - "is_complete": True - } - }), 200) + slack_bot(task) + current_task_response = {"task": task.to_dict()} + return make_response(jsonify(current_task_response), 200) @tasks_bp.route("//mark_incomplete", methods=["PATCH"]) def update_completed_task_to_incomplete(task_id): - # task = get_validate_model(Task, task_id) - task_model = Task.query.get(task_id) - - if not task_model: - return make_response({"message":f"Task {task_id} not found"}, 404) - - task_model.completed_at = None + task = get_validate_model(Task, task_id) + task.completed_at = None db.session.commit() - # return make_response(jsonify({"task": task_response}), 200) - return make_response(jsonify({ - "task": { - "id": task_model.task_id, - "title": task_model.title, - "description": task_model.description, - "is_complete": False - } - }), 200) - -# def is_complete(): -# request_body = request.get_json() -# if request_body["completed_at"] is not None: -# return True -# else: -# return False + current_task_response = {"task": task.to_dict()} + return make_response(jsonify(current_task_response), 200) def slack_bot(task): @@ -218,3 +122,4 @@ def slack_bot(task): } requests.post(PATH, data=bot_params, headers={"Authorization": SLACK_API_KEY}) + From 8e3d8ece66ff1e4243379785ae54ad01898cfd51 Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Thu, 10 Nov 2022 11:39:01 -0500 Subject: [PATCH 08/10] Some refactorings in goal_routes.py and goal.py --- app/goal_routes.py | 86 +++++++++++----------------------------------- app/models/goal.py | 9 ++++- 2 files changed, 28 insertions(+), 67 deletions(-) diff --git a/app/goal_routes.py b/app/goal_routes.py index 432a6a9d4..d88923d2d 100644 --- a/app/goal_routes.py +++ b/app/goal_routes.py @@ -33,87 +33,58 @@ def create_goal(): db.session.add(new_goal) # track this object db.session.commit() # any changes that are pending commit those changes as data written in SQL - return make_response(jsonify({ - "goal": { - "id": new_goal.goal_id, - "title": new_goal.title, - } - }), 201) + + new_goal_response = {"goal": new_goal.to_dict()} + return make_response(jsonify(new_goal_response), 201) @goals_bp.route("", methods=["GET"]) def read_all_goals(): goals = Goal.query.all() - goals_response = [] - - for goal in goals: - goals_response.append( - { - "id": goal.goal_id, - "title": goal.title - } - ) - - return make_response(jsonify(goals_response), 200) + goals_list = [goal.to_dict() for goal in goals] + return make_response(jsonify(goals_list), 200) @goals_bp.route("/", methods=["GET"]) def read_one_goal(goal_id): goal = get_validate_model(Goal, goal_id) - return make_response(jsonify({ - "goal": { - "id": goal.goal_id, - "title": goal.title, - } - }), 200) + current_goal_response = {"goal": goal.to_dict()} + + return make_response(jsonify(current_goal_response), 200) @goals_bp.route("/", methods=["PUT"]) def update_goal(goal_id): - goal_model = get_validate_model(Goal, goal_id) + goal = get_validate_model(Goal, goal_id) request_body = request.get_json() - - if not goal_model: - return make_response({"message":f"Goal {goal_model} not found"}, 404) - - goal_model.title = request_body["title"] + goal.title = request_body["title"] db.session.commit() - return make_response({ - "goal": { - "id": goal_model.goal_id, - "title": goal_model.title - } - }, 200) + current_goal_response = {"goal": goal.to_dict()} + return make_response(jsonify(current_goal_response), 200) @goals_bp.route("/", methods=["DELETE"]) def delete_goal(goal_id): - task = get_validate_model(Goal, goal_id) - - goal_model = Goal.query.get(goal_id) - - if not goal_model: - return make_response({"message":f"Task {goal_id} not found"}, 404) + goal = get_validate_model(Goal, goal_id) - db.session.delete(goal_model) + db.session.delete(goal) db.session.commit() - return make_response({"details": f'Goal {goal_id} "{goal_model.title}" successfully deleted'}, 200) + return make_response({"details": f'Goal {goal_id} "{goal.title}" successfully deleted'}, 200) @goals_bp.route("//tasks", methods=["POST"]) def sending_list_of_task_ids_to_goal(goal_id): goal = get_validate_model(Goal, goal_id) + request_body = request.get_json() task_ids = request_body["task_ids"] - goal.tasks = [] - for task_id in task_ids: - goal.tasks.append(Task.query.get(task_id)) + goal.tasks = [Task.query.get(task_id) for task_id in task_ids] db.session.commit() # any changes that are pending commit those changes as data written in SQL @@ -126,29 +97,12 @@ def sending_list_of_task_ids_to_goal(goal_id): @goals_bp.route("//tasks", methods=["GET"]) def getting_list_of_tasks_by_goal(goal_id): goal = get_validate_model(Goal, goal_id) - print('HELLO!!!!!!!') - tasks_list = [] - for task in goal.tasks: - # task_dict = {} - # task_dict["id"] = task.task_id - # task_dict["title"] = task.title - # task_dict["description"] = task.description - # task_dict["is_complete"] = False - # tasks_list.append(task_dict) - tasks_list.append( - { - "id": task.task_id, - "goal_id": task.goal_id, - "title": task.title, - "description": task.description, - "is_complete": False - } - ) - - # db.session.commit() # any changes that are pending commit those changes as data written in SQL + + tasks_list = [task.to_dict() for task in goal.tasks] return make_response(jsonify({ "id": goal.goal_id, "title": goal.title, "tasks": tasks_list }), 200) + diff --git a/app/models/goal.py b/app/models/goal.py index b0c0cfbd3..308a587e8 100644 --- a/app/models/goal.py +++ b/app/models/goal.py @@ -4,4 +4,11 @@ class Goal(db.Model): goal_id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String) - tasks = db.relationship("Task", back_populates="goal", lazy=True) \ No newline at end of file + tasks = db.relationship("Task", back_populates="goal", lazy=True) + + def to_dict(self): + result_dict = {} + result_dict["id"] = self.goal_id + result_dict["title"] = self.title + + return result_dict \ No newline at end of file From d98c89bd55fecf588c4a86577ca1eaa8ade01c43 Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Thu, 10 Nov 2022 11:58:37 -0500 Subject: [PATCH 09/10] Created Procfile --- app/Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/Procfile diff --git a/app/Procfile b/app/Procfile new file mode 100644 index 000000000..62e430aca --- /dev/null +++ b/app/Procfile @@ -0,0 +1 @@ +web: gunicorn 'app:create_app()' \ No newline at end of file From 169028b12934f16af0f3aec11814c8af7d713e5c Mon Sep 17 00:00:00 2001 From: galinaramaniuk Date: Thu, 10 Nov 2022 14:33:49 -0500 Subject: [PATCH 10/10] change Procfile location --- app/Procfile => Procfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/Procfile => Procfile (100%) diff --git a/app/Procfile b/Procfile similarity index 100% rename from app/Procfile rename to Procfile