diff --git a/DB/Configuration/event_config.json b/DB/Configuration/event_config.json deleted file mode 100644 index a2a3342e..00000000 --- a/DB/Configuration/event_config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "funcs": { - "create_db_instance": { - "category": "creation", - "resource_type": "DBInstance", - "message": "db instance created" - }, - "delete_db_instance": { - "category": "deletion", - "resource_type": "DBInstance", - "message": "db instance deleted" - }, - "stop_db_instance": { - "category": "deletion", - "resource_type": "DBInstance", - "message": "DB instance shutdown" - }, - "start_db_instance": { - "category": "deletion", - "resource_type": "DBInstance", - "message": "DB instance restarted" - }, - - "create_db_snapshot":{ - "category": "creation", - "resource_type": "DBSnapshot", - "message": "db snapshot created" - }, - "delete_db_snapshot":{ - "category": "creation", - "resource_type": "DBSnapshot", - "message": "db snapshot deleted" - - }, - "restore_db_instance_from_snapshot":{ - "category": "restoring", - "resource_type": "DBSnapshot", - "message": "db instance restored from snapshot" - - } - }, - "errs": { - - } -} \ No newline at end of file diff --git a/DB/configuration/event_config.json b/DB/configuration/event_config.json deleted file mode 100644 index a2a3342e..00000000 --- a/DB/configuration/event_config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "funcs": { - "create_db_instance": { - "category": "creation", - "resource_type": "DBInstance", - "message": "db instance created" - }, - "delete_db_instance": { - "category": "deletion", - "resource_type": "DBInstance", - "message": "db instance deleted" - }, - "stop_db_instance": { - "category": "deletion", - "resource_type": "DBInstance", - "message": "DB instance shutdown" - }, - "start_db_instance": { - "category": "deletion", - "resource_type": "DBInstance", - "message": "DB instance restarted" - }, - - "create_db_snapshot":{ - "category": "creation", - "resource_type": "DBSnapshot", - "message": "db snapshot created" - }, - "delete_db_snapshot":{ - "category": "creation", - "resource_type": "DBSnapshot", - "message": "db snapshot deleted" - - }, - "restore_db_instance_from_snapshot":{ - "category": "restoring", - "resource_type": "DBSnapshot", - "message": "db instance restored from snapshot" - - } - }, - "errs": { - - } -} \ No newline at end of file diff --git a/DB_UserAdministration/Controllers/permissionController.py b/DB_UserAdministration/Controllers/permissionController.py index 2d5aac7f..010a2a46 100644 --- a/DB_UserAdministration/Controllers/permissionController.py +++ b/DB_UserAdministration/Controllers/permissionController.py @@ -10,6 +10,9 @@ def create_permission(self, action:Action, resource: Resource, effect:Effect): def delete_permission(self, permission_id: int): return self.service.delete_permission(permission_id) + def update_permission(self): + return self.service.update_permission() + def list_permissions(self): return self.service.list_permissions() diff --git a/DB_UserAdministration/DataAccess/permissionManager.py b/DB_UserAdministration/DataAccess/permissionManager.py index 09508719..554f4fbd 100644 --- a/DB_UserAdministration/DataAccess/permissionManager.py +++ b/DB_UserAdministration/DataAccess/permissionManager.py @@ -1,4 +1,5 @@ import sqlite3 +from permissionModel import Action, Resource, Effect # from DataAccess import DBManager class PermissionManager: @@ -68,6 +69,10 @@ def delete_permission(self, permission_id): """ criteria = f'object_id = {permission_id}' return self.db_manager.delete(self.table_name, criteria) + + def update_permission(self,permission_id: int, action: Action = None, resource: Resource = None, effect: Effect = None): + criteria = f'object_id = {permission_id}' + return self.db_manager.update(self.table_name, criteria) def list_permissions(self): """ diff --git a/DB_UserAdministration/Services/permissionService.py b/DB_UserAdministration/Services/permissionService.py index 14c59dc1..377f019f 100644 --- a/DB_UserAdministration/Services/permissionService.py +++ b/DB_UserAdministration/Services/permissionService.py @@ -51,6 +51,7 @@ def delete_permission(self, permission_id: int): :return: The result of the deletion operation from the DAL. """ return self.dal.delete_permission(permission_id) + def list_permissions(self): """ @@ -60,7 +61,7 @@ def list_permissions(self): """ return self.dal.list_permissions() - def update_permission(self, permission_id: int, action: Action, resource: Resource): + def update_permission(self, permission_id: int, action: Action, resource: Resource, effect: Effect): """ Update an existing permission's action and resource based on its ID.