From c9615da5ecca2b01b5f1f020757158144e85c77c Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Fri, 30 Apr 2021 09:38:32 +0200
Subject: [PATCH] Renamed rap_id to user_id
---
src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java | 6 +++---
src/test/resources/test-data.sql | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java b/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java
index e57679c..f6d04da 100644
--- a/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java
+++ b/src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java
@@ -31,10 +31,10 @@ public class FileDAO {
public Optional<FileInfo> getFileInfo(String virtualPath) {
- String sql = "SELECT n.node_id, is_public, group_read, group_write, owner_id, async_trans,\n"
+ String sql = "SELECT n.node_id, is_public, group_read, group_write, creator_id, async_trans,\n"
+ "content_type, content_encoding, content_length, content_md5,\n"
+ "accept_views, provide_views, l.location_type, n.path <> n.relative_path AS virtual_parent,\n"
- + "(SELECT user_name FROM users WHERE rap_id = owner_id) AS username,\n"
+ + "(SELECT user_name FROM users WHERE user_id = creator_id) AS username,\n"
+ "base_path, os_path\n"
+ "FROM node_path p\n"
+ "JOIN node n ON p.node_id = n.node_id\n"
@@ -54,7 +54,7 @@ public class FileDAO {
fi.setIsPublic(rs.getBoolean("is_public"));
fi.setGroupRead(toList(rs.getArray("group_read")));
fi.setGroupWrite(toList(rs.getArray("group_write")));
- fi.setOwnerId(rs.getString("owner_id"));
+ fi.setOwnerId(rs.getString("creator_id"));
fi.setAsyncTrans(rs.getBoolean("async_trans"));
fi.setAcceptViews(toList(rs.getArray("accept_views")));
fi.setProvideViews(toList(rs.getArray("provide_views")));
diff --git a/src/test/resources/test-data.sql b/src/test/resources/test-data.sql
index df51224..77888ac 100644
--- a/src/test/resources/test-data.sql
+++ b/src/test/resources/test-data.sql
@@ -2,7 +2,7 @@ DELETE FROM node;
ALTER SEQUENCE node_node_id_seq RESTART WITH 1;
DELETE FROM users;
-INSERT INTO users (rap_id, user_name, e_mail) VALUES ('user1', 'username1', 'ia2@inaf.it');
+INSERT INTO users (user_id, user_name, e_mail) VALUES ('user1', 'username1', 'ia2@inaf.it');
INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES (NULL, NULL, '', 'container', '0', '0');
--
GitLab