Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature/812 - fix for - Error when deleting the Workspace Resources #908

Closed
wants to merge 6 commits into from
Closed

feature/812 - fix for - Error when deleting the Workspace Resources #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9844a7c
#812 stash
D-GopalKrishna Jan 22, 2024
cdd6329
Merge branch 'develop' into feature/812
D-GopalKrishna Feb 12, 2024
0167229
#812 - fix WorkspaceresourceService in crud_service
D-GopalKrishna Feb 12, 2024
54e0c2d
#812 cleanup
D-GopalKrishna Feb 12, 2024
cd73def
#8122 fix the mapper for to_dto in workspace resource entitiy
D-GopalKrishna Feb 13, 2024
0eb1b30
#812 cleanup/revert changes
D-GopalKrishna Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion applications/workspaces/server/workspaces/persistence/base_crud_persistence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class BaseModelRepository:
def __init__(self, model=None):
if model:
self.model = model


def _get(self, id):
"""
Expand Down Expand Up @@ -247,8 +247,11 @@ def delete(self, id):

if not result:
return f"{self.model.__name__} with id {id} not found.", 404

db.session.delete(result)
return db.session.commit()



def __str__(self):
return self.model.__tablename__
2 changes: 1 addition & 1 deletion applications/workspaces/server/workspaces/persistence/crud_persistence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,4 +280,4 @@ def open(self, workspace_resource):
def delete(self, id):
"""Delete an object from the repository."""
workspace_resource = self.get(id)
super().delete(id)
super().delete(id)
14 changes: 8 additions & 6 deletions applications/workspaces/server/workspaces/service/crud_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,14 +465,15 @@ def to_dao(cls, ws_dict: dict) -> TWorkspaceResourceEntity:

@classmethod
def to_dto(cls, resource) -> Model:
resource.origin = json.loads(resource.origin)
if resource.folder: # Legacy folder/path handling
resource_dict = dao_entity2dict(resource)
resource_dict['origin'] = json.loads(resource.origin)
if resource_dict['folder']: # Legacy folder/path handling

# Legacy folder/path handling
if resource.origin.get("folder", None) is not None:
resource.origin["path"] = resource.origin.get("folder")
del resource.origin["folder"]
dto = cls._calculated_fields_populate(cls.dict_to_dto(dao_entity2dict(resource)))
if resource_dict['origin'].get("folder", None) is not None:
resource_dict['origin']["path"] = resource_dict['origin'].get("folder")
del resource_dict['origin']["folder"]
dto = cls._calculated_fields_populate(cls.dict_to_dto(resource_dict))
dto.path = resource.folder
return dto

Expand Down Expand Up @@ -516,6 +517,7 @@ def is_authorized(self, resource: WorkspaceResourceEntity):

def get(self, id_):
workspace_resource: WorkspaceResourceEntity = super().get(id_)

return workspace_resource

def delete(self, id_):
Expand Down
Loading