Skip to content

Commit e7c70f0

Browse files
committed
remove all jsonify and reuse create_model helper functions for tasks model
1 parent 769ad1a commit e7c70f0

File tree

3 files changed

+7
-27
lines changed

3 files changed

+7
-27
lines changed

app/models/task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from ..db import db
55
from sqlalchemy import String, Date
66
from datetime import datetime
7-
from flask import Blueprint, abort, make_response, request, Response,jsonify
7+
from flask import Blueprint, abort, make_response, request, Response
88
from typing import Optional
99

1010
class Task(db.Model):

app/routes/goal_routes.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@
1212
@bp.post("")
1313
def create_goal():
1414
request_body = request.get_json()
15-
# try:
16-
# new_goal = Goal.from_dict(request_body)
17-
# except KeyError:
18-
# return jsonify({"details": "Invalid data"}), 400
19-
20-
# db.session.add(new_goal)
21-
# db.session.commit()
22-
23-
#return jsonify(new_goal.to_dict()), 201
15+
2416
return create_model(Goal,request_body)
2517

2618

@@ -55,8 +47,7 @@ def delete_goal(id):
5547

5648
db.session.delete(goal)
5749
db.session.commit()
58-
59-
#return jsonify({"message": f'Goal {goal.id} successfully deleted'}), 204
50+
6051
return Response(status=204, mimetype="application/json")
6152

6253
#nested

app/routes/task_routes.py

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from ..models.task import Task
2-
from flask import Blueprint, abort, make_response, request, Response,jsonify,current_app
2+
from flask import Blueprint, abort, make_response, request, Response,current_app
33
from ..db import db
44
from .route_utilities import validate_model,create_model,get_models_with_filters
55
from datetime import datetime,timezone
@@ -11,22 +11,13 @@
1111
def create_task():
1212

1313
request_body = request.get_json()
14-
15-
try:
16-
new_task = Task.from_dict(request_body)
17-
except KeyError:
18-
#return jsonify({"details": "Invalid data"}), 400
19-
abort(make_response({"details": "Invalid data"}, 400))
20-
21-
db.session.add(new_task)
22-
db.session.commit()
23-
return new_task.to_dict(), 201
24-
14+
return create_model(Task,request_body)
15+
2516
@bp.get("")
2617
def get_all_tasks():
2718
query = db.select(Task)
28-
2919
id_param = request.args.get("id")
20+
3021
if id_param:
3122
query = query.where(Task.id == int(id_param))
3223

@@ -125,5 +116,3 @@ def mark_task_complete(id):
125116
#if current_app.config.get("TESTING"):
126117
return Response(status=204, mimetype="application/json")
127118

128-
129-

0 commit comments

Comments
 (0)