Project

General

Profile

« Previous | Next » 

Revision 48779

Added by Panagiotis Kanakakis over 6 years ago

- Format comments method.

View differences:

modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/ManageRequestsTest.java
1 1 
package unitest;
2 2 

  		




  3
  
  
    
import com.opencsv.CSVReader;


  		




  4
  3
  
    
import eu.dnetlib.goldoa.domain.*;


  		




  5
  4
  
    
import eu.dnetlib.goldoa.service.*;


  		




  6
  5
  
    
import org.apache.commons.codec.digest.DigestUtils;


  		




  ......




  12
  11
  
    
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;


  		




  13
  12
  
    

  		




  14
  13
  
    
import javax.transaction.Transactional;


  		




  15
  
  
    
import java.io.FileNotFoundException;


  		




  16
  
  
    
import java.io.FileReader;


  		




  17
  
  
    
import java.io.IOException;


  		




  18
  
  
    
import java.text.ParseException;


  		




  19
  14
  
    
import java.util.ArrayList;


  		




  20
  15
  
    
import java.util.Date;


  		




  21
  16
  
    
import java.util.List;


  		




  ......




  271
  266
  
    
    @Transactional


  		




  272
  267
  
    
    //@Rollback(true)


  		




  273
  268
  
    
    public void paidRequestComment() throws PersonManagerException {


  		




  274
  
  
    
        Request r = rm.getById("20170530-1529");


  		




  275
  
  
    
        rm.rejectRequest(r.getId(),"pkanakakis@di.uoa.gr","comment",null);


  		




  
  269
  
    
        Request r = rm.getById("20170314-1397");


  		




  
  270
  
    
        rm.approveRequest(r.getId(),"pkanakakis@di.uoa.gr","Test Comment",null);


  		




  276
  271
  
    
    }


  		




  277
  272
  
    

  		




  278
  273
  
    

  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/PublicationTest.java
    
  





  1
  1
  
    
package unitest;


  		




  2
  2
  
    

  		




  3
  
  
    
import eu.dnetlib.goldoa.domain.Publication;


  		




  4
  
  
    
import eu.dnetlib.goldoa.domain.PublicationType;


  		




  5
  3
  
    
import eu.dnetlib.goldoa.domain.Publisher;


  		




  6
  4
  
    
import eu.dnetlib.goldoa.service.PublicationManager;


  		




  7
  5
  
    
import eu.dnetlib.goldoa.service.PublisherManager;


  		




  ......




  14
  12
  
    

  		




  15
  13
  
    
import javax.transaction.Transactional;


  		




  16
  14
  
    

  		




  17
  
  
    
import static org.junit.Assert.assertEquals;


  		




  18
  
  
    

  		




  19
  15
  
    
/**


  		




  20
  16
  
    
 * Created by panagiotis on 23/1/2017.


  		




  21
  17
  
    
 */


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/SearchManager.java
    
  





  2
  2
  
    

  		




  3
  3
  
    
import com.google.gwt.user.client.rpc.IsSerializable;


  		




  4
  4
  
    

  		




  5
  
  
    
import java.io.Serializable;


  		




  6
  5
  
    
import java.util.List;


  		




  7
  6
  
    

  		




  8
  7
  
    
