Checkpoint

Author: steve-r-west

README.md

@@ -639,8 +639,8 @@ func Example(ast *epsearchast_v3.AstNode, collection *mongo.Collection, tenantBo
 
 The following operators are currently supported:
 - `text` - Full-text search with analyzers
-- `eq` - Exact case-sensitive equality matching (supports string and UUID fields)
-- `in` - Multiple value exact matching (supports string and UUID fields)
+- `eq` - Exact case-sensitive equality matching (string fields only)
+- `in` - Multiple value exact matching (string fields only)
 - `like` - Case-sensitive wildcard matching
 - `ilike` - Case-insensitive wildcard matching
 - `gt` - Greater than (lexicographic comparison for strings)
@@ -696,17 +696,12 @@ To support `like` and `ilike` operators with proper case sensitivity handling, y
         {
           "type": "token"
         }
-      ],
-      "id": {
-        "type": "token"
-      }
+      ]
     }
   }
 }
 ```
 
-**Note on UUID Fields**: MongoDB Atlas Search (cloud) supports a dedicated `uuid` field type, but `token` type works for UUID string values in both Atlas Search and MongoDB Community Search editions. The query builder treats both the same way.
-
 **Query Builder Configuration:**
 
 The `FieldToMultiAnalyzers` map specifies which multi-analyzer to use for each field:
@@ -728,15 +723,15 @@ This allows you to mix fields with and without multi-analyzer support in the sam
 ##### Limitations
 
 1. The following operators are not yet implemented: `contains`, `contains_any`, `contains_all`, `is_null`
-2. Range operators (`gt`, `ge`, `lt`, `le`) perform lexicographic comparison on string fields. For numeric comparisons, ensure fields are indexed with appropriate numeric types
-3. Atlas Search requires proper [search index configuration](https://www.mongodb.com/docs/atlas/atlas-search/create-index/) with appropriate field types:
+2. The following field types are not currently supported: UUID fields, Date fields, Numeric fields (numbers are compared as strings)
+3. Range operators (`gt`, `ge`, `lt`, `le`) perform lexicographic comparison on string fields only
+4. Atlas Search requires proper [search index configuration](https://www.mongodb.com/docs/atlas/atlas-search/create-index/) with appropriate field types:
    - String fields used with `like`/`ilike` should be indexed with multi-analyzers as shown above
    - String fields used with `eq`/`in` should be indexed with `token` type
    - String fields used with range operators (`gt`/`ge`/`lt`/`le`) work with `token` type for lexicographic comparison
-   - UUID fields should be indexed with `token` type
    - Text fields should be indexed with `string` type and an appropriate analyzer
-4. Unlike regular MongoDB queries, Atlas Search queries use the aggregation pipeline with the `$search` stage
-5. Additional filters (like tenant boundaries) should be added as separate `$match` stages in the pipeline
+5. Unlike regular MongoDB queries, Atlas Search queries use the aggregation pipeline with the `$search` stage
+6. Additional filters (like tenant boundaries) should be added as separate `$match` stages in the pipeline
 
 ### FAQ
 

docker-compose.yml

@@ -70,7 +70,7 @@ services:
       - "/keyfile"
       - "--auth"
     ports:
-      - '20004:27017'
+      - '127.0.0.1:20004:27017'
     volumes:
       - mongo-community:/data/db:delegated
     configs:
@@ -96,7 +96,7 @@ services:
     hostname: mongo-community-search
     image: mongodb/mongodb-community-search:0.55.0
     ports:
-      - 20005:27027
+      - '127.0.0.1:20005:27027'
     volumes:
       - mongo-community-search:/data/mongot:delegated
     configs:

mongo/mongo_atlas_search_query_builder.go

@@ -1,11 +1,11 @@
-package epsearchast_v3_mongo
+package astmongo
 
 import (
 	"fmt"
 	"strings"
 
-	epsearchast_v3 "github.com/elasticpath/epcc-search-ast-helper/external/epsearchast/v3"
-	"go.mongodb.org/mongo-driver/bson"
+	"github.com/elasticpath/epcc-search-ast-helper"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type DefaultAtlasSearchQueryBuilder struct {
@@ -27,7 +27,7 @@ type StringMultiAnalyzers struct {
 	WildcardCaseSensitive string
 }
 
-var _ epsearchast_v3.SemanticReducer[bson.D] = (*DefaultAtlasSearchQueryBuilder)(nil)
+var _ epsearchast.SemanticReducer[bson.D] = (*DefaultAtlasSearchQueryBuilder)(nil)
 
 func (d DefaultAtlasSearchQueryBuilder) PostVisitAnd(rs []*bson.D) (*bson.D, error) {
 	// https://www.mongodb.com/docs/atlas/atlas-search/compound/

mongo/mongo_atlas_search_query_builder_int_test.go

@@ -1,15 +1,15 @@
-package epsearchast_v3_mongo
+package astmongo
 
 import (
 	"context"
 	"fmt"
 	"testing"
 	"time"
 
-	epsearchast_v3 "github.com/elasticpath/epcc-search-ast-helper/external/epsearchast/v3"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"github.com/elasticpath/epcc-search-ast-helper"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
@@ -19,7 +19,7 @@ func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
 
 	// Connect to Atlas Search enabled MongoDB
 	ctx := context.Background()
-	atlasClient, err := mongo.Connect(ctx, options.Client().ApplyURI("mongodb://admin:admin@localhost:20004/?replicaSet=rs0&directConnection=true"))
+	atlasClient, err := mongo.Connect(options.Client().ApplyURI("mongodb://admin:admin@localhost:20004/?replicaSet=rs0&directConnection=true"))
 	if err != nil {
 		t.Fatalf("Failed to connect to MongoDB Atlas Search: %v", err)
 	}
@@ -36,19 +36,22 @@ func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
 			"nullable_string_field": nil,
 			"text_field":            "Developers like IDEs",
 			"uuid_field":            "550e8400-e29b-41d4-a716-446655440001",
+			"date_field":            time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
 		},
 		bson.M{
 			"string_field":          "test2 test2",
 			"array_field":           []string{"c c", "d d"},
 			"nullable_string_field": "yay yay",
 			"text_field":            "I like Development Environments",
 			"uuid_field":            "550e8400-e29b-41d4-a716-446655440002",
+			"date_field":            time.Date(2024, 6, 15, 0, 0, 0, 0, time.UTC),
 		},
 		bson.M{
 			"string_field": "test3 test3",
 			"array_field":  []string{"c c"},
 			"text_field":   "Vim is the best",
 			"uuid_field":   "550e8400-e29b-41d4-a716-446655440003",
+			"date_field":   time.Date(2024, 12, 31, 0, 0, 0, 0, time.UTC),
 		},
 	}
 
@@ -339,60 +342,6 @@ func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
 					}`,
 			count: 2,
 		},
