Enhance company and company category search forms by adding new sortable fields (email, phone, country, state, language, currency) and updating related API documentation.

This commit is contained in:
Mazyar
2026-06-02 22:07:49 +03:30
parent 2457b76df9
commit 2090cc05ba
7 changed files with 46 additions and 59 deletions
+29
View File
@@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"strconv"
"strings"
"go.mongodb.org/mongo-driver/v2/bson"
)
@@ -189,6 +190,10 @@ func documentSortValue(docMap bson.M, sortField string) (interface{}, error) {
return id, nil
}
if strings.Contains(sortField, ".") {
return nestedDocumentValue(docMap, sortField)
}
sortValue, exists := docMap[sortField]
if !exists {
return nil, fmt.Errorf("sort field %s not found in document", sortField)
@@ -196,6 +201,30 @@ func documentSortValue(docMap bson.M, sortField string) (interface{}, error) {
return sortValue, nil
}
func nestedDocumentValue(docMap bson.M, path string) (interface{}, error) {
parts := strings.Split(path, ".")
var current interface{} = docMap
for _, part := range parts {
nested, ok := current.(bson.M)
if !ok {
if nestedMap, ok := current.(map[string]interface{}); ok {
nested = bson.M(nestedMap)
} else {
return nil, fmt.Errorf("sort field %s not found in document", path)
}
}
value, exists := nested[part]
if !exists {
return nil, fmt.Errorf("sort field %s not found in document", path)
}
current = value
}
return current, nil
}
func documentIDHex(docMap bson.M) (string, error) {
id, exists := docMap["_id"]
if !exists {
-55
View File
@@ -1,55 +0,0 @@
package mongo
import (
"strings"
"testing"
"go.mongodb.org/mongo-driver/v2/bson"
)
func TestEncodeDecodePageCursor(t *testing.T) {
encoded, err := encodePageCursor("created_at", -1, int64(1700000000), "507f1f77bcf86cd799439011", "abc123", 10)
if err != nil {
t.Fatalf("encode: %v", err)
}
if strings.Contains(encoded, "+") || strings.Contains(encoded, "/") {
t.Fatalf("expected URL-safe cursor, got %q", encoded)
}
decoded, err := decodePageCursor(encoded)
if err != nil {
t.Fatalf("decode: %v", err)
}
if decoded.SortField != "created_at" || decoded.SortOrder != -1 {
t.Fatalf("unexpected sort: %+v", decoded)
}
if decoded.FiltersHash != "abc123" || decoded.PageOffset != 10 {
t.Fatalf("unexpected metadata: %+v", decoded)
}
}
func TestBuildListPaginationCursorAndOffsetConflict(t *testing.T) {
_, err := BuildListPagination(10, 5, "cursor-token", "created_at", "desc", bson.M{}, ListPaginationOptions{})
if err == nil {
t.Fatal("expected error when cursor and offset are both set")
}
}
func TestBuildListPaginationOffsetMode(t *testing.T) {
p, err := BuildListPagination(10, 20, "", "created_at", "desc", bson.M{"status": "active"}, ListPaginationOptions{})
if err != nil {
t.Fatalf("build: %v", err)
}
if p.Skip != 20 || p.Limit != 10 || p.Cursor != "" {
t.Fatalf("unexpected pagination: %+v", p)
}
}
func TestHashFilterStable(t *testing.T) {
a := HashFilter(bson.M{"status": "active"})
b := HashFilter(bson.M{"status": "active"})
if a == "" || a != b {
t.Fatalf("expected stable non-empty hash, got %q and %q", a, b)
}
}