/ - Diff - D-Net - D-Net project tracking tool

         public void setDate(Date last_interaction_date) {
             this.last_interaction_date = last_interaction_date;
+        }
         @Override
         public String toString() {
             return "Notification{" +
                     "openaireId='" + openaireId + '\'' +
                     ", openaireName='" + openaireName + '\'' +
                     ", userMail='" + userMail + '\'' +
                     ", frequency=" + frequency +
                     ", notify=" + notify +
                     ", last_interaction_date=" + last_interaction_date +
                     '}';
+        }
+    }

     import java.io.StringReader;
     import java.net.HttpURLConnection;
     import java.net.URL;
     import java.util.Arrays;
     import java.util.List;
     public class ManagerUtils {
         private static String registryAPIForManagerEmails;
         private static String closedRegistryAPIForManagerEmails;
         private static String sessionCookieName;
         private static String sessionCookieDomain;
         private String id;
         private String email;
         private String name;
-...
             this.memberSince = memberSince;
+        }
         public static String getSessionCookieName() {
             return sessionCookieName;
+        }
         public static void setSessionCookieName(String sessionCookieName) {
             ManagerUtils.sessionCookieName = sessionCookieName;
+        }
         public static String getSessionCookieDomain() {
             return sessionCookieDomain;
+        }
         public static void setSessionCookieDomain(String sessionCookieDomain) {
             ManagerUtils.sessionCookieDomain = sessionCookieDomain;
+        }
         public static String getClosedRegistryAPIForManagerEmails() {
             return closedRegistryAPIForManagerEmails;
+        }
         public static void setClosedRegistryAPIForManagerEmails(String closedRegistryAPIForManagerEmails) {
             ManagerUtils.closedRegistryAPIForManagerEmails = closedRegistryAPIForManagerEmails;
+        }
         public  List<ManagerUtils> getManagersByEmail(String community, String sessionId) {
         public  List<ManagerUtils> getManagersByEmail(String community) {
             String url = registryAPIForManagerEmails.replace("{community}", community);
             URL obj = null;
             String responseStr = null;
             log.debug("Registry url is " + url);
             try {
                 obj = new URL(url);
                 HttpURLConnection con = (HttpURLConnection) obj.openConnection();
                 con.setRequestProperty("Cookie",sessionCookieName + "="+sessionId + "; domain="+ sessionCookieDomain+"; path=/;");
                 log.debug("Get manager emails from registry response code is: " + con.getResponseCode());
                 if (con.getResponseCode() != 200) {
                     return null;
+                }
                 BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
                 StringBuffer response = new StringBuffer();
                 String inputLine;
                 while ((inputLine = in.readLine()) != null) {
                     response.append(inputLine).append("\n");
+                }
                 in.close();
                 responseStr = response.toString();
             } catch (Exception e) {
                 log.error("An error occured while trying to fetch manager emails from registry ", e);
                 return null;
+            }
             return json2ManagerUtils(responseStr);
+        }
         public  List<ManagerUtils> getManagersByEmailNoSession(String community) {
             String url = "http://mpagasas.di.uoa.gr:8080/dnet-role-management/admin/community/"+community+"?name=false";
             URL obj = null;
             String responseStr = null;
             log.debug("Registry url is " + url);
-...
             List<ManagerUtils> managerUtilsList = null;
             try {
                 managersResponse = gson.fromJson(br, ManagersResponse.class);
                 managerUtilsList = managersResponse.getResponse();
             }catch(Exception e){
                 ManagerUtils[] testCase = gson.fromJson(br, ManagerUtils[].class);
                 managerUtilsList = Arrays.asList(testCase);
             }catch(Throwable e){
                 log.debug("Error in parsing json response. Given json is : "+json, e);
                 e.printStackTrace();
                 return null;
+            }
             log.debug("Original response.........: "+managersResponse.toString());
             log.debug("Original response.........: "+managerUtilsList.size());
             return managerUtilsList;
+        }
         public Boolean isCommunityManager(String communityId, String userMail, String sessionId) {
             List<ManagerUtils> managerUtils = this.getManagersByEmail(communityId, sessionId);
         public Boolean isCommunityManager(String communityId, String userMail) {
             List<ManagerUtils> managerUtils = this.getManagersByEmail(communityId);
             if(managerUtils != null) {
                 for(ManagerUtils manager : managerUtils) {
                     if(manager.getEmail() != null && manager.getEmail().equals(userMail)) {

                     .getRequiredWebApplicationContext(servletContextEvent.getServletContext())
                     .getAutowireCapableBeanFactory()
                     .autowireBean(this);
             logger.debug("Initializing EmailScheduler with beautySleep " + beautySleep + " and begin time " + targetHour + ":" + targetMinute + ":" + targetSecond + " and email sender " + emailSender);
             if(sendEmailNotifications) {
                 logger.debug("Initializing EmailScheduler with beautySleep " + beautySleep + " and begin time " + targetHour + ":" + targetMinute + ":" + targetSecond + " and email sender " + emailSender);
                 delay = getInitialDelaySeconds(Integer.parseInt(targetHour), Integer.parseInt(targetMinute), Integer.parseInt(targetSecond));

         private static String port;
         private static String from;
         private static String auth;
         private static String sslProtocols;
         private static String contactMail;
         private static String specialRecipients;
         private static String enabledCommunities;
-...
             } catch (SQLStoreException|Exception e) {
                 logger.error("Could not fetch claims by date from "+dateFrom+" to "+dateTo, e);
+            }
             logger.debug(claims.size() + "new claims found");
             for (Claim claim: claims) {
                 if (claim.getSourceType().equals("context")) {
                     context = (Context)claim.getSource();
-...
+                }
                 String openaireId = context.getOpenaireId().split("::")[0];
                 if (!managersOfCommunity.containsKey(openaireId) && enabledCommunitiesList != null && enabledCommunitiesList.contains(openaireId)) {
                 if (!managersOfCommunity.containsKey(openaireId) && (enabledCommunitiesList == null || enabledCommunitiesList.contains(openaireId))) {
                     /*
                     // specialRecipients are used currently for testing purposes
-...
                     List<String> managers = null;
                     try {
                         //CommunityUtils communityInfo = this.communityUtils.getCommunityInfo(openaireId);
                         List<ManagerUtils> managerUtils = this.managerUtils.getManagersByEmailNoSession(openaireId);
                         List<ManagerUtils> managerUtils = this.managerUtils.getManagersByEmail(openaireId);
                         //managers = communityInfo.getManagers();
                         if(managerUtils != null) {
                             Iterator<ManagerUtils> itr = managerUtils.iterator();
                             while (itr.hasNext()) {
                                 String manager = (String) itr.next().getEmail();
                                 Notification notification = fetchNotificationHandler.fetchNotification(openaireId, manager);
                                 if (notification != null) {
                                     itr.remove();
                                 } else {
                             for (ManagerUtils manager:managerUtils) {
                                 String managerMail = manager.getEmail();
                                 Notification notification = fetchNotificationHandler.fetchNotification(openaireId, managerMail);
                                 if (notification == null)  {
                                     if(managers == null) {
                                         managers = new ArrayList<>();
+                                    }
                                     managers.add(manager);
                                     logger.debug("Sending email to community manager: "+ manager);
                                     managers.add(managerMail);
                                     logger.debug("Sending email to community manager: "+ managerMail);
+                                }
+                            }
+                        }
-...
                             logger.debug("Community Managers: null");
+                        }
                     } catch (Exception e) {
                         logger.error(e);
                         e.printStackTrace();
                     } catch (SQLStoreException e) {
                         e.printStackTrace();
                         logger.error(e);
+                    }
                     logger.debug("Managers of community " + openaireId + ": "+managers);
-...
                             !managersOfCommunity.get(openaireId).isEmpty()) {
                         send(openaireId, context.getTitle().split(">")[0], "community", managersOfCommunity.get(openaireId));
+                    }
                 } else if(enabledCommunitiesList == null || !enabledCommunitiesList.contains(openaireId)) {
                 } else if(enabledCommunitiesList != null && !enabledCommunitiesList.contains(openaireId)) {
                     logger.debug("Community "+openaireId+" is not enabled");
+                }
+            }
-...
                 if(trueNotifications != null) {
                     for(Notification notification : trueNotifications) {
                         if (enabledCommunitiesList != null && enabledCommunitiesList.contains(notification.getOpenaireId())) {
                         if (enabledCommunitiesList == null || enabledCommunitiesList.contains(notification.getOpenaireId())) {
                             if(!allManagers.containsKey(notification.getOpenaireId())) {
                                 allManagers.put(notification.getOpenaireId(), new ArrayList());
     //                        CommunityUtils communityInfo = this.communityUtils.getCommunityInfo(notification.getOpenaireId());
                                 List<ManagerUtils> managerUtils = this.managerUtils.getManagersByEmailNoSession(notification.getOpenaireId());
                                 List<ManagerUtils> managerUtils = this.managerUtils.getManagersByEmail(notification.getOpenaireId());
     //                        List<String> managers = null;
                                 if (managerUtils != null) {
-...
             properties.put("mail.smtp.port", port);
             properties.put("mail.smtp.auth", auth); //enable authentication
             properties.put("mail.smtp.starttls.enable", "true");
             if(sslProtocols != null) {
                 properties.put("mail.smtp.ssl.protocols", sslProtocols);
+            }
             Session session = Session.getInstance(properties,
                 new javax.mail.Authenticator() {
                     protected PasswordAuthentication getPasswordAuthentication() {
-...
         public void setManagerUtils(ManagerUtils managerUtils) {
             this.managerUtils = managerUtils;
+        }
         public static String getSslProtocols() {
             return sslProtocols;
+        }
         public static void setSslProtocols(String sslProtocols) {
             EmailSender.sslProtocols = sslProtocols;
+        }
+    }

     services.claims.db.password = snowflakes
     services.claims.communityAPI = https://dev-openaire.d4science.org/openaire/community/
     services.claims.registryAPIForManagerEmails = http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/community/{community}/managers/email
     services.claims.closedRegistryAPIForManagerEmails = http://mpagasas.di.uoa.gr:8080/dnet-role-management/admin/community/
     services.claims.sessionCookieName = openAIRESession
     services.claims.sessionCookieDomain = .openaire.eu
     services.claims.registryAPIForManagerEmails = http://mpagasas.di.uoa.gr:8080/dnet-role-management/admin/community/{community}?name=false
     services.claims.searchAPIUrl = http://beta.services.openaire.eu:8480/search/
     #email properties
     ## EMAIL SETTINGS

             <property name="port" value="${services.claims.mail.port}"/>
             <property name="auth" value="${services.claims.mail.auth}"/>
             <property name="from" value="${services.claims.mail.from}"/>
             <property name="sslProtocols" value="${services.claims.mail.sslProtocols}"/>
             <property name="contactMail" value="${services.claims.mail.contactMail}"/>
             <property name="specialRecipients" value="${services.claims.mail.specialRecipients}"/>
             <property name="defaultFrequencyInHours" ref="defaultFrequencyInHours"/>
-...
         </bean>
         <bean id="managerUtils" class="eu.dnetlib.data.claims.utils.ManagerUtils">
             <property name="registryAPIForManagerEmails" value="${services.claims.registryAPIForManagerEmails}"/>
             <property name="closedRegistryAPIForManagerEmails" value="${services.claims.closedRegistryAPIForManagerEmails}"/>
             <property name="sessionCookieName" value="${services.claims.sessionCookieName}"/>
             <property name="sessionCookieDomain" value="${services.claims.sessionCookieDomain}"/>
         </bean>
         <bean id="sqlStore" class="eu.dnetlib.data.claims.sql.SqlStore" init-method="init" destroy-method="destroy">

Project

General

Profile

D-Net

Revision 62369

Added by Argiro Kokogiannaki over 1 year ago