Merge pull request #873 from go-kivik/allDocsMulti

multi-query _all_docs & POST _all_docs
go-kivik · Feb 4, 2024 · e415338 · e415338
2 parents 9ddd03f + fe78a6e
commit e415338
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 5 deletions.
diff --git a/x/server/db.go b/x/server/db.go
@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"path/filepath"
 	"strconv"
 	"time"
 
@@ -228,8 +229,18 @@ loop:
 func (s *Server) allDocs() httpe.HandlerWithError {
 	return httpe.HandlerWithErrorFunc(func(w http.ResponseWriter, r *http.Request) error {
 		req := map[string]interface{}{}
-		if err := s.bind(r, &req); err != nil {
-			return err
+		if _, last := filepath.Split(r.URL.Path); last == "queries" {
+			var jsonReq struct {
+				Queries []map[string]interface{} `json:"queries"`
+			}
+			if err := s.bind(r, &jsonReq); err != nil {
+				return err
+			}
+			req["queries"] = jsonReq.Queries
+		} else {
+			if err := s.bind(r, &req); err != nil {
+				return err
+			}
 		}
 		db := chi.URLParam(r, "db")
 		rows := s.client.DB(db).AllDocs(r.Context(), options(r))

diff --git a/x/server/db_test.go b/x/server/db_test.go
@@ -148,7 +148,92 @@ func Test_allDocs(t *testing.T) {
 				return client
 			}(),
 			wantStatus: http.StatusOK,
-			// wantBodyRE: "xxx",
+			wantJSON: map[string]interface{}{
+				"offset": 0,
+				"rows": []interface{}{
+					map[string]interface{}{
+						"id":  "foo",
+						"key": "foo",
+						"value": map[string]interface{}{
+							"rev": "1-beea34a62a215ab051862d1e5d93162e",
+						},
+					},
+				},
+				"total_rows": 99,
+			},
+		},
+		{
+			name:     "multi queries defaults",
+			authUser: userAdmin,
+			method:   http.MethodPost,
+			path:     "/db1/_all_docs/queries",
+			headers: map[string]string{
+				"Content-Type": "application/json",
+			},
+			body: strings.NewReader(`{"queries": [{"keys": ["foo", "bar"]}]}`),
+			client: func() *kivik.Client {
+				client, mock, err := mockdb.New()
+				if err != nil {
+					t.Fatal(err)
+				}
+				db := mock.NewDB()
+				mock.ExpectDB().WillReturn(db)
+				db.ExpectSecurity().WillReturn(&driver.Security{})
+				mock.ExpectDB().WillReturn(db)
+				db.ExpectAllDocs().WillReturn(mockdb.NewRows().
+					AddRow(&driver.Row{
+						ID:    "foo",
+						Key:   []byte(`"foo"`),
+						Value: strings.NewReader(`{"rev": "1-beea34a62a215ab051862d1e5d93162e"}`),
+					}).
+					TotalRows(99),
+				)
+				return client
+			}(),
+			wantStatus: http.StatusOK,
+			wantJSON: map[string]interface{}{
+				"offset": 0,
+				"rows": []interface{}{
+					map[string]interface{}{
+						"id":  "foo",
+						"key": "foo",
+						"value": map[string]interface{}{
+							"rev": "1-beea34a62a215ab051862d1e5d93162e",
+						},
+					},
+				},
+				"total_rows": 99,
+			},
+		},
+		{
+			name:     "POST _all_docs",
+			authUser: userAdmin,
+			method:   http.MethodPost,
+			path:     "/db1/_all_docs",
+			headers: map[string]string{
+				"Content-Type": "application/json",
+			},
+			body: strings.NewReader(`{"keys": ["foo", "bar"]}`),
+			client: func() *kivik.Client {
+				client, mock, err := mockdb.New()
+				if err != nil {
+					t.Fatal(err)
+				}
+				db := mock.NewDB()
+				mock.ExpectDB().WillReturn(db)
+				db.ExpectSecurity().WillReturn(&driver.Security{})
+				mock.ExpectDB().WillReturn(db)
+				db.ExpectAllDocs().WillReturn(mockdb.NewRows().
+					AddRow(&driver.Row{
+						ID:    "foo",
+						Key:   []byte(`"foo"`),
+						Value: strings.NewReader(`{"rev": "1-beea34a62a215ab051862d1e5d93162e"}`),
+					}).
+					TotalRows(99),
+				)
+				return client
+			}(),
+			wantStatus: http.StatusOK,
 			wantJSON: map[string]interface{}{
 				"offset": 0,
 				"rows": []interface{}{

diff --git a/x/server/server.go b/x/server/server.go
@@ -151,8 +151,8 @@ func (s *Server) routes(mux *chi.Mux) {
 		admin.Put("/", e(s.createDB()))
 		admin.Delete("/", e(s.deleteDB()))
 		member.Get("/_all_docs", e(s.allDocs()))
-		member.Post("/_all_docs/queries", e(s.notImplemented()))
-		member.Post("/_all_docs", e(s.notImplemented()))
+		member.Post("/_all_docs/queries", e(s.allDocs()))
+		member.Post("/_all_docs", e(s.allDocs()))
 		member.Get("/_design_docs", e(s.notImplemented()))
 		member.Post("/_design_docs", e(s.notImplemented()))
 		member.Post("/_design_docs/queries", e(s.notImplemented()))