fix collection and namespace switching

functional-tests/admin_tests/url_shortener.ts

@@ -13,7 +13,7 @@ export const requestHandler = (ctx: any) => {
             return;
         }
         // get the document with the ID from the collection
-        return getDocument("short_link", pathId)
+        return getDocument(pathId, "short_link")
             .then((doc: any) => {
                 // check if the document contains the URL
                 if (!doc?.data?.url) {

internal/admin/routes/collection_routes.go

@@ -197,7 +197,7 @@ func ConfigureCollectionAPI(server chi.Router, logger *zap.Logger, cs changestat
 			return
 		}
 
-		document, err := dm.GetDocumentByID(collectionName, namespaceName, documentId)
+		document, err := dm.GetDocumentByID(documentId, collectionName, namespaceName)
 		if err != nil {
 			util.JsonError(w, http.StatusNotFound, err.Error())
 			return
@@ -351,7 +351,7 @@ func ConfigureCollectionAPI(server chi.Router, logger *zap.Logger, cs changestat
 			util.JsonError(w, http.StatusBadRequest, "document_id is required")
 			return
 		}
-		document, err := dm.GetDocumentByID(collectionName, namespaceName, documentId)
+		document, err := dm.GetDocumentByID(documentId, collectionName, namespaceName)
 		if err != nil {
 			util.JsonError(w, http.StatusNotFound, err.Error())
 			return

internal/proxy/proxy_documents.go

@@ -22,12 +22,12 @@ func (ps *ProxyState) GetDocuments(collection, namespace string, limit, offset i
 }
 
 // GetDocumentByID is a function that returns a document in a collection by its ID.
-func (ps *ProxyState) GetDocumentByID(namespace, collection, docId string) (*spec.Document, error) {
+func (ps *ProxyState) GetDocumentByID(docId, collection, namespace string) (*spec.Document, error) {
 	if _, ok := ps.rm.GetNamespace(namespace); !ok {
 		return nil, spec.ErrNamespaceNotFound(namespace)
 	}
-	if _, ok := ps.rm.GetCollection(namespace, collection); !ok {
+	if _, ok := ps.rm.GetCollection(collection, namespace); !ok {
 		return nil, spec.ErrCollectionNotFound(collection)
 	}
-	return ps.store.FetchDocument(namespace, collection, docId)
+	return ps.store.FetchDocument(docId, collection, namespace)
 }

internal/proxy/proxystore/proxy_store.go

@@ -92,12 +92,12 @@ func (store *ProxyStore) DeleteChangeLogs(logs []*spec.ChangeLog) (int, error) {
 	return removed, nil
 }
 
-func createDocumentKey(nsName, colName, docId string) string {
+func createDocumentKey(docId, colName, nsName string) string {
 	return "doc/" + nsName + "/" + colName + "/" + docId
 }
 
-func (store *ProxyStore) FetchDocument(nsName, colName, docId string) (*spec.Document, error) {
-	docBytes, err := store.storage.Get(createDocumentKey(nsName, colName, docId))
+func (store *ProxyStore) FetchDocument(docId, colName, nsName string) (*spec.Document, error) {
+	docBytes, err := store.storage.Get(createDocumentKey(docId, colName, nsName))
 	if err != nil {
 		if err == storage.ErrStoreLocked {
 			return nil, err
@@ -119,7 +119,7 @@ func (store *ProxyStore) FetchDocuments(
 	limit, offset int,
 ) ([]*spec.Document, error) {
 	docs := make([]*spec.Document, 0)
-	docPrefix := createDocumentKey(namespaceName, collectionName, "")
+	docPrefix := createDocumentKey("", collectionName, namespaceName)
 	err := store.storage.IterateValuesPrefix(docPrefix, func(key string, val []byte) error {
 		if offset -= 1; offset > 0 {
 			return nil
@@ -145,15 +145,15 @@ func (store *ProxyStore) StoreDocument(doc *spec.Document) error {
 		return err
 	}
 	store.logger.Debug("storing document")
-	err = store.storage.Set(createDocumentKey(doc.NamespaceName, doc.CollectionName, doc.ID), docBytes)
+	err = store.storage.Set(createDocumentKey(doc.ID, doc.CollectionName, doc.NamespaceName), docBytes)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func (store *ProxyStore) DeleteDocument(id, colName, nsName string) error {
-	err := store.storage.Delete(createDocumentKey(nsName, colName, id))
+	err := store.storage.Delete(createDocumentKey(id, colName, nsName))
 	if err != nil {
 		if err == badger.ErrKeyNotFound {
 			return nil
@@ -164,7 +164,7 @@ func (store *ProxyStore) DeleteDocument(id, colName, nsName string) error {
 }
 
 func (store *ProxyStore) DeleteDocuments(doc *spec.Document) error {
-	err := store.storage.IterateTxnPrefix(createDocumentKey(doc.NamespaceName, doc.CollectionName, ""),
+	err := store.storage.IterateTxnPrefix(createDocumentKey("", doc.CollectionName, doc.NamespaceName),
 		func(txn storage.StorageTxn, key string) error {
 			return txn.Delete(key)
 		})

pkg/modules/dgate/state/state_mod.go

@@ -23,8 +23,8 @@ func (hp *ResourcesModule) Exports() *modules.Exports {
 	return &modules.Exports{
 		Named: map[string]any{
 			"getCollection":    hp.fetchCollection,
-			"getDocument":      hp.fetchDocument,
-			"getDocuments":     hp.fetchDocuments,
+			"getDocument":      hp.getDocument,
+			"getDocuments":     hp.getDocuments,
 			"addCollection":    writeFunc[*spec.Collection](hp, spec.AddCollectionCommand),
 			"addDocument":      writeFunc[*spec.Document](hp, spec.AddDocumentCommand),
 			"deleteCollection": writeFunc[*spec.Collection](hp, spec.DeleteCollectionCommand),
@@ -48,7 +48,7 @@ func (hp *ResourcesModule) fetchCollection(name string) *goja.Promise {
 			))
 			return
 		}
-		collection, ok := rm.GetCollection(namespace.(string), name)
+		collection, ok := rm.GetCollection(name, namespace.(string))
 		if !ok {
 			reject(goja.Null())
 			return
@@ -58,7 +58,7 @@ func (hp *ResourcesModule) fetchCollection(name string) *goja.Promise {
 	return docPromise
 }
 
-func (hp *ResourcesModule) fetchDocument(collection, docId string) *goja.Promise {
+func (hp *ResourcesModule) getDocument(docId, collection string) *goja.Promise {
 	ctx := hp.modCtx.Context()
 	state := hp.modCtx.State()
 	loop := hp.modCtx.EventLoop()
@@ -71,7 +71,7 @@ func (hp *ResourcesModule) fetchDocument(collection, docId string) *goja.Promise
 			return
 		}
 		doc, err := state.DocumentManager().
-			GetDocumentByID(collection, namespace.(string), docId)
+			GetDocumentByID(docId, collection, namespace.(string))
 		if err != nil {
 			reject(rt.NewGoError(err))
 			return
@@ -81,25 +81,20 @@ func (hp *ResourcesModule) fetchDocument(collection, docId string) *goja.Promise
 	return docPromise
 }
 
-func (hp *ResourcesModule) fetchDocuments(args goja.FunctionCall) (*goja.Promise, error) {
+type FetchDocumentsPayload struct {
+	Collection string `json:"collection"`
+	Limit      int    `json:"limit"`
+	Offset     int    `json:"offset"`
+}
+
+func (hp *ResourcesModule) getDocuments(payload FetchDocumentsPayload) (*goja.Promise, error) {
 	ctx := hp.modCtx.Context()
 	state := hp.modCtx.State()
 	loop := hp.modCtx.EventLoop()
 	rt := hp.modCtx.Runtime()
 
-	collection := ""
-	if args.Argument(0) == goja.Undefined() {
+	if payload.Collection == "" {
 		return nil, errors.New("collection name is required")
-	} else {
-		collection = args.Argument(0).String()
-	}
-	limit := 0
-	if args.Argument(1) != goja.Undefined() {
-		limit = int(args.Argument(1).ToInteger())
-	}
-	offset := 0
-	if args.Argument(2) != goja.Undefined() {
-		offset = int(args.Argument(2).ToInteger())
 	}
 
 	namespaceVal := ctx.Value(spec.Name("namespace"))
@@ -112,8 +107,10 @@ func (hp *ResourcesModule) fetchDocuments(args goja.FunctionCall) (*goja.Promise
 	loop.RunOnLoop(func(rt *goja.Runtime) {
 		doc, err := state.DocumentManager().
 			GetDocuments(
-				collection, namespace,
-				limit, offset,
+				payload.Collection,
+				namespace,
+				payload.Limit,
+				payload.Offset,
 			)
 		if err != nil {
 			reject(rt.NewGoError(err))

pkg/resources/document_manager.go

@@ -5,6 +5,6 @@ import (
 )
 
 type DocumentManager interface {
-	GetDocumentByID(collection, namespace, id string) (*spec.Document, error)
+	GetDocumentByID(id, collection, namespace string) (*spec.Document, error)
 	GetDocuments(collection, namespace string, limit, offset int) ([]*spec.Document, error)
 }