changes made for lmp and mobile update on same day

Author: dinesh-beehyv

kilkari/src/main/java/org/motechproject/nms/kilkari/service/impl/SubscriberServiceImpl.java

@@ -433,7 +433,14 @@ public Subscription updateRchMotherSubscriber(Long msisdn, MctsMother motherUpda
                 motherUpdate.setLastMenstrualPeriod(lmp);
                 motherUpdate.setUpdatedDateNic(lastUpdatedDateNic);
                 motherUpdate.setRegistrationDate(motherRegistrationDate);
-                if(subscription != null){subscriptionService.deleteCallRetry(subscription.getSubscriptionId());}
+
+                if(subscription != null){
+                    if ( !((subscriberByRchId.getLastMenstrualPeriod().getDayOfYear() == lmp.getDayOfYear()) && (subscriberByRchId.getLastMenstrualPeriod().getYear() == lmp.getYear()))) {
+                        subscriptionService.deleteCallRetry(subscription.getSubscriptionId());
+                    }else {
+                        subscriptionService.updateCallRetry(subscription.getSubscriptionId(), msisdn);
+                    }
+                }
                 return updateOrCreateSubscription(subscriberByRchId, subscription, lmp, pack, language, circle, SubscriptionOrigin.RCH_IMPORT, greaterCase);
             } else {  // we have a subscriber by phone# and also one with the RCH id
                 if (subscriptionService.activeSubscriptionByMsisdnRch(subscribersByMsisdn,msisdn, SubscriptionPackType.PREGNANCY, motherUpdate.getRchId(), null)) {
@@ -759,6 +766,14 @@ public ChildImportRejection updateRchChildSubscriber(Long msisdn, MctsChild chil
                 }
                 subscriberByRchId.setDateOfBirth(dob);
                 subscriberByRchId.setModificationDate(DateTime.now());
+                // Delete that record from retry table as beneficiary gets their mobile number update
+                if(subscription != null){
+                    if ((subscriberByRchId.getDateOfBirth().getDayOfYear() != dob.getDayOfYear())){
+                        subscriptionService.deleteCallRetry(subscription.getSubscriptionId());
+                    }else {
+                        subscriptionService.updateCallRetry(subscription.getSubscriptionId(), msisdn);
+                    }
+                }
                 finalSubscription = updateOrCreateSubscription(subscriberByRchId, subscription, dob, pack, language, circle, SubscriptionOrigin.RCH_IMPORT, false);
             } else {
                 //subscriber found with provided msisdn