slides: CID -> competition_id

server/app/apis/__init__.py

@@ -74,7 +74,7 @@ flask_api.add_namespace(misc_ns, path="/api/misc")
 flask_api.add_namespace(user_ns, path="/api/users")
 flask_api.add_namespace(auth_ns, path="/api/auth")
 flask_api.add_namespace(comp_ns, path="/api/competitions")
-flask_api.add_namespace(slide_ns, path="/api/competitions/<CID>/slides")
+flask_api.add_namespace(slide_ns, path="/api/competitions/<competition_id>/slides")
 flask_api.add_namespace(alternative_ns, path="/api/competitions/<CID>/slides/<SOrder>/questions/<QID>/alternatives")
 flask_api.add_namespace(answer_ns, path="/api/competitions/<CID>/teams/<TID>/answers")
 flask_api.add_namespace(team_ns, path="/api/competitions/<CID>/teams")

server/app/apis/slides.py

@@ -13,16 +13,16 @@ list_schema = SlideDTO.list_schema
 
 
 @api.route("/")
-@api.param("CID")
+@api.param("competition_id")
 class SlidesList(Resource):
     @check_jwt(editor=True)
-    def get(self, CID):
-        items = dbc.get.slide_list(CID)
+    def get(self, competition_id):
+        items = dbc.get.slide_list(competition_id)
         return list_response(list_schema.dump(items))
 
     @check_jwt(editor=True)
-    def post(self, CID):
-        item_comp = dbc.get.one(Competition, CID)
+    def post(self, competition_id):
+        item_comp = dbc.get.one(Competition, competition_id)
         item_slide = dbc.add.slide(item_comp)
         dbc.add.question(f"Fråga {item_slide.order + 1}", 10, 0, item_slide)
         dbc.utils.refresh(item_comp)
@@ -30,54 +30,54 @@ class SlidesList(Resource):
 
 
 @api.route("/<SOrder>")
-@api.param("CID,SOrder")
+@api.param("competition_id,SOrder")
 class Slides(Resource):
     @check_jwt(editor=True)
-    def get(self, CID, SOrder):
-        item_slide = dbc.get.slide(CID, SOrder)
+    def get(self, competition_id, SOrder):
+        item_slide = dbc.get.slide(competition_id, SOrder)
         return item_response(schema.dump(item_slide))
 
     @check_jwt(editor=True)
-    def put(self, CID, SOrder):
+    def put(self, competition_id, SOrder):
         args = slide_parser.parse_args(strict=True)
         title = args.get("title")
         timer = args.get("timer")
 
-        item_slide = dbc.get.slide(CID, SOrder)
+        item_slide = dbc.get.slide(competition_id, SOrder)
         item_slide = dbc.edit.slide(item_slide, title, timer)
 
         return item_response(schema.dump(item_slide))
 
     @check_jwt(editor=True)
-    def delete(self, CID, SOrder):
-        item_slide = dbc.get.slide(CID, SOrder)
+    def delete(self, competition_id, SOrder):
+        item_slide = dbc.get.slide(competition_id, SOrder)
 
         dbc.delete.slide(item_slide)
         return {}, codes.NO_CONTENT
 
 
 @api.route("/<SOrder>/order")
-@api.param("CID,SOrder")
+@api.param("competition_id,SOrder")
 class SlidesOrder(Resource):
     @check_jwt(editor=True)
-    def put(self, CID, SOrder):
+    def put(self, competition_id, SOrder):
         args = slide_parser.parse_args(strict=True)
         order = args.get("order")
 
-        item_slide = dbc.get.slide(CID, SOrder)
+        item_slide = dbc.get.slide(competition_id, SOrder)
 
         if order == item_slide.order:
             return item_response(schema.dump(item_slide))
 
         # clamp order between 0 and max
-        order_count = dbc.get.slide_count(CID)
+        order_count = dbc.get.slide_count(competition_id)
         if order < 0:
             order = 0
         elif order >= order_count - 1:
             order = order_count - 1
 
         # get slide at the requested order
-        item_slide_order = dbc.get.slide(CID, order)
+        item_slide_order = dbc.get.slide(competition_id, order)
 
         # switch place between them
         item_slide = dbc.edit.switch_order(item_slide, item_slide_order)
@@ -86,11 +86,11 @@ class SlidesOrder(Resource):
 
 
 @api.route("/<SOrder>/copy")
-@api.param("CID,SOrder")
+@api.param("competition_id,SOrder")
 class SlidesOrder(Resource):
     @check_jwt(editor=True)
-    def post(self, CID, SOrder):
-        item_slide = dbc.get.slide(CID, SOrder)
+    def post(self, competition_id, SOrder):
+        item_slide = dbc.get.slide(competition_id, SOrder)
 
         item_slide_copy = dbc.copy.slide(item_slide)