-		{
-			// Test EQ on UUID field - exact match
-			//language=JSON
-			filter: `{
-						"type": "EQ",
-						"args": ["uuid_field", "550e8400-e29b-41d4-a716-446655440001"]
-					}`,
-			count: 1,
-		},
-		{
-			// Test EQ on UUID field - different UUID
-			//language=JSON
-			filter: `{
-						"type": "EQ",
-						"args": ["uuid_field", "550e8400-e29b-41d4-a716-446655440002"]
-					}`,
-			count: 1,
-		},
-		{
-			// Test EQ on UUID field - non-existent UUID
-			//language=JSON
-			filter: `{
-						"type": "EQ",
-						"args": ["uuid_field", "550e8400-e29b-41d4-a716-446655440099"]
-					}`,
-			count: 0,
-		},
-		{
-			// Test IN on UUID field - multiple values
-			//language=JSON
-			filter: `{
-						"type": "IN",
-						"args": ["uuid_field", "550e8400-e29b-41d4-a716-446655440001", "550e8400-e29b-41d4-a716-446655440002"]
-					}`,
-			count: 2,
-		},
-		{
-			// Test IN on UUID field - single value
-			//language=JSON
-			filter: `{
-						"type": "IN",
-						"args": ["uuid_field", "550e8400-e29b-41d4-a716-446655440003"]
-					}`,
-			count: 1,
-		},
-		{
-			// Test IN on UUID field - no matches
-			//language=JSON
-			filter: `{
-						"type": "IN",
-						"args": ["uuid_field", "550e8400-e29b-41d4-a716-446655440099", "550e8400-e29b-41d4-a716-446655440098"]
-					}`,
-			count: 0,
-		},
 		{
 			// Test GT on string field - lexicographic comparison
 			//language=JSON
@@ -530,9 +479,12 @@ func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
 						},
 					}},
 					// uuid_field: indexed as token for equals and in operations
-					// Note: token type works for UUID string values
 					{"uuid_field", bson.D{
-						{"type", "token"},
+						{"type", "uuid"},
+					}},
+					// date_field: indexed as token for range and equality operations
+					{"date_field", bson.D{
+						{"type", "date"},
 					}},
 				}},
 			}},
@@ -565,7 +517,7 @@ func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
 
 			// Create query builder
 			// Configure multi-analyzers for fields that support LIKE/ILIKE
-			var qb epsearchast_v3.SemanticReducer[bson.D] = DefaultAtlasSearchQueryBuilder{
+			var qb epsearchast.SemanticReducer[bson.D] = DefaultAtlasSearchQueryBuilder{
 				FieldToMultiAnalyzers: map[string]*StringMultiAnalyzers{
 					"string_field": {
 						WildcardCaseInsensitive: "keywordAnalyzer",
@@ -579,12 +531,12 @@ func TestSmokeTestAtlasSearchWithFilters(t *testing.T) {
 			}
 
 			// Create Query Object
-			ast, err := epsearchast_v3.GetAst(tc.filter)
+			ast, err := epsearchast.GetAst(tc.filter)
 			if err != nil {
 				t.Fatalf("Failed to get filter: %v", err)
 			}
 
-			query, err := epsearchast_v3.SemanticReduceAst(ast, qb)
+			query, err := epsearchast.SemanticReduceAst(ast, qb)
 
 			if err != nil {
 				t.Fatalf("Failed to reduce AST: %v", err)