Filter deleted resources in get_by_id repository methods #4793

Copilot · 2025-12-18T12:48:38Z

What is being addressed

The get_*_by_id methods in repository classes return deleted resources, while list methods filter them out. This allows accessing deleted workspaces, workspace services, user resources, and shared services via direct URL after deletion.

How is this addressed

Added deploymentStatus != Status.Deleted filter to all get_by_id queries:

WorkspaceRepository.get_workspace_by_id()
WorkspaceServiceRepository.get_workspace_service_by_id()
UserResourceRepository.get_user_resource_by_id()
SharedServiceRepository.get_shared_service_by_id()

Query pattern:

query += ' AND c.deploymentStatus != @deletedStatus'
parameters.append({'name': '@deletedStatus', 'value': Status.Deleted})

Updated unit tests to verify deleted resources raise EntityDoesNotExist.

Updated CHANGELOG.md with bug fix entry and component version update.

Incremented API version from 0.25.6 to 0.25.7.

Original prompt

This section details on the original issue you should resolve

<issue_title>Deleted workspaces are still accessible via URL</issue_title>
<issue_description>Describe the bug
workspaces are still accessible via their URL after they are deleted
See also #4307 as this functionality may be required

Steps to reproduce

Create a workspace

copy the url

delete the workspace

re-visit the url

Azure TRE release version (e.g. v0.14.0 or main):
main
Deployed Azure TRE components - click the (i) in the UI:

Azure TRE
UI Version:
0.8.17
API Version:
0.25.2</issue_description>

Comments on the Issue (you are @copilot in this section)
@marrobi Ok, it looks like the get `X_by_id` methods are not filtering deleted out, but the list methods are.

Entity Type List Endpoint (filters deleted?) Get-by-ID (filters deleted?)

Workspace Yes No

Workspace Service Yes No

User Resource Yes No

Shared Service Yes No

So need something like:
async def get_workspace_by_id(self, workspace_id: str) -> Workspace:
    query = 'SELECT * FROM c WHERE c.resourceType = @resourceType AND c.id = @workspaceId AND c.deploymentStatus != @deletedStatus'
    parameters = [
        {'name': '@resourceType', 'value': ResourceType.Workspace},
        {'name': '@workspaceId', 'value': str(workspace_id)},
        {'name': '@deletedStatus', 'value': Status.Deleted}
    ]
    workspaces = await self.query(query=query, parameters=parameters)
    if not workspaces:
        raise EntityDoesNotExist
    return parse_obj_as(Workspace, workspaces[0])
There should also be unit tests to verify this.

@tamirkamara @jonnyry welcome your view on this, I don't think these endpoints should return deleted resources?
@jonnyry @marrobi Hmm I can't think of a reason why the current codebase would need Get-by-ID methods to return deleted entities.
There might be some possible use cases in future, perhaps an audit trail or those outlined in #4307, but for those cases you could an additional optional parameter to include deleted resources (with a default of false).</comment_new>

Fixes Deleted workspaces are still accessible via URL #4755

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

- Updated get_workspace_by_id to exclude deleted workspaces - Updated get_workspace_service_by_id to exclude deleted services - Updated get_user_resource_by_id to exclude deleted user resources - Updated get_shared_service_by_id to exclude deleted shared services - Added/updated unit tests to verify deleted resources are filtered - Updated CHANGELOG.md with bug fix entry Co-authored-by: marrobi <[email protected]>

api_app/tests_ma/test_db/test_repositories/test_shared_service_repository.py

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

github-actions · 2025-12-18T13:03:48Z

Unit Test Results

668 tests 668 ✅ 7s ⏱️
1 suites 0 💤
1 files 0 ❌

Results for commit 71593ab.

♻️ This comment has been updated with latest results.

marrobi · 2025-12-18T13:04:10Z

@copilot update the API version

