diff --git a/back/src/api/group.py b/back/src/api/group.py index af97f49..5fed0d8 100644 --- a/back/src/api/group.py +++ b/back/src/api/group.py @@ -96,7 +96,7 @@ def add(_app, _name_api): @doc.description("List all the videos availlable for this group tht does not depend on saison.") @doc.produces(content_type='application/json') async def retrive_video_no_saison(request, id): - value = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "group_id", id], ["==", "saison_id", None]], filter=["id"]) + value = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "group_id", id], ["==", "saison_id", None]], order_by=["name"], filter=["id"]) if value != None: return response.json(value) raise ServerError("No data found", status_code=404) @@ -106,16 +106,16 @@ def add(_app, _name_api): @doc.description("List all the videos availlable for this group tht does not depend on saison.") @doc.produces(content_type='application/json') async def retrive_saison(request, id): - list_values = data_global_elements.get_interface(data_global_elements.API_SAISON).gets_where(select=[["==", "group_id", id]], filter=["id"]) + list_values = data_global_elements.get_interface(data_global_elements.API_SAISON).gets_where(select=[["==", "group_id", id]], order_by=["number"], filter=["id"]) if list_values == None: raise ServerError("No data found", status_code=404) if len(list_values) == 0: return response.json(list_values) if "select" in request.args: if request.args["select"] == "*": - list_values = data_global_elements.get_interface(data_global_elements.API_SAISON).gets_where(select=[["==", "id", list_values]]) + list_values = data_global_elements.get_interface(data_global_elements.API_SAISON).gets_where(select=[["==", "id", list_values]], order_by=["number"]) else: - list_values = data_global_elements.get_interface(data_global_elements.API_SAISON).gets_where(select=[["==", "id", list_values]], filter=request.args["select"]) + list_values = data_global_elements.get_interface(data_global_elements.API_SAISON).gets_where(select=[["==", "id", list_values]], order_by=["number"], filter=request.args["select"]) return response.json(list_values) @elem_blueprint.put('/' + _name_api + '/', strict_slashes=True) diff --git a/back/src/api/saison.py b/back/src/api/saison.py index fa3ffd8..bbe7add 100644 --- a/back/src/api/saison.py +++ b/back/src/api/saison.py @@ -79,7 +79,7 @@ def add(_app, _name_api): @doc.description("List all the videos availlable for this group.") @doc.produces(content_type='application/json') async def retrive_video(request, id): - value = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "saison_id", id]], filter=["id"]) + value = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "saison_id", id]], order_by=["episode", "name"], filter=["id"]) if value != None: return response.json(value) raise ServerError("No data found", status_code=404) diff --git a/back/src/api/type.py b/back/src/api/type.py index 25c74f1..8567843 100644 --- a/back/src/api/type.py +++ b/back/src/api/type.py @@ -108,7 +108,7 @@ def add(_app, _name_api): @doc.description("List all video availlable with this type ... not link with an univers or a group.") @doc.produces(content_type='application/json') async def retrive_video_no_group(request, id): - list_values = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "type_id", id], ["==", "group_id", None], ["==", "univers_id", None]], filter=["id"]) + list_values = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "type_id", id], ["==", "group_id", None], ["==", "univers_id", None]], order_by=["name"], filter=["id"]) return response.json(list_values) ## ---------------------------------------------------------------------------------------- @@ -118,14 +118,14 @@ def add(_app, _name_api): @doc.description("List all groups availlable in this type (not depending of an univers).") @doc.produces(content_type='application/json') async def retrive_group(request, id): - list_values = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "type_id", id], ["!=", "group_id", None], ["==", "univers_id", None]], filter=["group_id"]) + list_values = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "type_id", id], ["!=", "group_id", None], ["==", "univers_id", None]], order_by=["name"], filter=["group_id"]) if len(list_values) == 0: return response.json(list_values) if "select" in request.args: if request.args["select"] == "*": - list_values = data_global_elements.get_interface(data_global_elements.API_GROUP).gets_where(select=[["==", "id", list_values]]) + list_values = data_global_elements.get_interface(data_global_elements.API_GROUP).gets_where(select=[["==", "id", list_values]], order_by=["name"]) else: - list_values = data_global_elements.get_interface(data_global_elements.API_GROUP).gets_where(select=[["==", "id", list_values]], filter=request.args["select"]) + list_values = data_global_elements.get_interface(data_global_elements.API_GROUP).gets_where(select=[["==", "id", list_values]], order_by=["name"], filter=request.args["select"]) return response.json(list_values) ## ---------------------------------------------------------------------------------------- @@ -135,14 +135,14 @@ def add(_app, _name_api): @doc.description("List all univers availlable.") @doc.produces(content_type='application/json') async def retrive_group(request, id): - list_values = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "type_id", id], ["!=", "univers_id", None]], filter=["univers_id"]) + list_values = data_global_elements.get_interface(data_global_elements.API_VIDEO).gets_where(select=[["==", "type_id", id], ["!=", "univers_id", None]], order_by=["name"], filter=["univers_id"]) if len(list_values) == 0: return response.json(list_values) if "select" in request.args: if request.args["select"] == "*": - list_values = data_global_elements.get_interface(data_global_elements.API_UNIVERS).gets_where(select=[["==", "id", list_values]]) + list_values = data_global_elements.get_interface(data_global_elements.API_UNIVERS).gets_where(select=[["==", "id", list_values]], order_by=["name"]) else: - list_values = data_global_elements.get_interface(data_global_elements.API_UNIVERS).gets_where(select=[["==", "id", list_values]], filter=request.args["select"]) + list_values = data_global_elements.get_interface(data_global_elements.API_UNIVERS).gets_where(select=[["==", "id", list_values]], order_by=["name"], filter=request.args["select"]) return response.json(list_values) _app.blueprint(elem_blueprint) \ No newline at end of file