This is an automated email from the git hooks/post-receive script. New commit to branch feature/7492 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit a1e24dc784f1d5fda33b26d0e26aeb5f935e5e9b Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 28 17:53:36 2015 +0200 récupération des tampons pour l'utilisateur (refs #7492) --- .../persistence/entities/StampTopiaDao.java | 27 ++++++++++++++++++++++ .../services/service/MailFolderService.java | 2 -- .../services/service/MailFolderServiceImpl.java | 21 ----------------- .../faxtomail/services/service/UserService.java | 3 +++ .../services/service/UserServiceImpl.java | 11 +++++++++ .../attachment/actions/EditAttachmentAction.java | 11 +++++---- 6 files changed, 47 insertions(+), 28 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java new file mode 100644 index 0000000..01d087f --- /dev/null +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java @@ -0,0 +1,27 @@ +package com.franciaflex.faxtomail.persistence.entities; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +public class StampTopiaDao extends AbstractStampTopiaDao<Stamp> { + + public Collection<Stamp> findAllForUser(FaxToMailUser user) { + + Map<String, Object> args = new HashMap<>(); + + StringBuilder query = new StringBuilder("FROM " + Stamp.class.getName() + " S "); + + query.append("WHERE :user IN ELEMENTS (S." + Stamp.PROPERTY_USERS + ") "); + args.put("user", user); + + for (FaxToMailUserGroup group : user.getUserGroups()) { + int i = 0; + query.append("OR :group" + i + " IN ELEMENTS (S." + Stamp.PROPERTY_GROUPS + ") "); + args.put("group" + i++, group); + } + + return findAll(query.toString(), args); + } + +} //StampTopiaDao diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java index fa4ac0d..a16656e 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java @@ -28,7 +28,6 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailService; @@ -68,5 +67,4 @@ public interface MailFolderService extends FaxToMailService { MailFilter findMailFilter(Email email, Set<String> modifiedProperties, List<Address> recipients); - Collection<Stamp> getPdfEditorStamps(String mailFolderId); } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java index c60665d..6f1f27e 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java @@ -31,7 +31,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import org.apache.commons.collections4.CollectionUtils; @@ -354,24 +353,4 @@ public class MailFolderServiceImpl extends FaxToMailServiceSupport implements Ma return filter; } - @Override - public Collection<Stamp> getPdfEditorStamps(String mailFolderId) { -// MailFolder folder = getMailFolder(mailFolderId); -// while (folder.getParent() != null && !folder.isUseCurrentLevelPdfEditorStamps()) { -// folder = folder.getParent(); -// } -// -// Collection<Stamp> pdfEditorStamps; -// if (folder != null) { -// pdfEditorStamps = folder.getPdfEditorStamps(); -// Hibernate.initialize(pdfEditorStamps); -// -// } else { -// pdfEditorStamps = null; -// } -// -// return pdfEditorStamps; - // FIXME - return null; - } } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java index 78f2d80..309a861 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java @@ -29,6 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.services.FaxToMailService; +import java.util.Collection; import java.util.List; /** @@ -58,4 +59,6 @@ public interface UserService extends FaxToMailService { Stamp saveSigning(FaxToMailUser user, Stamp signing, boolean defaultSigning); void deleteSigning(FaxToMailUser user, Stamp signing); + + Collection<Stamp> getPdfEditorStamps(FaxToMailUser user); } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java index 9cf99f1..16aaab5 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java @@ -34,6 +34,7 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Preconditions; import org.hibernate.Hibernate; +import java.util.Collection; import java.util.List; /** @@ -146,4 +147,14 @@ public class UserServiceImpl extends FaxToMailServiceSupport implements UserServ } } + + @Override + public Collection<Stamp> getPdfEditorStamps(FaxToMailUser user) { + Preconditions.checkNotNull(user); + + StampTopiaDao stampDao = getPersistenceContext().getStampDao(); + Collection<Stamp> result = stampDao.findAllForUser(user); + + return result; + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java index baf2ea1..d4e68db 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java @@ -25,9 +25,9 @@ package com.franciaflex.faxtomail.ui.swing.content.attachment.actions; */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.Stamp; -import com.franciaflex.faxtomail.services.service.MailFolderService; +import com.franciaflex.faxtomail.services.service.UserService; import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; @@ -65,9 +65,10 @@ public class EditAttachmentAction extends AbstractFaxToMailAction<AttachmentEdit public void doAction() throws Exception { getModel().fireAttachmentOpened(attachment, false); FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); - MailFolder mailFolder = attachment.getEmail().getMailFolder(); - MailFolderService mailFolderService = getContext().newServiceContext().getMailFolderService(); - stamps = mailFolderService.getPdfEditorStamps(mailFolder.getTopiaId()); + + FaxToMailUser currentUser = getContext().getCurrentUser(); + UserService userService = getContext().newServiceContext().getUserService(); + stamps = userService.getPdfEditorStamps(currentUser); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.