Skip to content

Commit bc464ac

Browse files
committed
remove all comment out lines and space
1 parent e7c70f0 commit bc464ac

File tree

4 files changed

+12
-33
lines changed

4 files changed

+12
-33
lines changed

app/models/task.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ def to_dict(self): # json
2222
task_dict = {"id": self.id,
2323
"title":self.title,
2424
"description":self.description,
25-
#"is_complete":self.completed_at if self.completed_at else False
2625
"is_complete": self.completed_at is not None}
2726

2827
if self.goal_id is not None:
@@ -37,8 +36,8 @@ def from_dict(cls, data_dict):
3736

3837
raise KeyError("title")
3938
if "description" not in data_dict:
40-
#abort(make_response({"details": "Invalid data"}, 400))
4139
raise KeyError("description")
40+
4241
return cls(
4342
title=data_dict["title"],
4443
description=data_dict["description"],

app/routes/goal_routes.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@
44
from ..models.task import Task
55
from .route_utilities import validate_model,create_model,get_models_with_filters
66

7-
87
bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
98

10-
11-
129
@bp.post("")
1310
def create_goal():
1411
request_body = request.get_json()
1512

1613
return create_model(Goal,request_body)
1714

18-
1915
@bp.get("")
2016
def get_all_goals():
2117
filters = request.args.to_dict()
@@ -26,9 +22,6 @@ def get_one_goal(id):
2622
goal = validate_model(Goal, id)
2723
return goal.to_dict()
2824

29-
30-
31-
3225
@bp.put("/<id>")
3326
def update_goal(id):
3427
goal = validate_model(Goal, id)
@@ -39,16 +32,14 @@ def update_goal(id):
3932
db.session.commit()
4033
return goal.to_dict()
4134

42-
43-
4435
@bp.delete("/<id>")
4536
def delete_goal(id):
4637
goal = validate_model(Goal, id)
4738

4839
db.session.delete(goal)
4940
db.session.commit()
5041

51-
return Response(status=204, mimetype="application/json")
42+
return Response(status=204,mimetype="application/json")
5243

5344
#nested
5445
@bp.post("/<goal_id>/tasks")
@@ -71,9 +62,7 @@ def add_tasks_to_goal(goal_id):
7162
"id": goal.id,
7263
"task_ids": task_ids
7364
}, 200
74-
75-
76-
65+
7766
@bp.get("/<goal_id>/tasks")
7867
def get_tasks_for_goal(goal_id):
7968
goal = validate_model(Goal, goal_id)

app/routes/route_utilities.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@ def validate_model(cls, id):
1717

1818
return model
1919

20-
2120
def create_model(cls, model_data):
2221
try:
2322
new_model = cls.from_dict(model_data)
2423
except KeyError as e:
25-
#response = {"message": f"Invalid request: missing {e.args[0]}"}
26-
#abort(make_response(response, 400))
2724
abort(make_response({"details": "Invalid data"}, 400))
2825

2926
db.session.add(new_model)

app/routes/task_routes.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,17 @@ def get_all_tasks():
3939

4040
query = query.where(Task.completed_at.is_(None))
4141

42-
#query = query.order_by(Task.id)
4342
if sort_param =="asc":
4443
query = query = query.order_by(Task.title.asc())
4544
elif sort_param == "desc":
4645
query = query.order_by(Task.title.desc())
4746
else:
4847
query = query.order_by(Task.id)
48+
4949
tasks = db.session.scalars(query)
5050

5151
result_list = []
52-
53-
result_list =[task.to_dict()for task in tasks]
52+
result_list =[task.to_dict() for task in tasks]
5453

5554
return result_list or []
5655

@@ -65,40 +64,35 @@ def replace_task(id):
6564
task = validate_model(Task, id)
6665
request_body = request.get_json()
6766

68-
# if request_body["is_complete"]:
69-
# task.completed_at = datetime.utcnow()
70-
# else:
71-
# task.completed_at = None
7267
task.title = request_body["title"]
7368
task.description = request_body["description"]
69+
7470
db.session.commit()
71+
7572
return Response(status = 204,mimetype ="application/json")
7673

7774
@bp.delete("/<id>")
7875
def del_task(id):
7976
task = validate_model(Task, id)
77+
8078
db.session.delete(task)
8179
db.session.commit()
80+
8281
return Response(status = 204,mimetype ="application/json")
8382

84-
# @bp.patch("/<id>/mark_complete")
85-
# def mark_complete(id):
86-
# task = validate_model(Task, id)
87-
# task.completed_at = datetime.utcnow()
88-
# db.session.commit()
89-
# return Response(status=204, mimetype="application/json")
9083

9184
@bp.patch("/<id>/mark_incomplete")
9285
def mark_incomplete(id):
9386
task = validate_model(Task, id)
9487
task.completed_at = None
88+
9589
db.session.commit()
90+
9691
return Response(status=204, mimetype="application/json")
9792

9893
@bp.patch("/<id>/mark_complete")
9994
def mark_task_complete(id):
10095
task = validate_model(Task, id)
101-
#task = Task.query.get(id)
10296
task.completed_at = datetime.now(timezone.utc)
10397
db.session.commit()
10498

@@ -113,6 +107,6 @@ def mark_task_complete(id):
113107

114108
json={"channel": slack_channel, "text": message}
115109
)
116-
#if current_app.config.get("TESTING"):
110+
117111
return Response(status=204, mimetype="application/json")
118112

0 commit comments

Comments
 (0)