Motech 2949 test

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+dist: trusty
 jdk:
   - oraclejdk8
 
@@ -20,13 +21,11 @@ script:
   - sudo chmod +x ./run_build.sh
   - ./run_build.sh
 
+before_cache:
+  - rm -r ~/.m2/repository/org/motechproject/*
+
 cache:
   directories:
     - $HOME/.m2
+    - $HOME/.motech/bundles
 
-notifications:
-  email:
-    recipients:
-      - travis-test-maniek@googlegroups.com
-    on_success: never
-    on_failure: always

atom-client/src/main/java/org/motechproject/atomclient/domain/FeedRecord.java

@@ -42,4 +42,11 @@ public String getUrl() {
     public String getData() {
         return data;
     }
+
+    public Integer getPage(String data) {
+        int beginIndex = data.indexOf("via");
+        beginIndex = data.indexOf("patient", beginIndex) + "patient/".length();
+        int endIndex = data.indexOf('/', beginIndex) - "\" ".length();
+        return Integer.parseInt(data.substring(beginIndex, endIndex));
+    }
 }

atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientConfigService.java

@@ -52,4 +52,13 @@ public interface AtomClientConfigService {
      * @return a regex or an empty string
      */
     String getRegexForFeedUrl(String url);
+
+    /**
+     * Sets the module's feed configurations, based on pages that should be consumed.
+     *
+     * @param currentPage last page that is already loaded to module
+     * @param recentPage recent available page that can be consumed
+     * @param feedUrl the feed URL
+     */
+    void readNewFeeds(int currentPage, int recentPage, String feedUrl);
 }

atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientService.java

@@ -22,4 +22,11 @@ public interface AtomClientService {
      * changed since the last time the feed was fetched.
      */
     void fetch();
+
+    /**
+     * Reads the atom feed(s) specified in task action.
+     * @param currentUrl last url that is already fetched
+     * @param lastUrl last known url that can be fetched
+     */
+    void read(String currentUrl, String lastUrl);
 }

atom-client/src/main/java/org/motechproject/atomclient/service/Constants.java

@@ -7,6 +7,7 @@ public final class Constants {
     public static final String FETCH_CRON_PROPERTY = "atomclient.feed.cron";
     public static final String BASE_ATOMCLIENT_SUBJECT = "org.motechproject.atomclient";
     public static final String FETCH_MESSAGE = BASE_ATOMCLIENT_SUBJECT + ".fetch";
+    public static final String READ_MESSAGE = BASE_ATOMCLIENT_SUBJECT + ".read";
     public static final String FEED_CHANGE_MESSAGE = BASE_ATOMCLIENT_SUBJECT + ".feedchange";
     public static final String RESCHEDULE_FETCH_JOB = BASE_ATOMCLIENT_SUBJECT + ".reschedulefetchjob";
 }

atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientConfigServiceImpl.java

@@ -8,9 +8,9 @@
 import org.motechproject.atomclient.service.Constants;
 import org.motechproject.atomclient.service.FeedConfig;
 import org.motechproject.atomclient.service.FeedConfigs;
+import org.motechproject.config.SettingsFacade;
 import org.motechproject.event.MotechEvent;
 import org.motechproject.event.listener.EventRelay;
-import org.motechproject.config.SettingsFacade;
 import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +22,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 
 @Service("atomClientConfigService")
@@ -134,4 +137,13 @@ public String getRegexForFeedUrl(String url) {
         }
         return "";
     }
+
+    public void readNewFeeds (int currentPage, int recentPage, String feedUrl) {
+        List<FeedConfig> newFeeds = new ArrayList<>();
+        String url = feedUrl.substring(0, feedUrl.lastIndexOf('/') + 1);
+        for (int i = currentPage; i <= recentPage; i++) {
+            newFeeds.add(new FeedConfig(url + Integer.toString(i), "/([0-9a-f-]*)\\?"));
+        }
+        this.setFeedConfigs(new FeedConfigs(new HashSet<>(newFeeds)));
+    }
 }

atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientEventHandler.java

@@ -12,6 +12,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * Handles:
  * - (raw or text) config changes by triggering the reload of the appropriate configuration items
@@ -22,10 +24,11 @@
 public class AtomClientEventHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AtomClientEventHandler.class);
+    private static final String CURRENT_URL = "currentFeedUrl";
+    private static final String LAST_URL = "lastFeedUrl";
     private AtomClientConfigService atomClientConfigService;
     private AtomClientService atomClientService;
 
