From c8adee576e2d5266d2a8466ca3a3b8a13afbeb32 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Mon, 16 Oct 2023 12:42:49 +0300
Subject: [PATCH] Add support for country reasearcher and datasource

---
 .../entities/Stakeholder.java                 |  8 ++-
 .../handlers/utils/RolesUtils.java            | 72 -------------------
 2 files changed, 5 insertions(+), 75 deletions(-)
 delete mode 100644 src/main/java/eu/dnetlib/uoamonitorservice/handlers/utils/RolesUtils.java

diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java b/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
index 6ab8c78..81bd3d1 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
@@ -9,9 +9,11 @@ import java.util.List;
 
 enum StakeholderType
 {
-    // Do not rename or remove existring values. This may cause problems with already stored values in DB
+    // Do not rename or remove existing values. This may cause problems with already stored values in DB
     funder, ri, project, organization,
-    FUNDER, RI, PROJECT, ORGANIZATION;
+    country, researcher, datasource,
+    FUNDER, RI, PROJECT, ORGANIZATION,
+    COUNTRY, RESEARCHER, DATASOURCE;
 }
 
 enum Locale {
@@ -19,7 +21,7 @@ enum Locale {
 
     public final String label;
 
-    private Locale(String label) {
+    Locale(String label) {
         this.label = label;
     }
 }
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/handlers/utils/RolesUtils.java b/src/main/java/eu/dnetlib/uoamonitorservice/handlers/utils/RolesUtils.java
deleted file mode 100644
index d360654..0000000
--- a/src/main/java/eu/dnetlib/uoamonitorservice/handlers/utils/RolesUtils.java
+++ /dev/null
@@ -1,72 +0,0 @@
-//package eu.dnetlib.uoamonitorservice.handlers.utils;
-//
-//import eu.dnetlib.uoaauthorizationlibrary.security.AuthorizationService;
-//import org.apache.log4j.Logger;
-//
-//import java.util.List;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//public class RolesUtils {
-//    @Autowired
-//    private AuthorizationService authorizationService;
-//
-//    private final Logger log = Logger.getLogger(this.getClass());
-//
-//    public List<String> getRoles() {
-//        return authorizationService.getRoles();
-//    }
-//
-//    public boolean isPortalAdmin(List<String> roles) {
-//        if(roles == null) {
-//            return false;
-//        }
-////        log.debug(authorizationService.PORTAL_ADMIN);
-////        log.debug("PortalAdmin: "+roles.contains(authorizationService.PORTAL_ADMIN));
-//        return roles.contains(authorizationService.PORTAL_ADMIN);
-//    }
-//
-//    public boolean isCurator(List<String> roles, String type) {
-//        if(roles == null) {
-//            return false;
-//        }
-////        log.debug(authorizationService.curator(type));
-////        log.debug("Curator in "+type+": "+roles.contains(authorizationService.curator(type)));
-//        return roles.contains(authorizationService.curator(type));
-//    }
-//
-//    public boolean isManager(List<String> roles, String type, String id) {
-//        if(roles == null) {
-//            return false;
-//        }
-////        log.debug(authorizationService.manager(type, id));
-////        log.debug("Manager in "+type+" - "+id+": "+roles.contains(authorizationService.manager(type, id)));
-//        return roles.contains(authorizationService.manager(type, id));
-//    }
-//
-//    public boolean isMember(List<String> roles, String type, String id) {
-//        if(roles == null) {
-//            return false;
-//        }
-////        log.debug(authorizationService.member(type, id));
-////        log.debug("Member in "+type+" - "+id+": "+roles.contains(authorizationService.member(type, id)));
-//        return roles.contains(authorizationService.member(type, id));
-//    }
-//
-//    public boolean isLoggedIn(List<String> roles) {
-//        if(roles == null || roles.contains(authorizationService.ANONYMOUS_USER)) {
-//            return false;
-//        }
-//        return true;
-//    }
-//
-//    public boolean hasUpdateAuthority(List<String> roles, String type, String id) {
-//        return isPortalAdmin(roles) || isCurator(roles, type) || isManager(roles, type, id);
-//    }
-//
-//    public boolean hasCreateAndDeleteAuthority(List<String> roles, String type) {
-//        return isPortalAdmin(roles) || isCurator(roles, type);
-//    }
-//}