From f645074ad1c8aa5be01ead874a07ff28c1621720 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Tue, 11 Jul 2023 17:15:37 +0200 Subject: [PATCH] Api v1.14.0 (#1406) * feature(chalice): changed feature-flag endpoints --- api/routers/core_dynamic.py | 23 +++++++++++------------ ee/api/routers/core_dynamic.py | 7 +++---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/api/routers/core_dynamic.py b/api/routers/core_dynamic.py index bf1328761..12f3806d5 100644 --- a/api/routers/core_dynamic.py +++ b/api/routers/core_dynamic.py @@ -490,29 +490,28 @@ def click_map_search(projectId: int, data: schemas.FlatClickMapSessionsSearch = @app.post('/{project_id}/feature-flags/search', tags=["feature flags"]) -async def search_feature_flags(project_id: int, - data: schemas.SearchFlagsSchema = Body(...), - context: schemas.CurrentContext = Depends(OR_context)): +def search_feature_flags(project_id: int, + data: schemas.SearchFlagsSchema = Body(...), + context: schemas.CurrentContext = Depends(OR_context)): return feature_flags.search_feature_flags(project_id=project_id, user_id=context.user_id, data=data) @app.get('/{project_id}/feature-flags/{feature_flag_id}', tags=["feature flags"]) -async def get_feature_flag(project_id: int, feature_flag_id: int): +def get_feature_flag(project_id: int, feature_flag_id: int): return feature_flags.get_feature_flag(project_id=project_id, feature_flag_id=feature_flag_id) @app.post('/{project_id}/feature-flags', tags=["feature flags"]) -async def add_feature_flag(project_id: int, data: schemas.FeatureFlagSchema = Body(...), - context: schemas.CurrentContext = Depends(OR_context)): +def add_feature_flag(project_id: int, data: schemas.FeatureFlagSchema = Body(...), + context: schemas.CurrentContext = Depends(OR_context)): return feature_flags.create_feature_flag(project_id=project_id, user_id=context.user_id, feature_flag_data=data) @app.put('/{project_id}/feature-flags/{feature_flag_id}', tags=["feature flags"]) -async def update_feature_flag(project_id: int, feature_flag_id: int, data: schemas.FeatureFlagSchema = Body(...), - context: schemas.CurrentContext = Depends(OR_context)): +def update_feature_flag(project_id: int, feature_flag_id: int, data: schemas.FeatureFlagSchema = Body(...), + context: schemas.CurrentContext = Depends(OR_context)): return feature_flags.update_feature_flag(project_id=project_id, feature_flag_id=feature_flag_id, - user_id=context.user_id, - feature_flag=data) + user_id=context.user_id, feature_flag=data) @app.delete('/{project_id}/feature-flags/{feature_flag_id}', tags=["feature flags"]) @@ -521,7 +520,7 @@ async def delete_feature_flag(project_id: int, feature_flag_id: int, _=Body(None @app.post('/{project_id}/feature-flags/{feature_flag_id}/status', tags=["feature flags"]) -async def update_feature_flag_status(project_id: int, feature_flag_id: int, - data: schemas.FeatureFlagStatus = Body(...)): +def update_feature_flag_status(project_id: int, feature_flag_id: int, + data: schemas.FeatureFlagStatus = Body(...)): return {"data": feature_flags.update_feature_flag_status(project_id=project_id, feature_flag_id=feature_flag_id, is_active=data.is_active)} diff --git a/ee/api/routers/core_dynamic.py b/ee/api/routers/core_dynamic.py index 795894cd8..70717821c 100644 --- a/ee/api/routers/core_dynamic.py +++ b/ee/api/routers/core_dynamic.py @@ -541,8 +541,7 @@ def add_feature_flag(project_id: int, data: schemas.FeatureFlagSchema = Body(... def update_feature_flag(project_id: int, feature_flag_id: int, data: schemas.FeatureFlagSchema = Body(...), context: schemas.CurrentContext = Depends(OR_context)): return feature_flags.update_feature_flag(project_id=project_id, feature_flag_id=feature_flag_id, - user_id=context.user_id, - feature_flag=data) + user_id=context.user_id, feature_flag=data) @app.delete('/{project_id}/feature-flags/{feature_flag_id}', tags=["feature flags"], @@ -553,7 +552,7 @@ def delete_feature_flag(project_id: int, feature_flag_id: int, _=Body(None)): @app.post('/{project_id}/feature-flags/{feature_flag_id}/status', tags=["feature flags"], dependencies=[OR_scope(Permissions.feature_flags)]) -async def update_feature_flag_status(project_id: int, feature_flag_id: int, - data: schemas.FeatureFlagStatus = Body(...)): +def update_feature_flag_status(project_id: int, feature_flag_id: int, + data: schemas.FeatureFlagStatus = Body(...)): return {"data": feature_flags.update_feature_flag_status(project_id=project_id, feature_flag_id=feature_flag_id, is_active=data.is_active)}