diff --git a/.travis.yml b/.travis.yml index bb594944c..96aa89ee2 100644 --- a/.travis.yml +++ b/.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 \ No newline at end of file diff --git a/atom-client/src/main/java/org/motechproject/atomclient/domain/FeedRecord.java b/atom-client/src/main/java/org/motechproject/atomclient/domain/FeedRecord.java index caa889dca..f45c48059 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/domain/FeedRecord.java +++ b/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)); + } } diff --git a/atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientConfigService.java b/atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientConfigService.java index 9c824f638..137bf26f1 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientConfigService.java +++ b/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); } diff --git a/atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientService.java b/atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientService.java index 558ea95dc..51af981bd 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/service/AtomClientService.java +++ b/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); } diff --git a/atom-client/src/main/java/org/motechproject/atomclient/service/Constants.java b/atom-client/src/main/java/org/motechproject/atomclient/service/Constants.java index d2cabb8b4..8a4233838 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/service/Constants.java +++ b/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"; } diff --git a/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientConfigServiceImpl.java b/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientConfigServiceImpl.java index 11b572626..16604a7ea 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientConfigServiceImpl.java +++ b/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 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))); + } } diff --git a/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientEventHandler.java b/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientEventHandler.java index 4b248a62b..cc8a714ca 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientEventHandler.java +++ b/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 params = event.getParameters(); + + String currentUrl = (String) params.get(CURRENT_URL); + String lastUrl = (String) params.get(LAST_URL); + + atomClientService.read(currentUrl, lastUrl); + } } diff --git a/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientServiceImpl.java b/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientServiceImpl.java index e7e927218..045c54b9b 100644 --- a/atom-client/src/main/java/org/motechproject/atomclient/service/impl/AtomClientServiceImpl.java +++ b/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 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() { diff --git a/atom-client/src/main/resources/task-channel.json b/atom-client/src/main/resources/task-channel.json index f6897444e..f5bb50911 100644 --- a/atom-client/src/main/resources/task-channel.json +++ b/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" + } + ] } ] } diff --git a/atom-client/src/main/resources/webapp/messages/messages.properties b/atom-client/src/main/resources/webapp/messages/messages.properties index 1218f015c..c844d7cfe 100644 --- a/atom-client/src/main/resources/webapp/messages/messages.properties +++ b/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 diff --git a/atom-client/src/test/java/org/motechproject/atomclient/it/AtomClientServiceBundleIT.java b/atom-client/src/test/java/org/motechproject/atomclient/it/AtomClientServiceBundleIT.java index 20471e0da..529535e28 100644 --- a/atom-client/src/test/java/org/motechproject/atomclient/it/AtomClientServiceBundleIT.java +++ b/atom-client/src/test/java/org/motechproject/atomclient/it/AtomClientServiceBundleIT.java @@ -1,5 +1,8 @@ package org.motechproject.atomclient.it; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; import org.apache.http.HttpStatus; import org.junit.Before; import org.junit.Test; @@ -19,6 +22,9 @@ import org.ops4j.pax.exam.spi.reactors.PerSuite; import javax.inject.Inject; +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetSocketAddress; import java.util.Arrays; import java.util.HashSet; @@ -172,4 +178,190 @@ public void verifySuccessiveFetches() { String data3 = feedRecord.getData(); assertThat(data3, is(not(data2))); } -} + + @Test + public void verifyPagination() { + + final String atomResponse = + "\r\n" + + "\r\n" + + " Patient AOP\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " OpenMRS\r\n" + + " \r\n" + + " bec795b1-3d17-451d-b43e-a094019f6984+37\r\n" + + " 2016-03-03T23:51:45Z\r\n" + + " 2016-03-03T23:51:45Z\r\n" + + " \r\n" + + " Patient\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " tag:atomfeed.ict4h.org:72deaf8e-039d-49ec-b041-4da9a35c95a2\r\n" + + " 2016-03-03T23:51:45Z\r\n" + + " 2016-03-03T23:51:45Z\r\n" + + " \r\n" + + " 2016-03-03T23:51:45Z\r\n" + + " \r\n" + + "\r\n"; + + try + { + HttpServer server = HttpServer.create(new InetSocketAddress("localhost", 8081), 0); + server.createContext("/openmrs/ws/atomfeed/patient/36", new atom1()); + server.createContext("/openmrs/ws/atomfeed/patient/37", new atom2()); + server.createContext("/openmrs/ws/atomfeed/patient/38", new atom3()); + server.setExecutor(null); // creates a default executor + server.start(); + + String currentUrl = "http:/" + server.getAddress().toString() + "/openmrs/ws/atomfeed/patient/36"; + String recentUrl = "http:/" + server.getAddress().toString() + "/openmrs/ws/atomfeed/patient/38"; + atomClientService.read(currentUrl, recentUrl); + + String fetchedUrl = "http:/" + server.getAddress().toString() + "/openmrs/ws/atomfeed/patient/37"; + FeedRecord feedRecord = feedRecordDataService.findByURL(fetchedUrl); + assertNotNull(feedRecord); + String data = feedRecord.getData(); + assertThat(data, is(atomResponse)); + server.stop(0); + } catch (IOException ex) { + ex.getCause(); + } + } + + static class atom1 implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + final String atomResponse1 = + "\n" + + "\n" + + " Patient AOP\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " OpenMRS\n" + + " \n" + + " bec795b1-3d17-451d-b43e-a094019f6984+36\n" + + " OpenMRS Feed Publisher\n" + + " 2016-03-03T23:46:14Z\n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:fbd3d76b-a23e-44d7-8df6-c0da95ab34ad\n" + + " 2016-03-03T23:39:59Z\n" + + " 2016-03-03T23:39:59Z\n" + + " \n" + + " \n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:e321ea5d-14d6-41ee-8727-9e5291bbcbb6\n" + + " 2016-03-03T23:41:20Z\n" + + " 2016-03-03T23:41:20Z\n" + + " \n" + + " \n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:91b6e147-39eb-4dd1-a983-ec95fc99a9fb\n" + + " 2016-03-03T23:42:34Z\n" + + " 2016-03-03T23:42:34Z\n" + + " \n" + + " \n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:76843fee-721d-472c-a849-25c292e3d3b5\n" + + " 2016-03-03T23:43:57Z\n" + + " 2016-03-03T23:43:57Z\n" + + " \n" + + " \n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:e12ca14d-7fdb-44cf-9efc-f8298df6ce0b\n" + + " 2016-03-03T23:46:14Z\n" + + " 2016-03-03T23:46:14Z\n" + + " \n" + + " \n" + + "\n"; + + t.sendResponseHeaders(200, atomResponse1.length()); + OutputStream os = t.getResponseBody(); + os.write(atomResponse1.getBytes()); + os.close(); + } + } + + static class atom2 implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + final String atomResponse2 = + "\n" + + "\n" + + " Patient AOP\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " OpenMRS\n" + + " \n" + + " bec795b1-3d17-451d-b43e-a094019f6984+37\n" + + " OpenMRS Feed Publisher\n" + + " 2016-03-03T23:51:45Z\n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:72deaf8e-039d-49ec-b041-4da9a35c95a2\n" + + " 2016-03-03T23:51:45Z\n" + + " 2016-03-03T23:51:45Z\n" + + " \n" + + " \n" + + "\n"; + + t.sendResponseHeaders(200, atomResponse2.length()); + OutputStream os = t.getResponseBody(); + os.write(atomResponse2.getBytes()); + os.close(); + } + } + + static class atom3 implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + final String atomResponse3 = + "\n" + + "\n" + + " Patient AOP\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " OpenMRS\n" + + " \n" + + " bec795b1-3d17-451d-b43e-a094019f6984+37\n" + + " OpenMRS Feed Publisher\n" + + " 2016-03-03T23:51:45Z\n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:72deaf8e-039d-49ec-b041-4da9a35c95a2\n" + + " 2016-03-03T23:51:45Z\n" + + " 2016-03-03T23:51:45Z\n" + + " \n" + + " \n" + + "\n"; + + t.sendResponseHeaders(200, atomResponse3.length()); + OutputStream os = t.getResponseBody(); + os.write(atomResponse3.getBytes()); + os.close(); + } + } + +} \ No newline at end of file diff --git a/atom-client/src/test/java/org/motechproject/atomclient/unit/EventTest.java b/atom-client/src/test/java/org/motechproject/atomclient/unit/EventTest.java index ef5bd8da4..b2b332a85 100644 --- a/atom-client/src/test/java/org/motechproject/atomclient/unit/EventTest.java +++ b/atom-client/src/test/java/org/motechproject/atomclient/unit/EventTest.java @@ -65,6 +65,28 @@ public class EventTest { " \n" + "\n"; + static final String ATOM_FEED_DATA_2 = "\n" + + "\n" + + " Patient AOP\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " OpenMRS\n" + + " \n" + + " bec795b1-3d17-451d-b43e-a094019f6984+35\n" + + " OpenMRS Feed Publisher\n" + + " 2016-02-23T03:31:13Z\n" + + " \n" + + " Patient\n" + + " \n" + + " tag:atomfeed.ict4h.org:9cc95d86-1b8e-4582-a774-83cf4b73c23e\n" + + " 2016-02-23T03:31:13Z\n" + + " 2016-02-23T03:31:13Z\n" + + " \n" + + " \n" + + "\n"; + @Before public void setup() { @@ -108,4 +130,17 @@ public void verifyEventNotSentForExistingData() { verify(eventRelay, times(0)).sendEventMessage(event.capture()); } + + @Test + public void verifyRead() { + String feedURL2 = SimpleHttpServer.getInstance().start("foo2", HttpStatus.SC_OK, ATOM_FEED_DATA_2); + + when(feedRecordDataService.findByURL(feedURL)).thenReturn(new FeedRecord(feedURL, ATOM_FEED_DATA)); + when(feedRecordDataService.findByURL(feedURL2)).thenReturn(new FeedRecord(feedURL2, ATOM_FEED_DATA_2)); + + atomClientService.read(feedURL, feedURL2); + + verify(atomClientConfigService).readNewFeeds(35, 36, feedURL); + } + } diff --git a/commcare/pom.xml b/commcare/pom.xml index 001a2b8aa..be6a193ae 100644 --- a/commcare/pom.xml +++ b/commcare/pom.xml @@ -208,7 +208,7 @@ org.motechproject.commcare.builder;version=${project.version}, org.motechproject.commcare.config;version=${project.version}, - org.motechproject.commcare.domain;version=${project.version}, + org.motechproject.commcare.domain.*;version=${project.version}, org.motechproject.commcare.events;version=${project.version}, org.motechproject.commcare.events.constants;version=${project.version}, org.motechproject.commcare.exception;version=${project.version}, diff --git a/commcare/src/main/java/org/motechproject/commcare/client/CommCareAPIHttpClient.java b/commcare/src/main/java/org/motechproject/commcare/client/CommCareAPIHttpClient.java index 1f11959cf..ae9c40bb5 100644 --- a/commcare/src/main/java/org/motechproject/commcare/client/CommCareAPIHttpClient.java +++ b/commcare/src/main/java/org/motechproject/commcare/client/CommCareAPIHttpClient.java @@ -142,14 +142,39 @@ public String formRequest(AccountConfig accountConfig, String formId) { /** * Executes a HTTP get request to the form list API endpoint. * - * @param accountConfig the account configuration to use - * @param formListRequest the request that will be used for creating the HTTP request + * @param accountConfig the account configuration to use + * @param formListRequest the request that will be used for creating the HTTP request * @return the response as a String (JSON expected) */ public String formListRequest(AccountConfig accountConfig, FormListRequest formListRequest) { return this.getRequest(accountConfig, commcareFormListUrl(accountConfig, formListRequest), null); } + /** + * Executes a HTTP get request to the report data API endpoint. + * + * @param accountConfig the account configuration to use + * @param reportId the ID of the report + * @return the response as a String (JSON expected) + */ + public String singleReportDataRequest(AccountConfig accountConfig, String reportId){ + return this.getRequest(accountConfig, commcareReportDataUrl(accountConfig, reportId), null); + } + + public String singleReportDataRequestWithFilters(AccountConfig accountConfig, String reportId, String filters) { + return this.getRequest(accountConfig, commcareReportDataUrlWithFilters(accountConfig, reportId, filters), null); + } + + /** + * Executes a HTTP get request to the reports list API endpoint. + * + * @param accountConfig the account configuration to use + * @return the response as a String (JSON expected) + */ + public String reportsListMetadataRequest(AccountConfig accountConfig) { + return this.getRequest(accountConfig, commcareReportsMetadataUrl(accountConfig), null); + } + /** * Retrieves a list of the cases from the CommCare server. The given {@code caseRequest} will be used for fetching * data from the server. @@ -159,7 +184,7 @@ public String formListRequest(AccountConfig accountConfig, FormListRequest formL * @return the JSON string representation of the cases */ public String casesRequest(AccountConfig accountConfig, CaseRequest caseRequest) { - return this.getRequest(accountConfig, commcareCasesUrl(accountConfig), caseRequest); + return this.getRequest(accountConfig, commcareCasesUrl(accountConfig, caseRequest), caseRequest); } /** @@ -348,7 +373,7 @@ private HttpMethod buildRequest(AccountConfig accountConfig, String url, Request HttpMethod requestMethod = new GetMethod(url); authenticate(accountConfig); - if (request != null) { + if (request != null && requestMethod.getQueryString() == null) { requestMethod.setQueryString(request.toQueryString()); } @@ -510,6 +535,21 @@ String commcareFixturesUrl(AccountConfig accountConfig, Integer pageSize, Intege buildPaginationParams(pageSize, pageNumber)); } + String commcareCasesUrl(AccountConfig accountConfig, CaseRequest caseRequest) { + try { + URIBuilder uriBuilder = new URIBuilder(String.format("%s/%s/api/v%s/case/", getCommcareBaseUrl(accountConfig.getBaseUrl()), + accountConfig.getDomain(), API_VERSION)); + + if (caseRequest != null) { + caseRequest.addQueryParams(uriBuilder); + } + + return uriBuilder.build().toString(); + } catch (URISyntaxException e) { + throw new IllegalArgumentException("Unable to build form list url", e); + } + } + String commcareCasesUrl(AccountConfig accountConfig) { return String.format("%s/%s/api/v%s/case/", getCommcareBaseUrl(accountConfig.getBaseUrl()), accountConfig.getDomain(), API_VERSION); @@ -524,6 +564,20 @@ String commcareCaseUrl(AccountConfig accountConfig, String caseId) { accountConfig.getDomain(), API_VERSION, caseId); } + String commcareReportDataUrl(AccountConfig accountConfig, String reportId) { + return String.format("%s/%s/api/v%s/configurablereportdata/%s/?format=json", + getCommcareBaseUrl(accountConfig.getBaseUrl()), accountConfig.getDomain(), API_VERSION, reportId); + } + + String commcareReportDataUrlWithFilters(AccountConfig accountConfig, String reportId, String filter) { + return commcareReportDataUrl(accountConfig, reportId).concat(filter); + } + + String commcareReportsMetadataUrl(AccountConfig accountConfig) { + return String.format("%s/%s/api/v%s/simplereportconfiguration/?format=json", getCommcareBaseUrl(accountConfig.getBaseUrl()), + accountConfig.getDomain(), API_VERSION); + } + String commcareStockTransactionsUrl(AccountConfig accountConfig) { return String.format("%s/%s/api/v%s/stock_transaction/?format=json", getCommcareBaseUrl(accountConfig.getBaseUrl()), accountConfig.getDomain(), API_VERSION); diff --git a/commcare/src/main/java/org/motechproject/commcare/config/manager/ConfigurationManager.java b/commcare/src/main/java/org/motechproject/commcare/config/manager/ConfigurationManager.java index b4d752ef6..ba4db685c 100644 --- a/commcare/src/main/java/org/motechproject/commcare/config/manager/ConfigurationManager.java +++ b/commcare/src/main/java/org/motechproject/commcare/config/manager/ConfigurationManager.java @@ -1,8 +1,11 @@ package org.motechproject.commcare.config.manager; import org.motechproject.commcare.domain.CommcareApplicationJson; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; import org.motechproject.commcare.service.CommcareAppStructureService; import org.motechproject.commcare.service.CommcareApplicationDataService; +import org.motechproject.commcare.service.CommcareReportService; +import org.motechproject.commcare.service.ReportsMetadataDataService; import org.motechproject.commcare.tasks.CommcareTasksNotifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,9 +28,15 @@ public class ConfigurationManager { @Autowired private CommcareAppStructureService appStructureService; + @Autowired + private CommcareReportService reportService; + @Autowired private CommcareApplicationDataService commcareApplicationDataService; + @Autowired + private ReportsMetadataDataService reportsMetadataDataService; + @Autowired private CommcareTasksNotifier commcareTasksNotifier; @@ -43,8 +52,8 @@ public void configUpdated(String configName) { } @Transactional - public void configUpdated(String configName, boolean downloadApplications) { - if (downloadApplications) { + public void configUpdated(String configName, boolean downloadApplicationsAndReports) { + if (downloadApplicationsAndReports) { LOGGER.info("Configuration [{}] updated, fetching Commcare schema, {}", configName); reloadConfig(configName); } else { @@ -62,15 +71,20 @@ public synchronized void configDeleted(String configName) { private synchronized void reloadConfig(String configName) { List applications = appStructureService.getAllApplications(configName); + ReportsMetadataInfo reportsMetadata = reportService.getReportsList(configName); // clear the configuration before saving the new one clearApps(configName); + clearReports(configName); for (CommcareApplicationJson app : applications) { app.setConfigName(configName); commcareApplicationDataService.create(app); } + reportsMetadata.setConfigName(configName); + reportsMetadataDataService.create(reportsMetadata); + commcareTasksNotifier.updateTasksInfo(); } @@ -79,4 +93,10 @@ private void clearApps(String configName) { commcareApplicationDataService.delete(application); } } + + private void clearReports(String configName) { + for (ReportsMetadataInfo report : reportsMetadataDataService.bySourceConfiguration(configName)) { + reportsMetadataDataService.delete(report); + } + } } diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/CaseInfo.java b/commcare/src/main/java/org/motechproject/commcare/domain/CaseInfo.java index ddae4e3d3..a26b23a77 100644 --- a/commcare/src/main/java/org/motechproject/commcare/domain/CaseInfo.java +++ b/commcare/src/main/java/org/motechproject/commcare/domain/CaseInfo.java @@ -12,6 +12,7 @@ public class CaseInfo { private String caseId; private String userId; private String dateClosed; + private String dateModified; private String domain; private List xformIds; private String version; @@ -50,6 +51,14 @@ public void setDateClosed(String dateClosed) { this.dateClosed = dateClosed; } + public String getDateModified() { + return dateModified; + } + + public void setDateModified(String dateModified) { + this.dateModified = dateModified; + } + public String getDomain() { return this.domain; } diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/CommcareForm.java b/commcare/src/main/java/org/motechproject/commcare/domain/CommcareForm.java index 0f965cd1a..b5c02508b 100644 --- a/commcare/src/main/java/org/motechproject/commcare/domain/CommcareForm.java +++ b/commcare/src/main/java/org/motechproject/commcare/domain/CommcareForm.java @@ -26,6 +26,9 @@ public class CommcareForm { @SerializedName("resource_uri") private String resourceUri; + @SerializedName("app_id") + private String appId; + private String type; private String uiversion; @@ -84,6 +87,14 @@ public void setResourceUri(String resourceUri) { this.resourceUri = resourceUri; } + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + public String getType() { return type; } diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/CommcareMetadataInfo.java b/commcare/src/main/java/org/motechproject/commcare/domain/CommcareMetadataInfo.java index 0fe414045..1e83513f1 100644 --- a/commcare/src/main/java/org/motechproject/commcare/domain/CommcareMetadataInfo.java +++ b/commcare/src/main/java/org/motechproject/commcare/domain/CommcareMetadataInfo.java @@ -1,16 +1,48 @@ package org.motechproject.commcare.domain; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.io.Serializable; +import java.util.Objects; + /** * Domain class representing case metadata, retrieved from CommCareHQ server. */ -public class CommcareMetadataInfo { +public class CommcareMetadataInfo implements Serializable { + + private static final long serialVersionUID = -3427706967092034501L; + @Expose + @SerializedName("limit") private int limit; + + @Expose + @SerializedName("next") private String nextPageQueryString; + + @Expose + @SerializedName("offset") private int offset; + + @Expose + @SerializedName("previous") private String previousPageQueryString; + + @Expose + @SerializedName("total_count") private int totalCount; + public CommcareMetadataInfo() { } + + public CommcareMetadataInfo(int limit, String nextPageQueryString, int offset, String previousPageQueryString, int totalCount) { + this.limit = limit; + this.nextPageQueryString = nextPageQueryString; + this.offset = offset; + this.previousPageQueryString = previousPageQueryString; + this.totalCount = totalCount; + } + public String getPreviousPageQueryString() { return previousPageQueryString; } @@ -50,4 +82,26 @@ public void setNextPageQueryString(String nextPageQueryString) { public void setPreviousPageQueryString(String previousPageQueryString) { this.previousPageQueryString = previousPageQueryString; } + + @Override + public int hashCode() { + return Objects.hash(limit, nextPageQueryString, offset, previousPageQueryString, totalCount); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof CommcareMetadataInfo)) { + return false; + } + + CommcareMetadataInfo other = (CommcareMetadataInfo) o; + + return Objects.equals(limit, other.limit) && Objects.equals(nextPageQueryString, other.nextPageQueryString) + && Objects.equals(offset, other.offset) && Objects.equals(previousPageQueryString, other.previousPageQueryString) + && Objects.equals(totalCount, other.totalCount); + } } diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataColumn.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataColumn.java new file mode 100644 index 000000000..4a33541e6 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataColumn.java @@ -0,0 +1,73 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.SerializedName; + +import java.util.Objects; + +/** + * Represents a single column report data. + */ +public class ReportDataColumn { + + @SerializedName("header") + private String header; + + @SerializedName("slug") + private String slug; + + @SerializedName("expand_column_value") + private String expandColumnValue; + + public ReportDataColumn() { } + + public ReportDataColumn(String header, String slug, String expandColumnValue) { + this.header = header; + this.slug = slug; + this.expandColumnValue = expandColumnValue; + } + + public String getHeader() { + return header; + } + + public String getSlug() { + return slug; + } + + public String getExpandColumnValue() { + return expandColumnValue; + } + + public void setHeader(String header) { + this.header = header; + } + + public void setSlug(String slug) { + this.slug = slug; + } + + public void setExpandColumnValue(String expandColumnValue) { + this.expandColumnValue = expandColumnValue; + } + + @Override + public int hashCode() { + return Objects.hash(header, slug, expandColumnValue); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof ReportDataColumn)) { + return false; + } + + ReportDataColumn other = (ReportDataColumn) o; + + return Objects.equals(header, other.header) && Objects.equals(slug, other.slug) + && Objects.equals(expandColumnValue, other.expandColumnValue); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataInfo.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataInfo.java new file mode 100644 index 000000000..b5cbee16d --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataInfo.java @@ -0,0 +1,79 @@ +package org.motechproject.commcare.domain.report; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * Represents a single CommCareHQ report data. It's a part of the MOTECH model. + */ +public class ReportDataInfo { + + private List columns; + private List> data; + private String nextPage; + private Integer totalRecords; + + public ReportDataInfo() { } + + public ReportDataInfo(List columns, List> data, String nextPage, Integer totalRecords) { + this.columns = columns; + this.data = data; + this.nextPage = nextPage; + this.totalRecords = totalRecords; + } + + public List getColumns() { + return columns; + } + + public void setColumns(List columns) { + this.columns = columns; + } + + public List> getData() { + return data; + } + + public void setData(List> data) { + this.data = data; + } + + public String getNextPage() { + return nextPage; + } + + public void setNextPage(String nextPage) { + this.nextPage = nextPage; + } + + public Integer getTotalRecords() { + return totalRecords; + } + + public void setTotalRecords(Integer totalRecords) { + this.totalRecords = totalRecords; + } + + @Override + public int hashCode() { + return Objects.hash(columns, data, nextPage, totalRecords); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof ReportDataInfo)) { + return false; + } + + ReportDataInfo other = (ReportDataInfo) o; + + return Objects.equals(columns, other.columns) && Objects.equals(data, other.data) + && Objects.equals(nextPage, other.nextPage) && Objects.equals(totalRecords, other.totalRecords); + } + +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataResponseJson.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataResponseJson.java new file mode 100644 index 000000000..9bc6e40c6 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportDataResponseJson.java @@ -0,0 +1,57 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; +import java.util.Map; + +/** + * Represents a single CommCareHQ report data. It's a part of the CommCareHQ model. + */ +public class ReportDataResponseJson { + + @SerializedName("columns") + private List columns; + + @SerializedName("data") + private List> data; + + @SerializedName("next_page") + private String nextPage; + + @SerializedName("total_records") + private Integer totalRecords; + + public List getColumns() { + return columns; + } + + public List> getData() { + return data; + } + + public String getNextPage() { + return nextPage; + } + + public Integer getTotalRecords() { + return totalRecords; + } + + public void setColumns(List reportDataColumns) { + this.columns = reportDataColumns; + } + + public void setData(List> reportDataList) { + this.data = reportDataList; + } + + public void setNextPage(String nextPage) { + this.nextPage = nextPage; + } + + public void setTotalRecords(Integer totalRecords) { + this.totalRecords = totalRecords; + } + +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataColumn.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataColumn.java new file mode 100644 index 000000000..833cb6798 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataColumn.java @@ -0,0 +1,80 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +import org.motechproject.commcare.domain.report.constants.ColumnType; + +import java.io.Serializable; +import java.util.Objects; + +/** + * Represents a single CommCareHQ {@link ReportMetadataInfo} column. + */ +public class ReportMetadataColumn implements Serializable { + + private static final long serialVersionUID = - 5218432575178076712L; + + @Expose + @SerializedName("column_id") + private String id; + + @Expose + @SerializedName("display") + private String display; + + @Expose + @SerializedName("type") + private ColumnType type; + + public ReportMetadataColumn() { } + + public ReportMetadataColumn(String id, String display, ColumnType type) { + this.id = id; + this.display = display; + this.type = type; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + this.display = display; + } + + public ColumnType getType() { + return type; + } + + public void setType(ColumnType type) { + this.type = type; + } + + @Override + public int hashCode() { + return Objects.hash(id, display, type); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof ReportMetadataColumn)) { + return false; + } + + ReportMetadataColumn other = (ReportMetadataColumn) o; + + return Objects.equals(id, other.id) && Objects.equals(display, other.display) && Objects.equals(type, other.type); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataFilter.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataFilter.java new file mode 100644 index 000000000..adb6c8f88 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataFilter.java @@ -0,0 +1,82 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +import org.motechproject.commcare.domain.report.constants.FilterDataType; +import org.motechproject.commcare.domain.report.constants.FilterType; + +import java.io.Serializable; +import java.util.Objects; + +/** + * Represents a single CommCareHQ {@link ReportMetadataInfo} filter. + */ +public class ReportMetadataFilter implements Serializable { + + private static final long serialVersionUID = 8994777814607875504L; + + @Expose + @SerializedName("datatype") + private FilterDataType datatype; + + @Expose + @SerializedName("slug") + private String slug; + + @Expose + @SerializedName("type") + private FilterType type; + + public ReportMetadataFilter() { } + + public ReportMetadataFilter(FilterDataType datatype, String slug, FilterType type) { + this.datatype = datatype; + this.slug = slug; + this.type = type; + } + + public FilterDataType getDatatype() { + return datatype; + } + + public void setDatatype(FilterDataType datatype) { + this.datatype = datatype; + } + + public String getSlug() { + return slug; + } + + public void setSlug(String slug) { + this.slug = slug; + } + + public FilterType getType() { + return type; + } + + public void setType(FilterType type) { + this.type = type; + } + + @Override + public int hashCode() { + return Objects.hash(datatype, slug, type); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof ReportMetadataFilter)) { + return false; + } + + ReportMetadataFilter other = (ReportMetadataFilter) o; + + return Objects.equals(datatype, other.datatype) && Objects.equals(slug, other.slug) && Objects.equals(type, other.type); + } + +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataInfo.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataInfo.java new file mode 100644 index 000000000..981401bde --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataInfo.java @@ -0,0 +1,111 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.io.Serializable; +import java.util.List; +import java.util.Objects; + +/** + * Represents a single CommCareHQ report. It's a part of the MOTECH model. + */ +public class ReportMetadataInfo implements Serializable { + + private static final long serialVersionUID = 1616570156650333507L; + + @Expose + @SerializedName("id") + private String id; + + @Expose + @SerializedName("title") + private String title; + + @Expose + @SerializedName("resource") + private String resource; + + @Expose + @SerializedName("columns") + private List columns; + + @Expose + @SerializedName("filters") + private List filters; + + public ReportMetadataInfo() { } + + public ReportMetadataInfo(String id, String title, List columns, List filters) { + this.id = id; + this.title = title; + this.columns = columns; + this.filters = filters; + } + + public ReportMetadataInfo (String id, String title, String resource, List columns, List filters) { + this(id, title, columns, filters); + this.resource = resource; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getResource () { + return resource; + } + + public void setResource (String resource) { + this.resource = resource; + } + + public List getColumns() { + return columns; + } + + public void setColumns(List columns) { + this.columns = columns; + } + + public List getFilters() { + return filters; + } + + public void setFilters(List filters) { + this.filters = filters; + } + + @Override + public int hashCode() { + return Objects.hash(id, title, columns, filters); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof ReportMetadataInfo)) { + return false; + } + + ReportMetadataInfo other = (ReportMetadataInfo) o; + + return Objects.equals(id, other.id) && Objects.equals(title, other.title) + && Objects.equals(columns, other.columns) && Objects.equals(filters, other.filters); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataJson.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataJson.java new file mode 100644 index 000000000..f1c67744e --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportMetadataJson.java @@ -0,0 +1,66 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +/** + * Represents a single CommCareHQ report. It's a part of the CommCareHQ model. + */ +public class ReportMetadataJson { + + @SerializedName("title") + private String title; + + @SerializedName("id") + private String id; + + @SerializedName("resource") + private String resource; + + @SerializedName("columns") + private List columns; + + @SerializedName("filters") + private List filters; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getResource() { + return resource; + } + + public void setResource() { + this.resource = resource; + } + + public List getColumns() { + return columns; + } + + public void setColumns(List columns) { + this.columns = columns; + } + + public List getFilters() { + return filters; + } + + public void setFilters(List filters) { + this.filters = filters; + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportsMetadataInfo.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportsMetadataInfo.java new file mode 100644 index 000000000..dcb460f79 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportsMetadataInfo.java @@ -0,0 +1,188 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.google.gson.annotations.SerializedName; +import com.google.gson.reflect.TypeToken; +import org.apache.commons.lang.StringEscapeUtils; +import org.motechproject.commcare.domain.CommcareMetadataInfo; +import org.motechproject.commons.api.json.MotechJsonReader; +import org.motechproject.mds.annotations.Access; +import org.motechproject.mds.annotations.CrudEvents; +import org.motechproject.mds.annotations.Entity; +import org.motechproject.mds.annotations.Field; +import org.motechproject.mds.annotations.Ignore; +import org.motechproject.mds.event.CrudEventType; +import org.motechproject.mds.util.SecurityMode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.jdo.annotations.NotPersistent; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +/** + * Wrapper class for storing list of instances of the {@link ReportMetadataInfo} class. It's a part of the MOTECH model. + */ +@Entity(name = "Commcare Reports Metadata") +@CrudEvents(CrudEventType.NONE) +@Access(value = SecurityMode.PERMISSIONS, members = {"manageCommcare"}) +public class ReportsMetadataInfo { + + private static final Logger LOGGER = LoggerFactory.getLogger(ReportsMetadataInfo.class); + + @Ignore + @NotPersistent + @SerializedName("objects") + private List reportMetadataInfoList; + + @Ignore + @NotPersistent + @SerializedName("meta") + private CommcareMetadataInfo metadataInfo; + + @Field(displayName = "Source configuration") + private String configName; + + @Field(displayName = "Metadata", type = "text") + private String serializedReportMetadataInfoList; + + @Field(displayName = "Reports", type = "text") + private String serializedMetadataInfo; + + public ReportsMetadataInfo() { } + + public ReportsMetadataInfo(List reportMetadataInfoList, CommcareMetadataInfo metadataInfo) { + this.reportMetadataInfoList = reportMetadataInfoList; + this.metadataInfo = metadataInfo; + serializeMetadataInfo(); + serializeReportMetadataInfoList(); + } + + public List getReportMetadataInfoList() { + if (reportMetadataInfoList == null && serializedReportMetadataInfoList != null) { + deserializeReportMetadataInfoList(); + } + return reportMetadataInfoList; + } + + public void setReportMetadataInfoList(List reportMetadataInfoList) { + this.reportMetadataInfoList = reportMetadataInfoList; + serializeReportMetadataInfoList(); + } + + public CommcareMetadataInfo getMetadataInfo() { + if (metadataInfo == null && serializedMetadataInfo != null) { + deserializeMetadataInfo(); + } + return metadataInfo; + } + + public void setMetadataInfo(CommcareMetadataInfo metadataInfo) { + this.metadataInfo = metadataInfo; + serializeMetadataInfo(); + } + + public String getConfigName () { + return configName; + } + + public void setConfigName (String configName) { + this.configName = configName; + } + + public String getSerializedReportMetadataInfoList () { + if (serializedReportMetadataInfoList == null && reportMetadataInfoList != null) { + serializeReportMetadataInfoList(); + } + return serializedReportMetadataInfoList; + } + + public void setSerializedReportMetadataInfoList (String serializedReportMetadataInfoList) { + this.serializedReportMetadataInfoList = serializedReportMetadataInfoList; + deserializeReportMetadataInfoList(); + } + + public String getSerializedMetadataInfo () { + if (serializedMetadataInfo == null && metadataInfo != null) { + serializeMetadataInfo(); + } + return serializedMetadataInfo; + } + + public void setSerializedMetadataInfo (String serializedMetadataInfo) { + this.serializedMetadataInfo = serializedMetadataInfo; + serializeMetadataInfo(); + } + + @Override + public int hashCode() { + return Objects.hash(reportMetadataInfoList, metadataInfo, serializedMetadataInfo, serializedReportMetadataInfoList, configName); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof ReportsMetadataInfo)) { + return false; + } + + ReportsMetadataInfo other = (ReportsMetadataInfo) o; + + return Objects.equals(reportMetadataInfoList, other.reportMetadataInfoList) + && Objects.equals(metadataInfo, other.metadataInfo) + && Objects.equals(serializedMetadataInfo, other.serializedMetadataInfo) + && Objects.equals(serializedReportMetadataInfoList, other.serializedReportMetadataInfoList) + && Objects.equals(configName, other.configName); + } + + private void serializeMetadataInfo () { + if (metadataInfo != null) { + Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); + serializedMetadataInfo = StringEscapeUtils.escapeJava(gson.toJson(metadataInfo)); + } + } + + private void deserializeMetadataInfo () { + if (serializedMetadataInfo != null) { + Type deserializeType = new TypeToken() { } .getType(); + MotechJsonReader motechJsonReader = new MotechJsonReader(); + + try { + metadataInfo = (CommcareMetadataInfo) motechJsonReader.readFromStringOnlyExposeAnnotations( + StringEscapeUtils.unescapeJava(serializedMetadataInfo), deserializeType); + } catch (JsonParseException e) { + LOGGER.error("Failed to deserialize CommCare schema from its JSON representation in the database. Fix the errors in the schema or force Commcare module to download the fresh schema.", e); + metadataInfo = null; + } + } + } + + private void serializeReportMetadataInfoList () { + if (reportMetadataInfoList != null) { + Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); + serializedReportMetadataInfoList = StringEscapeUtils.escapeJava(gson.toJson(reportMetadataInfoList)); + } + } + + private void deserializeReportMetadataInfoList () { + if (serializedReportMetadataInfoList != null) { + Type deserializeType = new TypeToken>() { } .getType(); + MotechJsonReader motechJsonReader = new MotechJsonReader(); + + try { + reportMetadataInfoList = (List) motechJsonReader.readFromStringOnlyExposeAnnotations( + StringEscapeUtils.unescapeJava(serializedReportMetadataInfoList), deserializeType); + } catch (JsonParseException e) { + LOGGER.error("Failed to deserialize CommCare schema from its JSON representation in the database. Fix the errors in the schema or force Commcare module to download the fresh schema.", e); + reportMetadataInfoList = Collections.emptyList(); + } + } + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportsMetadataResponseJson.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportsMetadataResponseJson.java new file mode 100644 index 000000000..e08352eec --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/ReportsMetadataResponseJson.java @@ -0,0 +1,35 @@ +package org.motechproject.commcare.domain.report; + +import com.google.gson.annotations.SerializedName; +import org.motechproject.commcare.domain.CommcareMetadataJson; + +import java.util.List; + +/** + * Wrapper class for storing list of instances of the {@link ReportMetadataJson} class and their metadata. It's part of the + * CommCareHQ model. + */ +public class ReportsMetadataResponseJson { + + @SerializedName("meta") + private CommcareMetadataJson metadata; + + @SerializedName("objects") + private List reports; + + public CommcareMetadataJson getMetadata() { + return metadata; + } + + public void setMetadata(CommcareMetadataJson metadata) { + this.metadata = metadata; + } + + public List getReports() { + return reports; + } + + public void setReports(List reports) { + this.reports = reports; + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/ColumnType.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/ColumnType.java new file mode 100644 index 000000000..f13356a8a --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/ColumnType.java @@ -0,0 +1,28 @@ +package org.motechproject.commcare.domain.report.constants; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; + +import java.lang.reflect.Type; + +public enum ColumnType { + FIELD("field"), + EXPANDED("expanded"), + PERCENT("percent"); + + private final String type; + + ColumnType(String type) { + this.type = type; + } + + public static class ColumnTypeDeserializer implements JsonDeserializer { + + @Override + public ColumnType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) { + String value = json.getAsString(); + return ColumnType.valueOf(value.toUpperCase()); + } + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/FilterDataType.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/FilterDataType.java new file mode 100644 index 000000000..bfad3dd02 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/FilterDataType.java @@ -0,0 +1,28 @@ +package org.motechproject.commcare.domain.report.constants; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; + +import java.lang.reflect.Type; + +public enum FilterDataType { + STRING("string"), + INTEGER("integer"), + DECIMAL("decimal"); + + private final String datatype; + + FilterDataType(String datatype) { + this.datatype = datatype; + } + + public static class FilterDataTypeDeserializer implements JsonDeserializer { + + @Override + public FilterDataType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) { + String value = json.getAsString(); + return FilterDataType.valueOf(value.toUpperCase()); + } + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/FilterType.java b/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/FilterType.java new file mode 100644 index 000000000..cf39aed87 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/domain/report/constants/FilterType.java @@ -0,0 +1,30 @@ +package org.motechproject.commcare.domain.report.constants; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; + +import java.lang.reflect.Type; + +public enum FilterType { + NUMERIC("numeric"), + DATE("date"), + CHOICE_LIST("choice_list"), + DYNAMIC_CHOICE_LIST("dynamic_choice_list"), + PRE("pre"); + + private final String type; + + FilterType(String type) { + this.type = type; + } + + public static class FilterTypeDeserializer implements JsonDeserializer { + + @Override + public FilterType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) { + String value = json.getAsString(); + return FilterType.valueOf(value.toUpperCase()); + } + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/events/CaseEvent.java b/commcare/src/main/java/org/motechproject/commcare/events/CaseEvent.java index fc470cf23..0d768e58b 100644 --- a/commcare/src/main/java/org/motechproject/commcare/events/CaseEvent.java +++ b/commcare/src/main/java/org/motechproject/commcare/events/CaseEvent.java @@ -1,5 +1,6 @@ package org.motechproject.commcare.events; +import org.motechproject.commcare.domain.CaseInfo; import org.motechproject.commcare.domain.CaseXml; import org.motechproject.commcare.events.constants.EventDataKeys; import org.motechproject.commcare.events.constants.EventSubjects; @@ -124,6 +125,28 @@ public static CaseEvent fromCaseXml(CaseXml caseInstance, String configName) { return event; } + /** + * Creates an instance of the {@link CaseEvent} class based on the given {@code caseInfo} and + * {@code configName}. + * + * @param caseInfo the case information + * @param configName the configuration name + * @return an instance of the {@link CaseEvent} + */ + public static CaseEvent fromCaseInfo(CaseInfo caseInfo, String configName) { + CaseEvent event = new CaseEvent(caseInfo.getCaseId()); + event.setServerModifiedOn(caseInfo.getServerDateModified()); + event.setUserId(caseInfo.getUserId()); + event.setCaseName(caseInfo.getCaseName()); + event.setCaseType(caseInfo.getCaseType()); + event.setDateModified(caseInfo.getDateModified()); + event.setFieldValues(caseInfo.getFieldValues()); + event.setOwnerId(caseInfo.getOwnerId()); + event.setConfigName(configName); + + return event; + } + public String getServerModifiedOn() { return this.serverModifiedOn; } diff --git a/commcare/src/main/java/org/motechproject/commcare/events/MalformedFormStatusMessageEvent.java b/commcare/src/main/java/org/motechproject/commcare/events/FailedImportStatusMessageEvent.java similarity index 83% rename from commcare/src/main/java/org/motechproject/commcare/events/MalformedFormStatusMessageEvent.java rename to commcare/src/main/java/org/motechproject/commcare/events/FailedImportStatusMessageEvent.java index c471cc75c..b66ddb9f9 100644 --- a/commcare/src/main/java/org/motechproject/commcare/events/MalformedFormStatusMessageEvent.java +++ b/commcare/src/main/java/org/motechproject/commcare/events/FailedImportStatusMessageEvent.java @@ -7,10 +7,10 @@ /** * A wrapper for the event that will trigger a status message signaling - * a failure to receive a form. The status messages will be displayed by the Admin + * a failure to receive a form or a case. The status messages will be displayed by the Admin * module in its UI (if the module is present). */ -public class MalformedFormStatusMessageEvent { +public class FailedImportStatusMessageEvent { /** * The message to display. @@ -20,7 +20,7 @@ public class MalformedFormStatusMessageEvent { /** * @param message the message to display */ - public MalformedFormStatusMessageEvent(String message) { + public FailedImportStatusMessageEvent(String message) { this.message = message; } diff --git a/commcare/src/main/java/org/motechproject/commcare/events/FormActionEventHandler.java b/commcare/src/main/java/org/motechproject/commcare/events/FormActionEventHandler.java index 01b3f30f2..116b242b4 100644 --- a/commcare/src/main/java/org/motechproject/commcare/events/FormActionEventHandler.java +++ b/commcare/src/main/java/org/motechproject/commcare/events/FormActionEventHandler.java @@ -1,6 +1,5 @@ package org.motechproject.commcare.events; -import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; @@ -49,11 +48,9 @@ public class FormActionEventHandler { @MotechListener(subjects = EventSubjects.SUBMIT_FORM + ".*") public void submitForm(MotechEvent event) { String configName = EventSubjects.getConfigName(event.getSubject()); - String xmlns = extractXmlnsFromEventSubject(event.getSubject(), configName); Map parameters = event.getParameters(); FormXml formXml = parseEventParametersToFormXml(parameters); - formXml.setXmlns(xmlns); Map formMetadata = new HashMap<>(); formMetadata.put(INSTANCE_ID_KEY, new MetadataValue(UUID.randomUUID().toString())); @@ -66,18 +63,18 @@ public void submitForm(MotechEvent event) { commcareFormService.uploadForm(formXml, configName); } - private String extractXmlnsFromEventSubject(String subject, String configName) { - return StringUtils.removeEnd(subject.replaceFirst(EventSubjects.SUBMIT_FORM + ".", StringUtils.EMPTY), "." + configName); - } - private FormXml parseEventParametersToFormXml(Map parameters) { FormXml formXml = new FormXml(); for (Map.Entry entry : parameters.entrySet()) { if (entry.getValue() != null) { - List xmlPath = discoverXmlPath(entry.getKey()); - FormValueElement element = formXml.getElementByPath(xmlPath); - element.setValue(entry.getValue().toString()); + if ("xmlns".equals(entry.getKey())) { + formXml.setXmlns(entry.getValue().toString()); + } else { + List xmlPath = discoverXmlPath(entry.getKey()); + FormValueElement element = formXml.getElementByPath(xmlPath); + element.setValue(entry.getValue().toString()); + } } } diff --git a/commcare/src/main/java/org/motechproject/commcare/events/FullCaseFailureEvent.java b/commcare/src/main/java/org/motechproject/commcare/events/FullCaseFailureEvent.java new file mode 100644 index 000000000..f8349da7b --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/events/FullCaseFailureEvent.java @@ -0,0 +1,50 @@ +package org.motechproject.commcare.events; + +import org.motechproject.commcare.service.impl.CommcareCaseEventParser; +import org.motechproject.commons.api.TasksEventParser; +import org.motechproject.event.MotechEvent; + +import java.util.HashMap; +import java.util.Map; + +import static org.motechproject.commcare.events.constants.EventDataKeys.CONFIG_NAME; +import static org.motechproject.commcare.events.constants.EventDataKeys.FAILED_CASE_MESSAGE; +import static org.motechproject.commcare.events.constants.EventSubjects.CASES_FAIL_EVENT; + +/** + * Represents a failure event for a full case received. + */ +public class FullCaseFailureEvent { + /** + * Name of the Motech Commcare configuration this failure affected. + */ + private final String configName; + + /** + * The error message. + */ + private final String errorMessage; + + /** + * @param configName name of the Motech Commcare configuration this failure affected + * @param errorMessage the error message + */ + public FullCaseFailureEvent(String configName, String errorMessage) { + this.configName = configName; + this.errorMessage = errorMessage; + } + + /** + * Builds a {@link MotechEvent} instance to send. + * @return the event to send + */ + public MotechEvent toMotechEvent() { + Map params = new HashMap<>(); + + params.put(TasksEventParser.CUSTOM_PARSER_EVENT_KEY, CommcareCaseEventParser.PARSER_NAME); + params.put(CONFIG_NAME, configName); + params.put(FAILED_CASE_MESSAGE, errorMessage); + + return new MotechEvent(CASES_FAIL_EVENT, params); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/events/ReportActionEventHandler.java b/commcare/src/main/java/org/motechproject/commcare/events/ReportActionEventHandler.java new file mode 100644 index 000000000..18fb6c371 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/events/ReportActionEventHandler.java @@ -0,0 +1,146 @@ +package org.motechproject.commcare.events; + +import org.joda.time.DateTime; +import org.motechproject.commcare.domain.report.constants.FilterDataType; +import org.motechproject.commcare.domain.report.constants.FilterType; +import org.motechproject.commcare.events.constants.DisplayNames; +import org.motechproject.commcare.events.constants.EventDataKeys; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.ReportActionService; +import org.motechproject.event.MotechEvent; +import org.motechproject.event.listener.annotations.MotechListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * This class serves as the event handler for the task actions, exposed by the Commcare module. + * Respective methods extract the necessary data from the {@link MotechEvent} instance and + * handles all the operations on Commcare reports. + */ +/** + * Class responsible for handling "Report" events. The service will extract the necessary data + * from the {@link MotechEvent} and pass them to the {@link ReportActionService} service that will + * query the CommCare Report UCR API and then send a motech event for selected report. + */ +@Component +public class ReportActionEventHandler { + + private static final String TYPE_KEY_IDENTIFIER = ".type"; + private static final String START_DATE_FILTER_SUFFIX = "-start"; + private static final String END_DATE_FILTER_SUFFIX = "-end"; + private static final String NUMERIC_OPERATOR_FILTER_SUFFIX = "-operator"; + private static final String NUMERIC_OPERAND_FILTER_SUFFIX = "-operand"; + private static final String COMMCARE_REPORT_FILTER_DATE_FORMAT = "yyyy-MM-dd"; + + private ReportActionService reportActionService; + + @Autowired + public ReportActionEventHandler (ReportActionService reportActionService) { + this.reportActionService = reportActionService; + } + + /** + * Handles events, connected with getting Commcare report. The event subject should have the following syntax: + * {@code EventSubjects.REPORT_EVENT.report_name.config_name} + * + * @param event the event, containing parameters necessary to get the Commcare report + */ + @MotechListener(subjects = EventSubjects.REPORT_EVENT + ".*") + public void receiveReport (MotechEvent event) { + String configName = EventSubjects.getConfigName(event.getSubject()); + Map parameters = event.getParameters(); + + String reportId = (String) parameters.get(EventDataKeys.REPORT_ID); + String reportName = (String) parameters.get(EventDataKeys.REPORT_NAME); + List fields = getFieldNamesFromParameters(parameters); + + String parsedFilters = convertFieldsToRequest(fields, parameters); + + reportActionService.queryReport(configName, reportId, reportName, parsedFilters); + } + + private List getFieldNamesFromParameters (Map parameters) { + List fieldNames = new ArrayList<>(); + + for (String key : parameters.keySet()) { + if (key.endsWith(TYPE_KEY_IDENTIFIER)) { + fieldNames.add(key.substring(0, key.indexOf(TYPE_KEY_IDENTIFIER))); + } + } + + return fieldNames; + } + + private String convertFieldsToRequest (List fieldNames, Map parameters) { + StringBuilder urlFilterBuilder = new StringBuilder(); + + for (String fieldName : fieldNames) { + String fieldType = (String) parameters.get(fieldName.concat(TYPE_KEY_IDENTIFIER)); + + if (fieldType.equals(FilterType.CHOICE_LIST.toString())) { + String fieldValue = (String) parameters.get(fieldName); + if (fieldValue != null) { + urlFilterBuilder.append("&") + .append(fieldName) + .append("=") + .append(fieldValue); + } + } else if (fieldType.equals(FilterType.DATE.toString())) { + urlFilterBuilder.append(parseDateField(fieldName, parameters)); + } else if (fieldType.equals(FilterDataType.DECIMAL.toString())) { + urlFilterBuilder.append(parseNumericField(fieldName, parameters)); + } + } + return urlFilterBuilder.toString(); + } + + private String parseDateField (String fieldName, Map parameters) { + StringBuilder parsedDataFilterBuilder = new StringBuilder(); + + DateTime startDate = (DateTime) parameters.get(fieldName); + DateTime endDate = (DateTime) parameters.get(fieldName + "." + DisplayNames.END_DATE); + + if (startDate != null) { + parsedDataFilterBuilder.append("&") + .append(fieldName) + .append(START_DATE_FILTER_SUFFIX) + .append("=") + .append(startDate.toString(COMMCARE_REPORT_FILTER_DATE_FORMAT)); + } + if (endDate != null) { + parsedDataFilterBuilder.append("&") + .append(fieldName) + .append(END_DATE_FILTER_SUFFIX) + .append("=") + .append(endDate.toString(COMMCARE_REPORT_FILTER_DATE_FORMAT)); + } + + return parsedDataFilterBuilder.toString(); + } + + private String parseNumericField (String fieldName, Map parameters) { + StringBuilder parsedNumericFilterBuilder = new StringBuilder(); + + String operator = (String) parameters.get(fieldName); + String operand = (String) parameters.get(fieldName + "." + EventDataKeys.VALUE); + + if (operator != null && operand != null) { + parsedNumericFilterBuilder.append("&") + .append(fieldName) + .append(NUMERIC_OPERATOR_FILTER_SUFFIX) + .append("=") + .append(operator) + .append("&") + .append(fieldName) + .append(NUMERIC_OPERAND_FILTER_SUFFIX) + .append("=") + .append(operand); + } + + return parsedNumericFilterBuilder.toString(); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/events/constants/DisplayNames.java b/commcare/src/main/java/org/motechproject/commcare/events/constants/DisplayNames.java index a3a611b91..001cffca1 100644 --- a/commcare/src/main/java/org/motechproject/commcare/events/constants/DisplayNames.java +++ b/commcare/src/main/java/org/motechproject/commcare/events/constants/DisplayNames.java @@ -12,6 +12,7 @@ public final class DisplayNames { public static final String UPDATE_CASE = "Update Case"; public static final String SUBMIT_FORM = "Submit Form"; public static final String IMPORT_FORMS = "Import Forms"; + public static final String CREATE_REPORT = "Create Report"; public static final String CONFIG_NAME = "commcare.configName"; public static final String CASE_ID = "commcare.caseId"; diff --git a/commcare/src/main/java/org/motechproject/commcare/events/constants/EventDataKeys.java b/commcare/src/main/java/org/motechproject/commcare/events/constants/EventDataKeys.java index 77c8bf3c7..6f7a5e34e 100644 --- a/commcare/src/main/java/org/motechproject/commcare/events/constants/EventDataKeys.java +++ b/commcare/src/main/java/org/motechproject/commcare/events/constants/EventDataKeys.java @@ -70,6 +70,11 @@ public final class EventDataKeys { //FullFormsExceptionEvent public static final String FAILED_FORM_MESSAGE = "failedMessage"; + public static final String FAILED_CASE_MESSAGE = "failed case import message"; + + //ReportEvent + public static final String REPORT_ID = "report_id"; + public static final String REPORT_NAME = "report_name"; /** * Utility class, should not be initiated. diff --git a/commcare/src/main/java/org/motechproject/commcare/events/constants/EventSubjects.java b/commcare/src/main/java/org/motechproject/commcare/events/constants/EventSubjects.java index 82694d47f..523c139b0 100644 --- a/commcare/src/main/java/org/motechproject/commcare/events/constants/EventSubjects.java +++ b/commcare/src/main/java/org/motechproject/commcare/events/constants/EventSubjects.java @@ -8,11 +8,13 @@ public final class EventSubjects { private static final String BASE_SUBJECT = "org.motechproject.commcare.api."; public static final String CASE_EVENT = BASE_SUBJECT + "case"; + public static final String REPORT_EVENT = BASE_SUBJECT + "report"; public static final String MALFORMED_CASE_EXCEPTION = BASE_SUBJECT + "exception"; public static final String FORM_STUB_EVENT = BASE_SUBJECT + "formstub"; public static final String FORM_STUB_FAIL_EVENT = FORM_STUB_EVENT + ".failed"; public static final String FORMS_EVENT = BASE_SUBJECT + "forms"; public static final String FORMS_FAIL_EVENT = FORMS_EVENT + ".failed"; + public static final String CASES_FAIL_EVENT = CASE_EVENT + ".failed"; public static final String RECEIVED_STOCK_TRANSACTION = BASE_SUBJECT + "receivedStockTransaction"; public static final String QUERY_STOCK_LEDGER = BASE_SUBJECT + "queryStockLedger"; public static final String IMPORT_FORMS = BASE_SUBJECT + "importForms"; @@ -24,6 +26,7 @@ public final class EventSubjects { public static final String CREATE_CASE = BASE_SUBJECT + "createCase"; public static final String UPDATE_CASE = BASE_SUBJECT + "updateCase"; public static final String SUBMIT_FORM = BASE_SUBJECT + "submitForm"; + public static final String RECEIVED_REPORT = BASE_SUBJECT + "receivedReport"; public static String getConfigName(String subject) { return subject.substring(subject.lastIndexOf('.') + 1); diff --git a/commcare/src/main/java/org/motechproject/commcare/pull/CaseImportStatus.java b/commcare/src/main/java/org/motechproject/commcare/pull/CaseImportStatus.java new file mode 100644 index 000000000..133aa3255 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/pull/CaseImportStatus.java @@ -0,0 +1,139 @@ +package org.motechproject.commcare.pull; + +/** + * Represents the status of an ongoing case import. + */ +public class CaseImportStatus { + /** + * The number of cases successfully imported. + */ + private int casesImported; + + /** + * The total number of cases to import. + */ + private int totalCases; + + /** + * The date of the last successfully imported case. + */ + private String lastImportDate; + + /** + * The ID of the last successfully imported case. + */ + private String lastImportCaseId; + + /** + * Whether the import ended in error. + */ + private boolean error; + + /** + * The error message, if applicable. + */ + private String errorMsg; + + /** + * Is import in progress currently. + */ + private boolean importInProgress; + + /** + * @return the number of cases successfully imported + */ + public int getCasesImported() { + return casesImported; + } + + /** + * @param casesImported the number of cases successfully imported + */ + public void setCasesImported(int casesImported) { + this.casesImported = casesImported; + } + + /** + * @return the total number of cases to import + */ + public int getTotalCases() { + return totalCases; + } + + /** + * @param totalCases the total number of cases to import + */ + public void setTotalCases(int totalCases) { + this.totalCases = totalCases; + } + + /** + * @return the date of the last successfully imported case + */ + public String getLastImportDate() { + return lastImportDate; + } + + /** + * @param lastImportDate the date of the last successfully imported case + */ + public void setLastImportDate(String lastImportDate) { + this.lastImportDate = lastImportDate; + } + + /** + * @return true if the import ended on error, false otherwise + */ + public boolean isError() { + return error; + } + + /** + * @param error true if the import ended on error, false otherwise + */ + public void setError(boolean error) { + this.error = error; + } + + /** + * @return the message for the error that stopped the import + */ + public String getErrorMsg() { + return errorMsg; + } + + /** + * @param errorMsg the message for the error that stopped the import + */ + public void setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } + + /** + * @return true if import is in progress, false otherwise + */ + public boolean isImportInProgress() { + return importInProgress; + } + + /** + * @param importInProgress true if import is in progress, false otherwise + */ + public void setImportInProgress(boolean importInProgress) { + this.importInProgress = importInProgress; + } + + /** + * @return the ID of the last successfully imported case + */ + public String getLastImportCaseId() { + return lastImportCaseId; + } + + /** + * @param lastImportCaseId the ID of the last successfully imported case + */ + public void setLastImportCaseId(String lastImportCaseId) { + this.lastImportCaseId = lastImportCaseId; + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporter.java b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporter.java new file mode 100644 index 000000000..94074a720 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporter.java @@ -0,0 +1,88 @@ +package org.motechproject.commcare.pull; + +import org.joda.time.DateTime; +import org.motechproject.commons.api.Range; + +/** + * The interface for the class managing case imports. The import + * can be based on a caseId or a date range. All cases retrieved from Commcare that match + * the provided caseId or date range will be treated as if they would just arrived through + * the case forwarding mechanism - an event will be published for each case. + * In case of failures, the import will be stopped, events for failure will also be fired, + * same as in the case forwarding controller. The import is done asynchronously in a separate thread, + * so this interface also allows checking the status of an ongoing import. + */ +public interface CommcareCaseImporter { + + /** + * Counts how many cases match the provided criteria. A single request to the case list + * API will be made underneath, and the returned total count will be returned by this method. + * @param dateRange the date range for the import + * @param configName the name of the configuration to use, if null is provided the default configuration + * will be used + * @return the total number of cases matching the provided criteria + * @throws IllegalArgumentException if the date range is null or invalid (start date after end date) + * @throws IllegalStateException if there is an already ongoing import in progress + */ + int countForImport(Range dateRange, String configName); + + /** + * Initiates asynchronous import for the provided caseId. Cases will be fetched from Commcare by doing HTTP + * request to the case list API. The import will run in a separate thread. An event will be fired for the + * successfully imported case. If an error occurs import will be stopped. + * @param caseId the uuid of the case to be imported. + * @param configName the name of the configuration to use, if null is provided the default configuration + * will be used + */ + void importSingleCase(final String caseId, final String configName); + + /** + * Initiates asynchronous import for the provided criteria. Cases will be fetched from Commcare by doing HTTP + * request to the case list API. The default fetch size per request is 100, but that can be controlled using the + * {@link #setFetchSize(int)} method. The import will run in a separate thread. An event will be fired for each + * successfully imported case. If an error occurs, the import will be stopped. + * @param dateRange the date range for the import + * @param configName the name of the configuration to use, if null is provided the default configuration + * will be used + * @throws IllegalArgumentException if the date range is null or invalid (start date after end date) + * @throws IllegalStateException if there is an already ongoing import in progress + */ + void startImport(final Range dateRange, final String configName); + + /** + * Stops the ongoing import. The effect is not guaranteed to be immediate. + */ + void stopImport(); + + /** + * Checks whether a case with the given id exists. + * @param caseId the uuid of the case to be imported. + * @param configName the name of the configuration to use, if null is provided the default configuration + * will be used + * @return boolean value + */ + boolean checkCaseIdForImport(final String caseId, final String configName); + + /** + * Checks whether there is an ongoing import in progress. + * @return true if there is an ongoing import, false otherwise + */ + boolean isImportInProgress(); + + /** + * Retrieves an {@link CaseImportStatus} object representing the status of the current, or + * the last import. {@link CaseImportStatus#isImportInProgress()} can be used to check if the import is ongoing, + * {@link CaseImportStatus#isError()} can be checked to see if the import failed. The received_on date for the + * last successfully imported case can be retrieved using {@link CaseImportStatus#getLastImportDate()}. + * @return the status object for the current or last import + */ + CaseImportStatus importStatus(); + + /** + * Sets the fetch size for the queries to the Commcare case list API. In other words, sets how many cases + * will be retrieved per request to the API. The default is 100. Setting a too large number might cause memory + * issues, setting a too low number might result in a large number of HTTP requests. + * @param fetchSize the fetch size for requests + */ + void setFetchSize(int fetchSize); +} diff --git a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporterFactory.java b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporterFactory.java new file mode 100644 index 000000000..4b4ef8f99 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporterFactory.java @@ -0,0 +1,77 @@ +package org.motechproject.commcare.pull; + +import org.motechproject.commcare.service.CommcareCaseService; +import org.motechproject.event.listener.EventRelay; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; +import java.util.HashMap; +import java.util.Map; + +/** + * This is the factory responsible for providing instances {@link CommcareCaseImporter} to + * the web layer. Importer instances are stored on a per http session basis. The instances are discarded + * once a session becomes invalidated. This class implements the {@link HttpSessionListener} to keep track + * of sessions being discarded (the session created event does not concern it). + */ +@Service("commcareCaseImporterFactory") +public class CommcareCaseImporterFactory implements HttpSessionListener{ + + private static final Logger LOGGER = LoggerFactory.getLogger(CommcareCaseImporterFactory.class); + + @Autowired + private EventRelay eventRelay; + + @Autowired + private CommcareCaseService caseService; + + private final Map importerMap = new HashMap<>(); + + /** + * Retrieves an importer instance for the given session. A new instance will be created if it doesn't yet exist. + * @param session the http session for which the importer should be retrieved. + * @return the importer instance for the session + * @throws IllegalArgumentException if the session is null + */ + public CommcareCaseImporter getImporter(HttpSession session) { + if (session == null) { + throw new IllegalArgumentException("No session provided, importers must be tied with an HTTP session"); + } + + final String sid = session.getId(); + + LOGGER.debug("Retrieving importer for session with ID: {}", sid); + + if (!importerMap.containsKey(sid)) { + LOGGER.debug("No importer available for session with ID: {}. Creating a new one.", sid); + importerMap.put(sid, new CommcareCaseImporterImpl(eventRelay, caseService)); + } + + return importerMap.get(sid); + } + + @Override + public void sessionCreated(HttpSessionEvent se) { + LOGGER.trace("Received session created event, id: {}", se.getSession().getId()); + } + + @Override + public void sessionDestroyed(HttpSessionEvent se) { + final String sid = se.getSession().getId(); + LOGGER.debug("Received sessionDestroyed event, id: {}", sid); + + CommcareCaseImporter removedImporter = importerMap.remove(sid); + + if (removedImporter == null) { + LOGGER.debug("No importer stored for session with id: {}", sid); + } else { + LOGGER.debug("Discarding importer for session with id: {}, import in progress: {}", + sid, removedImporter.isImportInProgress()); + } + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporterImpl.java b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporterImpl.java new file mode 100644 index 000000000..64132fbd1 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareCaseImporterImpl.java @@ -0,0 +1,269 @@ +package org.motechproject.commcare.pull; + +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; +import org.motechproject.commcare.domain.CaseInfo; +import org.motechproject.commcare.domain.CasesInfo; +import org.motechproject.commcare.events.CaseEvent; +import org.motechproject.commcare.events.FullCaseFailureEvent; +import org.motechproject.commcare.events.FailedImportStatusMessageEvent; +import org.motechproject.commcare.service.CommcareCaseService; +import org.motechproject.commons.api.Range; +import org.motechproject.event.listener.EventRelay; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The implementation of {@link CommcareCaseImporter}. Uses the {@link CommcareCaseService} for + * retrieval of cases. + */ +public class CommcareCaseImporterImpl implements CommcareCaseImporter { + + private static final Logger LOGGER = LoggerFactory.getLogger(CommcareCaseImporterImpl.class); + + private static final int PAGE_SIZE_FOR_FETCH = 100; + + private CommcareCaseService caseService; + private EventRelay eventRelay; + + private int fetchSize = PAGE_SIZE_FOR_FETCH; + + private Thread importThread; + private boolean importInProgress = false; + + private int importCount; + private int totalCount; + private int pageCount; + private String lastImportedDate; + private String lastImportedCaseId; + private boolean inError; + private String errorMessage; + + public CommcareCaseImporterImpl(EventRelay eventRelay, CommcareCaseService caseService) { + this.eventRelay = eventRelay; + this.caseService = caseService; + } + + @Override + public int countForImport(Range dateRange, String configName) { + validateDateRange(dateRange); + + LOGGER.info("Counting forms for import for dateRange: {}-{} [config: {}]", dateRange.getMin(), + dateRange.getMax(), configName); + + CasesInfo cases = caseService.getCasesByCasesTimeWithMetadata(dateTimeToString(dateRange.getMin()), + dateTimeToString(dateRange.getMax()), 1, 1, configName); + + int count = cases.getMetadataInfo().getTotalCount(); + LOGGER.info("Case count: {}", count); + + return count; + } + + public void importSingleCase(final String caseId, final String configName) { + LOGGER.info("Initiating import request for case with id : {} [config: {}]", caseId, configName); + importInProgress = true; + totalCount = 1; + + LOGGER.debug("Retrieving case info for case with id : {}", caseId); + // Fetching the case + CaseInfo caseInfo = caseService.getCaseByCaseId(caseId, configName); + + LOGGER.debug("Retrieved the case"); + // Sending event for the fetched case + CaseEvent caseEvent = CaseEvent.fromCaseInfo(caseInfo, configName); + eventRelay.sendEventMessage(caseEvent.toMotechEventWithData()); + + lastImportedCaseId = caseInfo.getCaseId(); + lastImportedDate = caseInfo.getDateModified(); + importCount = 1; + + LOGGER.info("Imported case with ID: {}", caseInfo.getCaseId()); + LOGGER.info("Case import finished for case with id : {}. ", caseId); + + importInProgress = false; + } + + public boolean checkCaseIdForImport(final String caseId, final String configName) { + LOGGER.debug("Checking if the case with id : {} exists", caseId); + CaseInfo caseInfo = caseService.getCaseByCaseId(caseId, configName); + LOGGER.info("Case with id : {} exists", caseId); + + return !(caseInfo == null); + } + + public void startImport(final Range dateRange, final String configName) { + validateDateRange(dateRange); + + LOGGER.info("Initiating case import for historical cases from {} to {} [config: {}]", + dateRange.getMin(), dateRange.getMax(), configName); + + initForImport(dateRange, configName); + + importThread = new Thread(new Runnable() { + @Override + public void run() { + boolean hasMore = false; + int currentPage = 1; + + LOGGER.debug("Import thread started"); + + do { + try { + LOGGER.debug("Retrieving cases from page {}, with page size {}", + pageCount, fetchSize); + // fetching the cases + CasesInfo caseList = caseService.getCasesByCasesTimeWithMetadata(dateTimeToString(dateRange.getMin()), + dateTimeToString(dateRange.getMax()), fetchSize, currentPage, configName); + + LOGGER.debug("Retrieved a list of {} cases", caseList.getCaseInfoList().size()); + + // sending events for each case + importCaseList(caseList, configName); + + LOGGER.debug("Imported {} cases", caseList.getCaseInfoList().size()); + + // the first page is the last one + hasMore = currentPage < pageCount; + + // we decrement the page + if (hasMore) { + LOGGER.debug("Proceeding to the next batch of cases"); + currentPage++; + } + + } catch (RuntimeException e) { + LOGGER.error("Error while importing cases", e); + LOGGER.error("{} of {} cases imported.", importCount, totalCount); + handleImportError(e, configName); + } + } while (importInProgress && hasMore); + + LOGGER.info("Case import finished. {} of {} cases imported. ", importCount, totalCount); + + importInProgress = false; + } + }); + + LOGGER.debug("Starting import thread"); + + importThread.start(); + } + + @Override + public void stopImport() { + LOGGER.info("Stopping import"); + + // will break the loop + importInProgress = false; + // wait for the thread + if (importThread != null) { + try { + LOGGER.debug("Joining the import thread"); + importThread.join(); + } catch (InterruptedException e) { + throw new IllegalStateException("Interrupted while stopping case import", e); + } + } + + LOGGER.info("Import stopped"); + } + + @Override + public boolean isImportInProgress() { + return importInProgress; + } + + @Override + public CaseImportStatus importStatus() { + LOGGER.debug("Retrieving import status"); + + CaseImportStatus status = new CaseImportStatus(); + + status.setTotalCases(totalCount); + status.setCasesImported(importCount); + status.setLastImportDate(lastImportedDate); + status.setLastImportCaseId(lastImportedCaseId); + status.setImportInProgress(importInProgress); + + if (inError) { + status.setErrorMsg(errorMessage); + status.setError(true); + } + + return status; + } + + @Override + public void setFetchSize(int fetchSize) { + this.fetchSize = fetchSize; + } + + private void importCaseList(CasesInfo caseList, String configName) { + for (CaseInfo caseInfo : caseList.getCaseInfoList()) { + CaseEvent caseEvent = CaseEvent.fromCaseInfo(caseInfo, configName); + eventRelay.sendEventMessage(caseEvent.toMotechEventWithData()); + + lastImportedCaseId = caseInfo.getCaseId(); + lastImportedDate = caseInfo.getDateModified(); + importCount++; + + LOGGER.info("Imported case with ID: {}", caseInfo.getCaseId()); + } + } + + private void initForImport(Range dateRange, String configName) { + importInProgress = true; + importCount = 0; + lastImportedDate = null; + lastImportedCaseId = null; + totalCount = countForImport(dateRange, configName); + inError = false; + errorMessage = null; + // calculate the page number, since we are going backwards + pageCount = (int) Math.ceil((double) totalCount / fetchSize); + + LOGGER.debug("Initialized for import"); + } + + private void validateDateRange(Range dateRange) { + if (dateRange == null) { + throw new IllegalArgumentException("Date range cannot be null, provide an empty one for all results"); + } + + DateTime start = dateRange.getMin(); + DateTime end = dateRange.getMax(); + + if (start != null && end != null && end.isBefore(start)) { + throw new IllegalArgumentException( + String.format("Date range start must be before date range end. Got start - %s, end - %s", + start, end)); + } + } + + private String dateTimeToString(DateTime dateTime) { + if (dateTime == null) { + return null; + } else { + DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); + return formatter.print(dateTime); + } + } + + private void handleImportError(RuntimeException e, String configName) { + errorMessage = e.getMessage(); + inError = true; + + // stop import + importInProgress = false; + + FullCaseFailureEvent failureEvent = new FullCaseFailureEvent(configName, errorMessage); + eventRelay.sendEventMessage(failureEvent.toMotechEvent()); + + // Trigger a status message in the Admin UI + String msg = "Error while importing case: " + errorMessage; + FailedImportStatusMessageEvent statusMessageEvent = new FailedImportStatusMessageEvent(msg); + eventRelay.sendEventMessage(statusMessageEvent.toMotechEvent()); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporter.java b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporter.java index d19ef76a5..460cc783f 100644 --- a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporter.java +++ b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporter.java @@ -17,28 +17,52 @@ public interface CommcareFormImporter { /** * Counts how many forms match the provided criteria. A single request to the form list * API will be made underneath, and the returned total count will be returned by this method. - * @param dateRange the date range for the import + * + * @param dateRange the date range for the import * @param configName the name of the configuration to use, if null is provided the default configuration * will be used * @return the total number of forms matching the provided criteria * @throws IllegalArgumentException if the date range is null or invalid (start date after end date) - * @throws IllegalStateException if there is an already ongoing import in progress + * @throws IllegalStateException if there is an already ongoing import in progress */ int countForImport(Range dateRange, String configName); + /** + * Checks if a form exists with select id. A single request to the form list + * API will be made underneath, and a boolean value will be returned by this method. + * + * @param formId the id of the form to be checked + * @param configName the name of the configuration to use, if null is provided the default configuration + * will be used + * @return the boolean value if there exists a form with the provided id + */ + boolean checkFormIdForImport(String formId, String configName); + /** * Initiates asynchronous import for the provided criteria. Forms will be fetched from Commcare by doing HTTP * request to the form list API. The default fetch size per request is 100, but that can be controlled using the * {@link #setFetchSize(int)} method. The import will run in a separate thread. An event will be fired for each * successfully imported form. If an error occurs, the import will be stopped. - * @param dateRange the date range for the import + * + * @param dateRange the date range for the import * @param configName the name of the configuration to use, if null is provided the default configuration * will be used * @throws IllegalArgumentException if the date range is null or invalid (start date after end date) - * @throws IllegalStateException if there is an already ongoing import in progress + * @throws IllegalStateException if there is an already ongoing import in progress */ void startImport(final Range dateRange, final String configName); + /** + * Initiates asynchronous import for the provided criteria. Forms will be fetched from Commcare by doing HTTP + * request to the form list API. An event will be fired after a + * successfully imported form. If an error occurs, the import will be stopped. + * + * @param formId the id of form to be imported + * @param configName the name of the configuration to use, if null is provided the default configuration + * will be used. + */ + void startImportById(final String formId, final String configName); + /** * Stops the ongoing import. The effect is not guaranteed to be immediate. */ @@ -46,6 +70,7 @@ public interface CommcareFormImporter { /** * Checks whether there is an ongoing import in progress. + * * @return true if there is an ongoing import, false otherwise */ boolean isImportInProgress(); @@ -55,6 +80,7 @@ public interface CommcareFormImporter { * the last import. {@link FormImportStatus#isImportInProgress()} can be used to check if the import is ongoing, * {@link FormImportStatus#isError()} can be checked to see if the import failed. The received_on date for the * last successfully imported form can be retrieved using {@link FormImportStatus#getLastImportDate()}. + * * @return the status object for the current or last import */ FormImportStatus importStatus(); @@ -63,6 +89,7 @@ public interface CommcareFormImporter { * Sets the fetch size for the queries to the Commcare form list API. In other words, sets how many forms * will be retrieved per request to the API. The default is 100. Setting a too large number might cause memory * issues, setting a too low number might result in a large number of HTTP requests. + * * @param fetchSize the fetch size for requests */ void setFetchSize(int fetchSize); diff --git a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporterImpl.java b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporterImpl.java index 616d03144..58bb0b6fe 100644 --- a/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporterImpl.java +++ b/commcare/src/main/java/org/motechproject/commcare/pull/CommcareFormImporterImpl.java @@ -7,10 +7,11 @@ import org.motechproject.commcare.domain.CommcareFormList; import org.motechproject.commcare.events.FullFormEvent; import org.motechproject.commcare.events.FullFormFailureEvent; -import org.motechproject.commcare.events.MalformedFormStatusMessageEvent; +import org.motechproject.commcare.events.FailedImportStatusMessageEvent; import org.motechproject.commcare.request.FormListRequest; import org.motechproject.commcare.service.CommcareFormService; import org.motechproject.commons.api.Range; +import org.motechproject.event.MotechEvent; import org.motechproject.event.listener.EventRelay; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +32,7 @@ public class CommcareFormImporterImpl implements CommcareFormImporter { private int fetchSize = PAGE_SIZE_FOR_FETCH; private Thread importThread; - private boolean importInProgress = false; + private boolean importInProgress; private int importCount; private int totalCount; @@ -63,6 +64,20 @@ public int countForImport(Range dateRange, String configName) { return count; } + @Override + public boolean checkFormIdForImport(String formId, String configName) { + LOGGER.info("Checking form with id {} [config: {}]", formId, configName); + CommcareForm form = formService.retrieveForm(formId, configName); + if (form.getId() != null) { + LOGGER.info("Form with id {} exists", form.getId()); + return true; + } else { + LOGGER.info("Form with id {} doesnot exist", formId); + return false; + } + } + + @Override public void startImport(final Range dateRange, final String configName) { validateNoImportInProgress(); @@ -129,6 +144,22 @@ public void run() { importThread.start(); } + @Override + public void startImportById(final String formId, final String configName) { + LOGGER.debug("Initiating form import with form id {} [config: {}]", + formId, configName); + CommcareForm form = formService.retrieveForm(formId, configName); + form.getForm().addAttribute("app_id", form.getAppId()); + FullFormEvent formEvent = new FullFormEvent(form.getForm(), form.getReceivedOn(), form.getConfigName()); + eventRelay.sendEventMessage(formEvent.toMotechEvent()); + lastFormXMLNSToBeImported = formEvent.getAttributes().get("xmlns"); + lastImportedDate = form.getReceivedOn(); + lastImportedFormId = form.getId(); + totalCount = 1; + importCount = 1; + LOGGER.info("Imported form with id {}", formId); + } + @Override public void stopImport() { LOGGER.info("Stopping import"); @@ -196,11 +227,12 @@ private void initForImport(Range dateRange, String configName) { private void importFormList(CommcareFormList formList) { // iterate backwards for (CommcareForm form : Lists.reverse(formList.getObjects())) { + form.getForm().addAttribute("app_id", form.getAppId()); FullFormEvent formEvent = new FullFormEvent(form.getForm(), form.getReceivedOn(), form.getConfigName()); lastFormXMLNSToBeImported = formEvent.getAttributes().get("xmlns"); - - eventRelay.sendEventMessage(formEvent.toMotechEvent()); + MotechEvent motechEvent = formEvent.toMotechEvent(); + eventRelay.sendEventMessage(motechEvent); lastImportedDate = form.getReceivedOn(); lastImportedFormId = form.getId(); @@ -250,7 +282,7 @@ private void handleImportError(RuntimeException e, String configName) { // Trigger a status message in the Admin UI String msg = "Error while importing form: " + errorMessage; - MalformedFormStatusMessageEvent statusMessageEvent = new MalformedFormStatusMessageEvent(msg); + FailedImportStatusMessageEvent statusMessageEvent = new FailedImportStatusMessageEvent(msg); eventRelay.sendEventMessage(statusMessageEvent.toMotechEvent()); } } diff --git a/commcare/src/main/java/org/motechproject/commcare/request/json/CaseRequest.java b/commcare/src/main/java/org/motechproject/commcare/request/json/CaseRequest.java index ddaf58499..022c2a5c3 100644 --- a/commcare/src/main/java/org/motechproject/commcare/request/json/CaseRequest.java +++ b/commcare/src/main/java/org/motechproject/commcare/request/json/CaseRequest.java @@ -1,5 +1,7 @@ package org.motechproject.commcare.request.json; +import org.apache.http.client.utils.URIBuilder; + import java.util.ArrayList; import java.util.List; @@ -46,6 +48,32 @@ public String toQueryString() { return toQueryString(queryParams); } + public void addQueryParams(URIBuilder uriBuilder) { + if (userId != null) { + uriBuilder.addParameter("user_id", userId); + } + if (ownerId != null) { + uriBuilder.addParameter("owner_id", ownerId); + } + if (caseId != null) { + uriBuilder.addParameter("case_id", caseId); + } + if (type != null) { + uriBuilder.addParameter("type", type); + } + if (caseName != null) { + uriBuilder.addParameter("case_name", caseName); + } + if (dateModifiedStart != null) { + uriBuilder.addParameter("date_modified_start", dateModifiedStart); + } + if (dateModifiedEnd != null) { + uriBuilder.addParameter("date_modified_end", dateModifiedEnd); + } + + addOtherQueryParams(uriBuilder); + } + /** * Sets the ID of the user to {@code userId}. * diff --git a/commcare/src/main/java/org/motechproject/commcare/request/json/Request.java b/commcare/src/main/java/org/motechproject/commcare/request/json/Request.java index bb896d886..a3f0b7f85 100644 --- a/commcare/src/main/java/org/motechproject/commcare/request/json/Request.java +++ b/commcare/src/main/java/org/motechproject/commcare/request/json/Request.java @@ -1,6 +1,7 @@ package org.motechproject.commcare.request.json; import org.apache.commons.lang.StringUtils; +import org.apache.http.client.utils.URIBuilder; import java.util.List; @@ -88,4 +89,9 @@ public boolean equals(Object o) { public int hashCode() { return toQueryString().hashCode(); } + + public void addOtherQueryParams(URIBuilder uriBuilder) { + uriBuilder.addParameter("limit", String.valueOf(limit < 1 ? DEFAULT_LIMIT : limit)); + uriBuilder.addParameter("offset", String.valueOf(offset < 0 ? 0 : offset)); + } } diff --git a/commcare/src/main/java/org/motechproject/commcare/service/CommcareReportService.java b/commcare/src/main/java/org/motechproject/commcare/service/CommcareReportService.java new file mode 100644 index 000000000..a54ee38d6 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/service/CommcareReportService.java @@ -0,0 +1,49 @@ +package org.motechproject.commcare.service; + +import org.motechproject.commcare.domain.report.ReportDataInfo; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; + +/** + * Responsible for interacting with CommCareHQ's Report Metadata and Data API. + */ +public interface CommcareReportService { + + /** + * Query CommCareHQ for all reports. + * + * @param configName the name of the configuration used for connecting to CommcareHQ, null means default configuration + * @return {@link ReportsMetadataInfo} object that contains reports metadata and the list of {@link ReportsMetadataInfo} objects representing reports + * found on the given CommcareHQ configuration + */ + ReportsMetadataInfo getReportsList(String configName); + + /** + * Same as {@link #getReportsList(String)} but uses default Commcare configuration. + */ + ReportsMetadataInfo getReportsList(); + + /** + * Query CommCareHQ for a report by its report id. + * + * @param reportId the id of the report on CommCareHQ + * @param configName the name of the configuration used for connecting to CommcareHQ, null means default configuration + * @return the ReportDataInfo object representing the state of the report data or null if that report does not exist. + */ + ReportDataInfo getReportById(String reportId, String configName); + + /** + * Query CommCareHQ for a report by its report id and using filters declared in report. + * + * @param reportId the id of the report on CommCareHQ + * @param configName the name of the configuration used for connecting to CommcareHQ, null means default configuration + * @param filters the list of filters able to use in request + * @return the ReportDataInfo object representing the state of the report data or null if that report does not exist. + */ + ReportDataInfo getReportByIdWithFilters(String reportId, String configName, String filters); + + /** + * Same as {@link #getReportById(String, String) getReportById} but uses default Commcare configuration. + */ + ReportDataInfo getReportById(String reportId); + +} diff --git a/commcare/src/main/java/org/motechproject/commcare/service/CommcareSchemaService.java b/commcare/src/main/java/org/motechproject/commcare/service/CommcareSchemaService.java index 0eef006c8..02640d8eb 100644 --- a/commcare/src/main/java/org/motechproject/commcare/service/CommcareSchemaService.java +++ b/commcare/src/main/java/org/motechproject/commcare/service/CommcareSchemaService.java @@ -2,6 +2,7 @@ import org.motechproject.commcare.domain.CommcareApplicationJson; import org.motechproject.commcare.domain.FormSchemaJson; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; import org.motechproject.commcare.tasks.builder.model.CaseTypeWithApplicationName; import org.motechproject.commcare.tasks.builder.model.FormWithApplicationName; @@ -57,4 +58,11 @@ public interface CommcareSchemaService { * @return Set of Forms with display names. */ Set getFormsWithApplicationName(String configName); + + /** + * Retrieves reports metadata by configuration name + * + * @return the list of matching reports metadata + */ + List getReportsMetadata(String configName); } diff --git a/commcare/src/main/java/org/motechproject/commcare/service/ReportActionService.java b/commcare/src/main/java/org/motechproject/commcare/service/ReportActionService.java new file mode 100644 index 000000000..59fad0393 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/service/ReportActionService.java @@ -0,0 +1,19 @@ +package org.motechproject.commcare.service; + +/** + * This service is responsible for handling Commcare report actions in tasks. + */ +public interface ReportActionService { + + /** + * This task action allows to query the Commcare Report UCR API. + * When the report is queried, is parsed by MOTECH and a Received Report + * event is raised. + * + * @param configName the name of the configuration used for connecting to CommcareHQ + * @param reportId the Id of report + * @param reportName the name of report + * @param urlParsedFilters parsed filter fields used in requests url + */ + void queryReport (String configName, String reportId, String reportName, String urlParsedFilters); +} diff --git a/commcare/src/main/java/org/motechproject/commcare/service/ReportsMetadataDataService.java b/commcare/src/main/java/org/motechproject/commcare/service/ReportsMetadataDataService.java new file mode 100644 index 000000000..2a5125d29 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/service/ReportsMetadataDataService.java @@ -0,0 +1,25 @@ +package org.motechproject.commcare.service; + +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.mds.annotations.Lookup; +import org.motechproject.mds.annotations.LookupField; +import org.motechproject.mds.service.MotechDataService; + +import java.util.List; + +/** + * Data service for the {@link ReportsMetadataInfo} class. Provides methods for managing instances of said class. + */ +public interface ReportsMetadataDataService extends MotechDataService { + + /** + * Returns a list of the reports that originate from the configuration with the given + * {@code configurationName}. + * + * @param configurationName the name of the configuration + * @return the list of matching reports + */ + @Lookup(name = "By Source configuration") + List bySourceConfiguration(@LookupField(name = "configName") String configurationName); + +} diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareAppStructureServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareAppStructureServiceImpl.java index 8e6e6a56b..4bbe61db3 100644 --- a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareAppStructureServiceImpl.java +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareAppStructureServiceImpl.java @@ -83,8 +83,10 @@ private AppStructureResponseJson parseApplicationsFromResponse(String response, } private void setDomain(AppStructureResponseJson responseJson, String configName) { - for (CommcareApplicationJson application : responseJson.getApplications()) { - application.setConfigName(configName); + if (responseJson != null) { + for (CommcareApplicationJson application : responseJson.getApplications()) { + application.setConfigName(configName); + } } } } diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareCaseServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareCaseServiceImpl.java index a12f8e660..553c6a084 100644 --- a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareCaseServiceImpl.java +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareCaseServiceImpl.java @@ -305,6 +305,7 @@ private CaseInfo populateCaseInfo(CaseJson caseResponse, String configName) { caseInfo.setCaseId(caseResponse.getCaseId()); caseInfo.setUserId(caseResponse.getUserId()); caseInfo.setConfigName(configName); + caseInfo.setDateModified(caseResponse.getDateModified()); return caseInfo; } diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormServiceImpl.java index ca2849b03..172d44e9f 100644 --- a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormServiceImpl.java +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormServiceImpl.java @@ -36,11 +36,14 @@ public CommcareFormServiceImpl(CommCareAPIHttpClient commcareHttpClient, Commcar @Override public CommcareForm retrieveForm(String id, String configName) { String returnJson = commcareHttpClient.formRequest(configService.getByName(configName).getAccountConfig(), id); - - CommcareForm form = FormAdapter.readJson(returnJson); - form.setConfigName(configName); - - return form; + CommcareForm form = new CommcareForm(); + if (("").equals(returnJson)){ + return form; + } else { + form = FormAdapter.readJson(returnJson); + form.setConfigName(configName); + return form; + } } @Override diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormsEventParser.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormsEventParser.java index 0489a9396..cb64bcad4 100644 --- a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormsEventParser.java +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareFormsEventParser.java @@ -4,6 +4,8 @@ import com.google.common.collect.Multimap; import org.apache.commons.lang.StringUtils; import org.motechproject.commons.api.TasksEventParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -32,6 +34,7 @@ public class CommcareFormsEventParser implements TasksEventParser { public static final String PARSER_NAME = "CommcareForms"; private static final String ID = "id"; + private static final Logger LOGGER = LoggerFactory.getLogger(CommcareFormsEventParser.class); @Override public Map parseEventParameters(String subject, Map entryParameters) { @@ -54,7 +57,13 @@ public String parseEventSubject(String eventSubject, Map eventPa if (eventSubject.equals(FORMS_EVENT)) { String xmlns = (String) ((Map) eventParameters.get(ATTRIBUTES)).get("xmlns"); - return eventSubject.concat(".").concat(configName).concat(".").concat(xmlns); + String appId = (String) ((Map) eventParameters.get(ATTRIBUTES)).get("app_id"); + + if (appId == null) { + appId = ""; + LOGGER.warn("AppId for form is null. XMLNS: {}", xmlns); + } + return eventSubject.concat(".").concat(configName).concat(".").concat(xmlns).concat(appId); } return eventSubject.concat(".").concat(configName); diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareReportServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareReportServiceImpl.java new file mode 100644 index 000000000..e5002303a --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareReportServiceImpl.java @@ -0,0 +1,141 @@ +package org.motechproject.commcare.service.impl; + +import com.google.common.reflect.TypeToken; +import org.motechproject.commcare.client.CommCareAPIHttpClient; +import org.motechproject.commcare.domain.CommcareMetadataInfo; +import org.motechproject.commcare.domain.CommcareMetadataJson; +import org.motechproject.commcare.domain.report.ReportMetadataInfo; +import org.motechproject.commcare.domain.report.ReportDataInfo; +import org.motechproject.commcare.domain.report.ReportDataResponseJson; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.commcare.domain.report.ReportMetadataJson; +import org.motechproject.commcare.domain.report.ReportsMetadataResponseJson; +import org.motechproject.commcare.domain.report.constants.ColumnType; +import org.motechproject.commcare.domain.report.constants.FilterDataType; +import org.motechproject.commcare.domain.report.constants.FilterType; +import org.motechproject.commcare.service.CommcareConfigService; +import org.motechproject.commcare.service.CommcareReportService; +import org.motechproject.commons.api.json.MotechJsonReader; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.HashMap; + +/** + * A {@link CommcareReportService} that is responsible for interacting with CommCareHQ's Report Metadata and Data API. + */ +@Service +public class CommcareReportServiceImpl implements CommcareReportService { + + private CommCareAPIHttpClient commcareHttpClient; + private CommcareConfigService configService; + private MotechJsonReader motechJsonReader; + + @Autowired + public CommcareReportServiceImpl(CommCareAPIHttpClient commcareHttpClient, CommcareConfigService configService) { + this.commcareHttpClient = commcareHttpClient; + this.configService = configService; + this.motechJsonReader = new MotechJsonReader(); + } + + @Override + public ReportsMetadataInfo getReportsList(String configName) { + String response = commcareHttpClient.reportsListMetadataRequest(configService.getByName(configName).getAccountConfig()); + + ReportsMetadataResponseJson reportsMetadataResponseJson = parseReportsFromResponse(response); + + return new ReportsMetadataInfo(generateReportsFromReportsResponse(reportsMetadataResponseJson.getReports()), populateReportsMetadata(reportsMetadataResponseJson.getMetadata())); + } + + @Override + public ReportsMetadataInfo getReportsList() { + return getReportsList(null); + } + + @Override + public ReportDataInfo getReportById(String reportId, String configName) { + String response = commcareHttpClient.singleReportDataRequest(configService.getByName(configName).getAccountConfig(), + reportId); + + ReportDataResponseJson reportResponse = parseSingleReportFromResponse(response); + + return generateReportFromReportResponse(reportResponse); + } + + @Override + public ReportDataInfo getReportByIdWithFilters (String reportId, String configName, String filters) { + String response = commcareHttpClient.singleReportDataRequestWithFilters(configService.getByName(configName).getAccountConfig(), + reportId, filters); + ReportDataResponseJson reportResponse = parseSingleReportFromResponse(response); + + return generateReportFromReportResponse(reportResponse); + } + + @Override + public ReportDataInfo getReportById(String reportId) { + return getReportById(reportId, null); + } + + private ReportsMetadataResponseJson parseReportsFromResponse(String response) { + Type reportsResponseType = new TypeToken() { } .getType(); + Map adapters = new HashMap<>(); + adapters.put(ColumnType.class, new ColumnType.ColumnTypeDeserializer()); + adapters.put(FilterType.class, new FilterType.FilterTypeDeserializer()); + adapters.put(FilterDataType.class, new FilterDataType.FilterDataTypeDeserializer()); + return (ReportsMetadataResponseJson) motechJsonReader.readFromString(response, reportsResponseType, adapters); + } + + private ReportDataResponseJson parseSingleReportFromResponse(String response) { + Type reportResponseType = new TypeToken() { } .getType(); + return (ReportDataResponseJson) motechJsonReader.readFromString(response, reportResponseType); + } + + private ReportDataInfo generateReportFromReportResponse(ReportDataResponseJson reportResponse) { + return populateReportDataInfo(reportResponse); + } + + private List generateReportsFromReportsResponse(List reportResponses) { + List reportsInfoList = Collections.emptyList(); + + if (reportResponses != null) { + reportsInfoList = new ArrayList<>(); + for (ReportMetadataJson reportResponse : reportResponses) { + reportsInfoList.add(populateReportMetadataInfo(reportResponse)); + } + } + + return reportsInfoList; + } + + private ReportMetadataInfo populateReportMetadataInfo(ReportMetadataJson reportResponse) { + ReportMetadataInfo reportMetadataInfo = null; + + if (reportResponse != null) { + reportMetadataInfo = new ReportMetadataInfo(reportResponse.getId(), reportResponse.getTitle(), + reportResponse.getColumns(), reportResponse.getFilters()); + } + + return reportMetadataInfo; + } + + private ReportDataInfo populateReportDataInfo(ReportDataResponseJson reportResponse) { + ReportDataInfo reportDataInfo = null; + + if (reportResponse != null) { + reportDataInfo = new ReportDataInfo(reportResponse.getColumns(), reportResponse.getData(), + reportResponse.getNextPage(), reportResponse.getTotalRecords()); + } + + return reportDataInfo; + } + + private CommcareMetadataInfo populateReportsMetadata(CommcareMetadataJson metadataJson) { + return new CommcareMetadataInfo(metadataJson.getLimit(), metadataJson.getNextPageQueryString(), + metadataJson.getOffset(), metadataJson.getPreviousPageQueryString(), metadataJson.getTotalCount()); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareSchemaServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareSchemaServiceImpl.java index 0bd592b81..416077b5e 100644 --- a/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareSchemaServiceImpl.java +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/CommcareSchemaServiceImpl.java @@ -3,8 +3,10 @@ import org.motechproject.commcare.domain.CommcareApplicationJson; import org.motechproject.commcare.domain.CommcareModuleJson; import org.motechproject.commcare.domain.FormSchemaJson; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; import org.motechproject.commcare.service.CommcareApplicationDataService; import org.motechproject.commcare.service.CommcareSchemaService; +import org.motechproject.commcare.service.ReportsMetadataDataService; import org.motechproject.commcare.tasks.builder.model.CaseTypeWithApplicationName; import org.motechproject.commcare.tasks.builder.model.FormWithApplicationName; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +29,8 @@ public class CommcareSchemaServiceImpl implements CommcareSchemaService { private CommcareApplicationDataService commcareApplicationDataService; + private ReportsMetadataDataService reportsMetadataDataService; + @Override @Transactional public List getAllFormSchemas(String configName) { @@ -106,8 +110,19 @@ public List retrieveApplications(String configName) { return commcareApplicationDataService.bySourceConfiguration(configName); } + @Override + @Transactional + public List getReportsMetadata (String configName) { + return reportsMetadataDataService.bySourceConfiguration(configName); + } + @Autowired public void setCommcareApplicationDataService(CommcareApplicationDataService commcareApplicationDataService) { this.commcareApplicationDataService = commcareApplicationDataService; } + + @Autowired + public void setReportsMetadataDataService (ReportsMetadataDataService reportsMetadataDataService) { + this.reportsMetadataDataService = reportsMetadataDataService; + } } diff --git a/commcare/src/main/java/org/motechproject/commcare/service/impl/ReportActionServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/service/impl/ReportActionServiceImpl.java new file mode 100644 index 000000000..6379d4cdf --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/service/impl/ReportActionServiceImpl.java @@ -0,0 +1,44 @@ +package org.motechproject.commcare.service.impl; + +import org.motechproject.commcare.events.constants.EventDataKeys; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.CommcareReportService; +import org.motechproject.commcare.service.ReportActionService; +import org.motechproject.event.MotechEvent; +import org.motechproject.event.listener.EventRelay; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service("reportActionService") +public class ReportActionServiceImpl implements ReportActionService { + + private CommcareReportService commcareReportService; + private EventRelay eventRelay; + + @Autowired + public ReportActionServiceImpl (CommcareReportService commcareReportService, EventRelay eventRelay) { + this.commcareReportService = commcareReportService; + this.eventRelay = eventRelay; + } + + @Override + public void queryReport (String configName, String reportId, String reportName, String urlParsedFilters) { + + commcareReportService.getReportByIdWithFilters(reportId, configName, urlParsedFilters); + + eventRelay.sendEventMessage(new MotechEvent(EventSubjects.RECEIVED_REPORT + "." + configName + "." + reportId, + prepareReceiveReportParameters(reportId, reportName))); + } + + private Map prepareReceiveReportParameters (String reportId, String reportName) { + Map parameters = new HashMap<>(); + + parameters.put(EventDataKeys.REPORT_ID, reportId); + parameters.put(EventDataKeys.REPORT_NAME, reportName); + + return parameters; + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/CommcareActionProxyService.java b/commcare/src/main/java/org/motechproject/commcare/tasks/CommcareActionProxyService.java index a56f8397d..41758ae6c 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/CommcareActionProxyService.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/CommcareActionProxyService.java @@ -30,4 +30,9 @@ public interface CommcareActionProxyService { * See {@link org.motechproject.commcare.service.QueryStockLedgerActionService#queryStockLedger(String, String, String, DateTime, DateTime, Map) queryStockLedger} */ void queryStockLedger(String configName, String caseId, String sectionId, DateTime startDate, DateTime endDate, Map extraData); + + /** + * See {@link org.motechproject.commcare.service.ReportActionService#queryReport(String, String, String, String)} + */ + void queryReport (String configName, String reportId, String reportName, String urlParsedFilters); } diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseActionBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseActionBuilder.java index 41f6c04c4..810506614 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseActionBuilder.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseActionBuilder.java @@ -123,7 +123,7 @@ public List buildActions() { .setDisplayName(DisplayNames.OWNER_ID) .setKey(EventDataKeys.OWNER_ID) .setType(UNICODE.getValue()) - .setRequired(true) + .setRequired(false) .setOrder(order++); parameters.add(builder.createActionParameterRequest()); diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilder.java index fa664530b..8de696ada 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilder.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilder.java @@ -7,6 +7,7 @@ import org.motechproject.commcare.service.CommcareSchemaService; import org.motechproject.tasks.contract.EventParameterRequest; import org.motechproject.tasks.contract.TriggerEventRequest; +import org.motechproject.tasks.domain.enums.ParameterType; import java.util.ArrayList; import java.util.HashSet; @@ -73,7 +74,7 @@ public List buildTriggers() { if (config.isEventStrategyFull()) { for (String caseProperty : module.getCaseProperties()) { - parameterRequests.add(new EventParameterRequest(caseProperty, caseProperty)); + parameterRequests.add(new EventParameterRequest(caseProperty, caseProperty, ParameterType.DATE.getValue())); } } @@ -99,7 +100,7 @@ private void addPartialCaseFields(List parameters) { parameters.add(new EventParameterRequest("commcare.userId", USER_ID)); parameters.add(new EventParameterRequest("commcare.apiKey", API_KEY)); parameters.add(new EventParameterRequest("commcare.caseAction", CASE_ACTION)); - parameters.add(new EventParameterRequest("commcare.dateModified", DATE_MODIFIED)); + parameters.add(new EventParameterRequest("commcare.dateModified", DATE_MODIFIED, ParameterType.DATE.getValue())); parameters.add(new EventParameterRequest("commcare.caseName", CASE_NAME)); parameters.add(new EventParameterRequest("commcare.ownerId", OWNER_ID)); } diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ChannelRequestBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ChannelRequestBuilder.java index c63226424..5386fd4e3 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ChannelRequestBuilder.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ChannelRequestBuilder.java @@ -49,6 +49,7 @@ public ChannelRequest buildChannelRequest() { FormTriggerBuilder formTriggerBuilder = new FormTriggerBuilder(schemaService, configService); CaseTriggerBuilder caseTriggerBuilder = new CaseTriggerBuilder(schemaService, configService); + ReportTriggerBuilder reportTriggerBuilder = new ReportTriggerBuilder(schemaService, configService); CommonTriggerBuilder commonTriggerBuilder = new CommonTriggerBuilder(configService); // Actions @@ -56,9 +57,11 @@ public ChannelRequest buildChannelRequest() { QueryStockLedgerActionBuilder queryStockLedgerActionBuilder = new QueryStockLedgerActionBuilder(configService); CaseActionBuilder caseActionBuilder = new CaseActionBuilder(configService); FormActionBuilder formActionBuilder = new FormActionBuilder(schemaService, configService); + ReportActionBuilder reportActionBuilder = new ReportActionBuilder(schemaService, configService); List triggers = formTriggerBuilder.buildTriggers(); triggers.addAll(caseTriggerBuilder.buildTriggers()); + triggers.addAll(reportTriggerBuilder.buildTriggers()); triggers.addAll(commonTriggerBuilder.buildTriggers()); List actions = new ArrayList<>(); @@ -66,6 +69,7 @@ public ChannelRequest buildChannelRequest() { actions.addAll(queryStockLedgerActionBuilder.buildActions()); actions.addAll(caseActionBuilder.buildActions()); actions.addAll(formActionBuilder.buildActions()); + actions.addAll(reportActionBuilder.buildActions()); return new ChannelRequest(DISPLAY_NAME, bundleContext.getBundle().getSymbolicName(), bundleContext.getBundle().getVersion().toString(), null, triggers, actions); diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CommonTriggerBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CommonTriggerBuilder.java index 5ae7ff120..83f448911 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CommonTriggerBuilder.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/CommonTriggerBuilder.java @@ -5,6 +5,7 @@ import org.motechproject.commcare.service.CommcareConfigService; import org.motechproject.tasks.contract.EventParameterRequest; import org.motechproject.tasks.contract.TriggerEventRequest; +import org.motechproject.tasks.domain.enums.ParameterType; import java.util.ArrayList; import java.util.List; @@ -73,7 +74,7 @@ private List buildStockTransactionTriggers() { parameterRequests.add(new EventParameterRequest(DisplayNames.QUANTITY, QUANTITY)); parameterRequests.add(new EventParameterRequest(DisplayNames.SECTION_ID, SECTION_ID)); parameterRequests.add(new EventParameterRequest(DisplayNames.STOCK_ON_HAND, STOCK_ON_HAND)); - parameterRequests.add(new EventParameterRequest(DisplayNames.TRANSACTION_DATE, TRANSACTION_DATE)); + parameterRequests.add(new EventParameterRequest(DisplayNames.TRANSACTION_DATE, TRANSACTION_DATE, ParameterType.DATE.getValue())); parameterRequests.add(new EventParameterRequest(DisplayNames.TYPE, TYPE)); String displayName = DisplayNameHelper.buildDisplayName(DisplayNames.RETRIEVED_STOCK_TRANSACTION, @@ -133,7 +134,7 @@ private List buildFormStubTrigger() { for (Config config : configService.getConfigs().getConfigs()) { List parameterRequests = new ArrayList<>(); - parameterRequests.add(new EventParameterRequest("commcare.receivedOn", RECEIVED_ON)); + parameterRequests.add(new EventParameterRequest("commcare.receivedOn", RECEIVED_ON, ParameterType.DATE.getValue())); parameterRequests.add(new EventParameterRequest("commcare.formId", FORM_ID)); parameterRequests.add(new EventParameterRequest("commcare.caseIds", CASE_IDS, "LIST")); parameterRequests.add(new EventParameterRequest(CONFIG_NAME_KEY, CONFIG_NAME)); diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormActionBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormActionBuilder.java index d64c17245..6bef8e020 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormActionBuilder.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormActionBuilder.java @@ -61,9 +61,10 @@ private List buildActionsForConfig(Config config) { String displayName = DisplayNameHelper.buildDisplayName(DisplayNames.SUBMIT_FORM, form.getFormName(), application.getApplicationName(), config.getName()); + String appId = (application.getCommcareAppId() == null) ? "" : application.getCommcareAppId(); ActionEventRequestBuilder actionBuilder = new ActionEventRequestBuilder() .setDisplayName(displayName) - .setSubject(EventSubjects.SUBMIT_FORM + "." + form.getXmlns() + "." + config.getName()) + .setSubject(EventSubjects.SUBMIT_FORM + "." + form.getXmlns() + appId + "." + config.getName()) .setActionParameters(parameters); actions.add(actionBuilder.createActionEventRequest()); } @@ -76,9 +77,10 @@ private List buildActionsForConfig(Config config) { private SortedSet buildActionParameters(FormSchemaJson form) { SortedSet parameters = new TreeSet<>(); int order = 0; + ActionParameterRequestBuilder builder; for (FormSchemaQuestionJson question : form.getQuestions()) { - ActionParameterRequestBuilder builder = new ActionParameterRequestBuilder(); + builder = new ActionParameterRequestBuilder(); String displayName = StringUtils.isBlank(question.getQuestionLabel()) ? question.getQuestionValue() : question.getQuestionLabel(); @@ -100,9 +102,21 @@ private SortedSet buildActionParameters(FormSchemaJson f parameters.add(builder.createActionParameterRequest()); } + parameters.add(addXmlnsParameter(form, order)); return parameters; } + private ActionParameterRequest addXmlnsParameter(FormSchemaJson form, int order) { + ActionParameterRequestBuilder builder = new ActionParameterRequestBuilder(); + builder.setValue(form.getXmlns()) + .setDisplayName("xmlns") + .setKey("xmlns") + .setOrder(order) + .setType(ParameterType.UNICODE.getValue()) + .setHidden(true); + return builder.createActionParameterRequest(); + } + private SortedSet convertCommcareoptionsToTaskActionOptions(List options) { SortedSet availableOptions = new TreeSet<>(); diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilder.java index f042f791a..06b140f98 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilder.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilder.java @@ -9,6 +9,7 @@ import org.motechproject.commcare.service.CommcareSchemaService; import org.motechproject.tasks.contract.EventParameterRequest; import org.motechproject.tasks.contract.TriggerEventRequest; +import org.motechproject.tasks.domain.enums.ParameterType; import java.util.ArrayList; import java.util.List; @@ -99,8 +100,8 @@ private TriggerEventRequest buildTriggerForForm(Config config, CommcareApplicati String formName = form.getFormName(); String displayName = DisplayNameHelper.buildDisplayName(RECEIVED_FORM, formName, applicationName, config.getName()); - - return new TriggerEventRequest(displayName, FORMS_EVENT + "." + config.getName() + "." + form.getXmlns(), + String appId = (application.getCommcareAppId() != null) ? application.getCommcareAppId() : ""; + return new TriggerEventRequest(displayName, FORMS_EVENT + "." + config.getName() + "." + form.getXmlns() + appId, null, buildTriggerParameters(form), FORMS_EVENT); } @@ -110,7 +111,7 @@ private List buildTriggerParameters(FormSchemaJson form) addCaseFields(parameters); for (FormSchemaQuestionJson question : form.getQuestions()) { - parameters.add(new EventParameterRequest(question.getQuestionValue(), question.getQuestionValue())); + parameters.add(new EventParameterRequest(question.getQuestionValue(), question.getQuestionValue(), ParameterType.DATE.getValue())); } return parameters; @@ -128,8 +129,8 @@ private void addMetadataFields(List parameters) { parameters.add(new EventParameterRequest("commcare.form.field.deviceId", META_DEVICE_ID)); parameters.add(new EventParameterRequest("commcare.form.field.username", META_USERNAME)); parameters.add(new EventParameterRequest("commcare.form.field.appVersion", META_APP_VERSION)); - parameters.add(new EventParameterRequest("commcare.form.field.timeStart", META_TIME_START)); - parameters.add(new EventParameterRequest("commcare.form.field.timeEnd", META_TIME_END)); + parameters.add(new EventParameterRequest("commcare.form.field.timeStart", META_TIME_START, ParameterType.DATE.getValue())); + parameters.add(new EventParameterRequest("commcare.form.field.timeEnd", META_TIME_END, ParameterType.DATE.getValue())); parameters.add(new EventParameterRequest("commcare.field.configName", CONFIG_NAME)); } } diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ReportActionBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ReportActionBuilder.java new file mode 100644 index 000000000..12edd3af9 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ReportActionBuilder.java @@ -0,0 +1,210 @@ +package org.motechproject.commcare.tasks.builder; + +import org.motechproject.commcare.config.Config; +import org.motechproject.commcare.domain.report.ReportMetadataFilter; +import org.motechproject.commcare.domain.report.ReportMetadataInfo; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.commcare.domain.report.constants.FilterDataType; +import org.motechproject.commcare.domain.report.constants.FilterType; +import org.motechproject.commcare.events.constants.DisplayNames; +import org.motechproject.commcare.events.constants.EventDataKeys; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.CommcareConfigService; +import org.motechproject.commcare.service.CommcareSchemaService; +import org.motechproject.tasks.contract.ActionEventRequest; +import org.motechproject.tasks.contract.ActionParameterRequest; +import org.motechproject.tasks.contract.builder.ActionEventRequestBuilder; +import org.motechproject.tasks.contract.builder.ActionParameterRequestBuilder; +import org.motechproject.tasks.domain.enums.ParameterType; + +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + +/** + * Class responsible for building the Task module actions, related to sending the + * forms via submission API. The built list of {@link ActionEventRequest}s instances can + * be passed to the Task module to register channel actions. + */ +public class ReportActionBuilder implements ActionBuilder { + + private CommcareSchemaService schemaService; + private CommcareConfigService configService; + + public ReportActionBuilder (CommcareSchemaService schemaService, CommcareConfigService configService) { + this.schemaService = schemaService; + this.configService = configService; + } + + @Override + public List buildActions () { + List actions = new ArrayList<>(); + + for (Config config : configService.getConfigs().getConfigs()) { + List builtActions = buildActionsForConfigs(config); + actions.addAll(builtActions); + } + + return actions; + } + + private List buildActionsForConfigs (Config config) { + List actions = new ArrayList<>(); + + for (ReportsMetadataInfo reportsMetadataInfo : schemaService.getReportsMetadata(config.getName())) { + for (ReportMetadataInfo reportMetadata : reportsMetadataInfo.getReportMetadataInfoList()) { + SortedSet parameters = buildActionParameters(reportMetadata); + + parameters.addAll(prepareCommonParameters(parameters.size(), reportMetadata.getId(), reportMetadata.getTitle())); + + String displayName = DisplayNameHelper.buildDisplayName(DisplayNames.CREATE_REPORT, reportMetadata.getTitle(), + config.getName()); + ActionEventRequestBuilder actionBuilder = new ActionEventRequestBuilder() + .setDisplayName(displayName) + .setSubject(EventSubjects.REPORT_EVENT + "." + reportMetadata.getTitle() + "." + config.getName()) + .setActionParameters(parameters); + + actions.add(actionBuilder.createActionEventRequest()); + } + } + + return actions; + } + + private SortedSet buildActionParameters (ReportMetadataInfo reportMetadata) { + SortedSet parameters = new TreeSet<>(); + int order = 0; + + for (ReportMetadataFilter filter : reportMetadata.getFilters()) { + if (filter.getDatatype().equals(FilterDataType.DECIMAL) || filter.getDatatype().equals(FilterDataType.INTEGER)) { + parameters.addAll(prepareNumericParameters(filter, order)); + order = parameters.size(); + } else if (filter.getType().equals(FilterType.DATE)) { + parameters.addAll(prepareDateParameters(filter, order)); + order = parameters.size(); + } else { + parameters.addAll(prepareUnicodeParameters(filter, order)); + order = parameters.size(); + } + } + + return parameters; + } + + private SortedSet prepareNumericParameters (ReportMetadataFilter filter, int startOrder) { + SortedSet parameters = new TreeSet<>(); + int order = startOrder; + + ActionParameterRequestBuilder builder = new ActionParameterRequestBuilder() + .setDisplayName(filter.getSlug()) + .setKey(filter.getSlug()) + .setType(ParameterType.SELECT.getValue()) + .setOptions(createNumericFilterOperators()) + .setOrder(order++); + + parameters.add(builder.createActionParameterRequest()); + + builder = new ActionParameterRequestBuilder() + .setDisplayName(filter.getSlug() + " " + EventDataKeys.VALUE) + .setKey(filter.getSlug() + "." + EventDataKeys.VALUE) + .setType(ParameterType.UNICODE.getValue()) + .setOrder(order++); + + parameters.add(builder.createActionParameterRequest()); + + parameters.add(prepareFilterTypeParameter(filter, FilterDataType.DECIMAL.toString(), order++)); + + return parameters; + } + + private SortedSet prepareDateParameters (ReportMetadataFilter filter, int startOrder) { + SortedSet parameters = new TreeSet<>(); + int order = startOrder; + + ActionParameterRequestBuilder builder = new ActionParameterRequestBuilder() + .setDisplayName(filter.getSlug()) + .setKey(filter.getSlug()) + .setType(ParameterType.DATE.getValue()) + .setOrder(order++); + + parameters.add(builder.createActionParameterRequest()); + + builder = new ActionParameterRequestBuilder() + .setDisplayName(DisplayNames.END_DATE) + .setKey(filter.getSlug() + "." + DisplayNames.END_DATE) + .setType(ParameterType.DATE.getValue()) + .setOrder(order++); + + parameters.add(builder.createActionParameterRequest()); + + parameters.add(prepareFilterTypeParameter(filter, FilterType.DATE.toString(), order++)); + + return parameters; + } + + private SortedSet prepareUnicodeParameters (ReportMetadataFilter filter, int startOrder) { + SortedSet parameters = new TreeSet<>(); + int order = startOrder; + + ActionParameterRequestBuilder builder = new ActionParameterRequestBuilder() + .setDisplayName(filter.getSlug()) + .setKey(filter.getSlug()) + .setType(ParameterType.UNICODE.getValue()) + .setOrder(order++); + + parameters.add(builder.createActionParameterRequest()); + + parameters.add(prepareFilterTypeParameter(filter, FilterType.CHOICE_LIST.toString(), order++)); + + return parameters; + } + + private ActionParameterRequest prepareFilterTypeParameter (ReportMetadataFilter filter, String type, int order) { + return new ActionParameterRequestBuilder() + .setDisplayName(filter.getSlug() + "." + EventDataKeys.TYPE) + .setKey(filter.getSlug() + "." + EventDataKeys.TYPE) + .setValue(type) + .setHidden(true) + .setOrder(order) + .createActionParameterRequest(); + } + + private SortedSet prepareCommonParameters (int startOrder, String reportId, String reportName) { + SortedSet parameters = new TreeSet<>(); + int order = startOrder; + + ActionParameterRequestBuilder builder = new ActionParameterRequestBuilder() + .setDisplayName(EventDataKeys.REPORT_ID) + .setKey(EventDataKeys.REPORT_ID) + .setValue(reportId) + .setHidden(true) + .setOrder(order++); + + parameters.add(builder.createActionParameterRequest()); + + builder = new ActionParameterRequestBuilder() + .setDisplayName(EventDataKeys.REPORT_NAME) + .setKey(EventDataKeys.REPORT_NAME) + .setValue(reportName) + .setHidden(true) + .setOrder(order); + + parameters.add(builder.createActionParameterRequest()); + + return parameters; + } + + private SortedSet createNumericFilterOperators () { + SortedSet availableOperators = new TreeSet<>(); + + availableOperators.add("="); + availableOperators.add("!="); + availableOperators.add("<"); + availableOperators.add("<="); + availableOperators.add(">"); + availableOperators.add(">="); + + return availableOperators; + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ReportTriggerBuilder.java b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ReportTriggerBuilder.java new file mode 100644 index 000000000..0823d7285 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/builder/ReportTriggerBuilder.java @@ -0,0 +1,80 @@ +package org.motechproject.commcare.tasks.builder; + +import org.motechproject.commcare.config.Config; +import org.motechproject.commcare.domain.report.ReportMetadataColumn; +import org.motechproject.commcare.domain.report.ReportMetadataInfo; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.CommcareConfigService; +import org.motechproject.commcare.service.CommcareSchemaService; +import org.motechproject.tasks.contract.EventParameterRequest; +import org.motechproject.tasks.contract.TriggerEventRequest; + +import java.util.ArrayList; +import java.util.List; + +import static org.motechproject.commcare.events.constants.EventDataKeys.CONFIG_NAME; + +/** + * The ReportTriggerBuilder class builds report triggers for each report + * present in MOTECH database. Each trigger has got its own attributes, depending on + * the case properties of each type. Some fields are common for all reports. + */ +public class ReportTriggerBuilder implements TriggerBuilder { + + private CommcareSchemaService schemaService; + private CommcareConfigService configService; + + private static final String RECEIVED_CASE = "Received Report"; + private static final String COLUMN_NAME_SUFFIX = " Column Name"; + + /** + * Creates an instance of the {@link ReportTriggerBuilder} class. It will use the given {@code schemaService} and + * {@code configService} for creating report triggers. + * + * @param schemaService the schema service + * @param configService the configuration service + */ + public ReportTriggerBuilder (CommcareSchemaService schemaService, CommcareConfigService configService) { + this.schemaService = schemaService; + this.configService = configService; + } + + @Override + public List buildTriggers () { + List triggers = new ArrayList<>(); + + for (Config config : configService.getConfigs().getConfigs()) { + triggers.addAll(buildTriggersForConfig(config)); + } + + return triggers; + } + + private List buildTriggersForConfig (Config config) { + List triggers = new ArrayList<>(); + + for (ReportsMetadataInfo reportMetadataInfo : schemaService.getReportsMetadata(config.getName())) { + for (ReportMetadataInfo reportMetadata : reportMetadataInfo.getReportMetadataInfoList()) { + String displayName = DisplayNameHelper.buildDisplayName(RECEIVED_CASE, reportMetadata.getTitle(), + config.getName()); + triggers.add(new TriggerEventRequest(displayName, EventSubjects.RECEIVED_REPORT + "." + config.getName() + "." + reportMetadata.getId(), + null, createTriggerParameters(reportMetadata))); + } + } + + return triggers; + } + + private List createTriggerParameters (ReportMetadataInfo reportMetadata) { + List parameters = new ArrayList<>(); + + parameters.add(new EventParameterRequest("commcare.field.configName", CONFIG_NAME)); + + for (ReportMetadataColumn column : reportMetadata.getColumns()) { + parameters.add(new EventParameterRequest(column.getDisplay() + COLUMN_NAME_SUFFIX, column.getDisplay())); + } + + return parameters; + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/tasks/impl/CommcareActionProxyServiceImpl.java b/commcare/src/main/java/org/motechproject/commcare/tasks/impl/CommcareActionProxyServiceImpl.java index ec57fbbf2..523cd8f9e 100644 --- a/commcare/src/main/java/org/motechproject/commcare/tasks/impl/CommcareActionProxyServiceImpl.java +++ b/commcare/src/main/java/org/motechproject/commcare/tasks/impl/CommcareActionProxyServiceImpl.java @@ -4,6 +4,7 @@ import org.motechproject.commcare.domain.CaseTask; import org.motechproject.commcare.service.CaseActionService; import org.motechproject.commcare.service.QueryStockLedgerActionService; +import org.motechproject.commcare.service.ReportActionService; import org.motechproject.commcare.service.imports.ImportFormActionService; import org.motechproject.commcare.tasks.CommcareActionProxyService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,14 +18,17 @@ public class CommcareActionProxyServiceImpl implements CommcareActionProxyServic private CaseActionService caseActionService; private ImportFormActionService importFormActionService; private QueryStockLedgerActionService queryStockLedgerActionService; + private ReportActionService reportActionService; @Autowired public CommcareActionProxyServiceImpl(CaseActionService caseActionService, ImportFormActionService importFormActionService, - QueryStockLedgerActionService queryStockLedgerActionService) { + QueryStockLedgerActionService queryStockLedgerActionService, + ReportActionService reportActionService) { this.caseActionService = caseActionService; this.importFormActionService = importFormActionService; this.queryStockLedgerActionService = queryStockLedgerActionService; + this.reportActionService = reportActionService; } @@ -47,4 +51,9 @@ public void importForms(String configName, DateTime startDate, DateTime endDate) public void queryStockLedger(String configName, String caseId, String sectionId, DateTime startDate, DateTime endDate, Map extraData) { queryStockLedgerActionService.queryStockLedger(configName, caseId, sectionId, startDate, endDate, extraData); } + + @Override + public void queryReport (String configName, String reportId, String reportName, String urlParsedFilters) { + reportActionService.queryReport(configName, reportId, reportName, urlParsedFilters); + } } diff --git a/commcare/src/main/java/org/motechproject/commcare/web/CaseImportController.java b/commcare/src/main/java/org/motechproject/commcare/web/CaseImportController.java new file mode 100644 index 000000000..1c00615a7 --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/web/CaseImportController.java @@ -0,0 +1,93 @@ +package org.motechproject.commcare.web; + +import org.motechproject.commcare.pull.CommcareCaseImporter; +import org.motechproject.commcare.pull.CommcareCaseImporterFactory; +import org.motechproject.commcare.pull.CaseImportStatus; +import org.motechproject.commcare.web.domain.CaseImportRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import javax.servlet.http.HttpSession; + +import static org.motechproject.commcare.util.Constants.HAS_MANAGE_COMMCARE_PERMISSION; +/** + * This controller is responsible for importing cases. + * Can initialize and start importing the cases and check the status of an ongoing import. + */ +@Controller +@RequestMapping("/case-import") +@PreAuthorize(HAS_MANAGE_COMMCARE_PERMISSION) +public class CaseImportController extends CommcareController{ + private static final Logger LOGGER = LoggerFactory.getLogger(CaseImportController.class); + + @Autowired + private CommcareCaseImporterFactory caseImporterFactory; + + /** + * Checks the status of the ongoing case import. If there is no import in progress currently, + * that will be reflected in the returned object. + * @return the status representation for case import + */ + @RequestMapping(value = "/status", method = RequestMethod.GET) + @ResponseBody + public CaseImportStatus checkImportStatus(HttpSession session) { + LOGGER.debug("Received import STATUS request"); + CommcareCaseImporter importer = caseImporterFactory.getImporter(session); + return importer.importStatus(); + } + + /** + * Initializes case import, on the UI this will trigger a modal with the number of cases. + * Under the covers this just does a case count for the provided request. + * @param importRequest the request for + * @return the number of cases that match this request + */ + @RequestMapping(value = "/init", method = RequestMethod.POST) + @ResponseBody + public int initImport(@RequestBody CaseImportRequest importRequest, HttpSession session) { + LOGGER.debug("Received import INIT request: {}", importRequest); + CommcareCaseImporter importer = caseImporterFactory.getImporter(session); + if (importRequest.getCaseId() == null) { + return importer.countForImport(importRequest.getDateRange(), importRequest.getConfig()); + } else { + return importer.checkCaseIdForImport(importRequest.getCaseId(), importRequest.getConfig()) ? 1 : 0; + } + } + + /** + * Starts a case import using the provided request. + * @param importRequest the request for the case import + * @return returns whether case imported by id is failed or not. + */ + @RequestMapping(value = "/start", method = RequestMethod.POST) + @ResponseStatus(HttpStatus.OK) + public void startImport(@RequestBody CaseImportRequest importRequest, HttpSession session) { + LOGGER.debug("Received import START request: {}", importRequest); + CommcareCaseImporter importer = caseImporterFactory.getImporter(session); + importer.startImport(importRequest.getDateRange(), importRequest.getConfig()); + } + + /** + * Starts a case import by the given case id. + * @param importRequest the request for the case import + * @return returns 0 if there is an error and 1 if there is no error. + */ + @RequestMapping(value = "/import-by-id", method = RequestMethod.POST) + @ResponseStatus(HttpStatus.OK) + public void startImportById(@RequestBody CaseImportRequest importRequest, HttpSession session) { + LOGGER.debug("Received import START request: {}", importRequest); + CommcareCaseImporter importer = caseImporterFactory.getImporter(session); + if (importRequest.getCaseId() != null) { + importer.importSingleCase(importRequest.getCaseId(), importRequest.getConfig()); + } + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/web/FormImportController.java b/commcare/src/main/java/org/motechproject/commcare/web/FormImportController.java index 3cf1cf1e9..82cce41ea 100644 --- a/commcare/src/main/java/org/motechproject/commcare/web/FormImportController.java +++ b/commcare/src/main/java/org/motechproject/commcare/web/FormImportController.java @@ -37,6 +37,7 @@ public class FormImportController extends CommcareController { /** * Checks the status of the ongoing form import. If there is no import in progress currently, * that will be reflected in the returned object. + * * @return the status representation for form import */ @RequestMapping(value = "/status", method = RequestMethod.GET) @@ -50,6 +51,7 @@ public FormImportStatus checkImportStatus(HttpSession session) { /** * Initializes form import, on the UI this will trigger a modal with the number of forms. * Under the covers this just does a form count for the provided request. + * * @param importRequest the request for * @return the number of forms that match this request */ @@ -58,11 +60,16 @@ public FormImportStatus checkImportStatus(HttpSession session) { public int initImport(@RequestBody FormImportRequest importRequest, HttpSession session) { LOGGER.debug("Received import INIT request: {}", importRequest); CommcareFormImporter importer = importerFactory.getImporter(session); - return importer.countForImport(importRequest.getDateRange(), importRequest.getConfig()); + if (importRequest.getFormId() == null) { + return importer.countForImport(importRequest.getDateRange(), importRequest.getConfig()); + } else { + return importer.checkFormIdForImport(importRequest.getFormId(), importRequest.getConfig()) ? 1 : 0; + } } /** * Starts a form import using the provided request. + * * @param importRequest the request for the form import */ @RequestMapping(value = "/start", method = RequestMethod.POST) @@ -70,6 +77,10 @@ public int initImport(@RequestBody FormImportRequest importRequest, HttpSession public void startImport(@RequestBody FormImportRequest importRequest, HttpSession session) { LOGGER.debug("Received import START request: {}", importRequest); CommcareFormImporter importer = importerFactory.getImporter(session); - importer.startImport(importRequest.getDateRange(), importRequest.getConfig()); + if (importRequest.getFormId() == null) { + importer.startImport(importRequest.getDateRange(), importRequest.getConfig()); + } else { + importer.startImportById(importRequest.getFormId(), importRequest.getConfig()); + } } } diff --git a/commcare/src/main/java/org/motechproject/commcare/web/FullFormController.java b/commcare/src/main/java/org/motechproject/commcare/web/FullFormController.java index b5ca34963..648eba1f4 100644 --- a/commcare/src/main/java/org/motechproject/commcare/web/FullFormController.java +++ b/commcare/src/main/java/org/motechproject/commcare/web/FullFormController.java @@ -4,7 +4,7 @@ import org.motechproject.commcare.domain.FormValueElement; import org.motechproject.commcare.events.FullFormEvent; import org.motechproject.commcare.events.FullFormFailureEvent; -import org.motechproject.commcare.events.MalformedFormStatusMessageEvent; +import org.motechproject.commcare.events.FailedImportStatusMessageEvent; import org.motechproject.commcare.exception.EndpointNotSupported; import org.motechproject.commcare.exception.FullFormParserException; import org.motechproject.commcare.parser.FullFormParser; @@ -17,6 +17,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import javax.servlet.http.HttpServletRequest; @@ -42,17 +43,17 @@ public FullFormController(EventRelay eventRelay, CommcareConfigService configSer @RequestMapping @ResponseStatus(HttpStatus.OK) - public void receiveFormForDefaultConfig(@RequestBody String body, HttpServletRequest request) throws EndpointNotSupported { - doReceiveForm(body, request, configService.getDefault()); + public void receiveFormForDefaultConfig(@RequestBody String body, HttpServletRequest request, @RequestParam(value = "app_id", required = false) String appId) throws EndpointNotSupported { + doReceiveForm(body, request, configService.getDefault(), appId); } @RequestMapping(value = "/{configName}") @ResponseStatus(HttpStatus.OK) - public void receiveForm(@RequestBody String body, HttpServletRequest request) throws EndpointNotSupported { - doReceiveForm(body, request, configService.getByName(getConfigName(request))); + public void receiveForm(@RequestBody String body, HttpServletRequest request, @RequestParam(value = "app_id", required = false) String appId) throws EndpointNotSupported { + doReceiveForm(body, request, configService.getByName(getConfigName(request)), appId); } - private void doReceiveForm(String body, HttpServletRequest request, Config config) throws EndpointNotSupported { + private void doReceiveForm(String body, HttpServletRequest request, Config config, String appId) throws EndpointNotSupported { LOGGER.trace("Received request for mapping /forms: {}", body); @@ -64,6 +65,7 @@ private void doReceiveForm(String body, HttpServletRequest request, Config confi try { FormValueElement formValueElement = parser.parse(); + formValueElement.addAttribute("app_id", appId); FullFormEvent fullFormEvent = new FullFormEvent(formValueElement, request.getHeader("received-on"), config.getName()); @@ -80,7 +82,7 @@ private void handleError(Exception e, Config config) { eventRelay.sendEventMessage(failureEvent.toMotechEvent()); // publish a status message in the Admin module String msg = "Error while receiving a form from Commcare: " + e.getMessage(); - MalformedFormStatusMessageEvent statusMessageEvent = new MalformedFormStatusMessageEvent(msg); + FailedImportStatusMessageEvent statusMessageEvent = new FailedImportStatusMessageEvent(msg); eventRelay.sendEventMessage(statusMessageEvent.toMotechEvent()); } diff --git a/commcare/src/main/java/org/motechproject/commcare/web/SchemaController.java b/commcare/src/main/java/org/motechproject/commcare/web/SchemaController.java index 894cf513b..10ec1b75f 100644 --- a/commcare/src/main/java/org/motechproject/commcare/web/SchemaController.java +++ b/commcare/src/main/java/org/motechproject/commcare/web/SchemaController.java @@ -3,10 +3,12 @@ import org.motechproject.commcare.domain.CaseInfo; import org.motechproject.commcare.domain.CasesInfo; import org.motechproject.commcare.domain.CommcareApplicationJson; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; import org.motechproject.commcare.exception.ConfigurationNotFoundException; import org.motechproject.commcare.service.CommcareApplicationDataService; import org.motechproject.commcare.service.CommcareCaseService; import org.motechproject.commcare.service.CommcareConfigService; +import org.motechproject.commcare.service.ReportsMetadataDataService; import org.motechproject.commcare.web.domain.CasesRecords; import org.motechproject.commcare.web.domain.GridSettings; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +39,9 @@ public class SchemaController extends CommcareController { @Autowired private CommcareApplicationDataService commcareApplicationDataService; + @Autowired + private ReportsMetadataDataService reportsMetadataDataService; + @Autowired private CommcareCaseService caseService; @@ -50,6 +55,13 @@ public List schema(@PathVariable String configName) { return commcareApplicationDataService.bySourceConfiguration(configName); } + @RequestMapping(value = "/reports/{configName}") + @ResponseBody + public List reports(@PathVariable String configName) { + validateConfig(configName); + return reportsMetadataDataService.bySourceConfiguration(configName); + } + @RequestMapping(value = "/caseList/{configName}") @ResponseBody public CasesRecords caseList(GridSettings settings, @PathVariable String configName) { diff --git a/commcare/src/main/java/org/motechproject/commcare/web/domain/CaseImportRequest.java b/commcare/src/main/java/org/motechproject/commcare/web/domain/CaseImportRequest.java new file mode 100644 index 000000000..2b90794fa --- /dev/null +++ b/commcare/src/main/java/org/motechproject/commcare/web/domain/CaseImportRequest.java @@ -0,0 +1,90 @@ +package org.motechproject.commcare.web.domain; + +import org.codehaus.jackson.annotate.JsonIgnore; +import org.joda.time.DateTime; +import org.motechproject.commons.api.Range; +import org.motechproject.commons.date.util.DateUtil; + +import java.io.Serializable; + +/** + * Represents a request for importing cases + */ +public class CaseImportRequest implements Serializable{ + private static final long serialVersionUID = 4392180915357501643L; + + /** + * To get cases modified after this date. + */ + private DateTime modifiedDateStart; + + /** + * To get cases modified before this date. + */ + private DateTime modifiedDateEnd; + + /** + * The name of the configuration for which to initiate the import. + */ + private String config; + + /** + * The uuid of the case to be imported. + */ + private String caseId; + /** + * @return date after which cases are modified. + */ + public DateTime getModifiedDateStart() { + return modifiedDateStart; + } + + /** + * @param modifiedDateStart date after which cases are modified. + */ + public void setModifiedDateStart(DateTime modifiedDateStart) { + this.modifiedDateStart = modifiedDateStart; + } + + /** + * @return date before which cases are modified. + */ + public DateTime getModifiedDateEnd() { + return modifiedDateEnd; + } + + /** + * @param modifiedDateEnd date before which cases are modified. + */ + public void setModifiedDateEnd(DateTime modifiedDateEnd) { + this.modifiedDateEnd = modifiedDateEnd; + } + + /** + * @return The name of the configuration for which to initiate the import. + */ + public String getConfig() { + return config; + } + + /** + * @param config The name of the configuration for which to initiate the import. + */ + public void setConfig(String config) { + this.config = config; + } + + public String getCaseId() { + return caseId; + } + + public void setCaseId(String caseId) { + this.caseId = caseId; + } + + @JsonIgnore + public Range getDateRange() { + return new Range<>(DateUtil.setTimeZoneUTC(modifiedDateStart), + DateUtil.setTimeZoneUTC(modifiedDateEnd)); + } +} diff --git a/commcare/src/main/java/org/motechproject/commcare/web/domain/FormImportRequest.java b/commcare/src/main/java/org/motechproject/commcare/web/domain/FormImportRequest.java index 5d3a51aeb..c03e5ea2b 100644 --- a/commcare/src/main/java/org/motechproject/commcare/web/domain/FormImportRequest.java +++ b/commcare/src/main/java/org/motechproject/commcare/web/domain/FormImportRequest.java @@ -24,12 +24,16 @@ public class FormImportRequest implements Serializable { */ private DateTime receivedOnEnd; + /** + * The id for form import. + */ + private String formId; + /** * The name of the configuration for which to initiate the import. */ private String config; - /** * @return the starting date for form import */ @@ -58,6 +62,20 @@ public void setReceivedOnEnd(DateTime receivedOnEnd) { this.receivedOnEnd = receivedOnEnd; } + /** + * @return the form id for form import + */ + public String getFormId() { + return formId; + } + + /** + * @param formId the id for form import + */ + public void setFormId(String formId) { + this.formId = formId; + } + /** * @return the name of the configuration for which to initiate the import */ @@ -72,6 +90,7 @@ public void setConfig(String config) { this.config = config; } + @JsonIgnore public Range getDateRange() { return new Range<>(DateUtil.setTimeZoneUTC(receivedOnStart), diff --git a/commcare/src/main/resources/META-INF/spring/blueprint.xml b/commcare/src/main/resources/META-INF/spring/blueprint.xml index 933701423..01fbbb5be 100644 --- a/commcare/src/main/resources/META-INF/spring/blueprint.xml +++ b/commcare/src/main/resources/META-INF/spring/blueprint.xml @@ -65,6 +65,9 @@ + + @@ -76,6 +79,9 @@ + + diff --git a/commcare/src/main/resources/velocity.templates/task-data-provider.vm b/commcare/src/main/resources/velocity.templates/task-data-provider.vm index 14c1d7669..e9553037e 100644 --- a/commcare/src/main/resources/velocity.templates/task-data-provider.vm +++ b/commcare/src/main/resources/velocity.templates/task-data-provider.vm @@ -71,7 +71,8 @@ }, { "displayName" : "commcare.form.field.receivedOn", - "fieldKey" : "receivedOn" + "fieldKey" : "receivedOn", + "type" : "DATE" }, { "displayName" : "commcare.form.field.metadata", @@ -128,7 +129,8 @@ }, { "displayName" : "commcare.case.field.dateClosed", - "fieldKey" : "dateClosed" + "fieldKey" : "dateClosed", + "type" : "DATE" }, { "displayName" : "commcare.case.field.domain", @@ -145,7 +147,8 @@ }, { "displayName" : "commcare.case.field.serverDateOpened", - "fieldKey" : "serverDateOpened" + "fieldKey" : "serverDateOpened", + "type" : "DATE" }, { "displayName" : "commcare.case.field.caseType", @@ -153,7 +156,8 @@ }, { "displayName" : "commcare.case.field.dateOpened", - "fieldKey" : "dateOpened" + "fieldKey" : "dateOpened", + "type" : "DATE" }, { "displayName" : "commcare.case.field.ownerId", @@ -171,7 +175,8 @@ #end { "displayName" : "commcare.case.field.serverDateModified", - "fieldKey" : "serverDateModified" + "fieldKey" : "serverDateModified", + "type" : "DATE" }, { "displayName" : "commcare.case.field.closed", @@ -268,7 +273,8 @@ }, { "displayName": "commcare.location.field.lastModified", - "fieldKey": "lastModified" + "fieldKey": "lastModified", + "type" : "DATE" }, { "displayName": "commcare.location.field.locationData", diff --git a/commcare/src/main/resources/webapp/css/commcare.css b/commcare/src/main/resources/webapp/css/commcare.css index df5b0c410..406eab35e 100644 --- a/commcare/src/main/resources/webapp/css/commcare.css +++ b/commcare/src/main/resources/webapp/css/commcare.css @@ -226,6 +226,46 @@ td.questionData .table { color: #224477; } +.report-schema .report-schema-group { + padding: 1px 7px 1px 15px; + line-height: 32px; + color: #005580; + background-color: #E4F1F9; + border: 1px solid #D1E6F9; + border-top: none; +} + +.report-schema .report-columns{ + padding-bottom: 12px; +} + +.report-schema .report-column{ + padding: 6px 20px; +} + +.report-schema .report-column button { + float: right; +} + +.report-schema .report-filters{ + padding-bottom: 12px; +} + +.report-schema .report-filters button{ + float: right; +} + +.report .modal-dialog .modal-content .modal-body p{ + font-weight: bold; + margin-left: 3px; +} + +.report .modal-dialog .modal-content .modal-body{ + padding: 15px; +} + + + .case-schema .case-schema-group { padding: 1px 7px 1px 15px; height: 37px; diff --git a/commcare/src/main/resources/webapp/index.html b/commcare/src/main/resources/webapp/index.html index 8ffdc019f..6b33119ad 100644 --- a/commcare/src/main/resources/webapp/index.html +++ b/commcare/src/main/resources/webapp/index.html @@ -5,17 +5,19 @@
  • {{msg('server.home')}}
  • {{msg('commcare')}}
  • {{msg('commcare.tab.settings')}}
    • -
  • {{msg('commcare.tab.import')}}
    • +
  • {{msg('commcare.tab.importForms')}}
    • +
  • {{msg('commcare.tab.importCases')}}
  • {{msg('commcare.tab.forms')}}
    • -
  • {{msg('commcare.tab.cases')}}
    • +
  • {{msg('commcare.tab.reports')}}
    • @@ -26,38 +28,4 @@
    - -
    -
    - -
    {{msg('commcare.filters')}}
    -
    -
    -
    - {{msg('commcare.caseName')}} -
    -
    - - - - -
    -
    -
    -
    - {{msg('commcare.dateModifiedRange')}} -
    - -
    -
    - -
    -
    -
    -
    -
    \ No newline at end of file diff --git a/commcare/src/main/resources/webapp/js/app.js b/commcare/src/main/resources/webapp/js/app.js index feaa7f7c8..fc7bdc254 100644 --- a/commcare/src/main/resources/webapp/js/app.js +++ b/commcare/src/main/resources/webapp/js/app.js @@ -27,8 +27,8 @@ } } }) - .state('commcare.import', { - url: '/import', + .state('commcare.importForms', { + url: '/importForms', parent: 'commcare', views: { 'commcareView': { @@ -37,6 +37,16 @@ } } }) + .state('commcare.importCases', { + url: '/importCases', + parent: 'commcare', + views: { + 'commcareView': { + templateUrl: '../commcare/resources/partials/importCases.html', + controller: 'CommcareImportCasesCtrl' + } + } + }) .state('commcare.forms', { url: '/forms', parent: 'commcare', @@ -56,6 +66,16 @@ controller: 'CommcareCaseSchemasCtrl' } } + }) + .state('commcare.reports', { + url: '/reports', + parent: 'commcare', + views: { + 'commcareView': { + templateUrl: '../commcare/resources/partials/reports.html', + controller: 'CommcareReportsCtrl' + } + } }); }]); }()); diff --git a/commcare/src/main/resources/webapp/js/controllers.js b/commcare/src/main/resources/webapp/js/controllers.js index a206890b0..d39ee05c7 100644 --- a/commcare/src/main/resources/webapp/js/controllers.js +++ b/commcare/src/main/resources/webapp/js/controllers.js @@ -47,11 +47,13 @@ $scope.receivedOnStart = null; $scope.receivedOnEnd = null; $scope.lastFormId = null; + $scope.formId = null; $scope.lastReceivedOn = null; $('#importCompleteAlert').fadeOut("slow"); $scope.byDateRange = false; - $scope.importOptions = ['all', 'byDateRange']; + $scope.byFormId = false; + $scope.importOptions = ['all', 'byDateRange', 'byFormId']; $scope.selectedImportOption = $scope.importOptions[0]; $scope.setImportOption = function (index) { $scope.resetImportRequest(); @@ -59,8 +61,13 @@ $scope.selectedImportOption = $scope.importOptions[index]; if ('byDateRange' === $scope.importOptions[index]) { $scope.byDateRange = true; + $scope.byFormId = false; + } else if ('byFormId' === $scope.importOptions[index]) { + $scope.byFormId = true; + $scope.byDateRange = false; } else { $scope.byDateRange = false; + $scope.byFormId = false; } }; @@ -109,7 +116,8 @@ $scope.importRequest = { "config": $scope.selectedConfig !== undefined? $scope.selectedConfig.name : '', "receivedOnStart": $scope.receivedOnStart, - "receivedOnEnd": $scope.receivedOnEnd + "receivedOnEnd": $scope.receivedOnEnd, + "formId": $scope.formId }; $scope.updateImportRequest = function (nameParameter, valueParameter) { @@ -129,6 +137,9 @@ case 'receivedOnEnd': $scope.importRequest.receivedOnEnd = normalizeDate(valueParameter); break; + case 'formId': + $scope.importRequest.formId = valueParameter; + break; case 'config': $scope.importRequest.config = valueParameter; break; @@ -142,7 +153,8 @@ $scope.importRequest = { "config": $scope.selectedConfig.name = $scope.selectedConfig !== undefined? $scope.selectedConfig.name : '', "receivedOnStart": null, - "receivedOnEnd": null + "receivedOnEnd": null, + "formId": null }; }; @@ -165,6 +177,7 @@ $scope.importFormsProgressShow = false; $('#importCommcareForms').modal('hide'); $scope.importFormsComplete = true; + $('#importCompleteAlert').fadeIn("slow"); clearInterval($scope.importStatusInterval); } @@ -218,6 +231,176 @@ }); }); + controllers.controller('CommcareImportCasesCtrl', function ($scope, $http, LoadingModal, ModalFactory) { + $scope.importOptions = ['all', 'byDateRange', 'byId']; + $scope.importCasesProgressShow = false; + $scope.importCasesComplete = false; + $scope.totalCases = 0; + $scope.casesImported = 0; + $scope.statusError = false; + $scope.errorMsg = 'Unknown error'; + $scope.importInProgress = false; + $scope.modifiedDateStart = null; + $scope.modifiedDateEnd = null; + $scope.caseId = null; + $scope.lastCaseId = null; + $scope.lastReceivedOn = null; + $('#importCompleteAlert').fadeOut("slow"); + + $scope.byDateRange = false; + $scope.byId = false; + $scope.importRequest = { + "config": $scope.selectedConfig !== undefined? $scope.selectedConfig.name : '', + "caseId": $scope.caseId, + "modifiedDateStart": $scope.modifiedDateStart, + "modifiedDateEnd": $scope.modifiedDateEnd + }; + $scope.selectedImportOption = $scope.importOptions[0]; + $scope.updateProgress = function () { + var percentage = Math.round(($scope.casesImported / $scope.totalCases) * 100); + percentage = !isNaN(percentage) && percentage !== Infinity && percentage >= 0 ? percentage : 0; + $('#commcareImportPercentage').text(percentage + '%').css({width: percentage + '%'}).attr('aria-valuenow', percentage); + }; + $scope.setImportOption = function (index) { + $scope.resetImportRequest(); + $scope.resetImportValues(); + $scope.selectedImportOption = $scope.importOptions[index]; + if ('byDateRange' === $scope.importOptions[index]) { + $scope.byDateRange = true; + } else { + $scope.byDateRange = false; + } + if ('byId' === $scope.importOptions[index]) { + $scope.byId = true; + } else { + $scope.byId = false; + } + }; + $scope.resetImportRequest = function () { + $scope.importRequest = { + "config": $scope.selectedConfig.name = $scope.selectedConfig !== undefined? $scope.selectedConfig.name : '', + "caseId": null, + "modifiedDateStart": null, + "modifiedDateEnd": null + }; + }; + $scope.resetImportValues = function () { + $scope.initImportComplete = false; + $scope.importCasesProgressShow = false; + $scope.importCasesComplete = false; + $scope.totalCases = 0; + $scope.casesImported = 0; + $scope.statusError = false; + $scope.importInProgress = false; + $('#importCompleteAlert').fadeOut("slow"); + }; + $scope.updateImportRequest = function (nameParameter, valueParameter) { + $scope.resetImportValues(); + var dValue, + normalizeDate = function (dateValue) { + var indexTValue = dateValue.indexOf('T'); + dValue = dateValue.replace(' ', ''); + dValue = dValue.replace(' ', ''); + return dValue; + }; + + switch (nameParameter) { + case 'modifiedDateStart': + $scope.importRequest.modifiedDateStart = normalizeDate(valueParameter); + break; + case 'modifiedDateEnd': + $scope.importRequest.modifiedDateEnd = normalizeDate(valueParameter); + break; + case 'config': + $scope.importRequest.config = valueParameter; + break; + case 'caseId': + $scope.importRequest.caseId = valueParameter; + break; + default: + break; + } + + }; + $scope.importCasesStart = function () { + $scope.updateImportRequest(); + $('#importCommcareCases').modal('show'); + $scope.initImport(); + }; + $scope.initImport = function () { + $http.post('../commcare/case-import/init', $scope.importRequest).success( function(data) { + $scope.totalCases = data; + $scope.initImportComplete = true; + }).error(function(data) { + $scope.importError(data); + }); + }; + $scope.closeImportCases = function () { + $('#importCommcareCases').modal('hide'); + $scope.importCasesProgressShow = false; + }; + $scope.importCasesContinue = function () { + $scope.updateProgress(); + if (!$scope.importCasesProgressShow) { + $scope.startImport(); + } + $scope.importCasesProgressShow = true; + }; + $scope.startImport = function () { + if (!$scope.importInProgress) { + var url = $scope.byId ? "../commcare/case-import/import-by-id" : "../commcare/case-import/start"; + $http.post(url, $scope.importRequest).success( function(data) { + $scope.importInProgress = true; + $scope.lastCaseId = null; + $scope.lastReceivedOn = null; + $scope.checkStatus(); + }).error(function(data) { + $scope.importError(data); + }); + } + }; + $scope.checkStatus = function () { + var getStatus = function () { + $http.get('../commcare/case-import/status').success(function(data) { + $scope.statusError = data.error; + if (data.casesImported > 0) { + $scope.casesImported = data.casesImported; + } + + $scope.lastCaseId = data.lastImportCaseId; + $scope.lastReceivedOn = data.lastImportDate; + + $scope.updateProgress(); + + if (data.casesImported === data.totalCases) { + $scope.importCasesProgressShow = false; + $('#importCommcareCases').modal('hide'); + $scope.importCasesComplete = true; + $('#importCompleteAlert').fadeIn("slow"); + clearInterval($scope.importStatusInterval); + } + + if (!data.error) { + $scope.importInProgress = data.importInProgress; + } else { + $scope.importError(data.errorMsg); + } + }).error(function(data) { + $scope.importError(data); + }); + }; + $scope.importStatusInterval = setInterval(function () { + getStatus(); + }, 2000); + }; + $scope.importError = function (msg) { + $scope.importCasesProgressShow = false; + $scope.errorMsg = msg; + clearInterval($scope.importStatusInterval); + $scope.statusError = true; + }; + }); + controllers.controller('CommcareSettingsCtrl', function ($scope, Configurations, ModalFactory, LoadingModal, $timeout) { $scope.eventStrategyOptions = [ 'minimal', 'partial', 'full' ]; @@ -625,7 +808,7 @@ $scope.downloadingCases = false; $scope.formatJson = function(jsonResponse) { - return JSON.stringify(jsonResponse, null,4); + return JSON.stringify(jsonResponse, null, 4); }; $scope.$watch('selectedConfig', function() { @@ -692,4 +875,39 @@ }; }); + controllers.controller('CommcareReportsCtrl', function ($scope, $http, Reports, LoadingModal) { + + $scope.reportError = false; + + $scope.formatJson = function(jsonResponse) { + return JSON.stringify(jsonResponse, null, 4); + }; + + $scope.$watch('selectedConfig', function() { + if (!$scope.$parent.selectedConfig) { + return; + } + if ($scope.$parent.selectedConfig === $scope.$parent.newlyCreatedConfig) { + return; + } + LoadingModal.open(); + + $scope.reports = Reports.query({name: $scope.selectedConfig.name}, function() { + $scope.reportError = false; + LoadingModal.close(); + }, function() { + $scope.reportError = true; + LoadingModal.close(); + }); + + LoadingModal.close(); + }); + + innerLayout({ + spacing_closed: 30, + east__minSize: 200, + east__maxSize: 350 + }); + }); + }()); diff --git a/commcare/src/main/resources/webapp/js/directives.js b/commcare/src/main/resources/webapp/js/directives.js index d3779db58..32d2b3d09 100644 --- a/commcare/src/main/resources/webapp/js/directives.js +++ b/commcare/src/main/resources/webapp/js/directives.js @@ -52,6 +52,7 @@ ngModel.$setViewValue(viewValue); }); scope.updateImportRequest('receivedOnStart', viewValue); + scope.updateImportRequest('modifiedDateStart', viewValue); }, onChangeMonthYear: function (year, month, inst) { var curDate = elem.datetimepicker("getDate"); @@ -114,6 +115,7 @@ ngModel.$setViewValue(viewValue); }); scope.updateImportRequest('receivedOnEnd', viewValue); + scope.updateImportRequest('modifiedDateEnd', viewValue); }, onChangeMonthYear: function (year, month, inst) { var curDate = $(this).datetimepicker("getDate"); diff --git a/commcare/src/main/resources/webapp/js/services.js b/commcare/src/main/resources/webapp/js/services.js index ce514a486..a3994f983 100644 --- a/commcare/src/main/resources/webapp/js/services.js +++ b/commcare/src/main/resources/webapp/js/services.js @@ -50,4 +50,13 @@ return $resource('../commcare/caseList/:name'); }); + services.factory('Reports', function($resource) { + return $resource('../commcare/reports/:name', {}, { + get: { + method: 'GET', + isArray: true + } + }); + }); + }()); diff --git a/commcare/src/main/resources/webapp/messages/messages.properties b/commcare/src/main/resources/webapp/messages/messages.properties index b77dbd26d..54e96a298 100644 --- a/commcare/src/main/resources/webapp/messages/messages.properties +++ b/commcare/src/main/resources/webapp/messages/messages.properties @@ -1,10 +1,12 @@ commcare=Commcare commcare.ok=OK commcare.tab.dataMapping=Data Mapping -commcare.tab.import=Import Forms +commcare.tab.importForms=Import Forms +commcare.tab.importCases=Import Cases commcare.tab.settings=Settings -commcare.tab.forms=Forms +commcare.tab.forms=Form Definitions commcare.tab.cases=Cases +commcare.tab.reports=Reports commcare.settings.section.accountSettings=Account Settings commcare.settings.section.eventForwarding=Event Forwarding @@ -45,7 +47,7 @@ commcare.save.failure=Failure while saving configuration. commcare.sync.success=Synchronization initiated successfully. -commcare.settings.tooltip.eventStrategy=There are three different strategies for case event forwarding\: minimal (default), partial and full. The minimal event includes only the case ID. The partial event passes in all of the basic case data that are not case specific. The full implementation will also include field values, which for some implementations could bloat the event. +commcare.settings.tooltip.eventStrategy=There are three different strategies for case event forwarding\: minimal , partial and full (default). The minimal event includes only the case ID. The partial event passes in all of the basic case data that are not case specific. The full implementation will also include field values, which for some implementations could bloat the event. commcare.settings.tooltip.forwardingRules=The column on the right displays the url's that will be sent to CommcareHQ as forwarding endpoint. If the forwarding API does not work in your instance, use these urls in CommcareHQ. commcare.select=Select @@ -60,11 +62,16 @@ commcare.view=View commcare.json=JSON commcare.close=Close commcare.importForms=Import Forms +commcare.importCases=Import Cases +commcare.importSingleCase=Import commcare.startImport=Start Import commcare.cancel=Cancel commcare.all=All +commcare.byId=By Case Id commcare.byDateRange=By Date Range +commcare.byFormId=By Form Id commcare.formsToImport=Forms to Import +commcare.casesToImport=Cases to Import commcare.verifyToSave=Successful verification is required to save configuration commcare.id=ID @@ -90,7 +97,6 @@ commcare.message=Message commcare.closeCase=Close Case commcare.receivedOn=Received On -commcare.formId=Form Id commcare.caseIds=Case Ids commcare.form.questions=Questions @@ -124,6 +130,7 @@ commcare.to=To commcare.startDateTime=Start DateTime commcare.endDateTime=End DateTime commcare.dateModifiedRange= Date Modified Range +commcare.formId = Form Id commcare.user.field.defaultPhoneNumber=Default phone number commcare.user.field.email=E-mail @@ -201,9 +208,26 @@ commcare.case.field.closed=Closed commcare.case.field.indices=Indices commcare.case.field.configName=Configuration Name +commcare.reports.reportDetails=Report Details +commcare.reports.columnsTitle=Columns +commcare.reports.filtersTitle=Filters +commcare.reports.title = Report Title + +commcare.report.columnTitle=Column Details +commcare.report.columnId=Column Id +commcare.report.columnDisplay=Display Name +commcare.report.columnType=Type + +commcare.report.filterTitle=Filters Details +commcare.report.filterDataType=Data Type +commcare.report.filterSlug=Slug +commcare.report.filterType=Type + commcare.error=Error commcare.error.cases=Unable to retrieve the list of cases commcare.error.schema=Unable to retrieve application schema +commcare.error.importCase=Unable to import the form with the given id +commcare.error.reports=Unable to retrieve reports metadata commcare.confirm.deleteConfig=Are you sure you want to delete this configuration? commcare.confirm.discardChanges=All changes will be lost! Continue? @@ -215,14 +239,27 @@ commcare.alert.info.noConfigurationsDefined=No configurations defined. Please cr commcare.ImportFormsReceivedBetweenPart1=Import Forms Received Between commcare.ImportFormsReceivedBetweenPart2= (Leave blank or import all forms) commcare.formsWillImported=forms will be imported. +commcare.formWillImported=form will be imported. commcare.importComplete=Import complete! +commcare.casesWillImported=cases will be imported. +commcare.caseWillImported=case will be imported. +commcare.retrievingCases=Retrieving the number of cases to import. +commcare.noCasesToImport=No cases were returned, nothing to import. +commcare.noCaseToImport=No case was returned, nothing to import. + commcare.import.error=There was an error while importing the forms: {0} commcare.import.lastForm=The following form was the last one successfully imported commcare.import.formId=Form Id: {0} commcare.import.receivedOn=Received on: {0} commcare.import.retry=Please try this import again starting from {0} commcare.formImport.imported=Imported {0} of {1} forms +commcare.import.formById =Checking for existence of form with id {0} + +commcare.import.caseId=Form Id: {0} +commcare.import.checkForCaseId=Checking for existence of case with id {0} +commcare.caseImport.imported=Imported {0} of {1} cases commcare.retrievingForms=Retrieving the number of forms to import. commcare.noFormsToImport=No forms were returned, nothing to import. +commcare.noFormToImport=No form was returned, nothing to import. diff --git a/commcare/src/main/resources/webapp/partials/cases.html b/commcare/src/main/resources/webapp/partials/cases.html deleted file mode 100644 index 1dc9365a4..000000000 --- a/commcare/src/main/resources/webapp/partials/cases.html +++ /dev/null @@ -1,48 +0,0 @@ -
    -
    -

     {{msg('commcare.alert.info.noConfigurationsDefined')}}

    -
    -
    - -
    - -
    - - - -
    - -
    -

    {{msg('commcare.alert.warning')}}

    - {{loadingError}} -
    - -
    -
    -
    -
    - - - -
    diff --git a/commcare/src/main/resources/webapp/partials/importCases.html b/commcare/src/main/resources/webapp/partials/importCases.html new file mode 100644 index 000000000..aa706d19b --- /dev/null +++ b/commcare/src/main/resources/webapp/partials/importCases.html @@ -0,0 +1,122 @@ +
    +
    +

     {{msg('commcare.alert.info.noConfigurationsDefined')}}

    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +

    {{msg('commcare.importComplete')}}

    +
    +
    + + +
    \ No newline at end of file diff --git a/commcare/src/main/resources/webapp/partials/importForms.html b/commcare/src/main/resources/webapp/partials/importForms.html index ef0f691cb..3e9834bc9 100644 --- a/commcare/src/main/resources/webapp/partials/importForms.html +++ b/commcare/src/main/resources/webapp/partials/importForms.html @@ -53,6 +53,12 @@

    {{msg('commcare.alert.warning')}}

    +
    + +
    + +
    +
    @@ -75,15 +81,24 @@

    {{msg('commcare.alert.warning')}}

    +
    +
    {{msg('commcare.import.formById',formId)}}
    +
    loading  {{msg('commcare.retrievingForms')}}
    -
    +
    {{totalForms}} {{msg('commcare.formsWillImported')}}
    -
    +
    +
    {{totalForms}} {{msg('commcare.formWillImported')}}
    +
    +
    {{msg('commcare.noFormsToImport')}}
    +
    +
    {{msg('commcare.noFormToImport')}}
    +
    {{msg('commcare.formImport.imported', formsImported, totalForms)}}
    diff --git a/commcare/src/main/resources/webapp/partials/reports.html b/commcare/src/main/resources/webapp/partials/reports.html new file mode 100644 index 000000000..7bfa2c9e9 --- /dev/null +++ b/commcare/src/main/resources/webapp/partials/reports.html @@ -0,0 +1,166 @@ +
    +
    +

     {{msg('commcare.alert.info.noConfigurationsDefined')}}

    +
    +
    + +
    + +
    + + +
    + +
    +

    {{msg('commcare.alert.warning')}}

    + {{msg('commcare.error.reports')}} +
    + +
    +

    {{msg('commcare.reports.reportDetails')}}

    +
    +
    +
    {{report.title}}
    +
    +
    +
    {{msg('commcare.reports.columnsTitle')}}
    + +
    +
    + {{column.display}} + + + + + + + +
    +
    +
    + +
    + {{msg('commcare.reports.filtersTitle')}} + + + + + + +
    +
    +
    +
    +
    + +
    \ No newline at end of file diff --git a/commcare/src/test/java/org/motechproject/commcare/events/FormActionEventHandlerTest.java b/commcare/src/test/java/org/motechproject/commcare/events/FormActionEventHandlerTest.java index 749b2915e..ce3ec88fb 100644 --- a/commcare/src/test/java/org/motechproject/commcare/events/FormActionEventHandlerTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/events/FormActionEventHandlerTest.java @@ -41,6 +41,7 @@ public void setUp() { formFields.put("/data/mother/dob_known", "yes"); formFields.put("/data/mother/dob", "1993-02-29"); formFields.put("/data/mother/child", "Mark"); + formFields.put("xmlns", XMLNS); event = new MotechEvent(EventSubjects.SUBMIT_FORM + "." + XMLNS + "." + CONFIG, formFields); } diff --git a/commcare/src/test/java/org/motechproject/commcare/events/ReportActionEventHandlerTest.java b/commcare/src/test/java/org/motechproject/commcare/events/ReportActionEventHandlerTest.java new file mode 100644 index 000000000..775c56075 --- /dev/null +++ b/commcare/src/test/java/org/motechproject/commcare/events/ReportActionEventHandlerTest.java @@ -0,0 +1,71 @@ +package org.motechproject.commcare.events; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.motechproject.commcare.events.constants.EventDataKeys; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.ReportActionService; +import org.motechproject.commcare.testutil.RequestTestUtils; +import org.motechproject.event.MotechEvent; + +import java.util.LinkedHashMap; +import java.util.Map; + +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.MockitoAnnotations.initMocks; + +public class ReportActionEventHandlerTest { + + private static final String CONFIG_NAME = "FooConfig"; + private static final String REPORT_ID = "Dddddd"; + private static final String REPORT_NAME = "Report Name"; + + @Mock + private ReportActionService reportActionService; + + private ReportActionEventHandler eventHandler; + + @Before + public void setUp() { + initMocks(this); + + eventHandler = new ReportActionEventHandler(reportActionService); + } + + @Test + public void shouldConvertEventParametersAndReceiveReport() { + MotechEvent event = prepareEvent(); + eventHandler.receiveReport(event); + + verify(reportActionService).queryReport( + eq(CONFIG_NAME), + eq(REPORT_ID), + eq(REPORT_NAME), + eq("&unicode_filter=Sample value&date_filter-start=2012-11-01&date_filter-end=2012-12-24&numeric_filter-operator==&numeric_filter-operand=100") + ); + } + + private MotechEvent prepareEvent() { + + String subject = EventSubjects.REPORT_EVENT + "." + REPORT_NAME + "." + CONFIG_NAME; + + Map params = new LinkedHashMap<>(); + params.put("unicode_filter", "Sample value"); + params.put("unicode_filter.type", "CHOICE_LIST"); + + params.put("date_filter", RequestTestUtils.START_DATE); + params.put("date_filter.commcare.endDate", RequestTestUtils.END_DATE); + params.put("date_filter.type", "DATE"); + + params.put("numeric_filter", "="); + params.put("numeric_filter.value", "100"); + params.put("numeric_filter.type", "DECIMAL"); + + params.put(EventDataKeys.REPORT_ID, REPORT_ID); + params.put(EventDataKeys.REPORT_NAME, REPORT_NAME); + + return new MotechEvent(subject, params); + } +} diff --git a/commcare/src/test/java/org/motechproject/commcare/it/CommcareTasksIntegrationBundleIT.java b/commcare/src/test/java/org/motechproject/commcare/it/CommcareTasksIntegrationBundleIT.java index 541b1f4ae..57b194fc1 100644 --- a/commcare/src/test/java/org/motechproject/commcare/it/CommcareTasksIntegrationBundleIT.java +++ b/commcare/src/test/java/org/motechproject/commcare/it/CommcareTasksIntegrationBundleIT.java @@ -124,19 +124,22 @@ public void tearDown() { public void testCommcareTasksIntegration() throws InterruptedException, IOException { config = ConfigsUtils.prepareConfigOne(); + createMockCommcareSchema(); + HttpResponse configurationResponse = createConfiguration(config); assertEquals(HttpStatus.SC_OK, configurationResponse.getStatusLine().getStatusCode()); configurationResponse = updateConfiguration(config, config.getName()); assertEquals(HttpStatus.SC_OK, configurationResponse.getStatusLine().getStatusCode()); - createMockCommcareSchema(); commcareTasksNotifier.updateTasksInfo(); waitForChannel(COMMCARE_CHANNEL_NAME); + Channel channel = findChannel(COMMCARE_CHANNEL_NAME); verifyCommcareChannelHasCorrectActionsAndTriggers(channel); + createDummyActionChannel(channel); createTestTask(); @@ -194,30 +197,35 @@ private void verifyCommcareChannelHasCorrectActionsAndTriggers(Channel channel) List triggerEvents = channel.getTriggerTaskEvents(); List actionEvents = channel.getActionTaskEvents(); - assertEquals(8, actionEvents.size()); - assertEquals(11, triggerEvents.size()); + assertEquals(9, actionEvents.size()); + assertEquals(13, triggerEvents.size()); TaskTriggerInformation expectedForm1 = new TaskTriggerInformation(); TaskTriggerInformation expectedForm2 = new TaskTriggerInformation(); TaskTriggerInformation expectedForm3 = new TaskTriggerInformation(); TaskTriggerInformation expectedForm4 = new TaskTriggerInformation(); + TaskTriggerInformation expectedForm5 = new TaskTriggerInformation(); TaskTriggerInformation expectedCaseBirth = new TaskTriggerInformation(); TaskTriggerInformation expectedCaseAppointment = new TaskTriggerInformation(); TaskTriggerInformation expectedCaseDeath = new TaskTriggerInformation(); + TaskTriggerInformation expectedCaseCheckup = new TaskTriggerInformation(); TaskTriggerInformation expectedStockTx = new TaskTriggerInformation(); - expectedForm1.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS1); + expectedForm1.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS1 + DummyCommcareSchema.APP_ID1); assertTrue(containsTrigger(channel, expectedForm1)); - expectedForm2.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS2); + expectedForm2.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS2 + DummyCommcareSchema.APP_ID1); assertTrue(containsTrigger(channel, expectedForm2)); - expectedForm3.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS3); + expectedForm3.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS3 + DummyCommcareSchema.APP_ID1); assertTrue(containsTrigger(channel, expectedForm3)); - expectedForm4.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS4); + expectedForm4.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS4 + DummyCommcareSchema.APP_ID2); assertTrue(containsTrigger(channel, expectedForm4)); + expectedForm5.setSubject("org.motechproject.commcare.api.forms." + config.getName() + "." + DummyCommcareSchema.XMLNS1); + assertTrue(containsTrigger(channel, expectedForm5)); + expectedCaseBirth.setSubject("org.motechproject.commcare.api.case." + config.getName() + ".birth"); assertTrue(containsTrigger(channel, expectedCaseBirth)); @@ -227,6 +235,9 @@ private void verifyCommcareChannelHasCorrectActionsAndTriggers(Channel channel) expectedCaseDeath.setSubject("org.motechproject.commcare.api.case." + config.getName() + ".death"); assertTrue(containsTrigger(channel, expectedCaseDeath)); + expectedCaseCheckup.setSubject("org.motechproject.commcare.api.case." + config.getName() + ".checkup"); + assertTrue(containsTrigger(channel, expectedCaseCheckup)); + expectedStockTx.setSubject(EventSubjects.RECEIVED_STOCK_TRANSACTION + '.' + config.getName()); assertTrue(containsTrigger(channel, expectedStockTx)); @@ -250,6 +261,11 @@ private void verifyCommcareChannelHasCorrectActionsAndTriggers(Channel channel) assertTriggerParameters(form4Trigger.getEventParameters(), Arrays.asList("/data/medications", "/data/meta/username", "/data/case/create/case_type")); + TriggerEvent form5Trigger = getTrigger(channel, expectedForm5); + assertEquals("org.motechproject.commcare.api.forms", form5Trigger.getTriggerListenerSubject()); + assertTriggerParameters(form5Trigger.getEventParameters(), + Arrays.asList("/data/medications", "/data/meta/username", "/data/case/create/case_type")); + TriggerEvent caseBirthTrigger = getTrigger(channel, expectedCaseBirth); assertEquals("org.motechproject.commcare.api.case", caseBirthTrigger.getTriggerListenerSubject()); assertTriggerParameters(caseBirthTrigger.getEventParameters(), @@ -265,6 +281,11 @@ private void verifyCommcareChannelHasCorrectActionsAndTriggers(Channel channel) assertTriggerParameters(caseDeathTrigger.getEventParameters(), Arrays.asList("dod", "caseName")); + TriggerEvent caseCheckupTrigger = getTrigger(channel, expectedCaseCheckup); + assertEquals("org.motechproject.commcare.api.case", caseCheckupTrigger.getTriggerListenerSubject()); + assertTriggerParameters(caseCheckupTrigger.getEventParameters(), + Arrays.asList("dod", "caseName")); + verifyTaskAction(channel, prepareStockLedgerAction()); verifyTaskAction(channel, prepareCreateCaseAction()); verifyTaskAction(channel, prepareUpdateCaseAction()); @@ -272,6 +293,7 @@ private void verifyCommcareChannelHasCorrectActionsAndTriggers(Channel channel) verifyTaskAction(channel, prepareSubmitForm2Action()); verifyTaskAction(channel, prepareSubmitForm3Action()); verifyTaskAction(channel, prepareSubmitForm4Action()); + verifyTaskAction(channel, prepareSubmitForm5Action()); } private void verifyTaskAction(Channel channel, ActionEvent expected) { @@ -296,19 +318,23 @@ private void assertTriggerParameters(List eventParameters, List< private void createMockCommcareSchema() { CommcareApplicationJson applicationJson1 = DummyCommcareSchema.getApplicationsForConfigOne().get(0); - applicationJson1.setCommcareAppId("123"); applicationJson1.setApplicationName("TestApp1"); applicationJson1.setResourceUri("none"); applicationJson1.setConfigName(config.getName()); CommcareApplicationJson applicationJson2 = DummyCommcareSchema.getApplicationsForConfigOne().get(1); - applicationJson2.setCommcareAppId("124"); applicationJson2.setApplicationName("TestApp2"); applicationJson2.setResourceUri("none"); applicationJson2.setConfigName(config.getName()); + CommcareApplicationJson applicationJson3 = DummyCommcareSchema.getApplicationsForConfigOne().get(2); + applicationJson3.setApplicationName("TestApp3"); + applicationJson3.setResourceUri("none"); + applicationJson3.setConfigName(config.getName()); + applicationDataService.create(applicationJson1); applicationDataService.create(applicationJson2); + applicationDataService.create(applicationJson3); } private HttpResponse sendMockForm() throws IOException, InterruptedException { @@ -505,7 +531,7 @@ private ActionEvent prepareUpdateCaseAction() { .setDisplayName(DisplayNames.OWNER_ID) .setKey(EventDataKeys.OWNER_ID) .setType(ParameterType.UNICODE) - .setRequired(true) + .setRequired(false) .setOrder(order++); parameters.add(builder.build()); @@ -557,11 +583,21 @@ private ActionEvent prepareSubmitForm1Action() { .setOrder(order++); parameters.add(builder.build()); + builder = new ActionParameterBuilder(); + builder.setValue(DummyCommcareSchema.XMLNS1) + .setDisplayName("xmlns") + .setKey("xmlns") + .setOrder(order++) + .setType(ParameterType.UNICODE) + .setHidden(true) + .setRequired(false); + parameters.add(builder.build()); + String displayName = String.format("Submit Form: form1 [TestApp1: %s]", config.getName()); ActionEventBuilder actionBuilder = new ActionEventBuilder() .setDisplayName(displayName) - .setSubject(EventSubjects.SUBMIT_FORM + ".http://openrosa.org/formdesigner/84FA38A2-93C1-4B9E-AA2A-0E082995FF9E." + config.getName()) + .setSubject(EventSubjects.SUBMIT_FORM + "." + DummyCommcareSchema.XMLNS1 + DummyCommcareSchema.APP_ID1 + "." + config.getName()) .setActionParameters(parameters); return actionBuilder.build(); } @@ -579,11 +615,21 @@ private ActionEvent prepareSubmitForm2Action() { .setOrder(order++); parameters.add(builder.build()); + builder = new ActionParameterBuilder(); + builder.setValue(DummyCommcareSchema.XMLNS2) + .setDisplayName("xmlns") + .setKey("xmlns") + .setOrder(order++) + .setType(ParameterType.UNICODE) + .setHidden(true) + .setRequired(false); + parameters.add(builder.build()); + String displayName = String.format("Submit Form: form2 [TestApp1: %s]", config.getName()); ActionEventBuilder actionBuilder = new ActionEventBuilder() .setDisplayName(displayName) - .setSubject(EventSubjects.SUBMIT_FORM + ".http://openrosa.org/formdesigner/12KE58A2-54C5-1Z4B-AR2S-Z0345995RF9E." + config.getName()) + .setSubject(EventSubjects.SUBMIT_FORM + "." + DummyCommcareSchema.XMLNS2 + DummyCommcareSchema.APP_ID1 + "." + config.getName()) .setActionParameters(parameters); return actionBuilder.build(); } @@ -601,11 +647,21 @@ private ActionEvent prepareSubmitForm3Action() { .setOrder(order++); parameters.add(builder.build()); + builder = new ActionParameterBuilder(); + builder.setValue(DummyCommcareSchema.XMLNS3) + .setDisplayName("xmlns") + .setKey("xmlns") + .setOrder(order++) + .setType(ParameterType.UNICODE) + .setHidden(true) + .setRequired(false); + parameters.add(builder.build()); + String displayName = String.format("Submit Form: form3 [TestApp1: %s]", config.getName()); ActionEventBuilder actionBuilder = new ActionEventBuilder() .setDisplayName(displayName) - .setSubject(EventSubjects.SUBMIT_FORM + ".http://openrosa.org/formdesigner/22KE58A2-54C5-1Z4B-AR2S-Z0345995RF9E." + config.getName()) + .setSubject(EventSubjects.SUBMIT_FORM + "." + DummyCommcareSchema.XMLNS3 + DummyCommcareSchema.APP_ID1 + "." + config.getName()) .setActionParameters(parameters); return actionBuilder.build(); } @@ -623,11 +679,53 @@ private ActionEvent prepareSubmitForm4Action() { .setOrder(order++); parameters.add(builder.build()); + builder = new ActionParameterBuilder(); + builder.setValue(DummyCommcareSchema.XMLNS4) + .setDisplayName("xmlns") + .setKey("xmlns") + .setOrder(order++) + .setType(ParameterType.UNICODE) + .setHidden(true) + .setRequired(false); + parameters.add(builder.build()); + String displayName = String.format("Submit Form: form4 [TestApp2: %s]", config.getName()); ActionEventBuilder actionBuilder = new ActionEventBuilder() .setDisplayName(displayName) - .setSubject(EventSubjects.SUBMIT_FORM + ".http://openrosa.org/formdesigner/32KE58A2-54C5-1Z4B-AR2S-Z0345995RF9E." + config.getName()) + .setSubject(EventSubjects.SUBMIT_FORM + "." + DummyCommcareSchema.XMLNS4 + DummyCommcareSchema.APP_ID2 + "." + config.getName()) + .setActionParameters(parameters); + return actionBuilder.build(); + } + + private ActionEvent prepareSubmitForm5Action() { + SortedSet parameters = new TreeSet<>(); + ActionParameterBuilder builder; + int order = 0; + + builder = new ActionParameterBuilder() + .setDisplayName("Does patient take any medications?") + .setKey(DummyCommcareSchema.FORM_QUESTION5) + .setRequired(false) + .setType(ParameterType.UNICODE) + .setOrder(order++); + parameters.add(builder.build()); + + builder = new ActionParameterBuilder(); + builder.setValue(DummyCommcareSchema.XMLNS1) + .setDisplayName("xmlns") + .setKey("xmlns") + .setOrder(order++) + .setType(ParameterType.UNICODE) + .setHidden(true) + .setRequired(false); + parameters.add(builder.build()); + + String displayName = String.format("Submit Form: form5 [TestApp3: %s]", config.getName()); + + ActionEventBuilder actionBuilder = new ActionEventBuilder() + .setDisplayName(displayName) + .setSubject(EventSubjects.SUBMIT_FORM + "." + DummyCommcareSchema.XMLNS1 + "." + config.getName()) .setActionParameters(parameters); return actionBuilder.build(); } diff --git a/commcare/src/test/java/org/motechproject/commcare/pull/CommcareCaseImporterTest.java b/commcare/src/test/java/org/motechproject/commcare/pull/CommcareCaseImporterTest.java new file mode 100644 index 000000000..09e9531cf --- /dev/null +++ b/commcare/src/test/java/org/motechproject/commcare/pull/CommcareCaseImporterTest.java @@ -0,0 +1,303 @@ +package org.motechproject.commcare.pull; + +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatcher; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.motechproject.commcare.domain.CaseInfo; +import org.motechproject.commcare.domain.CasesInfo; +import org.motechproject.commcare.domain.CommcareMetadataInfo; +import org.motechproject.commcare.events.constants.EventDataKeys; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.CommcareCaseService; +import org.motechproject.commcare.service.impl.CommcareCaseEventParser; +import org.motechproject.commons.api.Range; +import org.motechproject.commons.api.TasksEventParser; +import org.motechproject.event.MotechEvent; +import org.motechproject.event.listener.EventRelay; +import org.motechproject.testing.osgi.wait.Wait; +import org.motechproject.testing.osgi.wait.WaitCondition; +import org.springframework.test.util.ReflectionTestUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import static java.util.Arrays.asList; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(MockitoJUnitRunner.class) +public class CommcareCaseImporterTest { + private static final DateTime START = new DateTime(2013, 1, 15, 10, 25, 32); + private static final DateTime END = new DateTime(2015, 8, 15, 10, 25, 32); + private static final String CONFIG_NAME = "Bihar"; + private static final int TOTAL_COUNT = 5; + private static final int FETCH_SIZE = 2; + private static final int TOTAL_PAGES = 3; + private static final String CASE = "case"; + private static final String CASE_ID = "id0"; + + private static final String ATTR_KEY1 = "attr1"; + private static final String ATTR_KEY2 = "attr2"; + + private static final List REC_DATES = Arrays.asList( + dateTimeToString(new DateTime(2013, 2, 1, 10, 20, 33)), + dateTimeToString(new DateTime(2013, 10, 24, 1, 1, 59)), + dateTimeToString(new DateTime(2014, 6, 11, 20, 20, 33)), + dateTimeToString(new DateTime(2014, 11, 14, 20, 6, 12)), + dateTimeToString(new DateTime(2015, 8, 5, 2, 19, 33)) + ); + + private CommcareCaseImporter importer; + + @Mock + private EventRelay eventRelay; + + @Mock + private CommcareCaseService caseService; + + @Before + public void setup() { + setUpSuccessfulImport(); + importer = new CommcareCaseImporterImpl(eventRelay, caseService); + importer.setFetchSize(2); + } + + @Test + public void shouldImportCases() throws InterruptedException { + importer.startImport(new Range<>(START, END), CONFIG_NAME); + waitForImportEnd(); + + ArgumentCaptor pageCaptor = ArgumentCaptor.forClass(Integer.class); + verify(caseService, times(4)).getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + anyInt(), pageCaptor.capture(), eq(CONFIG_NAME)); // count + 3 fetches + + assertEquals(pageCaptor.getAllValues().get(0), (Integer)1); + assertEquals(pageCaptor.getAllValues().get(1), (Integer)1); + assertEquals(pageCaptor.getAllValues().get(2), (Integer)2); + assertEquals(pageCaptor.getAllValues().get(3), (Integer)3); + ArgumentCaptor eventCaptor = ArgumentCaptor.forClass(MotechEvent.class); + verify(eventRelay, times(5)).sendEventMessage(eventCaptor.capture()); + + for (int i = 0; i < 5; i++) { + verifyCaseEvent(eventCaptor.getAllValues().get(i), "id" + i, REC_DATES.get(i)); + } + + // verify status + CaseImportStatus status = importer.importStatus(); + + assertNotNull(status); + assertNull(status.getErrorMsg()); + assertFalse(status.isError()); + assertEquals(5, status.getCasesImported()); + assertEquals(5, status.getTotalCases()); + assertEquals(REC_DATES.get(4), status.getLastImportDate()); + assertEquals("id4", status.getLastImportCaseId()); + assertFalse(status.isImportInProgress()); + } + + @Test + public void shouldImportCaseById() { + importer.importSingleCase(CASE_ID, CONFIG_NAME); + + verify(caseService).getCaseByCaseId(eq(CASE_ID), eq(CONFIG_NAME)); + + ArgumentCaptor eventCaptor = ArgumentCaptor.forClass(MotechEvent.class); + verify(eventRelay).sendEventMessage(eventCaptor.capture()); + + verifyCaseEvent(eventCaptor.getAllValues().get(0), CASE_ID, REC_DATES.get(0)); + + + // verify status + CaseImportStatus status = importer.importStatus(); + + assertNotNull(status); + assertNull(status.getErrorMsg()); + assertFalse(status.isError()); + assertEquals(1, status.getCasesImported()); + assertEquals(REC_DATES.get(0), status.getLastImportDate()); + assertEquals("id0", status.getLastImportCaseId()); + assertFalse(status.isImportInProgress()); + } + + @Test + public void shouldCountCasesForImport() { + long count = importer.countForImport(new Range<>(START, END), CONFIG_NAME); + + assertEquals(5, count); + + ArgumentCaptor pageCaptor = ArgumentCaptor.forClass(Integer.class); + verify(caseService).getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + anyInt(), pageCaptor.capture(), eq(CONFIG_NAME)); + + // verify status didn't change + CaseImportStatus status = importer.importStatus(); + + assertNotNull(status); + assertNull(status.getErrorMsg()); + assertFalse(status.isError()); + assertEquals(0, status.getCasesImported()); + assertEquals(0, status.getTotalCases()); + assertNull(status.getLastImportDate()); + assertNull(status.getLastImportCaseId()); + assertFalse(status.isImportInProgress()); + } + + @Test + public void shouldStopImportOnError() throws InterruptedException { + // throw error on the second page + final String errorMsg = "Failure"; + when(caseService.getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + eq(FETCH_SIZE), getPageNumber(2), eq(CONFIG_NAME))).thenThrow(new RuntimeException(errorMsg)); + + importer.startImport(new Range<>(START, END), CONFIG_NAME); + waitForImportEnd(); + + ArgumentCaptor pageCaptor = ArgumentCaptor.forClass(Integer.class); + verify(caseService, times(3)).getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + anyInt(), pageCaptor.capture(), eq(CONFIG_NAME)); + + assertEquals(pageCaptor.getAllValues().get(0), (Integer)1); + assertEquals(pageCaptor.getAllValues().get(1), (Integer)1); + assertEquals(pageCaptor.getAllValues().get(2), (Integer)2); + + ArgumentCaptor eventCaptor = ArgumentCaptor.forClass(MotechEvent.class); + verify(eventRelay, times(4)).sendEventMessage(eventCaptor.capture()); + + verifyCaseEvent(eventCaptor.getAllValues().get(0), "id0", REC_DATES.get(0)); + verifyCaseFailureEvent(eventCaptor.getAllValues().get(2), errorMsg); + verifyCaseFailureStatusMessageEvent(eventCaptor.getAllValues().get(3), errorMsg); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldRejectNullDateRangeWhenStartingImport() { + importer.startImport(null, CONFIG_NAME); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldRejectNullDateRangeWhenCountingForImport() { + importer.countForImport(null, CONFIG_NAME); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldRejectInvalidDateRangeWhenStartingImport() { + importer.startImport(new Range<>(END, START), CONFIG_NAME); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldRejectInvalidDateRangeWhenCountingForImport() { + importer.countForImport(new Range<>(END, START), CONFIG_NAME); + } + + private void setUpSuccessfulImport() { + when(caseService.getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + eq(FETCH_SIZE), getPageNumber(3), eq(CONFIG_NAME))).thenReturn(caseList( + caseInfo("id4", REC_DATES.get(4)) + )); + when(caseService.getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + eq(FETCH_SIZE), getPageNumber(2), eq(CONFIG_NAME))).thenReturn(caseList( + caseInfo("id2", REC_DATES.get(2)), caseInfo("id3", REC_DATES.get(3)) + )); + when(caseService.getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), + eq(FETCH_SIZE), getPageNumber(1), eq(CONFIG_NAME))).thenReturn(caseList( + caseInfo("id0", REC_DATES.get(0)), caseInfo("id1", REC_DATES.get(1)) + )); + when(caseService.getCasesByCasesTimeWithMetadata(eq(dateTimeToString(START)), eq(dateTimeToString(END)), eq(1), + getPageNumber(1), eq(CONFIG_NAME))).thenReturn(caseList( + caseInfo("id0", REC_DATES.get(0)) + )); + when(caseService.getCaseByCaseId(eq("id0"), eq(CONFIG_NAME))).thenReturn(caseInfo("id0", REC_DATES.get(0))); + } + + private static String dateTimeToString(DateTime dateTime) { + if (dateTime == null) { + return null; + } else { + DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); + return formatter.print(dateTime); + } + } + + private CasesInfo caseList(CaseInfo... cases) { + CommcareMetadataInfo meta = new CommcareMetadataInfo(); + ReflectionTestUtils.setField(meta, "totalCount", TOTAL_COUNT); + + CasesInfo caseList = new CasesInfo(asList(cases), meta); + + return caseList; + } + + private CaseInfo caseInfo(String id, String date) { + CaseInfo caseInfo = new CaseInfo(); + + caseInfo.setCaseId(id); + caseInfo.setConfigName(CONFIG_NAME); + caseInfo.setDateModified(date); + caseInfo.setCaseType(CASE); + + return caseInfo; + } + + private Integer getPageNumber(final int pageNumber) { + return argThat(new ArgumentMatcher() { + @Override + public boolean matches(Object o) { + Integer pageNum = (Integer) o; + return pageNum == pageNumber; + } + }); + } + + private void verifyCaseEvent(MotechEvent event, String id, String dateModified) { + assertNotNull(event); + assertEquals(EventSubjects.CASE_EVENT, event.getSubject()); + + Map params = event.getParameters(); + + assertNotNull(params); + assertEquals(CONFIG_NAME, params.get(EventDataKeys.CONFIG_NAME)); + assertEquals(id, params.get(EventDataKeys.CASE_ID)); + assertEquals(dateModified, params.get(EventDataKeys.DATE_MODIFIED)); + assertEquals(CASE, params.get(EventDataKeys.CASE_TYPE)); + } + + private void verifyCaseFailureEvent(MotechEvent event, String msg) { + assertNotNull(event); + assertEquals(EventSubjects.CASES_FAIL_EVENT, event.getSubject()); + assertEquals(CommcareCaseEventParser.PARSER_NAME, event.getParameters().get(TasksEventParser.CUSTOM_PARSER_EVENT_KEY)); + assertEquals(CONFIG_NAME, event.getParameters().get(EventDataKeys.CONFIG_NAME)); + assertEquals(msg, event.getParameters().get(EventDataKeys.FAILED_CASE_MESSAGE)); + } + + private void verifyCaseFailureStatusMessageEvent(MotechEvent event, String msg) { + assertNotNull(event); + assertEquals("org.motechproject.message", event.getSubject()); + assertEquals("Error while importing case: " + msg, event.getParameters().get("message")); + assertEquals("CRITICAL", event.getParameters().get("level")); + assertEquals("commcare", event.getParameters().get("moduleName")); + } + + private void waitForImportEnd() throws InterruptedException { + new Wait(new WaitCondition() { + @Override + public boolean needsToWait() { + return importer.isImportInProgress(); + } + }, 5000).start(); + } +} diff --git a/commcare/src/test/java/org/motechproject/commcare/pull/CommcareFormImporterTest.java b/commcare/src/test/java/org/motechproject/commcare/pull/CommcareFormImporterTest.java index d01d88471..a872404d2 100644 --- a/commcare/src/test/java/org/motechproject/commcare/pull/CommcareFormImporterTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/pull/CommcareFormImporterTest.java @@ -33,10 +33,7 @@ import java.util.Map; import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.times; @@ -51,6 +48,7 @@ public class CommcareFormImporterTest { private static final String CONFIG_NAME = "Bihar"; private static final int TOTAL_COUNT = 5; private static final String FORM = "form"; + private static final String FORM_ID = "id0"; private static final String ATTR_KEY1 = "attr1"; private static final String ATTR_KEY2 = "attr2"; @@ -111,6 +109,32 @@ public void shouldImportForms() throws InterruptedException { assertFalse(status.isImportInProgress()); } + @Test + public void shouldImportFormById() { + importer.startImportById(new String(), CONFIG_NAME); + + ArgumentCaptor requestCaptor = ArgumentCaptor.forClass(String.class); + verify(formService).retrieveForm(requestCaptor.capture(), eq(CONFIG_NAME)); + + ArgumentCaptor eventCaptor = ArgumentCaptor.forClass(MotechEvent.class); + verify(eventRelay).sendEventMessage(eventCaptor.capture()); + + verifyFormEvent(eventCaptor.getAllValues().get(0), FORM_ID, REC_DATES.get(0)); + + + // verify status + FormImportStatus status = importer.importStatus(); + + assertNotNull(status); + assertNull(status.getErrorMsg()); + assertFalse(status.isError()); + assertEquals(1, status.getFormsImported()); + assertEquals(1, status.getTotalForms()); + assertEquals(CommcareParamHelper.printDateTime(REC_DATES.get(0)), status.getLastImportDate()); + assertEquals("id0", status.getLastImportFormId()); + assertFalse(status.isImportInProgress()); + } + @Test public void shouldCountFormsForImport() { long count = importer.countForImport(new Range<>(START, END), CONFIG_NAME); @@ -135,6 +159,28 @@ public void shouldCountFormsForImport() { assertFalse(status.isImportInProgress()); } + @Test + public void shouldCheckFormIdForImport() { + boolean answer = importer.checkFormIdForImport(new String(), CONFIG_NAME); + + assertTrue(answer); + + ArgumentCaptor requestCaptor = ArgumentCaptor.forClass(String.class); + verify(formService).retrieveForm(requestCaptor.capture(), eq(CONFIG_NAME)); + + // verify status didn't change + FormImportStatus status = importer.importStatus(); + + assertNotNull(status); + assertNull(status.getErrorMsg()); + assertFalse(status.isError()); + assertEquals(0, status.getFormsImported()); + assertEquals(0, status.getTotalForms()); + assertNull(status.getLastImportDate()); + assertNull(status.getLastImportFormId()); + assertFalse(status.isImportInProgress()); + } + @Test public void shouldStopImportOnError() throws InterruptedException { // throw error on the second page @@ -189,6 +235,7 @@ private void setUpSuccessfulImport() { when(formService.retrieveFormList(page(1), eq(CONFIG_NAME))).thenReturn(formList( form("id4", REC_DATES.get(4)), form("id3", REC_DATES.get(3)) )); + when(formService.retrieveForm(getFormId("id0"), eq(CONFIG_NAME))).thenReturn(form("id0", REC_DATES.get(0))); } private FormListRequest page(final int page) { @@ -201,6 +248,16 @@ public boolean matches(Object argument) { }); } + private String getFormId(final String formId){ + return argThat(new ArgumentMatcher() { + @Override + public boolean matches(Object argument) { + String answer = argument.toString(); + return answer != null && formId.equals(FORM_ID); + } + }); + } + private CommcareFormList formList(CommcareForm... forms) { CommcareMetadataJson meta = new CommcareMetadataJson(); ReflectionTestUtils.setField(meta, "totalCount", TOTAL_COUNT); @@ -247,7 +304,7 @@ private void verifyFormEvent(MotechEvent event, String id, DateTime receivedOn) Map attributes = (Map) params.get(EventDataKeys.ATTRIBUTES); assertNotNull(attributes); - assertEquals(2, attributes.size()); + assertEquals(3, attributes.size()); assertEquals(ATTR_KEY1 + " " + id, attributes.get(ATTR_KEY1)); assertEquals(ATTR_KEY2 + " " + id, attributes.get(ATTR_KEY2)); diff --git a/commcare/src/test/java/org/motechproject/commcare/service/impl/CommcareReportServiceImplTest.java b/commcare/src/test/java/org/motechproject/commcare/service/impl/CommcareReportServiceImplTest.java new file mode 100644 index 000000000..c94b63320 --- /dev/null +++ b/commcare/src/test/java/org/motechproject/commcare/service/impl/CommcareReportServiceImplTest.java @@ -0,0 +1,160 @@ +package org.motechproject.commcare.service.impl; + +import org.apache.commons.io.FileUtils; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.motechproject.commcare.client.CommCareAPIHttpClient; +import org.motechproject.commcare.config.Config; +import org.motechproject.commcare.domain.CommcareMetadataInfo; +import org.motechproject.commcare.domain.report.ReportMetadataColumn; +import org.motechproject.commcare.domain.report.ReportMetadataFilter; +import org.motechproject.commcare.domain.report.ReportMetadataInfo; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.commcare.domain.report.ReportDataInfo; +import org.motechproject.commcare.domain.report.ReportDataColumn; +import org.motechproject.commcare.domain.report.constants.ColumnType; +import org.motechproject.commcare.domain.report.constants.FilterDataType; +import org.motechproject.commcare.domain.report.constants.FilterType; +import org.motechproject.commcare.service.CommcareConfigService; +import org.motechproject.commcare.util.ConfigsUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class CommcareReportServiceImplTest { + + private static final String REPORTS_LIST_METADATA_RESPONSE = "json/service/reportsListMetadataResponse.json"; + private static final String REPORT_DATA_RESPONSE = "json/service/reportDataResponse.json"; + private static final String REPORT_ID = "reportId"; + private static final Logger LOGGER = LoggerFactory.getLogger(CommcareCaseServiceImplTest.class); + private CommcareReportServiceImpl reportService; + + @Mock + private CommCareAPIHttpClient commcareHttpClient; + + @Mock + private CommcareConfigService configService; + + private Config config; + + @Before + public void setUp() { + initMocks(this); + + config = ConfigsUtils.prepareConfigOne(); + + when(configService.getByName(null)).thenReturn(config); + + reportService = new CommcareReportServiceImpl(commcareHttpClient, configService); + } + + @Test + public void shouldGetReports() { + ReportsMetadataInfo reportsMetadataInfo = prepareReportsMetadataInfo(); + + when(commcareHttpClient.reportsListMetadataRequest(configService.getByName(null).getAccountConfig())).thenReturn(getResponseForReportsListMetadata()); + + ReportsMetadataInfo fetched = reportService.getReportsList(); + + assertEquals(reportsMetadataInfo, fetched); + } + + @Test + public void shouldGetReportById() { + ReportDataInfo reportDataInfo = prepareReportDataInfo(); + + when(commcareHttpClient.singleReportDataRequest(config.getAccountConfig(), REPORT_ID)).thenReturn(getResponseForReportData()); + + ReportDataInfo fetched = reportService.getReportById(REPORT_ID); + + assertEquals(reportDataInfo, fetched); + + } + + private String getResponseForReportsListMetadata() { + return getRawJson(REPORTS_LIST_METADATA_RESPONSE); + } + + private String getResponseForReportData() { + return getRawJson(REPORT_DATA_RESPONSE); + } + + private String getRawJson(String path) { + try { + URL url = this.getClass().getClassLoader().getResource(path); + return FileUtils.readFileToString(new File(url.getFile())); + } catch (IOException e) { + LOGGER.error(e.getMessage(), e); + return null; + } + } + + private ReportsMetadataInfo prepareReportsMetadataInfo() { + List reportMetadataInfoList = new ArrayList<>(); + + List columns = new ArrayList<>(); + columns.add(new ReportMetadataColumn("name", "Name", ColumnType.FIELD)); + columns.add(new ReportMetadataColumn("gender", "Gender", ColumnType.EXPANDED)); + columns.add(new ReportMetadataColumn("address", "Person Address", ColumnType.FIELD)); + + List filters = new ArrayList<>(); + filters.add(new ReportMetadataFilter(FilterDataType.STRING, "closed", FilterType.CHOICE_LIST)); + filters.add(new ReportMetadataFilter(FilterDataType.STRING, "owner_name", FilterType.CHOICE_LIST)); + + reportMetadataInfoList.add(new ReportMetadataInfo("9aab0eeb88555a7b3bc8676883e7379a", "Test Report 1", columns, filters)); + + columns = new ArrayList<>(); + columns.add(new ReportMetadataColumn("district", "District", ColumnType.FIELD)); + columns.add(new ReportMetadataColumn("number_of_children_visited", "Num Children Visited", ColumnType.FIELD)); + columns.add(new ReportMetadataColumn("number_of_children_underweight", "Underweight", ColumnType.FIELD)); + + filters = new ArrayList<>(); + filters.add(new ReportMetadataFilter(FilterDataType.STRING, "closed", FilterType.CHOICE_LIST)); + filters.add(new ReportMetadataFilter(FilterDataType.STRING, "owner_name", FilterType.CHOICE_LIST)); + filters.add(new ReportMetadataFilter(FilterDataType.INTEGER, "child_age", FilterType.DYNAMIC_CHOICE_LIST)); + filters.add(new ReportMetadataFilter(FilterDataType.STRING, "form_date", FilterType.DATE)); + + reportMetadataInfoList.add(new ReportMetadataInfo("9aab0eeb88555a7b4568676883e7379a", "Test Report 2", columns, filters)); + + CommcareMetadataInfo metadataInfo = new CommcareMetadataInfo(0, null, 0, null, 2); + + return new ReportsMetadataInfo(reportMetadataInfoList, metadataInfo); + } + + private ReportDataInfo prepareReportDataInfo() { + List columns = new ArrayList<>(); + columns.add(new ReportDataColumn("District", "district", null)); + columns.add(new ReportDataColumn("Num Children Visited", "number_of_children_visited", null)); + columns.add(new ReportDataColumn("Gender-male", "gender-male", "male")); + columns.add(new ReportDataColumn("Gender-female", "gender-female", "female")); + + List> data = new ArrayList<>(); + Map singleData = new HashMap<>(); + singleData.put("district", "Middlesex"); + singleData.put("number_of_children_visited", "46"); + singleData.put("gender-male", "10"); + singleData.put("gender-female", "35"); + data.add(singleData); + + singleData = new HashMap<>(); + singleData.put("district", "Suffolk"); + singleData.put("number_of_children_visited", "85"); + singleData.put("gender-male", "81"); + singleData.put("gender-female", "4"); + data.add(singleData); + + return new ReportDataInfo(columns, data, "/a/domainOne/api/v0.5/configurablereportdata/9aab0eeb88555a7b4568676883e7379a/?offset=3&limit=3&state=vermont", 30); + } +} diff --git a/commcare/src/test/java/org/motechproject/commcare/service/impl/parser/CommcareEventParsersTest.java b/commcare/src/test/java/org/motechproject/commcare/service/impl/parser/CommcareEventParsersTest.java index 4a87cc28e..5bbd0e3c4 100644 --- a/commcare/src/test/java/org/motechproject/commcare/service/impl/parser/CommcareEventParsersTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/service/impl/parser/CommcareEventParsersTest.java @@ -78,8 +78,8 @@ public void setUp() throws EndpointNotSupported { request.setPathInfo("/forms/"+ config.getName()); ArgumentCaptor captor = ArgumentCaptor.forClass(MotechEvent.class); - formsController.receiveForm(ResponseXML.getFormXML(), request); - formsController.receiveForm(ResponseXML.getFormXMLWithRepeatData(), request); + formsController.receiveForm(ResponseXML.getFormXML(), request, null); + formsController.receiveForm(ResponseXML.getFormXMLWithRepeatData(), request, null); request.setContent(ResponseXML.getCaseXML().getBytes()); casesController.receiveCase(request, config.getName()); diff --git a/commcare/src/test/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilderTest.java b/commcare/src/test/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilderTest.java index 77f162485..82e5087a5 100644 --- a/commcare/src/test/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilderTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/tasks/builder/CaseTriggerBuilderTest.java @@ -95,6 +95,11 @@ public void shouldBuildProperTriggerRequestForCases() { assertEquals("Received Case: death [app2: ConfigOne]", request.getDisplayName()); assertTrue(hasEventKey(request.getEventParameters(), CASE_FIELD6)); break; + case "org.motechproject.commcare.api.case.ConfigOne.checkup": + assertEquals(1 + CASE_PREDEFINED_FIELDS, request.getEventParameters().size()); + assertEquals("Received Case: checkup [app3: ConfigOne]", request.getDisplayName()); + assertTrue(hasEventKey(request.getEventParameters(), CASE_FIELD6)); + break; case "org.motechproject.commcare.api.case.ConfigTwo.visit": assertEquals(3 + CASE_PREDEFINED_FIELDS, request.getEventParameters().size()); assertEquals("Received Case: visit [app1: ConfigTwo]", request.getDisplayName()); diff --git a/commcare/src/test/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilderTest.java b/commcare/src/test/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilderTest.java index 2b71c030c..b06678bd2 100644 --- a/commcare/src/test/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilderTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/tasks/builder/FormTriggerBuilderTest.java @@ -32,6 +32,8 @@ import static org.motechproject.commcare.util.DummyCommcareSchema.XMLNS3; import static org.motechproject.commcare.util.DummyCommcareSchema.XMLNS4; import static org.motechproject.commcare.util.DummyCommcareSchema.XMLNS5; +import static org.motechproject.commcare.util.DummyCommcareSchema.APP_ID1; +import static org.motechproject.commcare.util.DummyCommcareSchema.APP_ID2; public class FormTriggerBuilderTest { @@ -88,28 +90,33 @@ public void shouldBuildProperTriggerRequestForCases() { String subject = request.getSubject(); switch (subject) { - case BASE_SUBJECT_ONE + "." + XMLNS1: + case BASE_SUBJECT_ONE + "." + XMLNS1 + APP_ID1: assertEquals(2 + FORM_PREDEFINED_FIELDS, request.getEventParameters().size()); assertEquals("Received Form: form1 [app1: ConfigOne]", request.getDisplayName()); assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION1)); assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION2)); break; - case BASE_SUBJECT_ONE + "." + XMLNS2: + case BASE_SUBJECT_ONE + "." + XMLNS2 + APP_ID1: assertEquals(1 + FORM_PREDEFINED_FIELDS, request.getEventParameters().size()); assertEquals("Received Form: form2 [app1: ConfigOne]", request.getDisplayName()); assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION3)); break; - case BASE_SUBJECT_ONE + "." + XMLNS3: + case BASE_SUBJECT_ONE + "." + XMLNS3 + APP_ID1: assertEquals(1 + FORM_PREDEFINED_FIELDS, request.getEventParameters().size()); assertEquals("Received Form: form3 [app1: ConfigOne]", request.getDisplayName()); assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION4)); break; - case BASE_SUBJECT_ONE + "." + XMLNS4: + case BASE_SUBJECT_ONE + "." + XMLNS4 + APP_ID2: assertEquals(1 + FORM_PREDEFINED_FIELDS, request.getEventParameters().size()); assertEquals("Received Form: form4 [app2: ConfigOne]", request.getDisplayName()); assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION5)); break; - case BASE_SUBJECT_TWO + "." + XMLNS5: + case BASE_SUBJECT_ONE + "." + XMLNS1: + assertEquals(1 + FORM_PREDEFINED_FIELDS, request.getEventParameters().size()); + assertEquals("Received Form: form5 [app3: ConfigOne]", request.getDisplayName()); + assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION5)); + break; + case BASE_SUBJECT_TWO + "." + XMLNS5 + APP_ID1: assertEquals(1 + FORM_PREDEFINED_FIELDS, request.getEventParameters().size()); assertEquals("Received Form: form5 [app1: ConfigTwo]", request.getDisplayName()); assertTrue(hasEventKey(request.getEventParameters(), FORM_QUESTION4)); diff --git a/commcare/src/test/java/org/motechproject/commcare/tasks/builder/ReportTriggerBuilderTest.java b/commcare/src/test/java/org/motechproject/commcare/tasks/builder/ReportTriggerBuilderTest.java new file mode 100644 index 000000000..98c8c2450 --- /dev/null +++ b/commcare/src/test/java/org/motechproject/commcare/tasks/builder/ReportTriggerBuilderTest.java @@ -0,0 +1,104 @@ +package org.motechproject.commcare.tasks.builder; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.motechproject.commcare.config.Configs; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.commcare.events.constants.EventSubjects; +import org.motechproject.commcare.service.CommcareConfigService; +import org.motechproject.commcare.service.CommcareSchemaService; +import org.motechproject.commcare.util.ConfigsUtils; +import org.motechproject.commcare.util.DummyCommcareSchema; +import org.motechproject.tasks.contract.EventParameterRequest; +import org.motechproject.tasks.contract.TriggerEventRequest; + +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; +import static org.motechproject.commcare.util.DummyCommcareSchema.REPORT_COLUMN1_VALUE; +import static org.motechproject.commcare.util.DummyCommcareSchema.REPORT_COLUMN4_VALUE; +import static org.motechproject.commcare.util.DummyCommcareSchema.REPORT_COLUMN5_VALUE; + +public class ReportTriggerBuilderTest { + + @Mock + private CommcareSchemaService schemaService; + + @Mock + private CommcareConfigService configService; + + private Configs configs = ConfigsUtils.prepareConfigsWithThreeConfigs(); + + private ReportTriggerBuilder reportTriggerBuilder; + + private static final String FIRST_REPORT_NAME = "reportOne"; + private static final String SECOND_REPORT_NAME = "reportTwo"; + + private static final String BASE_SUBJECT_ONE = EventSubjects.RECEIVED_REPORT + ".ConfigOne."; + private static final String BASE_SUBJECT_TWO = EventSubjects.RECEIVED_REPORT + ".ConfigTwo."; + + @Before + public void setUp() { + initMocks(this); + when(configService.getConfigs()).thenReturn(configs); + when(schemaService.getReportsMetadata("ConfigOne")).thenReturn(DummyCommcareSchema.getReportsMetadataForConfigOne()); + when(schemaService.getReportsMetadata("ConfigTwo")).thenReturn(DummyCommcareSchema.getReportsMetadataForConfigTwo()); + + reportTriggerBuilder = new ReportTriggerBuilder(schemaService, configService); + } + + @Test + public void shouldBuildProperTriggerRequestForReports() { + List triggers = reportTriggerBuilder.buildTriggers(); + + assertFalse(triggers.isEmpty()); + + int counter = 0; + for (ReportsMetadataInfo reports : DummyCommcareSchema.getReportsMetadataForConfigOne()) { + counter += reports.getReportMetadataInfoList().size(); + } + + for (ReportsMetadataInfo reports : DummyCommcareSchema.getReportsMetadataForConfigTwo()) { + counter += reports.getReportMetadataInfoList().size(); + } + + assertEquals(counter, triggers.size()); + + for (TriggerEventRequest request : triggers) { + String subject = request.getSubject(); + + switch (subject) { + case BASE_SUBJECT_ONE + DummyCommcareSchema.REPORT_ID1: + assertEquals("Received Report: Test Report 1 [ConfigOne]", request.getDisplayName()); + assertTrue(hasEventKey(request.getEventParameters(), REPORT_COLUMN1_VALUE)); + break; + case BASE_SUBJECT_ONE + DummyCommcareSchema.REPORT_ID2: + assertEquals("Received Report: Test Report 2 [ConfigOne]", request.getDisplayName()); + assertTrue(hasEventKey(request.getEventParameters(), REPORT_COLUMN4_VALUE)); + break; + case BASE_SUBJECT_TWO + DummyCommcareSchema.REPORT_ID1: + assertEquals("Received Report: Test Report 1 [ConfigTwo]", request.getDisplayName()); + assertTrue(hasEventKey(request.getEventParameters(), REPORT_COLUMN5_VALUE)); + break; + default: + fail("Found trigger with incorrect subject: " + subject); + } + } + } + + private boolean hasEventKey(List eventParameters, String key) { + for (EventParameterRequest parameter : eventParameters) { + if (parameter.getEventKey().equals(key)) { + return true; + } + } + + return false; + } +} diff --git a/commcare/src/test/java/org/motechproject/commcare/util/DummyCommcareSchema.java b/commcare/src/test/java/org/motechproject/commcare/util/DummyCommcareSchema.java index 754eed3ba..eb65cad42 100644 --- a/commcare/src/test/java/org/motechproject/commcare/util/DummyCommcareSchema.java +++ b/commcare/src/test/java/org/motechproject/commcare/util/DummyCommcareSchema.java @@ -4,6 +4,13 @@ import org.motechproject.commcare.domain.CommcareModuleJson; import org.motechproject.commcare.domain.FormSchemaJson; import org.motechproject.commcare.domain.FormSchemaQuestionJson; +import org.motechproject.commcare.domain.report.ReportMetadataColumn; +import org.motechproject.commcare.domain.report.ReportMetadataFilter; +import org.motechproject.commcare.domain.report.ReportMetadataInfo; +import org.motechproject.commcare.domain.report.ReportsMetadataInfo; +import org.motechproject.commcare.domain.report.constants.ColumnType; +import org.motechproject.commcare.domain.report.constants.FilterDataType; +import org.motechproject.commcare.domain.report.constants.FilterType; import java.util.ArrayList; import java.util.Arrays; @@ -33,6 +40,34 @@ public final class DummyCommcareSchema { public static final String XMLNS4 = "http://openrosa.org/formdesigner/32KE58A2-54C5-1Z4B-AR2S-Z0345995RF9E"; public static final String XMLNS5 = "http://openrosa.org/formdesigner/13KE58A2-54C5-1Z4B-AR2S-Z0345995RF9E"; + public static final String APP_ID1 = "cef11d974db0f4b69b465df85ef8c826"; + public static final String APP_ID2 = "053c85550dc563a682ff610dab71f8d5"; + + public static final String REPORT_ID1 = "9aab0eeb88555a7b3bc8676883e7379a"; + public static final String REPORT_ID2 = "9aab0eeb88555a7b4568676883e7379a"; + + public static final String REPORT_TITLE1 = "Test Report 1"; + public static final String REPORT_TITLE2 = "Test Report 2"; + + public static final String REPORT_UNICODE_FILTER_SLUG = "unicode_filter"; + public static final String REPORT_DECIMAL_FILTER_SLUG = "decimal_filter"; + public static final String REPORT_DATE_FILTER_SLUG = "date_filter"; + public static final String REPORT_DYNAMIC_UNICODE_FILTER_SLUG = "dynamic_unicode_filter"; + + public static final String REPORT_COLUMN1 = "district"; + public static final String REPORT_COLUMN2 = "number_of_children_visited"; + public static final String REPORT_COLUMN3 = "owner_name"; + public static final String REPORT_COLUMN4 = "birth_date"; + public static final String REPORT_COLUMN5 = "gender"; + public static final String REPORT_COLUMN6 = "child_age"; + + public static final String REPORT_COLUMN1_VALUE = "District"; + public static final String REPORT_COLUMN2_VALUE = "Number of children visited"; + public static final String REPORT_COLUMN3_VALUE = "Owner name"; + public static final String REPORT_COLUMN4_VALUE = "Birth date"; + public static final String REPORT_COLUMN5_VALUE = "Gender"; + public static final String REPORT_COLUMN6_VALUE = "Child Age"; + public static List getApplicationsForConfigOne() { List applicationsInConfig1 = new ArrayList<>(); @@ -40,11 +75,13 @@ public static List getApplicationsForConfigOne() { Map formNames2 = new HashMap<>(); Map formNames3 = new HashMap<>(); Map formNames4 = new HashMap<>(); + Map formNames5 = new HashMap<>(); formNames1.put("en", "form1"); formNames2.put("en", "form2"); formNames3.put("en", "form3"); formNames4.put("en", "form4"); + formNames5.put("en", "form5"); List fields1 = new ArrayList<>(); List fields2 = new ArrayList<>(); @@ -99,6 +136,11 @@ public static List getApplicationsForConfigOne() { formSchemaJson4.setQuestions(Collections.singletonList(questionJson5)); formSchemaJson4.setXmlns(XMLNS4); + FormSchemaJson formSchemaJson5 = new FormSchemaJson(); + formSchemaJson5.setFormNames(formNames5); + formSchemaJson5.setQuestions(Collections.singletonList(questionJson5)); + formSchemaJson5.setXmlns(XMLNS1); + CommcareModuleJson commcareModuleJson1 = new CommcareModuleJson(); commcareModuleJson1.setFormSchemas(Arrays.asList(formSchemaJson1, formSchemaJson2)); commcareModuleJson1.setCaseType("birth"); @@ -114,16 +156,29 @@ public static List getApplicationsForConfigOne() { commcareModuleJson3.setCaseType("death"); commcareModuleJson3.setCaseProperties(fields3); + CommcareModuleJson commcareModuleJson4 = new CommcareModuleJson(); + commcareModuleJson4.setFormSchemas(Collections.singletonList(formSchemaJson5)); + commcareModuleJson4.setCaseType("checkup"); + commcareModuleJson4.setCaseProperties(fields3); + CommcareApplicationJson commcareApplicationJson1 = new CommcareApplicationJson(); commcareApplicationJson1.setApplicationName("app1"); + commcareApplicationJson1.setCommcareAppId(APP_ID1); commcareApplicationJson1.setModules(Arrays.asList(commcareModuleJson1, commcareModuleJson2)); CommcareApplicationJson commcareApplicationJson2 = new CommcareApplicationJson(); commcareApplicationJson2.setApplicationName("app2"); + commcareApplicationJson2.setCommcareAppId(APP_ID2); commcareApplicationJson2.setModules(Collections.singletonList((commcareModuleJson3))); + CommcareApplicationJson commcareApplicationJson3 = new CommcareApplicationJson(); + commcareApplicationJson3.setApplicationName("app3"); + commcareApplicationJson3.setCommcareAppId(null); + commcareApplicationJson3.setModules(Collections.singletonList((commcareModuleJson4))); + applicationsInConfig1.add(commcareApplicationJson1); applicationsInConfig1.add(commcareApplicationJson2); + applicationsInConfig1.add(commcareApplicationJson3); return applicationsInConfig1; } @@ -156,6 +211,7 @@ public static List getApplicationsForConfigTwo() { CommcareApplicationJson commcareApplicationJson3 = new CommcareApplicationJson(); commcareApplicationJson3.setApplicationName("app1"); + commcareApplicationJson3.setCommcareAppId(APP_ID1); commcareApplicationJson3.setModules(Collections.singletonList((commcareModuleJson4))); applicationsInConfig2.add(commcareApplicationJson3); @@ -191,6 +247,7 @@ public static List getApplicationsForConfigThree() { CommcareApplicationJson commcareApplicationJson3 = new CommcareApplicationJson(); commcareApplicationJson3.setApplicationName("app1"); + commcareApplicationJson3.setCommcareAppId(APP_ID1); commcareApplicationJson3.setModules(Collections.singletonList((commcareModuleJson5))); applicationsInConfig3.add(commcareApplicationJson3); @@ -222,4 +279,84 @@ public static List getApplicationsWithCustomQuestionLab return applicationsInConfig; } + + public static List getReportsMetadataForConfigOne() { + List reportsInConfig1 = new ArrayList<>(); + + ReportsMetadataInfo report1 = new ReportsMetadataInfo(); + + List reportsMetadata = new ArrayList<>(); + + ReportMetadataInfo reportOneMetadata = new ReportMetadataInfo(); + List columnsInReportOne = new ArrayList<>(); + List filtersInreportOne = new ArrayList<>(); + + columnsInReportOne.add(new ReportMetadataColumn(REPORT_COLUMN1, REPORT_COLUMN1_VALUE, ColumnType.FIELD)); + columnsInReportOne.add(new ReportMetadataColumn(REPORT_COLUMN2, REPORT_COLUMN2_VALUE, ColumnType.EXPANDED)); + columnsInReportOne.add(new ReportMetadataColumn(REPORT_COLUMN3, REPORT_COLUMN3_VALUE, ColumnType.PERCENT)); + + filtersInreportOne.add(new ReportMetadataFilter(FilterDataType.DECIMAL, REPORT_DECIMAL_FILTER_SLUG, FilterType.NUMERIC)); + filtersInreportOne.add(new ReportMetadataFilter(FilterDataType.STRING, REPORT_UNICODE_FILTER_SLUG, FilterType.CHOICE_LIST)); + filtersInreportOne.add(new ReportMetadataFilter(FilterDataType.STRING, REPORT_DATE_FILTER_SLUG, FilterType.DATE)); + + ReportMetadataInfo reportTwoMetadata = new ReportMetadataInfo(); + List columnsInReportTwo = new ArrayList<>(); + List filtersInreportTwo = new ArrayList<>(); + + columnsInReportTwo.add(new ReportMetadataColumn(REPORT_COLUMN4, REPORT_COLUMN4_VALUE, ColumnType.FIELD)); + columnsInReportTwo.add(new ReportMetadataColumn(REPORT_COLUMN5, REPORT_COLUMN5_VALUE, ColumnType.EXPANDED)); + columnsInReportTwo.add(new ReportMetadataColumn(REPORT_COLUMN6, REPORT_COLUMN6_VALUE, ColumnType.FIELD)); + + filtersInreportTwo.add(new ReportMetadataFilter(FilterDataType.DECIMAL, REPORT_DYNAMIC_UNICODE_FILTER_SLUG, FilterType.DYNAMIC_CHOICE_LIST)); + filtersInreportTwo.add(new ReportMetadataFilter(FilterDataType.STRING, REPORT_UNICODE_FILTER_SLUG, FilterType.CHOICE_LIST)); + filtersInreportTwo.add(new ReportMetadataFilter(FilterDataType.STRING, REPORT_DATE_FILTER_SLUG, FilterType.DATE)); + + reportOneMetadata.setId(REPORT_ID1); + reportOneMetadata.setTitle(REPORT_TITLE1); + reportOneMetadata.setColumns(columnsInReportOne); + reportOneMetadata.setFilters(filtersInreportOne); + reportsMetadata.add(reportOneMetadata); + + reportTwoMetadata.setId(REPORT_ID2); + reportTwoMetadata.setTitle(REPORT_TITLE2); + reportTwoMetadata.setColumns(columnsInReportTwo); + reportTwoMetadata.setFilters(filtersInreportTwo); + reportsMetadata.add(reportTwoMetadata); + + report1.setReportMetadataInfoList(reportsMetadata); + reportsInConfig1.add(report1); + + return reportsInConfig1; + } + + public static List getReportsMetadataForConfigTwo() { + List reportsInConfig2 = new ArrayList<>(); + ReportsMetadataInfo report1 = new ReportsMetadataInfo(); + List reportsMetadata = new ArrayList<>(); + + ReportMetadataInfo reportOneMetadata = new ReportMetadataInfo(); + + List columnsInReportOne = new ArrayList<>(); + List filtersInreportOne = new ArrayList<>(); + + columnsInReportOne.add(new ReportMetadataColumn(REPORT_COLUMN6, REPORT_COLUMN6_VALUE, ColumnType.FIELD)); + columnsInReportOne.add(new ReportMetadataColumn(REPORT_COLUMN5, REPORT_COLUMN5_VALUE, ColumnType.EXPANDED)); + columnsInReportOne.add(new ReportMetadataColumn(REPORT_COLUMN4, REPORT_COLUMN4_VALUE, ColumnType.PERCENT)); + + filtersInreportOne.add(new ReportMetadataFilter(FilterDataType.DECIMAL, REPORT_DECIMAL_FILTER_SLUG, FilterType.NUMERIC)); + filtersInreportOne.add(new ReportMetadataFilter(FilterDataType.STRING, REPORT_UNICODE_FILTER_SLUG, FilterType.CHOICE_LIST)); + filtersInreportOne.add(new ReportMetadataFilter(FilterDataType.STRING, REPORT_DATE_FILTER_SLUG, FilterType.DATE)); + + reportOneMetadata.setId(REPORT_ID1); + reportOneMetadata.setTitle(REPORT_TITLE1); + reportOneMetadata.setColumns(columnsInReportOne); + reportOneMetadata.setFilters(filtersInreportOne); + reportsMetadata.add(reportOneMetadata); + + report1.setReportMetadataInfoList(reportsMetadata); + + reportsInConfig2.add(report1); + + return reportsInConfig2; + } } diff --git a/commcare/src/test/java/org/motechproject/commcare/web/CaseImportControllerTest.java b/commcare/src/test/java/org/motechproject/commcare/web/CaseImportControllerTest.java new file mode 100644 index 000000000..dd02a9f02 --- /dev/null +++ b/commcare/src/test/java/org/motechproject/commcare/web/CaseImportControllerTest.java @@ -0,0 +1,136 @@ +package org.motechproject.commcare.web; + +import org.apache.commons.io.IOUtils; +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.motechproject.commcare.pull.CaseImportStatus; +import org.motechproject.commcare.pull.CommcareCaseImporter; +import org.motechproject.commcare.pull.CommcareCaseImporterFactory; +import org.motechproject.commcare.util.CommcareParamHelper; +import org.motechproject.commons.api.Range; +import org.motechproject.commons.date.util.DateUtil; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.web.server.MockMvc; +import org.springframework.test.web.server.setup.MockMvcBuilders; + +import javax.servlet.http.HttpSession; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import static org.springframework.test.web.server.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.server.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.server.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.server.result.MockMvcResultMatchers.status; + +@RunWith(MockitoJUnitRunner.class) +public class CaseImportControllerTest { + + @InjectMocks + private CaseImportController caseImportController = new CaseImportController(); + + @Mock + private CommcareCaseImporterFactory importerFactory; + + @Mock + private CommcareCaseImporter caseImporter; + + private MockMvc controller; + + private final ObjectMapper objectMapper = new ObjectMapper(); + + @Before + public void setup() { + when(importerFactory.getImporter(any(HttpSession.class))).thenReturn(caseImporter); + controller = MockMvcBuilders.standaloneSetup(caseImportController).build(); + } + + @Test + public void shouldAllowCheckingImportStatus() throws Exception { + CaseImportStatus status = new CaseImportStatus(); + status.setImportInProgress(true); + status.setCasesImported(200); + status.setTotalCases(600); + status.setError(false); + status.setLastImportDate(CommcareParamHelper.printDateTime(DateUtil.now())); + + when(caseImporter.importStatus()).thenReturn(status); + + controller.perform(get("/case-import/status")) + .andExpect(status().is(HttpStatus.OK.value())) + .andExpect(content().type("application/json;charset=UTF-8")) + .andExpect(content().string(objectMapper.writeValueAsString(status))); + } + + @Test + public void shouldAllowImportInit() throws Exception { + when(caseImporter.countForImport(any(Range.class), eq("configName"))).thenReturn(1672); + + controller.perform(post("/case-import/init").body(requestJson().getBytes(Charset.forName("UTF-8"))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().is(HttpStatus.OK.value())) + .andExpect(content().type("application/json;charset=UTF-8")) + .andExpect(content().string("1672")); + + ArgumentCaptor captor = ArgumentCaptor.forClass(Range.class); + verify(caseImporter).countForImport(captor.capture(), eq("configName")); + verifyDateRange(captor.getValue()); + } + + @Test + public void shouldStartImport() throws Exception { + controller.perform(post("/case-import/start").body(requestJson().getBytes(Charset.forName("UTF-8"))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().is(HttpStatus.OK.value())); + + ArgumentCaptor captor = ArgumentCaptor.forClass(Range.class); + verify(caseImporter).startImport(captor.capture(), eq("configName")); + verifyDateRange(captor.getValue()); + } + + @Test + public void shouldStartImportByCaseId() throws Exception { + controller.perform(post("/case-import/import-by-id").body(requestJsonWithCaseId().getBytes(Charset.forName("UTF-8"))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().is(HttpStatus.OK.value())); + + ArgumentCaptor captor = ArgumentCaptor.forClass(String.class); + verify(caseImporter).importSingleCase(captor.capture(), eq("configName")); + } + + private String requestJson() throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("json/web/case-import-request.json")) { + return IOUtils.toString(in); + } + } + + private String requestJsonWithCaseId() throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("json/web/case-import-request-caseid.json")) { + return IOUtils.toString(in); + } + } + + private void verifyDateRange(Range dtRange) { + assertNotNull(dtRange); + assertEquals(new DateTime(2015, 3, 22, 17, 45, 35, 0, DateTimeZone.UTC), dtRange.getMin()); + assertEquals(new DateTime(2015, 11, 10, 8, 16, 21, 0, DateTimeZone.UTC), dtRange.getMax()); + } +} diff --git a/commcare/src/test/java/org/motechproject/commcare/web/FormImportControllerTest.java b/commcare/src/test/java/org/motechproject/commcare/web/FormImportControllerTest.java index 5f8308210..9933c0e38 100644 --- a/commcare/src/test/java/org/motechproject/commcare/web/FormImportControllerTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/web/FormImportControllerTest.java @@ -93,6 +93,20 @@ public void shouldAllowImportInit() throws Exception { verifyDateRange(captor.getValue()); } + @Test + public void shouldAllowImportInitByFormId() throws Exception { + when(formImporter.checkFormIdForImport(any(String.class), eq("configName"))).thenReturn(true); + + controller.perform(post("/form-import/init").body(requestJsonForFormId().getBytes(Charset.forName("UTF-8"))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().is(HttpStatus.OK.value())) + .andExpect(content().type("application/json;charset=UTF-8")) + .andExpect(content().string("1")); + + ArgumentCaptor captor = ArgumentCaptor.forClass(String.class); + verify(formImporter).checkFormIdForImport(captor.capture(), eq("configName")); + } + @Test public void shouldStartImport() throws Exception { controller.perform(post("/form-import/start").body(requestJson().getBytes(Charset.forName("UTF-8"))) @@ -104,6 +118,16 @@ public void shouldStartImport() throws Exception { verifyDateRange(captor.getValue()); } + @Test + public void shouldStartImportByFormId() throws Exception { + controller.perform(post("/form-import/start").body(requestJsonForFormId().getBytes(Charset.forName("UTF-8"))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().is(HttpStatus.OK.value())); + + ArgumentCaptor captor = ArgumentCaptor.forClass(String.class); + verify(formImporter).startImportById(captor.capture(), eq("configName")); + } + private void verifyDateRange(Range dtRange) { assertNotNull(dtRange); assertEquals(new DateTime(2012, 9, 29, 17, 24, 52, 0, DateTimeZone.UTC), dtRange.getMin()); @@ -115,4 +139,10 @@ private String requestJson() throws IOException { return IOUtils.toString(in); } } + + private String requestJsonForFormId() throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("json/web/import-request-form-id.json")) { + return IOUtils.toString(in); + } + } } diff --git a/commcare/src/test/java/org/motechproject/commcare/web/FullFormControllerTest.java b/commcare/src/test/java/org/motechproject/commcare/web/FullFormControllerTest.java index e832aca90..2bfed5794 100644 --- a/commcare/src/test/java/org/motechproject/commcare/web/FullFormControllerTest.java +++ b/commcare/src/test/java/org/motechproject/commcare/web/FullFormControllerTest.java @@ -11,6 +11,7 @@ import org.motechproject.commcare.service.CommcareConfigService; import org.motechproject.commcare.service.impl.CommcareFormsEventParser; import org.motechproject.commcare.util.ConfigsUtils; +import org.motechproject.commcare.util.DummyCommcareSchema; import org.motechproject.commcare.util.ResponseXML; import org.motechproject.commons.api.TasksEventParser; import org.motechproject.event.MotechEvent; @@ -68,7 +69,7 @@ public void setUp() throws Exception { public void testIncomingFormsFailure() throws EndpointNotSupported { ArgumentCaptor captor = ArgumentCaptor.forClass(MotechEvent.class); - controller.receiveForm("", request); + controller.receiveForm("", request, null); verify(eventRelay, times(2)).sendEventMessage(captor.capture()); } @@ -76,7 +77,7 @@ public void testIncomingFormsFailure() throws EndpointNotSupported { public void testIncomingDeviceReport() throws EndpointNotSupported { ArgumentCaptor captor = ArgumentCaptor.forClass(MotechEvent.class); - controller.receiveForm(ResponseXML.getDeviceReportXML(), request); + controller.receiveForm(ResponseXML.getDeviceReportXML(), request, DummyCommcareSchema.APP_ID1); verify(eventRelay).sendEventMessage(captor.capture()); MotechEvent event = captor.getValue(); @@ -93,8 +94,9 @@ public void testIncomingDeviceReport() throws EndpointNotSupported { assertEquals("2012-07-21T15:22:34.046462Z", parameters.get(RECEIVED_ON)); Map attributes = (Map) parameters.get(ATTRIBUTES); - assertEquals(1, attributes.size()); + assertEquals(2, attributes.size()); assertEquals("http://code.javarosa.org/devicereport", attributes.get("xmlns")); + assertEquals(DummyCommcareSchema.APP_ID1, attributes.get("app_id")); Multimap subElements = (Multimap) parameters.get(SUB_ELEMENTS); assertEquals(1, subElements.size()); @@ -106,7 +108,7 @@ public void testIncomingDeviceReport() throws EndpointNotSupported { public void testIncomingFormsSuccess() throws EndpointNotSupported { ArgumentCaptor captor = ArgumentCaptor.forClass(MotechEvent.class); - controller.receiveForm(ResponseXML.getFormXML(), request); + controller.receiveForm(ResponseXML.getFormXML(), request, DummyCommcareSchema.APP_ID1); verify(eventRelay).sendEventMessage(captor.capture()); MotechEvent event = captor.getValue(); @@ -125,11 +127,12 @@ public void testIncomingFormsSuccess() throws EndpointNotSupported { assertEquals("2012-07-21T15:22:34.046462Z", parameters.get(RECEIVED_ON)); Map attributes = (Map) parameters.get(ATTRIBUTES); - assertEquals(4, attributes.size()); + assertEquals(5, attributes.size()); assertEquals("1", attributes.get("uiVersion")); assertEquals("41", attributes.get("version")); assertEquals(ResponseXML.FORM_NAME, attributes.get("name")); - assertEquals("http://openrosa.org/formdesigner/84FA38A2-93C1-4B9E-AA2A-0E082995FF9E", attributes.get("xmlns")); + assertEquals(DummyCommcareSchema.XMLNS1, attributes.get("xmlns")); + assertEquals(DummyCommcareSchema.APP_ID1, attributes.get("app_id")); Multimap subElements = (Multimap) parameters.get(SUB_ELEMENTS); assertEquals(5, subElements.size()); diff --git a/commcare/src/test/resources/json/service/reportDataResponse.json b/commcare/src/test/resources/json/service/reportDataResponse.json new file mode 100644 index 000000000..9bf8a5b62 --- /dev/null +++ b/commcare/src/test/resources/json/service/reportDataResponse.json @@ -0,0 +1,38 @@ +{ + "columns": [ + { + "header": "District", + "slug": "district" + }, + { + "header": "Num Children Visited", + "slug": "number_of_children_visited" + }, + { + "header": "Gender-male", + "expand_column_value": "male", + "slug": "gender-male" + }, + { + "header": "Gender-female", + "expand_column_value": "female", + "slug": "gender-female" + } + ], + "data": [ + { + "district": "Middlesex", + "number_of_children_visited": 46, + "gender-male": 10, + "gender-female": 35 + }, + { + "district": "Suffolk", + "number_of_children_visited": 85, + "gender-male": 81, + "gender-female": 4 + } + ], + "next_page": "/a/domainOne/api/v0.5/configurablereportdata/9aab0eeb88555a7b4568676883e7379a/?offset=3&limit=3&state=vermont", + "total_records": 30 +} \ No newline at end of file diff --git a/commcare/src/test/resources/json/service/reportsListMetadataResponse.json b/commcare/src/test/resources/json/service/reportsListMetadataResponse.json new file mode 100644 index 000000000..0042f4deb --- /dev/null +++ b/commcare/src/test/resources/json/service/reportsListMetadataResponse.json @@ -0,0 +1,85 @@ +{ + "meta": { + "total_count": 2 + }, + "objects": [ + { + "columns": [ + { + "column_id": "name", + "display": "Name", + "type": "field" + }, + { + "column_id": "gender", + "display": "Gender", + "type": "expanded" + }, + { + "column_id": "address", + "display": "Person Address", + "type": "field" + } + ], + "filters": [ + { + "datatype": "string", + "slug": "closed", + "type": "choice_list" + }, + { + "datatype": "string", + "slug": "owner_name", + "type": "choice_list" + } + ], + "title": "Test Report 1", + "id": "9aab0eeb88555a7b3bc8676883e7379a", + "resource_uri": "/a/domainOne/api/v0.5/simplereportconfiguration/9aab0eeb88555a7b3bc8676883e7379a/" + }, + { + "columns": [ + { + "column_id": "district", + "display": "District", + "type": "field" + }, + { + "column_id": "number_of_children_visited", + "display": "Num Children Visited", + "type": "field" + }, + { + "column_id": "number_of_children_underweight", + "display": "Underweight", + "type": "field" + } + ], + "filters": [ + { + "datatype": "string", + "slug": "closed", + "type": "choice_list" + }, + { + "datatype": "string", + "slug": "owner_name", + "type": "choice_list" + }, + { + "datatype": "integer", + "slug": "child_age", + "type": "dynamic_choice_list" + }, + { + "datatype": "string", + "slug": "form_date", + "type": "date" + } + ], + "title": "Test Report 2", + "id": "9aab0eeb88555a7b4568676883e7379a", + "resource_uri": "/a/domainOne/api/v0.5/simplereportconfiguration/9aab0eeb88555a7b4568676883e7379a/" + } + ] +} \ No newline at end of file diff --git a/commcare/src/test/resources/json/web/case-import-request-caseid.json b/commcare/src/test/resources/json/web/case-import-request-caseid.json new file mode 100644 index 000000000..4112850de --- /dev/null +++ b/commcare/src/test/resources/json/web/case-import-request-caseid.json @@ -0,0 +1,6 @@ +{ + "config" : "configName", + "modifiedDateStart" : "2015-03-22T17:45:35", + "modifiedDateEnd" : "2015-11-10T08:16:21", + "caseId" : "843ee211-cdd3-4a16-aeb6-ba0e987f02e4" +} \ No newline at end of file diff --git a/commcare/src/test/resources/json/web/case-import-request.json b/commcare/src/test/resources/json/web/case-import-request.json new file mode 100644 index 000000000..e15888e99 --- /dev/null +++ b/commcare/src/test/resources/json/web/case-import-request.json @@ -0,0 +1,6 @@ +{ + "config" : "configName", + "modifiedDateStart" : "2015-03-22T17:45:35", + "modifiedDateEnd" : "2015-11-10T08:16:21", + "caseId" : null +} \ No newline at end of file diff --git a/commcare/src/test/resources/json/web/import-request-form-id.json b/commcare/src/test/resources/json/web/import-request-form-id.json new file mode 100644 index 000000000..9577f9c0a --- /dev/null +++ b/commcare/src/test/resources/json/web/import-request-form-id.json @@ -0,0 +1,6 @@ +{ + "config": "configName", + "receivedOnStart": null, + "receivedOnEnd": null, + "formId": "testId" +} \ No newline at end of file diff --git a/commcare/src/test/resources/json/web/import-request.json b/commcare/src/test/resources/json/web/import-request.json index 33e99ed93..f92472b31 100644 --- a/commcare/src/test/resources/json/web/import-request.json +++ b/commcare/src/test/resources/json/web/import-request.json @@ -1,5 +1,6 @@ { "config": "configName", "receivedOnStart": "2012-09-29T17:24:52", - "receivedOnEnd": "2013-10-29T08:24:52" + "receivedOnEnd": "2013-10-29T08:24:52", + "formId": null } \ No newline at end of file diff --git a/dhis2/pom.xml b/dhis2/pom.xml index 9f3e01b6a..5c51d427a 100644 --- a/dhis2/pom.xml +++ b/dhis2/pom.xml @@ -60,6 +60,10 @@ org.apache.httpcomponents httpcore-osgi + + org.mortbay.jetty + jetty + @@ -96,6 +100,7 @@ org.motechproject.dhis2.rest.domain;version=${project.version}, org.motechproject.dhis2.rest.service;version=${project.version}, org.motechproject.dhis2.tasks;version=${project.version}, + org.motechproject.dhis2.tasks.builder;version=${project.version}, org.motechproject.dhis2.web;version=${project.version}, @@ -126,4 +131,34 @@ + + + IT + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-test + + integration-test + + + + **/dhis2/**/*IntegrationTests.java + + + **/dhis2/**/*IT.java + + UTF-8 + + + + + + + + diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/DataSet.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/DataSet.java index 65a885eb9..ad366f807 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/DataSet.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/DataSet.java @@ -25,6 +25,14 @@ public class DataSet { @Field private List dataElementList; + public DataSet() {} + + public DataSet(String uuid, String name, List dataElementList) { + this.uuid = uuid; + this.name = name; + this.dataElementList = dataElementList; + } + public String getUuid() { return uuid; } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/OrgUnit.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/OrgUnit.java index d5d1e23e3..e38703bbd 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/OrgUnit.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/OrgUnit.java @@ -1,11 +1,13 @@ package org.motechproject.dhis2.domain; +import org.apache.commons.lang.ObjectUtils; import org.motechproject.mds.annotations.Access; import org.motechproject.mds.annotations.Entity; import org.motechproject.mds.annotations.Field; import org.motechproject.mds.util.SecurityMode; import javax.jdo.annotations.Unique; +import java.util.Objects; /** * Represents a DHIS2 Organisation Unit @@ -42,4 +44,25 @@ public String getUuid() { public void setUuid(String uuid) { this.uuid = uuid; } + + @Override + public boolean equals(Object o) { + + if (this == o) { + return true; + } + + if (!(o instanceof OrgUnit)) { + return false; + } + + OrgUnit other = (OrgUnit) o; + + return ObjectUtils.equals(uuid, other.uuid) && ObjectUtils.equals(name, other.name); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, name); + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/Program.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/Program.java index fe980deb8..9a1a9bf52 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/Program.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/Program.java @@ -1,5 +1,6 @@ package org.motechproject.dhis2.domain; +import org.apache.commons.lang.ObjectUtils; import org.motechproject.mds.annotations.Access; import org.motechproject.mds.annotations.Cascade; import org.motechproject.mds.annotations.Entity; @@ -8,6 +9,7 @@ import javax.jdo.annotations.Unique; import java.util.List; +import java.util.Objects; /** * Represents a DHIS2 Program @@ -41,6 +43,19 @@ public class Program { @Field private String programType; + public Program() {} + + public Program(String uuid, String name, TrackedEntity trackedEntity, List stages, + List attributes, boolean singleEvent, boolean registration, String programType) { + this.uuid = uuid; + this.name = name; + this.trackedEntity = trackedEntity; + this.stages = stages; + this.attributes = attributes; + this.singleEvent = singleEvent; + this.registration = registration; + this.programType = programType; + } public boolean isSingleEvent() { return singleEvent; @@ -105,4 +120,26 @@ public String getProgramType() { public void setProgramType(String programType) { this.programType = programType; } + + @Override + public boolean equals(Object o) { + + if (this == o) { + return true; + } + + if (!(o instanceof Program)) { + return false; + } + + Program other = (Program) o; + + return ObjectUtils.equals(uuid, other.uuid) && + ObjectUtils.equals(name, other.name); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, name); + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/Stage.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/Stage.java index 35e63fe5a..14ba3244d 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/Stage.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/Stage.java @@ -1,5 +1,6 @@ package org.motechproject.dhis2.domain; +import org.apache.commons.lang.ObjectUtils; import org.motechproject.mds.annotations.Access; import org.motechproject.mds.annotations.Entity; import org.motechproject.mds.annotations.Field; @@ -7,6 +8,7 @@ import javax.jdo.annotations.Unique; import java.util.List; +import java.util.Objects; /** * Represents a DHIS2 program stage event @@ -30,6 +32,16 @@ public class Stage { @Field private boolean registration; + public Stage() {} + + public Stage(String uuid, String name, List dataElements, String program, boolean registration) { + this.uuid = uuid; + this.name = name; + this.dataElements = dataElements; + this.program = program; + this.registration = registration; + } + public boolean hasRegistration() { return registration; } @@ -69,4 +81,29 @@ public String getProgram() { public void setProgram(String program) { this.program = program; } + + @Override + public boolean equals(Object o) { + + if (this == o) { + return true; + } + + if (!(o instanceof Stage)) { + return false; + } + + Stage other = (Stage) o; + + return ObjectUtils.equals(uuid, other.uuid) && + ObjectUtils.equals(name, other.name) && + ObjectUtils.equals(dataElements, other.dataElements) && + ObjectUtils.equals(program, other.program) && + ObjectUtils.equals(registration, other.registration); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, name, dataElements, program, registration); + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntity.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntity.java index 113fac593..5511401ca 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntity.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntity.java @@ -1,11 +1,13 @@ package org.motechproject.dhis2.domain; +import org.apache.commons.lang.ObjectUtils; import org.motechproject.mds.annotations.Access; import org.motechproject.mds.annotations.Entity; import org.motechproject.mds.annotations.Field; import org.motechproject.mds.util.SecurityMode; import javax.jdo.annotations.Unique; +import java.util.Objects; /** * Represents a DHIS2 tracked entity type @@ -42,4 +44,25 @@ public String getUuid() { public void setUuid(String uuid) { this.uuid = uuid; } + + @Override + public boolean equals(Object o) { + + if (this == o) { + return true; + } + + if (!(o instanceof TrackedEntity)) { + return false; + } + + TrackedEntity other = (TrackedEntity) o; + + return ObjectUtils.equals(uuid, other.uuid) && ObjectUtils.equals(name, other.name); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, name); + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityAttribute.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityAttribute.java index 3c35ec049..3902f4d92 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityAttribute.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityAttribute.java @@ -1,11 +1,13 @@ package org.motechproject.dhis2.domain; +import org.apache.commons.lang.ObjectUtils; import org.motechproject.mds.annotations.Access; import org.motechproject.mds.annotations.Entity; import org.motechproject.mds.annotations.Field; import org.motechproject.mds.util.SecurityMode; import javax.jdo.annotations.Unique; +import java.util.Objects; /** * Represents a DHIS2 tracked entity attribute @@ -42,4 +44,25 @@ public String getUuid() { public void setUuid(String uuid) { this.uuid = uuid; } + + @Override + public boolean equals(Object o) { + + if (this == o) { + return true; + } + + if (!(o instanceof TrackedEntityAttribute)) { + return false; + } + + TrackedEntityAttribute other = (TrackedEntityAttribute) o; + + return ObjectUtils.equals(uuid, other.uuid) && ObjectUtils.equals(name, other.name); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, name); + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityInstanceMapping.java b/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityInstanceMapping.java index b15840ff0..1687663aa 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityInstanceMapping.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/domain/TrackedEntityInstanceMapping.java @@ -1,11 +1,13 @@ package org.motechproject.dhis2.domain; +import org.apache.commons.lang.ObjectUtils; import org.motechproject.mds.annotations.Access; import org.motechproject.mds.annotations.Entity; import org.motechproject.mds.annotations.Field; import org.motechproject.mds.util.SecurityMode; import javax.jdo.annotations.Unique; +import java.util.Objects; /** * Maps an External ID to a DHIS2 ID @@ -54,4 +56,27 @@ public String getDhis2Uuid() { public void setDhis2Uuid(String dhis2Uuid) { this.dhis2Uuid = dhis2Uuid; } + + @Override + public boolean equals(Object o) { + + if (this == o) { + return true; + } + + if (!(o instanceof TrackedEntityInstanceMapping)) { + return false; + } + + TrackedEntityInstanceMapping other = (TrackedEntityInstanceMapping) o; + + return ObjectUtils.equals(externalName, other.externalName) && + ObjectUtils.equals(dhis2Name, other.dhis2Name) && + ObjectUtils.equals(dhis2Uuid, other.dhis2Uuid); + } + + @Override + public int hashCode() { + return Objects.hash(externalName, dhis2Name, dhis2Uuid); + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/event/EventHandler.java b/dhis2/src/main/java/org/motechproject/dhis2/event/EventHandler.java index 88784a5d4..70d536c93 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/event/EventHandler.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/event/EventHandler.java @@ -1,35 +1,13 @@ package org.motechproject.dhis2.event; -import org.motechproject.commons.api.TasksEventParser; -import org.motechproject.dhis2.domain.DataElement; -import org.motechproject.dhis2.domain.DataSet; -import org.motechproject.dhis2.exception.DataElementNotFoundException; -import org.motechproject.dhis2.rest.domain.AttributeDto; -import org.motechproject.dhis2.rest.domain.DataValueDto; -import org.motechproject.dhis2.rest.domain.DataValueSetDto; -import org.motechproject.dhis2.rest.domain.DhisEventDto; -import org.motechproject.dhis2.rest.domain.DhisStatus; -import org.motechproject.dhis2.rest.domain.DhisStatusResponse; -import org.motechproject.dhis2.rest.domain.EnrollmentDto; -import org.motechproject.dhis2.rest.domain.TrackedEntityInstanceDto; -import org.motechproject.dhis2.rest.service.DhisWebService; -import org.motechproject.dhis2.service.DataElementService; -import org.motechproject.dhis2.service.DataSetService; -import org.motechproject.dhis2.service.TrackedEntityInstanceMappingService; +import org.motechproject.dhis2.service.DhisService; import org.motechproject.event.MotechEvent; import org.motechproject.event.listener.annotations.MotechListener; -import org.motechproject.scheduler.service.MotechSchedulerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - /** * Event Handler for the DHIS2 module. The public methods listen for the event subjects listed in * {@link org.motechproject.dhis2.event.EventSubjects} @@ -40,20 +18,7 @@ public class EventHandler { private static final Logger LOGGER = LoggerFactory.getLogger(EventHandler.class); @Autowired - private DhisWebService dhisWebService; - - @Autowired - private TrackedEntityInstanceMappingService trackedEntityInstanceMappingService; - - @Autowired - private DataElementService dataElementService; - - @Autowired - private DataSetService dataSetService; - - public EventHandler() { - - } + private DhisService dhisService; /** * Parses the MotechEvent and creates a {@link org.motechproject.dhis2.rest.domain.TrackedEntityInstanceDto} @@ -64,17 +29,7 @@ public EventHandler() { @MotechListener(subjects = EventSubjects.CREATE_ENTITY) public void handleCreate (MotechEvent event) { LOGGER.debug("Handling CREATE_ENTITY MotechEvent"); - Map params = prepareDhisAttributesMap(event.getParameters()); - String externalUUID = (String) params.remove(EventParams.EXTERNAL_ID); - TrackedEntityInstanceDto trackedEntityInstance = createTrackedEntityInstanceFromParams(params); - - LOGGER.debug("Sending request to create entity to the DHIS Web Service"); - DhisStatusResponse response = dhisWebService.createTrackedEntityInstance(trackedEntityInstance); - - LOGGER.trace("Received response from the DHIS server. Status: {}", response.getStatus()); - if (response.getStatus() == DhisStatus.SUCCESS || response.getStatus() == DhisStatus.OK) { - trackedEntityInstanceMappingService.create(externalUUID, response.getReference()); - } + dhisService.createEntity(event.getParameters()); } /** @@ -85,9 +40,7 @@ public void handleCreate (MotechEvent event) { */ @MotechListener(subjects = {EventSubjects.ENROLL_IN_PROGRAM}) public void handleEnrollment (MotechEvent event) { - Map params = prepareDhisAttributesMap(event.getParameters()); - EnrollmentDto enrollment = createEnrollmentFromParams(params); - dhisWebService.createEnrollment(enrollment); + dhisService.enrollInProgram(event.getParameters()); } @@ -99,9 +52,7 @@ public void handleEnrollment (MotechEvent event) { */ @MotechListener(subjects = {EventSubjects.UPDATE_PROGRAM_STAGE}) public void handleStageUpdate (MotechEvent event) { - Map params = prepareDhisAttributesMap(event.getParameters()); - DhisEventDto dhisEventDto = createDhisEventFromParams(params); - dhisWebService.createEvent(dhisEventDto); + dhisService.updateProgramStage(event.getParameters()); } /** @@ -113,17 +64,7 @@ public void handleStageUpdate (MotechEvent event) { */ @MotechListener(subjects = {EventSubjects.CREATE_AND_ENROLL}) public void handleCreateAndEnroll (MotechEvent event) { - Map params = prepareDhisAttributesMap(event.getParameters()); - Map enrollmentParams = new HashMap<>(); - - enrollmentParams.put(EventParams.PROGRAM, params.remove(EventParams.PROGRAM)); - enrollmentParams.put(EventParams.DATE, params.remove(EventParams.DATE)); - - enrollmentParams.put(EventParams.EXTERNAL_ID, params.get(EventParams.EXTERNAL_ID)); - enrollmentParams.put(EventParams.LOCATION, params.get(EventParams.LOCATION)); - - handleCreate(new MotechEvent(EventSubjects.CREATE_ENTITY, params)); - handleEnrollment(new MotechEvent(EventSubjects.ENROLL_IN_PROGRAM, enrollmentParams)); + dhisService.createAndEnroll(event.getParameters()); } /** @@ -134,37 +75,7 @@ public void handleCreateAndEnroll (MotechEvent event) { */ @MotechListener(subjects = EventSubjects.SEND_DATA_VALUE) public void handleDataValue(MotechEvent event) { - - Map params = event.getParameters(); - - DataElement dataElement = dataElementService.findByName((String) params.get(EventParams.DATA_ELEMENT)); - - if (dataElement == null) { - throw new DataElementNotFoundException("The data element " + params.get(EventParams.DATA_ELEMENT) + - " that was sent did not match any values imported from DHIS2. Please make sure that the " + - "data element field matches a data element name in the DHIS2 module"); - } - - String orgUnitId = (String) params.get(EventParams.LOCATION); - String period = (String) params.get(EventParams.PERIOD); - String value = (String) params.get(EventParams.VALUE); - String categoryOptionCombo = (String) params.get(EventParams.CATEGORY_OPTION_COMBO); - String comment = (String) params.get(EventParams.COMMENT); - - DataValueDto dataValueDto = new DataValueDto(); - dataValueDto.setDataElement(dataElement.getUuid()); - dataValueDto.setValue(value); - dataValueDto.setOrgUnit(orgUnitId); - dataValueDto.setPeriod(period); - dataValueDto.setCategoryOptionCombo(categoryOptionCombo); - dataValueDto.setComment(comment); - - DataValueSetDto dataValueSetDto = new DataValueSetDto(); - List dataValueDtos = new ArrayList<>(); - dataValueDtos.add(dataValueDto); - dataValueSetDto.setDataValues(dataValueDtos); - - dhisWebService.sendDataValueSet(dataValueSetDto); + dhisService.sendDataValue(event.getParameters()); } /** @@ -175,134 +86,6 @@ public void handleDataValue(MotechEvent event) { */ @MotechListener(subjects = EventSubjects.SEND_DATA_VALUE_SET) public void handleDataValueSet(MotechEvent event) { - - Map params = prepareDhisAttributesMap(event.getParameters()); - DataSet dataSet = dataSetService.findByUuid((String) params.get(EventParams.DATA_SET)); - String completeDate = (String) params.get(EventParams.COMPLETE_DATE); - String period = (String) params.get(EventParams.PERIOD); - String orgUnitId = (String) params.get(EventParams.LOCATION); - String categoryOptionCombo = (String) params.get(EventParams.CATEGORY_OPTION_COMBO); - String comment = (String) params.get(EventParams.COMMENT); - String attributeOptionCombo = (String) params.get(EventParams.ATTRIBUTE_OPTION_COMBO); - - - List dataValueDtos = new ArrayList<>(); - - for (DataElement element : dataSet.getDataElementList()) { - DataValueDto dataValueDto = new DataValueDto(); - dataValueDto.setDataElement(element.getUuid()); - dataValueDto.setValue((String) params.get(element.getUuid())); - - dataValueDtos.add(dataValueDto); - } - - DataValueSetDto dataValueSetDto = new DataValueSetDto(); - dataValueSetDto.setDataSet(dataSet.getUuid()); - dataValueSetDto.setPeriod(period); - dataValueSetDto.setCompleteDate(completeDate); - dataValueSetDto.setOrgUnit(orgUnitId); - dataValueSetDto.setDataValues(dataValueDtos); - dataValueSetDto.setAttributeOptionCombo(attributeOptionCombo); - dataValueSetDto.setCategoryOptionCombo(categoryOptionCombo); - dataValueSetDto.setComment(comment); - dhisWebService.sendDataValueSet(dataValueSetDto); - } - - private TrackedEntityInstanceDto createTrackedEntityInstanceFromParams (Map params) { - String trackedEntity = (String) params.remove(EventParams.ENTITY_TYPE); - String orgUnitId = (String) params.remove(EventParams.LOCATION); - - List attributes = new ArrayList<>(); - for (Entry entry : params.entrySet()) { - if (entry.getValue() != null) { - AttributeDto attribute = new AttributeDto(); - attribute.setAttribute(entry.getKey()); - attribute.setValue(String.valueOf(entry.getValue())); - attributes.add(attribute); - } - } - - TrackedEntityInstanceDto trackedEntityInstance = new TrackedEntityInstanceDto(); - trackedEntityInstance.setTrackedEntity(trackedEntity); - trackedEntityInstance.setOrgUnit(orgUnitId); - trackedEntityInstance.setAttributes(attributes); - - return trackedEntityInstance; - } - - private EnrollmentDto createEnrollmentFromParams (Map params) { - String program = (String) params.remove(EventParams.PROGRAM); - - String externalId = (String) params.remove(EventParams.EXTERNAL_ID); - String trackedEntityInstanceId = trackedEntityInstanceMappingService.mapFromExternalId(externalId); - String orgUnit = (String) params.remove(EventParams.LOCATION); - - String date = (String) params.remove(EventParams.DATE); - - List attributes = new ArrayList<>(); - for (Entry entry : params.entrySet()) { - if (entry.getValue() != null) { - AttributeDto attribute = new AttributeDto(); - attribute.setAttribute(entry.getKey()); - attribute.setValue((String) entry.getValue()); - attributes.add(attribute); - } - } - - EnrollmentDto enrollment = new EnrollmentDto(); - enrollment.setProgram(program); - enrollment.setOrgUnit(orgUnit); - enrollment.setTrackedEntityInstance(trackedEntityInstanceId); - enrollment.setDateOfEnrollment(date); - enrollment.setAttributes(attributes); - - return enrollment; + dhisService.sendDataValueSet(event.getParameters()); } - - private DhisEventDto createDhisEventFromParams (Map params) { - DhisEventDto dhisEventDto = new DhisEventDto(); - - String registationString = (String) params.remove(EventParams.REGISTRATION); - boolean registration = registationString.contains("true"); - - if (registration) { - String externalTrackedEntityInstanceId = (String) params.remove(EventParams.EXTERNAL_ID); - String trackedEntityInstanceId = trackedEntityInstanceMappingService.mapFromExternalId(externalTrackedEntityInstanceId); - dhisEventDto.setTrackedEntityInstance(trackedEntityInstanceId); - } - - String orgUnitId = (String) params.remove(EventParams.LOCATION); - String program = (String) params.remove(EventParams.PROGRAM); - String date = (String) params.remove(EventParams.DATE); - String stage = (String) params.remove(EventParams.STAGE); - String status = (String) params.remove(EventParams.STATUS); - - List dataValues = new ArrayList<>(); - - for (Entry entry : params.entrySet()) { - DataValueDto dataValue = new DataValueDto(); - dataValue.setDataElement(entry.getKey()); - dataValue.setValue((String) entry.getValue()); - dataValues.add(dataValue); - } - - dhisEventDto.setProgram(program); - dhisEventDto.setEventDate(date); - dhisEventDto.setProgramStage(stage); - dhisEventDto.setOrgUnit(orgUnitId); - dhisEventDto.setStatus(status); - dhisEventDto.setDataValues(dataValues); - - return dhisEventDto; - } - - private Map prepareDhisAttributesMap(Map eventParams) { - Map dhisAttributes = new HashMap<>(eventParams); - - dhisAttributes.remove(MotechSchedulerService.JOB_ID_KEY); - dhisAttributes.remove(TasksEventParser.CUSTOM_PARSER_EVENT_KEY); - - return dhisAttributes; - } - } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataElementDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataElementDto.java index 83143a05b..8302b4d6b 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataElementDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataElementDto.java @@ -8,4 +8,12 @@ */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -public class DataElementDto extends BaseDto { } +public class DataElementDto extends BaseDto { + + public DataElementDto() {} + + public DataElementDto(String uuid, String name) { + this.setId(uuid); + this.setName(name); + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataSetDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataSetDto.java index 46cdea6a3..94cbcd5f3 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataSetDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DataSetDto.java @@ -3,6 +3,7 @@ import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonSerialize; +import java.util.ArrayList; import java.util.List; /** @@ -15,6 +16,10 @@ public class DataSetDto extends BaseDto { private List dataElements; public List getDataElements() { + if (dataElements == null) { + dataElements = new ArrayList<>(); + } + return dataElements; } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisDataValueStatusResponse.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisDataValueStatusResponse.java index 63e386d32..99014ef11 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisDataValueStatusResponse.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisDataValueStatusResponse.java @@ -7,11 +7,9 @@ * A class to model DHIS2 responses that result from importing data values and data value sets. */ @JsonIgnoreProperties(ignoreUnknown = true) -public class DhisDataValueStatusResponse { +public class DhisDataValueStatusResponse extends DhisResponse { - private DhisStatus status; private String description; - private ImportCountDto importCountDto; private ImportCountDto dataValueCount; private boolean dataSetComplete; @@ -24,14 +22,6 @@ public void setDataValueCount(ImportCountDto dataValueCount) { this.dataValueCount = dataValueCount; } - public DhisStatus getStatus() { - return status; - } - - public void setStatus(DhisStatus status) { - this.status = status; - } - public String getDescription() { return description; } @@ -40,14 +30,6 @@ public void setDescription(String description) { this.description = description; } - public ImportCountDto getImportCountDto() { - return importCountDto; - } - - public void setImportCountDto(ImportCountDto importCountDto) { - this.importCountDto = importCountDto; - } - public boolean isDataSetComplete() { return dataSetComplete; } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisResponse.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisResponse.java new file mode 100644 index 000000000..df41c9c73 --- /dev/null +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisResponse.java @@ -0,0 +1,28 @@ +package org.motechproject.dhis2.rest.domain; + +import org.codehaus.jackson.annotate.JsonIgnoreProperties; + +/** + * Base class for DHIS2 action response. + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public abstract class DhisResponse { + private DhisStatus status; + private ImportCountDto importCountDto; + + public DhisStatus getStatus() { + return status; + } + + public void setStatus(DhisStatus status) { + this.status = status; + } + + public ImportCountDto getImportCountDto() { + return importCountDto; + } + + public void setImportCountDto(ImportCountDto importCountDto) { + this.importCountDto = importCountDto; + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisStatusResponse.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisStatusResponse.java index 2545c1638..76bfcfa41 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisStatusResponse.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/DhisStatusResponse.java @@ -9,33 +9,21 @@ * A class to model DHIS2 responses that result from creating entities. */ @JsonIgnoreProperties(ignoreUnknown = true) -public class DhisStatusResponse { +public class DhisStatusResponse extends DhisResponse{ private DhisStatus status; - private ImportCountDto importCount; + private ImportCountDto importCountDto; private String reference; private DhisResponseDetails response; - public DhisStatus getStatus() { - return status; - } - - public void setStatus(DhisStatus status) { - this.status = status; - } - - public ImportCountDto getImportCount() { - if (importCount == null && response == null) { + public ImportCountDto getImportCountDto() { + if (importCountDto == null && response == null) { return null; } else { - return importCount != null ? importCount : response.getImportCount(); + return importCountDto != null ? importCountDto : response.getImportCount(); } } - public void setImportCount(ImportCountDto importCount) { - this.importCount = importCount; - } - public String getReference() { if (reference == null && response == null) { return null; @@ -58,7 +46,7 @@ public void setResponse(DhisResponseDetails response) { @Override public int hashCode() { - return Objects.hash(status, importCount, reference, response); + return Objects.hash(status, importCountDto, reference, response); } @Override @@ -71,7 +59,7 @@ public boolean equals(Object obj) { } final DhisStatusResponse other = (DhisStatusResponse) obj; return Objects.equals(this.status, other.status) - && Objects.equals(this.importCount, other.importCount) + && Objects.equals(this.importCountDto, other.importCountDto) && Objects.equals(this.reference, other.reference) && Objects.equals(this.response, other.response); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/OrganisationUnitDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/OrganisationUnitDto.java index a8f4668dd..b4c32ef52 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/OrganisationUnitDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/OrganisationUnitDto.java @@ -8,4 +8,12 @@ */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -public class OrganisationUnitDto extends BaseDto { } +public class OrganisationUnitDto extends BaseDto { + + public OrganisationUnitDto() {} + + public OrganisationUnitDto(String uuid, String name) { + this.setId(uuid); + this.setName(name); + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramDto.java index dd1ac1892..e8c70a744 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramDto.java @@ -22,6 +22,13 @@ public class ProgramDto extends BaseDto { private List organisationUnits; private List programTrackedEntityAttributes; + public ProgramDto() {} + + public ProgramDto(String uuid, String name) { + this.setId(uuid); + this.setName(name); + } + public boolean getRegistration() { return registration; } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramStageDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramStageDto.java index 929538c65..7dff12671 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramStageDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/ProgramStageDto.java @@ -16,6 +16,15 @@ public class ProgramStageDto extends BaseDto { private ProgramDto program; private List programStageDataElements; + public ProgramStageDto() { } + + public ProgramStageDto(String uuid, String name, ProgramDto program, List programStageDataElements) { + this.setId(uuid); + this.setName(name); + this.program = program; + this.programStageDataElements = programStageDataElements; + } + public ProgramDto getProgram() { return program; } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityAttributeDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityAttributeDto.java index 9dcea8d7e..7fb4d261d 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityAttributeDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityAttributeDto.java @@ -8,4 +8,12 @@ */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -public class TrackedEntityAttributeDto extends BaseDto { } +public class TrackedEntityAttributeDto extends BaseDto { + + public TrackedEntityAttributeDto() { } + + public TrackedEntityAttributeDto(String uuid, String name) { + this.setId(uuid); + this.setName(name); + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityDto.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityDto.java index 1577ad6db..79dfd3069 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityDto.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/domain/TrackedEntityDto.java @@ -8,4 +8,12 @@ */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -public class TrackedEntityDto extends BaseDto { } +public class TrackedEntityDto extends BaseDto { + + public TrackedEntityDto() { } + + public TrackedEntityDto(String uuid, String name) { + this.setId(uuid); + this.setName(name); + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/rest/service/impl/DhisWebServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/rest/service/impl/DhisWebServiceImpl.java index 09bcf6c66..989d57489 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/rest/service/impl/DhisWebServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/rest/service/impl/DhisWebServiceImpl.java @@ -1,5 +1,6 @@ package org.motechproject.dhis2.rest.service.impl; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.http.Header; import org.apache.http.HttpStatus; @@ -29,7 +30,9 @@ import org.motechproject.dhis2.rest.domain.DataValueSetDto; import org.motechproject.dhis2.rest.domain.DhisDataValueStatusResponse; import org.motechproject.dhis2.rest.domain.DhisEventDto; +import org.motechproject.dhis2.rest.domain.DhisResponse; import org.motechproject.dhis2.rest.domain.DhisServerInfo; +import org.motechproject.dhis2.rest.domain.DhisStatus; import org.motechproject.dhis2.rest.domain.DhisStatusResponse; import org.motechproject.dhis2.rest.domain.EnrollmentDto; import org.motechproject.dhis2.rest.domain.OrganisationUnitDto; @@ -235,7 +238,7 @@ public TrackedEntityDto getTrackedEntityByHref(String href) { @Override public TrackedEntityDto getTrackedEntityById(String id) { - return getResource(getURIForResource(settingsService.getSettings().getServerURI(), PROGRAM_STAGES, id), TrackedEntityDto.class); + return getResource(getURIForResource(settingsService.getSettings().getServerURI(), TRACKED_ENTITIES, id), TrackedEntityDto.class); } @Override @@ -401,26 +404,9 @@ private List getResources(String resourceName, Class c /*Attempts to create the an entity in the DHIS2 system. Returns the response from DHIS2*/ private DhisStatusResponse createEntity(Settings settings, String uri, String json) { HttpUriRequest request = generatePostRequest(settings, uri, json); - LOGGER.debug(String.format("Initiating request to create resource: %s, request: %s", json, request.toString())); - CloseableHttpResponse response = getResponseForRequest(request); - - LOGGER.debug(String.format("Received response to create resource: %s, request: %s", json, response)); - - DhisStatusResponse status; - - try (InputStream content = getContentForResponse(response)) { - status = new ObjectMapper().readValue(content, DhisStatusResponse.class); - } catch (IOException e) { - String msg = String.format("Error parsing response from uri: %s, exception: %s", uri, e.toString()); - statusMessageService.warn(msg, MODULE_NAME); - throw new DhisWebException(msg, e); - } finally { - closeResponse(response); - } - - return status; + return (DhisStatusResponse) getDhisResponseForHttpResponse(json, uri, response, DhisStatusResponse.class); } /*Converts the object to json*/ @@ -540,10 +526,23 @@ private DhisDataValueStatusResponse importDataValues(Settings settings, String u HttpUriRequest request = generatePostRequest(settings, uri, json); LOGGER.debug(String.format("Initiating request to create resource: %s, request: %s", json, request.toString())); CloseableHttpResponse response = getResponseForRequest(request); - LOGGER.debug(String.format("Received response to create resource: %s, request: %s", json, response)); + return (DhisDataValueStatusResponse) getDhisResponseForHttpResponse(json, uri, response, DhisDataValueStatusResponse.class); + } + private DhisResponse getDhisResponseForHttpResponse(String json, String uri, CloseableHttpResponse response, Class responseType) { + DhisResponse status; try (InputStream content = getContentForResponse(response)) { - return new ObjectMapper().readValue(content, DhisDataValueStatusResponse.class); + String contentString = IOUtils.toString(content); + LOGGER.debug(String.format("Received response to create resource: %s, request: %s", contentString, json)); + if(responseType == DhisStatusResponse.class) { + status = new ObjectMapper().readValue(contentString, DhisStatusResponse.class); + } else { + status = new ObjectMapper().readValue(contentString, DhisDataValueStatusResponse.class); + } + if (status.getStatus() == DhisStatus.ERROR) { + String msg = String.format("Error in DHIS2 status response, error details: %s", contentString); + throw new DhisWebException(msg); + } } catch (IOException e) { String msg = String.format("Error parsing response from uri: %s, exception: %s", uri, e.toString()); statusMessageService.warn(msg, MODULE_NAME); @@ -551,6 +550,7 @@ private DhisDataValueStatusResponse importDataValues(Settings settings, String u } finally { closeResponse(response); } + return status; } private void closeResponse(CloseableHttpResponse response) { diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/DhisService.java b/dhis2/src/main/java/org/motechproject/dhis2/service/DhisService.java new file mode 100644 index 000000000..a79b7c9f5 --- /dev/null +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/DhisService.java @@ -0,0 +1,18 @@ +package org.motechproject.dhis2.service; + +import java.util.Map; + +public interface DhisService { + + void createEntity(Map parameters); + + void enrollInProgram(Map parameters); + + void updateProgramStage(Map parameters); + + void createAndEnroll(Map parameters); + + void sendDataValue(Map parameters); + + void sendDataValueSet(Map parameters); +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/ProgramService.java b/dhis2/src/main/java/org/motechproject/dhis2/service/ProgramService.java index 85881ea10..b73fe1477 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/ProgramService.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/ProgramService.java @@ -1,6 +1,9 @@ package org.motechproject.dhis2.service; import org.motechproject.dhis2.domain.Program; +import org.motechproject.dhis2.domain.Stage; +import org.motechproject.dhis2.domain.TrackedEntity; +import org.motechproject.dhis2.domain.TrackedEntityAttribute; import org.motechproject.dhis2.rest.domain.ProgramDto; import java.util.List; @@ -11,5 +14,5 @@ public interface ProgramService extends GenericCrudService { List findByRegistration(boolean registration); Program findById(String id); - Program createFromDetails(ProgramDto details); + Program createFromDetails(ProgramDto details, TrackedEntity trackedEntity, List stages, List trackedEntityAttributes); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/StageService.java b/dhis2/src/main/java/org/motechproject/dhis2/service/StageService.java index 31a90353e..5ed9ef6ae 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/StageService.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/StageService.java @@ -1,12 +1,15 @@ package org.motechproject.dhis2.service; +import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.Stage; import org.motechproject.dhis2.rest.domain.ProgramStageDto; +import java.util.List; + /** * Manages CRUD operations for a {@link org.motechproject.dhis2.domain.Stage} */ public interface StageService extends GenericCrudService { Stage findById(String id); - Stage createFromDetails(ProgramStageDto details, String programId, boolean hasRegistration); + Stage createFromDetails(ProgramStageDto details, String programId, boolean hasRegistration, List dataElements); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/TasksService.java b/dhis2/src/main/java/org/motechproject/dhis2/service/TasksService.java index b9ea73b52..6f68f4ed9 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/TasksService.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/TasksService.java @@ -1,9 +1,11 @@ package org.motechproject.dhis2.service; +import org.motechproject.dhis2.tasks.builder.ChannelRequestBuilder; + /** * Processes Task channel updates for this module * @see org.motechproject.tasks.service.ChannelService - * @see org.motechproject.dhis2.tasks.ChannelRequestBuilder + * @see ChannelRequestBuilder * */ public interface TasksService { diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataElementServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataElementServiceImpl.java index 6aad88ae1..4dc1ab427 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataElementServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataElementServiceImpl.java @@ -6,6 +6,7 @@ import org.motechproject.dhis2.service.DataElementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -18,16 +19,19 @@ public class DataElementServiceImpl implements DataElementService { private DataElementDataService dataElementDataService; @Override + @Transactional public List findAll() { return dataElementDataService.retrieveAll(); } @Override + @Transactional public DataElement findById(String id) { return dataElementDataService.findByUuid(id); } @Override + @Transactional public DataElement createFromDetails(DataElementDto details) { DataElement dataElement = new DataElement(); dataElement.setUuid(details.getId()); @@ -36,21 +40,25 @@ public DataElement createFromDetails(DataElementDto details) { } @Override + @Transactional public void update(DataElement dataElement) { dataElementDataService.update(dataElement); } @Override + @Transactional public void delete(DataElement dataElement) { dataElementDataService.delete(dataElement); } @Override + @Transactional public void deleteAll() { dataElementDataService.deleteAll(); } @Override + @Transactional public DataElement findByName(String name) { return dataElementDataService.findByName(name); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataSetServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataSetServiceImpl.java index 81bd15d70..bdc5e3bb7 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataSetServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DataSetServiceImpl.java @@ -9,6 +9,7 @@ import org.motechproject.dhis2.service.DataSetService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -16,7 +17,7 @@ /** * Implementation of the {@link DataSetService} interface. */ -@Service +@Service("dataSetService") public class DataSetServiceImpl implements DataSetService { @Autowired @@ -27,6 +28,7 @@ public class DataSetServiceImpl implements DataSetService { @Override + @Transactional public DataSet createFromDetails(DataSetDto dto) { DataSet dataSet = new DataSet(); @@ -43,16 +45,19 @@ public DataSet createFromDetails(DataSetDto dto) { } @Override + @Transactional public List findAll() { return dataSetDataService.retrieveAll(); } @Override + @Transactional public DataSet findByUuid(String uuid) { return dataSetDataService.findByUuid(uuid); } @Override + @Transactional public void deleteAll() { dataSetDataService.deleteAll(); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DhisServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DhisServiceImpl.java new file mode 100644 index 000000000..e824a4c87 --- /dev/null +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/DhisServiceImpl.java @@ -0,0 +1,268 @@ +package org.motechproject.dhis2.service.impl; + +import org.joda.time.DateTime; +import org.joda.time.Period; +import org.motechproject.commons.api.TasksEventParser; +import org.motechproject.commons.date.util.JodaFormatter; +import org.motechproject.dhis2.domain.DataElement; +import org.motechproject.dhis2.domain.DataSet; +import org.motechproject.dhis2.event.EventParams; +import org.motechproject.dhis2.exception.DataElementNotFoundException; +import org.motechproject.dhis2.rest.domain.AttributeDto; +import org.motechproject.dhis2.rest.domain.DataValueDto; +import org.motechproject.dhis2.rest.domain.DataValueSetDto; +import org.motechproject.dhis2.rest.domain.DhisEventDto; +import org.motechproject.dhis2.rest.domain.DhisStatus; +import org.motechproject.dhis2.rest.domain.DhisStatusResponse; +import org.motechproject.dhis2.rest.domain.EnrollmentDto; +import org.motechproject.dhis2.rest.domain.TrackedEntityInstanceDto; +import org.motechproject.dhis2.rest.service.DhisWebService; +import org.motechproject.dhis2.service.DataElementService; +import org.motechproject.dhis2.service.DataSetService; +import org.motechproject.dhis2.service.DhisService; +import org.motechproject.dhis2.service.TrackedEntityInstanceMappingService; +import org.motechproject.scheduler.service.MotechSchedulerService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service("dhisService") +public class DhisServiceImpl implements DhisService { + private static final Logger LOGGER = LoggerFactory.getLogger(DhisServiceImpl.class); + + @Autowired + private DhisWebService dhisWebService; + + @Autowired + private TrackedEntityInstanceMappingService trackedEntityInstanceMappingService; + + @Autowired + private DataElementService dataElementService; + + @Autowired + private DataSetService dataSetService; + + @Override + public void createEntity(Map parameters) { + Map params = prepareDhisAttributesMap(parameters); + String externalUUID = (String) params.remove(EventParams.EXTERNAL_ID); + TrackedEntityInstanceDto trackedEntityInstance = createTrackedEntityInstanceFromParams(params); + + LOGGER.debug("Sending request to create entity to the DHIS Web Service"); + DhisStatusResponse response = dhisWebService.createTrackedEntityInstance(trackedEntityInstance); + + LOGGER.trace("Received response from the DHIS server. Status: {}", response.getStatus()); + if (response.getStatus() == DhisStatus.SUCCESS || response.getStatus() == DhisStatus.OK) { + trackedEntityInstanceMappingService.create(externalUUID, response.getReference()); + } + } + + @Override + public void enrollInProgram(Map parameters) { + Map params = prepareDhisAttributesMap(parameters); + EnrollmentDto enrollment = createEnrollmentFromParams(params); + dhisWebService.createEnrollment(enrollment); + } + + @Override + public void updateProgramStage(Map parameters) { + Map params = prepareDhisAttributesMap(parameters); + DhisEventDto dhisEventDto = createDhisEventFromParams(params); + dhisWebService.createEvent(dhisEventDto); + } + + @Override + public void createAndEnroll(Map parameters) { + Map params = prepareDhisAttributesMap(parameters); + Map enrollmentParams = new HashMap<>(); + + enrollmentParams.put(EventParams.PROGRAM, params.remove(EventParams.PROGRAM)); + enrollmentParams.put(EventParams.DATE, params.remove(EventParams.DATE)); + + enrollmentParams.put(EventParams.EXTERNAL_ID, params.get(EventParams.EXTERNAL_ID)); + enrollmentParams.put(EventParams.LOCATION, params.get(EventParams.LOCATION)); + + createEntity(params); + enrollInProgram(enrollmentParams); + } + + @Override + @Transactional + public void sendDataValue(Map params) { + DataElement dataElement = dataElementService.findByName((String) params.get(EventParams.DATA_ELEMENT)); + + if (dataElement == null) { + throw new DataElementNotFoundException("The data element " + params.get(EventParams.DATA_ELEMENT) + + " that was sent did not match any values imported from DHIS2. Please make sure that the " + + "data element field matches a data element name in the DHIS2 module"); + } + + String orgUnitId = (String) params.get(EventParams.LOCATION); + Period period = (Period) params.get(EventParams.PERIOD); + String value = (String) params.get(EventParams.VALUE); + String categoryOptionCombo = (String) params.get(EventParams.CATEGORY_OPTION_COMBO); + String comment = (String) params.get(EventParams.COMMENT); + + DataValueDto dataValueDto = new DataValueDto(); + dataValueDto.setDataElement(dataElement.getUuid()); + dataValueDto.setValue(value); + dataValueDto.setOrgUnit(orgUnitId); + dataValueDto.setPeriod(convertPeriodToString(period)); + dataValueDto.setCategoryOptionCombo(categoryOptionCombo); + dataValueDto.setComment(comment); + + DataValueSetDto dataValueSetDto = new DataValueSetDto(); + List dataValueDtos = new ArrayList<>(); + dataValueDtos.add(dataValueDto); + dataValueSetDto.setDataValues(dataValueDtos); + + dhisWebService.sendDataValueSet(dataValueSetDto); + } + + @Override + @Transactional + public void sendDataValueSet(Map parameters) { + Map params = prepareDhisAttributesMap(parameters); + DataSet dataSet = dataSetService.findByUuid((String) params.get(EventParams.DATA_SET)); + DateTime completeDate = (DateTime) params.get(EventParams.COMPLETE_DATE); + Period period = (Period) params.get(EventParams.PERIOD); + String orgUnitId = (String) params.get(EventParams.LOCATION); + String categoryOptionCombo = (String) params.get(EventParams.CATEGORY_OPTION_COMBO); + String comment = (String) params.get(EventParams.COMMENT); + String attributeOptionCombo = (String) params.get(EventParams.ATTRIBUTE_OPTION_COMBO); + + + List dataValueDtos = new ArrayList<>(); + + for (DataElement element : dataSet.getDataElementList()) { + DataValueDto dataValueDto = new DataValueDto(); + dataValueDto.setDataElement(element.getUuid()); + dataValueDto.setValue((String) params.get(element.getUuid())); + + dataValueDtos.add(dataValueDto); + } + + DataValueSetDto dataValueSetDto = new DataValueSetDto(); + dataValueSetDto.setDataSet(dataSet.getUuid()); + dataValueSetDto.setPeriod(convertPeriodToString(period)); + dataValueSetDto.setCompleteDate(convertDateTimeToString(completeDate)); + dataValueSetDto.setOrgUnit(orgUnitId); + dataValueSetDto.setDataValues(dataValueDtos); + dataValueSetDto.setAttributeOptionCombo(attributeOptionCombo); + dataValueSetDto.setCategoryOptionCombo(categoryOptionCombo); + dataValueSetDto.setComment(comment); + dhisWebService.sendDataValueSet(dataValueSetDto); + } + + private TrackedEntityInstanceDto createTrackedEntityInstanceFromParams (Map params) { + String trackedEntity = (String) params.remove(EventParams.ENTITY_TYPE); + String orgUnitId = (String) params.remove(EventParams.LOCATION); + + List attributes = new ArrayList<>(); + for (Map.Entry entry : params.entrySet()) { + if (entry.getValue() != null) { + AttributeDto attribute = new AttributeDto(); + attribute.setAttribute(entry.getKey()); + attribute.setValue(String.valueOf(entry.getValue())); + attributes.add(attribute); + } + } + + TrackedEntityInstanceDto trackedEntityInstance = new TrackedEntityInstanceDto(); + trackedEntityInstance.setTrackedEntity(trackedEntity); + trackedEntityInstance.setOrgUnit(orgUnitId); + trackedEntityInstance.setAttributes(attributes); + + return trackedEntityInstance; + } + + private EnrollmentDto createEnrollmentFromParams (Map params) { + String program = (String) params.remove(EventParams.PROGRAM); + + String externalId = (String) params.remove(EventParams.EXTERNAL_ID); + String trackedEntityInstanceId = trackedEntityInstanceMappingService.mapFromExternalId(externalId); + String orgUnit = (String) params.remove(EventParams.LOCATION); + + DateTime date = (DateTime) params.remove(EventParams.DATE); + + List attributes = new ArrayList<>(); + for (Map.Entry entry : params.entrySet()) { + if (entry.getValue() != null) { + AttributeDto attribute = new AttributeDto(); + attribute.setAttribute(entry.getKey()); + attribute.setValue((String) entry.getValue()); + attributes.add(attribute); + } + } + + EnrollmentDto enrollment = new EnrollmentDto(); + enrollment.setProgram(program); + enrollment.setOrgUnit(orgUnit); + enrollment.setTrackedEntityInstance(trackedEntityInstanceId); + enrollment.setDateOfEnrollment(convertDateTimeToString(date)); + enrollment.setAttributes(attributes); + + return enrollment; + } + + private DhisEventDto createDhisEventFromParams (Map params) { + DhisEventDto dhisEventDto = new DhisEventDto(); + + String registationString = (String) params.remove(EventParams.REGISTRATION); + boolean registration = registationString.contains("true"); + + if (registration) { + String externalTrackedEntityInstanceId = (String) params.remove(EventParams.EXTERNAL_ID); + String trackedEntityInstanceId = trackedEntityInstanceMappingService.mapFromExternalId(externalTrackedEntityInstanceId); + dhisEventDto.setTrackedEntityInstance(trackedEntityInstanceId); + } + + String orgUnitId = (String) params.remove(EventParams.LOCATION); + String program = (String) params.remove(EventParams.PROGRAM); + DateTime date = (DateTime) params.remove(EventParams.DATE); + String stage = (String) params.remove(EventParams.STAGE); + String status = (String) params.remove(EventParams.STATUS); + + List dataValues = new ArrayList<>(); + + for (Map.Entry entry : params.entrySet()) { + DataValueDto dataValue = new DataValueDto(); + dataValue.setDataElement(entry.getKey()); + dataValue.setValue((String) entry.getValue()); + dataValues.add(dataValue); + } + + dhisEventDto.setProgram(program); + dhisEventDto.setEventDate(convertDateTimeToString(date)); + dhisEventDto.setProgramStage(stage); + dhisEventDto.setOrgUnit(orgUnitId); + dhisEventDto.setStatus(status); + dhisEventDto.setDataValues(dataValues); + + return dhisEventDto; + } + + private Map prepareDhisAttributesMap(Map eventParams) { + Map dhisAttributes = new HashMap<>(eventParams); + + dhisAttributes.remove(MotechSchedulerService.JOB_ID_KEY); + dhisAttributes.remove(TasksEventParser.CUSTOM_PARSER_EVENT_KEY); + + return dhisAttributes; + } + + private String convertDateTimeToString(DateTime dateTime) { + return new JodaFormatter().formatDateTime(dateTime); + } + + private String convertPeriodToString(Period period) { + return new JodaFormatter().formatPeriod(period); + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImpl.java index fa6a4583d..b66ad5b6b 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImpl.java @@ -6,6 +6,7 @@ import org.motechproject.dhis2.service.OrgUnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -18,21 +19,25 @@ public class OrgUnitServiceImpl implements OrgUnitService { private OrgUnitDataService orgUnitDataService; @Override + @Transactional public List findAll() { return orgUnitDataService.retrieveAll(); } @Override + @Transactional public OrgUnit findById(String id) { return orgUnitDataService.findByUuid(id); } @Override + @Transactional public OrgUnit findByName(String name) { return orgUnitDataService.findByName(name); } @Override + @Transactional public OrgUnit createFromDetails(OrganisationUnitDto details) { OrgUnit orgUnit = new OrgUnit(); orgUnit.setUuid(details.getId()); @@ -41,16 +46,19 @@ public OrgUnit createFromDetails(OrganisationUnitDto details) { } @Override + @Transactional public void update(OrgUnit orgUnit) { orgUnitDataService.update(orgUnit); } @Override + @Transactional public void delete(OrgUnit orgUnit) { orgUnitDataService.delete(orgUnit); } @Override + @Transactional public void deleteAll() { orgUnitDataService.deleteAll(); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/ProgramServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/ProgramServiceImpl.java index 82b3e1b5e..3282b51a4 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/ProgramServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/ProgramServiceImpl.java @@ -1,11 +1,15 @@ package org.motechproject.dhis2.service.impl; import org.motechproject.dhis2.domain.Program; +import org.motechproject.dhis2.domain.Stage; +import org.motechproject.dhis2.domain.TrackedEntity; +import org.motechproject.dhis2.domain.TrackedEntityAttribute; import org.motechproject.dhis2.repository.ProgramDataService; import org.motechproject.dhis2.rest.domain.ProgramDto; import org.motechproject.dhis2.service.ProgramService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,42 +23,53 @@ public class ProgramServiceImpl implements ProgramService { private ProgramDataService programDataService; @Override + @Transactional public Program findById(String id) { return programDataService.findByUuid(id); } @Override + @Transactional public void update(Program program) { programDataService.update(program); } @Override + @Transactional public void delete(Program program) { programDataService.delete(program); } @Override - public Program createFromDetails(ProgramDto details) { + @Transactional + public Program createFromDetails(ProgramDto details, TrackedEntity trackedEntity, List stages, List trackedEntityAttributes) { Program program = new Program(); program.setUuid(details.getId()); program.setName(details.getName()); program.setRegistration(details.getRegistration()); program.setSingleEvent(details.getSingleEvent()); program.setProgramType(details.getProgramType()); + program.setTrackedEntity(trackedEntity); + program.setStages(stages); + program.setAttributes(trackedEntityAttributes); + return programDataService.create(program); } @Override + @Transactional public void deleteAll() { programDataService.deleteAll(); } @Override + @Transactional public List findAll() { return programDataService.retrieveAll(); } @Override + @Transactional public List findByRegistration(boolean registration) { return programDataService.findByRegistration(registration); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SettingsServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SettingsServiceImpl.java index 1b8d69f4d..4897c421c 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SettingsServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SettingsServiceImpl.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Service; import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; /** @@ -60,10 +62,23 @@ private synchronized void loadSettings() { LOGGER.debug("Loading DHIS2 settings..."); Gson gson = new Gson(); settings = gson.fromJson(jsonText, Settings.class); + if (settings.getServerURI() != null) { + settings.setServerURI(removeTrailingSlash()); + } } catch (Exception e) { String message = "There was an error loading json from the DHIS2 settings."; LOGGER.debug(message); throw new JsonIOException(message, e); } } + + private String removeTrailingSlash() throws URISyntaxException { + URI uri = new URI(settings.getServerURI()); + uri = uri.normalize(); + String uriString = uri.toString(); + if (uriString.endsWith("/")) { + uriString = uriString.substring(0, uriString.length() - 1); + } + return uriString; + } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/StageServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/StageServiceImpl.java index b55e7311e..302984427 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/StageServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/StageServiceImpl.java @@ -1,11 +1,13 @@ package org.motechproject.dhis2.service.impl; +import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.Stage; import org.motechproject.dhis2.repository.StageDataService; import org.motechproject.dhis2.rest.domain.ProgramStageDto; import org.motechproject.dhis2.service.StageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,36 +21,43 @@ public class StageServiceImpl implements StageService { private StageDataService stageDataService; @Override + @Transactional public List findAll() { return stageDataService.retrieveAll(); } @Override + @Transactional public Stage findById(String id) { return stageDataService.findByUuid(id); } @Override - public Stage createFromDetails(ProgramStageDto details, String programId, boolean hasRegistration) { + @Transactional + public Stage createFromDetails(ProgramStageDto details, String programId, boolean hasRegistration, List dataElements) { Stage stage = new Stage(); stage.setUuid(details.getId()); stage.setName(details.getName()); stage.setRegistration(hasRegistration); stage.setProgram(programId); + stage.setDataElements(dataElements); return stageDataService.create(stage); } @Override + @Transactional public void update(Stage stage) { stageDataService.update(stage); } @Override + @Transactional public void delete(Stage stage) { stageDataService.delete(stage); } @Override + @Transactional public void deleteAll() { stageDataService.deleteAll(); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SyncServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SyncServiceImpl.java index c2ee8e388..b7b29a335 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SyncServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/SyncServiceImpl.java @@ -1,7 +1,7 @@ package org.motechproject.dhis2.service.impl; +import org.apache.commons.lang3.StringUtils; import org.motechproject.dhis2.domain.DataElement; -import org.motechproject.dhis2.domain.Program; import org.motechproject.dhis2.domain.Stage; import org.motechproject.dhis2.domain.TrackedEntity; import org.motechproject.dhis2.domain.TrackedEntityAttribute; @@ -66,7 +66,7 @@ public class SyncServiceImpl implements SyncService { @Override @Transactional - public boolean sync() { + public synchronized boolean sync() { LOGGER.debug("Starting Sync"); try { long startTime = System.nanoTime(); @@ -98,7 +98,11 @@ private void addDataElements() { List dataElementDtos = dhisWebService.getDataElements(); for (DataElementDto dataElementDto : dataElementDtos) { - dataElementService.createFromDetails(dataElementDto); + if (StringUtils.isEmpty(dataElementDto.getName())) { + dataElementService.createFromDetails(dhisWebService.getDataElementById(dataElementDto.getId())); + } else { + dataElementService.createFromDetails(dataElementDto); + } } } @@ -117,7 +121,11 @@ private void addDataSets() { private void addAttributes() { List trackedEntityAttributeDtos = dhisWebService.getTrackedEntityAttributes(); for (TrackedEntityAttributeDto trackedEntityAttributeDto : trackedEntityAttributeDtos) { - trackedEntityAttributeService.createFromDetails(trackedEntityAttributeDto); + if (StringUtils.isEmpty(trackedEntityAttributeDto.getName())) { + trackedEntityAttributeService.createFromDetails(dhisWebService.getTrackedEntityAttributeById(trackedEntityAttributeDto.getId())); + } else { + trackedEntityAttributeService.createFromDetails(trackedEntityAttributeDto); + } } } @@ -128,7 +136,11 @@ private void addAttributes() { private void addTrackedEntities() { List trackedEntityDtos = dhisWebService.getTrackedEntities(); for (TrackedEntityDto trackedEntityDto : trackedEntityDtos) { - trackedEntityService.createFromDetails(trackedEntityDto); + if (StringUtils.isEmpty(trackedEntityDto.getName())) { + trackedEntityService.createFromDetails(dhisWebService.getTrackedEntityById(trackedEntityDto.getId())); + } else { + trackedEntityService.createFromDetails(trackedEntityDto); + } } } @@ -146,24 +158,26 @@ private void addPrograms() { } else { fullDto = dhisWebService.getProgramByHref(partialDto.getHref()); } - Program program = programService.createFromDetails(fullDto); /** * Request and add the program's sub-objects (tracked entity, program stages, program tracked entity's attributes). */ + TrackedEntity trackedEntity = null; if (fullDto.getTrackedEntity() != null) { - program.setTrackedEntity(getProgramTrackedEntityFromDto(fullDto.getTrackedEntity())); + trackedEntity = getProgramTrackedEntityFromDto(fullDto.getTrackedEntity()); } + List stages = null; if (fullDto.getProgramStages() != null) { - program.setStages(getStagesFromDtos(fullDto.getProgramStages(), program.getUuid(), program.hasRegistration())); + stages = getStagesFromDtos(fullDto.getProgramStages(), fullDto.getId(), fullDto.getRegistration()); } + List trackedEntityAttributes = null; if (fullDto.getProgramTrackedEntityAttributes() != null) { - program.setAttributes(getTrackedEntityAttributesFromDtos(fullDto.getProgramTrackedEntityAttributes())); + trackedEntityAttributes = getTrackedEntityAttributesFromDtos(fullDto.getProgramTrackedEntityAttributes()); } - programService.update(program); + programService.createFromDetails(fullDto, trackedEntity, stages, trackedEntityAttributes); } } @@ -203,8 +217,7 @@ private List getStagesFromDtos(List partialStageDtos, St } else { fullDto = dhisWebService.getProgramStageByHref(partialStageDto.getHref()); } - stage = stageService.createFromDetails(fullDto, programId, hasRegistration); - stage.setDataElements(getStageDataElementsFromDtos(fullDto.getProgramStageDataElements())); + stage = stageService.createFromDetails(fullDto, programId, hasRegistration, getStageDataElementsFromDtos(fullDto.getProgramStageDataElements())); } stages.add(stage); } @@ -271,7 +284,11 @@ private List getTrackedEntityAttributesFromDtos(List orgUnitDtos = dhisWebService.getOrganisationUnits(); for (OrganisationUnitDto orgUnitDto : orgUnitDtos) { - orgUnitService.createFromDetails(orgUnitDto); + if (StringUtils.isEmpty(orgUnitDto.getName())) { + orgUnitService.createFromDetails(dhisWebService.getOrganisationUnitById(orgUnitDto.getId())); + } else { + orgUnitService.createFromDetails(orgUnitDto); + } } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TasksServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TasksServiceImpl.java index 36840c957..0bd2f1b4c 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TasksServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TasksServiceImpl.java @@ -1,19 +1,13 @@ package org.motechproject.dhis2.service.impl; -import org.motechproject.dhis2.rest.service.DhisWebService; -import org.motechproject.dhis2.service.DataSetService; -import org.motechproject.dhis2.service.ProgramService; -import org.motechproject.dhis2.service.StageService; import org.motechproject.dhis2.service.TasksService; -import org.motechproject.dhis2.service.TrackedEntityAttributeService; -import org.motechproject.dhis2.service.TrackedEntityService; -import org.motechproject.dhis2.tasks.ChannelRequestBuilder; +import org.motechproject.dhis2.tasks.builder.ChannelRequestBuilder; import org.motechproject.tasks.service.ChannelService; -import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** @@ -23,40 +17,15 @@ public class TasksServiceImpl implements TasksService { private static final Logger LOGGER = LoggerFactory.getLogger(TasksServiceImpl.class); - private BundleContext bundleContext; - private ProgramService programService; - private StageService stageService; - private TrackedEntityService trackedEntityService; - private TrackedEntityAttributeService trackedEntityAttributeService; + @Autowired private ChannelService channelService; - private DhisWebService dhisWebService; - private DataSetService dataSetService; - @Autowired - public TasksServiceImpl(BundleContext bundleContext, - ProgramService programService, - StageService stageService, - TrackedEntityService trackedEntityService, - TrackedEntityAttributeService trackedEntityAttributeService, - ChannelService channelService, - DhisWebService dhisWebService, - DataSetService dataSetService) { - this.bundleContext = bundleContext; - this.programService = programService; - this.stageService = stageService; - this.trackedEntityService = trackedEntityService; - this.trackedEntityAttributeService = trackedEntityAttributeService; - this.channelService = channelService; - this.dhisWebService = dhisWebService; - this.dataSetService = dataSetService; - } + private ChannelRequestBuilder channelRequestBuilder; @Override + @Transactional public void updateChannel() { LOGGER.debug("Updating DHIS2 task channel..."); - ChannelRequestBuilder channelRequestBuilder = new ChannelRequestBuilder(bundleContext, programService, - stageService, trackedEntityAttributeService, trackedEntityService, dhisWebService.getServerVersion(), - dataSetService); channelService.registerChannel(channelRequestBuilder.build()); } } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImpl.java index 89716c4b1..b529f02ca 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImpl.java @@ -6,6 +6,7 @@ import org.motechproject.dhis2.service.TrackedEntityAttributeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,16 +20,19 @@ public class TrackedEntityAttributeServiceImpl implements TrackedEntityAttribute private TrackedEntityAttributeDataService trackedEntityAttributeDataService; @Override + @Transactional public List findAll() { return trackedEntityAttributeDataService.retrieveAll(); } @Override + @Transactional public TrackedEntityAttribute findById(String id) { return trackedEntityAttributeDataService.findByUuid(id); } @Override + @Transactional public TrackedEntityAttribute createFromDetails(TrackedEntityAttributeDto details) { TrackedEntityAttribute trackedEntityAttribute = new TrackedEntityAttribute(); trackedEntityAttribute.setUuid(details.getId()); @@ -37,16 +41,19 @@ public TrackedEntityAttribute createFromDetails(TrackedEntityAttributeDto detail } @Override + @Transactional public void update(TrackedEntityAttribute trackedEntityAttribute) { trackedEntityAttributeDataService.update(trackedEntityAttribute); } @Override + @Transactional public void delete(TrackedEntityAttribute trackedEntityAttribute) { trackedEntityAttributeDataService.delete(trackedEntityAttribute); } @Override + @Transactional public void deleteAll() { trackedEntityAttributeDataService.deleteAll(); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImpl.java index 6bfc97110..17e24613d 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImpl.java @@ -7,6 +7,7 @@ import org.motechproject.dhis2.service.TrackedEntityInstanceMappingException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -25,6 +26,7 @@ public class TrackedEntityInstanceMappingServiceImpl implements TrackedEntityIns private TrackedEntityInstanceMappingDataService trackedEntityInstanceMappingDataService; @Override + @Transactional public TrackedEntityInstanceMapping create(String externalId, String dhisId) { TrackedEntityInstanceMapping mapper = new TrackedEntityInstanceMapping(); mapper.setExternalName(externalId); @@ -33,6 +35,7 @@ public TrackedEntityInstanceMapping create(String externalId, String dhisId) { } @Override + @Transactional public String mapFromExternalId(String externalId) { TrackedEntityInstanceMapping mapper = trackedEntityInstanceMappingDataService.findByExternalName(externalId); @@ -46,26 +49,31 @@ public String mapFromExternalId(String externalId) { } @Override + @Transactional public void update(TrackedEntityInstanceMapping mapper) { trackedEntityInstanceMappingDataService.update(mapper); } @Override + @Transactional public void delete(TrackedEntityInstanceMapping mapper) { trackedEntityInstanceMappingDataService.delete(mapper); } @Override + @Transactional public List findAll() { return trackedEntityInstanceMappingDataService.retrieveAll(); } @Override + @Transactional public TrackedEntityInstanceMapping findByExternalId(String externalId) { return trackedEntityInstanceMappingDataService.findByExternalName(externalId); } @Override + @Transactional public void deleteAll() { trackedEntityInstanceMappingDataService.deleteAll(); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImpl.java index dd5822151..033958560 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImpl.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImpl.java @@ -6,6 +6,7 @@ import org.motechproject.dhis2.service.TrackedEntityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,16 +20,19 @@ public class TrackedEntityServiceImpl implements TrackedEntityService { private TrackedEntityDataService trackedEntityDataService; @Override + @Transactional public List findAll() { return trackedEntityDataService.retrieveAll(); } @Override + @Transactional public TrackedEntity findById(String id) { return trackedEntityDataService.findByUuid(id); } @Override + @Transactional public TrackedEntity createFromDetails(TrackedEntityDto details) { TrackedEntity trackedEntity = new TrackedEntity(); trackedEntity.setUuid(details.getId()); @@ -37,16 +41,19 @@ public TrackedEntity createFromDetails(TrackedEntityDto details) { } @Override + @Transactional public void update(TrackedEntity trackedEntity) { trackedEntityDataService.update(trackedEntity); } @Override + @Transactional public void delete(TrackedEntity trackedEntity) { trackedEntityDataService.delete(trackedEntity); } @Override + @Transactional public void deleteAll() { trackedEntityDataService.deleteAll(); } diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/DhisActionProxyService.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/DhisActionProxyService.java new file mode 100644 index 000000000..938bbf4a1 --- /dev/null +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/DhisActionProxyService.java @@ -0,0 +1,18 @@ +package org.motechproject.dhis2.tasks; + +import java.util.Map; + +public interface DhisActionProxyService { + + void enrollInProgram(Map parameters); + + void createEntity(Map parameters); + + void updateProgramStage(Map parameters); + + void createAndEnroll(Map parameters); + + void sendDataValue(Map parameters); + + void sendDataValueSet(Map parameters); +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/DisplayNames.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/DisplayNames.java index 7a1db4e9e..175bd9aa0 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/tasks/DisplayNames.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/DisplayNames.java @@ -10,7 +10,7 @@ private DisplayNames() { public static final String PROGRAM_ENROLLMENT = "Enroll in Program"; public static final String STAGE_EVENT = "Program Stage Event"; public static final String ENROLLMENT_DATE = "Date of Enrollment"; - public static final String DHIS2_DISPLAY_NAME = "DHIS2"; + public static final String DHIS2_DISPLAY_NAME = "dhis2"; public static final String CREATE_TRACKED_ENTITY_INSTANCE = "Create Tracked Entity Instance"; public static final String ORG_UNIT = "Organisation Unit ID"; public static final String PROGRAM_NAME = "Program Name"; diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/ChannelRequestBuilder.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/ChannelRequestBuilder.java similarity index 78% rename from dhis2/src/main/java/org/motechproject/dhis2/tasks/ChannelRequestBuilder.java rename to dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/ChannelRequestBuilder.java index fc5dc08fa..d84b29c85 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/tasks/ChannelRequestBuilder.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/ChannelRequestBuilder.java @@ -1,4 +1,4 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.motechproject.dhis2.domain.Program; import org.motechproject.dhis2.domain.Stage; @@ -7,17 +7,24 @@ import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; import org.motechproject.dhis2.rest.domain.ServerVersion; +import org.motechproject.dhis2.rest.service.DhisWebService; import org.motechproject.dhis2.service.DataSetService; import org.motechproject.dhis2.service.ProgramService; import org.motechproject.dhis2.service.StageService; import org.motechproject.dhis2.service.TrackedEntityAttributeService; import org.motechproject.dhis2.service.TrackedEntityService; +import org.motechproject.dhis2.tasks.DisplayNames; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.builder.ActionEventRequestBuilder; import org.motechproject.tasks.contract.ActionParameterRequest; import org.motechproject.tasks.contract.builder.ActionParameterRequestBuilder; import org.motechproject.tasks.contract.ChannelRequest; +import org.motechproject.tasks.domain.enums.MethodCallManner; import org.osgi.framework.BundleContext; +import org.motechproject.tasks.domain.enums.ParameterType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -28,43 +35,44 @@ * Builds a channel request from the records in MDS pertaining to the DHIS2 instance schema. * */ +@Component public class ChannelRequestBuilder { + public static final String ACTION_PROXY_SERVICE = "org.motechproject.dhis2.tasks.DhisActionProxyService"; + @Autowired private BundleContext bundleContext; + @Autowired private ProgramService programService; + @Autowired private StageService stageService; + @Autowired private TrackedEntityAttributeService trackedEntityAttributeService; + @Autowired private TrackedEntityService trackedEntityService; - private ServerVersion serverVersion; + @Autowired + private DhisWebService dhisWebService; + @Autowired private DataSetService dataSetService; - public ChannelRequestBuilder(BundleContext bundleContext, - ProgramService programService, - StageService stageService, - TrackedEntityAttributeService trackedEntityAttributeService, - TrackedEntityService trackedEntityService, - ServerVersion serverVersion, - DataSetService dataSetService) { - this.bundleContext = bundleContext; - this.programService = programService; - this.stageService = stageService; - this.trackedEntityAttributeService = trackedEntityAttributeService; - this.trackedEntityService = trackedEntityService; - this.serverVersion = serverVersion; - this.dataSetService = dataSetService; - } + @Autowired + private ProgramActionBuilder programActionBuilder; + @Autowired + private CreateInstanceActionBuilder createInstanceActionBuilder; + @Autowired + private StageActionBuilder stageActionBuilder; + @Autowired + private SendDataValueSetActionBuilder sendDataValueSetActionBuilder; + + private ServerVersion serverVersion; /** * Creates task action event requests for tracked entity instance creation, * program enrollment, and program stage events. * @return the new Channel Request */ + @Transactional public ChannelRequest build() { - - ProgramActionBuilder programActionBuilder = new ProgramActionBuilder(); - CreateInstanceActionBuilder createInstanceActionBuilder = new CreateInstanceActionBuilder(); - StageActionBuilder stageActionBuilder = new StageActionBuilder(); - SendDataValueSetActionBuilder sendDataValueSetActionBuilder = new SendDataValueSetActionBuilder(); + serverVersion = dhisWebService.getServerVersion(); List actions = new ArrayList<>(); @@ -100,6 +108,7 @@ private ActionEventRequest addSendDataValue() { builder.setDisplayName(DisplayNames.PERIOD) .setKey(EventParams.PERIOD) .setRequired(true) + .setType(ParameterType.PERIOD.getValue()) .setOrder(order++); actionParameterRequests.add(builder.createActionParameterRequest()); @@ -113,6 +122,7 @@ private ActionEventRequest addSendDataValue() { builder = new ActionParameterRequestBuilder(); builder.setDisplayName(DisplayNames.VALUE) .setKey(EventParams.VALUE) + .setType(ParameterType.TEXTAREA.getValue()) .setRequired(true) .setOrder(order++); actionParameterRequests.add(builder.createActionParameterRequest()); @@ -133,6 +143,9 @@ private ActionEventRequest addSendDataValue() { ActionEventRequestBuilder eventRequestBuilder = new ActionEventRequestBuilder(); eventRequestBuilder.setActionParameters(actionParameterRequests) .setDisplayName(DisplayNames.SEND_DATA_VALUE) + .setServiceInterface(ChannelRequestBuilder.ACTION_PROXY_SERVICE) + .setServiceMethod("sendDataValue") + .setServiceMethodCallManner(MethodCallManner.MAP.name()) .setSubject(EventSubjects.SEND_DATA_VALUE) .setName(DisplayNames.SEND_DATA_VALUE); diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/CreateInstanceActionBuilder.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/CreateInstanceActionBuilder.java similarity index 83% rename from dhis2/src/main/java/org/motechproject/dhis2/tasks/CreateInstanceActionBuilder.java rename to dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/CreateInstanceActionBuilder.java index 573cc03ed..096381c6f 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/tasks/CreateInstanceActionBuilder.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/CreateInstanceActionBuilder.java @@ -1,13 +1,18 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.motechproject.dhis2.domain.TrackedEntity; import org.motechproject.dhis2.domain.TrackedEntityAttribute; import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; +import org.motechproject.dhis2.tasks.DisplayNames; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.builder.ActionEventRequestBuilder; import org.motechproject.tasks.contract.ActionParameterRequest; import org.motechproject.tasks.contract.builder.ActionParameterRequestBuilder; +import org.motechproject.tasks.domain.enums.MethodCallManner; +import org.motechproject.tasks.domain.enums.ParameterType; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -17,9 +22,9 @@ /** * Builds task action requests for tracked entity instance creation for each entity type in the DHIS2 schema. */ +@Component public class CreateInstanceActionBuilder { - private static final String UNICODE = "UNICODE"; private static final int ATTRIBUTE_COUNT = 3; @@ -30,6 +35,7 @@ public class CreateInstanceActionBuilder { * @param trackedEntities * @return a list of action event requests for creating instances of each tracked entity type */ + @Transactional public List build(List attributes, List trackedEntities) { List actionEventRequests = new ArrayList<>(); @@ -45,7 +51,7 @@ public List build(List attributes, L ActionParameterRequestBuilder actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(DisplayNames.EXTERNAL_ID) .setKey(EventParams.EXTERNAL_ID) - .setType(UNICODE) + .setType(ParameterType.UNICODE.getValue()) .setRequired(true) .setOrder(counter++); @@ -54,7 +60,7 @@ public List build(List attributes, L actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(entity.getName()) - .setType(UNICODE) + .setType(ParameterType.TEXTAREA.getValue()) .setHidden(true) .setKey(EventParams.ENTITY_TYPE) .setValue(entity.getUuid()) @@ -64,7 +70,7 @@ public List build(List attributes, L actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(DisplayNames.ORG_UNIT) - .setType(UNICODE) + .setType(ParameterType.TEXTAREA.getValue()) .setKey(EventParams.LOCATION) .setOrder(counter++) .setRequired(true); @@ -76,6 +82,9 @@ public List build(List attributes, L ActionEventRequestBuilder builder = new ActionEventRequestBuilder() .setDisplayName(DisplayNames.CREATE_TRACKED_ENTITY_INSTANCE + " [" + entity.getName() + "]") .setName(entity.getName()) + .setServiceInterface(ChannelRequestBuilder.ACTION_PROXY_SERVICE) + .setServiceMethod("createEntity") + .setServiceMethodCallManner(MethodCallManner.MAP.name()) .setSubject(EventSubjects.CREATE_ENTITY) .setActionParameters(actionParameters); @@ -98,7 +107,7 @@ private SortedSet buildAttributeActionParameters(List build(List programs, ServerVersion version) { List actionEventRequests = new ArrayList<>(); @@ -47,7 +53,7 @@ public List build(List programs, ServerVersion vers ActionParameterRequestBuilder actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(DisplayNames.EXTERNAL_ID) .setKey(EventParams.EXTERNAL_ID) - .setType(UNICODE) + .setType(ParameterType.UNICODE.getValue()) .setRequired(true) .setOrder(counter++); @@ -59,7 +65,7 @@ public List build(List programs, ServerVersion vers .setDisplayName(DisplayNames.ENROLLMENT_DATE) .setKey(EventParams.DATE) .setOrder(counter++) - .setType(UNICODE); + .setType(ParameterType.DATE.getValue()); actionParameters.add(actionParameterBuilder.createActionParameterRequest()); actionParamsForCreateAndEnroll.add(actionParameterBuilder.createActionParameterRequest()); @@ -68,7 +74,7 @@ public List build(List programs, ServerVersion vers .setDisplayName(DisplayNames.PROGRAM_NAME) .setKey(EventParams.PROGRAM) .setValue(program.getUuid()) - .setType(UNICODE) + .setType(ParameterType.UNICODE.getValue()) .setOrder(counter++) .setHidden(true); @@ -77,7 +83,7 @@ public List build(List programs, ServerVersion vers actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(DisplayNames.ORG_UNIT) - .setType(UNICODE) + .setType(ParameterType.TEXTAREA.getValue()) .setKey(EventParams.LOCATION) .setOrder(counter++) .setRequired(true); @@ -94,6 +100,9 @@ public List build(List programs, ServerVersion vers builder.setActionParameters(actionParameters) .setDisplayName(DisplayNames.PROGRAM_ENROLLMENT + " [" + program.getName() + "]") + .setServiceInterface(ChannelRequestBuilder.ACTION_PROXY_SERVICE) + .setServiceMethod("enrollInProgram") + .setServiceMethodCallManner(MethodCallManner.MAP.name()) .setSubject(EventSubjects.ENROLL_IN_PROGRAM) .setName(program.getName()); @@ -104,7 +113,7 @@ public List build(List programs, ServerVersion vers /*Add corresponding create and enroll action*/ actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(program.getTrackedEntity().getName()) - .setType(UNICODE) + .setType(ParameterType.TEXTAREA.getValue()) .setHidden(true) .setKey(EventParams.ENTITY_TYPE) .setValue(program.getTrackedEntity().getUuid()) @@ -116,6 +125,9 @@ public List build(List programs, ServerVersion vers .setDisplayName(DisplayNames.CREATE_TRACKED_ENTITY_INSTANCE + " [" + program.getTrackedEntity().getName() + "]" + " and " + DisplayNames.PROGRAM_ENROLLMENT + " [" + program.getName() + "]") + .setServiceInterface(ChannelRequestBuilder.ACTION_PROXY_SERVICE) + .setServiceMethod("createAndEnroll") + .setServiceMethodCallManner(MethodCallManner.MAP.name()) .setSubject(EventSubjects.CREATE_AND_ENROLL) .setName(program.getTrackedEntity().getName() + ", " + program.getName()); @@ -139,7 +151,7 @@ private List buildRequestForProgram(Program program) { actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(attribute.getName()) .setKey(attribute.getUuid()) - .setType(UNICODE) + .setType(ParameterType.TEXTAREA.getValue()) .setOrder(counter++); parameterRequests.add(actionParameterBuilder.createActionParameterRequest()); diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/SendDataValueSetActionBuilder.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/SendDataValueSetActionBuilder.java similarity index 84% rename from dhis2/src/main/java/org/motechproject/dhis2/tasks/SendDataValueSetActionBuilder.java rename to dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/SendDataValueSetActionBuilder.java index 3036b91c1..c6110dda9 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/tasks/SendDataValueSetActionBuilder.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/SendDataValueSetActionBuilder.java @@ -1,13 +1,18 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.DataSet; import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; +import org.motechproject.dhis2.tasks.DisplayNames; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.builder.ActionEventRequestBuilder; import org.motechproject.tasks.contract.ActionParameterRequest; import org.motechproject.tasks.contract.builder.ActionParameterRequestBuilder; +import org.motechproject.tasks.domain.enums.MethodCallManner; +import org.motechproject.tasks.domain.enums.ParameterType; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -17,6 +22,7 @@ /** * Builds task action requests for each data set. */ +@Component public class SendDataValueSetActionBuilder { /** @@ -25,6 +31,7 @@ public class SendDataValueSetActionBuilder { * @param dataSets the list of data sets * @return the list of action event requests */ + @Transactional public List addSendDataValueSetActions(List dataSets) { List requests = new ArrayList<>(); @@ -48,12 +55,14 @@ private ActionEventRequest addSendDataValueSetAction(DataSet dataSet) { builder = new ActionParameterRequestBuilder(); builder.setDisplayName(DisplayNames.COMPLETE_DATE) .setKey(EventParams.COMPLETE_DATE) + .setType(ParameterType.DATE.getValue()) .setOrder(order++); actionParameterRequests.add(builder.createActionParameterRequest()); builder = new ActionParameterRequestBuilder(); builder.setDisplayName(DisplayNames.PERIOD) .setKey(EventParams.PERIOD) + .setType(ParameterType.PERIOD.getValue()) .setOrder(order++) .setRequired(true); actionParameterRequests.add(builder.createActionParameterRequest()); @@ -61,6 +70,7 @@ private ActionEventRequest addSendDataValueSetAction(DataSet dataSet) { builder = new ActionParameterRequestBuilder(); builder.setDisplayName(DisplayNames.ORG_UNIT) .setKey(EventParams.LOCATION) + .setType(ParameterType.TEXTAREA.getValue()) .setOrder(order++) .setRequired(true); actionParameterRequests.add(builder.createActionParameterRequest()); @@ -74,6 +84,7 @@ private ActionEventRequest addSendDataValueSetAction(DataSet dataSet) { builder = new ActionParameterRequestBuilder(); builder.setDisplayName(DisplayNames.COMMENT) .setKey(EventParams.COMMENT) + .setType(ParameterType.TEXTAREA.getValue()) .setOrder(order++); actionParameterRequests.add(builder.createActionParameterRequest()); @@ -87,6 +98,7 @@ private ActionEventRequest addSendDataValueSetAction(DataSet dataSet) { builder = new ActionParameterRequestBuilder(); builder.setDisplayName(dataElement.getName()) .setKey(dataElement.getUuid()) + .setType(ParameterType.TEXTAREA.getValue()) .setOrder(order++); actionParameterRequests.add(builder.createActionParameterRequest()); } @@ -102,6 +114,9 @@ private ActionEventRequest addSendDataValueSetAction(DataSet dataSet) { ActionEventRequestBuilder eventRequestBuilder = new ActionEventRequestBuilder(); eventRequestBuilder.setActionParameters(actionParameterRequests) .setDisplayName(String.format("%s [%s]", DisplayNames.SEND_DATA_VALUE_SET, dataSet.getName())) + .setServiceInterface(ChannelRequestBuilder.ACTION_PROXY_SERVICE) + .setServiceMethod("sendDataValueSet") + .setServiceMethodCallManner(MethodCallManner.MAP.name()) .setSubject(EventSubjects.SEND_DATA_VALUE_SET) .setName(String.format("%s [%s]", DisplayNames.SEND_DATA_VALUE_SET, dataSet.getName())); diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/StageActionBuilder.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/StageActionBuilder.java similarity index 89% rename from dhis2/src/main/java/org/motechproject/dhis2/tasks/StageActionBuilder.java rename to dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/StageActionBuilder.java index 33bbc433c..219ccf33e 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/tasks/StageActionBuilder.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/builder/StageActionBuilder.java @@ -1,14 +1,18 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.Stage; import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; +import org.motechproject.dhis2.tasks.DisplayNames; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.ActionParameterRequest; import org.motechproject.tasks.contract.builder.ActionEventRequestBuilder; import org.motechproject.tasks.contract.builder.ActionParameterRequestBuilder; +import org.motechproject.tasks.domain.enums.MethodCallManner; import org.motechproject.tasks.domain.enums.ParameterType; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; @@ -20,6 +24,7 @@ /** * Builds task action requests for program stage events for each program stage. */ +@Component public class StageActionBuilder { private int counter; @@ -34,6 +39,7 @@ public class StageActionBuilder { * @param stages * @return a list of ActionEventRequests */ + @Transactional public List build(List stages) { List actionEventRequests = new ArrayList<>(); @@ -98,14 +104,14 @@ public List build(List stages) { .setDisplayName(DisplayNames.EVENT_DATE) .setOrder(counter++) .setKey(EventParams.DATE) - .setType(ParameterType.UNICODE.getValue()) + .setType(ParameterType.DATE.getValue()) .setRequired(true); actionParameters.add(actionParameterBuilder.createActionParameterRequest()); actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(DisplayNames.ORG_UNIT) - .setType(ParameterType.UNICODE.getValue()) + .setType(ParameterType.TEXTAREA.getValue()) .setKey(EventParams.LOCATION) .setOrder(counter++) .setRequired(true); @@ -128,6 +134,9 @@ public List build(List stages) { builder.setActionParameters(actionParameters) .setDisplayName(DisplayNames.STAGE_EVENT + " [" + stage.getName() + "]") .setName(stage.getName()) + .setServiceInterface(ChannelRequestBuilder.ACTION_PROXY_SERVICE) + .setServiceMethod("updateProgramStage") + .setServiceMethodCallManner(MethodCallManner.MAP.name()) .setSubject(EventSubjects.UPDATE_PROGRAM_STAGE); actionEventRequests.add(builder.createActionEventRequest()); @@ -149,7 +158,7 @@ private List buildRequestForStage(Stage stage) { ActionParameterRequestBuilder actionParameterBuilder = new ActionParameterRequestBuilder() .setDisplayName(element.getName()) .setKey(element.getUuid()) - .setType(ParameterType.UNICODE.getValue()) + .setType(ParameterType.TEXTAREA.getValue()) .setOrder(counter++); parameterRequests.add(actionParameterBuilder.createActionParameterRequest()); diff --git a/dhis2/src/main/java/org/motechproject/dhis2/tasks/impl/DhisActionProxyServiceImpl.java b/dhis2/src/main/java/org/motechproject/dhis2/tasks/impl/DhisActionProxyServiceImpl.java new file mode 100644 index 000000000..d49b85380 --- /dev/null +++ b/dhis2/src/main/java/org/motechproject/dhis2/tasks/impl/DhisActionProxyServiceImpl.java @@ -0,0 +1,45 @@ +package org.motechproject.dhis2.tasks.impl; + +import org.motechproject.dhis2.service.DhisService; +import org.motechproject.dhis2.tasks.DhisActionProxyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service("dhisActionProxyService") +public class DhisActionProxyServiceImpl implements DhisActionProxyService { + + @Autowired + private DhisService dhisService; + + @Override + public void enrollInProgram(Map parameters) { + dhisService.enrollInProgram(parameters); + } + + @Override + public void createEntity(Map parameters) { + dhisService.createEntity(parameters); + } + + @Override + public void updateProgramStage(Map parameters) { + dhisService.updateProgramStage(parameters); + } + + @Override + public void createAndEnroll(Map parameters) { + dhisService.createAndEnroll(parameters); + } + + @Override + public void sendDataValue(Map parameters) { + dhisService.sendDataValue(parameters); + } + + @Override + public void sendDataValueSet(Map parameters) { + dhisService.sendDataValueSet(parameters); + } +} diff --git a/dhis2/src/main/java/org/motechproject/dhis2/web/DhisSchemaController.java b/dhis2/src/main/java/org/motechproject/dhis2/web/DhisSchemaController.java index f8725e303..eded47a06 100644 --- a/dhis2/src/main/java/org/motechproject/dhis2/web/DhisSchemaController.java +++ b/dhis2/src/main/java/org/motechproject/dhis2/web/DhisSchemaController.java @@ -37,7 +37,6 @@ public class DhisSchemaController { @Autowired private DataElementService dataElementService; - @ResponseStatus(HttpStatus.OK) @RequestMapping(value = "/programs", method = RequestMethod.GET) @ResponseBody @@ -59,7 +58,6 @@ public List getTrackedEntities() { return trackedEntityService.findAll(); } - @ResponseBody @ResponseStatus(HttpStatus.OK) @RequestMapping(value = "/orgUnits", method = RequestMethod.GET) @@ -67,13 +65,10 @@ public List getOrgUnits() { return orgUnitService.findAll(); } - @ResponseBody @ResponseStatus(HttpStatus.OK) @RequestMapping(value = "/dataElements", method = RequestMethod.GET) public List getDataElements() { return dataElementService.findAll(); } - - } diff --git a/dhis2/src/main/resources/META-INF/spring/blueprint.xml b/dhis2/src/main/resources/META-INF/spring/blueprint.xml index 562e11f8a..4b6bcf9b9 100644 --- a/dhis2/src/main/resources/META-INF/spring/blueprint.xml +++ b/dhis2/src/main/resources/META-INF/spring/blueprint.xml @@ -80,4 +80,16 @@ + + + + + + + + + + + + diff --git a/dhis2/src/main/resources/webapp/js/controllers.js b/dhis2/src/main/resources/webapp/js/controllers.js index 31ce9bae1..969f503bf 100644 --- a/dhis2/src/main/resources/webapp/js/controllers.js +++ b/dhis2/src/main/resources/webapp/js/controllers.js @@ -4,7 +4,7 @@ /* Controllers */ var controllers = angular.module('dhis2.controllers', []); - controllers.controller('Dhis2SettingsCtrl', function ($scope, $http) { + controllers.controller('Dhis2SettingsCtrl', function ($scope, Sync, $http) { $scope.retrievalError = false; $scope.updateError = false; @@ -18,21 +18,9 @@ $scope.retrievalError = true; }); - $scope.sync = function () { - $scope.blocked = true; - $scope.success = null; - $http.get('../dhis2/sync') - - .success(function (response) { - $scope.blocked = false; - $scope.success = response; - }) - - .error(function (response) { - $scope.blocked = false; - $scope.success = false; - }) - }; + $scope.sync = Sync.sync; + $scope.isSyncing = Sync.isSyncing; + $scope.success = Sync.isLastSuccessful; $scope.submit = function () { if(!$scope.settings.serverURI.match("^https?:\/\/.+")) { diff --git a/dhis2/src/main/resources/webapp/js/services.js b/dhis2/src/main/resources/webapp/js/services.js index 704d3e68a..6f022bcf0 100644 --- a/dhis2/src/main/resources/webapp/js/services.js +++ b/dhis2/src/main/resources/webapp/js/services.js @@ -5,6 +5,40 @@ var services = angular.module('dhis2.services', ['ngResource']); + services.service('Sync', syncService); + syncService.$inject = ['$http']; + + function syncService($http) { + var syncing = false; + var lastSuccessful = null; + + this.sync = sync; + this.isSyncing = isSyncing; + this.isLastSuccessful = isLastSuccessful; + + function sync() { + if (!syncing) { + syncing = true; + + $http.get('../dhis2/sync').then(function(successful) { + lastSuccessful = successful.data; + }, function() { + lastSuccessful = false; + }).finally(function() { + syncing = false; + }) + } + } + + function isSyncing() { + return syncing; + } + + function isLastSuccessful() { + return lastSuccessful; + } + } + services.factory('Programs', function ($resource) { return $resource('../dhis2/programs'); }); diff --git a/dhis2/src/main/resources/webapp/partials/settings.html b/dhis2/src/main/resources/webapp/partials/settings.html index da2fcf6e6..db241ff56 100644 --- a/dhis2/src/main/resources/webapp/partials/settings.html +++ b/dhis2/src/main/resources/webapp/partials/settings.html @@ -48,12 +48,12 @@
    {{msg('dhis2.web.settings.syncHeader')}}
    - -
    {{msg('dhis2.sync.wait')}}
    -
    {{msg('dhis2.sync.success')}}
    -
    {{msg('dhis2.sync.fail')}}
    +
    {{msg('dhis2.sync.wait')}}
    +
    {{msg('dhis2.sync.success')}}
    +
    {{msg('dhis2.sync.fail')}}
    \ No newline at end of file diff --git a/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2DummyServer.java b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2DummyServer.java new file mode 100644 index 000000000..9237194dc --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2DummyServer.java @@ -0,0 +1,91 @@ +package org.motechproject.dhis2.it; + +import org.apache.commons.io.IOUtils; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.nio.charset.Charset; + +public class Dhis2DummyServer { + + private static final Logger LOGGER = LoggerFactory.getLogger(Dhis2DummyServer.class); + + private static final String PROGRAM_ENDPOINT = "/programs/programId"; + private static final String DATA_ELEMENTS_ENDPOINT = "/dataElements"; + private static final String DATA_SETS_ENDPOINT = "/dataSets"; + private static final String ORGANISATION_UNITS_ENDPOINT = "/organisationUnits"; + private static final String PROGRAMS_ENDPOINT = "/programs"; + private static final String TRACKED_ENTITIES_ENDPOINT = "/trackedEntities"; + private static final String TRACKED_ENTITY_ATTRIBUTES_ENDPOINT = "/trackedEntityAttributes"; + + private static final String PROGRAM_RESPONSE = "/json/program-response.json"; + private static final String DATA_ELEMENTS_RESPONSE = "/json/data-elements-response.json"; + private static final String DATA_SETS_RESPONSE = "/json/data-sets-response.json"; + private static final String ORGANISATION_UNITS_RESPONSE = "/json/organisation-units-response.json"; + private static final String PROGRAMS_RESPONSE = "/json/programs-response.json"; + private static final String TRACKED_ENTITIES_RESPONSE = "/json/tracked-entities-response.json"; + private static final String TRACKED_ENTITY_ATTRIBUTES_RESPONSE = "/json/tracked-entity-attributes-response.json"; + + private Server server; + + public Dhis2DummyServer() { + server = new Server(9780); + } + + public void start() { + try { + server.setHandler(new Dhis2RequestsHandler()); + server.start(); + } catch (Exception e) { + LOGGER.error("Failed to start the Jetty server.", e); + } + } + + public void stop() { + try { + server.stop(); + } catch (Exception e) { + LOGGER.error("Failed to stop the Jetty server.", e); + } + } + + private static class Dhis2RequestsHandler extends AbstractHandler { + @Override + public void handle(String s, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, int i) throws IOException, ServletException { + String requestURI = httpServletRequest.getRequestURI().toString(); + + if (requestURI.contains(PROGRAM_ENDPOINT)) { + writeResponse(httpServletResponse, PROGRAM_RESPONSE); + } else if (requestURI.contains(DATA_ELEMENTS_ENDPOINT)) { + writeResponse(httpServletResponse, DATA_ELEMENTS_RESPONSE); + } else if (requestURI.contains(DATA_SETS_ENDPOINT)) { + writeResponse(httpServletResponse, DATA_SETS_RESPONSE); + } else if (requestURI.contains(ORGANISATION_UNITS_ENDPOINT)) { + writeResponse(httpServletResponse, ORGANISATION_UNITS_RESPONSE); + } else if (requestURI.contains(PROGRAMS_ENDPOINT)) { + writeResponse(httpServletResponse, PROGRAMS_RESPONSE); + } else if (requestURI.contains(TRACKED_ENTITIES_ENDPOINT)) { + writeResponse(httpServletResponse, TRACKED_ENTITIES_RESPONSE); + } else if (requestURI.contains(TRACKED_ENTITY_ATTRIBUTES_ENDPOINT)) { + writeResponse(httpServletResponse, TRACKED_ENTITY_ATTRIBUTES_RESPONSE); + } + } + + private void writeResponse(HttpServletResponse response, String filePath) throws IOException { + response.setContentType("application/json; charset=utf-8"); + response.setStatus(HttpServletResponse.SC_OK); + + try (InputStream inputStream = getClass().getResourceAsStream(filePath); + PrintWriter responseWriter = response.getWriter()) { + responseWriter.println(IOUtils.toString(inputStream, Charset.forName("UTF-8"))); + } + } + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2IntegrationTests.java b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2IntegrationTests.java index 6b0cb201c..d73ffb761 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2IntegrationTests.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2IntegrationTests.java @@ -4,6 +4,6 @@ import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({TasksBundleIT.class, EventHandlerBundleIT.class}) +@Suite.SuiteClasses({TasksBundleIT.class, EventHandlerBundleIT.class, Dhis2SyncServiceIT.class}) public class Dhis2IntegrationTests { } diff --git a/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2ServerBaseIT.java b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2ServerBaseIT.java new file mode 100644 index 000000000..ff91771b6 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2ServerBaseIT.java @@ -0,0 +1,18 @@ +package org.motechproject.dhis2.it; + +import org.junit.After; +import org.junit.Before; + +public abstract class Dhis2ServerBaseIT extends BaseDhisIT { + private Dhis2DummyServer dhis2Server = new Dhis2DummyServer(); + + @Before + public void setUpServer() { + dhis2Server.start(); + } + + @After + public void tearDown() { + dhis2Server.stop(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2SyncServiceIT.java b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2SyncServiceIT.java new file mode 100644 index 000000000..9a27e2fa8 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/it/Dhis2SyncServiceIT.java @@ -0,0 +1,135 @@ +package org.motechproject.dhis2.it; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.motechproject.dhis2.domain.DataElement; +import org.motechproject.dhis2.domain.DataSet; +import org.motechproject.dhis2.domain.OrgUnit; +import org.motechproject.dhis2.domain.Program; +import org.motechproject.dhis2.domain.TrackedEntity; +import org.motechproject.dhis2.domain.TrackedEntityAttribute; +import org.motechproject.dhis2.rest.domain.DataElementDto; +import org.motechproject.dhis2.rest.domain.OrganisationUnitDto; +import org.motechproject.dhis2.service.DataElementService; +import org.motechproject.dhis2.service.DataSetService; +import org.motechproject.dhis2.service.OrgUnitService; +import org.motechproject.dhis2.service.ProgramService; +import org.motechproject.dhis2.service.Settings; +import org.motechproject.dhis2.service.SettingsService; +import org.motechproject.dhis2.service.StageService; +import org.motechproject.dhis2.service.SyncService; +import org.motechproject.dhis2.service.TrackedEntityAttributeService; +import org.motechproject.dhis2.service.TrackedEntityService; +import org.motechproject.testing.osgi.container.MotechNativeTestContainerFactory; +import org.ops4j.pax.exam.ExamFactory; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerSuite; + +import javax.inject.Inject; + +import java.util.List; + +import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; + + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerSuite.class) +@ExamFactory(MotechNativeTestContainerFactory.class) +public class Dhis2SyncServiceIT extends Dhis2ServerBaseIT { + + @Inject + private DataSetService dataSetService; + @Inject + private ProgramService programService; + @Inject + private TrackedEntityAttributeService trackedEntityAttributeService; + @Inject + private TrackedEntityService trackedEntityService; + @Inject + private OrgUnitService orgUnitService; + @Inject + private DataElementService dataElementService; + @Inject + private StageService stageService; + @Inject + private SettingsService settingsService; + @Inject + private SyncService syncService; + + @Before + public void sync() { + Settings settings = new Settings("http://localhost:9780", "name","password"); + + settingsService.updateSettings(settings); + syncService.sync(); + } + + @Test + public void shouldAddDataElementsBySync() { + List dataElements = dataElementService.findAll(); + + assertNotNull(dataElements); + assertEquals(1, dataElements.size()); + + assertEquals("testDataElementId", dataElements.get(0).getUuid()); + assertEquals("testDataElementName", dataElements.get(0).getName()); + } + + @Test + public void shouldAddDataSetsBySync() { + List dataSets = dataSetService.findAll(); + + assertNotNull(dataSets); + assertEquals(1, dataSets.size()); + + assertEquals("testDataSetId", dataSets.get(0).getUuid()); + assertEquals("testDataSetName", dataSets.get(0).getName()); + } + + @Test + public void shouldAddTrackedEntityAttributesBySync() { + List trackedEntityAttributes = trackedEntityAttributeService.findAll(); + + assertNotNull(trackedEntityAttributes); + assertEquals(1, trackedEntityAttributes.size()); + + assertEquals("trackedEntityAttributes1Id", trackedEntityAttributes.get(0).getUuid()); + assertEquals("trackedEntityAttributes1Name", trackedEntityAttributes.get(0).getName()); + } + + @Test + public void shouldAddTrackedEntitiesBySync() { + List trackedEntities = trackedEntityService.findAll(); + + assertNotNull(trackedEntities); + assertEquals(1, trackedEntities.size()); + + assertEquals("trackedEntities1Id", trackedEntities.get(0).getUuid()); + assertEquals("trackedEntities1Name", trackedEntities.get(0).getName()); + } + + @Test + public void shouldAddProgramsBySync() { + List programs = programService.findAll(); + + assertNotNull(programs); + assertEquals(1, programs.size()); + + assertEquals("programId", programs.get(0).getUuid()); + assertEquals("programName", programs.get(0).getName()); + } + + @Test + public void shouldAddOrganisationUnitsBySync() { + List orgUnits = orgUnitService.findAll(); + + assertNotNull(orgUnits); + assertEquals(1, orgUnits.size()); + + assertEquals("testOrganisationUnitId", orgUnits.get(0).getUuid()); + assertEquals("testOrganisationUnitName", orgUnits.get(0).getName()); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataElementServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataElementServiceImplTest.java new file mode 100644 index 000000000..adc0c55a4 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataElementServiceImplTest.java @@ -0,0 +1,54 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.DataElement; +import org.motechproject.dhis2.repository.DataElementDataService; +import org.motechproject.dhis2.rest.domain.DataElementDto; +import org.motechproject.dhis2.service.DataElementService; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class DataElementServiceImplTest { + + private static final String ID = "id"; + private static final String NAME = "NAME"; + + @Mock + private DataElementDataService dataElementDataService; + + @InjectMocks + private DataElementService dataElementService; + + @Before + public void setUp() { + dataElementService = new DataElementServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreateFromDetails() { + DataElementDto actual = new DataElementDto(ID, NAME); + DataElement expected = new DataElement(actual.getName(), actual.getId()); + + when(dataElementDataService.create(eq(expected))).thenReturn(expected); + DataElement created = dataElementService.createFromDetails(actual); + + assertThat(created, equalTo(expected)); + + verify(dataElementDataService).create(eq(expected)); + } + + @Test + public void shouldDeleteAll() { + dataElementService.deleteAll(); + verify(dataElementDataService).deleteAll(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataSetServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataSetServiceImplTest.java index 274abdf09..a24467087 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataSetServiceImplTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DataSetServiceImplTest.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; +import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; import static org.mockito.Matchers.eq; @@ -47,19 +48,17 @@ public void shouldCreateFromDetails() { DataSetDto dto = prepareDataSetDto(); DataSet expected = prepareDataSet(dto); - for (DataElementDto dataElementDto : dto.getDataElements()) { - when(dataElementService.findById(eq(dataElementDto.getId()))).thenReturn(prepareDataElement(dataElementDto)); - } - when(dataSetDataService.create(eq(expected))).thenReturn(expected); + createFromDetails(dto, expected); + } - DataSet created = dataSetService.createFromDetails(dto); + @Test + public void shouldCreateFromDetailsWhenDataElementListIsNull() { + DataSetDto dto = prepareDataSetDtoWithNullDataElementList(); + assertNotNull(dto.getDataElements()); - assertThat(created, equalTo(expected)); + DataSet expected = prepareDataSet(dto); - for (DataElementDto dataElementDto : dto.getDataElements()) { - verify(dataElementService).findById(dataElementDto.getId()); - } - verify(dataSetDataService).create(eq(expected)); + createFromDetails(dto, expected); } @Test @@ -69,6 +68,22 @@ public void shouldDeleteAll() { verify(dataSetDataService).deleteAll(); } + private void createFromDetails(DataSetDto actual, DataSet expected) { + for (DataElementDto dataElementDto : actual.getDataElements()) { + when(dataElementService.findById(eq(dataElementDto.getId()))).thenReturn(prepareDataElement(dataElementDto)); + } + when(dataSetDataService.create(eq(expected))).thenReturn(expected); + + DataSet created = dataSetService.createFromDetails(actual); + + assertThat(created, equalTo(expected)); + + for (DataElementDto dataElementDto : actual.getDataElements()) { + verify(dataElementService).findById(dataElementDto.getId()); + } + verify(dataSetDataService).create(eq(expected)); + } + private DataSetDto prepareDataSetDto() { DataSetDto dto = new DataSetDto(); @@ -83,6 +98,16 @@ private DataSetDto prepareDataSetDto() { return dto; } + private DataSetDto prepareDataSetDtoWithNullDataElementList() { + DataSetDto dto = new DataSetDto(); + + dto.setId(ID); + dto.setName(NAME); + dto.setDataElements(null); + + return dto; + } + private DataElementDto prepareDataElementDto(String suffix) { DataElementDto dto = new DataElementDto(); diff --git a/dhis2/src/test/java/org/motechproject/dhis2/event/EventHandlerTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DhisServiceImplTest.java similarity index 87% rename from dhis2/src/test/java/org/motechproject/dhis2/event/EventHandlerTest.java rename to dhis2/src/test/java/org/motechproject/dhis2/service/impl/DhisServiceImplTest.java index e15a8eaf8..e023902df 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/event/EventHandlerTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/DhisServiceImplTest.java @@ -1,5 +1,6 @@ -package org.motechproject.dhis2.event; +package org.motechproject.dhis2.service.impl; +import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -7,7 +8,9 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import org.motechproject.commons.date.util.JodaFormatter; import org.motechproject.dhis2.domain.DataElement; +import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.exception.DataElementNotFoundException; import org.motechproject.dhis2.rest.domain.AttributeDto; import org.motechproject.dhis2.rest.domain.DataValueDto; @@ -20,9 +23,9 @@ import org.motechproject.dhis2.rest.domain.TrackedEntityInstanceDto; import org.motechproject.dhis2.rest.service.DhisWebService; import org.motechproject.dhis2.service.DataElementService; +import org.motechproject.dhis2.service.DhisService; import org.motechproject.dhis2.service.SettingsService; import org.motechproject.dhis2.service.TrackedEntityInstanceMappingService; -import org.motechproject.event.MotechEvent; import java.util.ArrayList; import java.util.HashMap; @@ -33,8 +36,7 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class EventHandlerTest { - +public class DhisServiceImplTest { private static final String ORGUNIT_ID = "orgUnitID"; private static final String ENTITY_TYPE_PERSON = "person"; private static final String ENTITY_INSTANCE_ID = "externalID"; @@ -47,13 +49,11 @@ public class EventHandlerTest { private static final String STAGE_ID = "stageId"; private static final String DATA_ELEMENT_ID = "dataElementID"; private static final String DATA_ELEMENT_VALUE = "value"; - private static final String PERIOD = "period"; + private static final String PERIOD_VALUE = "5 months"; private static final String CATEGORY_COMBO = "categoryOption"; private static final String COMMENT = "comment"; private static final String STATUS = "ACTIVE"; - - @Mock SettingsService settingsService; @Mock @@ -62,9 +62,11 @@ public class EventHandlerTest { private DataElementService dataElementService; @Mock private DhisWebService dhisWebservice; + private DhisStatusResponse response; + @InjectMocks - private EventHandler handler = new EventHandler(); + private DhisService dhisService = new DhisServiceImpl(); @Before public void setup() throws Exception{ @@ -77,7 +79,7 @@ public void setup() throws Exception{ response = new DhisStatusResponse(); response.setReference(INSTANCE_DHIS_ID); response.setStatus(DhisStatus.SUCCESS); - response.setImportCount(importCount); + response.setImportCountDto(importCount); } @Test @@ -101,9 +103,8 @@ public void testCreate() throws Exception { params.put(EventParams.LOCATION, ORGUNIT_ID); params.put(ATTRIBUTE_ID, ATTRIBUTE_VALUE); - MotechEvent event = new MotechEvent(EventSubjects.CREATE_ENTITY, params); + dhisService.createEntity(params); - handler.handleCreate(event); verify(trackedEntityInstanceMappingService).create(ENTITY_INSTANCE_ID, INSTANCE_DHIS_ID); verify(dhisWebservice).createTrackedEntityInstance(instance); } @@ -119,7 +120,7 @@ public void testEnrollment() throws Exception { EnrollmentDto enrollment = new EnrollmentDto(); enrollment.setAttributes(attributeDtos); - enrollment.setDateOfEnrollment(DATE); + enrollment.setDateOfEnrollment(new JodaFormatter().formatDateTime(new DateTime(DATE))); enrollment.setProgram(PROGRAM_ID); enrollment.setTrackedEntityInstance(INSTANCE_DHIS_ID); @@ -131,12 +132,11 @@ public void testEnrollment() throws Exception { Map params = new HashMap<>(); params.put(EventParams.PROGRAM,PROGRAM_ID ); params.put(EventParams.EXTERNAL_ID, ENTITY_INSTANCE_ID); - params.put(EventParams.DATE, DATE); + params.put(EventParams.DATE, new DateTime(DATE)); params.put(ATTRIBUTE_ID, ATTRIBUTE_VALUE); - MotechEvent event = new MotechEvent(EventSubjects.ENROLL_IN_PROGRAM,params); + dhisService.enrollInProgram(params); - handler.handleEnrollment(event); verify(trackedEntityInstanceMappingService).mapFromExternalId(ENTITY_INSTANCE_ID); verify(dhisWebservice).createEnrollment(enrollment); @@ -154,7 +154,7 @@ public void testEventWithRegistration() throws Exception { programStageDto.setDataValues(dataValues); programStageDto.setTrackedEntityInstance(INSTANCE_DHIS_ID); programStageDto.setProgram(PROGRAM_ID); - programStageDto.setEventDate(DATE); + programStageDto.setEventDate(new JodaFormatter().formatDateTime(new DateTime(DATE))); programStageDto.setOrgUnit(ORGUNIT_ID); programStageDto.setProgramStage(STAGE_ID); programStageDto.setStatus(STATUS); @@ -168,13 +168,12 @@ public void testEventWithRegistration() throws Exception { params.put(EventParams.EXTERNAL_ID, ENTITY_INSTANCE_ID); params.put(EventParams.LOCATION, ORGUNIT_ID); params.put(EventParams.PROGRAM, PROGRAM_ID); - params.put(EventParams.DATE, DATE); + params.put(EventParams.DATE, new DateTime(DATE)); params.put(EventParams.STAGE,STAGE_ID); params.put(EventParams.STATUS, STATUS); params.put(DATA_ELEMENT_ID, DATA_ELEMENT_VALUE); - MotechEvent event = new MotechEvent(EventSubjects.UPDATE_PROGRAM_STAGE, params); - handler.handleStageUpdate(event); + dhisService.updateProgramStage(params); verify(trackedEntityInstanceMappingService).mapFromExternalId(ENTITY_INSTANCE_ID); verify(dhisWebservice).createEvent(programStageDto); @@ -190,7 +189,7 @@ public void testCreateAndEnroll() throws Exception { EnrollmentDto enrollment = new EnrollmentDto(); enrollment.setAttributes(new ArrayList<>()); - enrollment.setDateOfEnrollment(DATE); + enrollment.setDateOfEnrollment(new JodaFormatter().formatDateTime(new DateTime(DATE))); enrollment.setProgram(PROGRAM_ID); enrollment.setOrgUnit(ORGUNIT_ID); enrollment.setTrackedEntityInstance(INSTANCE_DHIS_ID); @@ -210,12 +209,10 @@ public void testCreateAndEnroll() throws Exception { params.put(EventParams.ENTITY_TYPE, ENTITY_TYPE_PERSON ); params.put(EventParams.LOCATION,ORGUNIT_ID); params.put(EventParams.PROGRAM,PROGRAM_ID ); - params.put(EventParams.DATE, DATE); + params.put(EventParams.DATE, new DateTime(DATE)); params.put(ATTRIBUTE_ID, ATTRIBUTE_VALUE); - MotechEvent event = new MotechEvent(EventSubjects.CREATE_AND_ENROLL, params); - - handler.handleCreateAndEnroll(event); + dhisService.createAndEnroll(params); verify(dhisWebservice).createTrackedEntityInstance(instance); verify(dhisWebservice).createEnrollment(enrollment); @@ -229,7 +226,7 @@ public void testHandleDataValue() { dataValueDto.setDataElement(DATA_ELEMENT_ID); dataValueDto.setValue(DATA_ELEMENT_VALUE); dataValueDto.setOrgUnit(ORGUNIT_ID); - dataValueDto.setPeriod(PERIOD); + dataValueDto.setPeriod(PERIOD_VALUE); dataValueDto.setCategoryOptionCombo(CATEGORY_COMBO); dataValueDto.setComment(COMMENT); @@ -241,7 +238,7 @@ public void testHandleDataValue() { Map params = new HashMap<>(); params.put(EventParams.DATA_ELEMENT, DATA_ELEMENT_ID); params.put(EventParams.LOCATION, ORGUNIT_ID); - params.put(EventParams.PERIOD, PERIOD); + params.put(EventParams.PERIOD, new JodaFormatter().parsePeriod(PERIOD_VALUE)); params.put(EventParams.VALUE, DATA_ELEMENT_VALUE); params.put(EventParams.CATEGORY_OPTION_COMBO, CATEGORY_COMBO); params.put(EventParams.COMMENT, COMMENT); @@ -250,9 +247,7 @@ public void testHandleDataValue() { when(dataElementService.findByName(DATA_ELEMENT_ID)).thenReturn(dataElement); - MotechEvent event = new MotechEvent(EventSubjects.SEND_DATA_VALUE, params); - - handler.handleDataValue(event); + dhisService.sendDataValue(params); verify(dhisWebservice).sendDataValueSet(Matchers.refEq(dataValueSetDto)); } @@ -263,14 +258,13 @@ public void shouldThrowExceptionForNonExistingDataValue() { Map params = new HashMap<>(); params.put(EventParams.DATA_ELEMENT, DATA_ELEMENT_ID); params.put(EventParams.LOCATION, ORGUNIT_ID); - params.put(EventParams.PERIOD, PERIOD); + params.put(EventParams.PERIOD, PERIOD_VALUE); params.put(EventParams.VALUE, DATA_ELEMENT_VALUE); params.put(EventParams.CATEGORY_OPTION_COMBO, CATEGORY_COMBO); params.put(EventParams.COMMENT, COMMENT); when(dataElementService.findByName(DATA_ELEMENT_ID)).thenReturn(null); - MotechEvent event = new MotechEvent(EventSubjects.SEND_DATA_VALUE, params); - handler.handleDataValue(event); - } + dhisService.sendDataValue(params); + } } diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImplTest.java new file mode 100644 index 000000000..dec462ff1 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/OrgUnitServiceImplTest.java @@ -0,0 +1,54 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.OrgUnit; +import org.motechproject.dhis2.repository.OrgUnitDataService; +import org.motechproject.dhis2.rest.domain.OrganisationUnitDto; +import org.motechproject.dhis2.service.OrgUnitService; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class OrgUnitServiceImplTest { + + private static final String ID = "id"; + private static final String NAME = "NAME"; + + @Mock + private OrgUnitDataService orgUnitDataService; + + @InjectMocks + private OrgUnitService orgUnitService; + + @Before + public void setUp() { + orgUnitService = new OrgUnitServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreateFromDetails() { + OrganisationUnitDto actual = new OrganisationUnitDto(ID, NAME); + OrgUnit expected = new OrgUnit(actual.getName(), actual.getId()); + + when(orgUnitDataService.create(eq(expected))).thenReturn(expected); + OrgUnit created = orgUnitService.createFromDetails(actual); + + assertThat(created, equalTo(expected)); + + verify(orgUnitDataService).create(eq(expected)); + } + + @Test + public void shouldDeleteAll() { + orgUnitService.deleteAll(); + verify(orgUnitDataService).deleteAll(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/ProgramServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/ProgramServiceImplTest.java new file mode 100644 index 000000000..b73b270c9 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/ProgramServiceImplTest.java @@ -0,0 +1,73 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.Program; +import org.motechproject.dhis2.domain.TrackedEntity; +import org.motechproject.dhis2.repository.ProgramDataService; +import org.motechproject.dhis2.rest.domain.ProgramDto; +import org.motechproject.dhis2.service.ProgramService; + +import java.util.ArrayList; +import java.util.List; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; +import static org.springframework.test.util.MatcherAssertionErrors.assertThat; + +public class ProgramServiceImplTest { + private static final String ID = "id"; + private static final String NAME = "NAME"; + + @Mock + private ProgramDataService programDataService; + + @InjectMocks + private ProgramService programService; + + @Before + public void setUp() { + programService = new ProgramServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreateFromDetails() { + ProgramDto actual = new ProgramDto(ID, NAME); + + Program expected = new Program(actual.getId(), actual.getName(), new TrackedEntity(), new ArrayList<>(), + new ArrayList<>(), false, true, null); + + when(programDataService.create(eq(expected))).thenReturn(expected); + Program created = programService.createFromDetails(actual, new TrackedEntity(), new ArrayList<>(), new ArrayList<>()); + + assertThat(created, equalTo(expected)); + + verify(programDataService).create(eq(expected)); + } + + @Test + public void shouldFindByRegistration() { + List expectedPrograms = new ArrayList<>(); + + expectedPrograms.add(new Program(ID, NAME, new TrackedEntity(), new ArrayList<>(), new ArrayList<>(), false, true, null)); + when(programDataService.findByRegistration(true)).thenReturn(expectedPrograms); + + List createdPrograms = programService.findByRegistration(true); + assertThat(createdPrograms, equalTo(expectedPrograms)); + + verify(programDataService).findByRegistration(true); + } + + @Test + public void shouldDeleteAll() { + programService.deleteAll(); + verify(programDataService).deleteAll(); + } + +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/SettingsServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/SettingsServiceImplTest.java new file mode 100644 index 000000000..9fe0b2e3f --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/SettingsServiceImplTest.java @@ -0,0 +1,59 @@ +package org.motechproject.dhis2.service.impl; + +import com.google.gson.JsonIOException; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.motechproject.config.SettingsFacade; +import org.motechproject.dhis2.service.Settings; +import org.motechproject.event.listener.EventRelay; + +import java.io.IOException; +import java.io.InputStream; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class SettingsServiceImplTest { + + private static final String SETTINGS_FILE_NAME = "dhis2-settings.json"; + private static final String SETTINGS_JSON = "json/settings/settings.json"; + + private Settings settings; + + @Mock + private EventRelay eventRelay; + + @Mock + private SettingsFacade settingsFacade; + + private SettingsServiceImpl settingsService; + + @Before + public void setUp() { + initMocks(this); + settings = new Settings("localhost:8080/dhis/", "admin", "district"); + try (InputStream is = getClass().getClassLoader().getResourceAsStream(SETTINGS_JSON)) { + when(settingsFacade.getRawConfig(SETTINGS_FILE_NAME)).thenReturn(is); + settingsService = new SettingsServiceImpl(settingsFacade, eventRelay); + } catch (IOException e) { + String message = "There was an error loading json from the DHIS2 settings."; + throw new JsonIOException(message, e); + } + } + + @Test + public void shouldRemoveTrailingSlashes() { + try (InputStream is = getClass().getClassLoader().getResourceAsStream(SETTINGS_JSON)) { + when(settingsFacade.getRawConfig(SETTINGS_FILE_NAME)).thenReturn(is); + settingsService.updateSettings(settings); + String expected = "localhost:8080/dhis"; + assertThat(settingsService.getSettings().getServerURI(), equalTo(expected)); + } catch (IOException e) { + String message = "There was an error loading json from the DHIS2 settings."; + throw new JsonIOException(message, e); + } + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/StageServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/StageServiceImplTest.java new file mode 100644 index 000000000..9ee55ae90 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/StageServiceImplTest.java @@ -0,0 +1,57 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.Stage; +import org.motechproject.dhis2.repository.StageDataService; +import org.motechproject.dhis2.rest.domain.ProgramDto; +import org.motechproject.dhis2.rest.domain.ProgramStageDto; + +import java.util.ArrayList; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class StageServiceImplTest { + + private static final String ID = "id"; + private static final String NAME = "NAME"; + private static final String PROGRAM_ID = "ProgramId"; + + @Mock + private StageDataService stageDataService; + + @InjectMocks + private StageServiceImpl stageService; + + @Before + public void setUp() { + stageService = new StageServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreateFromDetails() { + ProgramStageDto actual = new ProgramStageDto(ID, NAME, new ProgramDto(PROGRAM_ID, NAME), new ArrayList<>()); + Stage expected = new Stage(ID, NAME, new ArrayList<>(), PROGRAM_ID, true); + + when(stageDataService.create(eq(expected))).thenReturn(expected); + Stage created = stageService.createFromDetails(actual, actual.getProgram().getId(), true, new ArrayList<>()); + + assertThat(created, equalTo(expected)); + + verify(stageDataService).create(eq(expected)); + } + + @Test + public void shouldDeleteAll() { + stageService.deleteAll(); + verify(stageDataService).deleteAll(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImplTest.java new file mode 100644 index 000000000..987b753df --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityAttributeServiceImplTest.java @@ -0,0 +1,53 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.TrackedEntityAttribute; +import org.motechproject.dhis2.repository.TrackedEntityAttributeDataService; +import org.motechproject.dhis2.rest.domain.TrackedEntityAttributeDto; +import org.motechproject.dhis2.service.TrackedEntityAttributeService; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class TrackedEntityAttributeServiceImplTest { + private static final String ID = "id"; + private static final String NAME = "NAME"; + + @Mock + private TrackedEntityAttributeDataService trackedEntityAttributeDataService; + + @InjectMocks + private TrackedEntityAttributeService trackedEntityAttributeService; + + @Before + public void setUp() { + trackedEntityAttributeService = new TrackedEntityAttributeServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreateFromDetails() { + TrackedEntityAttributeDto actual = new TrackedEntityAttributeDto(ID, NAME); + TrackedEntityAttribute expected = new TrackedEntityAttribute(actual.getName(), actual.getId()); + + when(trackedEntityAttributeDataService.create(eq(expected))).thenReturn(expected); + TrackedEntityAttribute created = trackedEntityAttributeService.createFromDetails(actual); + + assertThat(created, equalTo(expected)); + + verify(trackedEntityAttributeDataService).create(eq(expected)); + } + + @Test + public void shouldDeleteAll() { + trackedEntityAttributeService.deleteAll(); + verify(trackedEntityAttributeDataService).deleteAll(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImplTest.java new file mode 100644 index 000000000..a9e35ed76 --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityInstanceMappingServiceImplTest.java @@ -0,0 +1,64 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.TrackedEntityInstanceMapping; +import org.motechproject.dhis2.repository.TrackedEntityInstanceMappingDataService; +import org.motechproject.dhis2.service.TrackedEntityInstanceMappingService; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class TrackedEntityInstanceMappingServiceImplTest { + private static final String EXTERNAL_NAME = "externalName"; + private static final String DHIS2_ID = "dhis2Id"; + + @Mock + private TrackedEntityInstanceMappingDataService trackedEntityInstanceMappingDataService; + + @InjectMocks + private TrackedEntityInstanceMappingService trackedEntityInstanceMappingService; + + @Before + public void setUp() { + trackedEntityInstanceMappingService = new TrackedEntityInstanceMappingServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreate() { + TrackedEntityInstanceMapping expected = new TrackedEntityInstanceMapping(EXTERNAL_NAME, DHIS2_ID); + + when(trackedEntityInstanceMappingDataService.create(eq(expected))).thenReturn(expected); + TrackedEntityInstanceMapping created = trackedEntityInstanceMappingService.create(EXTERNAL_NAME, DHIS2_ID); + + assertThat(created, equalTo(expected)); + + verify(trackedEntityInstanceMappingDataService).create(eq(expected)); + } + + @Test + public void shouldMapFromExternalId() { + TrackedEntityInstanceMapping expected = new TrackedEntityInstanceMapping(EXTERNAL_NAME, DHIS2_ID); + + when(trackedEntityInstanceMappingDataService.findByExternalName(EXTERNAL_NAME)).thenReturn(expected); + + String fetchedDhis2Uuid = trackedEntityInstanceMappingService.mapFromExternalId(EXTERNAL_NAME); + + assertEquals(expected.getDhis2Uuid(), fetchedDhis2Uuid); + verify(trackedEntityInstanceMappingDataService).findByExternalName(EXTERNAL_NAME); + } + + @Test + public void shouldDeleteAll() { + trackedEntityInstanceMappingService.deleteAll(); + verify(trackedEntityInstanceMappingDataService).deleteAll(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImplTest.java b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImplTest.java new file mode 100644 index 000000000..bf375304b --- /dev/null +++ b/dhis2/src/test/java/org/motechproject/dhis2/service/impl/TrackedEntityServiceImplTest.java @@ -0,0 +1,53 @@ +package org.motechproject.dhis2.service.impl; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.motechproject.dhis2.domain.TrackedEntity; +import org.motechproject.dhis2.repository.TrackedEntityDataService; +import org.motechproject.dhis2.rest.domain.TrackedEntityDto; +import org.motechproject.dhis2.service.TrackedEntityService; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class TrackedEntityServiceImplTest { + private static final String ID = "id"; + private static final String NAME = "NAME"; + + @Mock + private TrackedEntityDataService trackedEntityDataService; + + @InjectMocks + private TrackedEntityService trackedEntityService; + + @Before + public void setUp() { + trackedEntityService = new TrackedEntityServiceImpl(); + initMocks(this); + } + + @Test + public void shouldCreateFromDetails() { + TrackedEntityDto actual = new TrackedEntityDto(ID, NAME); + TrackedEntity expected = new TrackedEntity(actual.getName(), actual.getId()); + + when(trackedEntityDataService.create(eq(expected))).thenReturn(expected); + TrackedEntity created = trackedEntityService.createFromDetails(actual); + + assertThat(created, equalTo(expected)); + + verify(trackedEntityDataService).create(eq(expected)); + } + + @Test + public void shouldDeleteAll() { + trackedEntityService.deleteAll(); + verify(trackedEntityDataService).deleteAll(); + } +} diff --git a/dhis2/src/test/java/org/motechproject/dhis2/tasks/ChannelRequestBuilderTest.java b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/ChannelRequestBuilderTest.java similarity index 53% rename from dhis2/src/test/java/org/motechproject/dhis2/tasks/ChannelRequestBuilderTest.java rename to dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/ChannelRequestBuilderTest.java index 8f425f443..fcd9c7f70 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/tasks/ChannelRequestBuilderTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/ChannelRequestBuilderTest.java @@ -1,26 +1,33 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.mockito.runners.MockitoJUnitRunner; -import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.DataSet; import org.motechproject.dhis2.domain.Program; import org.motechproject.dhis2.domain.Stage; import org.motechproject.dhis2.domain.TrackedEntity; import org.motechproject.dhis2.domain.TrackedEntityAttribute; +import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; import org.motechproject.dhis2.rest.domain.ServerVersion; +import org.motechproject.dhis2.rest.service.DhisWebService; import org.motechproject.dhis2.service.DataSetService; import org.motechproject.dhis2.service.ProgramService; import org.motechproject.dhis2.service.StageService; import org.motechproject.dhis2.service.TrackedEntityAttributeService; import org.motechproject.dhis2.service.TrackedEntityService; +import org.motechproject.dhis2.tasks.DisplayNames; import org.motechproject.dhis2.util.DummyData; import org.motechproject.tasks.contract.ActionEventRequest; +import org.motechproject.tasks.contract.ActionParameterRequest; import org.motechproject.tasks.contract.ChannelRequest; +import org.motechproject.tasks.domain.enums.ParameterType; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Version; @@ -28,6 +35,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -36,6 +45,10 @@ @RunWith(MockitoJUnitRunner.class) public class ChannelRequestBuilderTest { + private static final String BUNDLE_SYMBOLIC_NAME = "bundleSymbolicName"; + private static final String BUNDLE_VERSION = "bundleVersion"; + private static final String TEST_VERSION = "2.22"; + @Mock private ProgramService programService; @@ -60,6 +73,26 @@ public class ChannelRequestBuilderTest { @Mock private Version version; + @Mock + private DhisWebService dhisWebService; + + @Mock + private ProgramActionBuilder programActionBuilder; + + @Mock + private CreateInstanceActionBuilder createInstanceActionBuilder; + + @Mock + private SendDataValueSetActionBuilder sendDataValueSetActionBuilder; + + @Mock + private StageActionBuilder stageActionBuilder; + + @InjectMocks + private ChannelRequestBuilder builder = new ChannelRequestBuilder(); + + private ServerVersion serverVersion = new ServerVersion(TEST_VERSION); + private List programs; private List stages; private List attributes; @@ -71,41 +104,20 @@ public class ChannelRequestBuilderTest { @Before public void setup() { + MockitoAnnotations.initMocks(this); - programs = new ArrayList<>(); - stages = new ArrayList<>(); - attributes = new ArrayList<>(); - dataSets = DummyData.prepareDataSets(); - trackedEntities = new ArrayList<>(); - - setupStages(); - setupPrograms(); - setupTrackedEntities(); - - when(programService.findByRegistration(true)).thenReturn(programs); - when(stageService.findAll()).thenReturn(stages); - when(trackedEntityAttributeService.findAll()).thenReturn(attributes); - when(trackedEntityService.findAll()).thenReturn(trackedEntities); - when(dataSetService.findAll()).thenReturn(dataSets); - - when(bundleContext.getBundle()).thenReturn(bundle); - when(bundle.getVersion()).thenReturn(version); - - when(bundle.getSymbolicName()).thenReturn("BundleSymbolicName"); - when(version.toString()).thenReturn("bundleVersion"); + mockTestData(); + mockActionEventRequest(); - ChannelRequestBuilder builder = new ChannelRequestBuilder(bundleContext, programService, stageService, - trackedEntityAttributeService, trackedEntityService, new ServerVersion(ServerVersion.V2_18), - dataSetService); request = builder.build(); - } - @Test public void testBuildChannelRequest() throws Exception { assertNotNull(request); - assertEquals(request.getDisplayName(),DisplayNames.DHIS2_DISPLAY_NAME); + assertEquals(request.getDisplayName(), DisplayNames.DHIS2_DISPLAY_NAME); + assertEquals(request.getModuleName(), BUNDLE_SYMBOLIC_NAME); + assertEquals(request.getModuleVersion(), BUNDLE_VERSION); assertEquals(EXPECTED_ACTIONS_SIZE, request.getActionTaskEvents().size()); } @@ -125,7 +137,6 @@ public void testActionEventRequests() throws Exception{ assertEquals(actionEventRequest.getSubject(), EventSubjects.CREATE_AND_ENROLL); assertNotNull(actionEventRequest.getActionParameters()); - actionEventRequest = itr.next(); assertEquals(actionEventRequest.getName(),"Program2"); assertEquals(actionEventRequest.getSubject(), EventSubjects.ENROLL_IN_PROGRAM); @@ -136,7 +147,6 @@ public void testActionEventRequests() throws Exception{ assertEquals(actionEventRequest.getSubject(), EventSubjects.CREATE_AND_ENROLL); assertNotNull(actionEventRequest.getActionParameters()); - actionEventRequest = itr.next(); assertEquals(actionEventRequest.getName(),"stage1"); assertEquals(actionEventRequest.getSubject(), EventSubjects.UPDATE_PROGRAM_STAGE); @@ -147,7 +157,6 @@ public void testActionEventRequests() throws Exception{ assertEquals(actionEventRequest.getSubject(), EventSubjects.UPDATE_PROGRAM_STAGE); assertNotNull(actionEventRequest.getActionParameters()); - actionEventRequest = itr.next(); assertEquals(actionEventRequest.getName(),"trackedEntity1"); assertEquals(actionEventRequest.getSubject(), EventSubjects.CREATE_ENTITY); @@ -157,85 +166,86 @@ public void testActionEventRequests() throws Exception{ assertEquals(actionEventRequest.getName(),"trackedEntity2"); assertEquals(actionEventRequest.getSubject(), EventSubjects.CREATE_ENTITY); assertNotNull(actionEventRequest.getActionParameters()); - - } + private void mockTestData() { + programs = DummyData.preparePrograms(); + stages = DummyData.prepareStages(); + attributes = DummyData.prepareTrackedEntityAttributes(); + dataSets = DummyData.prepareDataSets(); + trackedEntities = DummyData.prepareTrackedEntities(); - private void setupPrograms() { - List stages = new ArrayList<>(); - List attributes = new ArrayList<>(); + when(programService.findByRegistration(true)).thenReturn(programs); + when(stageService.findAll()).thenReturn(stages); + when(trackedEntityAttributeService.findAll()).thenReturn(attributes); + when(trackedEntityService.findAll()).thenReturn(trackedEntities); + when(dataSetService.findAll()).thenReturn(dataSets); - TrackedEntityAttribute attribute1 = new TrackedEntityAttribute("attribute1", "uuid"); - TrackedEntityAttribute attribute2 = new TrackedEntityAttribute("attribute2", "uuid"); - attributes.add(attribute1); - attributes.add(attribute2); + when(bundleContext.getBundle()).thenReturn(bundle); + when(bundle.getVersion()).thenReturn(version); + when(dhisWebService.getServerVersion()).thenReturn(serverVersion); - TrackedEntity trackedEntity = new TrackedEntity("trackedEntityName","trackedEntityID"); + when(bundle.getSymbolicName()).thenReturn(BUNDLE_SYMBOLIC_NAME); + when(version.toString()).thenReturn(BUNDLE_VERSION); + } - Program program1 = new Program(); - program1.setName("Program1"); - program1.setUuid("program1UUID"); - program1.setRegistration(true); - program1.setSingleEvent(false); - program1.setTrackedEntity(trackedEntity); - program1.setStages(stages); - program1.setAttributes(attributes); + private void mockActionEventRequest() { + when(stageActionBuilder.build(stages)).thenReturn(prepareStagesActionEventRequests()); + when(createInstanceActionBuilder.build(attributes, trackedEntities)).thenReturn(prepareInstanceActionEventRequests()); + when(programActionBuilder.build(programs, serverVersion)).thenReturn(prepareProgramActionEventRequests()); + when(sendDataValueSetActionBuilder.addSendDataValueSetActions(dataSets)).thenReturn(prepareDataSetsActionEventRequests()); + } - Program program2 = new Program(); - program2.setName("Program2"); - program2.setUuid("program2UUID"); - program2.setRegistration(true); - program2.setSingleEvent(false); - program2.setTrackedEntity(trackedEntity); - program2.setStages(stages); - program2.setAttributes(attributes); + private List prepareProgramActionEventRequests() { + List result = new ArrayList<>(); - programs.add(program1); - programs.add(program2); + for(Program program : programs) { + result.add(prepareActionEventRequests(program.getName(), EventSubjects.ENROLL_IN_PROGRAM)); + result.add(prepareActionEventRequests(program.getTrackedEntity().getName() + ", " + program.getName(), EventSubjects.CREATE_AND_ENROLL)); + } + return result; } - private void setupStages() { - - DataElement dataElement1 = new DataElement("dataElementName1","dataElementID1"); - DataElement dataElement2 = new DataElement("dataElementName2","dataElementID2"); - - Stage stage1 = new Stage(); - stage1.setName("stage1"); - stage1.setProgram("programID"); - stage1.setUuid("stageID"); + private List prepareStagesActionEventRequests() { + List result = new ArrayList<>(); - List dataElements = new ArrayList<>(); - dataElements.add(dataElement1); - dataElements.add(dataElement2); + for (Stage stage : stages) { + result.add(prepareActionEventRequests(stage.getName(), EventSubjects.UPDATE_PROGRAM_STAGE)); + } - stage1.setDataElements(dataElements); + return result; + } - Stage stage2 = new Stage(); - stage2.setName("stage2"); - stage2.setProgram("programID"); - stage2.setUuid("stageID"); + private List prepareInstanceActionEventRequests() { + List result = new ArrayList<>(); - stage2.setDataElements(dataElements); + for (TrackedEntity trackedEntity : trackedEntities) { + result.add(prepareActionEventRequests(trackedEntity.getName(), EventSubjects.CREATE_ENTITY)); + } - stages.add(stage1); - stages.add(stage2); + return result; } - private void setupTrackedEntities() { + private List prepareDataSetsActionEventRequests() { + List result = new ArrayList<>(); - TrackedEntity trackedEntity1 = new TrackedEntity("trackedEntity1", "ID1"); - TrackedEntity trackedEntity2 = new TrackedEntity("trackedEntity2", "ID2"); + for (DataSet dataSet : dataSets) { + result.add(prepareActionEventRequests(dataSet.getName(), EventSubjects.CREATE_ENTITY)); + } - trackedEntities.add(trackedEntity1); - trackedEntities.add(trackedEntity2); + return result; + } + private ActionEventRequest prepareActionEventRequests(String name, String subject) { + SortedSet parameters = new TreeSet<>(); - TrackedEntityAttribute attribute1 = new TrackedEntityAttribute("attribute1", "ID1"); - TrackedEntityAttribute attribute2 = new TrackedEntityAttribute("attribute2", "ID2"); + parameters.add(new ActionParameterRequest(0, EventParams.EXTERNAL_ID, null, "testActionParam1", + ParameterType.UNICODE.getValue(), true, false, null)); + parameters.add(new ActionParameterRequest(1, EventParams.DATE, null, "testActionParam2", + ParameterType.DATE.getValue(), true, false, null)); - attributes.add(attribute1); - attributes.add(attribute2); + return new ActionEventRequest(name, "displayName", subject, "description", "serviceInterface", "serviceMethod", + "serviceMethodCallManner", parameters); } -} +} \ No newline at end of file diff --git a/dhis2/src/test/java/org/motechproject/dhis2/tasks/CreateInstanceActionBuilderTest.java b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/CreateInstanceActionBuilderTest.java similarity index 90% rename from dhis2/src/test/java/org/motechproject/dhis2/tasks/CreateInstanceActionBuilderTest.java rename to dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/CreateInstanceActionBuilderTest.java index 67fa9cacd..0cef69e57 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/tasks/CreateInstanceActionBuilderTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/CreateInstanceActionBuilderTest.java @@ -1,4 +1,4 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.junit.Test; @@ -6,6 +6,8 @@ import org.motechproject.dhis2.domain.TrackedEntityAttribute; import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; +import org.motechproject.dhis2.tasks.DisplayNames; +import org.motechproject.dhis2.tasks.builder.CreateInstanceActionBuilder; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.ActionParameterRequest; @@ -44,7 +46,7 @@ public void testBuildTrackedEntities() throws Exception{ assertNotNull(requests); ActionEventRequest actionEventRequest = requests.get(0); - assertEquals(actionEventRequest.getDisplayName(),DisplayNames.CREATE_TRACKED_ENTITY_INSTANCE + + assertEquals(actionEventRequest.getDisplayName(), DisplayNames.CREATE_TRACKED_ENTITY_INSTANCE + " [" + trackedEntity1.getName() + "]"); assertEquals(actionEventRequest.getSubject(), EventSubjects.CREATE_ENTITY); assertEquals(actionEventRequest.getName(),trackedEntity1.getName()); diff --git a/dhis2/src/test/java/org/motechproject/dhis2/tasks/ProgramActionBuilderTest.java b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/ProgramActionBuilderTest.java similarity index 96% rename from dhis2/src/test/java/org/motechproject/dhis2/tasks/ProgramActionBuilderTest.java rename to dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/ProgramActionBuilderTest.java index 5f8243a53..e56dfb5ff 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/tasks/ProgramActionBuilderTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/ProgramActionBuilderTest.java @@ -1,4 +1,4 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.junit.Test; import org.motechproject.dhis2.domain.Program; @@ -8,6 +8,8 @@ import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; import org.motechproject.dhis2.rest.domain.ServerVersion; +import org.motechproject.dhis2.tasks.DisplayNames; +import org.motechproject.dhis2.tasks.builder.ProgramActionBuilder; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.ActionParameterRequest; @@ -37,7 +39,7 @@ public void shouldBuildProgramEnrollmentTaskActions() throws Exception { ActionEventRequest request = actionEventRequests.get(0); assertEquals(request.getSubject(), EventSubjects.ENROLL_IN_PROGRAM); assertEquals(request.getName(),program1.getName()); - assertEquals(request.getDisplayName(),DisplayNames.PROGRAM_ENROLLMENT + " [" + program1.getName() + "]"); + assertEquals(request.getDisplayName(), DisplayNames.PROGRAM_ENROLLMENT + " [" + program1.getName() + "]"); SortedSet actionParameters = request.getActionParameters(); diff --git a/dhis2/src/test/java/org/motechproject/dhis2/tasks/SendDataValueSetActionBuilderTest.java b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/SendDataValueSetActionBuilderTest.java similarity index 90% rename from dhis2/src/test/java/org/motechproject/dhis2/tasks/SendDataValueSetActionBuilderTest.java rename to dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/SendDataValueSetActionBuilderTest.java index 1f2ac7440..62378f281 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/tasks/SendDataValueSetActionBuilderTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/SendDataValueSetActionBuilderTest.java @@ -1,13 +1,15 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.junit.Test; import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.DataSet; import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; +import org.motechproject.dhis2.tasks.DisplayNames; import org.motechproject.dhis2.util.DummyData; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.ActionParameterRequest; +import org.motechproject.tasks.domain.enums.MethodCallManner; import java.util.ArrayList; import java.util.List; @@ -71,7 +73,11 @@ private List prepareActionEventRequests(List dataSe String.format("%s [%s]", DisplayNames.SEND_DATA_VALUE_SET, dataSet.getName()), String.format("%s [%s]", DisplayNames.SEND_DATA_VALUE_SET, dataSet.getName()), EventSubjects.SEND_DATA_VALUE_SET, - null, null, null, null, actionParameters)); + null, + ChannelRequestBuilder.ACTION_PROXY_SERVICE, + "sendDataValueSet", + MethodCallManner.MAP.name(), + actionParameters)); } return requests; diff --git a/dhis2/src/test/java/org/motechproject/dhis2/tasks/StageActionBuilderTest.java b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/StageActionBuilderTest.java similarity index 95% rename from dhis2/src/test/java/org/motechproject/dhis2/tasks/StageActionBuilderTest.java rename to dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/StageActionBuilderTest.java index c42e59bb1..48ff89e30 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/tasks/StageActionBuilderTest.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/tasks/builder/StageActionBuilderTest.java @@ -1,10 +1,12 @@ -package org.motechproject.dhis2.tasks; +package org.motechproject.dhis2.tasks.builder; import org.junit.Test; import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.Stage; import org.motechproject.dhis2.event.EventParams; import org.motechproject.dhis2.event.EventSubjects; +import org.motechproject.dhis2.tasks.DisplayNames; +import org.motechproject.dhis2.tasks.builder.StageActionBuilder; import org.motechproject.tasks.contract.ActionEventRequest; import org.motechproject.tasks.contract.ActionParameterRequest; @@ -61,7 +63,7 @@ public void testBuildStagesWithDataElements() throws Exception{ ActionEventRequest eventRequest = actionEventRequests.get(0); assertEquals(eventRequest.getSubject(), EventSubjects.UPDATE_PROGRAM_STAGE); assertEquals(eventRequest.getName(),stage1.getName()); - assertEquals(eventRequest.getDisplayName(),DisplayNames.STAGE_EVENT + " [" + stage1.getName() + "]"); + assertEquals(eventRequest.getDisplayName(), DisplayNames.STAGE_EVENT + " [" + stage1.getName() + "]"); SortedSet actionParameters = eventRequest.getActionParameters(); diff --git a/dhis2/src/test/java/org/motechproject/dhis2/util/DummyData.java b/dhis2/src/test/java/org/motechproject/dhis2/util/DummyData.java index 0cf1eba37..e76f2270f 100644 --- a/dhis2/src/test/java/org/motechproject/dhis2/util/DummyData.java +++ b/dhis2/src/test/java/org/motechproject/dhis2/util/DummyData.java @@ -2,6 +2,10 @@ import org.motechproject.dhis2.domain.DataElement; import org.motechproject.dhis2.domain.DataSet; +import org.motechproject.dhis2.domain.Program; +import org.motechproject.dhis2.domain.Stage; +import org.motechproject.dhis2.domain.TrackedEntity; +import org.motechproject.dhis2.domain.TrackedEntityAttribute; import java.util.ArrayList; import java.util.List; @@ -21,27 +25,76 @@ public static List prepareDataSets() { dataElements.add(new DataElement("dataElement1", "dataElement1Id")); dataElements.add(new DataElement("dataElement2", "dataElement2Id")); - DataSet dataSet = new DataSet(); - dataSet.setName("dataSet1"); - dataSet.setUuid("dataSet1Id"); - dataSet.setDataElementList(dataElements); - - dataSets.add(dataSet); + dataSets.add(new DataSet("dataSet1Id", "dataSet1", dataElements)); dataElements = new ArrayList<>(); dataElements.add(new DataElement("dataElement3", "dataElement3Id")); dataElements.add(new DataElement("dataElement4", "dataElement4Id")); - dataSet = new DataSet(); - dataSet.setName("dataSet2"); - dataSet.setUuid("dataSet2Id"); - dataSet.setDataElementList(dataElements); - - dataSets.add(dataSet); + dataSets.add(new DataSet("dataSet2Id", "dataSet2", dataElements)); return dataSets; } + /** + * Prepares a list of programs; + */ + public static List preparePrograms() { + List programs = new ArrayList<>(); + List stages = new ArrayList<>(); + List attributes = new ArrayList<>(); + + attributes.add(new TrackedEntityAttribute("attribute1", "uuid")); + attributes.add(new TrackedEntityAttribute("attribute2", "uuid")); + + TrackedEntity trackedEntity = new TrackedEntity("trackedEntityName","trackedEntityID"); + + programs.add(new Program("program1UUID", "Program1", trackedEntity, stages, attributes, false, true, null)); + programs.add(new Program("program2UUID", "Program2", trackedEntity, stages, attributes, false, true, null)); + + return programs; + } + + /** + * Prepares a list of stages; + */ + public static List prepareStages() { + List stages = new ArrayList<>(); + List dataElements = new ArrayList<>(); + + dataElements.add(new DataElement("dataElementName1","dataElementID1")); + dataElements.add(new DataElement("dataElementName2","dataElementID2")); + + stages.add(new Stage("stageID1", "stage1", dataElements, "programID", true)); + stages.add(new Stage("stageID2", "stage2", dataElements, "programID", true)); + + return stages; + } + + /** + * Prepares a list of tracked entities; + */ + public static List prepareTrackedEntities() { + List trackedEntities = new ArrayList<>(); + + trackedEntities.add(new TrackedEntity("trackedEntity1", "ID1")); + trackedEntities.add(new TrackedEntity("trackedEntity2", "ID2")); + + return trackedEntities; + } + + /** + * Prepares a list of tracked entity attributes; + */ + public static List prepareTrackedEntityAttributes() { + List attributes = new ArrayList<>(); + + attributes.add(new TrackedEntityAttribute("attribute1", "ID1")); + attributes.add(new TrackedEntityAttribute("attribute2", "ID2")); + + return attributes; + } + /** * Utility class, should not be initiated. */ diff --git a/dhis2/src/test/resources/json/data-elements-response.json b/dhis2/src/test/resources/json/data-elements-response.json new file mode 100644 index 000000000..5a64d614f --- /dev/null +++ b/dhis2/src/test/resources/json/data-elements-response.json @@ -0,0 +1,18 @@ +{ + "pager": { + "page": "1", + "pageCount": "1", + "total": "1", + "pageSize": "1" + }, + "dataElements": [ + { + "id": "testDataElementId", + "name": "testDataElementName", + "created": "2016-10-22T17:48:51.639", + "lastUpdated": "2016-10-22T17:48:51.639", + "code": "testDataElementCode", + "href": "http://localhost:9780/api/dataElements/testDataElementId" + } + ] +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/data-sets-response.json b/dhis2/src/test/resources/json/data-sets-response.json new file mode 100644 index 000000000..5d25a6b0c --- /dev/null +++ b/dhis2/src/test/resources/json/data-sets-response.json @@ -0,0 +1,20 @@ +{ + "pager": { + "page": "1", + "pageCount": "1", + "total": "1", + "pageSize": "1" + }, + "dataSets": [ { + "id": "testDataSetId", + "name": "testDataSetName", + "created": "2016-10-22T17:48:51.639", + "lastUpdated": "2016-10-22T17:48:51.639", + "code": "testDataSetCode", + "href": "http://localhost:9780/api/dataSets/testDataSetId", + "dataElementList":[ { + "id": "testDataElementFromDataSetId", + "name": "testDataElementFromDataSetName" + }] + }] +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/organisation-units-response.json b/dhis2/src/test/resources/json/organisation-units-response.json new file mode 100644 index 000000000..f72ea82e0 --- /dev/null +++ b/dhis2/src/test/resources/json/organisation-units-response.json @@ -0,0 +1,16 @@ +{ + "pager": { + "page": "1", + "pageCount": "1", + "total": "1", + "pageSize": "1" + }, + "organisationUnits": [{ + "id": "testOrganisationUnitId", + "name": "testOrganisationUnitName", + "created": "2016-10-22T17:48:51.639", + "lastUpdated": "2016-10-22T17:48:51.639", + "code": "testOrganisationUnitCode", + "href": "http://localhost:9780/api/organisationUnits/testOrganisationUnitId" + }] +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/program-response.json b/dhis2/src/test/resources/json/program-response.json new file mode 100644 index 000000000..22379dd83 --- /dev/null +++ b/dhis2/src/test/resources/json/program-response.json @@ -0,0 +1,10 @@ +{ + "id": "programId", + "name": "programName", + "programType": "programType", + "trackedEntity": { + "id": "trackedEntities1Id", + "name": "trackedEntities1Name" + }, + "href": "http://localhost:9780/api/programs/programId" +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/programs-response.json b/dhis2/src/test/resources/json/programs-response.json new file mode 100644 index 000000000..db484a68f --- /dev/null +++ b/dhis2/src/test/resources/json/programs-response.json @@ -0,0 +1,18 @@ +{ + "pager": { + "page": "1", + "pageCount": "1", + "total": "1", + "pageSize": "1" + }, + "programs": [{ + "id": "programId", + "name": "programName", + "programType": "programType", + "trackedEntity": { + "id": "trackedEntities1Id", + "name": "trackedEntities1Name" + }, + "href": "http://localhost:9780/api/programs/programId" + }] +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/settings/settings.json b/dhis2/src/test/resources/json/settings/settings.json new file mode 100644 index 000000000..3de56db68 --- /dev/null +++ b/dhis2/src/test/resources/json/settings/settings.json @@ -0,0 +1,5 @@ +{ + "serverURI":"localhost:8080/dhis/", + "username":"admin", + "password":"district" +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/tracked-entities-response.json b/dhis2/src/test/resources/json/tracked-entities-response.json new file mode 100644 index 000000000..397778f63 --- /dev/null +++ b/dhis2/src/test/resources/json/tracked-entities-response.json @@ -0,0 +1,16 @@ +{ + "pager": { + "page": "1", + "pageCount": "1", + "total": "1", + "pageSize": "1" + }, + "trackedEntities": [{ + "id": "trackedEntities1Id", + "name": "trackedEntities1Name", + "created": "2016-10-22T17:48:51.639", + "lastUpdated": "2016-10-22T17:48:51.639", + "code": "trackedEntities1Code", + "href": "http://localhost:9780/api/trackedEntities/trackedEntities1Id" + }] +} \ No newline at end of file diff --git a/dhis2/src/test/resources/json/tracked-entity-attributes-response.json b/dhis2/src/test/resources/json/tracked-entity-attributes-response.json new file mode 100644 index 000000000..9e323a37c --- /dev/null +++ b/dhis2/src/test/resources/json/tracked-entity-attributes-response.json @@ -0,0 +1,16 @@ +{ + "pager": { + "page": "1", + "pageCount": "1", + "total": "1", + "pageSize": "1" + }, + "trackedEntityAttributes": [{ + "id": "trackedEntityAttributes1Id", + "name": "trackedEntityAttributes1Name", + "created": "2016-10-22T17:48:51.639", + "lastUpdated": "2016-10-22T17:48:51.639", + "code": "trackedEntityAttributes1Code", + "href": "http://localhost:9780/api/trackedEntityAttributes/trackedEntityAttributes1Id" + }] +} \ No newline at end of file diff --git a/mtraining/src/main/java/org/motechproject/mtraining/service/impl/CourseStructureServiceImpl.java b/mtraining/src/main/java/org/motechproject/mtraining/service/impl/CourseStructureServiceImpl.java index 2212d7038..9e685e556 100644 --- a/mtraining/src/main/java/org/motechproject/mtraining/service/impl/CourseStructureServiceImpl.java +++ b/mtraining/src/main/java/org/motechproject/mtraining/service/impl/CourseStructureServiceImpl.java @@ -189,7 +189,7 @@ private Quiz getQuiz(Long id, Map quizMap) { private void clearRelationships(List courses, Map courseMap, Map chapterMap, Map lessonMap, Map quizMap) { for (CourseUnitDto courseDto : courses) { - Course course = courseDataService.findCourseById(courseDto.getId()); + Course course = courseDataService.detachedCopy(courseDataService.findCourseById(courseDto.getId())); if (course == null) { throw new CourseUnitNotFoundException("Cannot find course with id: " + courseDto.getId()); diff --git a/mtraining/src/test/java/org/motechproject/mtraining/service/it/CourseStructureServiceBundleIT.java b/mtraining/src/test/java/org/motechproject/mtraining/service/it/CourseStructureServiceBundleIT.java index 8e3a332e9..8fe8ea183 100644 --- a/mtraining/src/test/java/org/motechproject/mtraining/service/it/CourseStructureServiceBundleIT.java +++ b/mtraining/src/test/java/org/motechproject/mtraining/service/it/CourseStructureServiceBundleIT.java @@ -667,24 +667,26 @@ public void updateCourseStructureTest6() throws Exception { verifyUnused(asList(QUIZ_3, QUIZ_4, QUIZ_6, "quiz_7"), asList("lesson_10", LESSON_7, LESSON_8, LESSON_9), asList(CHAPTER_4, CHAPTER_5, CHAPTER_6)); } - - private void verifyUnused(List quizzes, List lessons, List chapters) { - // verify unused units - List unusedQuizzes = mTrainingService.getUnusedQuizzes(); - List unusedLessons = mTrainingService.getUnusedLessons(); - List unusedChapters = mTrainingService.getUnusedChapters(); - - List unusedUnits = extract(unusedQuizzes, on(Quiz.class).getName()); - Collections.sort(unusedUnits); - assertEquals(quizzes, unusedUnits); - - unusedUnits = extract(unusedLessons, on(Lesson.class).getName()); - Collections.sort(unusedUnits); - assertEquals(lessons, unusedUnits); - - unusedUnits = extract(unusedChapters, on(Chapter.class).getName()); - Collections.sort(unusedUnits); - assertEquals(chapters, unusedUnits); + private void verifyUnused(List quizzes, List lessons, List chapters){ + List allQuizzes = mTrainingService.getAllQuizzes(); + List allLessons = mTrainingService.getAllLessons(); + List allChapters = mTrainingService.getAllChapters(); + + for(Quiz quiz : allQuizzes) { + if(quizzes.contains(quiz.getName())) { + assertNull(quiz.getChapter()); + } + } + for(Lesson lesson : allLessons) { + if(lessons.contains(lesson.getName())) { + assertNull(lesson.getChapter()); + } + } + for(Chapter chapter : allChapters) { + if(chapters.contains(chapter.getName())) { + assertNull(chapter.getCourse()); + } + } } private void verifyLessons(Chapter chapter, int size, List expectedLessons, List expectedStates) { @@ -710,9 +712,9 @@ private void setUpData() { Quiz q2 = new Quiz(QUIZ_2, CourseUnitState.Active, "content_2", "Description_2", props); Quiz q3 = new Quiz(QUIZ_3, CourseUnitState.Active, "content_3", "Description_3", props); - q1 = quizDataService.create(q1); - q2 = quizDataService.create(q2); - q3 = quizDataService.create(q3); + q1 = quizDataService.detachedCopy(quizDataService.create(q1)); + q2 = quizDataService.detachedCopy(quizDataService.create(q2)); + q3 = quizDataService.detachedCopy(quizDataService.create(q3)); idMap.put(q1.getName(), q1.getId()); idMap.put(q2.getName(), q2.getId()); @@ -724,11 +726,11 @@ private void setUpData() { Lesson l4 = new Lesson(LESSON_4, CourseUnitState.Active, "content_4", "Description_4", props); Lesson l5 = new Lesson(LESSON_5, CourseUnitState.Active, "content_5", "Description_5", props); - l1 = lessonDataService.create(l1); - l2 = lessonDataService.create(l2); - l3 = lessonDataService.create(l3); - l4 = lessonDataService.create(l4); - l5 = lessonDataService.create(l5); + l1 = lessonDataService.detachedCopy(lessonDataService.create(l1)); + l2 = lessonDataService.detachedCopy(lessonDataService.create(l2)); + l3 = lessonDataService.detachedCopy(lessonDataService.create(l3)); + l4 = lessonDataService.detachedCopy(lessonDataService.create(l4)); + l5 = lessonDataService.detachedCopy(lessonDataService.create(l5)); idMap.put(l1.getName(), l1.getId()); idMap.put(l2.getName(), l2.getId()); @@ -740,9 +742,9 @@ private void setUpData() { Chapter ch2 = new Chapter(CHAPTER_2, CourseUnitState.Active, "content_2", "Description_2", props); Chapter ch3 = new Chapter(CHAPTER_3, CourseUnitState.Active, "content_3", "Description_3", props); - ch1 = chapterDataService.create(ch1); - ch2 = chapterDataService.create(ch2); - ch3 = chapterDataService.create(ch3); + ch1 = chapterDataService.detachedCopy(chapterDataService.create(ch1)); + ch2 = chapterDataService.detachedCopy(chapterDataService.create(ch2)); + ch3 = chapterDataService.detachedCopy(chapterDataService.create(ch3)); idMap.put(ch1.getName(), ch1.getId()); idMap.put(ch2.getName(), ch2.getId()); @@ -765,15 +767,15 @@ private void setUpData() { ch1.setLessons(lessons1); ch2.setLessons(lessons2); ch3.setLessons(lessons3); - ch1 = chapterDataService.update(ch1); - ch2 = chapterDataService.update(ch2); - ch3 = chapterDataService.update(ch3); + ch1 = chapterDataService.detachedCopy(chapterDataService.update(ch1)); + ch2 = chapterDataService.detachedCopy(chapterDataService.update(ch2)); + ch3 = chapterDataService.detachedCopy(chapterDataService.update(ch3)); Course c1 = new Course(COURSE_1, CourseUnitState.Active, "content_1", "Description_1", props); Course c2 = new Course(COURSE_2, CourseUnitState.Active, "content_2", "Description_2", props); - c1 = courseDataService.create(c1); - c2 = courseDataService.create(c2); + c1 = courseDataService.detachedCopy(courseDataService.create(c1)); + c2 = courseDataService.detachedCopy(courseDataService.create(c2)); idMap.put(c1.getName(), c1.getId()); idMap.put(c2.getName(), c2.getId()); @@ -795,10 +797,10 @@ private void setUpData() { Lesson l7 = new Lesson(LESSON_7, CourseUnitState.Active, "content_7", "Description_7", props); Lesson l8 = new Lesson(LESSON_8, CourseUnitState.Active, "content_8", "Description_8", props); Lesson l9 = new Lesson(LESSON_9, CourseUnitState.Active, "content_9", "Description_9", props); - lessonDataService.create(l6); - lessonDataService.create(l7); - lessonDataService.create(l8); - lessonDataService.create(l9); + l6 = lessonDataService.detachedCopy(lessonDataService.create(l6)); + l7 = lessonDataService.detachedCopy(lessonDataService.create(l7)); + l8 = lessonDataService.detachedCopy(lessonDataService.create(l8)); + l9 = lessonDataService.detachedCopy(lessonDataService.create(l9)); idMap.put(l6.getName(), l6.getId()); idMap.put(l7.getName(), l7.getId()); @@ -808,9 +810,9 @@ private void setUpData() { Chapter ch4 = new Chapter(CHAPTER_4, CourseUnitState.Active, "content_4", "Description_4", props); Chapter ch5 = new Chapter(CHAPTER_5, CourseUnitState.Active, "content_5", "Description_5", props); Chapter ch6 = new Chapter(CHAPTER_6, CourseUnitState.Active, "content_6", "Description_6", props); - chapterDataService.create(ch4); - chapterDataService.create(ch5); - chapterDataService.create(ch6); + ch4 = chapterDataService.detachedCopy(chapterDataService.create(ch4)); + ch5 = chapterDataService.detachedCopy(chapterDataService.create(ch5)); + ch6 = chapterDataService.detachedCopy(chapterDataService.create(ch6)); idMap.put(ch4.getName(), ch4.getId()); idMap.put(ch5.getName(), ch5.getId()); @@ -819,9 +821,9 @@ private void setUpData() { Quiz q4 = new Quiz(QUIZ_4, CourseUnitState.Active, "content_4", "Description_4", props); Quiz q5 = new Quiz(QUIZ_5, CourseUnitState.Active, "content_5", "Description_5", props); Quiz q6 = new Quiz(QUIZ_6, CourseUnitState.Active, "content_6", "Description_6", props); - quizDataService.create(q4); - quizDataService.create(q5); - quizDataService.create(q6); + q4 = quizDataService.detachedCopy(quizDataService.create(q4)); + q5 = quizDataService.detachedCopy(quizDataService.create(q5)); + q6 = quizDataService.detachedCopy(quizDataService.create(q6)); idMap.put(q4.getName(), q4.getId()); idMap.put(q5.getName(), q5.getId()); @@ -829,8 +831,8 @@ private void setUpData() { Course c3 = new Course(COURSE_3, CourseUnitState.Active, "content_3", "Description_3", props); Course c4 = new Course(COURSE_4, CourseUnitState.Active, "content_4", "Description_4", props); - courseDataService.create(c3); - courseDataService.create(c4); + c3 = courseDataService.detachedCopy(courseDataService.create(c3)); + c4 = courseDataService.detachedCopy(courseDataService.create(c4)); idMap.put(c3.getName(), c3.getId()); idMap.put(c4.getName(), c4.getId()); diff --git a/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingIntegrationTests.java b/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingIntegrationTests.java index d3cc3dc62..a81e7e882 100644 --- a/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingIntegrationTests.java +++ b/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingIntegrationTests.java @@ -7,7 +7,7 @@ * Parent IT class to run all the individual service ITs */ @RunWith(Suite.class) -@Suite.SuiteClasses({MTrainingServiceBundleIT.class, //CourseStructureServiceBundleIT.class, +@Suite.SuiteClasses({MTrainingServiceBundleIT.class, CourseStructureServiceBundleIT.class, BookmarkServiceBundleIT.class, ActivityServiceBundleIT.class}) public class MTrainingIntegrationTests { } diff --git a/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingServiceBundleIT.java b/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingServiceBundleIT.java index 140e67a88..7a20c6314 100644 --- a/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingServiceBundleIT.java +++ b/mtraining/src/test/java/org/motechproject/mtraining/service/it/MTrainingServiceBundleIT.java @@ -61,7 +61,6 @@ public class MTrainingServiceBundleIT extends BasePaxIT { @Inject private QuizDataService quizDataService; - @Before public void setup() { getLogger().info("setup"); @@ -206,17 +205,23 @@ public Course doInTransaction(TransactionStatus transactionStatus) { assertEquals(firstCourse.getChapters().size(), secondCourse.getChapters().size()); } - @Ignore + @Test public void testCourseChapterUpdate() throws Exception { - Course firstCourse = mTrainingService.createCourse(generateFullCourse("testSharedChapter")); + courseDataService.doInTransaction(new TransactionCallback() { + @Override + public Course doInTransaction(TransactionStatus transactionStatus) { + Course firstCourse = mTrainingService.createCourse(generateFullCourse("testSharedChapter")); - Chapter chapterToUpdate = firstCourse.getChapters().get(0); - chapterToUpdate.setState(CourseUnitState.Inactive); - Chapter updatedChapter = mTrainingService.updateChapter(chapterToUpdate); - firstCourse = mTrainingService.getCourseById(firstCourse.getId()); + Chapter chapterToUpdate = firstCourse.getChapters().get(0); + chapterToUpdate.setState(CourseUnitState.Inactive); + Chapter updatedChapter = mTrainingService.updateChapter(chapterToUpdate); + firstCourse = mTrainingService.getCourseById(firstCourse.getId()); - assertEquals(firstCourse.getChapters().get(0).getId(), updatedChapter.getId()); - assertEquals(firstCourse.getChapters().get(0).getState(), updatedChapter.getState()); + assertEquals(firstCourse.getChapters().get(0).getId(), updatedChapter.getId()); + assertEquals(firstCourse.getChapters().get(0).getState(), updatedChapter.getState()); + return firstCourse; + } + }); } @Test @@ -229,16 +234,22 @@ public void testCourseUpdateStatus() throws Exception { assertEquals(CourseUnitState.Inactive, updated.getState()); } - @Ignore + @Test public void testCourseUpdateAddChapter() throws Exception { - Course firstCourse = mTrainingService.createCourse(generateFullCourse("testCourseUpdateAddChapter")); - assertEquals(2, firstCourse.getChapters().size()); + courseDataService.doInTransaction(new TransactionCallback() { + @Override + public Course doInTransaction(TransactionStatus transactionStatus) { + Course firstCourse = courseDataService.detachedCopy(mTrainingService.createCourse(generateFullCourse("testCourseUpdateAddChapter"))); + assertEquals(2, firstCourse.getChapters().size()); - Chapter newChapter = new Chapter("newChapter", CourseUnitState.Active, "newChapterContent", null, null); - firstCourse.getChapters().add(newChapter); + Chapter newChapter = new Chapter("newChapter", CourseUnitState.Active, "newChapterContent", null, null); + firstCourse.getChapters().add(newChapter); - Course updated = mTrainingService.updateCourse(firstCourse); - assertEquals(3, updated.getChapters().size()); + Course updated = mTrainingService.updateCourse(firstCourse); + assertEquals(3, updated.getChapters().size()); + return updated; + } + }); } @Test diff --git a/mtraining/src/test/java/org/motechproject/mtraining/service/ut/service/CourseStructureServiceTest.java b/mtraining/src/test/java/org/motechproject/mtraining/service/ut/service/CourseStructureServiceTest.java index 3527f7284..35217fc88 100644 --- a/mtraining/src/test/java/org/motechproject/mtraining/service/ut/service/CourseStructureServiceTest.java +++ b/mtraining/src/test/java/org/motechproject/mtraining/service/ut/service/CourseStructureServiceTest.java @@ -84,8 +84,8 @@ public void shouldRemoveRelations() { chapter.setId(11l); Course course = new Course(Constants.COURSE, CourseUnitState.Active, Constants.COURSE, Constants.COURSE, null, asList(chapter)); course.setId(1l); - - when(courseDataService.findCourseById(1l)).thenReturn(course); + + when(courseDataService.detachedCopy(courseDataService.findCourseById(1l))).thenReturn(course); courseStructureService.updateCourseStructure(coursesToUpdate); @@ -132,11 +132,12 @@ public void shouldCreateCorrectStructure() { Course course = new Course(Constants.COURSE, CourseUnitState.Active, Constants.COURSE, Constants.COURSE, null, null); course.setId(1l); - when(courseDataService.findCourseById(1l)).thenReturn(course); + when(courseDataService.detachedCopy(courseDataService.findCourseById(1l))).thenReturn(course); when(chapterDataService.findChapterById(11l)).thenReturn(chapter); when(lessonDataService.findLessonById(13l)).thenReturn(lesson); when(quizDataService.findQuizById(15l)).thenReturn(quiz); + courseStructureService.updateCourseStructure(coursesToUpdate); verify(courseDataService).update(courseArgumentCaptor.capture()); diff --git a/odk/src/main/resources/securityRules.json b/odk/src/main/resources/securityRules.json index 5ca2dec71..4490e6a74 100644 --- a/odk/src/main/resources/securityRules.json +++ b/odk/src/main/resources/securityRules.json @@ -45,7 +45,8 @@ "origin": "SYSTEM_MODULE_ODK", "version": "1.0", "methodsRequired": [ - "GET" + "GET", + "POST" ] }, { diff --git a/odk/src/test/java/org/motechproject/odk/it/FormControllerIT.java b/odk/src/test/java/org/motechproject/odk/it/FormControllerIT.java index d68c26975..39b93b1a2 100644 --- a/odk/src/test/java/org/motechproject/odk/it/FormControllerIT.java +++ b/odk/src/test/java/org/motechproject/odk/it/FormControllerIT.java @@ -33,7 +33,7 @@ @ExamFactory(MotechNativeTestContainerFactory.class) public class FormControllerIT extends OdkBaseIT { - private static final int WAIT_COUNT = 30; + private static final int WAIT_COUNT = 100; private static final int EXPECTED_EVENTS_SUCCESS = 7; private static final int EXPECTED_EVENTS_FAIL = 1; private static final String TIMEOUT = "Timeout"; @@ -71,12 +71,12 @@ public void testNestedRepeats() throws Exception { int count = 0; while (mockEventListener.getEvents().size() < EXPECTED_EVENTS_SUCCESS && count < WAIT_COUNT) { count++; - getLogger().debug("Number of events: " + mockEventListener.getEvents().size()); + getLogger().error("Number of events: " + mockEventListener.getEvents().size()); if (count == WAIT_COUNT) { fail(TIMEOUT); } - Thread.sleep(2000); + Thread.sleep(5000); } List events = mockEventListener.getEvents(); diff --git a/openmrs/pom.xml b/openmrs/pom.xml index d55f2cf91..aecb7b573 100644 --- a/openmrs/pom.xml +++ b/openmrs/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 modules diff --git a/openmrs/src/main/java/org/motechproject/openmrs/domain/Encounter.java b/openmrs/src/main/java/org/motechproject/openmrs/domain/Encounter.java index 8b16782ee..4d8abb31d 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/domain/Encounter.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/domain/Encounter.java @@ -4,6 +4,7 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import org.motechproject.openmrs.util.JsonUtils; @@ -31,6 +32,7 @@ public class Encounter { private Visit visit; private List obs; private List encounterProviders; + private Form form; /** * Default constructor. @@ -50,6 +52,11 @@ public Encounter(Location location, EncounterType encounterType, Date encounterD public Encounter(Location location, EncounterType encounterType, Date encounterDatetime, Patient patient, Visit visit, List encounterProviders, List obs) { + this(location, encounterType, encounterDatetime, patient, visit, encounterProviders, obs, null); + } + + public Encounter(Location location, EncounterType encounterType, Date encounterDatetime, Patient patient, + Visit visit, List encounterProviders, List obs, Form form) { this.location = location; this.encounterType = encounterType; this.encounterDatetime = encounterDatetime; @@ -57,6 +64,7 @@ public Encounter(Location location, EncounterType encounterType, Date encounterD this.visit = visit; this.encounterProviders = encounterProviders; this.obs = obs; + this.form = form; } public String getUuid() { @@ -127,13 +135,17 @@ public List getObs() { return obs; } + public Form getForm() { return form; } + + public void setForm(Form form) { this.form = form; } + public void setObs(List obs) { this.obs = obs; } @Override public int hashCode() { - return Objects.hash(uuid, display, location, encounterType, encounterDatetime, patient, visit, obs, encounterProviders); + return Objects.hash(uuid, display, location, encounterType, encounterDatetime, patient, visit, obs, encounterProviders, form); } @Override //NO CHECKSTYLE Cyclomatic Complexity @@ -153,7 +165,8 @@ public boolean equals(Object o) { Objects.equals(patient, encounter.patient) && Objects.equals(visit, encounter.visit) && Objects.equals(obs, encounter.obs) && - Objects.equals(encounterProviders, encounter.encounterProviders); + Objects.equals(encounterProviders, encounter.encounterProviders) && + Objects.equals(form, encounter.form); } /** @@ -161,7 +174,7 @@ public boolean equals(Object o) { */ public static class EncounterSerializer implements JsonSerializer { - @Override + @Override //NO CHECKSTYLE Cyclomatic Complexity public JsonElement serialize(Encounter src, Type typeOfSrc, JsonSerializationContext context) { JsonObject encounter = new JsonObject(); @@ -176,7 +189,7 @@ public JsonElement serialize(Encounter src, Type typeOfSrc, JsonSerializationCon encounter.addProperty("location", src.getLocation().getUuid()); } if (src.encounterType != null) { - encounter.addProperty("encounterType", src.getEncounterType().getName()); + encounter.addProperty("encounterType", src.getEncounterType().getUuid()); } if (src.encounterDatetime != null) { encounter.addProperty("encounterDatetime", sdf.format(src.getEncounterDatetime())); @@ -190,6 +203,9 @@ public JsonElement serialize(Encounter src, Type typeOfSrc, JsonSerializationCon if (src.visit != null) { encounter.addProperty("visit", src.getVisit().getUuid()); } + if (src.form != null) { + encounter.addProperty("form", src.getForm().getUuid()); + } if (src.obs != null) { final JsonElement jsonObs = context.serialize(src.getObs()); encounter.add("obs", jsonObs); @@ -198,6 +214,18 @@ public JsonElement serialize(Encounter src, Type typeOfSrc, JsonSerializationCon } } + /** + * Implementation of the {@link JsonSerializer} interface for the {@link Encounter} class. It represents the encounter + * as its ID. + */ + public static class EncounterUuidSerializer implements JsonSerializer { + + @Override + public JsonElement serialize(Encounter encounter, Type type, JsonSerializationContext jsonSerializationContext) { + return new JsonPrimitive(encounter.getUuid()); + } + } + /** * Implementation of the {@link JsonDeserializer} interface for the {@link Encounter} class. */ diff --git a/openmrs/src/main/java/org/motechproject/openmrs/domain/EncounterType.java b/openmrs/src/main/java/org/motechproject/openmrs/domain/EncounterType.java index e393adc0c..588da29e6 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/domain/EncounterType.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/domain/EncounterType.java @@ -18,20 +18,21 @@ public class EncounterType { private String name; private String description; - public EncounterType(String name) { + public EncounterType(String name, String uuid) { this.name = name; + this.uuid = uuid; } /** * Implementation of the {@link JsonSerializer} interface for the * {@link EncounterType} class. It represents the encounter - * as its name. + * as its uuid. */ public static class EncounterTypeSerializer implements JsonSerializer { @Override public JsonElement serialize(EncounterType src, Type typeOfSrc, JsonSerializationContext context) { - return new JsonPrimitive(src.getName()); + return new JsonPrimitive(src.getUuid()); } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/domain/Form.java b/openmrs/src/main/java/org/motechproject/openmrs/domain/Form.java new file mode 100644 index 000000000..de747d0cb --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/domain/Form.java @@ -0,0 +1,103 @@ +package org.motechproject.openmrs.domain; + + +import java.util.Objects; + +/** + * Represents a single form. + */ +public class Form { + + private String uuid; + private String name; + private String description; + private String version; + private boolean published; + private boolean retired; + + public Form(){ + } + + public Form(String uuid, String name, String description, String version, boolean published, boolean retired) { + this.uuid = uuid; + this.name = name; + this.description = description; + this.version = version; + this.published = published; + this.retired = retired; + } + + public Form(String name, String version) { + this(null, name, null, version, false, false); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public boolean isRetired() { + return retired; + } + + public void setRetired(boolean retired) { + this.retired = retired; + } + + public boolean isPublished() { + return published; + } + + public void setPublished(boolean published) { + this.published = published; + } + + @Override + public int hashCode() { + return Objects.hash(uuid, name, description, version, published, retired); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Form form = (Form) o; + return Objects.equals(uuid, form.uuid) && + Objects.equals(name, form.name) && + Objects.equals(description, form.description) && + Objects.equals(version, form.version) && + Objects.equals(published, form.published) && + Objects.equals(retired, form.retired); + } +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/domain/Observation.java b/openmrs/src/main/java/org/motechproject/openmrs/domain/Observation.java index 1d45b122c..fbf2e9945 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/domain/Observation.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/domain/Observation.java @@ -1,13 +1,17 @@ package org.motechproject.openmrs.domain; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import java.lang.reflect.Type; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -17,6 +21,7 @@ * a moment in time. */ public class Observation { + private static final String DISPLAY_KEY = "display"; private String uuid; private String display; @@ -25,7 +30,17 @@ public class Observation { private ObservationValue value; private Date obsDatetime; private Person person; - private List groupsMembers; + private List groupMembers; + private Boolean voided; + private String valueModifier; + private String valueCodedName; + private Observation obsGroup; + private Location location; + private Order order; + private String comment; + + //Field used in Tasks filter + private String numberOfObservations; public String getUuid() { return uuid; @@ -87,20 +102,89 @@ public void setPerson(Person person) { this.person = person; } - public List getGroupsMembers() { - return groupsMembers; + public List getGroupMembers() { + if (groupMembers == null) { + groupMembers = new ArrayList<>(); + } + + return groupMembers; + } + + public void setGroupMembers(List groupMembers) { + this.groupMembers = groupMembers; + } + + public Boolean getVoided () { + return voided; + } + + public void setVoided (Boolean voided) { + this.voided = voided; + } + + public String getValueModifier () { + return valueModifier; + } + + public void setValueModifier (String valueModifier) { + this.valueModifier = valueModifier; + } + + public String getValueCodedName () { + return valueCodedName; + } + + public void setValueCodedName (String valueCodedName) { + this.valueCodedName = valueCodedName; + } + + public Observation getObsGroup() { + return obsGroup; + } + + public void setObsGroup(Observation obsGroup) { + this.obsGroup = obsGroup; + } + + public Location getLocation () { + return location; } - public void setGroupsMembers(List groupsMembers) { - this.groupsMembers = groupsMembers; + public void setLocation (Location location) { + this.location = location; + } + + public Order getOrder () { + return order; + } + + public void setOrder (Order order) { + this.order = order; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getNumberOfObservations () { + return numberOfObservations; + } + + public void setNumberOfObservations (String numberOfObservations) { + this.numberOfObservations = numberOfObservations; } @Override public int hashCode() { - return Objects.hash(uuid, display, concept, encounter, value, obsDatetime, person, groupsMembers); + return Objects.hash(uuid, display, concept, encounter, value, obsDatetime, person, groupMembers, voided, + valueModifier, valueCodedName, obsGroup, location, order, comment); } - @Override + @Override //NO CHECKSTYLE Cyclomatic Complexity public boolean equals(Object o) { if (this == o) { return true; @@ -115,7 +199,11 @@ public boolean equals(Object o) { return Objects.equals(uuid, other.uuid) && Objects.equals(display, other.display) && Objects.equals(concept, other.concept) && Objects.equals(encounter, other.encounter) && Objects.equals(value, other.value) && Objects.equals(obsDatetime, other.obsDatetime) - && Objects.equals(person, other.person) && Objects.equals(groupsMembers, other.groupsMembers); + && Objects.equals(person, other.person) && Objects.equals(groupMembers, other.groupMembers) + && Objects.equals(voided, other.voided) && Objects.equals(valueModifier, other.valueModifier) + && Objects.equals(valueCodedName, other.valueCodedName) && Objects.equals(obsGroup, other.obsGroup) + && Objects.equals(location, other.location) && Objects.equals(order, other.order) + && Objects.equals(comment, other.comment); } /** @@ -138,6 +226,10 @@ public JsonElement serialize(Observation observation, Type typeOfSrc, JsonSerial if (observation.obsDatetime != null) { object.addProperty("obsDatetime", sdf.format(observation.obsDatetime)); } + if (observation.groupMembers != null) { + final JsonElement jsonObs = context.serialize(observation.groupMembers); + object.add("groupMembers", jsonObs); + } return object; } @@ -187,9 +279,31 @@ public boolean equals(Object o) { * {@link Observation.ObservationValue} class. */ public static class ObservationValueSerializer implements JsonSerializer { + @Override public JsonElement serialize(ObservationValue src, Type typeOfSrc, JsonSerializationContext context) { return new JsonPrimitive(src.getDisplay()); } } + + /** + * Implementation of the {@link JsonDeserializer} interface for the + * {@link Observation.ObservationValue} class. + */ + public static class ObservationValueDeserializer implements JsonDeserializer { + @Override + public ObservationValue deserialize (JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + ObservationValue observationValue = new ObservationValue(null); + + if (json.isJsonObject()) { + JsonObject jsonObject = json.getAsJsonObject(); + observationValue.setDisplay(jsonObject.get(DISPLAY_KEY).getAsString()); + } else if (json.isJsonPrimitive()) { + JsonPrimitive jsonPrimitive = json.getAsJsonPrimitive(); + observationValue.setDisplay(jsonPrimitive.getAsString()); + } + + return observationValue; + } + } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/domain/Order.java b/openmrs/src/main/java/org/motechproject/openmrs/domain/Order.java new file mode 100644 index 000000000..e1b67c651 --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/domain/Order.java @@ -0,0 +1,165 @@ +package org.motechproject.openmrs.domain; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.annotations.Expose; + +import java.lang.reflect.Type; +import java.util.Objects; +import java.util.SortedSet; +import java.util.TreeSet; + +/** + * Represents a single order. An order represents the instructions for patient in which order and how long + * should one take a medications. + */ +public class Order { + public static final String DEFAULT_TYPE = "order"; + + private String uuid; + private String display; + + @Expose + private String type; + @Expose + private Encounter encounter; + @Expose + private Provider orderer; + @Expose + private Patient patient; + @Expose + private Concept concept; + @Expose + private CareSetting careSetting; + + public Order() { + } + + public Order(String type, Encounter encounter, Provider orderer, Patient patient, Concept concept, CareSetting careSetting) { + this.type = type; + this.encounter = encounter; + this.orderer = orderer; + this.patient = patient; + this.concept = concept; + this.careSetting = careSetting; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + this.display = display; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Encounter getEncounter() { + return encounter; + } + + public void setEncounter(Encounter encounter) { + this.encounter = encounter; + } + + public Provider getOrderer() { + return orderer; + } + + public void setOrderer(Provider orderer) { + this.orderer = orderer; + } + + public Patient getPatient() { + return patient; + } + + public void setPatient(Patient patient) { + this.patient = patient; + } + + public Concept getConcept() { + return concept; + } + + public void setConcept(Concept concept) { + this.concept = concept; + } + + public CareSetting getCareSetting() { + return careSetting; + } + + public void setCareSetting(CareSetting careSetting) { + this.careSetting = careSetting; + } + + public enum CareSetting { + INPATIENT, OUTPATIENT; + + public static SortedSet getValuesAsStringSet() { + SortedSet values = new TreeSet<>(); + + for (CareSetting careSetting : CareSetting.values()) { + values.add(careSetting.toString()); + } + + return values; + } + } + + /** + * Implementation of the {@link JsonDeserializer} interface for the {@link CareSetting} class. + */ + public static class CareSettingDeserializer implements JsonDeserializer { + @Override + public CareSetting deserialize(JsonElement src, Type typeOfT, JsonDeserializationContext context) { + JsonObject jsonCareSetting = src.getAsJsonObject(); + JsonElement display = jsonCareSetting.get("display"); + + return CareSetting.valueOf(display.getAsString().toUpperCase()); + } + } + + @Override + public int hashCode() { + return Objects.hash(uuid, display, encounter, orderer, patient, concept, careSetting); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof Order)) { + return false; + } + + Order other = (Order) o; + + return Objects.equals(uuid, other.uuid) && + Objects.equals(display, other.display) && + Objects.equals(encounter, other.encounter) && + Objects.equals(orderer, other.orderer) && + Objects.equals(patient, other.patient) && + Objects.equals(concept, other.concept) && + Objects.equals(careSetting, other.careSetting); + } +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/domain/Provider.java b/openmrs/src/main/java/org/motechproject/openmrs/domain/Provider.java index 45d38fa27..17ba2b431 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/domain/Provider.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/domain/Provider.java @@ -1,5 +1,11 @@ package org.motechproject.openmrs.domain; +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; + +import java.lang.reflect.Type; import java.util.Objects; /** @@ -51,6 +57,18 @@ public void setIdentifier(String identifier) { this.identifier = identifier; } + /** + * Implementation of the {@link JsonSerializer} interface for the {@link Provider} class. It represents the provider + * as its ID. + */ + public static class ProviderSerializer implements JsonSerializer { + + @Override + public JsonElement serialize(Provider provider, Type type, JsonSerializationContext jsonSerializationContext) { + return new JsonPrimitive(provider.getUuid()); + } + } + @Override public int hashCode() { return Objects.hash(uuid, person, identifier); diff --git a/openmrs/src/main/java/org/motechproject/openmrs/helper/EventHelper.java b/openmrs/src/main/java/org/motechproject/openmrs/helper/EventHelper.java index bebb5719c..45ffd5a6c 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/helper/EventHelper.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/helper/EventHelper.java @@ -101,9 +101,14 @@ public static Map encounterParameters(Encounter encounter) { } else { encounterParameters.put(EventKeys.LOCATION_ID, null); } + if (encounter.getVisit() != null) { + encounterParameters.put(EventKeys.VISIT_ID, encounter.getVisit().getUuid()); + } + if (encounter.getForm() != null) { + encounterParameters.put(EventKeys.FORM_ID, encounter.getForm().getUuid()); + } encounterParameters.put(EventKeys.ENCOUNTER_DATE, encounter.getEncounterDatetime()); encounterParameters.put(EventKeys.ENCOUNTER_TYPE, encounter.getEncounterType().getUuid()); - encounterParameters.put(EventKeys.VISIT_ID, encounter.getVisit().getUuid()); return encounterParameters; } @@ -166,7 +171,10 @@ public static Map observationParameters(Observation obs) { observationParameters.put(EventKeys.OBSERVATION_CONCEPT_NAME, obs.getConcept().getName().getName()); } observationParameters.put(EventKeys.PATIENT_ID, obs.getPerson().getUuid()); - observationParameters.put(EventKeys.OBSERVATION_VALUE, obs.getValue().getDisplay()); + if (obs.getValue() != null) { + observationParameters.put(EventKeys.OBSERVATION_VALUE, obs.getValue().getDisplay()); + } + return observationParameters; } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/FormResource.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/FormResource.java new file mode 100644 index 000000000..f73601530 --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/FormResource.java @@ -0,0 +1,20 @@ +package org.motechproject.openmrs.resource; + + +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Form; + +/** + * Interface for forms management. + */ +public interface FormResource { + + /** + * Gets the form by its UUID. The given {@code config} will be used while performing this action. + * + * @param config the name of the configuration + * @param uuid the UUID of the visit + * @return the form with the given UUID + */ + Form getFormByUuid(Config config, String uuid); +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/ObservationResource.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/ObservationResource.java index 6a584578b..45b53145d 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/resource/ObservationResource.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/ObservationResource.java @@ -38,6 +38,16 @@ public interface ObservationResource { */ Observation getObservationById(Config config, String uuid); + /** + * Gets the latest observation with the given patientUUID and conceptUUID. The given {@code config} will be used while performing this action. + * + * @param config the configuration to be used while performing this action + * @param patientUUID the UUID of the patient + * @param conceptUUID the UUID of the concept + * @return the latest observation with the given patientUUID and conceptUUID + */ + ObservationListResult getObservationByPatientUUIDAndConceptUUID(Config config, String patientUUID, String conceptUUID); + /** * Creates the given observation on the OpenMRS server. The given {@code config} will be used while performing this * action. @@ -48,6 +58,16 @@ public interface ObservationResource { */ Observation createObservation(Config config, Observation observation); + /** + * Creates the given observation on the OpenMRS server. The given {@code config} will be used while performing this + * action. + * + * @param config the configuration to be used while performing this action + * @param observationJson the observation json to be created + * @return the saved observation + */ + Observation createObservationFromJson(Config config, String observationJson); + /** * Deletes the observation with the given UUID. The given {@code config} will be used while performing this action. * diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/OrderResource.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/OrderResource.java new file mode 100644 index 000000000..ae853c198 --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/OrderResource.java @@ -0,0 +1,20 @@ +package org.motechproject.openmrs.resource; + +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Order; + +/** + * Interface for orders management. + */ +public interface OrderResource { + + /** + * Creates the given order on the OpenMRS server. The given {@code config} will be used while performing this + * action. + * + * @param config the configuration to be used while performing this action + * @param order the order to be created + * @return the saved order + */ + Order createOrder(Config config, Order order); +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/BaseResource.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/BaseResource.java index db6379fb7..e88f7bbc8 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/BaseResource.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/BaseResource.java @@ -3,14 +3,14 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.httpclient.HttpClient; import org.motechproject.openmrs.config.Config; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestOperations; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.net.URI; import java.util.Arrays; diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/FormResourceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/FormResourceImpl.java new file mode 100644 index 000000000..b33d9dc42 --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/FormResourceImpl.java @@ -0,0 +1,26 @@ +package org.motechproject.openmrs.resource.impl; + +import org.apache.commons.httpclient.HttpClient; +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Form; +import org.motechproject.openmrs.resource.FormResource; +import org.motechproject.openmrs.util.JsonUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestOperations; + +@Component +public class FormResourceImpl extends BaseResource implements FormResource { + + @Autowired + public FormResourceImpl(RestOperations restOperations, HttpClient httpClient) { + super(restOperations, httpClient); + } + + @Override + public Form getFormByUuid(Config config, String uuid) { + String responseJson = getJson(config, "/form/{uuid}", uuid); + return (Form) JsonUtils.readJson(responseJson, Form.class); + } + +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/ObservationResourceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/ObservationResourceImpl.java index 6ba9812eb..828d9cb8b 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/ObservationResourceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/ObservationResourceImpl.java @@ -6,6 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.domain.Concept; +import org.motechproject.openmrs.domain.Encounter; import org.motechproject.openmrs.domain.Observation; import org.motechproject.openmrs.domain.ObservationListResult; import org.motechproject.openmrs.domain.Person; @@ -15,6 +16,10 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.RestOperations; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; + @Component public class ObservationResourceImpl extends BaseResource implements ObservationResource { @@ -26,7 +31,7 @@ public ObservationResourceImpl(RestOperations restOperations, HttpClient httpCli @Override public ObservationListResult queryForObservationsByPatientId(Config config, String uuid) { String responseJson = getJson(config, "/obs?patient={uuid}&v=full", uuid); - return (ObservationListResult) JsonUtils.readJson(responseJson, ObservationListResult.class); + return (ObservationListResult) JsonUtils.readJsonWithAdapters(responseJson, ObservationListResult.class, createValueAdapter()); } @Override @@ -41,14 +46,26 @@ public void voidObservation(Config config, String id, String reason) { @Override public Observation getObservationById(Config config, String uuid) { String responseJson = getJson(config, "/obs/{uuid}?v=full", uuid); - return (Observation) JsonUtils.readJson(responseJson, Observation.class); + return (Observation) JsonUtils.readJsonWithAdapters(responseJson, Observation.class, createValueAdapter()); + } + + @Override + public ObservationListResult getObservationByPatientUUIDAndConceptUUID(Config config, String patientUUID, String conceptUUID) { + String responseJson = getJson(config, "/obs?patient={patientUUID}&concept={conceptUUID}&limit=1&v=full", patientUUID, conceptUUID); + return (ObservationListResult) JsonUtils.readJsonWithAdapters(responseJson, ObservationListResult.class, createValueAdapter()); } @Override public Observation createObservation(Config config, Observation observation) { String requestJson = buildGson().toJson(observation); String responseJson = postForJson(config, requestJson, "/obs"); - return (Observation) JsonUtils.readJson(responseJson, Observation.class); + return (Observation) JsonUtils.readJsonWithAdapters(responseJson, Observation.class, createValueAdapter()); + } + + @Override + public Observation createObservationFromJson(Config config, String observationJson) { + String responseJson = postForJson(config, observationJson, "/obs"); + return (Observation) JsonUtils.readJsonWithAdapters(responseJson, Observation.class, createValueAdapter()); } @Override @@ -61,6 +78,14 @@ private Gson buildGson() { .registerTypeAdapter(Observation.ObservationValue.class, new Observation.ObservationValueSerializer()) .registerTypeAdapter(Concept.class, new Concept.ConceptSerializer()) .registerTypeAdapter(Person.class, new Person.PersonSerializer()) + .registerTypeAdapter(Encounter.class, new Encounter.EncounterUuidSerializer()) .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create(); } + + private Map createValueAdapter() { + Map valueAdapter = new HashMap<>(); + valueAdapter.put(Observation.ObservationValue.class, new Observation.ObservationValueDeserializer()); + + return valueAdapter; + } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/OrderResourceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/OrderResourceImpl.java new file mode 100644 index 000000000..fcca206cb --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/OrderResourceImpl.java @@ -0,0 +1,53 @@ +package org.motechproject.openmrs.resource.impl; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.apache.commons.httpclient.HttpClient; +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Concept; +import org.motechproject.openmrs.domain.Encounter; +import org.motechproject.openmrs.domain.Order; +import org.motechproject.openmrs.domain.Patient; +import org.motechproject.openmrs.domain.Provider; +import org.motechproject.openmrs.resource.OrderResource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestOperations; + +@Component +public class OrderResourceImpl extends BaseResource implements OrderResource { + + @Autowired + public OrderResourceImpl(RestOperations restOperations, HttpClient httpClient) { + super(restOperations, httpClient); + } + + @Override + public Order createOrder(Config config, Order order) { + String requestJson = buildGson().toJson(order); + String responseJson = postForJson(config, requestJson, "/order"); + return buildGsonDeserializer().fromJson(responseJson, Order.class); + } + + private Gson buildGson() { + GsonBuilder builder = new GsonBuilder(); + + builder + .excludeFieldsWithoutExposeAnnotation() + .registerTypeAdapter(Encounter.class, new Encounter.EncounterUuidSerializer()) + .registerTypeAdapter(Provider.class, new Provider.ProviderSerializer()) + .registerTypeAdapter(Patient.class, new Patient.PatientSerializer()) + .registerTypeAdapter(Concept.class, new Concept.ConceptSerializer()); + + return builder.create(); + } + + private Gson buildGsonDeserializer() { + GsonBuilder builder = new GsonBuilder(); + + builder + .registerTypeAdapter(Order.CareSetting.class, new Order.CareSettingDeserializer()); + + return builder.create(); + } +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/PersonResourceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/PersonResourceImpl.java index 95a4ca59b..8ba909f47 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/PersonResourceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/resource/impl/PersonResourceImpl.java @@ -55,7 +55,7 @@ public AttributeTypeListResult queryPersonAttributeTypeByName(Config config, Str } @Override - public AttributeListResult queryPersonAttributeByPersonUuid (Config config, String uuid) { + public AttributeListResult queryPersonAttributeByPersonUuid(Config config, String uuid) { String responseJson = getJson(config, "/person/{uuid}/attribute", uuid); return (AttributeListResult) JsonUtils.readJsonWithAdapters(responseJson, AttributeListResult.class, createAttributeAdapter()); } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/EventKeys.java b/openmrs/src/main/java/org/motechproject/openmrs/service/EventKeys.java index ee75b7f9f..f04e9d30f 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/EventKeys.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/EventKeys.java @@ -45,6 +45,7 @@ public final class EventKeys { public static final String USER_ID = "UserId"; public static final String PROGRAM_ID = "ProgramId"; public static final String PROGRAM_ENROLLMENT_ID = "ProgramEnrollmentId"; + public static final String FORM_ID = "FormId"; public static final String BASE_SUBJECT = "org.motechproject.mrs.api."; diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSFormService.java b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSFormService.java new file mode 100644 index 000000000..fb33c3b3a --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSFormService.java @@ -0,0 +1,16 @@ +package org.motechproject.openmrs.service; + +import org.motechproject.openmrs.domain.Form; + +public interface OpenMRSFormService { + + /** + * Returns the form with the given {@code uuid}. Configuration with the given {@code configName} will be used + * while performing this action. + * + * @param configName the name of the configuration + * @param uuid the UUID of the visit + * @return the form with the given UUID + */ + Form getFormByUuid(String configName, String uuid); +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSObservationService.java b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSObservationService.java index 5f85a2d2f..0660e6ea0 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSObservationService.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSObservationService.java @@ -53,6 +53,28 @@ public interface OpenMRSObservationService { */ Observation getObservationByUuid(String configName, String uuid); + /** + * Returns the observation with given {@code uuid}. Configuration with the given {@code configName} will be used + * while performing this action. + * + * @param configName the name of the configuration + * @param patientUUID the UUID of the patient + * @param conceptUUID the UUID of the concept + * @return the latest observation with the given patientUUID and conceptUUID, null if the observation doesn't exist + */ + Observation getLatestObservationByPatientUUIDAndConceptUUID(String configName, String patientUUID, String conceptUUID); + + /** + * Returns the latest observation with given {@code patientUuid} and {@code value}. Configuration with the given {@code configName} will be used + * while performing this action. + * + * @param configName the name of the configuration + * @param patientUuid the UUID of the patient + * @param value the observation value + * @return the latest observation with the given patientUuid and value, null if the observation doesn't exist + */ + Observation getLatestObservationByValueAndPatientUuid(String configName, String patientUuid, String value); + /** * Creates the given {@code observation} on the OpenMRS server. Configuration with the given {@code configName} will * be used while performing this action. @@ -63,6 +85,16 @@ public interface OpenMRSObservationService { */ Observation createObservation(String configName, Observation observation); + /** + * Creates the given {@code observation} on the OpenMRS server. Configuration with the given {@code configName} will + * be used while performing this action. + * + * @param configName the name of the configuration + * @param observationJson the observation json to be created + * @return the created observation + */ + Observation createObservationFromJson(String configName, String observationJson); + /** * Deletes the observation with the given {@code uuid} from the OpenMRS server. If the observation with the given * {@code uuid} doesn't exist an error will be logged. Configuration with the given {@code configName} will be used diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSOrderService.java b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSOrderService.java new file mode 100644 index 000000000..d30aa0a7d --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSOrderService.java @@ -0,0 +1,19 @@ +package org.motechproject.openmrs.service; + +import org.motechproject.openmrs.domain.Order; + +/** + * Interface for handling orders on the OpenMRS server. + */ +public interface OpenMRSOrderService { + + /** + * Creates the given {@code order} on the OpenMRS server. Configuration with the given {@code configName} will + * be used while performing this action. + * + * @param configName the name of the configuration + * @param order the order to be created + * @return the created order + */ + Order createOrder(String configName, Order order); +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSPatientService.java b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSPatientService.java index 3174a43ae..02c74e0c3 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSPatientService.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/OpenMRSPatientService.java @@ -74,6 +74,17 @@ public interface OpenMRSPatientService { */ Patient getPatientByMotechId(String configName, String motechId); + /** + * Returns the patient with the given {@code identifierName} and {@code identifierId}. Configuration with the given {@code configName} will be used + * while performing this action. + * + * @param configName the name of the configuration + * @param identifierId the identifier id of the patient + * @param identifierName the identifier name of the patient + * @return the patient with the given identifier, null if the patient doesn't exist + */ + Patient getPatientByIdentifier(String configName, String identifierId, String identifierName); + /** * If the {@code motechId} is null this method will return a list of patients with given {@code name}, else it will * return a list with a single patient that has the given {@code name} and {@code motechId}. If there are no diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSCohortServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSCohortServiceImpl.java index 768937afb..e74ac9096 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSCohortServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSCohortServiceImpl.java @@ -31,7 +31,7 @@ public CohortQueryReport getCohortQueryReport(String configName, String cohortQu Config config = configService.getConfigByName(configName); return cohortResource.getCohortQueryReport(config, cohortQueryUuid, parameters); } catch (HttpClientErrorException e) { - throw new OpenMRSException("Could not get cohort query report for uuid" + cohortQueryUuid, e); + throw new OpenMRSException(String.format("Could not get cohort query report for uuid: %s. %s %s" + cohortQueryUuid, e.getMessage(), e.getResponseBodyAsString()), e); } } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSConceptServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSConceptServiceImpl.java index 78f8d806f..d855393c0 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSConceptServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSConceptServiceImpl.java @@ -104,8 +104,7 @@ public Concept getConceptByUuid(String configName, String uuid) { Config config = configService.getConfigByName(configName); concept = conceptResource.getConceptById(config, uuid); } catch (HttpClientErrorException e) { - LOGGER.error("Failed to get concept with ID " + uuid); - concept = null; + throw new OpenMRSException(String.format("Could not get Concept for uuid: %s. %s %s", uuid, e.getMessage(), e.getResponseBodyAsString()), e); } return concept; diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImpl.java index 8e59ed3ed..da3d5cfc1 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImpl.java @@ -1,6 +1,5 @@ package org.motechproject.openmrs.service.impl; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.motechproject.event.MotechEvent; @@ -8,12 +7,11 @@ import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.domain.Encounter; import org.motechproject.openmrs.domain.EncounterType; -import org.motechproject.openmrs.domain.Observation; import org.motechproject.openmrs.domain.Patient; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.helper.EventHelper; import org.motechproject.openmrs.resource.EncounterResource; import org.motechproject.openmrs.service.EventKeys; -import org.motechproject.openmrs.service.OpenMRSConceptService; import org.motechproject.openmrs.service.OpenMRSConfigService; import org.motechproject.openmrs.service.OpenMRSEncounterService; import org.motechproject.openmrs.service.OpenMRSPatientService; @@ -24,7 +22,6 @@ import org.springframework.web.client.HttpClientErrorException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @Service("encounterService") @@ -32,7 +29,6 @@ public class OpenMRSEncounterServiceImpl implements OpenMRSEncounterService { private static final Logger LOGGER = LoggerFactory.getLogger(OpenMRSEncounterServiceImpl.class); - private final OpenMRSConceptService conceptService; private final OpenMRSPatientService patientService; private final OpenMRSConfigService configService; @@ -43,11 +39,9 @@ public class OpenMRSEncounterServiceImpl implements OpenMRSEncounterService { @Autowired public OpenMRSEncounterServiceImpl(EncounterResource encounterResource, OpenMRSPatientService patientAdapter, - OpenMRSConceptService conceptAdapter, EventRelay eventRelay, - OpenMRSConfigService configService) { + EventRelay eventRelay, OpenMRSConfigService configService) { this.encounterResource = encounterResource; this.patientService = patientAdapter; - this.conceptService = conceptAdapter; this.configService = configService; this.eventRelay = eventRelay; } @@ -59,19 +53,12 @@ public Encounter createEncounter(String configName, Encounter encounter) { Encounter createdEncounter; Config config = configService.getConfigByName(configName); - // OpenMRS expects the observations to reference a concept uuid rather - // than just a concept name. Attempt to map all concept names to concept - // uuid's for each of the observations - List updatedObs = resolveConceptUuidForConceptNames(config, encounter.getObs()); - try { - encounter.setObs(updatedObs); createdEncounter = encounterResource.createEncounter(config, encounter); eventRelay.sendEventMessage(new MotechEvent(EventKeys.CREATED_NEW_ENCOUNTER_SUBJECT, EventHelper.encounterParameters(createdEncounter))); } catch (HttpClientErrorException e) { - LOGGER.error("Could not create encounter: " + e.getMessage()); - return null; + throw new OpenMRSException(String.format("Could not create encounter with patient uuid: %s. %s %s", encounter.getPatient().getUuid(), e.getMessage(), e.getResponseBodyAsString()), e); } return createdEncounter; @@ -100,7 +87,7 @@ public Encounter getEncounterByUuid(String configName, String uuid) { Config config = configService.getConfigByName(configName); return encounterResource.getEncounterById(config, uuid); } catch (HttpClientErrorException e) { - return null; + throw new OpenMRSException(String.format("Could not get encounter with uuid: %s. %s %s", uuid, e.getMessage(), e.getResponseBodyAsString()), e); } } @@ -159,7 +146,7 @@ private List getEncountersByEncounterType(Config config, String motec List encountersByPatientMotechId = getAllEncountersByPatientMotechId(config, motechId); for (Encounter encounter : encountersByPatientMotechId) { - if (StringUtils.equals(encounter.getEncounterType().getName(), encounterType)) { + if (StringUtils.equals(encounter.getEncounterType().getUuid(), encounterType)) { encountersByEncounterType.add(encounter); } } @@ -176,31 +163,6 @@ private void validateEncounter(Encounter encounter) { Validate.notNull(encounter.getEncounterType(), "Encounter type cannot be null"); } - private List resolveConceptUuidForConceptNames(Config config, List originalObservations) { - List updatedObs = new ArrayList<>(); - if (originalObservations != null) { - for (Observation observation : originalObservations) { - if (observationValueIsNotEmpty(observation)) { - String conceptUuid = conceptService.resolveConceptUuidFromConceptName(config.getName(), observation.getConcept().getName().getName()); - if (CollectionUtils.isNotEmpty(observation.getGroupsMembers())) { - resolveConceptUuidForConceptNames(config, observation.getGroupsMembers()); - } - observation.getConcept().setUuid(conceptUuid); - updatedObs.add(observation); - } else { - LOGGER.warn("Observation value is null or empty for concept: " + observation.getConcept().getName() - + " and will not be created"); - } - } - } - - return updatedObs; - } - - private boolean observationValueIsNotEmpty(Observation observation) { - return observation.getValue() != null && StringUtils.isNotEmpty(observation.getValue().getDisplay()); - } - private List getAllEncountersByPatientMotechId(Config config, String motechId) { Validate.notEmpty(motechId, "MOTECH Id cannot be empty"); @@ -219,8 +181,7 @@ private List getEncountersForPatient(Config config, Patient patient) try { result = encounterResource.queryForAllEncountersByPatientId(config, patient.getUuid()).getResults(); } catch (HttpClientErrorException e) { - LOGGER.error("Error retrieving encounters for patient: " + patient.getUuid()); - return Collections.emptyList(); + throw new OpenMRSException(String.format("Could not get encounters for patient with uuid: %s. %s %s", patient.getUuid(), e.getMessage(), e.getResponseBodyAsString()), e); } return result; diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSFormServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSFormServiceImpl.java new file mode 100644 index 000000000..ae8850aa7 --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSFormServiceImpl.java @@ -0,0 +1,35 @@ +package org.motechproject.openmrs.service.impl; + +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Form; +import org.motechproject.openmrs.exception.OpenMRSException; +import org.motechproject.openmrs.resource.FormResource; +import org.motechproject.openmrs.service.OpenMRSConfigService; +import org.motechproject.openmrs.service.OpenMRSFormService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpClientErrorException; + +@Service("formService") +public class OpenMRSFormServiceImpl implements OpenMRSFormService { + + @Autowired + private final OpenMRSConfigService configService; + private final FormResource formResource; + + @Autowired + public OpenMRSFormServiceImpl(OpenMRSConfigService configService, FormResource formResource) { + this.configService = configService; + this.formResource = formResource; + } + + @Override + public Form getFormByUuid(String configName, String uuid) { + try { + Config config = configService.getConfigByName(configName); + return formResource.getFormByUuid(config, uuid); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get Form for uuid %s. %s %s", uuid, e.getMessage(), e.getResponseBodyAsString()), e); + } + } +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSGeneratedIdentifierServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSGeneratedIdentifierServiceImpl.java index 6dac2ac33..9b020bce2 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSGeneratedIdentifierServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSGeneratedIdentifierServiceImpl.java @@ -31,7 +31,7 @@ public GeneratedIdentifier getLatestIdentifier(String configName, String sourceN return generatedIdentifierResource.getGeneratedIdentifier(config, sourceName); } catch (HttpServerErrorException | HttpClientErrorException e) { - throw new OpenMRSException("Cannot get latest identifier from Generator with name: " + sourceName, e); + throw new OpenMRSException(String.format("Cannot get latest identifier from Generator with name: %s. %s %s" + sourceName, e.getMessage(), e.getResponseBodyAsString()), e); } } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSLocationServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSLocationServiceImpl.java index 65f892623..080d97bd2 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSLocationServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSLocationServiceImpl.java @@ -6,6 +6,7 @@ import org.motechproject.event.listener.EventRelay; import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.domain.Location; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.helper.EventHelper; import org.motechproject.openmrs.resource.LocationResource; import org.motechproject.openmrs.service.EventKeys; @@ -76,8 +77,7 @@ public List getLocations(String configName, String locationName) { Config config = configService.getConfigByName(configName); locations = locationResource.queryForLocationByName(config, locationName).getResults(); } catch (HttpClientErrorException e) { - LOGGER.error("Failed to retrieve all locations by location name: " + locationName); - return Collections.emptyList(); + throw new OpenMRSException(String.format("Could not get Locations for name %s. %s %s", locationName, e.getMessage(), e.getResponseBodyAsString()), e); } return locations; diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSObservationServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSObservationServiceImpl.java index bc201ac0a..ea0255971 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSObservationServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSObservationServiceImpl.java @@ -1,17 +1,17 @@ package org.motechproject.openmrs.service.impl; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.Validate; import org.apache.log4j.Logger; import org.motechproject.event.MotechEvent; import org.motechproject.event.listener.EventRelay; import org.motechproject.openmrs.config.Config; -import org.motechproject.openmrs.domain.Concept; import org.motechproject.openmrs.domain.Observation; import org.motechproject.openmrs.domain.ObservationListResult; import org.motechproject.openmrs.domain.Patient; import org.motechproject.openmrs.exception.ObservationNotFoundException; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.helper.EventHelper; -import org.motechproject.openmrs.resource.ConceptResource; import org.motechproject.openmrs.resource.ObservationResource; import org.motechproject.openmrs.service.EventKeys; import org.motechproject.openmrs.service.OpenMRSConfigService; @@ -35,17 +35,14 @@ public class OpenMRSObservationServiceImpl implements OpenMRSObservationService private final OpenMRSConfigService configService; private final ObservationResource obsResource; - private final ConceptResource conceptResource; private final EventRelay eventRelay; @Autowired public OpenMRSObservationServiceImpl(ObservationResource obsResource, OpenMRSPatientService patientAdapter, - ConceptResource conceptResource, EventRelay eventRelay, - OpenMRSConfigService configService) { + EventRelay eventRelay, OpenMRSConfigService configService) { this.obsResource = obsResource; this.patientService = patientAdapter; - this.conceptResource = conceptResource; this.eventRelay = eventRelay; this.configService = configService; } @@ -95,32 +92,60 @@ public Observation getObservationByUuid(String configName, String uuid) { } } + @Override + public Observation getLatestObservationByPatientUUIDAndConceptUUID(String configName, String patientUUID, String conceptUUID) { + Validate.notEmpty(patientUUID, "Patient uuid cannot be empty"); + Validate.notEmpty(conceptUUID, "Concept uuid cannot be empty"); + + try { + Config config = configService.getConfigByName(configName); + ObservationListResult obs = obsResource.getObservationByPatientUUIDAndConceptUUID(config, patientUUID, conceptUUID); + return CollectionUtils.isEmpty(obs.getResults()) ? null : obs.getResults().get(0); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get Observation for Patient uuid: %s and Concept: %s. %s %s", + patientUUID, conceptUUID, e.getMessage(), e.getResponseBodyAsString()), e); + } + } + + @Override + public Observation getLatestObservationByValueAndPatientUuid(String configName, String patientUuid, String value) { + try { + Config config = configService.getConfigByName(configName); + ObservationListResult obs = obsResource.queryForObservationsByPatientId(config, patientUuid); + return getLatestObservationByValue(obs.getResults(), new Observation.ObservationValue(value)); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get Observation for Patient uuid: %s. %s %s", + patientUuid, e.getMessage(), e.getResponseBodyAsString()), e); + } + } + @Override public Observation createObservation(String configName, Observation observation) { Validate.notEmpty(observation.getPerson().getUuid(), "Patient uuid cannot be empty"); - Validate.notNull(observation.getConcept().getName(), "Concept name cannot be empty"); + Validate.notEmpty(observation.getConcept().getUuid(), "Concept uuid cannot be empty"); Validate.notNull(observation.getObsDatetime()); - Validate.notNull(observation.getValue()); - Validate.notEmpty(observation.getValue().getDisplay()); try { Config config = configService.getConfigByName(configName); - Concept concept = conceptResource.getConceptByName(config, observation.getConcept().getName().getName()); - Patient patient = patientService.getPatientByUuid(configName, observation.getPerson().getUuid()); - - Validate.notNull(concept); - Validate.notNull(patient); - - observation.setConcept(concept); - observation.setPerson(patient.getPerson()); Observation created = obsResource.createObservation(config, observation); eventRelay.sendEventMessage(new MotechEvent(EventKeys.CREATED_NEW_OBSERVATION_SUBJECT, EventHelper.observationParameters(created))); return created; + } catch (HttpClientErrorException e) { + throw new OpenMRSException("Error while creating observation. Response body: " + e.getResponseBodyAsString(), e); + } + } + + @Override + public Observation createObservationFromJson(String configName, String observationJson) { + try { + Config config = configService.getConfigByName(configName); + Observation created = obsResource.createObservationFromJson(config, observationJson); + eventRelay.sendEventMessage(new MotechEvent(EventKeys.CREATED_NEW_OBSERVATION_SUBJECT, EventHelper.observationParameters(created))); + return created; } catch (HttpClientErrorException e) { - LOGGER.error("Error while creating observation!"); - return null; + throw new OpenMRSException("Error while creating observation. Response body: " + e.getResponseBodyAsString(), e); } } @@ -161,4 +186,17 @@ private List findObservations(Config config, String motechId, Strin return obs; } + + private Observation getLatestObservationByValue(List obs, Observation.ObservationValue value) { + Observation result = null; + + for (Observation observation : obs) { + if (value.equals(observation.getValue())) { + result = observation; + break; + } + } + + return result; + } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSOrderServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSOrderServiceImpl.java new file mode 100644 index 000000000..c548f3208 --- /dev/null +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSOrderServiceImpl.java @@ -0,0 +1,47 @@ +package org.motechproject.openmrs.service.impl; + +import org.apache.commons.lang.Validate; +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Order; +import org.motechproject.openmrs.exception.OpenMRSException; +import org.motechproject.openmrs.resource.OrderResource; +import org.motechproject.openmrs.service.OpenMRSConfigService; +import org.motechproject.openmrs.service.OpenMRSOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpClientErrorException; + +@Service("orderService") +public class OpenMRSOrderServiceImpl implements OpenMRSOrderService { + + private OrderResource orderResource; + private OpenMRSConfigService configService; + + @Autowired + public OpenMRSOrderServiceImpl(OrderResource orderResource, OpenMRSConfigService configService) { + this.orderResource = orderResource; + this.configService = configService; + } + + @Override + public Order createOrder(String configName, Order order) { + validateOrder(order); + + try { + Config config = configService.getConfigByName(configName); + return orderResource.createOrder(config, order); + } catch (HttpClientErrorException e) { + throw new OpenMRSException("Error while creating order. Response body: " + e.getResponseBodyAsString(), e); + } + } + + private void validateOrder(Order order) { + Validate.notNull(order, "Order cannot be null"); + Validate.notNull(order.getConcept(), "Concept cannot be null"); + Validate.notNull(order.getCareSetting(), "Care setting cannot be null"); + Validate.notNull(order.getEncounter(), "Encounter cannot be null"); + Validate.notNull(order.getOrderer(), "Orderer type cannot be null"); + Validate.notNull(order.getType(), "Type cannot be null"); + Validate.notNull(order.getPatient(), "Patient cannot be null"); + } +} diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPatientServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPatientServiceImpl.java index d12b66308..8bde1392e 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPatientServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPatientServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpStatusCodeException; import java.util.ArrayList; import java.util.Collections; @@ -64,8 +65,12 @@ public Patient createPatient(String configName, Patient patient) { Config config = configService.getConfigByName(configName); if (patient.getPerson().getUuid() == null) { - personResource.checkPersonAttributeTypes(config, patient.getPerson()); - patient.setPerson(personResource.createPerson(config, patient.getPerson())); + try { + personResource.checkPersonAttributeTypes(config, patient.getPerson()); + patient.setPerson(personResource.createPerson(config, patient.getPerson())); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not create Person. %s %s", e.getMessage(), e.getResponseBodyAsString()), e); + } } IdentifierType identifierType = new IdentifierType(); @@ -84,8 +89,7 @@ public Patient createPatient(String configName, Patient patient) { return savedPatient; } catch (HttpClientErrorException e) { - LOGGER.error("Failed to create a patient in OpenMRS with MOTECH Id: " + patient.getMotechId()); - return null; + throw new OpenMRSException(String.format("Could not create Patient. %s %s", e.getMessage(), e.getResponseBodyAsString()), e); } } @@ -118,6 +122,11 @@ public Patient getPatientByMotechId(String configName, String motechId) { return getPatientByMotechId(configService.getConfigByName(configName), motechId); } + @Override + public Patient getPatientByIdentifier(String configName, String identifierId, String identifierName) { + return getPatientByIdentifier(configService.getConfigByName(configName), identifierId, identifierName); + } + @Override public List search(String configName, String name, String motechId) { Validate.notEmpty(name, "Name cannot be empty"); @@ -188,9 +197,8 @@ private Patient getPatientByUuid(Config config, String uuid) { Patient patient; try { patient = patientResource.getPatientById(config, uuid); - } catch (HttpClientErrorException e) { - LOGGER.error("Failed to get patient by id: " + uuid); - return null; + } catch (HttpStatusCodeException e) { + throw new OpenMRSException(String.format("Could not get Patient with uuid: %s. %s %s", uuid, e.getMessage(), e.getResponseBodyAsString()), e); } Identifier motechIdentifier = getMotechIdentifier(config, patient); @@ -211,9 +219,8 @@ private Patient getPatientByMotechId(Config config, String motechId) { PatientListResult patientList; try { patientList = patientResource.queryForPatient(config, motechId); - } catch (HttpClientErrorException e) { - LOGGER.error("Failed search for patient by MOTECH Id: " + motechId); - return null; + } catch (HttpStatusCodeException e) { + throw new OpenMRSException(String.format("Could not get Patient for MOTECH Id: %s. %s %s", motechId, e.getMessage(), e.getResponseBodyAsString()), e); } if (patientList.getResults().size() == 0) { @@ -225,6 +232,46 @@ private Patient getPatientByMotechId(Config config, String motechId) { return getPatientByUuid(config.getName(), patientList.getResults().get(0).getUuid()); } + private Patient getPatientByIdentifier(Config config, String identifierId, String identifierName) { + Validate.notEmpty(identifierId, "Identifier Id cannot be empty"); + Validate.notEmpty(identifierName, "Identifier Name cannot be empty"); + + PatientListResult patientList; + Patient fetchedPatient; + try { + patientList = patientResource.queryForPatient(config, identifierId); + } catch (HttpStatusCodeException e) { + throw new OpenMRSException(String.format("Could not get Patient for %s: %s. %s %s", identifierName, identifierId, e.getMessage(), e.getResponseBodyAsString()), e); + } + + if (patientList.getResults().size() == 0) { + return null; + } else { + fetchedPatient = getPatientByIdentifierName(config, identifierId, identifierName, patientList); + } + + return fetchedPatient; + } + + private Patient getPatientByIdentifierName(Config config, String identifierId, String identifierName, PatientListResult patientList) { + List identifiersList; + Patient result = null; + for (Patient patient : patientList.getResults()) { + identifiersList = patientResource.getPatientIdentifierList(config, patient.getUuid()); + + for (Identifier identifier : identifiersList) { + if (identifierName.equals(identifier.getIdentifierType().getName()) && identifierId.equals(identifier.getIdentifier())) { + result = getPatientByUuid(config.getName(), patient.getUuid()); + break; + } + } + if (result != null) { + break; + } + } + return result; + } + private Patient updatePatient(Config config, Patient patient) { Validate.notNull(patient, "Patient cannot be null"); Validate.notEmpty(patient.getUuid(), "Patient Id cannot be empty"); @@ -244,7 +291,8 @@ private Patient updatePatient(Config config, Patient patient) { updatedPatient = getPatientByUuid(config, patient.getUuid()); eventRelay.sendEventMessage(new MotechEvent(EventKeys.UPDATED_PATIENT_SUBJECT, EventHelper.patientParameters(updatedPatient))); } catch (HttpClientErrorException e) { - throw new OpenMRSException("Failed to update OpenMRS patient with id: " + patient.getUuid(), e); + throw new OpenMRSException(String.format("Failed to update OpenMRS patient with uuid: %s. %s %s" + patient.getUuid(), e.getMessage(), + e.getResponseBodyAsString()), e); } return updatedPatient; @@ -262,7 +310,8 @@ private Patient updatePatientIdentifiers(Config config, Patient patient) { updatedPatient = getPatientByUuid(config, patient.getUuid()); eventRelay.sendEventMessage(new MotechEvent(EventKeys.UPDATED_PATIENT_IDENTIFIERS_SUBJECT, EventHelper.patientParameters(updatedPatient))); } catch (HttpClientErrorException e) { - throw new OpenMRSException("Failed to update OpenMRS patient's identifiers for patient with id: " + patient.getUuid(), e); + throw new OpenMRSException(String.format("Failed to update OpenMRS patient's identifiers for patient with uuid: %s. %s %s", patient.getUuid(), + e.getMessage(), e.getResponseBodyAsString()), e); } return updatedPatient; } @@ -322,8 +371,7 @@ private String getMotechPatientIdentifierTypeUuid(Config config) { try { motechPatientIdentifierTypeUuid = patientResource.getMotechPatientIdentifierUuid(config); } catch (HttpClientErrorException e) { - LOGGER.error("There was an exception retrieving the MOTECH Identifier Type UUID"); - return null; + throw new OpenMRSException(String.format("Could not get Patient Identifier Type uuid. %s, %s", e.getMessage(), e.getResponseBodyAsString()), e); } if (motechPatientIdentifierTypeUuid == null) { @@ -365,8 +413,8 @@ private List getSupportedIdentifierTypeList(Config config, List parsePatientIdentifiers(Config config, List parsedIdentifiers.add(identifier); } } catch (HttpClientErrorException e) { - LOGGER.error("There was an exception retrieving the identifier type with name {}", identifierTypeName); + throw new OpenMRSException(String.format("Could not get Patient Identifier Type for name: %s. %s %s", identifierTypeName, + e.getMessage(), e.getResponseBodyAsString()), e); } } @@ -414,7 +463,8 @@ private void deleteAllAttributes(Config config, Person person) { try { personResource.deleteAttribute(config, person.getUuid(), attribute); } catch (HttpClientErrorException e) { - LOGGER.warn("Failed to delete attribute with name: " + attribute.getName()); + throw new OpenMRSException(String.format("Could not delete Person's attribute for Person uuid: %s and Attribute uuid: %s. %s %s", + person.getUuid(), attribute.getUuid(), e.getMessage(), e.getResponseBodyAsString()), e); } } } @@ -439,6 +489,8 @@ private void saveAttributesForPerson(Config config, Person person) { personResource.createPersonAttribute(config, person.getUuid(), attribute); } catch (HttpClientErrorException e) { LOGGER.warn("Unable to add attribute to person with id: " + person.getUuid()); + throw new OpenMRSException(String.format("Could not create Person's attribute for Person uuid: %s and Attribute uuid: %s. %s %s", + person.getUuid(), attribute.getUuid(), e.getMessage(), e.getResponseBodyAsString()), e); } } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPersonServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPersonServiceImpl.java index d9e77622e..b536ead5e 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPersonServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSPersonServiceImpl.java @@ -54,7 +54,7 @@ public Person createPerson(String configName, Person person) { return saved; } catch (HttpClientErrorException e) { - throw new OpenMRSException("Failed to create person for: " + person.getDisplay(), e); + throw new OpenMRSException(String.format("Failed to create person for: %s. %s %s", person.getDisplay(), e.getMessage(), e.getResponseBodyAsString()), e); } } @@ -124,7 +124,8 @@ public Person updatePerson(String configName, Person person) { return updated; } catch (HttpClientErrorException e) { - throw new OpenMRSException("Failed to update a person in OpenMRS with id: " + person.getUuid(), e); + throw new OpenMRSException(String.format("Failed to update a person in OpenMRS with uuid: %s. %s %s", person.getUuid(), + e.getMessage(), e.getResponseBodyAsString()), e); } } @@ -145,6 +146,8 @@ private void saveAttributesForPerson(Config config, Person person) { personResource.createPersonAttribute(config, person.getUuid(), attribute); } catch (HttpClientErrorException e) { LOGGER.warn("Unable to add attribute to person with id: " + person.getUuid()); + throw new OpenMRSException(String.format("Could not add an attribute with uuid: %s to Person with uuid: %s. %s %s", attribute.getUuid(), + person.getUuid(), e.getMessage(), e.getResponseBodyAsString()), e); } } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProgramEnrollmentServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProgramEnrollmentServiceImpl.java index 40619d65f..dcd0ab69f 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProgramEnrollmentServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProgramEnrollmentServiceImpl.java @@ -79,32 +79,52 @@ public ProgramEnrollment updateProgramEnrollment(String configName, ProgramEnrol } return updatedProgramEnrollment; } catch (HttpClientErrorException e) { - throw new OpenMRSException("Could not update program enrollment with uuid: " + programEnrollment.getUuid(), e); + throw new OpenMRSException(String.format("Could not update program enrollment with uuid: %s. %s %s", programEnrollment.getUuid(), + e.getMessage(), e.getResponseBodyAsString()), e); } } @Override public List getBahmniProgramEnrollmentByPatientUuid(String configName, String patientUuid) { - return programEnrollmentResource.getBahmniProgramEnrollmentByPatientUuid(configService.getConfigByName(configName), patientUuid); + try { + return programEnrollmentResource.getBahmniProgramEnrollmentByPatientUuid(configService.getConfigByName(configName), patientUuid); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get a Bahmni Program Enrollments for Patient uuid: %s. %s %s", patientUuid, + e.getMessage(), e.getResponseBodyAsString()), e); + } } @Override public List getBahmniProgramEnrollmentByPatientMotechId(String configName, String patientMotechId) { - Patient patient = patientService.getPatientByMotechId(configName, patientMotechId); - - return Objects.nonNull(patient) ? getBahmniProgramEnrollmentByPatientUuid(configName, patient.getUuid()) : new ArrayList<>(); + try { + Patient patient = patientService.getPatientByMotechId(configName, patientMotechId); + return Objects.nonNull(patient) ? getBahmniProgramEnrollmentByPatientUuid(configName, patient.getUuid()) : new ArrayList<>(); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not create a Bahmni Program Enrollment for Patient Motech Id: %s. %s %s", + patientMotechId, e.getMessage(), e.getResponseBodyAsString()), e); + } } @Override public List getProgramEnrollmentByPatientUuid(String configName, String patientUuid) { - return programEnrollmentResource.getProgramEnrollmentByPatientUuid(configService.getConfigByName(configName), patientUuid); + try { + return programEnrollmentResource.getProgramEnrollmentByPatientUuid(configService.getConfigByName(configName), patientUuid); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get Program Enrollment for Patient uuid: %s. %s %s", patientUuid, + e.getMessage(), e.getResponseBodyAsString()), e); + } } @Override public List getProgramEnrollmentByPatientMotechId(String configName, String patientMotechId) { - Patient patient = patientService.getPatientByMotechId(configName, patientMotechId); + try { + Patient patient = patientService.getPatientByMotechId(configName, patientMotechId); - return Objects.nonNull(patient) ? getProgramEnrollmentByPatientUuid(configName, patient.getUuid()) : new ArrayList<>(); + return Objects.nonNull(patient) ? getProgramEnrollmentByPatientUuid(configName, patient.getUuid()) : new ArrayList<>(); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get a Program Enrollment for Patient Motech Id: %s, %s %s", patientMotechId, + e.getMessage(), e.getResponseBodyAsString()), e); + } } @Override diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProviderServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProviderServiceImpl.java index 01b25a518..cb90febf5 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProviderServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSProviderServiceImpl.java @@ -2,6 +2,7 @@ import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.domain.Provider; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.resource.ProviderResource; import org.motechproject.openmrs.service.OpenMRSConfigService; import org.motechproject.openmrs.service.OpenMRSProviderService; @@ -43,8 +44,7 @@ public Provider getProviderByUuid(String configName, String uuid) { Config config = configService.getConfigByName(configName); return providerResource.getByUuid(config, uuid); } catch (HttpClientErrorException e) { - LOGGER.error("Error while fetching provider with UUID: " + uuid); - return null; + throw new OpenMRSException(String.format("Could not get Provider for uuid: %s. %s %s", uuid, e.getMessage(), e.getResponseBodyAsString()), e); } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSRelationshipServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSRelationshipServiceImpl.java index 817c19e0c..ad7abc3df 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSRelationshipServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSRelationshipServiceImpl.java @@ -6,11 +6,13 @@ import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.domain.Relationship; import org.motechproject.openmrs.domain.RelationshipListResult; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.resource.RelationshipResource; import org.motechproject.openmrs.service.OpenMRSConfigService; import org.motechproject.openmrs.service.OpenMRSRelationshipService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.client.HttpClientErrorException; import java.util.ArrayList; import java.util.List; @@ -28,26 +30,31 @@ public class OpenMRSRelationshipServiceImpl implements OpenMRSRelationshipServic public List getByTypeUuidAndPersonUuid(String configName, String typeUuid, String personUuid) { Config config = configService.getConfigByName(configName); - RelationshipListResult result = relationshipResource.getByPersonUuid(config, personUuid); + try { + RelationshipListResult result = relationshipResource.getByPersonUuid(config, personUuid); - //temporary workaround until OpenMRS server-side filtering for the relationships is fixed - return new ArrayList<>(Collections2.filter(result.getResults(), new Predicate() { - @Override - public boolean apply(Relationship relationship) { - String personBUuid = null; - String relationshipTypeUuid = null; + //temporary workaround until OpenMRS server-side filtering for the relationships is fixed + return new ArrayList<>(Collections2.filter(result.getResults(), new Predicate() { + @Override + public boolean apply(Relationship relationship) { + String personBUuid = null; + String relationshipTypeUuid = null; - if (relationship.getPersonB() != null) { - personBUuid = relationship.getPersonB().getUuid(); - } + if (relationship.getPersonB() != null) { + personBUuid = relationship.getPersonB().getUuid(); + } - if (relationship.getRelationshipType() != null) { - relationshipTypeUuid = relationship.getRelationshipType().getUuid(); - } + if (relationship.getRelationshipType() != null) { + relationshipTypeUuid = relationship.getRelationshipType().getUuid(); + } - return StringUtils.equals(personBUuid, personUuid) - && StringUtils.equals(relationshipTypeUuid, typeUuid); - } - })); + return StringUtils.equals(personBUuid, personUuid) + && StringUtils.equals(relationshipTypeUuid, typeUuid); + } + })); + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not get Relationship for Person uuid: %s. %s %s", personUuid, + e.getMessage(), e.getResponseBodyAsString()), e); + } } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSVisitServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSVisitServiceImpl.java index 7fed91eb2..f3dce16b2 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSVisitServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/service/impl/OpenMRSVisitServiceImpl.java @@ -6,6 +6,7 @@ import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.domain.Visit; import org.motechproject.openmrs.domain.VisitType; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.helper.EventHelper; import org.motechproject.openmrs.resource.VisitResource; import org.motechproject.openmrs.service.EventKeys; @@ -37,11 +38,15 @@ public OpenMRSVisitServiceImpl(OpenMRSConfigService configService, VisitResource public Visit createVisit(String configName, Visit visit) { validateVisit(visit); - Config config = configService.getConfigByName(configName); - Visit createdVisit = visitResource.createVisit(config, visit); + try { + Config config = configService.getConfigByName(configName); + Visit createdVisit = visitResource.createVisit(config, visit); - eventRelay.sendEventMessage(new MotechEvent(EventKeys.CREATED_NEW_VISIT_SUBJECT, EventHelper.visitParameters(createdVisit))); - return createdVisit; + eventRelay.sendEventMessage(new MotechEvent(EventKeys.CREATED_NEW_VISIT_SUBJECT, EventHelper.visitParameters(createdVisit))); + return createdVisit; + } catch (HttpClientErrorException e) { + throw new OpenMRSException(String.format("Could not create a Visit. %s %s", e.getMessage(), e.getResponseBodyAsString()), e); + } } @Override @@ -50,8 +55,7 @@ public Visit getVisitByUuid(String configName, String uuid) { Config config = configService.getConfigByName(configName); return visitResource.getVisitById(config, uuid); } catch (HttpClientErrorException e) { - LOGGER.error("Error while fetching visit with UUID: " + uuid); - return null; + throw new OpenMRSException(String.format("Could not get a Visit for uuid: %s. %s %s", uuid, e.getMessage(), e.getResponseBodyAsString()), e); } } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSActionProxyService.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSActionProxyService.java index 1f604f155..9ca6d1784 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSActionProxyService.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSActionProxyService.java @@ -2,6 +2,8 @@ import org.joda.time.DateTime; import org.motechproject.openmrs.domain.Encounter; +import org.motechproject.openmrs.domain.Observation; +import org.motechproject.openmrs.domain.Order; import org.motechproject.openmrs.domain.Patient; import org.motechproject.openmrs.domain.Visit; @@ -19,8 +21,8 @@ public interface OpenMRSActionProxyService { /** * Creates an encounter with the given {@code encounterDate}, {@code encounterType}, {@code locationName}, - * {@code patientUuid} and {@code providerUuid}. The locationName is the only not required field. Configuration with - * the given {@code configName} will be used while performing this action. + * {@code patientUuid},{@code providerUuid} and {@code formId}. The locationName and formId are the only not required fields. + * Configuration with the given {@code configName} will be used while performing this action. * * @param configName the name of the configuration * @param encounterDatetime the date of encounter @@ -29,11 +31,13 @@ public interface OpenMRSActionProxyService { * @param patientUuid the patient uuid * @param providerUuid the provider uuid * @param visitUuid the visit uuid - * @param observations the map of observations where concept name is a key and value from the observation is a value + * @param formUuid the form uuid + * @param observations the map of observations where concept Uuid is a key and value from the observation is a value + * @return the created encounter */ Encounter createEncounter(String configName, DateTime encounterDatetime, String encounterType, String locationName, String patientUuid, String providerUuid, String visitUuid, - Map observations); + String formUuid, Map observations); /** * Creates a patient with the given params. The required fields are : {@code givenName}, {@code familyName}, @@ -88,6 +92,22 @@ Patient createPatient(String configName, String givenName, String middleName, St */ void updatePatientIdentifiers(String configName, String patientUuid, Map identifiers); + /** + * Creates an observation from given {@code observationJSON}. The observationJSON is the only required field. Other + * params are optional and will overwrite any matching key of {@code observationJSON}. Configuration with + * the given {@code configName} will be used while performing this action. + * @param configName the name of the configuration + * @param observationJSON the observation in JSON + * @param encounterUuid the encounter uuid + * @param conceptUuid the concept uuid + * @param obsDatetime the observation datetime + * @param orderUuid the order uuid + * @param comment the comment + * @return the created observation + */ + Observation createObservationJSON(String configName, String observationJSON, String encounterUuid, String conceptUuid, + DateTime obsDatetime, String orderUuid, String comment); + /** * Creates a visit with the given {@code patientUuid}, {@code visitStartDatetime}, * {@code visitEndDatetime}, {@code visitType} and {@code locationName}. The locationName and visitType are the only not required field. Configuration with @@ -191,4 +211,18 @@ void changeStateOfProgramEnrollment(String configName, String programEnrollmentU * @param parameters the additional parameters */ void getCohortQueryReport(String configName, String cohortQueryUuid, Map parameters); + + /** + * Creates an order with the given params. + * + * @param configName the name of the configuration + * @param type the order type + * @param encounterUuid the encounter uuid + * @param patientUuid the patient uuid + * @param conceptUuid the concept uuid + * @param ordererUuid the orderer uuid + * @param careSetting the care setting value + * @return the created Order + */ + Order createOrder(String configName, String type, String encounterUuid, String patientUuid, String conceptUuid, String ordererUuid, String careSetting); } diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProvider.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProvider.java index fd2f1f414..99273e3a1 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProvider.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProvider.java @@ -8,13 +8,16 @@ import org.motechproject.event.listener.annotations.MotechListener; import org.motechproject.openmrs.domain.Encounter; import org.motechproject.openmrs.domain.GeneratedIdentifier; +import org.motechproject.openmrs.domain.Observation; import org.motechproject.openmrs.domain.Patient; import org.motechproject.openmrs.domain.ProgramEnrollment; import org.motechproject.openmrs.domain.ProgramEnrollmentListResult; import org.motechproject.openmrs.domain.Provider; import org.motechproject.openmrs.domain.Relationship; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.service.OpenMRSEncounterService; import org.motechproject.openmrs.service.OpenMRSGeneratedIdentifierService; +import org.motechproject.openmrs.service.OpenMRSObservationService; import org.motechproject.openmrs.service.OpenMRSPatientService; import org.motechproject.openmrs.service.OpenMRSProgramEnrollmentService; import org.motechproject.openmrs.service.OpenMRSProviderService; @@ -37,13 +40,19 @@ import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BAHMNI_PROGRAM_ENROLLMENT; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_MOTECH_ID; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_MOTECH_ID_AND_PROGRAM_NAME; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_PATIENT_UUID_AND_CONCEPT_UUID; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_PATIENT_UUID_AND_VALUE; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_UUID; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_UUID_AMD_PROGRAM_NAME; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.CONCEPT_UUID; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.ENCOUNTER; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.IDENTIFIER; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.IDENTIFIER_ID; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.IDENTIFIER_SOURCE_NAME; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.MOTECH_ID; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.NAME; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.OBSERVATION; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.OBSERVATION_VALUE; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PACKAGE_ROOT; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PATIENT; import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PATIENT_MOTECH_ID; @@ -64,9 +73,10 @@ public class OpenMRSTaskDataProvider extends AbstractDataProvider { private static final Logger LOGGER = LoggerFactory.getLogger(OpenMRSTaskDataProvider.class); private static final List> SUPPORTED_CLASSES = Arrays.asList(Patient.class, Provider.class, Encounter.class, - Relationship.class, ProgramEnrollment.class, GeneratedIdentifier.class); + Relationship.class, ProgramEnrollment.class, GeneratedIdentifier.class, Observation.class); private OpenMRSEncounterService encounterService; + private OpenMRSObservationService observationService; private OpenMRSPatientService patientService; private OpenMRSProviderService providerService; private OpenMRSTaskDataProviderBuilder dataProviderBuilder; @@ -78,10 +88,11 @@ public class OpenMRSTaskDataProvider extends AbstractDataProvider { @Autowired public OpenMRSTaskDataProvider(OpenMRSTaskDataProviderBuilder taskDataProviderBuilder, OpenMRSEncounterService encounterService, - OpenMRSPatientService patientService, OpenMRSProviderService providerService, + OpenMRSObservationService observationService, OpenMRSPatientService patientService, OpenMRSProviderService providerService, OpenMRSRelationshipService relationshipService, OpenMRSProgramEnrollmentService programEnrollmentService, OpenMRSGeneratedIdentifierService generatedIdentifierService, BundleContext bundleContext) { this.encounterService = encounterService; + this.observationService = observationService; this.patientService = patientService; this.providerService = providerService; this.dataProviderBuilder = taskDataProviderBuilder; @@ -154,6 +165,8 @@ public Object lookup(String type, String lookupName, Map lookupF case PROGRAM_ENROLLMENT: obj = getProgramEnrollments(lookupName, lookupFields, configName, isBahmniProgramEnrollment); break; case IDENTIFIER: obj = getIdentifier(lookupFields, configName); + break; + case OBSERVATION: obj = getObservation(lookupName, lookupFields, configName); } } @@ -176,16 +189,54 @@ private Encounter getEncounter(String lookupName, Map lookupFiel private Patient getPatient(String lookupName, Map lookupFields, String configName) { Patient patient = null; - switch (lookupName) { - case BY_MOTECH_ID: patient = patientService.getPatientByMotechId(configName, lookupFields.get(MOTECH_ID)); + try { + switch (lookupName) { + case BY_MOTECH_ID: patient = patientService.getPatientByMotechId(configName, lookupFields.get(MOTECH_ID)); + break; + case BY_UUID: patient = patientService.getPatientByUuid(configName, lookupFields.get(UUID)); + break; + default: + if (lookupFields != null) { + patient = patientService.getPatientByIdentifier(configName, lookupFields.get(IDENTIFIER_ID), lookupName); + } else { + LOGGER.error("Lookup with name {} doesn't exist for patient object", lookupName); + } + break; + } + } catch (OpenMRSException e) { + LOGGER.error(e.getMessage(), e); + } + + return patient; + } + + private Observation getObservation(String lookupName, Map lookupFields, String configName) { + Observation result = null; + String observationsNumber; + + switch(lookupName) { + case BY_PATIENT_UUID_AND_CONCEPT_UUID: + result = observationService.getLatestObservationByPatientUUIDAndConceptUUID(configName, + lookupFields.get(PATIENT_UUID), lookupFields.get(CONCEPT_UUID)); + observationsNumber = getObservationsNumber(result); + if (result == null) { + result = new Observation(); + } + result.setNumberOfObservations(observationsNumber); break; - case BY_UUID: patient = patientService.getPatientByUuid(configName, lookupFields.get(UUID)); + case BY_PATIENT_UUID_AND_VALUE: + result = observationService.getLatestObservationByValueAndPatientUuid(configName, lookupFields.get(PATIENT_UUID), + lookupFields.get(OBSERVATION_VALUE)); + observationsNumber = getObservationsNumber(result); + if (result == null) { + result = new Observation(); + } + result.setNumberOfObservations(observationsNumber); break; - default: LOGGER.error("Lookup with name {} doesn't exist for patient object", lookupName); + default: LOGGER.error("Lookup with name {} doesn't exist for observation object", lookupName); break; } - - return patient; + return result; } private Provider getProvider(String lookupName, Map lookupFields, String configName) { @@ -278,6 +329,10 @@ private GeneratedIdentifier getIdentifier(Map lookupFields, Stri return generatedIdentifierService.getLatestIdentifier(configName, lookupFields.get(IDENTIFIER_SOURCE_NAME)); } + private String getObservationsNumber(Observation observation) { + return observation == null ? "0" : "1"; + } + private List filterPrograms(List programEnrollments, String programName, String activeProgram) { List programEnrollmentsList = filterByProgramName(programEnrollments, programName); List result; @@ -302,7 +357,7 @@ private boolean isActiveProgram(String activeProgram) { private List filterByProgramName(List programEnrollments, String programName) { List result = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(programEnrollments)) { + if (CollectionUtils.isNotEmpty(programEnrollments)) { for (ProgramEnrollment programEnrollment : programEnrollments) { if (programEnrollment.getProgram().getName().equals(programName)) { result.add(programEnrollment); @@ -316,7 +371,7 @@ private List filterByProgramName(List prog private List filterByActiveProgramOnly(List programEnrollments) { List result = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(programEnrollments)) { + if (CollectionUtils.isNotEmpty(programEnrollments)) { for (ProgramEnrollment programEnrollment : programEnrollments) { if (programEnrollment.getDateCompleted() == null) { result.add(programEnrollment); diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTasksConstants.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTasksConstants.java index e1f635c5f..36d1e513f 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTasksConstants.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/OpenMRSTasksConstants.java @@ -13,6 +13,8 @@ public final class OpenMRSTasksConstants { public static final String BY_PERSON_UUID = "openMRS.person"; public static final String BY_MOTECH_ID_AND_PROGRAM_NAME = "openMRS.lookup.motechIdAndProgramName"; public static final String BY_UUID_AMD_PROGRAM_NAME = "openMRS.lookup.uuidAndProgramName"; + public static final String BY_PATIENT_UUID_AND_CONCEPT_UUID = "openMRS.lookup.patientUuidAndConceptUuid"; + public static final String BY_PATIENT_UUID_AND_VALUE = "openMRS.lookup.patientUuidAndValue"; // Lookup objects public static final String ENCOUNTER = "Encounter"; @@ -22,18 +24,23 @@ public final class OpenMRSTasksConstants { public static final String PROGRAM_ENROLLMENT = "ProgramEnrollment"; public static final String BAHMNI_PROGRAM_ENROLLMENT = "BahmniProgramEnrollment"; public static final String IDENTIFIER = "GeneratedIdentifier"; + public static final String OBSERVATION = "Observation"; // Field names public static final String MOTECH_ID = "openMRS.motechId"; public static final String UUID = "openMRS.uuid"; public static final String PATIENT_MOTECH_ID = "openMRS.patient.motechId"; public static final String PATIENT_UUID = "openMRS.patient.uuid"; + public static final String CONCEPT_UUID = "openMRS.concept.uuid"; + public static final String OBSERVATION_VALUE = "openMRS.observation.value"; public static final String PERSON_UUID = "openMRS.person.uuid"; public static final String RELATIONSHIP_TYPE_UUID = "openMRS.relationshipType.uuid"; public static final String PROGRAM_NAME = "openMRS.programName"; public static final String IDENTIFIER_SOURCE_NAME = "openMRS.identifier.sourceName"; public static final String PROGRAM_ENROLLMENT_UUID = "openMRS.programEnrollment.uuid"; public static final String ACTIVE_PROGRAM = "openMRS.activeProgramOnly"; + public static final String IDENTIFIER_ID = "openMRS.other.identifier.id"; + public static final String IDENTIFIER_NAME = "openMRS.other.identifier.name"; private OpenMRSTasksConstants() { diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/builder/ActionBuilder.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/builder/ActionBuilder.java index 58135c5c5..44d5df30c 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/builder/ActionBuilder.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/builder/ActionBuilder.java @@ -1,6 +1,7 @@ package org.motechproject.openmrs.tasks.builder; import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.Order; import org.motechproject.openmrs.service.OpenMRSConfigService; import org.motechproject.openmrs.tasks.constants.DisplayNames; import org.motechproject.openmrs.tasks.constants.Keys; @@ -18,6 +19,7 @@ import static org.motechproject.tasks.domain.enums.ParameterType.BOOLEAN; import static org.motechproject.tasks.domain.enums.ParameterType.DATE; import static org.motechproject.tasks.domain.enums.ParameterType.MAP; +import static org.motechproject.tasks.domain.enums.ParameterType.TEXTAREA; /** * Responsible for building actions for the Tasks channel. @@ -26,12 +28,14 @@ public class ActionBuilder { private static final String CREATE_ENCOUNTER = "Create Encounter"; private static final String CREATE_PATIENT = "Create Patient"; private static final String UPDATE_PATIENT_IDENTIFIERS = "Update Patient Identifiers"; - private static final String CREATE_VISIT = "Create Visit"; private static final String UPDATE_PERSON = "Update Person"; + private static final String CREATE_OBSERVATION_JSON = "Create Observation JSON"; + private static final String CREATE_VISIT = "Create Visit"; private static final String CREATE_PROGRAM_ENROLLMENT = "Create Program Enrollment"; private static final String UPDATE_PROGRAM_ENROLLMENT = "Update Program Enrollment"; private static final String CHANGE_PROGRAM_ENROLLMENT_STATE = "Change Program Enrollment State"; private static final String GET_COHORT_QUERY_REPORT = "Get CohortQuery Report"; + private static final String CREATE_ORDER = "Create Order"; private static final String OPENMRS_ACTION_PROXY_SERVICE = "org.motechproject.openmrs.tasks.OpenMRSActionProxyService"; private static final String OPENMRS_V1_9 = "1.9"; @@ -53,6 +57,7 @@ public List buildActions() { actions.add(buildCreateEncounterAction(configName)); actions.add(buildCreatePatientAction(configName)); actions.add(buildUpdatePatientAction(configName)); + actions.add(buildCreateObservationJSON(configName)); actions.add(buildCreateVisitAction(configName)); actions.add(buildUpdatePatientIdentifiersAction(configName)); actions.add(buildGetCohortQueryReport(configName)); @@ -69,6 +74,7 @@ private void buildActionsForVersionGreaterThan19(Config config, String configNam actions.add(buildCreateProgramEnrollmentAction(configName)); actions.add(buildUpdateProgramEnrollmentAction(configName)); actions.add(buildChangeStateOfProgramEnrollmentAction(configName)); + actions.add(buildCreateOrderAction(configName)); } } @@ -82,10 +88,11 @@ private ActionEventRequest buildCreateEncounterAction(String configName) { order++)); actionParameters.add(prepareParameter(Keys.ENCOUNTER_DATE, DisplayNames.ENCOUNTER_DATE, DATE, true, order++)); actionParameters.add(prepareParameter(Keys.ENCOUNTER_TYPE, DisplayNames.ENCOUNTER_TYPE, true, order++)); - actionParameters.add(prepareParameter(Keys.LOCATION_NAME, DisplayNames.LOCATION_NAME, false, order++)); + actionParameters.add(prepareParameter(Keys.LOCATION_NAME, DisplayNames.LOCATION_NAME, TEXTAREA, false, order++)); actionParameters.add(prepareParameter(Keys.PATIENT_UUID, DisplayNames.PATIENT_UUID, true, order++)); actionParameters.add(prepareParameter(Keys.PROVIDER_UUID, DisplayNames.PROVIDER_UUID, true, order++)); actionParameters.add(prepareParameter(Keys.VISIT_UUID, DisplayNames.VISIT_UUID, false, order++)); + actionParameters.add(prepareParameter(Keys.FORM, DisplayNames.FORM, false, order++)); actionParameters.add(prepareParameter(Keys.OBSERVATION, DisplayNames.OBSERVATION, MAP, false, order)); postActionParameters.add(prepareParameter(Keys.UUID, DisplayNames.ENCOUNTER_UUID, false, 0)); @@ -147,6 +154,30 @@ private ActionEventRequest buildUpdatePatientAction(String configName) { .createActionEventRequest(); } + private ActionEventRequest buildCreateObservationJSON(String configName) { + SortedSet actionParameters = new TreeSet<>(); + int order = 0; + String serviceMethod = "createObservationJSON"; + String defaultValueForJsonField = "{}"; + + actionParameters.add(prepareParameter(Keys.CONFIG_NAME, DisplayNames.CONFIG_NAME, configName, true, true, order++)); + actionParameters.add(prepareParameter(Keys.OBSERVATION_JSON, DisplayNames.OBSERVATION_JSON, TEXTAREA, + defaultValueForJsonField, true, order++)); + actionParameters.add(prepareParameter(Keys.ENCOUNTER_UUID, DisplayNames.ENCOUNTER_UUID, false, order++)); + actionParameters.add(prepareParameter(Keys.CONCEPT_UUID, DisplayNames.CONCEPT_UUID, false, order++)); + actionParameters.add(prepareParameter(Keys.OBSERVATION_DATETIME, DisplayNames.OBSERVATION_DATETIME, DATE, false, order++)); + actionParameters.add(prepareParameter(Keys.ORDER_UUID, DisplayNames.ORDER_UUID, false, order++)); + actionParameters.add(prepareParameter(Keys.COMMENT, DisplayNames.COMMENT, TEXTAREA, false, order)); + + return new ActionEventRequestBuilder() + .setDisplayName(getDisplayName(CREATE_OBSERVATION_JSON, configName)) + .setServiceInterface(OPENMRS_ACTION_PROXY_SERVICE) + .setServiceMethod(serviceMethod) + .setSubject(getSubject(serviceMethod, configName)) + .setActionParameters(actionParameters) + .createActionEventRequest(); + } + private ActionEventRequest buildCreateVisitAction(String configName) { SortedSet actionParameters = new TreeSet<>(); SortedSet postActionParameters = new TreeSet<>(); @@ -159,7 +190,7 @@ private ActionEventRequest buildCreateVisitAction(String configName) { actionParameters.add(prepareParameter(Keys.VISIT_START_DATETIME, DisplayNames.VISIT_START_DATETIME, DATE, true, order++)); actionParameters.add(prepareParameter(Keys.VISIT_STOP_DATETIME, DisplayNames.VISIT_STOP_DATETIME, DATE, true, order++)); actionParameters.add(prepareParameter(Keys.VISIT_TYPE_UUID, DisplayNames.VISIT_TYPE_UUID, true, order++)); - actionParameters.add(prepareParameter(Keys.LOCATION_NAME, DisplayNames.LOCATION_NAME, false, order)); + actionParameters.add(prepareParameter(Keys.LOCATION_NAME, DisplayNames.LOCATION_NAME, TEXTAREA, false, order)); postActionParameters.add(prepareParameter(Keys.UUID, DisplayNames.VISIT_UUID, false, 0)); @@ -266,6 +297,34 @@ private ActionEventRequest buildGetCohortQueryReport(String configName) { .createActionEventRequest(); } + private ActionEventRequest buildCreateOrderAction(String configName) { + SortedSet parameters = new TreeSet<>(); + SortedSet postActionParameters = new TreeSet<>(); + + int order = 0; + String serviceMethod = "createOrder"; + + parameters.add(prepareParameter(Keys.CONFIG_NAME, DisplayNames.CONFIG_NAME, configName, false, true, order++)); + parameters.add(prepareParameter(Keys.ORDER_TYPE, DisplayNames.ORDER_TYPE, ParameterType.UNICODE, Order.DEFAULT_TYPE, true, order++)); + parameters.add(prepareParameter(Keys.ENCOUNTER_UUID, DisplayNames.ENCOUNTER_UUID, true, order++)); + parameters.add(prepareParameter(Keys.PATIENT_UUID, DisplayNames.PATIENT_UUID, true, order++)); + parameters.add(prepareParameter(Keys.CONCEPT_UUID, DisplayNames.CONCEPT_UUID, true, order++)); + parameters.add(prepareParameter(Keys.ORDERER_UUID, DisplayNames.ORDER_ORDERER_UUID, true, order++)); + parameters.add(prepareParameter(Keys.CARE_SETTING, DisplayNames.ORDER_CARE_SETTING, ParameterType.SELECT, + Order.CareSetting.getValuesAsStringSet(), true, order)); + + postActionParameters.add(prepareParameter(Keys.UUID, DisplayNames.ORDER_UUID, false, 0)); + + return new ActionEventRequestBuilder() + .setDisplayName(getDisplayName(CREATE_ORDER, configName)) + .setServiceInterface(OPENMRS_ACTION_PROXY_SERVICE) + .setServiceMethod(serviceMethod) + .setSubject(getSubject(serviceMethod, configName)) + .setActionParameters(parameters) + .setPostActionParameters(postActionParameters) + .createActionEventRequest(); + } + private SortedSet prepareProgramEnrollmentParameters(int startOrder, boolean addAttributeMap) { SortedSet parameters = new TreeSet<>(); int order = startOrder; @@ -286,22 +345,22 @@ private SortedSet prepareCommonParameters(int startOrder SortedSet parameters = new TreeSet<>(); int order = startOrder; - parameters.add(prepareParameter(Keys.GIVEN_NAME, DisplayNames.GIVEN_NAME, true, order++)); - parameters.add(prepareParameter(Keys.MIDDLE_NAME, DisplayNames.MIDDLE_NAME, false, order++)); - parameters.add(prepareParameter(Keys.FAMILY_NAME, DisplayNames.FAMILY_NAME, true, order++)); - parameters.add(prepareParameter(Keys.ADDRESS_1, DisplayNames.ADDRESS_1, false, order++)); - parameters.add(prepareParameter(Keys.ADDRESS_2, DisplayNames.ADDRESS_2, false, order++)); - parameters.add(prepareParameter(Keys.ADDRESS_3, DisplayNames.ADDRESS_3, false, order++)); - parameters.add(prepareParameter(Keys.ADDRESS_4, DisplayNames.ADDRESS_4, false, order++)); - parameters.add(prepareParameter(Keys.ADDRESS_5, DisplayNames.ADDRESS_5, false, order++)); - parameters.add(prepareParameter(Keys.ADDRESS_6, DisplayNames.ADDRESS_6, false, order++)); - parameters.add(prepareParameter(Keys.CITY_VILLAGE, DisplayNames.CITY_VILLAGE, false, order++)); - parameters.add(prepareParameter(Keys.STATE_PROVINCE, DisplayNames.STATE_PROVINCE, false, order++)); - parameters.add(prepareParameter(Keys.COUNTRY, DisplayNames.COUNTRY, false, order++)); - parameters.add(prepareParameter(Keys.POSTAL_CODE, DisplayNames.POSTAL_CODE, false, order++)); - parameters.add(prepareParameter(Keys.COUNTY_DISTRICT, DisplayNames.COUNTY_DISTRICT, false, order++)); - parameters.add(prepareParameter(Keys.LATITUDE, DisplayNames.LATITUDE, false, order++)); - parameters.add(prepareParameter(Keys.LONGITUDE, DisplayNames.LONGITUDE, false, order++)); + parameters.add(prepareParameter(Keys.GIVEN_NAME, DisplayNames.GIVEN_NAME, TEXTAREA, true, order++)); + parameters.add(prepareParameter(Keys.MIDDLE_NAME, DisplayNames.MIDDLE_NAME, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.FAMILY_NAME, DisplayNames.FAMILY_NAME, TEXTAREA, true, order++)); + parameters.add(prepareParameter(Keys.ADDRESS_1, DisplayNames.ADDRESS_1, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.ADDRESS_2, DisplayNames.ADDRESS_2, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.ADDRESS_3, DisplayNames.ADDRESS_3, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.ADDRESS_4, DisplayNames.ADDRESS_4, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.ADDRESS_5, DisplayNames.ADDRESS_5, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.ADDRESS_6, DisplayNames.ADDRESS_6, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.CITY_VILLAGE, DisplayNames.CITY_VILLAGE, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.STATE_PROVINCE, DisplayNames.STATE_PROVINCE, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.COUNTRY, DisplayNames.COUNTRY, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.POSTAL_CODE, DisplayNames.POSTAL_CODE, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.COUNTY_DISTRICT, DisplayNames.COUNTY_DISTRICT, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.LATITUDE, DisplayNames.LATITUDE, TEXTAREA, false, order++)); + parameters.add(prepareParameter(Keys.LONGITUDE, DisplayNames.LONGITUDE, TEXTAREA, false, order++)); parameters.add(prepareParameter(Keys.START_DATE, DisplayNames.START_DATE, DATE, false, order++)); parameters.add(prepareParameter(Keys.END_DATE, DisplayNames.END_DATE, DATE, false, order++)); parameters.add(prepareParameter(Keys.BIRTH_DATE, DisplayNames.BIRTH_DATE, DATE, false, order++)); @@ -327,6 +386,22 @@ private ActionParameterRequest prepareParameter(String key, String displayName, .createActionParameterRequest(); } + private ActionParameterRequest prepareParameter(String key, String displayName, ParameterType type, + SortedSet options, boolean required, int order) { + return prepareParameterBuilder(key, displayName, required, order) + .setType(type.toString()) + .setOptions(options) + .createActionParameterRequest(); + } + + private ActionParameterRequest prepareParameter(String key, String displayName, ParameterType type, String value, + boolean required, int order) { + return prepareParameterBuilder(key, displayName, required, order) + .setValue(value) + .setType(type.toString()) + .createActionParameterRequest(); + } + private ActionParameterRequest prepareParameter(String key, String displayName, String value, boolean required, boolean hidden, int order) { return prepareParameterBuilder(key, displayName, required, order) diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/DisplayNames.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/DisplayNames.java index 7273582a3..447be3192 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/DisplayNames.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/DisplayNames.java @@ -15,6 +15,7 @@ public final class DisplayNames { public static final String PROVIDER_UUID = "openMRS.provider.uuid"; public static final String OBSERVATION = "openMRS.encounter.observation"; public static final String ENCOUNTER_UUID = "openMRS.encounter.uuid"; + public static final String FORM = "openMRS.encounter.form"; //Patient action public static final String PERSON_UUID = "openMRS.person.uuid"; @@ -46,26 +47,36 @@ public final class DisplayNames { public static final String IDENTIFIERS = "openMRS.patient.identifiers"; public static final String PERSON_ATTRIBUTES = "openMRS.patient.personAttributes"; + //Observation json + public static final String OBSERVATION_JSON = "openMRS.observationJSON"; + public static final String CONCEPT_UUID = "openMRS.concept.uuid"; + public static final String OBSERVATION_DATETIME = "openMRS.obsDatetime"; + public static final String COMMENT = "openMRS.comment"; + //Visit action public static final String VISIT_UUID = "openMRS.visit.uuid"; public static final String VISIT_START_DATETIME = "openMRS.visit.startDatetime"; public static final String VISIT_STOP_DATETIME = "openMRS.visit.stopDatetime"; public static final String VISIT_TYPE_UUID = "openMRS.visit.type.uuid"; - //Program Enrollment action public static final String PROGRAM_UUID = "openMRS.program.uuid"; public static final String PROGRAM_ENROLLMENT_UUID = "openMRS.programEnrollment.uuid"; public static final String DATE_ENROLLED = "openMRS.programEnrollment.dateEnrolled"; + public static final String DATE_COMPLETED = "openMRS.programEnrollment.dateCompleted"; public static final String STATE_UUID = "openMRS.program.state.uuid"; public static final String STATE_START_DATE = "openMRS.program.state.startDate"; public static final String PROGRAM_ENROLLMENT_ATTRIBUTES = "openMRS.programEnrollment.attributes"; - //CohortQuery Report action public static final String COHORT_QUERY_UUID = "openMRS.cohortQuery.uuid"; public static final String COHORT_QUERY_PARAMETERS = "openMRS.cohortQuery.parameters"; public static final String PATIENT_DISPLAY = "openMRS.patient.display"; public static final String COHORT_QUERY_REPORTMEMBER = "openMRS.cohortQuery.reportMember"; + //Order Action + public static final String ORDER_TYPE = "openMRS.orderType"; + public static final String ORDER_UUID = "openMRS.order.uuid"; + public static final String ORDER_ORDERER_UUID = "openMRS.order.orderer.uuid"; + public static final String ORDER_CARE_SETTING = "openMRS.order.careSetting"; /** * Utility class, should not be initiated. diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/Keys.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/Keys.java index 1ad42ff69..2e16e61f0 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/Keys.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/constants/Keys.java @@ -14,6 +14,7 @@ public final class Keys { public static final String PATIENT_UUID = "patientUuid"; public static final String PROVIDER_UUID = "providerUuid"; public static final String OBSERVATION = "observation"; + public static final String FORM = "form"; //Patient action public static final String PERSON_UUID = "person.uuid"; @@ -46,27 +47,39 @@ public final class Keys { public static final String UUID = "uuid"; public static final String PERSON_ATTRIBUTES = "person.personAttributes"; + //Observation action + public static final String OBSERVATION_JSON = "observationJSON"; + public static final String ENCOUNTER_UUID = "encounterUuid"; + public static final String CONCEPT_UUID = "conceptUuid"; + public static final String OBSERVATION_DATETIME = "obsDatetime"; + public static final String COMMENT = "comment"; + //Visit action public static final String VISIT_START_DATETIME = "startDatetime"; public static final String VISIT_STOP_DATETIME = "stopDatetime"; public static final String VISIT_TYPE_UUID = "visitTypeUuid"; public static final String VISIT_UUID = "visitUuid"; - public static final String VISIT_TYPE = "visitType"; //Program Enrollment action public static final String PROGRAM_UUID = "program.uuid"; + public static final String PROGRAM_ENROLLMENT_UUID = "programEnrollmentUuid"; public static final String DATE_ENROLLED = "dateEnrolled"; public static final String DATE_COMPLETED = "dateCompleted"; public static final String STATE_UUID = "stateUuid"; public static final String STATE_START_DATE = "startDate"; - public static final String PROGRAM_ENROLLMENT_ATTRIBUTES = "programEnrollmentAttributes"; //CohortQuery Report action public static final String COHORT_QUERY_UUID = "cohortQueryUuid"; public static final String COHORT_QUERY_PARAMETERS = "cohortQueryParameters"; public static final String PATIENT_DISPLAY = "patientDisplay"; + //Order action + public static final String ORDER_UUID = "orderUuid"; + public static final String ORDER_TYPE = "orderType"; + public static final String ORDERER_UUID = "ordererUuid"; + public static final String CARE_SETTING = "careSetting"; + /** * Utility class, should not be initiated. */ diff --git a/openmrs/src/main/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceImpl.java b/openmrs/src/main/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceImpl.java index 5a206dee5..4f763eb62 100644 --- a/openmrs/src/main/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceImpl.java +++ b/openmrs/src/main/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceImpl.java @@ -1,20 +1,25 @@ package org.motechproject.openmrs.tasks.impl; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.motechproject.event.MotechEvent; import org.motechproject.event.listener.EventRelay; import org.motechproject.openmrs.domain.Attribute; import org.motechproject.openmrs.domain.CohortQueryReport; import org.motechproject.openmrs.domain.Concept; -import org.motechproject.openmrs.domain.ConceptName; import org.motechproject.openmrs.domain.Encounter; import org.motechproject.openmrs.domain.EncounterType; +import org.motechproject.openmrs.domain.Form; import org.motechproject.openmrs.domain.Identifier; import org.motechproject.openmrs.domain.IdentifierType; import org.motechproject.openmrs.domain.Location; import org.motechproject.openmrs.domain.Observation; +import org.motechproject.openmrs.domain.Order; import org.motechproject.openmrs.domain.Patient; import org.motechproject.openmrs.domain.Person; import org.motechproject.openmrs.domain.Program; @@ -26,7 +31,10 @@ import org.motechproject.openmrs.service.OpenMRSCohortService; import org.motechproject.openmrs.service.OpenMRSConceptService; import org.motechproject.openmrs.service.OpenMRSEncounterService; +import org.motechproject.openmrs.service.OpenMRSFormService; import org.motechproject.openmrs.service.OpenMRSLocationService; +import org.motechproject.openmrs.service.OpenMRSObservationService; +import org.motechproject.openmrs.service.OpenMRSOrderService; import org.motechproject.openmrs.service.OpenMRSPatientService; import org.motechproject.openmrs.service.OpenMRSPersonService; import org.motechproject.openmrs.service.OpenMRSProgramEnrollmentService; @@ -57,32 +65,39 @@ public class OpenMRSActionProxyServiceImpl implements OpenMRSActionProxyService private OpenMRSEncounterService encounterService; private OpenMRSLocationService locationService; private OpenMRSPatientService patientService; + private OpenMRSObservationService observationService; private OpenMRSVisitService visitService; private OpenMRSProviderService providerService; private OpenMRSProgramEnrollmentService programEnrollmentService; private OpenMRSPersonService personService; private OpenMRSCohortService cohortService; + private OpenMRSFormService formService; + private OpenMRSOrderService orderService; private EventRelay eventRelay; @Override public Encounter createEncounter(String configName, DateTime encounterDatetime, String encounterType, String locationName, String patientUuid, String providerUuid, String visitUuid, - Map observations) { + String formUuid, Map observations) { Location location = getLocationByName(configName, locationName); Patient patient = patientService.getPatientByUuid(configName, patientUuid); Provider provider = providerService.getProviderByUuid(configName, providerUuid); Visit visit = null; + Form form = null; if (StringUtils.isNotEmpty(visitUuid)) { visit = visitService.getVisitByUuid(configName, visitUuid); } + if (StringUtils.isNotEmpty(formUuid)) { + form = formService.getFormByUuid(configName, formUuid); + } + + EncounterType type = new EncounterType(null, encounterType); //While creating observations, the encounterDateTime is used as a obsDateTime. List observationList = MapUtils.isNotEmpty(observations) ? convertObservationMapToList(observations, encounterDatetime) : null; - EncounterType type = new EncounterType(encounterType); - - Encounter encounter = new Encounter(location, type, encounterDatetime.toDate(), patient, visit, Collections.singletonList(provider.getPerson()), observationList); + Encounter encounter = new Encounter(location, type, encounterDatetime.toDate(), patient, visit, Collections.singletonList(provider.getPerson()), observationList, form); return encounterService.createEncounter(configName, encounter); } @@ -130,7 +145,14 @@ public void updatePerson(String configName, String personUuid, String givenName, String gender, Boolean dead, String causeOfDeathUUID, Map personAttributes) { Concept causeOfDeath = StringUtils.isNotEmpty(causeOfDeathUUID) ? conceptService.getConceptByUuid(configName, causeOfDeathUUID) : null; - Person person = preparePerson(givenName, middleName, familyName, address1, address2, + String parsedMiddleName; + if ("\"\"".equals(middleName)) { + parsedMiddleName = ""; + } else { + parsedMiddleName = middleName; + } + + Person person = preparePerson(givenName, parsedMiddleName, familyName, address1, address2, address3, address4, address5, address6, cityVillage, stateProvince, country, postalCode, countyDistrict, latitude, longitude, startDate, endDate, birthDate, birthDateEstimated, @@ -140,6 +162,32 @@ public void updatePerson(String configName, String personUuid, String givenName, personService.updatePerson(configName, person); } + @Override + public Observation createObservationJSON(String configName, String observationJSON, String encounterUuid, String conceptUuid, + DateTime obsDatetime, String orderUuid, String comment) { + JsonParser parser = new JsonParser(); + JsonObject obj = parser.parse(observationJSON).getAsJsonObject(); + + if (StringUtils.isNotEmpty(encounterUuid)) { + obj.addProperty("encounter", encounterUuid); + } + if (StringUtils.isNotEmpty(conceptUuid)) { + obj.addProperty("concept", conceptUuid); + } + if (obsDatetime != null) { + DateTimeFormatter fullDateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + obj.addProperty("obsDatetime", obsDatetime.toString(fullDateTimeFormatter)); + } + if (StringUtils.isNotEmpty(orderUuid)) { + obj.addProperty("order", orderUuid); + } + if (StringUtils.isNotEmpty(comment)) { + obj.addProperty("comment", comment); + } + + return observationService.createObservationFromJson(configName, obj.toString()); + } + @Override public Visit createVisit(String configName, String patientUuid, DateTime startDatetime, DateTime stopDatetime, String visitTypeUuid, String locationName) { @@ -241,6 +289,25 @@ public void getCohortQueryReport(String configName, String cohortQueryUuid, Map< } } + @Override + public Order createOrder(String configName, String type, String encounterUuid, String patientUuid, String conceptUuid, String ordererUuid, String careSetting) { + Encounter encounter = new Encounter(); + encounter.setUuid(encounterUuid); + + Patient patient = new Patient(); + patient.setUuid(patientUuid); + + Concept concept = new Concept(); + concept.setUuid(conceptUuid); + + Provider orderer = new Provider(); + orderer.setUuid(ordererUuid); + + Order order = new Order(type, encounter, orderer, patient, concept, Order.CareSetting.valueOf(careSetting)); + + return orderService.createOrder(configName, order); + } + private Location getDefaultLocation(String configName) { return getLocationByName(configName, DEFAULT_LOCATION_NAME); } @@ -280,29 +347,42 @@ private List convertIdentifierMapToList(Map identifi private List convertObservationMapToList(Map observations, DateTime obsDatetime) { List observationList = new ArrayList<>(); - - for (String observationConceptName : observations.keySet()) { - if (valueIsNotEmpty(observations, observationConceptName)) { - String[] observationValues = observations.get(observationConceptName).replace(", ", ",").split(","); - for (String value : observationValues) { - Observation observation = new Observation(); - - ConceptName conceptName = new ConceptName(observationConceptName); - Concept concept = new Concept(conceptName); - observation.setConcept(concept); - - Observation.ObservationValue observationValue = new Observation.ObservationValue(value); - observation.setValue(observationValue); - - observation.setObsDatetime(obsDatetime.toDate()); - - observationList.add(observation); + List observationChildren = new ArrayList<>(); + List observationParents = new ArrayList<>(); + + for (String observationConceptPath : observations.keySet()) { + if (valueIsNotEmpty(observations, observationConceptPath)) { + if (isObservationGroups(observationConceptPath)) { + String[] concepts = observationConceptPath.split("/"); + + Observation childrenObservation = null; + for (int i = concepts.length - 1; i >= 0; i--) { + String concept = concepts[i]; + + if (i == 0) { + createOrUpdateObservation(observationParents, concept, obsDatetime, childrenObservation); + } else if (i == concepts.length - 1) { + String value = observations.get(observationConceptPath); + childrenObservation = createObservation(concept, obsDatetime, value, null); + } else { + childrenObservation = createOrUpdateObservation(observationChildren, concept, obsDatetime, childrenObservation); + } + } + } else { + String[] observationValues = observations.get(observationConceptPath).replace(", ", ",").split(","); + for (String value : observationValues) { + if (StringUtils.isNotEmpty(value)) { + observationList.add(createObservation(observationConceptPath, obsDatetime, value, null)); + } + } } } else { - LOGGER.warn("Observation value is null or empty for concept: " + observationConceptName + LOGGER.warn("Observation value is null or empty for concept path: " + observationConceptPath + " and will not be created"); } } + + observationList.addAll(observationParents); return observationList; } @@ -310,6 +390,68 @@ private boolean valueIsNotEmpty(Map map, String key) { return StringUtils.isNotEmpty(map.get(key)); } + private Observation createOrUpdateObservation(List observationList, String concept, DateTime obsDatetime, Observation childrenObservation) { + Observation observation = getObservation(observationList, concept, null); + if (observation == null) { + observation = createObservation(concept, obsDatetime, null, childrenObservation); + observationList.add(observation); + } else if (getObservation(observation.getGroupMembers(), childrenObservation) == null){ + observation.getGroupMembers().add(childrenObservation); + } + + return observation; + } + + private Observation createObservation(String observationConceptUuid, DateTime obsDatetime, String value, Observation childrenObs) { + Observation observation = new Observation(); + + Concept concept = new Concept(); + concept.setUuid(observationConceptUuid); + observation.setConcept(concept); + + observation.setObsDatetime(obsDatetime.toDate()); + + if (StringUtils.isNotEmpty(value)) { + Observation.ObservationValue observationValue = new Observation.ObservationValue(value); + observation.setValue(observationValue); + } + + if (childrenObs != null) { + List groupsMembers = new ArrayList<>(); + groupsMembers.add(childrenObs); + observation.setGroupMembers(groupsMembers); + } + + return observation; + } + + private boolean isObservationGroups(String observationConceptPath) { + return observationConceptPath.contains("/"); + } + + private Observation getObservation(List observationList, Observation obsToFind) { + String value = obsToFind.getValue() != null ? obsToFind.getValue().getDisplay() : null; + return getObservation(observationList, obsToFind.getConcept().getUuid(), value); + } + + private Observation getObservation(List observationList, String conceptUuid, String value) { + Observation observation = null; + + for (Observation obs : observationList) { + if (StringUtils.equals(conceptUuid, obs.getConcept().getUuid())) { + if (obs.getValue() == null && value == null) { + observation = obs; + break; + } else if (obs.getValue() != null && StringUtils.equals(obs.getValue().getDisplay(), value)) { + observation = obs; + break; + } + } + } + + return observation; + } + private List convertAttributeMapToList(Map attributes, boolean isProgramEnrollmentUpdate) { List attributesList = new ArrayList<>(); @@ -412,4 +554,19 @@ public void setEventRelay(EventRelay eventRelay) { public void setVisitService(OpenMRSVisitService visitService) { this.visitService = visitService; } + + @Autowired + public void setObservationService(OpenMRSObservationService observationService) { + this.observationService = observationService; + } + + @Autowired + public void setFormService(OpenMRSFormService formService) { + this.formService = formService; + } + + @Autowired + public void setOrderService(OpenMRSOrderService orderService) { + this.orderService = orderService; + } } diff --git a/openmrs/src/main/resources/META-INF/spring/blueprint.xml b/openmrs/src/main/resources/META-INF/spring/blueprint.xml index 2f5f8c689..25482cf05 100644 --- a/openmrs/src/main/resources/META-INF/spring/blueprint.xml +++ b/openmrs/src/main/resources/META-INF/spring/blueprint.xml @@ -38,6 +38,8 @@ + + diff --git a/openmrs/src/main/resources/velocity.templates/task-data-provider.vm b/openmrs/src/main/resources/velocity.templates/task-data-provider.vm index 818a5f5c1..b5aac7294 100644 --- a/openmrs/src/main/resources/velocity.templates/task-data-provider.vm +++ b/openmrs/src/main/resources/velocity.templates/task-data-provider.vm @@ -73,6 +73,14 @@ "openMRS.uuid" ] } + #foreach($identifier in $config.getPatientIdentifierTypeNames()), + { + "displayName": "$identifier", + "fields": [ + "openMRS.other.identifier.id" + ] + } + #end ], "fields": [ { @@ -102,7 +110,7 @@ "fieldKey": "person.display" }, { - "displayName": "openMRS.person.address", + "displayName": "openMRS.person.fullAddress", "fieldKey": "person.preferredAddress.fullAddressString" }, { @@ -111,12 +119,12 @@ "type": "INTEGER" }, { - "displayName": "openMRS.person.birthdateEstimated", + "displayName": "openMRS.person.birthDateEstimated", "fieldKey": "person.birthdateEstimated", "type": "BOOLEAN" }, { - "displayName": "openMRS.person.birthdate", + "displayName": "openMRS.person.birthDate", "fieldKey": "person.birthdate", "type": "DATE" }, @@ -252,6 +260,92 @@ } ] }, + { + "displayName": "Observation [$config.getName()]", + "type": "Observation-$config.getName()", + "lookupFields": [ + { + "displayName": "openMRS.lookup.patientUuidAndConceptUuid", + "fields": [ + "openMRS.patient.uuid", + "openMRS.concept.uuid" + ] + }, + { + "displayName": "openMRS.lookup.patientUuidAndValue", + "fields": [ + "openMRS.patient.uuid", + "openMRS.observation.value" + ] + } + ], + "fields": [ + { + "displayName": "openMRS.observation.uuid", + "fieldKey": "uuid" + }, + { + "displayName": "openMRS.observation.display", + "fieldKey": "display" + }, + { + "displayName": "openMRS.concept.uuid", + "fieldKey": "concept.uuid" + }, + { + "displayName": "openMRS.person.uuid", + "fieldKey": "person.uuid" + }, + { + "displayName": "openMRS.obsDatetime", + "fieldKey": "obsDatetime" + }, + { + "displayName": "openMRS.observation.obsGroup", + "fieldKey": "obsGroup" + }, + { + "displayName": "openMRS.observation.valueCodedName", + "fieldKey": "valueCodedName" + }, + { + "displayName": "openMRS.observation.groupMembers", + "fieldKey": "groupMembers" + }, + { + "displayName": "openMRS.location.uuid", + "fieldKey": "location.uuid" + }, + { + "displayName": "openMRS.location.display", + "fieldKey": "location.display" + }, + { + "displayName": "openMRS.order.uuid", + "fieldKey": "order.uuid" + }, + { + "displayName": "openMRS.encounter.uuid", + "fieldKey": "encounter.uuid" + }, + { + "displayName": "openMRS.observation.voided", + "fieldKey": "voided" + }, + { + "displayName": "openMRS.observation.value", + "fieldKey": "value.display" + }, + { + "displayName": "openMRS.observation.valueModifier", + "fieldKey": "valueModifier" + }, + { + "displayName": "openMRS.observation.numberOfObservations", + "fieldKey": "numberOfObservations" + } + ] + }, { "displayName": "Relationship [$config.getName()]", "type": "Relationship-$config.getName()", diff --git a/openmrs/src/main/resources/webapp/messages/messages.properties b/openmrs/src/main/resources/webapp/messages/messages.properties index 52dfb5992..256248849 100644 --- a/openmrs/src/main/resources/webapp/messages/messages.properties +++ b/openmrs/src/main/resources/webapp/messages/messages.properties @@ -7,6 +7,9 @@ openMRS.lookup.uuid=UUID openMRS.lookup.motechIdAndProgramName=MOTECH ID and Program name openMRS.lookup.uuidAndProgramName=UUID and Program name openMRS.lookup.sourceName=Generator source name +openMRS.lookup.patientUuidAndConceptUuid=Patient UUID and Concept UUID +openMRS.lookup.patientUuidAndValue=Patient UUID and Value +openMRS.lookup.patientOtherIdentifiers=Patient Other Identifiers #Actions openMRS.createEncounter=Create Encounter @@ -30,10 +33,13 @@ openMRS.patient=Patient openMRS.provider=Provider openMRS.relationship=Relationship openMRS.person=Person +openMRS.observation=Observation #Common field names openMRS.motechId=MotechId openMRS.uuid=UUID +openMRS.other.identifier.id=Other Identifier Id +openMRS.other.identifier.name=Other Identifier Name openMRS.programName=Program name openMRS.activeProgramOnly=Active program only @@ -44,6 +50,7 @@ openMRS.encounter.display=Encounter display openMRS.encounter.uuid=Encounter UUID openMRS.encounter.type=Encounter type openMRS.encounter.observation=Observation +openMRS.encounter.form=Form UUID #Location openMRS.location.display=Location display @@ -57,6 +64,9 @@ openMRS.patient.motechId=Patient MOTECH ID openMRS.patient.identifiers=Patient identifiers openMRS.patient.personAttributes=Person attributes +#Concept +openMRS.concept.uuid=Concept UUID + #Person openMRS.person.age=Person age openMRS.person.birthDateEstimated=Person birthDateEstimated flag @@ -92,6 +102,20 @@ openMRS.address.startDate=Start Date openMRS.address.endDate=End Date openMRS.address.fullAddress=Full Address +#Observation +openMRS.observation.uuid=Observation UUID +openMRS.observation.display=Observation display +openMRS.observationJSON=Observation JSON +openMRS.observation.voided=Observation voided +openMRS.observation.obsGroup=Observation group +openMRS.observation.groupMembers=Observation group members +openMRS.observation.valueCodedName=Observation value coded name +openMRS.observation.value=Observation value +openMRS.observation.valueModifier=Observation value modifier +openMRS.observation.numberOfObservations=No. observation(s) returned +openMRS.obsDatetime=Observation Datetime +openMRS.comment=Comment + #Visit openMRS.visit.uuid=Visit UUID openMRS.visit.startDatetime=Start datetime @@ -132,6 +156,17 @@ openMRS.programEnrollment.numberOfPrograms=No. program(s) returned openMRS.identifier.sourceName=Source Name openMRS.identifier.generated=Generated Identifier +#Cohort Query +openMRS.cohortQuery.uuid=CohortQuery UUID +openMRS.cohortQuery.reportMember=CohortQuery Report Member +openMRS.cohortQuery.parameters=Query Parameters + +#Order +openMRS.orderType=Type +openMRS.order.uuid=Order UUID +openMRS.order.orderer.uuid=Orderer UUID +openMRS.order.careSetting= Care Setting + #Configuration openMRS.config.settings=Settings openMRS.config=Account Settings @@ -155,9 +190,4 @@ openMRS.config.error.usernameRequired=Username is required. openMRS.config.error.passwordRequired=Password is required. openMRS.config.error.motechIDRequired=Motech ID is required. openMRS.config.error.patientIdentifierTypeExists=Patient Identifier type already in use. -openMRS.config.info.motechID=The name of the OpenMRS identifier used by MOTECH. This must match the identifier that you will create in OpenMRS. The default is MOTECH Id. - -#Cohort Query -openMRS.cohortQuery.uuid=CohortQuery UUID -openMRS.cohortQuery.reportMember=CohortQuery Report Member -openMRS.cohortQuery.parameters=Query Parameters \ No newline at end of file +openMRS.config.info.motechID=The name of the OpenMRS identifier used by MOTECH. This must match the identifier that you will create in OpenMRS. The default is MOTECH Id. \ No newline at end of file diff --git a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSConceptServiceIT.java b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSConceptServiceIT.java index 747eba7f1..80eb4f35f 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSConceptServiceIT.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSConceptServiceIT.java @@ -1,5 +1,6 @@ package org.motechproject.openmrs.it; +import com.sun.org.apache.xpath.internal.operations.Bool; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -10,6 +11,7 @@ import org.motechproject.openmrs.domain.Concept; import org.motechproject.openmrs.domain.ConceptName; import org.motechproject.openmrs.exception.ConceptNameAlreadyInUseException; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.service.EventKeys; import org.motechproject.openmrs.service.OpenMRSConceptService; import org.motechproject.testing.osgi.BasePaxIT; @@ -27,7 +29,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.motechproject.openmrs.util.TestConstants.DEFAULT_CONFIG_NAME; @@ -96,10 +97,17 @@ public void shouldUpdateConcept() throws InterruptedException, ConceptNameAlread @Test public void shouldDeleteConcept() throws InterruptedException, ConceptNameAlreadyInUseException { + Boolean isOpenMRSExceptionThrown = Boolean.FALSE; synchronized (lock) { conceptAdapter.deleteConcept(DEFAULT_CONFIG_NAME, conceptOne.getUuid()); - assertNull(conceptAdapter.getConceptByUuid(DEFAULT_CONFIG_NAME, conceptOne.getUuid())); + try { + conceptAdapter.getConceptByUuid(DEFAULT_CONFIG_NAME, conceptOne.getUuid()); + } catch (OpenMRSException e) { + isOpenMRSExceptionThrown = Boolean.TRUE; + } + + assertTrue(isOpenMRSExceptionThrown); lock.wait(60000); } @@ -187,10 +195,17 @@ private Concept createConcept(Concept concept) throws ConceptNameAlreadyInUseExc } private void deleteConcept(Concept concept) throws InterruptedException { + Boolean isOpenMRSExceptionThrown = Boolean.FALSE; conceptAdapter.deleteConcept(DEFAULT_CONFIG_NAME, concept.getUuid()); - assertNull(conceptAdapter.getConceptByUuid(DEFAULT_CONFIG_NAME, concept.getUuid())); + try { + conceptAdapter.getConceptByUuid(DEFAULT_CONFIG_NAME, concept.getUuid()); + } catch (OpenMRSException e) { + isOpenMRSExceptionThrown = Boolean.TRUE; + } + + assertTrue(isOpenMRSExceptionThrown); } public class MrsListener implements EventListener { diff --git a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSEncounterServiceIT.java b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSEncounterServiceIT.java index ac8a89535..5ea312cd4 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSEncounterServiceIT.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSEncounterServiceIT.java @@ -22,6 +22,7 @@ import org.motechproject.openmrs.domain.VisitType; import org.motechproject.openmrs.exception.ConceptNameAlreadyInUseException; import org.motechproject.openmrs.exception.HttpException; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.exception.PatientNotFoundException; import org.motechproject.openmrs.service.EventKeys; import org.motechproject.openmrs.service.OpenMRSConceptService; @@ -46,7 +47,6 @@ import java.util.Collections; import java.util.Map; -import static junit.framework.Assert.assertNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -141,7 +141,7 @@ public void shouldCreateEncounter() throws HttpException, ParseException, Interr @Test public void shouldGetLatestEncounter() { - Encounter encounter = encounterAdapter.getLatestEncounterByPatientMotechId(DEFAULT_CONFIG_NAME, patient.getMotechId(), encounterType.getName()); + Encounter encounter = encounterAdapter.getLatestEncounterByPatientMotechId(DEFAULT_CONFIG_NAME, patient.getMotechId(), encounterType.getUuid()); assertNotNull(encounter); assertEquals(new LocalDate("2012-09-05"), new LocalDate(encounter.getEncounterDatetime())); @@ -149,10 +149,18 @@ public void shouldGetLatestEncounter() { @Test public void shouldDeleteEncounter() throws InterruptedException { + Boolean isopenMRSExceptionThrown = Boolean.FALSE; synchronized (lock) { encounterAdapter.deleteEncounter(DEFAULT_CONFIG_NAME, encounter.getUuid()); - assertNull(encounterAdapter.getEncounterByUuid(DEFAULT_CONFIG_NAME, encounter.getUuid())); + + try { + encounterAdapter.getEncounterByUuid(DEFAULT_CONFIG_NAME, encounter.getUuid()); + } catch (OpenMRSException e) { + isopenMRSExceptionThrown = Boolean.TRUE; + } + + assertTrue(isopenMRSExceptionThrown); lock.wait(60000); } @@ -335,7 +343,7 @@ private void prepareVisit() { } private void prepareEncounterType() { - EncounterType tempEncounterType = new EncounterType("FooType"); + EncounterType tempEncounterType = new EncounterType("FooType", null); tempEncounterType.setDescription("FooDescription"); String encounterUuid = encounterAdapter.createEncounterType(DEFAULT_CONFIG_NAME, tempEncounterType).getUuid(); diff --git a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSPatientServiceIT.java b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSPatientServiceIT.java index 7776f92e0..308455a88 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSPatientServiceIT.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSPatientServiceIT.java @@ -16,6 +16,7 @@ import org.motechproject.openmrs.domain.Person; import org.motechproject.openmrs.exception.ConceptNameAlreadyInUseException; import org.motechproject.openmrs.exception.HttpException; +import org.motechproject.openmrs.exception.OpenMRSException; import org.motechproject.openmrs.exception.PatientNotFoundException; import org.motechproject.openmrs.service.EventKeys; import org.motechproject.openmrs.service.OpenMRSConceptService; @@ -184,10 +185,18 @@ public void shouldDeceasePerson() throws HttpException, PatientNotFoundException @Test public void shouldDeletePatient() throws PatientNotFoundException, InterruptedException { + Boolean isOpenMRSExceptionThrown = Boolean.FALSE; synchronized (lock) { patientAdapter.deletePatient(DEFAULT_CONFIG_NAME, patient.getUuid()); - assertNull(patientAdapter.getPatientByUuid(DEFAULT_CONFIG_NAME, patient.getUuid())); + + try { + patientAdapter.getPatientByUuid(DEFAULT_CONFIG_NAME, patient.getUuid()); + } catch (OpenMRSException e) { + isOpenMRSExceptionThrown = Boolean.TRUE; + } + + assertTrue(isOpenMRSExceptionThrown); lock.wait(60000); } @@ -255,9 +264,17 @@ private Patient savePatient(Patient patient) throws InterruptedException { private void deletePatient(Patient patient) throws PatientNotFoundException, InterruptedException { String locationId = patient.getLocationForMotechId().getUuid(); + Boolean isOpenMRSExceptionThrown = Boolean.FALSE; patientAdapter.deletePatient(DEFAULT_CONFIG_NAME, patient.getUuid()); - assertNull(patientAdapter.getPatientByUuid(DEFAULT_CONFIG_NAME, patient.getUuid())); + + try { + patientAdapter.getPatientByUuid(DEFAULT_CONFIG_NAME, patient.getUuid()); + } catch (OpenMRSException e) { + isOpenMRSExceptionThrown = Boolean.TRUE; + } + + assertTrue(isOpenMRSExceptionThrown); locationAdapter.deleteLocation(DEFAULT_CONFIG_NAME, locationId); } diff --git a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSTasksIntegrationBundleIT.java b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSTasksIntegrationBundleIT.java index a81d1a55a..80cef81f8 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/it/MRSTasksIntegrationBundleIT.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/it/MRSTasksIntegrationBundleIT.java @@ -30,12 +30,12 @@ import org.motechproject.openmrs.service.OpenMRSProviderService; import org.motechproject.openmrs.service.OpenMRSVisitService; import org.motechproject.openmrs.tasks.constants.Keys; +import org.motechproject.tasks.domain.enums.TaskActivityType; import org.motechproject.tasks.domain.mds.task.DataSource; import org.motechproject.tasks.domain.mds.task.Lookup; import org.motechproject.tasks.domain.mds.task.Task; import org.motechproject.tasks.domain.mds.task.TaskActionInformation; import org.motechproject.tasks.domain.mds.task.TaskActivity; -import org.motechproject.tasks.domain.enums.TaskActivityType; import org.motechproject.tasks.domain.mds.task.TaskConfig; import org.motechproject.tasks.domain.mds.task.TaskConfigStep; import org.motechproject.tasks.domain.mds.task.TaskTriggerInformation; @@ -159,7 +159,7 @@ public void setUp() throws IOException, InterruptedException, ParseException, Co @After public void tearDown() throws PatientNotFoundException { - List encounters = encounterService.getEncountersByEncounterType(DEFAULT_CONFIG_NAME, MOTECH_ID, createdEncounterType.getName()); + List encounters = encounterService.getEncountersByEncounterType(DEFAULT_CONFIG_NAME, MOTECH_ID, createdEncounterType.getUuid()); for (Encounter encounter : encounters) { encounterService.deleteEncounter(DEFAULT_CONFIG_NAME, encounter.getUuid()); @@ -234,6 +234,26 @@ public void testOpenMRSProviderDataSourceAndCreateEncounterAction() throws Inter checkIfProviderWasCreatedProperly(); } + @Test + public void testCreateEncounterPostActionParameter() throws InterruptedException { + Task task = prepareCreateEncounterPostActionParameterTask(); + + getTriggerHandler().registerHandlerFor(task.getTrigger().getEffectiveListenerSubject()); + + activateTrigger(); + + // Give Tasks some time to process + assertTrue(waitForTaskExecution(task.getId())); + + Encounter encounter = encounterService.getLatestEncounterByPatientMotechId(DEFAULT_CONFIG_NAME, MOTECH_ID, createdEncounterType.getUuid()); + String firstEncounterUuid = encounter.getUuid(); + + Patient patient = patientService.getPatientByMotechId(DEFAULT_CONFIG_NAME, "Jacob Lee"); + Person.Address address = patient.getPerson().getPreferredAddress(); + + assertEquals(firstEncounterUuid, address.getAddress1()); + } + @Test public void testCreatePatientPostActionParameter() throws InterruptedException { Task task = prepareCreatePatientPostActionParameterTask(); @@ -368,7 +388,21 @@ private void createEncounterTestData() throws ParseException, ConceptNameAlready createdEncounter = encounterService.createEncounter(DEFAULT_CONFIG_NAME, encounter); } - private Task prepareCreatePatientPostActionParameterTask() { + private Task prepareCreateEncounterPostActionParameterTask() { + TaskTriggerInformation triggerInformation = new TaskTriggerInformation("CREATE SettingsRecord", "data-services", MDS_CHANNEL_NAME, + VERSION, TRIGGER_SUBJECT, TRIGGER_SUBJECT); + + ArrayList taskActions = new ArrayList(); + taskActions.add(prepareCreateEncounterActionInformation()); + taskActions.add(prepareCreatePatientActionInformation("{{pa.0.uuid}}", "Jacob Lee", false)); + + Task task = new Task("OpenMRSEncounterPostActionParameterTestTask", triggerInformation, taskActions, new TaskConfig(), true, true); + getTaskService().save(task); + + return task; + } + + private Task prepareCreatePatientPostActionParameterTask(){ TaskTriggerInformation triggerInformation = new TaskTriggerInformation("CREATE SettingsRecord", "data-services", MDS_CHANNEL_NAME, VERSION, TRIGGER_SUBJECT, TRIGGER_SUBJECT); @@ -378,8 +412,8 @@ private Task prepareCreatePatientPostActionParameterTask() { taskConfig.addAll(taskConfigStepSortedSet); ArrayList taskActions = new ArrayList(); - taskActions.add(prepareCreatePatientActionInformation("Wallstreet 15/2", "John Smith")); - taskActions.add(prepareCreatePatientActionInformation("{{pa.0.uuid}}", "Jacob Lee")); + taskActions.add(prepareCreatePatientActionInformation("Wallstreet 15/2", "John Smith", true)); + taskActions.add(prepareCreatePatientActionInformation("{{pa.0.uuid}}", "Jacob Lee", true)); Task task = new Task("OpenMRSPatientPostActionParameterTestTask", triggerInformation, taskActions, taskConfig, true, true); getTaskService().save(task); @@ -387,16 +421,29 @@ private Task prepareCreatePatientPostActionParameterTask() { return task; } - private TaskActionInformation prepareCreatePatientActionInformation(String adress1, String motechId) { + private TaskActionInformation prepareCreatePatientActionInformation(String address1, String motechId, boolean withPatientDataSourceBubbles) { TaskActionInformation actionInformation = new TaskActionInformation("Create Patient [" + DEFAULT_CONFIG_NAME + "]", OPENMRS_CHANNEL_NAME, OPENMRS_CHANNEL_NAME, VERSION, TEST_INTERFACE, "createPatient"); actionInformation.setSubject(String.format("createPatient.%s", DEFAULT_CONFIG_NAME)); Map values = new HashMap<>(); - values.put(Keys.ADDRESS_1, adress1); - values.put(Keys.FAMILY_NAME, "{{ad.openMRS.Patient-" + DEFAULT_CONFIG_NAME + "#0.person.display}}"); - values.put(Keys.GENDER, "{{ad.openMRS.Patient-" + DEFAULT_CONFIG_NAME + "#0.person.gender}}"); - values.put(Keys.GIVEN_NAME, "{{ad.openMRS.Patient-" + DEFAULT_CONFIG_NAME + "#0.person.display}}"); + + String familyName; + String gender; + String givenName; + if (withPatientDataSourceBubbles) { + familyName = "{{ad.openMRS.Patient-" + DEFAULT_CONFIG_NAME + "#0.person.display}}"; + gender = "{{ad.openMRS.Patient-" + DEFAULT_CONFIG_NAME + "#0.person.gender}}"; + givenName = "{{ad.openMRS.Patient-" + DEFAULT_CONFIG_NAME + "#0.person.display}}"; + } else { + familyName = "Bond"; + gender = "M"; + givenName = "James"; + } + values.put(Keys.ADDRESS_1, address1); + values.put(Keys.FAMILY_NAME, familyName); + values.put(Keys.GENDER, gender); + values.put(Keys.GIVEN_NAME, givenName); values.put(Keys.MOTECH_ID, motechId); values.put(Keys.CONFIG_NAME, DEFAULT_CONFIG_NAME); actionInformation.setValues(values); @@ -404,6 +451,23 @@ private TaskActionInformation prepareCreatePatientActionInformation(String adres return actionInformation; } + private TaskActionInformation prepareCreateEncounterActionInformation(){ + TaskActionInformation actionInformation = new TaskActionInformation("Create Encounter [" + DEFAULT_CONFIG_NAME + "]", OPENMRS_CHANNEL_NAME, + OPENMRS_CHANNEL_NAME, VERSION, TEST_INTERFACE, "createEncounter"); + actionInformation.setSubject(String.format("createEncounter.%s", DEFAULT_CONFIG_NAME)); + + Map values = new HashMap<>(); + values.put(Keys.PROVIDER_UUID, createdProvider.getUuid()); + values.put(Keys.PATIENT_UUID, createdPatient.getUuid()); + values.put(Keys.ENCOUNTER_TYPE, createdEncounterType.getUuid()); + values.put(Keys.ENCOUNTER_DATE, new DateTime("2015-01-16T00:00:00Z").toString()); + values.put(Keys.LOCATION_NAME, DEFAULT_LOCATION_NAME); + values.put(Keys.CONFIG_NAME, DEFAULT_CONFIG_NAME); + actionInformation.setValues(values); + + return actionInformation; + } + private Patient preparePatient() { Person person = new Person(); @@ -479,7 +543,7 @@ private Provider prepareProvider() { } private EncounterType prepareEncounterType() { - EncounterType tempEncounterType = new EncounterType("TestEncounterType"); + EncounterType tempEncounterType = new EncounterType("TestEncounterType", null); tempEncounterType.setDescription("TestDescription"); String encounterUuid = encounterService.createEncounterType(DEFAULT_CONFIG_NAME, tempEncounterType).getUuid(); @@ -551,7 +615,7 @@ private void checkIfPatientWasCreatedProperly() { } private void checkIfEncounterWasCreatedProperly() { - List encounterList = encounterService.getEncountersByEncounterType(DEFAULT_CONFIG_NAME, MOTECH_ID, createdEncounterType.getName()); + List encounterList = encounterService.getEncountersByEncounterType(DEFAULT_CONFIG_NAME, MOTECH_ID, createdEncounterType.getUuid()); assertEquals(2, encounterList.size()); diff --git a/openmrs/src/test/java/org/motechproject/openmrs/it/version1_12/MRSTaskIntegrationBundle1_12IT.java b/openmrs/src/test/java/org/motechproject/openmrs/it/version1_12/MRSTaskIntegrationBundle1_12IT.java index 20ae8f9de..676ef6f64 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/it/version1_12/MRSTaskIntegrationBundle1_12IT.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/it/version1_12/MRSTaskIntegrationBundle1_12IT.java @@ -21,12 +21,12 @@ import org.motechproject.openmrs.service.OpenMRSPatientService; import org.motechproject.openmrs.service.OpenMRSProgramEnrollmentService; import org.motechproject.openmrs.tasks.constants.Keys; +import org.motechproject.tasks.domain.enums.TaskActivityType; import org.motechproject.tasks.domain.mds.task.DataSource; import org.motechproject.tasks.domain.mds.task.Lookup; import org.motechproject.tasks.domain.mds.task.Task; import org.motechproject.tasks.domain.mds.task.TaskActionInformation; import org.motechproject.tasks.domain.mds.task.TaskActivity; -import org.motechproject.tasks.domain.enums.TaskActivityType; import org.motechproject.tasks.domain.mds.task.TaskConfig; import org.motechproject.tasks.domain.mds.task.TaskConfigStep; import org.motechproject.tasks.domain.mds.task.TaskTriggerInformation; diff --git a/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/FormResourceImplTest.java b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/FormResourceImplTest.java new file mode 100644 index 000000000..84c44b6f9 --- /dev/null +++ b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/FormResourceImplTest.java @@ -0,0 +1,73 @@ +package org.motechproject.openmrs.resource.impl; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpState; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.config.ConfigDummyData; +import org.motechproject.openmrs.domain.Form; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.web.client.RestOperations; + +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class FormResourceImplTest extends AbstractResourceImplTest { + + private static final String FORM_RESPONSE_JSON = "json/form/form-response.json"; + + @Mock + private RestOperations restOperations; + + @Mock + private HttpClient httpClient; + + @Captor + private ArgumentCaptor> requestCaptor; + + private FormResourceImpl formResource; + + private Config config; + + @Before + public void setUp() { + initMocks(this); + when(httpClient.getState()).thenReturn(new HttpState()); + + formResource = new FormResourceImpl(restOperations, httpClient); + config = ConfigDummyData.prepareConfig("one"); + } + + @Test + public void shouldGetFormByUuid() throws Exception { + Form form = buildForm(); + URI url = config.toInstancePathWithParams("/form/{uuid}", form.getUuid()); + + when(restOperations.exchange(eq(url), eq(HttpMethod.GET), any(HttpEntity.class), eq(String.class))) + .thenReturn(getResponseFromFile(FORM_RESPONSE_JSON)); + + Form created = formResource.getFormByUuid(config, form.getUuid()); + + verify(restOperations).exchange(eq(url), eq(HttpMethod.GET), requestCaptor.capture(), eq(String.class)); + + assertEquals(form, created); + assertEquals(getHeadersForGet(config), requestCaptor.getValue().getHeaders()); + } + + private Form buildForm() throws Exception { + return (Form) readFromFile(FORM_RESPONSE_JSON, Form.class); + } + + +} diff --git a/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/ObservationResourceImplTest.java b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/ObservationResourceImplTest.java index eae040edb..5a9e01877 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/ObservationResourceImplTest.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/ObservationResourceImplTest.java @@ -1,7 +1,9 @@ package org.motechproject.openmrs.resource.impl; +import com.google.gson.JsonObject; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpState; +import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -9,13 +11,17 @@ import org.mockito.Mock; import org.motechproject.openmrs.config.Config; import org.motechproject.openmrs.config.ConfigDummyData; +import org.motechproject.openmrs.domain.Observation; import org.motechproject.openmrs.domain.ObservationListResult; import org.motechproject.openmrs.resource.ObservationResource; +import org.motechproject.openmrs.util.JsonUtils; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.web.client.RestOperations; import java.net.URI; +import java.util.Date; +import java.util.List; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; @@ -29,13 +35,16 @@ public class ObservationResourceImplTest extends AbstractResourceImplTest { private static final String OBSERVATION_LIST_RESPONSE_JSON = "json/observation/observation-list-response.json"; + private static final String OBSERVATION_QUERY_RESPONSE_JSON = "json/observation/observation-query-response.json"; + + private static final String OBSERVATION_RESPONSE_JSON = "json/observation/observation-response.json"; + private static final String PREPARE_OBSERVATION_JSON = "json/observation/prepare-observation.json"; @Mock private RestOperations restOperations; @Mock private HttpClient httpClient; - @Captor private ArgumentCaptor> requestCaptor; @@ -69,4 +78,62 @@ public void shouldQueryForObservationByPatientId() throws Exception { assertThat(requestCaptor.getValue().getBody(), nullValue()); } + @Test + public void shouldQueryForObservationByPatientIdAndConceptId() throws Exception { + String patientId = "OOO"; + String conceptId = "CCC"; + URI url = config.toInstancePathWithParams("/obs?patient={patientUUID}&concept={conceptUUID}&limit=1&v=full", patientId, conceptId); + + when(restOperations.exchange(eq(url), eq(HttpMethod.GET), any(HttpEntity.class), eq(String.class))) + .thenReturn(getResponseFromFile(OBSERVATION_QUERY_RESPONSE_JSON)); + + ObservationListResult result = observationResource.getObservationByPatientUUIDAndConceptUUID(config, patientId, conceptId); + + verify(restOperations).exchange(eq(url), eq(HttpMethod.GET), requestCaptor.capture(), eq(String.class)); + + assertThat(result, equalTo(readFromFile(OBSERVATION_QUERY_RESPONSE_JSON, ObservationListResult.class))); + assertThat(requestCaptor.getValue().getHeaders(), equalTo(getHeadersForGet(config))); + } + + @Test + public void shouldCreateObservation() throws Exception { + String observationJson = prepareObservationJson(); + ObservationFromJSON observation = prepareObservation(); + + URI url = config.toInstancePath("/obs"); + + when(restOperations.exchange(eq(url), eq(HttpMethod.POST), any(HttpEntity.class), eq(String.class))) + .thenReturn(getResponseFromFile(OBSERVATION_RESPONSE_JSON)); + + Observation created = observationResource.createObservationFromJson(config, observationJson); + + verify(restOperations).exchange(eq(url), eq(HttpMethod.POST), requestCaptor.capture(), eq(String.class)); + + assertThat(created.getPerson().getUuid(), equalTo(observation.person)); + assertThat(created.getConcept().getUuid(), equalTo(observation.concept)); + assertThat(created.getObsDatetime(), equalTo(new DateTime(observation.obsDatetime).toDate())); + assertThat(Double.parseDouble(created.getValue().getDisplay()), equalTo(Double.parseDouble(observation.value))); + + assertThat(requestCaptor.getValue().getHeaders(), equalTo(getHeadersForPost(config))); + assertThat(JsonUtils.readJson(requestCaptor.getValue().getBody(), JsonObject.class), + equalTo(readFromFile(PREPARE_OBSERVATION_JSON, JsonObject.class))); + } + + private String prepareObservationJson() throws Exception { + return readJsonFromFile(PREPARE_OBSERVATION_JSON); + } + + private ObservationFromJSON prepareObservation() throws Exception { + return (ObservationFromJSON) readFromFile(PREPARE_OBSERVATION_JSON, ObservationFromJSON.class); + } + + private class ObservationFromJSON { + private String person; + private Date obsDatetime; + private String concept; + private String encounter; + private String value; + private List groupsMembers; + } + } diff --git a/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/OrderResourceImplTest.java b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/OrderResourceImplTest.java new file mode 100644 index 000000000..d24972a19 --- /dev/null +++ b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/OrderResourceImplTest.java @@ -0,0 +1,82 @@ +package org.motechproject.openmrs.resource.impl; + +import com.google.gson.JsonObject; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpState; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.config.ConfigDummyData; +import org.motechproject.openmrs.domain.Order; +import org.motechproject.openmrs.util.JsonUtils; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.web.client.RestOperations; + +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +public class OrderResourceImplTest extends AbstractResourceImplTest { + + private static final String ORDER_RESPONSE = "json/order/order-response.json"; + private static final String PREPARE_ORDER_JSON = "json/order/order-prepare.json"; + private static final String CREATE_ORDER_JSON = "json/order/order-create.json"; + + @Mock + private RestOperations restOperations; + + @Mock + private HttpClient httpClient; + + @Captor + private ArgumentCaptor> requestCaptor; + + private OrderResourceImpl orderResource; + + private Config config; + + @Before + public void setUp() { + initMocks(this); + when(httpClient.getState()).thenReturn(new HttpState()); + + orderResource = new OrderResourceImpl(restOperations, httpClient); + config = ConfigDummyData.prepareConfig("one"); + } + + @Test + public void shouldCreateOrder() throws Exception { + Order order = prepareOrder(); + URI url = config.toInstancePath("/order"); + + when(restOperations.exchange(eq(url), eq(HttpMethod.POST), any(HttpEntity.class), eq(String.class))) + .thenReturn(getResponseFromFile(ORDER_RESPONSE)); + + Order created = orderResource.createOrder(config, order); + + verify(restOperations).exchange(eq(url), eq(HttpMethod.POST), requestCaptor.capture(), eq(String.class)); + + assertEquals(order.getType(), created.getType()); + assertEquals(order.getEncounter(), created.getEncounter()); + assertEquals(order.getOrderer(), created.getOrderer()); + assertEquals(order.getConcept().getUuid(), created.getConcept().getUuid()); + assertEquals(order.getPatient(), created.getPatient()); + + assertEquals(requestCaptor.getValue().getHeaders(), getHeadersForPost(config)); + assertEquals(JsonUtils.readJson(requestCaptor.getValue().getBody(), JsonObject.class), + readFromFile(CREATE_ORDER_JSON, JsonObject.class)); + } + + private Order prepareOrder() throws Exception { + return (Order) readFromFile(PREPARE_ORDER_JSON, Order.class); + } +} \ No newline at end of file diff --git a/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/PersonResourceImplTest.java b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/PersonResourceImplTest.java index a4387f329..9c2ad75c8 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/PersonResourceImplTest.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/resource/impl/PersonResourceImplTest.java @@ -26,6 +26,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -38,6 +39,7 @@ public class PersonResourceImplTest extends AbstractResourceImplTest { private static final String PERSON_ATTRIBUTE_TYPE_RESPONSE_JSON = "json/person/person-attribute-type-response.json"; private static final String CREATE_PERSON_ATTRIBUTE_JSON = "json/person/person-attribute-create.json"; private static final String PERSON_NAME_UPDATE_JSON = "json/person/person-name-update.json"; + private static final String PERSON_MIDDLENAME_UPDATE_JSON = "json/person/person-middleName-update.json"; private static final String PERSON_RESPONSE_JSON = "json/person/person-response.json"; private static final String CREATE_PERSON_JSON = "json/person/person-create.json"; private static final String UPDATE_PERSON_ADDRESS_JSON = "json/person/person-address-update.json"; @@ -195,9 +197,24 @@ public void shouldUpdatePersonName() throws Exception { verify(restOperations).exchange(eq(url), eq(HttpMethod.POST), requestCaptor.capture(), eq(String.class)); - assertThat(requestCaptor.getValue().getHeaders(), equalTo(getHeadersForPostWithoutResponse(config))); - assertThat(JsonUtils.readJson(requestCaptor.getValue().getBody(), JsonObject.class), - equalTo(readFromFile(PERSON_NAME_UPDATE_JSON, JsonObject.class))); + assertEquals(readFromFile(PERSON_NAME_UPDATE_JSON, Person.Name.class), + JsonUtils.readJson(requestCaptor.getValue().getBody(), Person.Name.class)); + } + + @Test + public void shouldOverwritePersonMiddleName() throws Exception { + String personId = "CCC"; + Person.Name name = prepareName(); + name.setMiddleName(""); + + URI url = config.toInstancePathWithParams("/person/{personUuid}/name/{nameUuid}", personId, name.getUuid()); + + personResource.updatePersonName(config, personId, name); + + verify(restOperations).exchange(eq(url), eq(HttpMethod.POST), requestCaptor.capture(), eq(String.class)); + + assertEquals(readFromFile(PERSON_MIDDLENAME_UPDATE_JSON, Person.Name.class), + JsonUtils.readJson(requestCaptor.getValue().getBody(), Person.Name.class)); } @Test @@ -254,7 +271,7 @@ private Person.Name prepareName() { name.setUuid("AAA"); name.setGivenName("Motech"); name.setMiddleName("E"); - name.setGivenName("Test"); + name.setFamilyName("Test"); return name; } private Person.Address prepareAddress() throws Exception { diff --git a/openmrs/src/test/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImplTest.java b/openmrs/src/test/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImplTest.java new file mode 100644 index 000000000..513f123f1 --- /dev/null +++ b/openmrs/src/test/java/org/motechproject/openmrs/service/impl/OpenMRSEncounterServiceImplTest.java @@ -0,0 +1,87 @@ +package org.motechproject.openmrs.service.impl; + +import org.joda.time.DateTime; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.motechproject.event.listener.EventRelay; +import org.motechproject.openmrs.config.Config; +import org.motechproject.openmrs.domain.*; +import org.motechproject.openmrs.exception.OpenMRSException; +import org.motechproject.openmrs.resource.EncounterResource; +import org.motechproject.openmrs.service.OpenMRSConceptService; +import org.motechproject.openmrs.service.OpenMRSConfigService; +import org.motechproject.openmrs.service.OpenMRSPatientService; +import org.springframework.http.HttpStatus; +import org.springframework.web.client.HttpClientErrorException; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.verify; + +@RunWith(MockitoJUnitRunner.class) +public class OpenMRSEncounterServiceImplTest { + + private static final String CONFIG_NAME = "Configuration name"; + + @Mock + private OpenMRSPatientService patientService; + + @Mock + private OpenMRSConceptService conceptService; + + @Mock + private OpenMRSConfigService configService; + + @Mock + private EncounterResource encounterResource; + + @Mock + private EventRelay eventRelay; + + @Mock + private Config config; + + @InjectMocks + private OpenMRSEncounterServiceImpl encounterServiceImpl = new OpenMRSEncounterServiceImpl(encounterResource, patientService, eventRelay, configService); + + + @Test(expected = OpenMRSException.class) + public void shouldThrowOpenMRSExceptionIfEncounterIsNotCreated() throws Exception { + Location location = new Location(); + location.setName("testLocation"); + + Patient patient = new Patient(); + patient.setUuid("10"); + + Provider provider = new Provider(); + provider.setUuid("20"); + + Person person = new Person(); + person.setUuid("30"); + provider.setPerson(person); + + Visit visit = new Visit(); + visit.setUuid("40"); + + DateTime encounterDatetime = new DateTime("2000-08-16T07:22:05Z"); + + List obsList = new ArrayList<>(); + + Encounter encounter = new Encounter(location, new EncounterType("testEncounterType", null), encounterDatetime.toDate(), patient, visit, Collections.singletonList(provider.getPerson()), obsList); + + when(configService.getConfigByName(CONFIG_NAME)).thenReturn(config); + when(encounterResource.createEncounter(config,encounter)).thenThrow(new HttpClientErrorException(HttpStatus.BAD_REQUEST)); + + try { + encounterServiceImpl.createEncounter(CONFIG_NAME, encounter); + } finally { + verify(encounterResource).createEncounter(config, encounter); + } + } +} diff --git a/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderBuilderTest.java b/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderBuilderTest.java index 736e92db1..4149cd48f 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderBuilderTest.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderBuilderTest.java @@ -48,12 +48,12 @@ public void generatedProviderShouldReturnNullWhenConfigsListIsEmpty() { @Test public void generatedProviderShouldReturnJSONForOneConfiguration() throws IOException { - assertEquals(7, getGeneratedJSONObjectsCount(1)); + assertEquals(8, getGeneratedJSONObjectsCount(1)); } @Test public void generatedProviderShouldReturnJSONForTwoConfigurations() throws IOException { - assertEquals(14, getGeneratedJSONObjectsCount(2)); + assertEquals(16, getGeneratedJSONObjectsCount(2)); } private int getGeneratedJSONObjectsCount(int amountOfConfigs) throws IOException { diff --git a/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderTest.java b/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderTest.java index 80b8a0b82..d6a25dbff 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderTest.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/tasks/OpenMRSTaskDataProviderTest.java @@ -8,20 +8,11 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.motechproject.openmrs.config.Configs; -import org.motechproject.openmrs.domain.Attribute; -import org.motechproject.openmrs.domain.Encounter; -import org.motechproject.openmrs.domain.EncounterType; -import org.motechproject.openmrs.domain.Patient; -import org.motechproject.openmrs.domain.Person; -import org.motechproject.openmrs.domain.Program; -import org.motechproject.openmrs.domain.ProgramEnrollment; -import org.motechproject.openmrs.domain.ProgramEnrollmentListResult; -import org.motechproject.openmrs.domain.Provider; -import org.motechproject.openmrs.domain.Relationship; -import org.motechproject.openmrs.domain.RelationshipType; +import org.motechproject.openmrs.domain.*; import org.motechproject.openmrs.service.OpenMRSConfigService; import org.motechproject.openmrs.service.OpenMRSEncounterService; import org.motechproject.openmrs.service.OpenMRSGeneratedIdentifierService; +import org.motechproject.openmrs.service.OpenMRSObservationService; import org.motechproject.openmrs.service.OpenMRSPatientService; import org.motechproject.openmrs.service.OpenMRSProgramEnrollmentService; import org.motechproject.openmrs.service.OpenMRSProviderService; @@ -44,20 +35,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.ACTIVE_PROGRAM; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BAHMNI_PROGRAM_ENROLLMENT; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_MOTECH_ID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_MOTECH_ID_AND_PROGRAM_NAME; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_PERSON_UUID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_UUID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.BY_UUID_AMD_PROGRAM_NAME; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.MOTECH_ID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PATIENT_MOTECH_ID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PATIENT_UUID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PERSON_UUID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.PROGRAM_NAME; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.RELATIONSHIP_TYPE_UUID; -import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.UUID; +import static org.motechproject.openmrs.tasks.OpenMRSTasksConstants.*; @RunWith(MockitoJUnitRunner.class) public class OpenMRSTaskDataProviderTest { @@ -67,6 +45,8 @@ public class OpenMRSTaskDataProviderTest { private static final String PROGRAM_ANOTHER_NAME = "anotherName"; private static final String DEFAULT_UUID = "495b10c4-56bd-11df-a35e-0027136865c4"; private static final String DEFAULT_MOTECH_ID = "3"; + private static final String DEFAULT_IDENTIFIER_ID = "4"; + private static final String DEFAULT_IDENTIFIER_NAME = "identifierName"; private static final String ATTRIBUTE_UUID = "51f41ccf-dca8-48e3-bcf3-5e0981948b1e"; private static final String ATTRIBUTE_VALUE = "attributeValue"; private static final String ATTRIBUTE_TYPE_UUID = "2c41f832-f3ed-47f1-92e2-53143ee71626"; @@ -75,6 +55,9 @@ public class OpenMRSTaskDataProviderTest { @Mock private OpenMRSEncounterService encounterService; + @Mock + private OpenMRSObservationService observationService; + @Mock private OpenMRSPatientService patientService; @@ -107,7 +90,7 @@ public class OpenMRSTaskDataProviderTest { @Before public void setUp() { when(configService.getConfigs()).thenReturn(new Configs()); - taskDataProvider = new OpenMRSTaskDataProvider(taskDataProviderBuilder, encounterService, patientService, + taskDataProvider = new OpenMRSTaskDataProvider(taskDataProviderBuilder, encounterService, observationService, patientService, providerService, relationshipService, programEnrollmentService, identifierService, bundleContext); } @@ -168,7 +151,7 @@ public void shouldReturnEncounterForLookupGetEncounterByUuid() { lookupFields.put(UUID, DEFAULT_UUID); Encounter encounter = new Encounter(); - encounter.setEncounterType(new EncounterType("encounterTypeTest")); + encounter.setEncounterType(new EncounterType("encounterTypeTest", null)); when(encounterService.getEncounterByUuid(CONFIG_NAME, DEFAULT_UUID)).thenReturn(encounter); @@ -178,6 +161,27 @@ public void shouldReturnEncounterForLookupGetEncounterByUuid() { verify(encounterService).getEncounterByUuid(CONFIG_NAME, DEFAULT_UUID); } + @Test + public void shouldReturnObservationForPatientUuidAndConceptUuid() { + String className = Observation.class.getSimpleName(); + String conceptUuid = "sampleConceptUuid"; + + Map lookupFields = new HashMap<>(); + lookupFields.put(PATIENT_UUID, DEFAULT_UUID); + lookupFields.put(CONCEPT_UUID, conceptUuid); + + Observation observation = new Observation(); + observation.setUuid("10"); + + when(observationService.getLatestObservationByPatientUUIDAndConceptUUID(CONFIG_NAME, DEFAULT_UUID, conceptUuid)).thenReturn(observation); + + Object object = taskDataProvider.lookup(className + '-' + CONFIG_NAME, BY_PATIENT_UUID_AND_CONCEPT_UUID, lookupFields); + + assertEquals(observation, object); + + verify(observationService).getLatestObservationByPatientUUIDAndConceptUUID(CONFIG_NAME, DEFAULT_UUID, conceptUuid); + } + @Test public void shouldReturnNullWhenWrongLookupNameForPatient() { String className = Patient.class.getSimpleName(); @@ -282,6 +286,25 @@ public void shouldReturnPatientForLookupGetPatientByMotechId() { verify(patientService).getPatientByMotechId(CONFIG_NAME, DEFAULT_MOTECH_ID); } + @Test + public void shouldReturnPatientForLookupGetPatientByOtherId() { + String className = Patient.class.getSimpleName(); + + Map lookupFields = new HashMap<>(); + lookupFields.put(IDENTIFIER_ID, DEFAULT_IDENTIFIER_ID); + lookupFields.put(IDENTIFIER_NAME, DEFAULT_IDENTIFIER_NAME); + + Patient patient = new Patient(); + patient.setUuid("10"); + + when(patientService.getPatientByIdentifier(CONFIG_NAME, DEFAULT_IDENTIFIER_ID, DEFAULT_IDENTIFIER_NAME)).thenReturn(patient); + + Object object = taskDataProvider.lookup(className + '-' + CONFIG_NAME, DEFAULT_IDENTIFIER_NAME, lookupFields); + + assertEquals(patient, object); + verify(patientService).getPatientByIdentifier(CONFIG_NAME, DEFAULT_IDENTIFIER_ID, DEFAULT_IDENTIFIER_NAME); + } + @Test public void shouldReturnNullWhenWrongLookupNameForProvider() { String className = Provider.class.getSimpleName(); diff --git a/openmrs/src/test/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceTest.java b/openmrs/src/test/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceTest.java index afac681e1..064995139 100644 --- a/openmrs/src/test/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceTest.java +++ b/openmrs/src/test/java/org/motechproject/openmrs/tasks/impl/OpenMRSActionProxyServiceTest.java @@ -1,6 +1,9 @@ package org.motechproject.openmrs.tasks.impl; +import com.google.gson.JsonObject; import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -18,10 +21,12 @@ import org.motechproject.openmrs.domain.ConceptName; import org.motechproject.openmrs.domain.Encounter; import org.motechproject.openmrs.domain.EncounterType; +import org.motechproject.openmrs.domain.Form; import org.motechproject.openmrs.domain.Identifier; import org.motechproject.openmrs.domain.IdentifierType; import org.motechproject.openmrs.domain.Location; import org.motechproject.openmrs.domain.Observation; +import org.motechproject.openmrs.domain.Order; import org.motechproject.openmrs.domain.Patient; import org.motechproject.openmrs.domain.Person; import org.motechproject.openmrs.domain.Program; @@ -32,7 +37,10 @@ import org.motechproject.openmrs.service.OpenMRSCohortService; import org.motechproject.openmrs.service.OpenMRSConceptService; import org.motechproject.openmrs.service.OpenMRSEncounterService; +import org.motechproject.openmrs.service.OpenMRSFormService; import org.motechproject.openmrs.service.OpenMRSLocationService; +import org.motechproject.openmrs.service.OpenMRSObservationService; +import org.motechproject.openmrs.service.OpenMRSOrderService; import org.motechproject.openmrs.service.OpenMRSPatientService; import org.motechproject.openmrs.service.OpenMRSPersonService; import org.motechproject.openmrs.service.OpenMRSProgramEnrollmentService; @@ -43,7 +51,9 @@ import org.motechproject.openmrs.tasks.constants.Keys; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,6 +69,8 @@ public class OpenMRSActionProxyServiceTest { private static final String CONFIG_NAME = "Configuration name"; + private static final DateTimeFormatter fullDateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + private static final Date DATE = new DateTime("2000-08-16T07:22:05Z").toDate(); @Mock private OpenMRSConceptService conceptService; @@ -75,6 +87,12 @@ public class OpenMRSActionProxyServiceTest { @Mock private OpenMRSPersonService personService; + @Mock + private OpenMRSObservationService observationService; + + @Mock + private OpenMRSOrderService orderService; + @Mock private OpenMRSVisitService visitService; @@ -90,12 +108,24 @@ public class OpenMRSActionProxyServiceTest { @Mock private EventRelay eventRelay; + @Mock + private OpenMRSFormService formService; + @Captor private ArgumentCaptor patientCaptor; + @Captor + private ArgumentCaptor encounterCaptor; + @Captor private ArgumentCaptor personCaptor; + @Captor + private ArgumentCaptor observationCaptor; + + @Captor + private ArgumentCaptor orderCaptor; + @Captor private ArgumentCaptor visitCaptor; @@ -123,13 +153,15 @@ public void shouldCreateEncounterWithGivenParameters() { Visit visit = new Visit(); visit.setUuid("40"); - DateTime encounterDatetime = new DateTime("2000-08-16T07:22:05Z"); + Form form = new Form(); + form.setUuid("50"); + Map observations = new HashMap<>(); - observations.put("testConceptName","testObservationValueName0"); + observations.put("18ff53df-744a-4a3f-8f25-dac6de5b7131", "testObservationValueName0"); List obsList = createObservationList(1); - Encounter encounter = new Encounter(location, new EncounterType("testEncounterType"), encounterDatetime.toDate(), patient, visit, Collections.singletonList(provider.getPerson()), obsList); + Encounter encounter = new Encounter(location, new EncounterType(null, "testId"), DATE, patient, visit, Collections.singletonList(provider.getPerson()), obsList); doReturn(patient).when(patientService).getPatientByUuid(eq(CONFIG_NAME), eq(patient.getUuid())); doReturn(provider).when(providerService).getProviderByUuid(eq(CONFIG_NAME), eq(provider.getUuid())); @@ -140,8 +172,8 @@ public void shouldCreateEncounterWithGivenParameters() { .when(locationService).getLocations(eq(CONFIG_NAME), eq(location.getName())); Encounter encounterCreated = openMRSActionProxyService.createEncounter(CONFIG_NAME, new DateTime(encounter.getEncounterDatetime()), - encounter.getEncounterType().getName(), location.getName(), patient.getUuid(), provider.getUuid(), - visit.getUuid(), observations); + encounter.getEncounterType().getUuid(), location.getName(), patient.getUuid(), provider.getUuid(), + visit.getUuid(), form.getUuid(), observations); assertEquals(encounter, encounterCreated); } @@ -164,13 +196,15 @@ public void shouldCreateEncounterWithGivenParametersWithoutObsWithEmptyValue() { Visit visit = new Visit(); visit.setUuid("40"); - DateTime encounterDatetime = new DateTime("2000-08-16T07:22:05Z"); + Form form = new Form(); + form.setUuid("50"); + Map observations = new HashMap<>(); - observations.put("testConceptName",""); + observations.put("18ff53df-744a-4a3f-8f25-dac6de5b7131", ""); List obsList = new ArrayList<>(); - Encounter encounter = new Encounter(location, new EncounterType("testEncounterType"), encounterDatetime.toDate(), patient, visit, Collections.singletonList(provider.getPerson()), obsList); + Encounter encounter = new Encounter(location, new EncounterType(null, "testId"), DATE, patient, visit, Collections.singletonList(provider.getPerson()), obsList); doReturn(patient).when(patientService).getPatientByUuid(eq(CONFIG_NAME), eq(patient.getUuid())); doReturn(provider).when(providerService).getProviderByUuid(eq(CONFIG_NAME), eq(provider.getUuid())); @@ -181,8 +215,8 @@ public void shouldCreateEncounterWithGivenParametersWithoutObsWithEmptyValue() { .when(locationService).getLocations(eq(CONFIG_NAME), eq(location.getName())); Encounter encounterCreated = openMRSActionProxyService.createEncounter(CONFIG_NAME, new DateTime(encounter.getEncounterDatetime()), - encounter.getEncounterType().getName(), location.getName(), patient.getUuid(), provider.getUuid(), - visit.getUuid(), observations); + encounter.getEncounterType().getUuid(), location.getName(), patient.getUuid(), provider.getUuid(), + visit.getUuid(), form.getUuid(), observations); assertEquals(encounter, encounterCreated); } @@ -205,26 +239,68 @@ public void shouldCreateEncounterWithGivenParametersWithObsWithManyValues() { Visit visit = new Visit(); visit.setUuid("40"); - DateTime encounterDatetime = new DateTime("2000-08-16T07:22:05Z"); + Form form = new Form(); + form.setUuid("50"); + Map observations = new HashMap<>(); - observations.put("testConceptName","testObservationValueName0, testObservationValueName1"); + /* Empty value in observations should not be included */ + observations.put("18ff53df-744a-4a3f-8f25-dac6de5b7131","testObservationValueName0, ,testObservationValueName1"); List obsList = createObservationList(2); - Encounter encounter = new Encounter(location, new EncounterType("testEncounterType"), encounterDatetime.toDate(), patient, visit, Collections.singletonList(provider.getPerson()), obsList); + Encounter encounter = new Encounter(location, new EncounterType(null, "testId"), DATE, patient, visit, Collections.singletonList(provider.getPerson()), obsList); doReturn(patient).when(patientService).getPatientByUuid(eq(CONFIG_NAME), eq(patient.getUuid())); doReturn(provider).when(providerService).getProviderByUuid(eq(CONFIG_NAME), eq(provider.getUuid())); doReturn(visit).when(visitService).getVisitByUuid(eq(CONFIG_NAME), eq(visit.getUuid())); doReturn(encounter).when(encounterService).createEncounter(eq(CONFIG_NAME), eq(encounter)); - doReturn(Collections.singletonList(location)) .when(locationService).getLocations(eq(CONFIG_NAME), eq(location.getName())); Encounter encounterCreated = openMRSActionProxyService.createEncounter(CONFIG_NAME, new DateTime(encounter.getEncounterDatetime()), - encounter.getEncounterType().getName(), location.getName(), patient.getUuid(), provider.getUuid(), - visit.getUuid(), observations); + encounter.getEncounterType().getUuid(), location.getName(), patient.getUuid(), provider.getUuid(), + visit.getUuid(), form.getUuid(), observations); + + + assertEquals(encounter, encounterCreated); + } + + @Test + public void shouldCreateEncounterAndObservationGroups() { + Location location = new Location(); + location.setName("testLocation"); + + Patient patient = new Patient(); + patient.setUuid("10"); + + Provider provider = new Provider(); + provider.setUuid("20"); + + Person person = new Person(); + person.setUuid("30"); + provider.setPerson(person); + + Visit visit = new Visit(); + visit.setUuid("40"); + + Form form = new Form(); + form.setUuid("50"); + + Map observations = prepareObservationGroupsMap(); + List obsList = createObservationGroups(); + Encounter encounter = new Encounter(location, new EncounterType(null, "testId"), DATE, patient, visit, Collections.singletonList(provider.getPerson()), obsList); + + doReturn(patient).when(patientService).getPatientByUuid(eq(CONFIG_NAME), eq(patient.getUuid())); + doReturn(provider).when(providerService).getProviderByUuid(eq(CONFIG_NAME), eq(provider.getUuid())); + doReturn(visit).when(visitService).getVisitByUuid(eq(CONFIG_NAME), eq(visit.getUuid())); + doReturn(encounter).when(encounterService).createEncounter(eq(CONFIG_NAME), eq(encounter)); + doReturn(Collections.singletonList(location)) + .when(locationService).getLocations(eq(CONFIG_NAME), eq(location.getName())); + + Encounter encounterCreated = openMRSActionProxyService.createEncounter(CONFIG_NAME, new DateTime(encounter.getEncounterDatetime()), + encounter.getEncounterType().getUuid(), location.getName(), patient.getUuid(), provider.getUuid(), + visit.getUuid(), form.getUuid(), observations); assertEquals(encounter, encounterCreated); } @@ -376,6 +452,33 @@ public void shouldUpdatePersonWithGivenParameters() { assertEquals(person, personCaptor.getValue()); } + @Test + public void shouldUpdatePersonWithBlankMiddleName() { + Person person = createTestPerson(); + // the empty value from task action fields + person.getPreferredName().setMiddleName("\"\""); + + Person.Address personAddress = person.getPreferredAddress(); + + Map personAttributes = new HashMap<>(); + personAttributes.put("8d8718c2-c2cc-11de-8d13-0010c6dffd0f", "testValue"); + + openMRSActionProxyService.updatePerson(CONFIG_NAME, person.getUuid(), person.getPreferredName().getGivenName(), + person.getPreferredName().getMiddleName(), person.getPreferredName().getFamilyName(), + personAddress.getAddress1(), personAddress.getAddress2(), personAddress.getAddress3(), + personAddress.getAddress4(), personAddress.getAddress5(), personAddress.getAddress6(), + personAddress.getCityVillage(), personAddress.getStateProvince(), personAddress.getCountry(), + personAddress.getPostalCode(), personAddress.getCountyDistrict(), personAddress.getLatitude(), + personAddress.getLongitude(), new DateTime(personAddress.getStartDate()), + new DateTime(personAddress.getEndDate()), new DateTime(person.getBirthdate()), + person.getBirthdateEstimated(), person.getGender(), person.getDead(), null, personAttributes); + + verify(personService).updatePerson(eq(CONFIG_NAME), personCaptor.capture()); + // middleName should be converted to empty string + person.getPreferredName().setMiddleName(""); + assertEquals(person, personCaptor.getValue()); + } + @Test public void shouldUpdatePatientIdentifiers() { Patient patient = new Patient(); @@ -394,6 +497,86 @@ public void shouldUpdatePatientIdentifiers() { assertEquals("CommCare CaseID", patientCaptorIdentifier.getIdentifierType().getName()); } + @Test + public void shouldCreateObservationWithGivenJsonParameter() { + JsonObject observationObject = new JsonObject(); + + String encounterUuid = "10"; + String conceptUuid = "20"; + String obsDatetime = "2016-07-29T18:29:50.000+0800"; + String comment = "testComment"; + + observationObject.addProperty("encounter", encounterUuid); + observationObject.addProperty("concept", conceptUuid); + observationObject.addProperty("obsDatetime", obsDatetime); + observationObject.addProperty("comment", comment); + String observationJSON = observationObject.toString(); + + Encounter encounter = new Encounter(); + encounter.setUuid(encounterUuid); + + Concept concept = new Concept(); + concept.setUuid(conceptUuid); + + Observation observation = new Observation(); + observation.setEncounter(encounter); + observation.setConcept(concept); + observation.setObsDatetime(new DateTime(obsDatetime).toDate()); + observation.setComment(comment); + + doReturn(observation).when(observationService).createObservationFromJson(eq(CONFIG_NAME), + eq(observationJSON)); + + Observation obsCreated = openMRSActionProxyService.createObservationJSON(CONFIG_NAME, observationJSON, null, null, null, null, null); + + assertEquals(observation, obsCreated); + } + + + @Test + public void shouldCreateObservationWithReplacedParameters() { + JsonObject observationObject = new JsonObject(); + + String encounterUuid = "10"; + String conceptUuid = "20"; + String obsDatetime = "2016-07-29T18:29:50.000+0800"; + String comment = "testComment"; + String value = "testValue"; + + String encounterUuidReplace = "100"; + String conceptUuidReplace = "200"; + String obsDatetimeReplace = "2010-07-29T18:29:50.000+0800"; + String commentReplace = "testComment2"; + + observationObject.addProperty("encounter", encounterUuid); + observationObject.addProperty("concept", conceptUuid); + observationObject.addProperty("obsDatetime", obsDatetime); + observationObject.addProperty("comment", comment); + observationObject.addProperty("value", value); + String observationJSON = observationObject.toString(); + + observationObject = new JsonObject(); + observationObject.addProperty("encounter", encounterUuidReplace); + observationObject.addProperty("concept", conceptUuidReplace); + observationObject.addProperty("obsDatetime", new DateTime(obsDatetimeReplace).toString(fullDateTimeFormatter)); + observationObject.addProperty("comment", commentReplace); + observationObject.addProperty("value", value); + String observationJSONReplace = observationObject.toString(); + + Encounter encounter = new Encounter(); + encounter.setUuid(encounterUuid); + + Concept concept = new Concept(); + concept.setUuid(conceptUuid); + + openMRSActionProxyService.createObservationJSON(CONFIG_NAME, observationJSON, + encounterUuidReplace, conceptUuidReplace, new DateTime(obsDatetimeReplace), null, commentReplace); + + verify(observationService).createObservationFromJson(eq(CONFIG_NAME), observationCaptor.capture()); + assertEquals(observationJSONReplace, observationCaptor.getValue()); + } + + @Test public void shouldCreateVisitWithRequiredGivenParameters() { Patient patient = new Patient(); @@ -590,6 +773,28 @@ public void shouldGetCohortQueryReportWithGivenParameters() { assertEquals(createEventForMember(cohortQueryUuid, prepareCohortQueryReportMember("2")), capturedEvents.get(1)); } + @Test + public void shouldCreateOrderWithGivenParameters() { + + Patient patient = new Patient(); + patient.setUuid("10"); + + Provider provider = new Provider(); + provider.setUuid("20"); + + Encounter encounter = new Encounter(); + encounter.setUuid("50"); + + Concept concept = createTestConcept("60"); + + Order order = new Order("order", encounter, provider, patient, concept, Order.CareSetting.INPATIENT); + + doReturn(order).when(orderService).createOrder(eq(CONFIG_NAME), eq(order)); + Order orderCreated = openMRSActionProxyService.createOrder(CONFIG_NAME, "order", encounter.getUuid(), patient.getUuid(), concept.getUuid(), provider.getUuid(), Order.CareSetting.INPATIENT.toString()); + + assertEquals(order, orderCreated); + } + private Person createTestPerson() { Person person = new Person(); @@ -616,13 +821,13 @@ private Person createTestPerson() { Person.Address address = new Person.Address("address 1", "address 2", "address 3", "address 4", "address 5", "address 6", "City", "State", "Country", "000000", "County district", "30", "50", - new DateTime("2000-08-16T07:22:05Z").toDate(), new DateTime("2100-08-16T07:22:05Z").toDate()); + DATE, new DateTime("2100-08-16T07:22:05Z").toDate()); person.setPreferredAddress(address); person.setAddresses(Collections.singletonList(address)); person.setGender("M"); - person.setBirthdate(new DateTime("2000-08-16T07:22:05Z").toDate()); + person.setBirthdate(DATE); person.setBirthdateEstimated(true); person.setDead(false); @@ -645,13 +850,13 @@ private List createObservationList(int observationsNumber) { List observationList = new ArrayList<>(); for (int i = 0; i < observationsNumber; i++) { - ConceptName conceptName = new ConceptName("testConceptName"); - Concept concept = new Concept(conceptName); + Concept concept = new Concept(); + concept.setUuid("18ff53df-744a-4a3f-8f25-dac6de5b7131"); Observation observation = new Observation(); observation.setConcept(concept); observation.setValue(new Observation.ObservationValue("testObservationValueName" + Integer.toString(i))); - observation.setObsDatetime(new DateTime("2000-08-16T07:22:05Z").toDate()); + observation.setObsDatetime(DATE); observationList.add(observation); } return observationList; @@ -689,4 +894,72 @@ private MotechEvent createEventForMember(String cohortQueryUuid, CohortQueryRepo return new MotechEvent(EventSubjects.GET_COHORT_QUERY_MEMBER_EVENT.concat(CONFIG_NAME), parameters); } -} + + private Map prepareObservationGroupsMap() { + Map observationsMap = new HashMap<>(); + + observationsMap.put("parentUuid/child1Uuid/child2Child1Uuid", "Yes"); + observationsMap.put("parentUuid/child1Uuid/child1Child1Uuid", "No"); + observationsMap.put("parentUuid/child2Uuid", "2nd"); + observationsMap.put("parentUuid/child3Uuid", "Maybe"); + + //observations with blank/null values should be omitted + observationsMap.put("parentUuid/child1Uuid/child3Child1Uuid", null); + observationsMap.put("parentUuid/child5Uuid", null); + observationsMap.put("parentUuid/child6Uuid", ""); + + return observationsMap; + } + + private List createObservationGroups() { + Concept concept1 = new Concept(); + concept1.setUuid("child1Child1Uuid"); + + Observation childChild1 = new Observation(); + childChild1.setConcept(concept1); + childChild1.setValue(new Observation.ObservationValue("No")); + childChild1.setObsDatetime(DATE); + + Concept concept2 = new Concept(); + concept2.setUuid("child2Child1Uuid"); + + Observation childChild2 = new Observation(); + childChild2.setConcept(concept2); + childChild2.setValue(new Observation.ObservationValue("Yes")); + childChild2.setObsDatetime(DATE); + + Concept concept3 = new Concept(); + concept3.setUuid("child1Uuid"); + + Observation child1 = new Observation(); + child1.setConcept(concept3); + child1.setGroupMembers(Arrays.asList(childChild2, childChild1)); + child1.setObsDatetime(DATE); + + Concept concept4 = new Concept(); + concept4.setUuid("child2Uuid"); + + Observation child2 = new Observation(); + child2.setConcept(concept4); + child2.setValue(new Observation.ObservationValue("2nd")); + child2.setObsDatetime(DATE); + + Concept concept5 = new Concept(); + concept5.setUuid("child3Uuid"); + + Observation child3 = new Observation(); + child3.setConcept(concept5); + child3.setValue(new Observation.ObservationValue("Maybe")); + child3.setObsDatetime(DATE); + + Concept concept6 = new Concept(); + concept6.setUuid("parentUuid"); + + Observation parentObservation = new Observation(); + parentObservation.setObsDatetime(DATE); + parentObservation.setConcept(concept6); + parentObservation.setGroupMembers(Arrays.asList(child1, child2, child3)); + + return Collections.singletonList(parentObservation); + } + } \ No newline at end of file diff --git a/openmrs/src/test/resources/json/form/form-response.json b/openmrs/src/test/resources/json/form/form-response.json new file mode 100644 index 000000000..33acc2515 --- /dev/null +++ b/openmrs/src/test/resources/json/form/form-response.json @@ -0,0 +1,33 @@ +{ + "uuid": "a85a55d4-c1f4-4631-b9a8-694cc0973112", + "display": "test", + "name": "test", + "description": null, + "encounterType": { + "uuid": "81da9590-3f10-11e4-adec-0800271c1b75", + "display": "ADMISSION", + "links": [ + { + "rel": "self", + "uri": "http://192.168.33.10/openmrs/ws/rest/v1/encountertype/81da9590-3f10-11e4-adec-0800271c1b75" + } + ] + }, + "version": "2", + "build": null, + "published": false, + "formFields": [], + "retired": false, + "resources": [], + "links": [ + { + "rel": "self", + "uri": "http://192.168.33.10/openmrs/ws/rest/v1/form/a85a55d4-c1f4-4631-b9a8-694cc0973112" + }, + { + "rel": "full", + "uri": "http://192.168.33.10/openmrs/ws/rest/v1/form/a85a55d4-c1f4-4631-b9a8-694cc0973112?v=full" + } + ], + "resourceVersion": "1.9" +} \ No newline at end of file diff --git a/openmrs/src/test/resources/json/observation/observation-query-response.json b/openmrs/src/test/resources/json/observation/observation-query-response.json new file mode 100644 index 000000000..2ca384307 --- /dev/null +++ b/openmrs/src/test/resources/json/observation/observation-query-response.json @@ -0,0 +1,17 @@ +{ + "results":[ + { + "uuid":"DDD", + "display":"Temperature (C): 37.0", + "concept":{ + "uuid":"9bdb3fb6-4d07-11e1-a4ea-00ff26c46bb6", + "display": "CCC" + }, + "value":{ + "display":"VVV" + }, + "obsDatetime":"1962-01-01T00:00:00.000+0000", + "groupMembers":null + } + ] +} diff --git a/openmrs/src/test/resources/json/observation/observation-response.json b/openmrs/src/test/resources/json/observation/observation-response.json new file mode 100644 index 000000000..58f86957b --- /dev/null +++ b/openmrs/src/test/resources/json/observation/observation-response.json @@ -0,0 +1,12 @@ +{ + "uuid": "01a4703c-f89f-4316-803b-dc9d08da5a0a", + "display": "TestConcept: 1", + "concept": { + "uuid": "b8be9fcf-91bc-41c5-ba8e-0434343990a2" + }, + "person": { + "uuid": "c10463d2-a811-4a4b-a3d9-76a932ba6e75" + }, + "obsDatetime": "2016-07-29T10:29:50.000+0000", + "value": 1.0 +} \ No newline at end of file diff --git a/openmrs/src/test/resources/json/observation/prepare-observation.json b/openmrs/src/test/resources/json/observation/prepare-observation.json new file mode 100644 index 000000000..6fefd190c --- /dev/null +++ b/openmrs/src/test/resources/json/observation/prepare-observation.json @@ -0,0 +1,6 @@ +{ + "person": "c10463d2-a811-4a4b-a3d9-76a932ba6e75", + "obsDatetime": "2016-07-29T18:29:50.000+0800", + "concept": "b8be9fcf-91bc-41c5-ba8e-0434343990a2", + "value": 1 +} \ No newline at end of file diff --git a/openmrs/src/test/resources/json/order/order-create.json b/openmrs/src/test/resources/json/order/order-create.json new file mode 100644 index 000000000..ec3a2b635 --- /dev/null +++ b/openmrs/src/test/resources/json/order/order-create.json @@ -0,0 +1,8 @@ +{ + "type": "order", + "patient": "p123456-2821-4334-ab85-eef3cd8fea8c", + "concept": "c123456-2821-4334-ab85-eef3cd8fea8c", + "orderer": "o123456-2821-4334-ab85-eef3cd8fea8c", + "encounter": "e123456-2821-4334-ab85-eef3cd8fea8c" + +} \ No newline at end of file diff --git a/openmrs/src/test/resources/json/order/order-prepare.json b/openmrs/src/test/resources/json/order/order-prepare.json new file mode 100644 index 000000000..d4df589d3 --- /dev/null +++ b/openmrs/src/test/resources/json/order/order-prepare.json @@ -0,0 +1,15 @@ +{ + "type": "order", + "patient": { + "uuid": "p123456-2821-4334-ab85-eef3cd8fea8c" + }, + "concept": { + "uuid": "c123456-2821-4334-ab85-eef3cd8fea8c" + }, + "orderer": { + "uuid": "o123456-2821-4334-ab85-eef3cd8fea8c" + }, + "encounter": { + "uuid": "e123456-2821-4334-ab85-eef3cd8fea8c" + } +} \ No newline at end of file diff --git a/openmrs/src/test/resources/json/order/order-response.json b/openmrs/src/test/resources/json/order/order-response.json new file mode 100644 index 000000000..d4df589d3 --- /dev/null +++ b/openmrs/src/test/resources/json/order/order-response.json @@ -0,0 +1,15 @@ +{ + "type": "order", + "patient": { + "uuid": "p123456-2821-4334-ab85-eef3cd8fea8c" + }, + "concept": { + "uuid": "c123456-2821-4334-ab85-eef3cd8fea8c" + }, + "orderer": { + "uuid": "o123456-2821-4334-ab85-eef3cd8fea8c" + }, + "encounter": { + "uuid": "e123456-2821-4334-ab85-eef3cd8fea8c" + } +} \ No newline at end of file diff --git a/openmrs/src/test/resources/json/person/person-middleName-update.json b/openmrs/src/test/resources/json/person/person-middleName-update.json new file mode 100644 index 000000000..7ad347156 --- /dev/null +++ b/openmrs/src/test/resources/json/person/person-middleName-update.json @@ -0,0 +1,5 @@ +{ + "givenName":"Motech", + "middleName":"", + "familyName":"Test" +} diff --git a/pom.xml b/pom.xml index 3a2c6b7df..cd4229bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -753,6 +753,11 @@ 2.2.0 test + + org.mortbay.jetty + jetty + 6.1.24 + org.motechproject motech-pax-it @@ -1271,6 +1276,7 @@ BACKWARD_COMPATIBLE_IMPLEMENTER + true @@ -1390,8 +1396,8 @@ - Jenkins - http://ci.motechproject.org/ + Travis CI + https://travis-ci.org/mkruszynski/modules/ diff --git a/run_build.sh b/run_build.sh index b2e5e96b0..f486ba585 100644 --- a/run_build.sh +++ b/run_build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cat ~/.m2/settings.xml + if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$DB" = "psql" ]; then mvn -Dmotech.sql.password=password -Dmotech.sql.user=postgres -Dmaven.test.failure.ignore=false -Dmotech.sql.driver=org.postgresql.Driver -Dmotech.sql.dbtype=psql -Dmotech.sql.url=jdbc:postgresql://localhost:5432/ clean install -PIT -U @@ -8,12 +8,11 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then fi elif [ "$TRAVIS_BRANCH" = "master" ] && [ "$DB" = "mysql" ]; then - #mvn clean install -PIT -U - - #if [ "$?" -ne 0 ]; then - # exit 1 - #fi + mvn clean install -PIT -U + if [ "$?" -ne 0 ]; then + exit 1 + fi - mvn clean deploy --settings ./deploy-settings.xml -Dmaven.test.skip=true -U + mvn clean deploy --settings deploy-settings.xml -Dmaven.test.skip=true -U fi \ No newline at end of file