Incremented API version from 0.25.6 to 0.25.7 for bug fix release. Added version update entry to CHANGELOG.md COMPONENTS section. Co-authored-by: marrobi <[email protected]>

Copilot · 2025-12-18T13:07:39Z

@copilot update the API version

Updated API version to 0.25.7 in commit 2e4d7e8

JC-wk · 2026-01-08T11:04:28Z

api version will need upping again

…ithub.com/microsoft/AzureTRE into copilot/fix-deleted-workspaces-url-access

JC-wk

I have tested this and deleted workspaces are no longer visible @marrobi

marrobi · 2026-01-12T17:09:00Z

@tamirkamara are you able to look at this one? Thanks.

github-actions · 2026-01-13T12:09:43Z

🤖 pr-bot 🤖

⚠️ The specified SHA f645fff is not the latest commit on the PR. Please validate the latest commit and re-run /test

(in response to this comment from @marrobi)

marrobi · 2026-01-13T12:13:35Z

/test-extended a3fc372

github-actions · 2026-01-13T12:13:50Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20956292168 (with refid 95c03b79)

(in response to this comment from @marrobi)

github-actions · 2026-01-14T08:11:53Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20956292168 (with refid 95c03b79)

(in response to this comment from @marrobi)

marrobi · 2026-01-14T09:35:25Z

/test-extended a3fc372

github-actions · 2026-01-14T09:35:50Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20989307837 (with refid 95c03b79)

(in response to this comment from @marrobi)

github-actions · 2026-01-14T12:06:02Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20989307837 (with refid 95c03b79)

(in response to this comment from @marrobi)

marrobi · 2026-01-14T12:44:47Z

/test-destroy-env

github-actions · 2026-01-14T12:45:28Z

