Changed message service to send only the currently published messages

src/main/java/no/bioforsk/vips/logic/controller/session/MessageBean.java

@@ -40,6 +40,7 @@ import no.bioforsk.vips.logic.entity.MessageLocale;
 import no.bioforsk.vips.logic.entity.MessageLocalePK;
 import no.bioforsk.vips.logic.entity.MessageTag;
 import no.bioforsk.vips.logic.entity.VipsLogicUser;
+import no.bioforsk.vips.logic.util.SystemTime;
 import no.bioforsk.web.forms.FormField;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.FilenameUtils;
@@ -256,6 +257,19 @@ public class MessageBean {
         q.setParameter("tagIds", tagIds);
         return q.getResultList();
     }
+    
+    public List<Message> getCurrentFilteredMessagesForOrganization(List<Integer> tagIds, Integer organizationId) {
+        Query q = em.createNativeQuery("SELECT * FROM message WHERE message_id IN ("
+                + "SELECT message_id FROM message_message_tag "
+                + "WHERE message_tag_id IN (:tagIds) "
+                + "AND :systemTime BETWEEN date_pub AND date_valid_to "
+                + "AND organization_id = :organizationId "
+                + ")", Message.class);
+        q.setParameter("tagIds", tagIds);
+        q.setParameter("systemTime", SystemTime.getSystemTime());
+        q.setParameter("organizationId", organizationId);
+        return q.getResultList();
+    }
 
     public List<MessageTag> getMessageTagList() {
         return em.createNamedQuery("MessageTag.findAll", MessageTag.class).getResultList();

src/main/java/no/bioforsk/vips/logic/service/LogicService.java

@@ -241,13 +241,7 @@ public class LogicService {
     @Produces("application/json;charset=UTF-8")
     public Response getMessageListWithTags(@QueryParam("tagId") List<Integer> tagIds, @PathParam("organizationId") Integer organizationId)
     {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(SystemTime.getSystemTime());
-        cal.add(Calendar.YEAR, -1);
-        Date datePubStart = cal.getTime();
-        cal.add(Calendar.YEAR, 2);
-        Date datePubEnd = cal.getTime();
-        List<Message> messageListWithTags = SessionControllerGetter.getMessageBean().getFilteredMessages(organizationId, tagIds, datePubStart, datePubEnd);
+        List<Message> messageListWithTags = SessionControllerGetter.getMessageBean().getCurrentFilteredMessagesForOrganization(tagIds, organizationId);
         return Response.ok().entity(messageListWithTags).build();
     }