Written location_xml_tests and Kilkari_retry_call_test

AutoIncrementIDsScript.sql

@@ -0,0 +1,16 @@
+use motech_data_services;
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE `nms_districts` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT ;
+ALTER TABLE `nms_talukas` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT ;
+ALTER TABLE `nms_health_blocks` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `nms_health_facilities` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `nms_health_sub_facilities` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `nms_villages` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `nms_mother_rejects` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `nms_child_rejects` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `nms_imi_cdrs` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT ;
+ALTER TABLE `nms_imi_csrs` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT ;
+ALTER TABLE `motech_data_services`.`nms_taluka_healthblock` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `motech_data_services`.`nms_village_healthsubfacility` CHANGE COLUMN `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
+SET FOREIGN_KEY_CHECKS=1;
+

api/pom.xml

@@ -1,154 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>nms</artifactId>
-        <groupId>org.motechproject.nms</groupId>
-        <version>1.0.31</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <artifactId>api</artifactId>
-    <version>1.0.31</version>
-    <packaging>bundle</packaging>
-    <name>API module</name>
-
-    <properties>
-        <modules.root.dir>${basedir}/..</modules.root.dir>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.motechproject</groupId>
-            <artifactId>motech-platform-osgi-extender-fragment</artifactId>
-            <version>${motech.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.motechproject.nms</groupId>
-            <artifactId>region</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.motechproject.nms</groupId>
-            <artifactId>props</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.motechproject.nms</groupId>
-            <artifactId>flw</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.motechproject.nms</groupId>
-            <artifactId>kilkari</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.motechproject.nms</groupId>
-            <artifactId>mobile-academy</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.motechproject.nms</groupId>
-            <artifactId>mcts</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test-mvc</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>motech-repo</id>
-            <name>MOTECH Maven Repository</name>
-            <url>http://nexus.motechproject.org/content/repositories/public</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.5</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Blueprint-Enabled>true</Blueprint-Enabled>
-                        <Resource-Path>api/resources</Resource-Path>
-                        <Context-Path>api</Context-Path>
-                        <Export-Package>
-                            org.motechproject.nms.api.web.contract,
-                            org.motechproject.nms.api.web.contract.kilkari,
-                            org.motechproject.nms.api.web.contract.mobileAcademy,
-                            org.motechproject.nms.api.web.contract.mobileAcademy.sms,
-                            org.motechproject.nms.api.web.converter,
-                            org.motechproject.nms.api.web.repository,
-                            org.motechproject.nms.api.web.domain
-                        </Export-Package>
-                        <Import-Package>
-                            org.motechproject.osgi.web,
-                            org.aopalliance.aop,
-                            org.springframework.aop,
-                            org.springframework.aop.framework,
-                            net.sf.cglib.core,
-                            net.sf.cglib.proxy,
-                            net.sf.cglib.reflect,
-                            org.springframework.web.multipart.commons,
-                            org.springframework.transaction,
-                            org.motechproject.nms.kilkari.repository,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>copy-bundles</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${user.home}/.motech/bundles</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>target</directory>
-                                    <includes>
-                                        <include>*.jar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>nms</artifactId>
+        <groupId>org.motechproject.nms</groupId>
+        <version>1.0.38.1</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <artifactId>api</artifactId>
+    <version>1.0.38.1</version>
+    <packaging>bundle</packaging>
+    <name>API module</name>
+
+    <properties>
+        <modules.root.dir>${basedir}/..</modules.root.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.motechproject</groupId>
+            <artifactId>motech-platform-osgi-extender-fragment</artifactId>
+            <version>${motech.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>region</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>props</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>flw</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>kilkari</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>mobile-academy</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>mcts</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test-mvc</artifactId>
+       </dependency>-->
+
+        <dependency>
+            <groupId>org.motechproject.nms</groupId>
+            <artifactId>rch</artifactId>
+            <version>1.0.38.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
+
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>motech-repo</id>
+            <name>MOTECH Maven Repository</name>
+            <url>http://nexus.motechproject.org/content/repositories/public</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.5</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Blueprint-Enabled>true</Blueprint-Enabled>
+                        <Resource-Path>api/resources</Resource-Path>
+                        <Context-Path>api</Context-Path>
+                        <Export-Package>
+                            org.motechproject.nms.api.web.contract,
+                            org.motechproject.nms.api.web.contract.kilkari,
+                            org.motechproject.nms.api.web.contract.mobileAcademy,
+                            org.motechproject.nms.api.web.contract.mobileAcademy.sms,
+                            org.motechproject.nms.api.web.converter,
+                            org.motechproject.nms.api.web.repository,
+                            org.motechproject.nms.api.web.domain,
+                            org.motechproject.nms.api.web.service
+                        </Export-Package>
+                        <Import-Package>
+                            org.motechproject.osgi.web,
+                            org.aopalliance.aop,
+                            org.springframework.aop,
+                            org.springframework.aop.framework,
+                            net.sf.cglib.core,
+                            net.sf.cglib.proxy,
+                            net.sf.cglib.reflect,
+                            org.springframework.web.multipart.commons,
+                            org.springframework.transaction,
+                            org.motechproject.nms.flw.repository,
+                            org.motechproject.nms.mcts.service,
+                            org.motechproject.nms.kilkari.repository,
+                            org.motechproject.nms.kilkari.service,
+                            org.motechproject.nms.kilkari.domain,
+                            org.motechproject.nms.kilkari.utils,
+                            org.motechproject.nms.rejectionhandler.service,
+                            org.motechproject.nms.region.repository,
+                            org.motechproject.nms.region.service,
+                            org.motechproject.nms.rch.service,
+                            org.datanucleus.enhancement,
+                            org.springframework.validation.beanvalidation,
+                            org.springframework.cglib.proxy,
+                            org.springframework.cglib.core,
+                            org.springframework.core,
+                            org.springframework.cglib.reflect,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-bundles</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${user.home}/.motech/bundles</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>target</directory>
+                                    <includes>
+                                        <include>*.jar</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

api/src/main/java/org/motechproject/nms/api/web/KilkariController.java

@@ -330,5 +330,7 @@ public void deactivateSubscription(@RequestBody SubscriptionRequest subscription
         }
 
         subscriptionService.deactivateSubscription(subscription, DeactivationReason.DEACTIVATED_BY_USER);
+
+        log("RESPONSE: /kilkari/subscription (DELETE)", "Success");
     }
 }

api/src/main/java/org/motechproject/nms/api/web/LanguageController.java

@@ -4,6 +4,7 @@
 import org.motechproject.nms.api.web.exception.NotAuthorizedException;
 import org.motechproject.nms.api.web.exception.NotDeployedException;
 import org.motechproject.nms.api.web.exception.NotFoundException;
+import org.motechproject.nms.flw.domain.FlwJobStatus;
 import org.motechproject.nms.flw.domain.FrontLineWorker;
 import org.motechproject.nms.flw.service.FrontLineWorkerService;
 import org.motechproject.nms.props.domain.Service;
@@ -76,6 +77,7 @@ public void setUserLanguageLocationCode(@PathVariable String serviceName,
         FrontLineWorker flw = frontLineWorkerService.getByContactNumber(callingNumber);
         if (flw == null) {
             flw = new FrontLineWorker(callingNumber);
+            flw.setJobStatus(FlwJobStatus.ACTIVE);
         }
 
         Language language = languageService.getForCode(languageLocationCode);