Merge pull request #10 from UPHRH-platform/delete-form

Delete form

src/main/java/com/tarento/formservice/controllers/FormsController.java

@@ -78,7 +78,7 @@ public class FormsController {
 		}
 		return ResponseGenerator.successResponse(formsService.getFormById(formId));
 	}
-
+	
 	@PostMapping(value = PathRoutes.FormServiceApi.CREATE_FORM)
 	public String createForm(@RequestBody FormDetail form,
 			@RequestHeader(value = Constants.Parameters.X_USER_INFO, required = false) String xUserInfo)

src/main/java/com/tarento/formservice/model/Status.java

@@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum Status {
 	DRAFT("Draft"), NEW("New"), REVIEW("Review"), PUBLISH("Publish"), UNPUBLISH("Unpublish"), INSCOMPLETED(
-			"INSCOMPLETED"), LEADINSCOMPLETED("LEADINSCOMPLETED"), SENTFORINS("SENTFORINS");
+			"INSCOMPLETED"), LEADINSCOMPLETED("LEADINSCOMPLETED"), SENTFORINS("SENTFORINS"),
+	DELETED("Deleted"),DUPLICATE("Duplicate");
 
 	private String value;
 

src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java

@@ -286,13 +286,14 @@ public class FormsServiceImpl implements FormsService {
         } else {
             boolQuery.must(QueryBuilders.matchPhraseQuery(Constants.STATUS, Status.PUBLISH.name()));
         }
+        boolQuery.mustNot(QueryBuilders.matchPhraseQuery(Constants.STATUS, Status.DELETED.name()));
 
         return boolQuery;
     }
 
     private SearchRequest buildQueryForGetQueryById(Long id) {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().size(0)
-                .query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("id", id)))
+                .query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("id", id)).mustNot(QueryBuilders.matchPhraseQuery(Constants.STATUS, Status.DELETED.name())))
                 .aggregation(AggregationBuilders.terms("UniqueFormId").field("id").size(100)
                         .subAggregation(AggregationBuilders.topHits("LatestVersion").from(0).size(1)
                                 .version(Boolean.FALSE).explain(Boolean.FALSE)