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

« Previous | Next »

Revision 39077

Added by Antonis Lempesis about 9 years ago

- Notifying moderator when a request has been paid.
- Sending all comments in notification emails.

     				try {
     					emailUtils.sendRequesterPaidEmail(requestInfo);
     					emailUtils.sendPublisherPaidEmail(requestInfo);
     					for (Person person : personManager.getModerators())
     						emailUtils.sendModeratorPaidEmail(person, requestInfo);
     				} catch (MessagingException e) {
     					e.printStackTrace();
+    				}

     	void sendPublisherPaidEmail(RequestInfo requestInfo) throws MessagingException;
     	void sendModeratorPaidEmail(Person moderator, RequestInfo requestInfo) throws MessagingException;
     	void sendRequesterOnHoldEmail(RequestInfo requestInfo) throws MessagingException;
     	void sendPublisherOnHoldEmail(RequestInfo requestInfo) throws MessagingException;

     package eu.dnetlib.goldoa.service.utils;
     import eu.dnetlib.goldoa.domain.BudgetInfo;
     import eu.dnetlib.goldoa.domain.Comment;
     import eu.dnetlib.goldoa.domain.Person;
     import eu.dnetlib.goldoa.domain.Publisher;
     import eu.dnetlib.goldoa.domain.RequestInfo;
-...
     				"If no invoice has been uploaded, or the publisher bank information is missing, our accounting office may put the request on hold until all information is in the system.\n" +
     				"\n";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		text += formatComments(requestInfo);
     		text += "You may click on the link below at any time to follow the status of your request:\n" +
     				link + "\n" +
     				" \n" +
-...
     				"If no invoice has been uploaded, or the publisher bank information is missing, our accounting office may put the request on hold until all information is in the system.\n" +
     				"\n";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		text += formatComments(requestInfo);
     		text += "You may click on the link below at any time to follow the status of your request:\n" +
     				link + "\n" +
     				" \n" +
-...
     			text += "Publisher: " + requestInfo.getPublication().getPublisher().getName() + "\n";
     		text += "Requested funding: " + requestInfo.getFundingRequested() + " " + requestInfo.getCurrency().getName() + "\n" +
     				"\n" +
     				"Reason: ";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		else
     			text += "-\n\n";
     				"\n";
     		text += formatComments(requestInfo);
     		text += "You may click on the link below at any time to find more information:\n" +
     				link + "\n" +
     				" \n" +
-...
     				"Phone: +30 210 6875 300 Fax +30 210 6875 485\n" +
     				"VAT NUMBER: EL999723442\n" +
     				"\n";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		text += formatComments(requestInfo);
     		text += "Click on the link below at any time to follow the status of your request:\n" +
     				requestLink + "\n" +
     				"\n" +
-...
     					"VAT NUMBER: EL999723442\n" +
     					"\n";
     			if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     				text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     			text += formatComments(requestInfo);
     			text += "Click on the link below at any time to follow the status of this request:\n" +
     					requestLink + "\n" +
     					"\n" +
-...
     				"1. update the DOI in our system, and \n" +
     				"2. deposit the final manuscript in an OpenAIRE compliant repository (see list here)\n" +
     				"\n";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		text += formatComments(requestInfo);
     		text += "Feel free to contact us at " + contactLink + " if you need further information.\n\n" +
     				"Best,\n" +
     				"The OpenAIRE team";
-...
     					"1. update the DOI in our system, and \n" +
     					"2. deposit the final manuscript in an OpenAIRE compliant repository (see list here)\n" +
     					"\n";
     			if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     				text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     			text += formatComments(requestInfo);
     			text += "Feel free to contact us at " + contactLink + " if you need further information.\n\n" +
     					"Best,\n" +
     					"The OpenAIRE team";
