diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py index adeef3898a3baabec97d69e93eceb22c63c0c2ca..9f4553c8dfb9230177ebeeecdfda864c2e1984b0 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 74710b9580f1edb78ef6634779327909ce8321e5..276d135265bf4adb8d5725ab78d8c11159feaada 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)