added a few tests

Author: patelraj0602

document-store/src/test/java/org/hypertrace/core/documentstore/model/config/TypesafeConfigDatastoreConfigExtractorTest.java

@@ -321,6 +321,32 @@ void testBuildPostgresUsingDefaultKeys() {
     assertEquals(expected, config);
   }
 
+  @Test
+  void testBuildPostgresUsingDefaultKeysAndCustomParams() {
+    final ConnectionConfig config =
+        TypesafeConfigDatastoreConfigExtractor.from(
+                buildConfigMapWithDefaultKeysAndCustomParamsForPostgres(), TYPE_KEY)
+            .extract()
+            .connectionConfig();
+    final ConnectionConfig expected =
+        ConnectionConfig.builder()
+            .type(DatabaseType.POSTGRES)
+            .addEndpoint(Endpoint.builder().host(host).port(port).build())
+            .database(database)
+            .credentials(ConnectionCredentials.builder().username(user).password(password).build())
+            .applicationName(appName)
+            .connectionPoolConfig(
+                ConnectionPoolConfig.builder()
+                    .maxConnections(maxConnections)
+                    .connectionAccessTimeout(accessTimeout)
+                    .connectionSurrenderTimeout(surrenderTimeout)
+                    .build())
+            .customParameter("flatStructureCollection", "earth")
+            .build();
+
+    assertEquals(expected, config);
+  }
+
   private Config buildConfigMap() {
     return ConfigFactory.parseMap(
         Map.ofEntries(
@@ -355,6 +381,22 @@ private Config buildConfigMapWithDefaultKeysForPostgres() {
             entry("connectionIdleTime", surrenderTimeout)));
   }
 
+  private Config buildConfigMapWithDefaultKeysAndCustomParamsForPostgres() {
+    return ConfigFactory.parseMap(
+        Map.ofEntries(
+            entry(TYPE_KEY, "postgres"),
+            entry("postgres.host", host),
+            entry("postgres.port", port),
+            entry("postgres.database", database),
+            entry("postgres.user", user),
+            entry("postgres.password", password),
+            entry("appName", appName),
+            entry("maxPoolSize", maxConnections),
+            entry("connectionAccessTimeout", accessTimeout),
+            entry("connectionIdleTime", surrenderTimeout),
+            entry("customParams.flatStructureCollection", "earth")));
+  }
+
   private Config buildConfigMapUsingDefaultKeysForMongo() {
     return ConfigFactory.parseMap(
         Map.ofEntries(

document-store/src/test/java/org/hypertrace/core/documentstore/postgres/query/v1/PostgresQueryParserTest.java

@@ -638,6 +638,7 @@ void testFindWithSortingAndPagination() {
             .setPagination(pagination)
             .build();
 
+    // json field
     PostgresQueryParser postgresQueryParser =
         new PostgresQueryParser(TEST_TABLE, PostgresQueryTransformer.transform(query));
     String sql = postgresQueryParser.parse();
@@ -661,6 +662,21 @@ void testFindWithSortingAndPagination() {
     assertEquals("Bottle", params.getObjectParams().get(7));
     assertEquals(1, params.getObjectParams().get(9));
     assertEquals(3, params.getObjectParams().get(10));
+
+    // non-json field
+    postgresQueryParser =
+        new PostgresQueryParser(
+            TEST_TABLE, PostgresQueryTransformer.transform(query), "testCollection");
+    assertEquals(
+        "SELECT \"item\" AS \"item\", "
+            + "\"price\" AS \"price\", "
+            + "\"quantity\" AS \"quantity\", "
+            + "\"date\" AS \"date\" "
+            + "FROM \"testCollection\" "
+            + "WHERE \"item\" && ARRAY[?, ?, ?, ?]::text[] "
+            + "ORDER BY \"quantity\" DESC NULLS LAST,\"item\" ASC NULLS FIRST "
+            + "OFFSET ? LIMIT ?",
+        postgresQueryParser.parse());
   }
 
   @Test