/**


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/RequestManagerImpl.java
    
  





  1
  1
  
    
package eu.dnetlib.goldoa.service;


  		




  2
  2
  
    

  		




  3
  
  
    
import com.opencsv.CSVReader;


  		




  4
  3
  
    
import eu.dnetlib.goldoa.domain.*;


  		




  5
  4
  
    
import eu.dnetlib.goldoa.service.dao.RequestDAO;


  		




  6
  5
  
    
import eu.dnetlib.goldoa.service.utils.EmailUtils;


  		




  ......




  14
  13
  
    
import org.springframework.transaction.annotation.Transactional;


  		




  15
  14
  
    

  		




  16
  15
  
    
import javax.mail.MessagingException;


  		




  17
  
  
    
import java.io.FileReader;


  		




  18
  16
  
    
import java.io.IOException;


  		




  19
  17
  
    
import java.io.InputStream;


  		




  20
  18
  
    
import java.math.BigInteger;


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java
    
  





  9
  9
  
    
import org.apache.commons.logging.LogFactory;


  		




  10
  10
  
    
import org.hibernate.Criteria;


  		




  11
  11
  
    
import org.hibernate.criterion.Order;


  		




  12
  
  
    
import org.hibernate.criterion.ProjectionList;


  		




  13
  
  
    
import org.hibernate.criterion.Projections;


  		




  14
  12
  
    
import org.hibernate.criterion.Restrictions;


  		




  15
  13
  
    
import org.hibernate.transform.Transformers;


  		




  16
  14
  
    
import org.springframework.stereotype.Repository;


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/RequestDAO.java
    
  





  23
  23
  
    
import java.io.StringWriter;


  		




  24
  24
  
    
import java.math.BigInteger;


  		




  25
  25
  
    
import java.sql.Timestamp;


  		




  26
  
  
    
import java.text.DateFormat;


  		




  27
  26
  
    
import java.text.ParseException;


  		




  28
  27
  
    
import java.text.SimpleDateFormat;


  		




  29
  28
  
    
import java.util.*;


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/utils/MailLibrary.java
    
  





  3
  3
  
    
import org.apache.commons.logging.Log;


  		




  4
  4
  
    
import org.apache.commons.logging.LogFactory;


  		




  5
  5
  
    
import org.springframework.beans.factory.annotation.Value;


  		




  6
  
  
    
import org.springframework.context.annotation.Scope;


  		




  7
  6
  
    
import org.springframework.stereotype.Service;


  		




  8
  7
  
    

  		




  9
  8
  
    
import javax.annotation.PostConstruct;


  		




  ......




  11
  10
  
    
import javax.mail.internet.AddressException;


  		




  12
  11
  
    
import javax.mail.internet.InternetAddress;


  		




  13
  12
  
    
import javax.mail.internet.MimeMessage;


  		




  14
  
  
    
import java.io.IOException;


  		




  15
  13
  
    
import java.util.Properties;


  		




  16
  14
  
    

  		




  17
  15
  
    
/**


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/utils/EmailUtilsImpl.java
    
  





  265
  265
  
    
				" \n" +


  		




  266
  266
  
    
				"Best,\n" +


  		




  267
  267
  
    
				"The OpenAIRE team";


  		




  268
  
  
    

  		




  
  268
  
    
		System.out.println(text);


  		




  269
  269
  
    
		mailLibrary.sendEmail(request.getUser().getEmail(), subject, text);


  		




  270
  270
  
    
	}


  		




  271
  271
  
    

  		




  ......




  913
  913
  
    
		if (request.getRequestComments() != null && request.getRequestComments().size() > 0) {


  		




  914
  914
  
    
			text = "IMPORTANT:\n";


  		




  915
  915
  
    

  		




  916
  
  
    
	/*		for (int i = 0; i < request.getComments().size(); i++) {


  		




  917
  
  
    
				Comment comment = request.getComments().get(i);


  		




  
  916
  
    
			for (int i = 0; i < request.getRequestComments().size(); i++) {


  		




  
  917
  
    
				Comment comment = request.getRequestComments().get(i);


  		




  918
  918
  
    

  		




  919
  919
  
    
				if (i > 0)


  		




  920
  920
  
    
					text += "\n";


  		




  921
  921
  
    

  		




  922
  
  
    
				text += comment.getComment() + " -" + comment.getUser().getName() + " " + comment.getUser().getLastname() + " @ " + new SimpleDateFormat("yyyy-MM-dd").format(comment.getDate());


  		




  
  922
  
    
				text += comment.getComment() + " -" + comment.getUser().getFirstname() + " " + comment.getUser().getLastname() + " @ " + new SimpleDateFormat("yyyy-MM-dd").format(comment.getDate());


  		




  923
  923
  
    
			}


  		




  924
  924
  
    

  		




  925
  
  
    
			RequestComment comment = request.getRequestComments().get(request.getRequestComments().size() - 1);


  		




  
  925
  
    
			//Comment comment = request.getRequestComments().get(request.getRequestComments().size() - 1);


  		




  926
  926
  
    

  		




  927
  
  
    
 			text += comment.getComment() + " -" + comment.getUser().getFirstname() + " " + comment.getUser().getLastname() + " @ " + new SimpleDateFormat("yyyy-MM-dd").format(comment.getComment().getDate());


  		




  928
  
  
    
*/


  		




  
  927
  
    
 			//text += comment.getComment() + " -" + comment.getUser().getFirstname() + " " + comment.getUser().getLastname() + " @ " + new SimpleDateFormat("yyyy-MM-dd").format(comment.getDate());


  		




  929
  928
  
    
			text += "\n\n";


  		




  930
  929
  
    
		}


  		




  931
  930
  
    

  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/eligibility/ChainEligibilityManager.java
    
  





  3
  3
  
    
