From 431580e12b62964ff1a2fa3a8229ed9fd5940c79 Mon Sep 17 00:00:00 2001 From: Cristiano Urban Date: Tue, 22 Jun 2021 22:09:15 +0200 Subject: [PATCH] Minor changes. Signed-off-by: Cristiano Urban --- transfer_service/db_connector.py | 16 ++++++++-------- transfer_service/group_rw_rpc_server.py | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py index adeef38..9f4553c 100644 --- a/transfer_service/db_connector.py +++ b/transfer_service/db_connector.py @@ -721,36 +721,36 @@ class DbConnector(object): if not conn.closed: conn.rollback() - def updateGroupRead(self, groupsToAdd, groupsToRemove, nodeVOSPath): + def updateGroupRead(self, groupToAdd, groupToRemove, nodeVOSPath): with self.getConnection() as conn: try: cursor = conn.cursor(cursor_factory = RealDictCursor) cursor.execute(""" UPDATE node c - SET group_read = update_array(c.group_read, %s::VARCHAR[], %s::VARCHAR[]) + SET group_read = update_array(c.group_read, %s, %s) FROM node n WHERE c.path <@ n.path AND n.node_id = id_from_vos_path(%s); """, - (groupsToAdd, - groupsToRemove, + (groupToAdd, + groupToRemove, nodeVOSPath,)) conn.commit() except Exception as e: if not conn.closed: conn.rollback() - def updateGroupWrite(self, groupsToAdd, groupsToRemove, nodeVOSPath): + def updateGroupWrite(self, groupToAdd, groupToRemove, nodeVOSPath): with self.getConnection() as conn: try: cursor = conn.cursor(cursor_factory = RealDictCursor) cursor.execute(""" UPDATE node c - SET group_write = update_array(c.group_write, %s::VARCHAR[], %s::VARCHAR[]) + SET group_write = update_array(c.group_write, %s, %s) FROM node n WHERE c.path <@ n.path AND n.node_id = id_from_vos_path(%s); """, - (groupsToAdd, - groupsToRemove, + (groupToAdd, + groupToRemove, nodeVOSPath,)) conn.commit() except Exception as e: diff --git a/transfer_service/group_rw_rpc_server.py b/transfer_service/group_rw_rpc_server.py index 74710b9..276d135 100644 --- a/transfer_service/group_rw_rpc_server.py +++ b/transfer_service/group_rw_rpc_server.py @@ -56,6 +56,7 @@ class GroupRwRPCServer(RedisRPCServer): jobType = requestType.split('_')[0] vospacePath = requestBody["vospacePath"] groupname = requestBody["groupName"] + self.logger.info(f"groupName: {groupname}") #groupInDb = self.dbConn.userExists(groupname) #groupInfo = self.systemUtils.userInfo(groupname) -- GitLab