-
     @Autowired
     public void setAtomClientConfigService(AtomClientConfigService atomClientConfigService) {
         this.atomClientConfigService = atomClientConfigService;
@@ -72,4 +75,15 @@ public void handleFetch(MotechEvent event) {
 
         atomClientService.fetch();
     }
+
+    @MotechListener(subjects = { Constants.READ_MESSAGE })
+    public void handleRead(MotechEvent event) {
+        LOGGER.trace("handleRead {}", event);
+        Map<String, Object> params = event.getParameters();
+
+        String currentUrl = (String) params.get(CURRENT_URL);
+        String lastUrl = (String) params.get(LAST_URL);
+
+        atomClientService.read(currentUrl, lastUrl);
+    }
 }

atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientServiceImpl.java

@@ -4,11 +4,13 @@
 import com.rometools.fetcher.FetcherException;
 import com.rometools.fetcher.impl.HttpURLFeedFetcher;
 import com.rometools.rome.io.FeedException;
+import org.motechproject.atomclient.domain.FeedRecord;
 import org.motechproject.atomclient.repository.FeedRecordDataService;
 import org.motechproject.atomclient.service.AtomClientConfigService;
 import org.motechproject.atomclient.service.AtomClientService;
 import org.motechproject.atomclient.service.Constants;
 import org.motechproject.atomclient.service.FeedConfig;
+import org.motechproject.atomclient.service.FeedConfigs;
 import org.motechproject.event.MotechEvent;
 import org.motechproject.event.listener.EventRelay;
 import org.motechproject.scheduler.contract.CronJobId;
@@ -24,6 +26,9 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 
 @Service("atomClientService")
@@ -34,6 +39,7 @@ public class AtomClientServiceImpl implements AtomClientService {
     private AtomClientConfigService configService;
     private MotechSchedulerService motechSchedulerService;
     private FeedFetcher feedFetcher;
+    private FeedRecordDataService feedRecordDataService;
 
 
     @Autowired
@@ -42,6 +48,7 @@ public AtomClientServiceImpl(FeedRecordDataService feedRecordDataService, EventR
         feedFetcher = new HttpURLFeedFetcher(new FeedCache(feedRecordDataService, eventRelay, configService));
         this.configService = configService;
         this.motechSchedulerService = motechSchedulerService;
+        this.feedRecordDataService = feedRecordDataService;
     }
 
 
@@ -65,6 +72,29 @@ public void scheduleFetchJob(String cronExpression) {
     }
 
 
+    @Override
+    @Transactional
+    public void read(String currentUrl, String lastUrl) {
+        List<FeedConfig> feeds = new ArrayList<>();
+        String regex = "/([0-9a-f-]*)\\?";
+
+        feeds.add(new FeedConfig(currentUrl, regex));
+        feeds.add(new FeedConfig(lastUrl, regex));
+        configService.setFeedConfigs(new FeedConfigs(new HashSet<>(feeds)));
+        fetch();
+
+        FeedRecord feedRecord = feedRecordDataService.findByURL(currentUrl);
+        String currenData = feedRecord.getData();
+        int currentPage = feedRecord.getPage(currenData);
+
+        feedRecord = feedRecordDataService.findByURL(lastUrl);
+        String lastData = feedRecord.getData();
+        int lastPage = feedRecord.getPage(lastData);
+
+        configService.readNewFeeds(currentPage, lastPage, currentUrl);
+        fetch();
+    }
+
     @Override
     @Transactional
     public void fetch() {

atom-client/src/main/resources/task-channel.json

@@ -35,6 +35,20 @@
       "subject" : "org.motechproject.atomclient.fetch",
       "displayName" : "atomclient.task.feed.fetch",
       "actionParameters" : [ ]
+    },
+    {
+      "subject" : "org.motechproject.atomclient.read",
+      "displayName" : "atomclient.task.feed.OpenMRS.read",
+      "actionParameters" : [
+        {
+          "key" : "currentFeedUrl",
+          "displayName" : "atomclient.task.feed.OpenMRS.currentUrl"
+        },
+        {
+          "key" : "lastFeedUrl",
+          "displayName" : "atomclient.task.feed.OpenMRS.lastUrl"
+        }
+      ]
     }
   ]
 }

atom-client/src/main/resources/webapp/messages/messages.properties

@@ -10,3 +10,6 @@ atomclient.task.feed.change.updated_date=Updated Date
 atomclient.task.feed.change.raw_content=Raw Content
 atomclient.task.feed.change.extracted_content=Extracted Content
 atomclient.task.feed.fetch=Fetch!
+atomclient.task.feed.OpenMRS.read = Read OpenMRS Feeds
+atomclient.task.feed.OpenMRS.currentUrl= Current OpenMRS Feed Url
+atomclient.task.feed.OpenMRS.lastUrl= Recent OpenMRS Feed Url