60:Fix for unknown keywords in message

motech · Jun 30, 2011 · e144643 · e144643
1 parent 5470322
commit e144643
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 7 deletions.
diff --git a/motech-server-core/src/main/java/org/motechproject/server/model/IncomingMessage.java b/motech-server-core/src/main/java/org/motechproject/server/model/IncomingMessage.java
@@ -5,7 +5,6 @@
 import org.motechproject.ws.RequestParameterBuilder;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 
 public class IncomingMessage {
 
@@ -57,7 +56,7 @@ public void setTime(String time) {
         this.time = time;
     }
 
-    public Boolean hasInformation() {
+    public Boolean hasSufficientInformation() {
         return isNotBlank(key) && isNotBlank(text) && isNotBlank(code);
     }
 
@@ -95,4 +94,8 @@ public String requestParameters() throws UnsupportedEncodingException {
     public String toString() {
         return "Issue { " + text + " } sent from " + number;
     }
+
+    public Boolean isFor(String key) {
+        return key.equalsIgnoreCase(this.key);
+    }
 }
diff --git a/...re/src/main/java/org/motechproject/server/model/db/hibernate/MessageProcessorDAOImpl.java b/...re/src/main/java/org/motechproject/server/model/db/hibernate/MessageProcessorDAOImpl.java
@@ -16,8 +16,9 @@ public class MessageProcessorDAOImpl implements MessageProcessorDAO {
 
     public MessageProcessorURL urlFor(String keyword) {
         Criteria criteria = sessionFactory.getCurrentSession().createCriteria(MessageProcessorURL.class);
-        criteria.add(Restrictions.eq("key",keyword));
-        return (MessageProcessorURL) criteria.uniqueResult();
+        criteria.add(Restrictions.eq("key", keyword));
+        Object result = criteria.uniqueResult();
+        return result != null ? (MessageProcessorURL) result : null;
     }
 
     public List<MessageProcessorURL> list() {

diff --git a/motech-server-core/src/main/java/org/motechproject/server/util/MailingConstants.java b/motech-server-core/src/main/java/org/motechproject/server/util/MailingConstants.java
@@ -2,7 +2,7 @@
 
 public class MailingConstants {
 
-    public static final String INSUFFICIENT_INFO_FOR_SUPPORT_CASE = "Welcome to MOTECH. SMS should be in format <SUPPORT> <StaffID> <Issue>";
+    public static final String INSUFFICIENT_INFO_FOR_SUPPORT_CASE = "Welcome to MOTECH. Your keyword is invalid. Please use the correct format to send your message";
     public static final String FAILED_TO_RAISE_SUPPORT_CASE = "Welcome to MOTECH . Support case could not be raised";
     public static final String SUPPORT_CASE_CREATION_ACKNOWLEDGEMENT = "Welcome to MOTECH. Your message has been submitted to the support team";
 

diff --git a/...src/main/java/org/motechproject/server/omod/web/controller/IncomingMessageController.java b/...src/main/java/org/motechproject/server/omod/web/controller/IncomingMessageController.java
@@ -22,11 +22,19 @@ public class IncomingMessageController {
     @RequestMapping(value = "/module/motechmodule/incomingmessage",method = RequestMethod.GET)
     public String redirect(IncomingMessage incomingMessage) throws UnsupportedEncodingException {
         log(incomingMessage);
-        MessageProcessorURL url = dao.urlFor(incomingMessage.getKey());
+        MessageProcessorURL url = processorURL(incomingMessage);
         return new StringBuilder().append(REDIRECT).append(url.toString())
                 .append(incomingMessage.requestParameters()).toString();
     }
 
+    private MessageProcessorURL processorURL(IncomingMessage incomingMessage) {
+        MessageProcessorURL processorURL = dao.urlFor(incomingMessage.getKey());
+        if(processorURL == null){
+            processorURL = dao.urlFor("DEFAULT");
+        }
+        return processorURL;
+    }
+
 
     private void log(IncomingMessage incomingMessage) {
         dao.save(incomingMessage);

diff --git a/...mod/src/main/java/org/motechproject/server/omod/web/controller/SupportCaseController.java b/...mod/src/main/java/org/motechproject/server/omod/web/controller/SupportCaseController.java
@@ -55,7 +55,7 @@ public ModelAndView mailToSupport(@ModelAttribute IncomingMessage incomingMessag
         log.info("Received support case request " + incomingMessage);
         ModelAndView response = new ModelAndView(VIEW);
         try {
-            if (incomingMessage.hasInformation()) {
+            if (incomingMessage.hasSufficientInformation() && incomingMessage.isFor("SUPPORT")) {
                 return sendSupportMail(incomingMessage);
             }
             response.addObject(RESPONSE, INSUFFICIENT_INFO_FOR_SUPPORT_CASE);

diff --git a/motech-server-omod/src/main/resources/message-processor.xml b/motech-server-omod/src/main/resources/message-processor.xml
@@ -32,4 +32,9 @@
         <property name="resourceLoaderPath" value="classpath:org/motechproject/server/omod/web/model"/>
     </bean>
 
+    <bean id="defaultURLProcessor" class="org.motechproject.server.model.MessageProcessorURL">
+        <constructor-arg index="0" value="SUPPORT"/>
+        <constructor-arg index="1" value="redirect:/module/motechmodule/supportcase.form"/>
+    </bean>
+
 </beans>
diff --git a/motech-server-omod/src/main/resources/sqldiff.xml b/motech-server-omod/src/main/resources/sqldiff.xml
@@ -3284,4 +3284,14 @@
         </sql>
     </diff>
 
+    <diff>
+        <version>5.3</version>
+        <author>Thoughtworks</author>
+        <date>June 30 2011</date>
+        <description>Adding default URL for #60</description>
+        <sql>
+            insert into motechmodule_url(message_key,url) values('DEFAULT','/module/motechmodule/supportcase.form');
+        </sql>
+    </diff>
+
 </sqldiff>
diff --git a/...test/java/org/motechproject/server/omod/web/controller/IncomingMessageControllerTest.java b/...test/java/org/motechproject/server/omod/web/controller/IncomingMessageControllerTest.java
@@ -56,4 +56,33 @@ public void shouldRedirectAccordingToKeyword() throws UnsupportedEncodingExcepti
         assertEquals("redirect:/module/motechmodule/supportcase.form?text=Hi&number=%2B233123456789&key=SUPPORT&time=2011-03-03+10%3A10%3A10&code=1982",redirectedUrl);
     }
 
+    @Test
+    public void shouldRedirectToSupportIfUrlNotMapped() throws UnsupportedEncodingException {
+
+        MessageProcessorDAO dao = createMock(MessageProcessorDAO.class);
+        controller.setDao(dao);
+
+        IncomingMessage message = new IncomingMessage();
+        message.setKey("TEST");
+        message.setText("Hi");
+
+        dao.save(message);
+        expectLastCall();
+
+        expect(dao.urlFor("TEST"))
+                .andReturn(null);
+
+        expect(dao.urlFor("DEFAULT"))
+                .andReturn(new MessageProcessorURL("DEFAULT","/module/motechmodule/supportcase.form"));
+
+        replay(dao);
+
+        String redirectedUrl = controller.redirect(message);
+
+        verify(dao);
+
+        assertEquals("redirect:/module/motechmodule/supportcase.form?text=Hi&key=TEST",redirectedUrl);
+    }
+
+
 }
diff --git a/...src/test/java/org/motechproject/server/omod/web/controller/SupportCaseControllerTest.java b/...src/test/java/org/motechproject/server/omod/web/controller/SupportCaseControllerTest.java
@@ -40,6 +40,18 @@ public void shouldSendErrorMessageBackIfCompleteInformationNotPresent() {
         assertEquals(MailingConstants.INSUFFICIENT_INFO_FOR_SUPPORT_CASE, modelAndView.getModelMap().get("response"));
     }
 
+    @Test
+    public void shouldSendErrorMessageBackIfKeyIsNotSupport() {
+        SupportCaseController controller = new SupportCaseController();
+        IncomingMessage message = new IncomingMessage();
+        message.setText("TEST 465 Hello");
+        message.setKey("TEST");
+        message.setCode("1982");
+        ModelAndView modelAndView = controller.mailToSupport(message);
+        assertEquals("/module/motechmodule/response", modelAndView.getViewName());
+        assertEquals(MailingConstants.INSUFFICIENT_INFO_FOR_SUPPORT_CASE, modelAndView.getModelMap().get("response"));
+    }
+
     @Test
     public void shouldMailToSupport() {