Search defaulter cases for given tenantId.

case-management/pom.xml

@@ -95,6 +95,21 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.6</version>
+        </dependency>
+
+
+        <!-- Egov dependencies -->
+        <dependency>
+            <groupId>org.egov</groupId>
+            <artifactId>mdms-client</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
     <repositories>
         <repository>

case-management/src/main/java/egov/Main.java

@@ -5,7 +5,7 @@
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@ComponentScan(basePackages = { "egov", "egov.dataupload.web.controllers" , "egov.dataupload.config"})
+@ComponentScan(basePackages = { "egov", "egov.casemanagement.web.controllers" , "egov.casemanagement.config"})
 public class Main {
         public static void main(String[] args) throws Exception {
             SpringApplication.run(Main.class, args);

case-management/src/main/java/egov/dataupload/config/Configuration.java → case-management/src/main/java/egov/casemanagement/config/Configuration.java

@@ -1,4 +1,4 @@
-package egov.dataupload.config;
+package egov.casemanagement.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.*;
@@ -104,4 +104,22 @@ public MappingJackson2HttpMessageConverter jacksonConverter(ObjectMapper objectM
     @Value("${egov.root.tenant.id}")
     private String rootTenantId;
 
+    @Value("${send.email.topic}")
+    private String sendEmailTopic;
+
+    @Value("${send.sms.topic}")
+    private String sendSmsTopic;
+
+    @Value("${cova.health.record.topic}")
+    private String covaHealthRecordTopic;
+
+    @Value("${cova.fetch.url}")
+    private String covaFetchUrl;
+
+    @Value("${cova.create.health.record.url}")
+    private String covaCreateHealthRecordUrl;
+
+    @Value("${cova.auth.token}")
+    private String covaAuthToken;
+
 }

case-management/src/main/java/egov/dataupload/config/MainConfiguration.java → case-management/src/main/java/egov/casemanagement/config/MainConfiguration.java

@@ -1,4 +1,4 @@
-package egov.dataupload.config;
+package egov.casemanagement.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -54,4 +54,9 @@ public RestHighLevelClient client(){
         RestHighLevelClient client = new RestHighLevelClient(builder);
         return client;
     }
+
+    @Bean
+    public RestClient restClient(){
+        return client().getLowLevelClient();
+    }
 }

case-management/src/main/java/egov/dataupload/models/AuditDetails.java → case-management/src/main/java/egov/casemanagement/models/AuditDetails.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models;
+package egov.casemanagement.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;

case-management/src/main/java/egov/dataupload/models/Idgen/IdGenerationRequest.java → case-management/src/main/java/egov/casemanagement/models/Idgen/IdGenerationRequest.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.Idgen;
+package egov.casemanagement.models.Idgen;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

case-management/src/main/java/egov/dataupload/models/Idgen/IdGenerationResponse.java → case-management/src/main/java/egov/casemanagement/models/Idgen/IdGenerationResponse.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.Idgen;
+package egov.casemanagement.models.Idgen;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

case-management/src/main/java/egov/dataupload/models/Idgen/IdRequest.java → case-management/src/main/java/egov/casemanagement/models/Idgen/IdRequest.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.Idgen;
+package egov.casemanagement.models.Idgen;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

case-management/src/main/java/egov/dataupload/models/Idgen/IdResponse.java → case-management/src/main/java/egov/casemanagement/models/Idgen/IdResponse.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.Idgen;
+package egov.casemanagement.models.Idgen;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

case-management/src/main/java/egov/casemanagement/models/cova/CovaData.java

@@ -0,0 +1,18 @@
+package egov.casemanagement.models.cova;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class CovaData {
+    @JsonProperty("mobile_no")
+    private String mobileNumber = null;
+
+    @JsonProperty("district_name")
+    private String district = null;
+
+}

case-management/src/main/java/egov/casemanagement/models/cova/CovaSearchResponse.java

@@ -0,0 +1,22 @@
+package egov.casemanagement.models.cova;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class CovaSearchResponse {
+    @JsonProperty("response")
+    private int response = 0;
+
+    @JsonProperty("sys_message")
+    private String sys_message = null;
+
+    @JsonProperty("data")
+    private List<CovaData> data = null;
+}

case-management/src/main/java/egov/dataupload/models/sign/SignRequest.java → case-management/src/main/java/egov/casemanagement/models/sign/SignRequest.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.sign;
+package egov.casemanagement.models.sign;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

case-management/src/main/java/egov/dataupload/models/sign/SignResponse.java → case-management/src/main/java/egov/casemanagement/models/sign/SignResponse.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.sign;
+package egov.casemanagement.models.sign;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;

case-management/src/main/java/egov/dataupload/models/user/CreateUserRequest.java → case-management/src/main/java/egov/casemanagement/models/user/CreateUserRequest.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.user;
+package egov.casemanagement.models.user;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

case-management/src/main/java/egov/dataupload/models/user/User.java → case-management/src/main/java/egov/casemanagement/models/user/User.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.user;
+package egov.casemanagement.models.user;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;

data-upload/src/main/java/egov/dataupload/models/user/UserDetailResponse.java → case-management/src/main/java/egov/casemanagement/models/user/UserDetailResponse.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.user;
+package egov.casemanagement.models.user;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

data-upload/src/main/java/egov/dataupload/models/user/UserSearchRequest.java → case-management/src/main/java/egov/casemanagement/models/user/UserSearchRequest.java

@@ -1,4 +1,4 @@
-package egov.dataupload.models.user;
+package egov.casemanagement.models.user;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;

case-management/src/main/java/egov/dataupload/producer/Producer.java → case-management/src/main/java/egov/casemanagement/producer/Producer.java

@@ -1,4 +1,4 @@
-package egov.dataupload.producer;
+package egov.casemanagement.producer;
 
 import lombok.extern.slf4j.Slf4j;
 import org.egov.tracer.kafka.CustomKafkaTemplate;

case-management/src/main/java/egov/dataupload/repository/ElasticSearchRepository.java → case-management/src/main/java/egov/casemanagement/repository/ElasticSearchRepository.java

@@ -1,19 +1,17 @@
-package egov.dataupload.repository;
+package egov.casemanagement.repository;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import egov.dataupload.config.Configuration;
-import egov.dataupload.web.models.CaseSearchRequest;
-import egov.dataupload.web.models.ModelCase;
+import egov.casemanagement.config.Configuration;
+import egov.casemanagement.web.models.CaseSearchRequest;
+import egov.casemanagement.web.models.ModelCase;
 import lombok.extern.slf4j.Slf4j;
 import org.egov.tracer.model.CustomException;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.*;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,8 +38,18 @@ public class ElasticSearchRepository implements SearchRepository{
 
     @Override
     public List<ModelCase> searchCases(CaseSearchRequest request){
-        SearchRequest searchRequest = new SearchRequest(configuration.getEsIndexName());
         SearchSourceBuilder sourceBuilder = getSearchBody(request);
+        return getCasesFromES(sourceBuilder);
+    }
+
+    @Override
+    public List<ModelCase> searchDefaulterCases(String tenantId, Long timestamp) {
+        SearchSourceBuilder searchSourceBuilder = getSearchBodyForDefaulterCases(tenantId, timestamp);
+        return getCasesFromES(searchSourceBuilder);
+    }
+
+    private List<ModelCase> getCasesFromES(SearchSourceBuilder sourceBuilder) {
+        SearchRequest searchRequest = new SearchRequest(configuration.getEsIndexName());
         searchRequest.source(sourceBuilder);
 
         List<ModelCase> cases = new ArrayList<>();
@@ -68,19 +76,19 @@ private SearchSourceBuilder getSearchBody(CaseSearchRequest request) {
         List<QueryBuilder> queries = new ArrayList<>();
 
         if(request.getCaseId() != null)
-            queries.add(QueryBuilders.termsQuery("case.caseId.keyword", request.getCaseId()));
+            queries.add(QueryBuilders.termsQuery("case.caseId", request.getCaseId()));
 
         if(request.getUserUuids() != null)
-            queries.add(QueryBuilders.termsQuery("case.userUuid.keyword", request.getUserUuids()));
+            queries.add(QueryBuilders.termsQuery("case.userUuid", request.getUserUuids()));
 
         if(request.getStatus() != null)
-            queries.add(QueryBuilders.termsQuery("case.status.keyword", request.getStatus()));
+            queries.add(QueryBuilders.termsQuery("case.status", request.getStatus()));
 
         if(request.getUuid() != null)
-            queries.add(QueryBuilders.termsQuery("case.uuid.keyword", request.getUuid()));
+            queries.add(QueryBuilders.termsQuery("case.uuid", request.getUuid()));
 
         if(request.getTenantId() != null)
-            queries.add(QueryBuilders.termsQuery("case.tenantId.keyword", request.getTenantId()));
+            queries.add(QueryBuilders.termsQuery("case.tenantId", request.getTenantId()));
 
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         for (QueryBuilder curr : queries) {
@@ -90,4 +98,27 @@ private SearchSourceBuilder getSearchBody(CaseSearchRequest request) {
         sourceBuilder.query(boolQueryBuilder);
         return sourceBuilder;
     }
+
+    private SearchSourceBuilder getSearchBodyForDefaulterCases(String tenantId, Long timestamp) {
+
+
+        RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("case.healthDetails.auditDetails.lastModifiedTime");
+        rangeQueryBuilder.gte(timestamp);
+
+        MatchQueryBuilder statusQuery = QueryBuilders.matchQuery("case.status", "active");
+
+        MatchQueryBuilder tenantIdQuery = QueryBuilders.matchQuery("case.tenantId", tenantId);
+
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        boolQueryBuilder.should(statusQuery);
+        boolQueryBuilder.should(tenantIdQuery);
+        boolQueryBuilder.mustNot(rangeQueryBuilder);
+
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().timeout(new TimeValue(60, TimeUnit.SECONDS));
+
+        sourceBuilder.query(boolQueryBuilder);
+
+        return sourceBuilder;
+    }
+
 }

case-management/src/main/java/egov/dataupload/repository/IdGenRepository.java → case-management/src/main/java/egov/casemanagement/repository/IdGenRepository.java

@@ -1,11 +1,11 @@
-package egov.dataupload.repository;
+package egov.casemanagement.repository;
 
 
-import egov.dataupload.config.Configuration;
-import egov.dataupload.models.Idgen.IdGenerationRequest;
-import egov.dataupload.models.Idgen.IdGenerationResponse;
-import egov.dataupload.models.Idgen.IdRequest;
-import egov.dataupload.models.Idgen.IdResponse;
+import egov.casemanagement.config.Configuration;
+import egov.casemanagement.models.Idgen.IdGenerationRequest;
+import egov.casemanagement.models.Idgen.IdGenerationResponse;
+import egov.casemanagement.models.Idgen.IdRequest;
+import egov.casemanagement.models.Idgen.IdResponse;
 import org.egov.common.contract.request.RequestInfo;
 import org.egov.tracer.model.CustomException;
 import org.egov.tracer.model.ServiceCallException;

case-management/src/main/java/egov/casemanagement/repository/SearchRepository.java

@@ -0,0 +1,11 @@
+package egov.casemanagement.repository;
+
+import egov.casemanagement.web.models.CaseSearchRequest;
+import egov.casemanagement.web.models.ModelCase;
+
+import java.util.List;
+
+public interface SearchRepository {
+    public List<ModelCase> searchCases(CaseSearchRequest request);
+    List<ModelCase> searchDefaulterCases(String tenantId, Long timestamp);
+}

case-management/src/main/java/egov/dataupload/repository/ServiceRequestRepository.java → case-management/src/main/java/egov/casemanagement/repository/ServiceRequestRepository.java

@@ -1,4 +1,4 @@
-package egov.dataupload.repository;
+package egov.casemanagement.repository;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -30,9 +30,9 @@ public ServiceRequestRepository(ObjectMapper mapper, RestTemplate restTemplate)
 	public Object fetchResult(String uri, Object request) {
 		mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 		Object response = null;
-		log.info("URI: "+uri.toString());
+		log.info("URI: "+ uri);
 		try {
-			response = restTemplate.postForObject(uri.toString(), request, Map.class);
+			response = restTemplate.postForObject(uri, request, Map.class);
 		}catch(HttpClientErrorException e) {
 			log.error("External Service threw an Exception: ",e);
 			throw new ServiceCallException(e.getResponseBodyAsString());

case-management/src/main/java/egov/dataupload/repository/SignatureRepository.java → case-management/src/main/java/egov/casemanagement/repository/SignatureRepository.java

@@ -1,10 +1,10 @@
-package egov.dataupload.repository;
+package egov.casemanagement.repository;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import egov.dataupload.config.Configuration;
-import egov.dataupload.models.sign.SignRequest;
-import egov.dataupload.models.sign.SignResponse;
+import egov.casemanagement.config.Configuration;
+import egov.casemanagement.models.sign.SignRequest;
+import egov.casemanagement.models.sign.SignResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.egov.tracer.model.CustomException;
 import org.springframework.beans.factory.annotation.Autowired;