Skip to content

Commit

Permalink
Merge branch 'master' into enh/user-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
odeimaiz authored Nov 5, 2024
2 parents fb3debd + cddaab9 commit 0b4a91f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ flag_management:

component_management:
default_rules:
carryforward: true
statuses:
- type: project
target: auto
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from servicelib.status_codes_utils import is_5xx_server_error

from .._meta import API_VTAG as VTAG
from ..application_settings_utils import requires_dev_feature_enabled
from ..login.decorators import get_user_id, login_required
from ..products.api import get_product_name
from ..projects._common_models import ProjectPathParams
Expand Down Expand Up @@ -102,6 +103,7 @@ async def _wrapper(request: web.Request) -> web.StreamResponse:


@routes.delete(f"/{VTAG}/trash", name="empty_trash")
@requires_dev_feature_enabled
@login_required
@permission_required("project.delete")
@_handle_request_exceptions
Expand All @@ -117,6 +119,7 @@ async def empty_trash(request: web.Request):


@routes.post(f"/{VTAG}/projects/{{project_id}}:trash", name="trash_project")
@requires_dev_feature_enabled
@login_required
@permission_required("project.delete")
@_handle_request_exceptions
Expand All @@ -140,6 +143,7 @@ async def trash_project(request: web.Request):


@routes.post(f"/{VTAG}/projects/{{project_id}}:untrash", name="untrash_project")
@requires_dev_feature_enabled
@login_required
@permission_required("project.delete")
@_handle_request_exceptions
Expand Down
11 changes: 11 additions & 0 deletions services/web/server/tests/unit/with_dbs/03/test_trash.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,23 @@
from models_library.rest_pagination import Page
from pytest_mock import MockerFixture
from pytest_simcore.helpers.assert_checks import assert_status
from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
from pytest_simcore.helpers.typing_env import EnvVarsDict
from pytest_simcore.helpers.webserver_login import UserInfoDict
from servicelib.aiohttp import status
from simcore_service_webserver.db.models import UserRole
from simcore_service_webserver.projects.models import ProjectDict


@pytest.fixture
def app_environment(
app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
) -> EnvVarsDict:
return app_environment | setenvs_from_dict(
monkeypatch, {"WEBSERVER_DEV_FEATURES_ENABLED": "1"}
)


@pytest.fixture
def user_role() -> UserRole:
return UserRole.USER
Expand Down

0 comments on commit 0b4a91f

Please sign in to comment.