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 1528951de9..1ffa2824d0 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 @@ -180,4 +180,5 @@ public class ServiceConstants { public static final String VEHICLE_ID_FIELD = "vehicleIds"; + 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 6d1c3cd6a3..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,6 +9,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import static digit.config.ServiceConstants.PERCENTAGE_WILDCARD; @Component public class PlanConfigQueryBuilder { @@ -105,8 +106,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() + PERCENTAGE_WILDCARD); } if (criteria.getStatus() != null) { 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 } }