diff --git a/src/main/java/org/openepics/names/repository/DeviceGroupRepository.java b/src/main/java/org/openepics/names/repository/DeviceGroupRepository.java
index 9d608063b609a959910c76d9bd5078d3e3ddbc11..f157efe23ad6c39fe415726d3dcee8e21220dec7 100644
--- a/src/main/java/org/openepics/names/repository/DeviceGroupRepository.java
+++ b/src/main/java/org/openepics/names/repository/DeviceGroupRepository.java
@@ -183,6 +183,8 @@ public class DeviceGroupRepository {
cq.orderBy(cb.asc(cb.function("get_mnemonic_path_devicegroup", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -197,6 +199,8 @@ public class DeviceGroupRepository {
cq.orderBy(cb.desc(cb.function("get_mnemonic_path_devicegroup", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("name")));
}
diff --git a/src/main/java/org/openepics/names/repository/DeviceTypeRepository.java b/src/main/java/org/openepics/names/repository/DeviceTypeRepository.java
index 133a728ce6d800ff7bc6532b11ffc28abb3db8d9..e6d3c5bf68b8af9921a9cf78214db2033b32f6db 100644
--- a/src/main/java/org/openepics/names/repository/DeviceTypeRepository.java
+++ b/src/main/java/org/openepics/names/repository/DeviceTypeRepository.java
@@ -183,6 +183,8 @@ public class DeviceTypeRepository {
cq.orderBy(cb.asc(cb.function("get_mnemonic_path_devicetype", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -197,6 +199,8 @@ public class DeviceTypeRepository {
cq.orderBy(cb.desc(cb.function("get_mnemonic_path_devicetype", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("name")));
}
diff --git a/src/main/java/org/openepics/names/repository/DisciplineRepository.java b/src/main/java/org/openepics/names/repository/DisciplineRepository.java
index 44e99978f2efa9272ca00b800939a6a1358e9af6..4d6e8adb2167e270436ec3d2c089c0ffc41e6f4d 100644
--- a/src/main/java/org/openepics/names/repository/DisciplineRepository.java
+++ b/src/main/java/org/openepics/names/repository/DisciplineRepository.java
@@ -183,6 +183,8 @@ public class DisciplineRepository {
cq.orderBy(cb.asc(from.get("mnemonic")));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -197,6 +199,8 @@ public class DisciplineRepository {
cq.orderBy(cb.asc(from.get("mnemonic")));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("name")));
}
diff --git a/src/main/java/org/openepics/names/repository/NameRepository.java b/src/main/java/org/openepics/names/repository/NameRepository.java
index be1ef023554c42996fef5cc7f3da29ef45ea3a66..d31a74f5b11424fdcd1ed93ef165612b9b20496a 100644
--- a/src/main/java/org/openepics/names/repository/NameRepository.java
+++ b/src/main/java/org/openepics/names/repository/NameRepository.java
@@ -173,6 +173,8 @@ public class NameRepository {
cq.orderBy(cb.asc(cb.function("get_mnemonic_path_device_structure", String.class, from.get("convention_name"))));
} else if (FieldName.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldName.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -187,6 +189,8 @@ public class NameRepository {
cq.orderBy(cb.desc(cb.function("get_mnemonic_path_device_structure", String.class, from.get("convention_name"))));
} else if (FieldName.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldName.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("convention_name")));
}
diff --git a/src/main/java/org/openepics/names/repository/SubsystemRepository.java b/src/main/java/org/openepics/names/repository/SubsystemRepository.java
index da5c5b796f4e815fe52ed3cdfb61de5f10238026..2be94490b7afe311de5499964f9553cbc743d223 100644
--- a/src/main/java/org/openepics/names/repository/SubsystemRepository.java
+++ b/src/main/java/org/openepics/names/repository/SubsystemRepository.java
@@ -183,6 +183,8 @@ public class SubsystemRepository {
cq.orderBy(cb.asc(cb.function("get_mnemonic_path_subsystem", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -197,6 +199,8 @@ public class SubsystemRepository {
cq.orderBy(cb.desc(cb.function("get_mnemonic_path_subsystem", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("name")));
}
diff --git a/src/main/java/org/openepics/names/repository/SystemGroupRepository.java b/src/main/java/org/openepics/names/repository/SystemGroupRepository.java
index 1dac14308b8665176b9d6a4c1ff65a01956dd55f..ebefc1f7c286aa7074e9507e13a0c63d2e8cfeff 100644
--- a/src/main/java/org/openepics/names/repository/SystemGroupRepository.java
+++ b/src/main/java/org/openepics/names/repository/SystemGroupRepository.java
@@ -179,6 +179,8 @@ public class SystemGroupRepository {
cq.orderBy(cb.asc(from.get("mnemonic")));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -193,6 +195,8 @@ public class SystemGroupRepository {
cq.orderBy(cb.desc(from.get("mnemonic")));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("name")));
}
diff --git a/src/main/java/org/openepics/names/repository/SystemRepository.java b/src/main/java/org/openepics/names/repository/SystemRepository.java
index 90c2fc7335df940ce789be122308e19d062760a4..0403e3490107b944129d7a784f6a0de08cf6ee87 100644
--- a/src/main/java/org/openepics/names/repository/SystemRepository.java
+++ b/src/main/java/org/openepics/names/repository/SystemRepository.java
@@ -183,6 +183,8 @@ public class SystemRepository {
cq.orderBy(cb.asc(cb.function("get_mnemonic_path_system", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.asc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.asc(from.get("requested")));
} else {
cq.orderBy(cb.asc(from.get("convention_name")));
}
@@ -197,6 +199,8 @@ public class SystemRepository {
cq.orderBy(cb.desc(cb.function("get_mnemonic_path_system", String.class, from.get("uuid"))));
} else if (FieldStructure.DESCRIPTION.equals(orderBy)) {
cq.orderBy(cb.desc(from.get("description")));
+ } else if (FieldStructure.WHEN.equals(orderBy)) {
+ cq.orderBy(cb.desc(from.get("requested")));
} else {
cq.orderBy(cb.desc(from.get("name")));
}
diff --git a/src/main/java/org/openepics/names/rest/api/v1/INames.java b/src/main/java/org/openepics/names/rest/api/v1/INames.java
index 9fa26817c48586dd204d336cd7c1a3129ebb9bb7..0fdcf3be735b9ff4c74762fd1e0dcdc79e4ca6f2 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/INames.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/INames.java
@@ -107,9 +107,8 @@ public interface INames {
read GET /names/{name} - both name and uuid (name - exact and search, uuid exact)
*/
- public static final String DEFAULT_FALSE = "false";
- public static final String DEFAULT_PAGE = "0";
- public static final String DEFAULT_PAGE_SIZE = "100";
+ public static final String DEFAULT_PAGE = "0";
+ public static final String DEFAULT_PAGE_SIZE = "100";
/**
* Create names by list of name elements.
diff --git a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
index f8606bbb6a957ea3d96bb8818399268f09435627..c28d0976ebae595aed72a4c0b4cdff2b8b90f99b 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
@@ -114,9 +114,8 @@ public interface IStructures {
update PATCH /structures/reject - rejectStructures (List<StructureElement>)
*/
- public static final String DEFAULT_FALSE = "false";
- public static final String DEFAULT_PAGE = "0";
- public static final String DEFAULT_PAGE_SIZE = "100";
+ public static final String DEFAULT_PAGE = "0";
+ public static final String DEFAULT_PAGE_SIZE = "100";
/**
* Create (propose) structures by list of structure elements.
diff --git a/src/main/java/org/openepics/names/rest/beans/FieldName.java b/src/main/java/org/openepics/names/rest/beans/FieldName.java
index 5ed6b831d6497781455a5602f3c48e77b9753aa3..f73973c707b8b8097e957f496b7aefc8627c68f6 100644
--- a/src/main/java/org/openepics/names/rest/beans/FieldName.java
+++ b/src/main/java/org/openepics/names/rest/beans/FieldName.java
@@ -30,6 +30,7 @@ public enum FieldName {
NAMEEQUIVALENCE,
SYSTEMSTRUCTURE,
DEVICESTRUCTURE,
- DESCRIPTION;
+ DESCRIPTION,
+ WHEN;
}
diff --git a/src/main/java/org/openepics/names/rest/beans/FieldStructure.java b/src/main/java/org/openepics/names/rest/beans/FieldStructure.java
index 2958fd8df1f83d49856eebc59e5a02ef2959ad0a..f8cf33e9e6fd3bce91393642f0353855d763d515 100644
--- a/src/main/java/org/openepics/names/rest/beans/FieldStructure.java
+++ b/src/main/java/org/openepics/names/rest/beans/FieldStructure.java
@@ -31,6 +31,7 @@ public enum FieldStructure {
MNEMONIC,
MNEMONICEQUIVALENCE,
MNEMONICPATH,
- DESCRIPTION;
+ DESCRIPTION,
+ WHEN;
}