Compare commits
47 Commits
9
pom.xml
9
pom.xml
|
@ -1,15 +1,14 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>uoa-monitor-service</artifactId>
|
<artifactId>uoa-monitor-service</artifactId>
|
||||||
<version>1.0.4-SNAPSHOT</version>
|
<version>1.1.15-BETA-SNAPSHOT</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>uoa-monitor-service</name>
|
<name>uoa-monitor-service</name>
|
||||||
<scm>
|
<scm>
|
||||||
<developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/uoa-monitor-service.git</developerConnection>
|
<developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/uoa-monitor-service.git</developerConnection>
|
||||||
</scm>
|
<tag>HEAD</tag>
|
||||||
|
</scm>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>uoa-spring-boot-parent</artifactId>
|
<artifactId>uoa-spring-boot-parent</artifactId>
|
||||||
|
|
|
@ -60,11 +60,11 @@ public interface StakeholderDAO extends MongoRepository<Stakeholder, String> {
|
||||||
*/
|
*/
|
||||||
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNull();
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNull();
|
||||||
|
|
||||||
List<Stakeholder> findByStandaloneIsTrueAndUmbrellaIsNullAndDefaultId(String id);
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndDefaultId(String id);
|
||||||
|
|
||||||
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndType(StakeholderType Type);
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndType(StakeholderType Type);
|
||||||
|
|
||||||
List<Stakeholder> findByStandaloneIsTrueAndUmbrellaIsNullAndTypeAndDefaultId(StakeholderType Type, String id);
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndTypeAndDefaultId(StakeholderType Type, String id);
|
||||||
|
|
||||||
default List<Stakeholder> standaloneStakeholders() {
|
default List<Stakeholder> standaloneStakeholders() {
|
||||||
return standaloneStakeholders(null);
|
return standaloneStakeholders(null);
|
||||||
|
@ -76,9 +76,9 @@ public interface StakeholderDAO extends MongoRepository<Stakeholder, String> {
|
||||||
|
|
||||||
default List<Stakeholder> standaloneStakeholders(StakeholderType type, String id) {
|
default List<Stakeholder> standaloneStakeholders(StakeholderType type, String id) {
|
||||||
if (type != null && id != null) {
|
if (type != null && id != null) {
|
||||||
return findByStandaloneIsTrueAndUmbrellaIsNullAndTypeAndDefaultId(type, id);
|
return findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndTypeAndDefaultId(type, id);
|
||||||
} else if (id != null) {
|
} else if (id != null) {
|
||||||
return findByStandaloneIsTrueAndUmbrellaIsNullAndDefaultId(id);
|
return findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndDefaultId(id);
|
||||||
} else if (type != null) {
|
} else if (type != null) {
|
||||||
return findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndType(type);
|
return findByDefaultIdIsNotNullAndStandaloneIsTrueAndUmbrellaIsNullAndType(type);
|
||||||
} else {
|
} else {
|
||||||
|
@ -91,11 +91,11 @@ public interface StakeholderDAO extends MongoRepository<Stakeholder, String> {
|
||||||
*/
|
*/
|
||||||
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsFalse();
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsFalse();
|
||||||
|
|
||||||
List<Stakeholder> findByStandaloneIsFalseAndDefaultId(String id);
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsFalseAndDefaultId(String id);
|
||||||
|
|
||||||
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsFalseAndType(StakeholderType Type);
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsFalseAndType(StakeholderType Type);
|
||||||
|
|
||||||
List<Stakeholder> findByStandaloneIsFalseAndTypeAndDefaultId(StakeholderType Type, String id);
|
List<Stakeholder> findByDefaultIdIsNotNullAndStandaloneIsFalseAndTypeAndDefaultId(StakeholderType Type, String id);
|
||||||
|
|
||||||
default List<Stakeholder> dependentStakeholders() {
|
default List<Stakeholder> dependentStakeholders() {
|
||||||
return dependentStakeholders(null);
|
return dependentStakeholders(null);
|
||||||
|
@ -107,9 +107,9 @@ public interface StakeholderDAO extends MongoRepository<Stakeholder, String> {
|
||||||
|
|
||||||
default List<Stakeholder> dependentStakeholders(StakeholderType type, String id) {
|
default List<Stakeholder> dependentStakeholders(StakeholderType type, String id) {
|
||||||
if (type != null && id != null) {
|
if (type != null && id != null) {
|
||||||
return findByStandaloneIsFalseAndTypeAndDefaultId(type, id);
|
return findByDefaultIdIsNotNullAndStandaloneIsFalseAndTypeAndDefaultId(type, id);
|
||||||
} else if (id != null) {
|
} else if (id != null) {
|
||||||
return findByStandaloneIsFalseAndDefaultId(id);
|
return findByDefaultIdIsNotNullAndStandaloneIsFalseAndDefaultId(id);
|
||||||
} else if (type != null) {
|
} else if (type != null) {
|
||||||
return findByDefaultIdIsNotNullAndStandaloneIsFalseAndType(type);
|
return findByDefaultIdIsNotNullAndStandaloneIsFalseAndType(type);
|
||||||
} else {
|
} else {
|
||||||
|
@ -153,11 +153,11 @@ public interface StakeholderDAO extends MongoRepository<Stakeholder, String> {
|
||||||
* */
|
* */
|
||||||
List<Stakeholder> findByDefaultIdNotNullAndStandaloneIsTrue();
|
List<Stakeholder> findByDefaultIdNotNullAndStandaloneIsTrue();
|
||||||
|
|
||||||
List<Stakeholder> findByStandaloneIsTrueAndDefaultId(String id);
|
List<Stakeholder> findByDefaultIdNotNullAndStandaloneIsTrueAndDefaultId(String id);
|
||||||
|
|
||||||
List<Stakeholder> findByDefaultIdNotNullAndStandaloneIsTrueAndType(StakeholderType Type);
|
List<Stakeholder> findByDefaultIdNotNullAndStandaloneIsTrueAndType(StakeholderType Type);
|
||||||
|
|
||||||
List<Stakeholder> findByStandaloneIsTrueAndTypeAndDefaultId(StakeholderType Type, String id);
|
List<Stakeholder> findByDefaultIdNotNullAndStandaloneIsTrueAndTypeAndDefaultId(StakeholderType Type, String id);
|
||||||
|
|
||||||
default List<Stakeholder> browseStakeholders() {
|
default List<Stakeholder> browseStakeholders() {
|
||||||
return browseStakeholders(null);
|
return browseStakeholders(null);
|
||||||
|
@ -169,9 +169,9 @@ public interface StakeholderDAO extends MongoRepository<Stakeholder, String> {
|
||||||
|
|
||||||
default List<Stakeholder> browseStakeholders(StakeholderType type, String id) {
|
default List<Stakeholder> browseStakeholders(StakeholderType type, String id) {
|
||||||
if (type != null && id != null) {
|
if (type != null && id != null) {
|
||||||
return findByStandaloneIsTrueAndTypeAndDefaultId(type, id);
|
return findByDefaultIdNotNullAndStandaloneIsTrueAndTypeAndDefaultId(type, id);
|
||||||
} else if (id != null) {
|
} else if (id != null) {
|
||||||
return findByStandaloneIsTrueAndDefaultId(id);
|
return findByDefaultIdNotNullAndStandaloneIsTrueAndDefaultId(id);
|
||||||
} else if (type != null) {
|
} else if (type != null) {
|
||||||
return findByDefaultIdNotNullAndStandaloneIsTrueAndType(type);
|
return findByDefaultIdNotNullAndStandaloneIsTrueAndType(type);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue