Skip to content

Commit 587855b

Browse files
committed
Fixes #14 - replace http codes by constants
1 parent d5c11c5 commit 587855b

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

time_tracker_api/activities/activities_model.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
from flask import Flask
2-
31
from time_tracker_api.database import CRUDDao
42

53

64
class ActivityDao(CRUDDao):
75
pass
86

97

10-
def create_dao(app: Flask) -> ActivityDao:
8+
def create_dao() -> ActivityDao:
119
from time_tracker_api.sql_repository import db
1210
from time_tracker_api.sql_repository import SQLCRUDDao, AuditedSQLModel, SQLModel
1311

time_tracker_api/activities/activities_namespace.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from faker import Faker
22
from flask_restplus import fields, Resource, Namespace
3+
from flask_restplus._http import HTTPStatus
34

4-
from time_tracker_api import flask_app
55
from time_tracker_api.api import audit_fields
66
from time_tracker_api.activities.activities_model import create_dao
77

@@ -42,49 +42,49 @@
4242
activity_response_fields
4343
)
4444

45-
activity_dao = create_dao(flask_app)
45+
activity_dao = create_dao()
4646

4747

4848
@ns.route('')
4949
class Activities(Resource):
5050
@ns.doc('list_activities')
51-
@ns.marshal_list_with(activity, code=200)
51+
@ns.marshal_list_with(activity, code=HTTPStatus.OK)
5252
def get(self):
5353
"""List all activities"""
54-
return activity_dao.get_all(), 200
54+
return activity_dao.get_all(), HTTPStatus.OK
5555

5656
@ns.doc('create_activity')
57-
@ns.response(400, 'Bad request')
57+
@ns.response(HTTPStatus.BAD_REQUEST, 'Bad request')
5858
@ns.expect(activity_input)
59-
@ns.marshal_with(activity, code=201)
59+
@ns.marshal_with(activity, code=HTTPStatus.CREATED)
6060
def post(self):
6161
"""Create an activity"""
62-
return activity_dao.create(ns.payload), 201
62+
return activity_dao.create(ns.payload), HTTPStatus.CREATED
6363

6464

6565
@ns.route('/<string:id>')
66-
@ns.response(404, 'Activity not found')
66+
@ns.response(HTTPStatus.NOT_FOUND, 'Activity not found')
6767
@ns.param('id', 'The activity identifier')
6868
class Activity(Resource):
6969
@ns.doc('get_activity')
70-
@ns.response(422, 'The id has an invalid format')
71-
@ns.marshal_with(activity, code=200)
70+
@ns.response(HTTPStatus.UNPROCESSABLE_ENTITY, 'The id has an invalid format')
71+
@ns.marshal_with(activity, code=HTTPStatus.OK)
7272
def get(self, id):
7373
"""Get an activity"""
74-
return activity_dao.get(id)
74+
return activity_dao.get(id), HTTPStatus.OK
7575

7676
@ns.doc('update_activity')
77-
@ns.response(422, 'The data has an invalid format.')
77+
@ns.response(HTTPStatus.UNPROCESSABLE_ENTITY, 'The data has an invalid format.')
7878
@ns.expect(activity_input)
7979
@ns.marshal_with(activity)
8080
def put(self, id):
8181
"""Update an activity"""
8282
return activity_dao.update(id, ns.payload)
8383

8484
@ns.doc('delete_activity')
85-
@ns.response(422, 'The id has an invalid format')
86-
@ns.response(204, 'Activity deleted successfully')
85+
@ns.response(HTTPStatus.UNPROCESSABLE_ENTITY, 'The id has an invalid format')
86+
@ns.response(HTTPStatus.NO_CONTENT, 'Activity deleted successfully')
8787
def delete(self, id):
8888
"""Delete an activity"""
8989
activity_dao.delete(id)
90-
return None, 204
90+
return None, HTTPStatus.NO_CONTENT

0 commit comments

Comments
 (0)