Commit c9615da5 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Renamed rap_id to user_id

parent 58cbbcc1

src/main/java/it/inaf/ia2/transfer/persistence/FileDAO.java

+3 −3
Original line number Diff line number Diff line
@@ -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")));

src/test/resources/test-data.sql

+1 −1
Original line number Diff line number Diff line
@@ -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');