From cd486281e8f78eb4166c7e3454f857bf7aed280e Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Thu, 29 Aug 2024 16:50:43 +0530 Subject: [PATCH 1/6] Plan config name-implemented fuzzy search --- .../digit/repository/querybuilder/PlanConfigQueryBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java b/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java index 6dc4449b55..74deaa36da 100644 --- a/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java +++ b/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java @@ -105,8 +105,8 @@ private String buildPlanConfigSearchQuery(PlanConfigurationSearchCriteria criter if (criteria.getName() != null) { addClauseIfRequired(preparedStmtList, builder); - builder.append(" pc.name = ?"); - preparedStmtList.add(criteria.getName()); + builder.append(" pc.name LIKE ?"); + preparedStmtList.add(criteria.getName() + '%'); } if (criteria.getStatus() != null) { From 4397a69b1bc2253d1a7ca3ac4a9fd605fc0a6b54 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Fri, 13 Sep 2024 13:32:40 +0530 Subject: [PATCH 2/6] moved "%" to serviceConstants file --- .../src/main/java/digit/config/ServiceConstants.java | 2 ++ .../digit/repository/querybuilder/PlanConfigQueryBuilder.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/health-services/plan-service/src/main/java/digit/config/ServiceConstants.java b/health-services/plan-service/src/main/java/digit/config/ServiceConstants.java index 2266c82de9..ed278e05a1 100644 --- a/health-services/plan-service/src/main/java/digit/config/ServiceConstants.java +++ b/health-services/plan-service/src/main/java/digit/config/ServiceConstants.java @@ -110,4 +110,6 @@ public class ServiceConstants { public static final String MDMS_SCHEMA_PROPERTIES_IS_REQUIRED = "isRequired"; public static final String BOUNDARY_CODE = "boundaryCode"; + public static final String PERCENTAGE_WILDCARD = "%"; + } diff --git a/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java b/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java index 74deaa36da..94e799589f 100644 --- a/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java +++ b/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import static digit.config.ServiceConstants.*; @Component public class PlanConfigQueryBuilder { @@ -106,7 +107,7 @@ private String buildPlanConfigSearchQuery(PlanConfigurationSearchCriteria criter if (criteria.getName() != null) { addClauseIfRequired(preparedStmtList, builder); builder.append(" pc.name LIKE ?"); - preparedStmtList.add(criteria.getName() + '%'); + preparedStmtList.add(criteria.getName() + PERCENTAGE_WILDCARD); } if (criteria.getStatus() != null) { From fad64358ab1c4823e7d8558c3c823c72541b5255 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Tue, 1 Oct 2024 15:11:17 +0530 Subject: [PATCH 3/6] added status --- .../src/main/java/digit/web/models/PlanConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java b/health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java index 135f4991a8..44191134a9 100644 --- a/health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java +++ b/health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java @@ -87,7 +87,8 @@ public class PlanConfiguration { public enum StatusEnum { DRAFT , GENERATED, - INVALID_DATA + INVALID_DATA, + SETUP_COMPLETED } } From 9bd33cdc5eda980db6f400a65ee433109a8cab10 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Thu, 3 Oct 2024 13:48:11 +0530 Subject: [PATCH 4/6] modified changes --- .../java/org/egov/project/config/ProjectConfiguration.java | 3 +++ .../org/egov/project/validator/project/ProjectValidator.java | 2 +- .../project/src/main/resources/application.properties | 5 ++++- .../src/main/resources/db/Dockerfile | 2 +- .../src/main/resources/db/migrate.sh | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/health-services/project/src/main/java/org/egov/project/config/ProjectConfiguration.java b/health-services/project/src/main/java/org/egov/project/config/ProjectConfiguration.java index 26759e381e..67ee5a87af 100644 --- a/health-services/project/src/main/java/org/egov/project/config/ProjectConfiguration.java +++ b/health-services/project/src/main/java/org/egov/project/config/ProjectConfiguration.java @@ -222,4 +222,7 @@ public class ProjectConfiguration { @Value("${project.task.no.resource.validation.status}") private List noResourceStatuses; + + @Value("${project.attendance.feature.enabled:true}") + private Boolean isAttendanceFeatureEnabled; } diff --git a/health-services/project/src/main/java/org/egov/project/validator/project/ProjectValidator.java b/health-services/project/src/main/java/org/egov/project/validator/project/ProjectValidator.java index 266f664312..9aaba88a42 100644 --- a/health-services/project/src/main/java/org/egov/project/validator/project/ProjectValidator.java +++ b/health-services/project/src/main/java/org/egov/project/validator/project/ProjectValidator.java @@ -75,7 +75,7 @@ public void validateCreateProjectRequest(ProjectRequest request) { //Verify MDMS Data // TODO: Uncomment and fix as per HCM once we get clarity // validateRequestMDMSData(request, tenantId, errorMap); - validateAttendanceSessionAgainstMDMS(request,errorMap,tenantId); + if(config.getIsAttendanceFeatureEnabled()) validateAttendanceSessionAgainstMDMS(request,errorMap,tenantId); //Get boundaries in list from all Projects in request body for validation Map> boundariesForValidation = getBoundaryForValidation(request.getProjects()); diff --git a/health-services/project/src/main/resources/application.properties b/health-services/project/src/main/resources/application.properties index 93f601466a..71af8eab0d 100644 --- a/health-services/project/src/main/resources/application.properties +++ b/health-services/project/src/main/resources/application.properties @@ -180,4 +180,7 @@ project.location.capture.kafka.create.topic=save-location-capture-project-topic project.location.capture.consumer.bulk.create.topic=save-location-capture-project-bulk-topic #---------No resource statuses ------------# -project.task.no.resource.validation.status=ADMINISTRATION_FAILED, BENEFICIARY_REFUSED, CLOSED_HOUSEHOLD, NOT_ADMINISTERED \ No newline at end of file +project.task.no.resource.validation.status=ADMINISTRATION_FAILED, BENEFICIARY_REFUSED, CLOSED_HOUSEHOLD, NOT_ADMINISTERED + +#---------Attendance Feature ------------# +project.attendance.feature.enabled=true diff --git a/health-services/resource-estimation-service/src/main/resources/db/Dockerfile b/health-services/resource-estimation-service/src/main/resources/db/Dockerfile index 60fc07ce69..f5241a8f86 100644 --- a/health-services/resource-estimation-service/src/main/resources/db/Dockerfile +++ b/health-services/resource-estimation-service/src/main/resources/db/Dockerfile @@ -1,4 +1,4 @@ -FROM egovio/flyway:4.1.2 +FROM egovio/flyway:10.7.1 COPY ./migration/main /flyway/sql diff --git a/health-services/resource-estimation-service/src/main/resources/db/migrate.sh b/health-services/resource-estimation-service/src/main/resources/db/migrate.sh index 43960b25cd..c58d6f91e3 100644 --- a/health-services/resource-estimation-service/src/main/resources/db/migrate.sh +++ b/health-services/resource-estimation-service/src/main/resources/db/migrate.sh @@ -1,3 +1,3 @@ #!/bin/sh -flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate \ No newline at end of file +flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate \ No newline at end of file From 74f7c81f79ece1fb47117c321033c908f4c5b791 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Fri, 4 Oct 2024 12:17:18 +0530 Subject: [PATCH 5/6] removed service util --- .../src/main/java/digit/util/ServiceUtil.java | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 health-services/plan-service/src/main/java/digit/util/ServiceUtil.java diff --git a/health-services/plan-service/src/main/java/digit/util/ServiceUtil.java b/health-services/plan-service/src/main/java/digit/util/ServiceUtil.java deleted file mode 100644 index 5195999053..0000000000 --- a/health-services/plan-service/src/main/java/digit/util/ServiceUtil.java +++ /dev/null @@ -1,23 +0,0 @@ -package digit.util; - -import org.springframework.stereotype.Component; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -@Component -public class ServiceUtil { - - /** - * Validates the given input string against the provided regex pattern. - * - * @param patternString the regex pattern to validate against - * @param inputString the input string to be validated - * @return true if the input string matches the regex pattern, false otherwise - */ - public Boolean validateStringAgainstRegex(String patternString, String inputString) { - Pattern pattern = Pattern.compile(patternString); - Matcher matcher = pattern.matcher(inputString); - return matcher.matches(); - } -} From bc177b0032ed9a0ae8389381ab3cc6ac6602c444 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Fri, 4 Oct 2024 12:34:44 +0530 Subject: [PATCH 6/6] resolved comment --- .../digit/repository/querybuilder/PlanConfigQueryBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java b/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java index f5a38b53c1..5106f01679 100644 --- a/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java +++ b/health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import static digit.config.ServiceConstants.*; +import static digit.config.ServiceConstants.PERCENTAGE_WILDCARD; @Component public class PlanConfigQueryBuilder {