From 89b42e8ea1ebc45269338cf3c83c505dccb2da02 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Wed, 19 Jul 2023 15:56:42 +0200
Subject: [PATCH] SSDM-55: Added ordering by id of properties
---
.../server/asapi/v3/translator/dataset/DataSetQuery.java | 2 +-
.../server/asapi/v3/translator/experiment/ExperimentQuery.java | 2 +-
.../generic/server/asapi/v3/translator/sample/SampleQuery.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java
index 2a03c904b01..fe9a8838d1f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java
@@ -117,7 +117,7 @@ public interface DataSetQuery extends ObjectQuery
+ "left join material_types mt on m.maty_id = mt.id "
+ "join data_set_type_property_types etpt on p.dstpt_id = etpt.id "
+ "join property_types pt on etpt.prty_id = pt.id "
- + "where p.ds_id = any(?{1})", parameterBindings = { LongSetMapper.class },
+ + "where p.ds_id = any(?{1}) order by id", parameterBindings = { LongSetMapper.class },
resultSetBinding = PropertyRecordDataObjectBinding.class, fetchSize = FETCH_SIZE)
public List<PropertyRecord> getProperties(LongSet dataSetIds);
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java
index 1a8be90db0c..f38a1602e1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java
@@ -85,7 +85,7 @@ public interface ExperimentQuery extends ObjectQuery
+ "left join material_types mt on m.maty_id = mt.id "
+ "join experiment_type_property_types etpt on p.etpt_id = etpt.id "
+ "join property_types pt on etpt.prty_id = pt.id "
- + "where p.expe_id = any(?{1})", parameterBindings = { LongSetMapper.class },
+ + "where p.expe_id = any(?{1}) order by id", parameterBindings = { LongSetMapper.class },
resultSetBinding = PropertyRecordDataObjectBinding.class, fetchSize = FETCH_SIZE)
public List<PropertyRecord> getProperties(LongSet experimentIds);
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java
index 736575e22cc..0c77078bfc9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java
@@ -82,7 +82,7 @@ public interface SampleQuery extends ObjectQuery
+ "left join material_types mt on m.maty_id = mt.id "
+ "join sample_type_property_types etpt on p.stpt_id = etpt.id "
+ "join property_types pt on etpt.prty_id = pt.id "
- + "where p.samp_id = any(?{1})", parameterBindings = { LongSetMapper.class },
+ + "where p.samp_id = any(?{1}) order by id", parameterBindings = { LongSetMapper.class },
resultSetBinding = PropertyRecordDataObjectBinding.class, fetchSize = FETCH_SIZE)
public List<PropertyRecord> getProperties(LongSet sampleIds);
--
GitLab