Temporary commit

src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java

@@ -278,6 +278,13 @@ public class MessageController extends HttpServlet {
                 {
                     // Store the message
                     Message message = SessionControllerGetter.getMessageBean().storeMessage(formValidation.getFormFields(), user);
+                    
+                    // New messages should be sent to subscribers
+                    if(formValidation.getFormField("messageId").getValueAsInteger() < 0)
+                    {
+                        SessionControllerGetter.getMessagingBean().sendUniversalMessage(message);
+                    }
+
                     // Delete the current illustration
                     String deleteIllustration = formValidation.getFormField("deleteIllustration").getWebValue();
                     if(deleteIllustration != null && deleteIllustration.equals("true"))

src/main/java/no/nibio/vips/logic/entity/VipsLogicUser.java

@@ -76,6 +76,8 @@ public class VipsLogicUser implements Serializable {
     private String approvalApplication;
     @Size(max = 2147483647)
     private String remarks;
+    @Size(max = 10)
+    private String preferredLocale;
     private Set<UserAuthentication> userAuthenticationSet;
     private Organization organizationId;
     private Integer userStatusId;
@@ -370,4 +372,19 @@ public class VipsLogicUser implements Serializable {
     public void setUserUuid(UUID userUuid) {
         this.userUuid = userUuid;
     }
+
+    /**
+     * @return the preferredLocale
+     */
+    @Column(name = "preferred_locale")
+    public String getPreferredLocale() {
+        return preferredLocale;
+    }
+
+    /**
+     * @param preferredLocale the preferredLocale to set
+     */
+    public void setPreferredLocale(String preferredLocale) {
+        this.preferredLocale = preferredLocale;
+    }
 }

src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java

@@ -68,4 +68,19 @@ public class MessagingBean {
             System.out.println(uMe.getMsgSubject());
         }
     }
+    
+    public void sendUniversalMessage(Message message)
+    {
+        // Create a universal message from the message
+        // TODO: When UniversalMessage has changed, pick
+        MessageLocale ml = message.getLocalMessageWithFallback("nb", "nb");
+        // Find the suscribers, create distribution list
+        
+        // Store it
+        
+        // Send it
+        
+        // Log it
+        
+    }
 }

src/test/java/no/nibio/vips/logic/messaging/UniversalMessagingTest.java

@@ -81,9 +81,9 @@ public class UniversalMessagingTest {
             
             
             String[][] recipients = {
-                {"1","Tor-Einar Skog","Mail","tor-einar.skog@nibio.no"},
-                {"1","Tor-Einar Skog","Sms","91303819"},
-                {"2","Lars Aksel Opsahl", "Mail","lars.opsahl@nibio.no"}
+                {"1","Tor-Einar Skog","Mail","tor-einar.skog@nibio.no"}//,
+                //{"1","Tor-Einar Skog","Sms","91303819"},
+                //{"2","Lars Aksel Opsahl", "Mail","lars.opsahl@nibio.no"}
             };
 
             List<MessageRecipient> rList = new ArrayList<>();
@@ -110,6 +110,7 @@ public class UniversalMessagingTest {
         
             System.out.println(new ObjectMapper().writeValueAsString(um));
             Response r = umClient.sendMessage(new ObjectMapper().writeValueAsString(um));
+            assertEquals(200,r.getStatus());
             
             result = r.readEntity(String.class);
             System.out.println(result);