Merge pull request #697 from motech-implementations/kilkari-csv-impor…

…t-fix Added Last_Update_date to mapping of csvReader
motech-implementations · Oct 5, 2016 · 00b8da3 · 00b8da3
2 parents 3faa539 + 8f61d8e
commit 00b8da3
Show file tree

Hide file tree

Showing 15 changed files with 176 additions and 89 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>api</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>API module</name>
 

diff --git a/csv/pom.xml b/csv/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>csv</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>CSV Module</name>
 

diff --git a/flw/pom.xml b/flw/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>flw</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>FLW module</name>
 

diff --git a/flwUpdate/pom.xml b/flwUpdate/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>flwUpdate</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>FLW Update Module</name>
 

diff --git a/imi/pom.xml b/imi/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>imi</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>IMI module</name>
 

diff --git a/kilkari/pom.xml b/kilkari/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>kilkari</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>Kilkari module</name>
 

diff --git a/...ain/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java b/...ain/java/org/motechproject/nms/kilkari/service/impl/MctsBeneficiaryImportServiceImpl.java
@@ -193,6 +193,8 @@ public boolean importMotherRecord(Map<String, Object> record) {
 
         //validate if it's an updated record compared to one from database
         if (mother.getUpdatedDateNic() != null && (mctsUpdatedDateNic == null || mother.getUpdatedDateNic().isAfter(mctsUpdatedDateNic))) {
+            subscriptionErrorDataService.create(new SubscriptionError(msisdn, mother.getBeneficiaryId(),
+                    SubscriptionRejectionReason.ALREADY_SUBSCRIBED, SubscriptionPackType.PREGNANCY, "Updated Record exits"));
             return false;
         }
 
@@ -267,6 +269,8 @@ public boolean importChildRecord(Map<String, Object> record) {
 
         //validate if it's an updated record compared to one from database
         if (child.getUpdatedDateNic() != null && (mctsUpdatedDateNic == null || child.getUpdatedDateNic().isAfter(mctsUpdatedDateNic))) {
+            subscriptionErrorDataService.create(new SubscriptionError(msisdn, child.getBeneficiaryId(),
+                    SubscriptionRejectionReason.ALREADY_SUBSCRIBED, SubscriptionPackType.CHILD, "Updated Record exits"));
             return false;
         }
 
@@ -419,7 +423,12 @@ public Boolean retrieve(String value) {
                 return mctsBeneficiaryValueProcessor.getDeathFromString(value);
             }
         }));
-
+        mapping.put(KilkariConstants.LAST_UPDATE_DATE, new Optional(new GetInstanceByString<LocalDate>() {
+            @Override
+            public LocalDate retrieve(String value) {
+                return (LocalDate) mctsBeneficiaryValueProcessor.getDateByString(value).toLocalDate();
+            }
+        }));
         return mapping;
     }
 
@@ -459,7 +468,12 @@ public Boolean retrieve(String value) {
                 return mctsBeneficiaryValueProcessor.getDeathFromString(value);
             }
         }));
-
+        mapping.put(KilkariConstants.LAST_UPDATE_DATE, new Optional(new GetInstanceByString<LocalDate>() {
+            @Override
+            public LocalDate retrieve(String value) {
+                return (LocalDate) mctsBeneficiaryValueProcessor.getDateByString(value).toLocalDate();
+            }
+        }));
         return mapping;
     }
 }
diff --git a/mcts/pom.xml b/mcts/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>mcts</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>Mother Children Tracking Service</name>
 

diff --git a/mobile-academy/pom.xml b/mobile-academy/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>mobile-academy</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>Mobile Academy module</name>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <artifactId>nms</artifactId>
     <groupId>org.motechproject.nms</groupId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>pom</packaging>
     <name>National Motech System</name>
 

diff --git a/props/pom.xml b/props/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>props</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>Properties module</name>
 

diff --git a/region/pom.xml b/region/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>region</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>Region Module</name>
 

diff --git a/testing/pom.xml b/testing/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <artifactId>nms</artifactId>
         <groupId>org.motechproject.nms</groupId>
-        <version>1.0.21</version>
+        <version>1.0.22</version>
         <relativePath>../</relativePath>
     </parent>
 
     <artifactId>testing</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <packaging>bundle</packaging>
     <name>Testing module</name>