diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/IPersonRegistratorTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/IPersonRegistratorTranslator.java
new file mode 100644
index 0000000000000000000000000000000000000000..a4183aaf4e092caa6d0d7e965be77226c6814783
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/IPersonRegistratorTranslator.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.api.v3.translator.entity.person;
+
+/**
+ * @author pkupczyk
+ */
+public interface IPersonRegistratorTranslator extends IObjectToPersonTranslator
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonQuery.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonQuery.java
index 8c6b25886430d30d4d123e941730defd043fbf0c..f537dcc65acb26eaa72585597e81a7266b2b3acc 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonQuery.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonQuery.java
@@ -37,6 +37,9 @@ public interface PersonQuery extends ObjectQuery
public List<PersonBaseRecord> getPersons(LongSet personIds);
@Select(sql = "select id as objectId, space_id as relatedId from persons where id = any(?{1})", parameterBindings = { LongSetMapper.class }, fetchSize = FETCH_SIZE)
- public List<ObjectRelationRecord> getSpaces(LongSet personIds);
+ public List<ObjectRelationRecord> getSpaceIds(LongSet personIds);
+
+ @Select(sql = "select id as objectId, pers_id_registerer as relatedId from persons where id = any(?{1})", parameterBindings = { LongSetMapper.class }, fetchSize = FETCH_SIZE)
+ public List<ObjectRelationRecord> getRegistratorIds(LongSet personIds);
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonRegistratorTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonRegistratorTranslator.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ea440c9dc181b64832db16480f028498aef8533
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonRegistratorTranslator.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.openbis.generic.server.api.v3.translator.entity.person;
+
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import net.lemnik.eodsql.QueryTool;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.translator.entity.common.ObjectRelationRecord;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class PersonRegistratorTranslator extends ObjectToPersonTranslator implements IPersonRegistratorTranslator
+{
+
+ @Override
+ protected List<ObjectRelationRecord> loadRecords(LongOpenHashSet objectIds)
+ {
+ PersonQuery query = QueryTool.getManagedQuery(PersonQuery.class);
+ return query.getRegistratorIds(new LongOpenHashSet(objectIds));
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonSpaceTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonSpaceTranslator.java
index dc1033c3346eb2b6d979690a48e8f93d953628af..8d76ed2a5149242aaf2f57249b67c030ce652a6d 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonSpaceTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonSpaceTranslator.java
@@ -38,7 +38,7 @@ public class PersonSpaceTranslator extends ObjectToSpaceTranslator implements IP
protected List<ObjectRelationRecord> loadRecords(LongOpenHashSet objectIds)
{
PersonQuery query = QueryTool.getManagedQuery(PersonQuery.class);
- return query.getSpaces(objectIds);
+ return query.getSpaceIds(objectIds);
}
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonTranslator.java
index 7ebebda4f111cf6665a4e2d47b099886281b1c9b..160cb17bff5fe4de693bec292a6c263275a63825 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/translator/entity/person/PersonTranslator.java
@@ -40,6 +40,9 @@ public class PersonTranslator extends AbstractCachingTranslator<Long, Person, Pe
@Autowired
private IPersonSpaceTranslator spaceTranslator;
+ @Autowired
+ private IPersonRegistratorTranslator registratorTranslator;
+
@Override
protected Person createObject(TranslationContext context, Long personId, PersonFetchOptions fetchOptions)
{
@@ -60,6 +63,11 @@ public class PersonTranslator extends AbstractCachingTranslator<Long, Person, Pe
relations.put(IPersonSpaceTranslator.class, spaceTranslator.translate(context, personIds, fetchOptions.withSpace()));
}
+ if (fetchOptions.hasRegistrator())
+ {
+ relations.put(IPersonRegistratorTranslator.class, registratorTranslator.translate(context, personIds, fetchOptions.withRegistrator()));
+ }
+
return relations;
}
@@ -82,5 +90,11 @@ public class PersonTranslator extends AbstractCachingTranslator<Long, Person, Pe
result.setSpace(relations.get(IPersonSpaceTranslator.class, personId));
result.getFetchOptions().withSpaceUsing(fetchOptions.withSpace());
}
+
+ if (fetchOptions.hasRegistrator())
+ {
+ result.setRegistrator(relations.get(IPersonRegistratorTranslator.class, personId));
+ result.getFetchOptions().withRegistratorUsing(fetchOptions.withRegistrator());
+ }
}
}
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSpaceTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSpaceTest.java
index 83c2f30b0ac31de391827a9a16f5138a67194c7a..ebb5b53242e9878cc6a86cc67e4df8a3f2a503ef 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSpaceTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSpaceTest.java
@@ -17,6 +17,7 @@
package ch.ethz.sis.openbis.systemtest.api.v3;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import java.util.Arrays;
import java.util.Iterator;
@@ -196,7 +197,8 @@ public class MapSpaceTest extends AbstractTest
SpacePermId permId = new SpacePermId("TEST-SPACE");
SpaceFetchOptions fetchOptions = new SpaceFetchOptions();
- fetchOptions.withRegistrator();
+ fetchOptions.withRegistrator().withSpace();
+ fetchOptions.withRegistrator().withRegistrator();
String sessionToken = v3api.login(TEST_USER, PASSWORD);
Map<ISpaceId, Space> map = v3api.mapSpaces(sessionToken, Arrays.asList(permId), fetchOptions);
@@ -205,6 +207,14 @@ public class MapSpaceTest extends AbstractTest
Person registrator = space.getRegistrator();
assertEquals(registrator.getUserId(), "test");
+ assertNotNull(registrator.getFirstName());
+ assertNotNull(registrator.getLastName());
+ assertEquals(registrator.getEmail(), "franz-josef.elmer@systemsx.ch");
+ assertEqualsDate(registrator.getRegistrationDate(), "2008-11-05 09:18:10");
+ assertEquals(registrator.isActive(), Boolean.TRUE);
+ assertEquals(registrator.getSpace().getCode(), "CISD");
+ assertEquals(registrator.getRegistrator().getUserId(), "system");
+
assertProjectsNotFetched(space);
assertSamplesNotFetched(space);
}
diff --git a/openbis/sourceTest/sql/postgresql/146/043=persons.tsv b/openbis/sourceTest/sql/postgresql/146/043=persons.tsv
index 3341f7a5a51023656c71691064fd540cb6f65591..03883669963df4c565646df772c4590b531c65bf 100644
--- a/openbis/sourceTest/sql/postgresql/146/043=persons.tsv
+++ b/openbis/sourceTest/sql/postgresql/146/043=persons.tsv
@@ -1,7 +1,7 @@
1 System User system \N 2008-11-05 09:18:00.622+01 \N \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787000737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t
3 John Observer observer observer@o.o 1 2008-11-05 09:18:10.581+01 \N \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t
4 ETL Server etlserver franz-josef.elmer@systemsx.ch 1 2008-11-05 09:18:10.581+01 \N \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t
-2 John Doe test franz-josef.elmer@systemsx.ch 1 2008-11-05 09:18:10.581+01 \N \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200085a0029646973706c6179437573746f6d436f6c756d6e446562756767696e674572726f724d657373616765735a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c001064726f70446f776e53657474696e677371007e00014c001670616e656c436f6c6c617073656453657474696e677371007e00014c001170616e656c53697a6553657474696e677371007e00014c001d7265616c4e756d626572466f726d6174696e67506172616d65746572737400514c63682f73797374656d73782f636973642f6f70656e6269732f67656e657269632f7368617265642f62617369632f64746f2f5265616c4e756d626572466f726d6174696e67506172616d65746572733b4c000b74616253657474696e677371007e000178700001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00053f4000000000000c7708000000100000000174001e73616d706c652d747970656d61696e5f73616d706c655f62726f7773657274000a43454c4c5f504c415445787371007e00053f4000000000000c77080000001000000000787371007e00053f4000000000000c770800000010000000027400156c6566745f70616e656c5f43454c4c5f504c415445737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000012c7400196c6566745f70616e656c5f44494c5554494f4e5f504c4154457371007e000d0000012c787372004f63682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e5265616c4e756d626572466f726d6174696e67506172616d657465727300000000000000010200035a0010666f726d6174696e67456e61626c6564490009707265636973696f6e5a000a736369656e746966696378700100000004007371007e00053f4000000000000c7708000000100000000274002367656e657269635f73616d706c655f76696577657244494c5554494f4e5f504c415445740018636f6e7461696e65722d73616d706c652d73656374696f6e74001f67656e657269635f73616d706c655f76696577657243454c4c5f504c415445740016706172656e742d73616d706c65732d73656374696f6e78 t
+2 John Doe test franz-josef.elmer@systemsx.ch 1 2008-11-05 09:18:10.581+01 1 \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200085a0029646973706c6179437573746f6d436f6c756d6e446562756767696e674572726f724d657373616765735a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c001064726f70446f776e53657474696e677371007e00014c001670616e656c436f6c6c617073656453657474696e677371007e00014c001170616e656c53697a6553657474696e677371007e00014c001d7265616c4e756d626572466f726d6174696e67506172616d65746572737400514c63682f73797374656d73782f636973642f6f70656e6269732f67656e657269632f7368617265642f62617369632f64746f2f5265616c4e756d626572466f726d6174696e67506172616d65746572733b4c000b74616253657474696e677371007e000178700001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00053f4000000000000c7708000000100000000174001e73616d706c652d747970656d61696e5f73616d706c655f62726f7773657274000a43454c4c5f504c415445787371007e00053f4000000000000c77080000001000000000787371007e00053f4000000000000c770800000010000000027400156c6566745f70616e656c5f43454c4c5f504c415445737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000012c7400196c6566745f70616e656c5f44494c5554494f4e5f504c4154457371007e000d0000012c787372004f63682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e5265616c4e756d626572466f726d6174696e67506172616d657465727300000000000000010200035a0010666f726d6174696e67456e61626c6564490009707265636973696f6e5a000a736369656e746966696378700100000004007371007e00053f4000000000000c7708000000100000000274002367656e657269635f73616d706c655f76696577657244494c5554494f4e5f504c415445740018636f6e7461696e65722d73616d706c652d73656374696f6e74001f67656e657269635f73616d706c655f76696577657243454c4c5f504c415445740016706172656e742d73616d706c65732d73656374696f6e78 t
5 John Inactive inactive inactive@in.active 1 2008-11-05 09:18:10.581+01 \N \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 f
6 John Doe test role test_role inactive@in.active 1 2008-11-05 09:18:10.581+01 2 \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t
7 John Doe test space test_space inactive@in.active 3 2008-11-05 09:18:10.581+01 \N \\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078 t