import eu.dnetlib.goldoa.domain.Eligibility;


  		




  4
  4
  
    
import eu.dnetlib.goldoa.domain.Request;


  		




  5
  5
  
    
import eu.dnetlib.goldoa.service.EligibilityManager;


  		




  6
  
  
    
import eu.dnetlib.goldoa.service.PublicationManagerImpl;


  		




  7
  6
  
    
import org.apache.log4j.Logger;


  		




  8
  
  
    
import org.aspectj.weaver.ast.Or;


  		




  9
  7
  
    
import org.springframework.beans.factory.annotation.Autowired;


  		




  10
  8
  
    
import org.springframework.context.annotation.Primary;


  		




  11
  9
  
    
import org.springframework.stereotype.Component;


  		




  12
  10
  
    

  		




  13
  11
  
    
import java.util.ArrayList;


  		




  14
  
  
    
import java.util.Arrays;


  		




  15
  12
  
    
import java.util.List;


  		




  16
  13
  
    

  		




  17
  14
  
    
/*


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/eligibility/ProjectEligibiliyManager.java
    
  





  6
  6
  
    
import eu.dnetlib.goldoa.service.EligibilityManager;


  		




  7
  7
  
    
import eu.dnetlib.goldoa.service.ProjectManager;


  		




  8
  8
  
    
import eu.dnetlib.goldoa.service.RequestManager;


  		




  9
  
  
    
import eu.dnetlib.goldoa.service.utils.MailLibrary;


  		




  10
  9
  
    
import org.apache.commons.logging.Log;


  		




  11
  10
  
    
import org.apache.commons.logging.LogFactory;


  		




  12
  11
  
    
import org.springframework.beans.factory.annotation.Autowired;


  		




  13
  12
  
    
import org.springframework.beans.factory.annotation.Value;


  		




  14
  13
  
    
import org.springframework.stereotype.Component;


  		




  15
  14
  
    

  		




  16
  
  
    
import javax.annotation.PostConstruct;


  		




  17
  
  
    
import java.sql.Timestamp;


  		




  18
  15
  
    
import java.util.Date;


  		




  19
  16
  
    
import java.util.List;


  		




  20
  17
  
    

  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Eligibility.java
    
  





  1
  1
  
    
package eu.dnetlib.goldoa.domain;


  		




  2
  2
  
    

  		




  3
  3
  
    
import com.google.gwt.user.client.rpc.IsSerializable;


  		




  4
  
  
    
import org.springframework.stereotype.Component;


  		




  5
  4
  
    

  		




  6
  5
  
    
import java.util.Arrays;


  		




  7
  6
  
    
import java.util.HashSet;


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/HIbernateDomainConverter.java
    
  





  2
  2
  
    

  		




  3
  3
  
    
import com.fasterxml.jackson.databind.ObjectMapper;


  		




  4
  4
  
    
import com.fasterxml.jackson.databind.type.TypeFactory;


  		




  5
  
  
    
import eu.dnetlib.goldoa.service.dao.UserDAO;


  		




  6
  5
  
    
import org.apache.commons.logging.Log;


  		




  7
  6
  
    
import org.apache.commons.logging.LogFactory;


  		




  8
  7
  
    
import org.aspectj.lang.ProceedingJoinPoint;


  		




  9
  8
  
    
import org.aspectj.lang.annotation.Around;


  		




  10
  9
  
    
import org.aspectj.lang.annotation.Aspect;


  		




  11
  10
  
    
import org.aspectj.lang.reflect.MethodSignature;


  		




  12
  
  
    
import org.aspectj.org.eclipse.jdt.internal.core.SourceType;


  		




  13
  
  
    
import org.hibernate.stat.Statistics;


  		




  14
  
  
    
import org.springframework.beans.factory.annotation.Autowired;


  		




  15
  11
  
    
import org.springframework.stereotype.Component;


  		




  16
  12
  
    

  		




  17
  
  
    
import java.text.DecimalFormat;


  		




  18
  
  
    
import java.text.NumberFormat;


  		




  19
  13
  
    
import java.util.List;


  		




  20
  14
  
    

  		




  21
  15
  
    
/**


  		












  

    
      modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java
    
  





  1
  1
  
    
package eu.dnetlib.goldoa.domain;


  		




  2
  2
  
    

  		




  3
  3
  
    
import com.google.gwt.user.client.rpc.IsSerializable;


  		




  
  4
  
    

  		




  4
  5
  
    
import javax.persistence.*;


  		




  5
  6
  
    

  		




  6
  7
  
    
@Entity


  		












Also available in:  Unified diff