This is an automated email from the git hooks/post-receive script. New commit to branch feature/april in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a4dde9b9fc93fca0c05c52d79d5905c8f227c0d9 Author: jcouteau <couteau@codelutin.com> Date: Tue Oct 2 10:52:00 2018 +0200 refs #221 - Vote associatif : EmailService should be ok --- .../pollen/services/service/mail/EmailService.java | 52 +++++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index a92d54a5..5272e7d2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -45,6 +45,7 @@ import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.PollenResource; import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.persistence.entity.Question; import org.chorem.pollen.persistence.entity.Report; import org.chorem.pollen.persistence.entity.UserCredential; import org.chorem.pollen.persistence.entity.Vote; @@ -124,23 +125,26 @@ public class EmailService extends PollenServiceSupport { return timeZone; } - public ChoiceAddedEmail newChoiceAddedEmail(Poll poll, Choice choice) { + public ChoiceAddedEmail newChoiceAddedEmail(Question question, Choice choice) { + //FIXME JC181002 - Modifier l'email pour adapter aux questions ChoiceAddedEmail email = new ChoiceAddedEmail(getLocale(), getTimeZone()); - email.setPoll(poll); + email.setPoll(question.getPoll()); email.setChoice(choice); return email; } - public ChoiceEditedEmail newChoiceEditedEmail(Poll poll, Choice choice) { + public ChoiceEditedEmail newChoiceEditedEmail(Question question, Choice choice) { + //FIXME JC181002 - Modifier l'email pour adapter aux questions ChoiceEditedEmail email = new ChoiceEditedEmail(getLocale(), getTimeZone()); - email.setPoll(poll); + email.setPoll(question.getPoll()); email.setChoice(choice); return email; } - public ChoiceDeletedEmail newChoiceDeletedEmail(Poll poll, Choice choice) { + public ChoiceDeletedEmail newChoiceDeletedEmail(Question question, Choice choice) { + //FIXME JC181002 - Modifier l'email pour adapter aux questions ChoiceDeletedEmail email = new ChoiceDeletedEmail(getLocale(), getTimeZone()); - email.setPoll(poll); + email.setPoll(question.getPoll()); email.setChoice(choice); return email; } @@ -166,16 +170,40 @@ public class EmailService extends PollenServiceSupport { return email; } - public VoteAddedEmail newVoteAddedEmail(Poll poll, Vote vote) { - return new VoteAddedEmail(getLocale(), getTimeZone(), poll, vote); + public CommentAddedEmail newCommentAddedEmail(Question question, Comment comment) { + //FIXME JC181002 - Email spécifique pour les questions ? + CommentAddedEmail email = new CommentAddedEmail(getLocale(), getTimeZone()); + email.setPoll(question.getPoll()); + email.setComment(comment); + return email; + } + + public CommentEditedEmail newCommentEditedEmail(Question question, Comment comment) { + //FIXME JC181002 - Email spécifique pour les questions ? + CommentEditedEmail email = new CommentEditedEmail(getLocale(), getTimeZone()); + email.setPoll(question.getPoll()); + email.setComment(comment); + return email; + } + + public CommentDeletedEmail newCommentDeletedEmail(Question question, Comment comment) { + //FIXME JC181002 - Email spécifique pour les questions ? + CommentDeletedEmail email = new CommentDeletedEmail(getLocale(), getTimeZone()); + email.setPoll(question.getPoll()); + email.setComment(comment); + return email; + } + + public VoteAddedEmail newVoteAddedEmail(Question question, Vote vote) { + return new VoteAddedEmail(getLocale(), getTimeZone(), question.getPoll(), vote); } - public VoteEditedEmail newVoteEditedEmail(Poll poll, Vote vote) { - return new VoteEditedEmail(getLocale(), getTimeZone(), poll, vote); + public VoteEditedEmail newVoteEditedEmail(Question question, Vote vote) { + return new VoteEditedEmail(getLocale(), getTimeZone(), question.getPoll(), vote); } - public VoteDeletedEmail newVoteDeletedEmail(Poll poll, Vote vote) { - return new VoteDeletedEmail(getLocale(), getTimeZone(), poll, vote); + public VoteDeletedEmail newVoteDeletedEmail(Question question, Vote vote) { + return new VoteDeletedEmail(getLocale(), getTimeZone(), question.getPoll(), vote); } public PollCreatedEmail newPollCreatedEmail(Poll poll) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.