Skip to content

Commit 996a025

Browse files
JobziJobzi
committed
refactor: TT-417 add HTTPStatus from http
1 parent 954a2c3 commit 996a025

File tree

7 files changed

+53
-71
lines changed

7 files changed

+53
-71
lines changed

‎V2/tests/api/azure/project_azure_endpoints_test.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import json
2+
from http import HTTPStatus
23

34
import pytest
45
from faker import Faker
@@ -7,7 +8,6 @@
78
from time_tracker.projects._application import _projects as azure_projects
89
from time_tracker.projects import _domain as domain
910
from time_tracker.projects import _infrastructure as infrastructure
10-
from time_tracker.utils.enums import ResponseEnums as enums
1111

1212
PROJECT_URL = '/api/projects/'
1313

@@ -36,7 +36,7 @@ def test__project_azure_endpoint__returns_all_projects(
3636
response = azure_projects._get_projects.get_projects(req)
3737
projects_json_data = response.get_body().decode("utf-8")
3838

39-
assert response.status_code == enums.STATUS_OK.value
39+
assert response.status_code == HTTPStatus.OK
4040
assert projects_json_data == json.dumps(inserted_projects)
4141

4242

@@ -55,7 +55,7 @@ def test__project_azure_endpoint__returns_an_project__when_project_matches_its_i
5555
response = azure_projects._get_projects.get_projects(req)
5656
activitiy_json_data = response.get_body().decode("utf-8")
5757

58-
assert response.status_code == enums.STATUS_OK.value
58+
assert response.status_code == HTTPStatus.OK
5959
assert activitiy_json_data == json.dumps(inserted_project)
6060

6161

@@ -70,8 +70,8 @@ def test__projects_azure_endpoint__returns_a_status_code_400__when_project_reciv
7070

7171
response = azure_projects._get_projects.get_projects(req)
7272

73-
assert response.status_code == enums.STATUS_BAD_REQUEST.value
74-
assert response.get_body() == enums.INVALID_ID.value.encode()
73+
assert response.status_code == HTTPStatus.BAD_REQUEST
74+
assert response.get_body() == b"Invalid Format ID"
7575

7676

7777
def test__project_azure_endpoint__returns_an_project_with_inactive_status__when_a_project_matching_its_id_is_found(
@@ -89,7 +89,7 @@ def test__project_azure_endpoint__returns_an_project_with_inactive_status__when_
8989
response = azure_projects._delete_project.delete_project(req)
9090
project_json_data = json.loads(response.get_body().decode("utf-8"))
9191

92-
assert response.status_code == enums.STATUS_OK.value
92+
assert response.status_code == HTTPStatus.OK
9393
assert project_json_data['status'] == 0
9494
assert project_json_data['deleted'] is True
9595

@@ -105,8 +105,8 @@ def test__delete_projects_azure_endpoint__returns_a_status_code_400__when_projec
105105

106106
response = azure_projects._delete_project.delete_project(req)
107107

108-
assert response.status_code == enums.STATUS_BAD_REQUEST.value
109-
assert response.get_body() == enums.INVALID_ID.value.encode()
108+
assert response.status_code == HTTPStatus.BAD_REQUEST
109+
assert response.get_body() == b"Invalid Format ID"
110110

111111

112112
def test__delete_projects_azure_endpoint__returns_a_status_code_404__when_no_found_a_project_to_delete(
@@ -120,8 +120,8 @@ def test__delete_projects_azure_endpoint__returns_a_status_code_404__when_no_fou
120120

121121
response = azure_projects._delete_project.delete_project(req)
122122

123-
assert response.status_code == enums.STATUS_NOT_FOUND.value
124-
assert response.get_body() == enums.NOT_FOUND.value.encode()
123+
assert response.status_code == HTTPStatus.NOT_FOUND
124+
assert response.get_body() == b"Not found"
125125

126126

127127
def test__update_project_azure_endpoint__returns_an_project__when_found_a_project_to_update(
@@ -141,7 +141,7 @@ def test__update_project_azure_endpoint__returns_an_project__when_found_a_projec
141141
activitiy_json_data = response.get_body().decode("utf-8")
142142
inserted_project.update(project_body)
143143

144-
assert response.status_code == enums.STATUS_OK.value
144+
assert response.status_code == HTTPStatus.OK
145145
assert activitiy_json_data == json.dumps(inserted_project)
146146

147147

@@ -159,8 +159,8 @@ def test__update_projects_azure_endpoint__returns_a_status_code_404__when_no_fou
159159

160160
response = azure_projects._update_project.update_project(req)
161161

162-
assert response.status_code == enums.STATUS_NOT_FOUND.value
163-
assert response.get_body() == enums.NOT_FOUND.value.encode()
162+
assert response.status_code == HTTPStatus.NOT_FOUND
163+
assert response.get_body() == b"Not found"
164164

165165

166166
def test__update_projects_azure_endpoint__returns_a_status_code_400__when_recive_an_incorrect_body(
@@ -175,8 +175,8 @@ def test__update_projects_azure_endpoint__returns_a_status_code_400__when_recive
175175

176176
response = azure_projects._update_project.update_project(req)
177177

178-
assert response.status_code == enums.STATUS_BAD_REQUEST.value
179-
assert response.get_body() == enums.INCORRECT_BODY.value.encode()
178+
assert response.status_code == HTTPStatus.BAD_REQUEST
179+
assert response.get_body() == b"Incorrect body"
180180

181181

182182
def test__update_projects_azure_endpoint__returns_a_status_code_400__when_project_recive_invalid_id(
@@ -190,8 +190,8 @@ def test__update_projects_azure_endpoint__returns_a_status_code_400__when_projec
190190

191191
response = azure_projects._update_project.update_project(req)
192192

193-
assert response.status_code == enums.STATUS_BAD_REQUEST.value
194-
assert response.get_body() == enums.INVALID_ID.value.encode()
193+
assert response.status_code == HTTPStatus.BAD_REQUEST
194+
assert response.get_body() == b"Invalid Format ID"
195195

196196

197197
def test__project_azure_endpoint__creates_an_project__when_project_has_all_attributes(
@@ -210,7 +210,7 @@ def test__project_azure_endpoint__creates_an_project__when_project_has_all_attri
210210
project_json_data = json.loads(response.get_body())
211211
project_body['id'] = project_json_data['id']
212212

213-
assert response.status_code == enums.STATUS_CREATED.value
213+
assert response.status_code == HTTPStatus.CREATED
214214
assert project_json_data == project_body
215215

216216

@@ -230,7 +230,7 @@ def test__project_azure_endpoint__returns_a_status_code_400__when_project_does_n
230230

231231
response = azure_projects._create_project.create_project(req)
232232

233-
assert response.status_code == enums.STATUS_BAD_REQUEST.value
233+
assert response.status_code == HTTPStatus.BAD_REQUEST
234234
assert response.get_body() == json.dumps(['The name key is missing in the input data']).encode()
235235

236236

@@ -250,5 +250,5 @@ def test__project_azure_endpoint__returns_a_status_code_500__when_project_recive
250250

251251
response = azure_projects._create_project.create_project(req)
252252

253-
assert response.status_code == enums.INTERNAL_SERVER_ERROR.value
254-
assert response.get_body() == enums.NOT_CREATED.value.encode()
253+
assert response.status_code == HTTPStatus.INTERNAL_SERVER_ERROR
254+
assert response.get_body() == b"could not be created"

‎V2/time_tracker/projects/_application/_projects/_create_project.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import dataclasses
22
import json
33
import typing
4+
from http import HTTPStatus
45

56
import azure.functions as func
67

78
from ... import _domain
89
from ... import _infrastructure
910
from time_tracker._infrastructure import DB as database
10-
from time_tracker.utils.enums import ResponseEnums as enums
1111

1212

1313
def create_project(req: func.HttpRequest) -> func.HttpResponse:
@@ -20,7 +20,7 @@ def create_project(req: func.HttpRequest) -> func.HttpResponse:
2020

2121
validation_errors = _validate_project(project_data)
2222
if validation_errors:
23-
status_code = enums.STATUS_BAD_REQUEST.value
23+
status_code = HTTPStatus.BAD_REQUEST
2424
response = json.dumps(validation_errors)
2525
else:
2626
project_to_create = _domain.Project(
@@ -37,13 +37,13 @@ def create_project(req: func.HttpRequest) -> func.HttpResponse:
3737
created_project = use_case.create_project(project_to_create)
3838

3939
status_code, response = [
40-
enums.INTERNAL_SERVER_ERROR.value, enums.NOT_CREATED.value.encode()
41-
] if not created_project else [enums.STATUS_CREATED.value, json.dumps(created_project.__dict__)]
40+
HTTPStatus.INTERNAL_SERVER_ERROR, b"could not be created"
41+
] if not created_project else [HTTPStatus.CREATED, json.dumps(created_project.__dict__)]
4242

4343
return func.HttpResponse(
4444
body=response,
4545
status_code=status_code,
46-
mimetype=enums.MIME_TYPE.value
46+
mimetype="application/json"
4747
)
4848

4949

‎V2/time_tracker/projects/_application/_projects/_delete_project.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import json
2+
from http import HTTPStatus
23

34
import azure.functions as func
45

56
from ... import _domain
67
from ... import _infrastructure
78
from time_tracker._infrastructure import DB as database
8-
from time_tracker.utils.enums import ResponseEnums as enums
99

1010

1111
def delete_project(req: func.HttpRequest) -> func.HttpResponse:
@@ -18,18 +18,18 @@ def delete_project(req: func.HttpRequest) -> func.HttpResponse:
1818
deleted_project = use_case.delete_project(project_id)
1919

2020
status_code, response = [
21-
enums.STATUS_NOT_FOUND.value, enums.NOT_FOUND.value.encode()
22-
] if not deleted_project else [enums.STATUS_OK.value, json.dumps(deleted_project.__dict__)]
21+
HTTPStatus.NOT_FOUND, b"Not found"
22+
] if not deleted_project else [HTTPStatus.OK, json.dumps(deleted_project.__dict__)]
2323

2424
return func.HttpResponse(
2525
body=response,
2626
status_code=status_code,
27-
mimetype=enums.MIME_TYPE.value,
27+
mimetype="application/json",
2828
)
2929

3030
except ValueError:
3131
return func.HttpResponse(
32-
body=enums.INVALID_ID.value.encode(),
33-
status_code=enums.STATUS_BAD_REQUEST.value,
34-
mimetype=enums.MIME_TYPE.value
32+
body=b"Invalid Format ID",
33+
status_code=HTTPStatus.BAD_REQUEST,
34+
mimetype="application/json"
3535
)

‎V2/time_tracker/projects/_application/_projects/_get_projects.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import json
22
import typing
3+
from http import HTTPStatus
34

45
import azure.functions as func
56

67
from ... import _domain
78
from ... import _infrastructure
89
from time_tracker._infrastructure import DB as database
9-
from time_tracker.utils.enums import ResponseEnums as enums
1010

1111

1212
def get_projects(req: func.HttpRequest) -> func.HttpResponse:
@@ -20,24 +20,24 @@ def get_projects(req: func.HttpRequest) -> func.HttpResponse:
2020
response = _get_by_id(int(project_id), project_service)
2121
if not response:
2222
return func.HttpResponse(
23-
body=enums.NOT_FOUND.value.encode(),
24-
status_code=enums.STATUS_NOT_FOUND.value,
25-
mimetype=enums.MIME_TYPE.value
23+
body=b"Not found",
24+
status_code=HTTPStatus.NOT_FOUND,
25+
mimetype="application/json"
2626
)
2727
else:
2828
response = _get_all(project_service)
2929

3030
return func.HttpResponse(
3131
body=json.dumps(response),
32-
status_code=enums.STATUS_OK.value,
33-
mimetype=enums.MIME_TYPE.value,
32+
status_code=HTTPStatus.OK,
33+
mimetype="application/json",
3434
)
3535

3636
except ValueError:
3737
return func.HttpResponse(
38-
body=enums.INVALID_ID.value.encode(),
39-
status_code=enums.STATUS_BAD_REQUEST.value,
40-
mimetype=enums.MIME_TYPE.value
38+
body=b"Invalid Format ID",
39+
status_code=HTTPStatus.BAD_REQUEST,
40+
mimetype="application/json"
4141
)
4242

4343

‎V2/time_tracker/projects/_application/_projects/_update_project.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import dataclasses
22
import json
3+
from http import HTTPStatus
34

45
import azure.functions as func
56

67
from ... import _domain
78
from ... import _infrastructure
89
from time_tracker._infrastructure import DB as database
9-
from time_tracker.utils.enums import ResponseEnums as enums
1010

1111

1212
def update_project(req: func.HttpRequest) -> func.HttpResponse:
@@ -19,32 +19,32 @@ def update_project(req: func.HttpRequest) -> func.HttpResponse:
1919
project_data = req.get_json()
2020

2121
if not _validate_project(project_data):
22-
status_code = enums.STATUS_BAD_REQUEST.value
23-
response = enums.INCORRECT_BODY.value.encode()
22+
status_code = HTTPStatus.BAD_REQUEST
23+
response = b"Incorrect body"
2424

2525
else:
2626
updated_project = use_case.update_project(project_id, project_data)
2727
status_code, response = [
28-
enums.STATUS_NOT_FOUND.value, enums.NOT_FOUND.value.encode()
29-
] if not updated_project else [enums.STATUS_OK.value, json.dumps(updated_project.__dict__)]
28+
HTTPStatus.NOT_FOUND, b"Not found"
29+
] if not updated_project else [HTTPStatus.OK, json.dumps(updated_project.__dict__)]
3030

3131
return func.HttpResponse(
3232
body=response,
3333
status_code=status_code,
34-
mimetype=enums.MIME_TYPE.value,
34+
mimetype="application/json",
3535
)
3636

3737
except ValueError:
3838
return func.HttpResponse(
39-
body=enums.INVALID_ID.value.encode(),
40-
status_code=enums.STATUS_BAD_REQUEST.value,
41-
mimetype=enums.MIME_TYPE.value,
39+
body=b"Invalid Format ID",
40+
status_code=HTTPStatus.BAD_REQUEST,
41+
mimetype="application/json",
4242
)
4343
except Exception as error:
4444
return func.HttpResponse(
4545
body=str(error).encode(),
46-
status_code=enums.STATUS_BAD_REQUEST.value,
47-
mimetype=enums.MIME_TYPE.value,
46+
status_code=HTTPStatus.BAD_REQUEST,
47+
mimetype="application/json",
4848
)
4949

5050

‎V2/time_tracker/utils/enums/__init__.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎V2/time_tracker/utils/enums/response_enums.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)