Merge pull request #823 from Path-of-Modifiers/812-make-modifier-id-unique-per-modfier

#812 Fixed tests, found a bug also

Author: bogadisa

src/backend_api/app/api/routes/modifier.py

@@ -166,7 +166,7 @@ async def update_modifier(
 
 
 @router.delete(
-    "/{modifierId}",
+    "/",
     response_model=str,
     dependencies=[Depends(get_current_active_superuser)],
 )

src/backend_api/app/tests/test_simulating_env/api/api_routes_test_base.py

@@ -742,11 +742,14 @@ async def test_delete_instance_not_enough_permissions(
         response = await async_client.delete(
             f"{settings.API_V1_STR}/{route_prefix}/{obj_out_pk_map[unique_identifier]}",
         )
+        content = response.json()
+        print(content["detail"], "badsad")
         invalid_token_error = InvalidTokenError(
             token=None,
             function_name=UserCache.verify_token.__name__,
             class_name=UserCache.__name__,
         )
+        print(response.status_code, invalid_token_error.status_code)
         assert response.status_code == invalid_token_error.status_code
         content = response.json()
         assert content["detail"] == invalid_token_error.detail

src/backend_api/app/tests/test_simulating_env/api/api_test_rate_limit_base.py

@@ -68,7 +68,7 @@ async def perform_time_interval_requests_with_api_function(
                     # print(
                     #     f"{response.status_code} | {i} | {request_amount} | ResponseJson: {response.json()}"
                     # )
-                    assert response.status_code == 200 if i < request_amount else 429
+                    assert response.status_code == (200 if i < request_amount else 429)
                     await asyncio.sleep(skip_time)
 
                     # if i >= request_amount:

src/backend_api/app/tests/utils/model_utils/item_modifier.py

@@ -45,10 +45,12 @@ async def create_random_item_modifier_dict(
     itemId = item.itemId
     modifier_dict, modifier = await generate_random_modifier(db)
     modifierId = modifier.modifierId
+    position = modifier.position
 
     item_modifier_dict = {
         "itemId": itemId,
         "modifierId": modifierId,
+        "position": position,
         "roll": roll_value,
         "createdHoursSinceLaunch": random_int(small_int=True),
     }

src/backend_api/app/tests/utils/model_utils/plot.py

@@ -45,11 +45,9 @@ async def create_minimal_random_plot_query_dict(db: Session) -> dict[str, Any]:
     }
 
     wanted_modifiers = [
-        [
-            {
-                "modifierId": modifier_dep.modifierId,
-            }
-        ]
+        {
+            "modifierId": modifier_dep.modifierId,
+        }
     ]
 
     plot_query = {