#3043: Add geosearch query for locations

NCI-Agency · Jul 24, 2020 · e840813 · e840813
1 parent aa51f0f
commit e840813
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git a/src/main/java/mil/dds/anet/beans/search/LocationSearchQuery.java b/src/main/java/mil/dds/anet/beans/search/LocationSearchQuery.java
@@ -10,6 +10,10 @@ public class LocationSearchQuery extends AbstractSearchQuery<LocationSearchSortB
   @GraphQLInputField
   private LocationStatus status;
 
+  @GraphQLQuery
+  @GraphQLInputField
+  private String withinPolygon;
+
   public LocationSearchQuery() {
     super(LocationSearchSortBy.NAME);
   }
@@ -22,4 +26,12 @@ public void setStatus(LocationStatus status) {
     this.status = status;
   }
 
+  public String getWithinPolygon() {
+    return withinPolygon;
+  }
+
+  public void setWithinPolygon(String withinPolygon) {
+    this.withinPolygon = withinPolygon;
+  }
+
 }
diff --git a/src/main/java/mil/dds/anet/search/AbstractLocationSearcher.java b/src/main/java/mil/dds/anet/search/AbstractLocationSearcher.java
@@ -40,11 +40,17 @@ protected void buildQuery(LocationSearchQuery query) {
       qb.addSqlArg("userUuid", DaoUtils.getUuid(query.getUser()));
     }
 
+    if (query.getWithinPolygon() != null) {
+      addWithinPolygon(query);
+    }
+
     addOrderByClauses(qb, query);
   }
 
   protected abstract void addTextQuery(LocationSearchQuery query);
 
+  protected abstract void addWithinPolygon(LocationSearchQuery query);
+
   protected void addOrderByClauses(AbstractSearchQueryBuilder<?, ?> qb, LocationSearchQuery query) {
     switch (query.getSortBy()) {
       case CREATED_AT:

diff --git a/src/main/java/mil/dds/anet/search/AbstractSearcher.java b/src/main/java/mil/dds/anet/search/AbstractSearcher.java
@@ -80,6 +80,18 @@ protected void addFullTextSearch(String tableName, String text, boolean isSortBy
     }
   }
 
+  protected void addWithinPolygonMssql(String locationUuidColumn, String queryText) {
+    qb.addWhereClause(String.format(
+        "\"%1$s\" IN (SELECT \"uuid\" FROM locations WHERE \"geometry\".STWithin(geometry::STGeomFromText('%2$s', 3857)) = 1)",
+        locationUuidColumn, queryText));
+  }
+
+  protected void addWithinPolygonPsql(String locationUuidColumn, String queryText) {
+    qb.addWhereClause(String.format(
+        "\"%1$s\" IN (SELECT \"uuid\" FROM locations WHERE ST_Within(\"geometry\", ST_GeomFromText('%2$s', 3857)))",
+        locationUuidColumn, queryText));
+  }
+
   protected List<String> getOrderBy(SortOrder sortOrder, String table, String... columns) {
     final List<String> clauses = new ArrayList<>();
     for (final String column : columns) {

diff --git a/src/main/java/mil/dds/anet/search/mssql/MssqlLocationSearcher.java b/src/main/java/mil/dds/anet/search/mssql/MssqlLocationSearcher.java
@@ -26,6 +26,11 @@ protected void addTextQuery(LocationSearchQuery query) {
     qb.addSqlArg("containsQuery", qb.getContainsQuery(text));
   }
 
+  @Override
+  protected void addWithinPolygon(LocationSearchQuery query) {
+    addWithinPolygonMssql("uuid", query.getWithinPolygon());
+  }
+
   @Override
   protected void addOrderByClauses(AbstractSearchQueryBuilder<?, ?> qb, LocationSearchQuery query) {
     if (query.isTextPresent() && !query.isSortByPresent()) {

diff --git a/src/main/java/mil/dds/anet/search/pg/PostgresqlLocationSearcher.java b/src/main/java/mil/dds/anet/search/pg/PostgresqlLocationSearcher.java
@@ -18,6 +18,11 @@ protected void addTextQuery(LocationSearchQuery query) {
     addFullTextSearch("locations", query.getText(), query.isSortByPresent());
   }
 
+  @Override
+  protected void addWithinPolygon(LocationSearchQuery query) {
+    addWithinPolygonPsql("uuid", query.getWithinPolygon());
+  }
+
   @Override
   protected void addOrderByClauses(AbstractSearchQueryBuilder<?, ?> qb, LocationSearchQuery query) {
     if (query.isTextPresent() && !query.isSortByPresent()) {