-...
+    	}
     	@Override
     	public void sendModeratorPaidEmail(Person moderator, RequestInfo requestInfo) throws MessagingException {
     		String subject = "[OpenAIRE-FP7-Post-Grant-OA-Pilot] Funding request " + requestInfo.getId() + " for invoice " + requestInfo.getInvoice().getNumber() + " has been paid";
     		String text;
     		text = "Dear moderator,\n";
     		text += "\n" +
     				"The following request has been completed and APCs have been paid:\n" +
     				"\n" +
     				"Invoice #: " + requestInfo.getInvoice().getNumber() + "\n" +
     				"Project: " + requestInfo.getProject().getAcronym() + " - " + requestInfo.getProject().getGrant() + "\n" +
     				"Publication: " + requestInfo.getPublication().getTitle() + "\n"; // TODO add authors
     		if (requestInfo.getPublication().getJournal() != null) {
     			text += "Journal: " + requestInfo.getPublication().getJournal().getTitle();
     			if (requestInfo.getPublication().getJournal().getPublisher() != null)
     				text += " , " + requestInfo.getPublication().getJournal().getPublisher().getName();
     			text += "\n";
     		} else if (requestInfo.getPublication().getPublisher() != null)
     			text += "Publisher: " + requestInfo.getPublication().getPublisher().getName() + "\n";
     		text += "Requested funding: " + requestInfo.getFundingRequested() + " " + requestInfo.getCurrency().getName() + "\n" +
     				"\n";
     		text += "Best,\n" +
     				"The OpenAIRE team";
     		mailLibrary.sendEmail(new String[]{moderator.getEmail()}, subject, text);
+    	}
     	@Override
     	public void sendRequesterOnHoldEmail(RequestInfo requestInfo) throws MessagingException {
     		String subject = "[OpenAIRE-FP7-Post-Grant-OA-Pilot] Your funding request " + requestInfo.getId() + " has been put on hold";
     		String contactLink = baseAddress + "/#home";
-...
     		text += "Requested funding: " + requestInfo.getFundingRequested() + " " + requestInfo.getCurrency().getName() + "\n" +
     				"\n";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		text += formatComments(requestInfo);
     		text += "Click on the link below at any time to follow the status of your request:\n" +
     				requestLink + "\n" +
     				"\n" +
-...
     		mailLibrary.sendEmail(new String[]{requestInfo.getUser().getEmail()}, subject, text);
+    	}
     	private String formatComments(RequestInfo requestInfo) {
     		String text = "";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0) {
     			text = "IMPORTANT:\n";
     			for (int i = 0; i < requestInfo.getComments().size(); i++) {
     				Comment comment = requestInfo.getComments().get(i);
     				if (i > 0)
     					text += "\n";
     				text += comment.getComment() + " -" + comment.getPerson().getName() + " " + comment.getPerson().getLastname() + " @ " + new SimpleDateFormat("yyyy-MM-dd").format(comment.getDate());
+    			}
     			text += "\n\n";
+    		}
     		return text;
+    	}
     	@Override
     	public void sendPublisherOnHoldEmail(RequestInfo requestInfo) throws MessagingException {
     		Publisher publisher = requestInfo.getPublication().getPublisher() != null ? requestInfo.getPublication().getPublisher() : requestInfo.getPublication().getJournal().getPublisher();
-...
     			text += "Requested funding: " + requestInfo.getFundingRequested() + " " + requestInfo.getCurrency().getName() + "\n" +
     					"\n";
     			if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     				text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     			text += formatComments(requestInfo);
     			text += "Click on the link below at any time to follow the status of your request:\n" +
     					requestLink + "\n" +
     					"\n" +
-...
     		text += "Requested funding: " + requestInfo.getFundingRequested() + " " + requestInfo.getCurrency().getName() + "\n" +
     				"\n";
     		if (requestInfo.getComments() != null && requestInfo.getComments().size() > 0)
     			text += requestInfo.getComments().get(requestInfo.getComments().size() - 1).getComment() + "\n\n";
     		text += formatComments(requestInfo);
     		text += "Click on the link below at any time to follow the status of your request:\n" +
     				requestLink + "\n" +
     				"\n" +

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 39077

Added by Antonis Lempesis about 9 years ago