diff --git a/src/main/java/se/su/dsv/scipro/data/controllers/NotificationController.java b/src/main/java/se/su/dsv/scipro/data/controllers/NotificationController.java index 7619e42349..fb9d8ca595 100644 --- a/src/main/java/se/su/dsv/scipro/data/controllers/NotificationController.java +++ b/src/main/java/se/su/dsv/scipro/data/controllers/NotificationController.java @@ -12,9 +12,6 @@ import se.su.dsv.scipro.data.enums.NotificationPriority; */ public interface NotificationController { - public void processNotification(User usertoNotify, NotificationMessage notificationMessage, - String absoluteUrl, NotificationPriority notificationPriority); - public void createNotificationForPrivateMessage(final User user, final String message, final String url); diff --git a/src/main/java/se/su/dsv/scipro/data/controllers/impl/NotificationControllerImpl.java b/src/main/java/se/su/dsv/scipro/data/controllers/impl/NotificationControllerImpl.java index 9047e1d33e..4373fb64fb 100644 --- a/src/main/java/se/su/dsv/scipro/data/controllers/impl/NotificationControllerImpl.java +++ b/src/main/java/se/su/dsv/scipro/data/controllers/impl/NotificationControllerImpl.java @@ -48,8 +48,7 @@ public class NotificationControllerImpl implements NotificationController { @Autowired protected MailEventDao mailEventDao; - @Override - public void processNotification(User usertoNotify, NotificationMessage notificationMessage, + private void processNotification(User usertoNotify, NotificationMessage notificationMessage, String absoluteUrl, NotificationPriority notificationPriorityForEvent) { GeneralSystemSettings generalSystemSettings = generalSystemSettingsDao .getGeneralSystemSettingsInstance(); diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/PrivateMessage.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/PrivateMessage.java index 436de04478..e9113f0475 100644 --- a/src/main/java/se/su/dsv/scipro/data/dataobjects/PrivateMessage.java +++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/PrivateMessage.java @@ -35,7 +35,6 @@ public class PrivateMessage extends LazyDeletableDomainObject{ @Id @GeneratedValue private Long id; - //TODO Fix column size and validate this in any page that uses it @Lob private String subject; diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/WebNotification.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/WebNotification.java index fcc8ca7cef..9ea6d152c6 100644 --- a/src/main/java/se/su/dsv/scipro/data/dataobjects/WebNotification.java +++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/WebNotification.java @@ -3,6 +3,7 @@ */ package se.su.dsv.scipro.data.dataobjects; +import javax.persistence.Basic; import javax.persistence.Cacheable; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -32,14 +33,17 @@ public class WebNotification extends DomainObject{ private Long id; @Lob + @Basic(optional=false) private String infoText; @Lob + @Basic(optional=false) private String url; @ManyToOne(optional=false) private User user; + @Basic(optional=false) private boolean readByUser = false; @Override