Destroying branch test environment (RG: rg-tre0a48c21f)... (run: https://github.com/microsoft/AzureTRE/actions/runs/20994544513)

github-actions · 2026-01-14T12:45:33Z

Branch test environment destroy complete (RG: rg-tre0a48c21f)

github-actions · 2026-01-14T12:45:37Z

Destroying PR test environment (RG: rg-tre95c03b79)... (run: https://github.com/microsoft/AzureTRE/actions/runs/20994544513)

github-actions · 2026-01-14T13:10:18Z

PR test environment destroy complete (RG: rg-tre95c03b79)

marrobi · 2026-01-14T13:11:21Z

/test-extended f4febb0

github-actions · 2026-01-14T13:11:33Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20995310765 (with refid 95c03b79)

(in response to this comment from @marrobi)

github-actions · 2026-01-15T06:08:04Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20995310765 (with refid 95c03b79)

(in response to this comment from @marrobi)

github-actions · 2026-01-15T06:10:26Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/20995310765 (with refid 95c03b79)

(in response to this comment from @marrobi)

tamirkamara · 2026-01-15T13:27:12Z

/test-destroy-env

github-actions · 2026-01-15T13:27:50Z

Destroying branch test environment (RG: rg-tre0a48c21f)... (run: https://github.com/microsoft/AzureTRE/actions/runs/21032942381)

github-actions · 2026-01-15T13:27:54Z

Branch test environment destroy complete (RG: rg-tre0a48c21f)

github-actions · 2026-01-15T13:27:57Z

Destroying PR test environment (RG: rg-tre95c03b79)... (run: https://github.com/microsoft/AzureTRE/actions/runs/21032942381)

github-actions · 2026-01-15T13:51:50Z

PR test environment destroy complete (RG: rg-tre95c03b79)

tamirkamara · 2026-01-18T07:36:42Z

/test-extended 71593ab

github-actions · 2026-01-18T07:36:55Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/21108169623 (with refid 95c03b79)

(in response to this comment from @tamirkamara)

tamirkamara

@marrobi I believe something not right here as the E2E consistently fail to delete workspaces.

Initial plan

82b391d

Copilot AI assigned Copilot and marrobi Dec 18, 2025

Copilot started work on behalf of marrobi December 18, 2025 12:49 View session

github-code-quality bot found potential problems Dec 18, 2025

View reviewed changes

api_app/tests_ma/test_db/test_repositories/test_shared_service_repository.py Fixed Show fixed Hide fixed

Potential fix for pull request finding 'Unused import'

52a0865

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Fix access to deleted workspaces via URL~~ Filter deleted resources in get_by_id repository methods Dec 18, 2025

Copilot finished work on behalf of marrobi December 18, 2025 13:03

Copilot AI requested a review from marrobi December 18, 2025 13:03

marrobi marked this pull request as ready for review December 18, 2025 13:03

marrobi requested a review from a team as a code owner December 18, 2025 13:03

Copilot started work on behalf of marrobi December 18, 2025 13:04 View session

marrobi requested a review from JC-wk December 18, 2025 13:04

Update API version to 0.25.7

2e4d7e8

Incremented API version from 0.25.6 to 0.25.7 for bug fix release. Added version update entry to CHANGELOG.md COMPONENTS section. Co-authored-by: marrobi <[email protected]>

Copilot finished work on behalf of marrobi December 18, 2025 13:08

marrobi requested a review from tamirkamara December 19, 2025 11:26

Merge branch 'main' into copilot/fix-deleted-workspaces-url-access

af2ca0c

James Chapman and others added 5 commits January 9, 2026 10:25

bump api version

7faea01

Merge branch 'copilot/fix-deleted-workspaces-url-access' of https://g…

20f690d

…ithub.com/microsoft/AzureTRE into copilot/fix-deleted-workspaces-url-access

Merge branch 'main' into copilot/fix-deleted-workspaces-url-access

f3e4bd0

Merge branch 'main' into copilot/fix-deleted-workspaces-url-access

641f15f

update changelog

f645fff

JC-wk approved these changes Jan 12, 2026

View reviewed changes

tamirkamara approved these changes Jan 13, 2026

View reviewed changes

up api version

a3fc372

marrobi enabled auto-merge (squash) January 13, 2026 12:40

Merge branch 'main' into copilot/fix-deleted-workspaces-url-access

1b53384

up version

f4febb0

tamirkamara added 2 commits January 18, 2026 09:32

Merge branch 'main' into copilot/fix-deleted-workspaces-url-access

2ad54c7

Update _version.py

71593ab

tamirkamara requested changes Jan 18, 2026

View reviewed changes

Entity Type	List Endpoint (filters deleted?)	Get-by-ID (filters deleted?)
Workspace	Yes	No
Workspace Service	Yes	No
User Resource	Yes	No
Shared Service	Yes	No

Filter deleted resources in get_by_id repository methods #4793

Are you sure you want to change the base?

Filter deleted resources in get_by_id repository methods #4793

Conversation

Copilot AI commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What is being addressed

How is this addressed

Comments on the Issue (you are @copilot in this section)

Uh oh!

Uh oh!

github-actions bot commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Unit Test Results

Uh oh!

marrobi commented Dec 18, 2025

Uh oh!

Copilot AI commented Dec 18, 2025

Uh oh!

JC-wk commented Jan 8, 2026

Uh oh!

JC-wk left a comment

Choose a reason for hiding this comment

Uh oh!

marrobi commented Jan 12, 2026

Uh oh!

github-actions bot commented Jan 13, 2026

Uh oh!

marrobi commented Jan 13, 2026

Uh oh!

github-actions bot commented Jan 13, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

marrobi commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

marrobi commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

marrobi commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

tamirkamara commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

github-actions bot commented Jan 15, 2026

Uh oh!

tamirkamara commented Jan 18, 2026

Uh oh!

github-actions bot commented Jan 18, 2026

Uh oh!

tamirkamara left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Copilot AI commented Dec 18, 2025 •

edited

Loading

github-actions bot commented Dec 18, 2025 •

edited

Loading

tamirkamara left a comment •

edited

Loading