From 3f0bbbd81c7f8585489aaaa973585ea74a088e78 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 5 Oct 2021 21:01:19 +0000
Subject: [PATCH] [Trunk | Monitor Service]: 1. StakeholderController.java: In
 method "getAllRealStakeholders()" (/stakeholder), return also stakeholders
 with "restricted" visibility, without checking user's roles. 2. pom.xml: 
 a. Update parent from "spring-boot-starter-parent" to "dnet45-parent" ==> add
 <dependencyManagement> and "maven-war-plugin" and comment
 "spring-boot-maven-plugin". 	b. For dependencies
 "uoa-authorization-library" and "uoa-notification-service", use version 1.0.0
 (released version), not 1.0.0-SNAPSHOT.

---
 pom.xml                                       | 58 ++++++++++++++-----
 .../controllers/StakeholderController.java    |  3 +-
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1dcaa18..72b4a1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,19 +11,21 @@
 
     <name>uoa-monitor-service</name>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.8.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-
+<!-- Use parent with artifact spring-boot-starter-parent and add plugin with artifact spring-boot-maven-plugin in order to run springboot run command-->
 <!--    <parent>-->
-<!--        <groupId>eu.dnetlib</groupId>-->
-<!--        <artifactId>dnet45-parent</artifactId>-->
-<!--        <version>1.0.0-SNAPSHOT</version>-->
+<!--        <groupId>org.springframework.boot</groupId>-->
+<!--        <artifactId>spring-boot-starter-parent</artifactId>-->
+<!--        <version>1.5.8.RELEASE</version>-->
+<!--        <relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->
 <!--    </parent>-->
 
+    <!-- Comment parent with artifact dnet45-parent and <dependencyManagement> in order to run springboot run command -->
+    <parent>
+        <groupId>eu.dnetlib</groupId>
+        <artifactId>dnet45-parent</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -32,6 +34,18 @@
         <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
     </properties>
 
+    <!-- Comment parent with artifact dnet45-parent and <dependencyManagement> in order to run springboot run command -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>1.5.8.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -77,12 +91,12 @@
         <dependency>
             <groupId>eu.dnetlib</groupId>
             <artifactId>uoa-authorization-library</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>eu.dnetlib</groupId>
             <artifactId>uoa-notification-service</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -97,10 +111,12 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
+<!-- Use parent with artifact spring-boot-starter-parent and add plugin with artifact spring-boot-maven-plugin in order to run springboot run command-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--            </plugin>-->
+
             <!--3d answer: https://stackoverflow.com/questions/23260057/the-forked-vm-terminated-without-saying-properly-goodbye-vm-crash-or-system-exi-->
             <!--If you use openjdk there might be a problem with surfire plugin - uncomment following lines-->
             <plugin>
@@ -112,6 +128,16 @@
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+
         </plugins>
         <finalName>uoa-monitor-service</finalName>
         <resources>
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
index bd49360..25451ab 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
@@ -378,7 +378,8 @@ public class StakeholderController {
                 if(rolesUtils.isCurator(roles, stakeholder.getType())
                         || rolesUtils.isManager(roles, stakeholder.getType(), stakeholder.getAlias())
                         || stakeholder.getVisibility() == Visibility.PUBLIC
-                        || (stakeholder.getVisibility() == Visibility.RESTRICTED && rolesUtils.isMember(roles, stakeholder.getType(), stakeholder.getAlias()))) {
+                        || stakeholder.getVisibility() == Visibility.RESTRICTED) {
+//                        || (stakeholder.getVisibility() == Visibility.RESTRICTED && rolesUtils.isMember(roles, stakeholder.getType(), stakeholder.getAlias()))) {
                     //stakeholdersFull.add(this.setFullEntities(stakeholder));
                     continue;
                 }