Skip to content

Commit db4c587

Browse files
authored
Merge pull request #309 from OperationCode/specify-datatype
2 parents 154b952 + 25db8a0 commit db4c587

19 files changed

Lines changed: 181 additions & 170 deletions

app/api/routes/api_key.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ def apikey():
4343
return utils.standardize_response(status_code=500)
4444

4545
logger.info(apikey.serialize)
46-
return utils.standardize_response(payload=dict(data=apikey.serialize))
46+
return utils.standardize_response(
47+
payload=dict(data=apikey.serialize),
48+
datatype="credentials")
4749
except Exception as e:
4850
logger.exception(e)
4951
return utils.standardize_response(status_code=500)
@@ -57,4 +59,6 @@ def rotate_apikey():
5759
new_key = rotate_key(g.auth_key, db.session)
5860
if not new_key:
5961
return utils.standardize_response(status_code=500)
60-
return utils.standardize_response(payload=dict(data=new_key.serialize))
62+
return utils.standardize_response(
63+
payload=dict(data=new_key.serialize),
64+
datatype="credentials")

app/api/routes/categories.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,16 @@ def get_categories():
3939

4040
return utils.standardize_response(payload=dict(
4141
data=category_list,
42-
**pagination_details))
42+
**pagination_details),
43+
datatype="categories")
4344

4445

4546
def get_category(id):
4647
category = Category.query.get(id)
4748

4849
if category:
49-
return utils.standardize_response(payload=dict(data=(category.serialize)))
50+
return utils.standardize_response(
51+
payload=dict(data=(category.serialize)),
52+
datatype="category")
5053

5154
return redirect('/404')

app/api/routes/languages.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,16 @@ def get_languages():
3939

4040
return utils.standardize_response(payload=dict(
4141
data=language_list,
42-
**pagination_details))
42+
**pagination_details),
43+
datatype="languages")
4344

4445

4546
def get_language(id):
4647
language = Language.query.get(id)
4748

4849
if language:
49-
return utils.standardize_response(payload=dict(data=(language.serialize)))
50+
return utils.standardize_response(
51+
payload=dict(data=(language.serialize)),
52+
datatype="language")
5053

5154
return redirect('/404')

app/api/routes/resource_creation.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ def create_resources(json, db):
8989
return utils.standardize_response(payload=error, status_code=500)
9090

9191
# Success
92-
return utils.standardize_response(payload=dict(data=created_resources))
92+
return utils.standardize_response(
93+
payload=dict(data=created_resources),
94+
datatype="resources")
9395
except Exception as e:
9496
logger.exception(e)
9597
return utils.standardize_response(status_code=500)

app/api/routes/resource_modification.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ def update_resource(id, json, db):
7878
db.session.commit()
7979

8080
return utils.standardize_response(
81-
payload=dict(data=resource.serialize)
81+
payload=dict(data=resource.serialize),
82+
datatype="resource"
8283
)
8384

8485
except IntegrityError as e:
@@ -142,7 +143,9 @@ def update_votes(id, vote_direction):
142143
setattr(vote_info, 'current_direction', vote_direction)
143144
db.session.commit()
144145

145-
return utils.standardize_response(payload=dict(data=resource.serialize))
146+
return utils.standardize_response(
147+
payload=dict(data=resource.serialize),
148+
datatype="resource")
146149

147150

148151
def add_click(id):
@@ -155,4 +158,6 @@ def add_click(id):
155158
setattr(resource, 'times_clicked', initial_count + 1)
156159
db.session.commit()
157160

158-
return utils.standardize_response(payload=dict(data=resource.serialize))
161+
return utils.standardize_response(
162+
payload=dict(data=resource.serialize),
163+
datatype="resource")

app/api/routes/resource_retrieval.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,16 @@ def get_resources():
100100

101101
return utils.standardize_response(payload=dict(
102102
data=resource_list,
103-
**pagination_details))
103+
**pagination_details),
104+
datatype="resources")
104105

105106

106107
def get_resource(id):
107108
resource = Resource.query.get(id)
108109

109110
if resource:
110-
return utils.standardize_response(payload=dict(data=(resource.serialize)))
111+
return utils.standardize_response(
112+
payload=dict(data=(resource.serialize)),
113+
datatype="resource")
111114

112115
return redirect('/404')

app/api/routes/search.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,6 @@ def search_results():
7979
"total_count": search_result['nbHits'],
8080
}
8181
}
82-
return utils.standardize_response(payload=dict(data=results, **pagination_details))
82+
return utils.standardize_response(
83+
payload=dict(data=results, **pagination_details),
84+
datatype="resources")

0 commit comments

Comments
 (0)