Merge pull request #53 from kintone-labs/SSR-2417-add_get_records_wit…

…h_total_count SSR-2417 add get records with total count
kintone-labs · Feb 21, 2023 · 33651f9 · 33651f9
2 parents cdbdce7 + c772fd8
commit 33651f9
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 3 deletions.
diff --git a/app.go b/app.go
@@ -316,6 +316,7 @@ func isJSON(contentType string) bool {
 func parseResponse(resp *http.Response) ([]byte, error) {
 	body, err := ioutil.ReadAll(resp.Body)
 	resp.Body.Close()
+
 	if err != nil {
 		return nil, err
 	}
@@ -384,7 +385,9 @@ func (app *App) getRecords(fields []string, query string, totalCount bool) ([]*R
 		Query      string   `json:"query"`
 		TotalCount bool     `json:"totalCount"`
 	}
+
 	data, _ := json.Marshal(request_body{app.AppId, fields, query, totalCount})
+
 	req, err := app.newRequest("GET", "records", bytes.NewReader(data))
 	if err != nil {
 		return nil, "", err
@@ -397,7 +400,8 @@ func (app *App) getRecords(fields []string, query string, totalCount bool) ([]*R
 	if err != nil {
 		return nil, "", err
 	}
-	recs, respTotalCount, err := DecodeRecords(body)
+	recs, respTotalCount, err := DecodeRecordsWithTotalCount(body)
+
 	if err != nil {
 		return nil, "", ErrInvalidResponse
 	}

diff --git a/app_test.go b/app_test.go
@@ -7,6 +7,7 @@ package kintone
 import (
 	"crypto/tls"
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -168,8 +169,30 @@ func handleResponseGetRecords(response http.ResponseWriter, request *http.Reques
 	checkAuth(response, request)
 	checkContentType(response, request)
 	if request.Method == "GET" {
-		testData := GetTestDataGetRecords()
-		fmt.Fprint(response, testData.output)
+		type RequestBody struct {
+			App        uint64   `json:"app,string"`
+			Fields     []string `json:"fields"`
+			Query      string   `json:"query"`
+			TotalCount bool     `json:"totalCount"`
+		}
+
+		body, err := ioutil.ReadAll(request.Body)
+		if err != nil {
+			http.Error(response, "Bad request", http.StatusBadRequest)
+			return
+		}
+		var bodyRequest RequestBody
+		if err := json.Unmarshal([]byte(body), &bodyRequest); err != nil {
+			http.Error(response, "Body incorrect", http.StatusBadRequest)
+		}
+
+		if bodyRequest.TotalCount {
+			testData := GetTestDataGetRecordsWithTotalCount()
+			fmt.Fprint(response, testData.output)
+		} else {
+			testData := GetTestDataGetRecords()
+			fmt.Fprint(response, testData.output)
+		}
 	} else if request.Method == "DELETE" {
 		testData := GetTestDataDeleteRecords()
 		fmt.Fprint(response, testData.output)
@@ -179,6 +202,8 @@ func handleResponseGetRecords(response http.ResponseWriter, request *http.Reques
 	}
 }
 
+//end
+
 func handleResponseGetRecordsComments(response http.ResponseWriter, request *http.Request) {
 	checkAuth(response, request)
 	checkContentType(response, request)
@@ -302,6 +327,22 @@ func TestGetRecord(t *testing.T) {
 	}
 }
 
+func TestGetRecordWithTotalCount(t *testing.T) {
+	testDataRecords := GetTestDataGetRecordsWithTotalCount()
+	app := newApp()
+
+	if recs, totalCount, err := app.GetRecordsWithTotalCount(testDataRecords.input[0].([]string), testDataRecords.input[1].(string)); err != nil {
+		t.Error(err)
+	} else {
+		if len(recs) > 3 {
+			t.Error("Too many records")
+		}
+		if totalCount != "999" {
+			t.Error("TotalCount incorrect", err)
+		}
+	}
+}
+
 func TestUpdateRecord(t *testing.T) {
 	testData := GetTestDataGetRecord()
 	testDataRecords := GetTestDataGetRecords()

diff --git a/app_test_json.go b/app_test_json.go
@@ -161,6 +161,55 @@ func GetTestDataGetRecords() *TestData {
 	}
 }
 
+func GetTestDataGetRecordsWithTotalCount() *TestData {
+	return &TestData{
+		input: []interface{}{
+			[]string{},
+			"limit 3 offset 3",
+		},
+		output: `
+		{
+			"records":[
+				{
+					"Created_datetime":{
+						"type":"CREATED_TIME",
+						"value":"2019-03-11T04:50:00Z"
+					},
+					"Created_by":{
+						"type":"CREATOR",
+						"value":{
+							"code":"Administrator",
+							"name":"Administrator"
+						}
+					},
+					"$id":{
+						"type":"__ID__",
+						"value":"1"
+					}
+				},
+				{
+					"Created_datetime":{
+						"type":"CREATED_TIME",
+						"value":"2019-03-11T06:42:00Z"
+					},
+					"Created_by":{
+						"type":"CREATOR",
+						"value":{
+							"code":"Administrator",
+							"name":"Administrator"
+						}
+					},
+					"$id":{
+						"type":"__ID__",
+						"value":"2"
+					}
+				}
+			],
+			"totalCount": "999"
+		}`,
+	}
+}
+
 func GetDataTestUploadFile() *TestData {
 	return &TestData{
 		output: `

diff --git a/record.go b/record.go
@@ -343,6 +343,28 @@ func DecodeRecords(b []byte) ([]*Record, string, error) {
 	return rec_list, t.TotalCount, nil
 }
 
+func DecodeRecordsWithTotalCount(b []byte) ([]*Record, string, error) {
+	var t struct {
+		Records    []recordData `json:"records"`
+		TotalCount string       `json:"totalCount"`
+	}
+	err := json.Unmarshal(b, &t)
+	if err != nil {
+		return nil, "", errors.New("Invalid JSON format")
+	}
+
+	rec_list := make([]*Record, len(t.Records))
+	for i, rd := range t.Records {
+		r, err := decodeRecordData(rd)
+		if err != nil {
+			return nil, "", err
+		}
+		rec_list[i] = r
+	}
+
+	return rec_list, t.TotalCount, nil
+}
+
 // DecodeRecord decodes JSON response for single-get API.
 func DecodeRecord(b []byte) (*Record, error) {
 	var t struct {

diff --git a/record_test.go b/record_test.go
@@ -389,3 +389,76 @@ func TestDecodeRecords(t *testing.T) {
 		t.Error("dropdown must be invalid")
 	}
 }
+
+func TestDecodeRecordsWithTotalCount(t *testing.T) {
+	b := []byte(`
+	{
+		"records": [
+			{
+				"record_id": {
+					"type": "RECORD_NUMBER",
+					"value": "1"
+				},
+				"created_time": {
+					"type": "CREATED_TIME",
+					"value": "2012-02-03T08:50:00Z"
+				},
+				"updated_time": {
+					"type": "UPDATED_TIME",
+					"value": "2018-10-24T08:50:00Z"
+				},
+				"dropdown": {
+					"type": "DROP_DOWN",
+					"value": null
+				}
+			},
+			{
+				"record_id": {
+					"type": "RECORD_NUMBER",
+					"value": "2"
+				},
+				"created_time": {
+					"type": "CREATED_TIME",
+					"value": "2012-02-03T09:22:00Z"
+				},
+				"updated_time": {
+					"type": "UPDATED_TIME",
+					"value": "2018-10-24T09:22:00Z"
+				},
+				"dropdown": {
+					"type": "DROP_DOWN",
+					"value": null
+				}
+			}
+		],
+		"totalCount": "9999"
+	}`)
+
+	type Record struct {
+		id       uint64
+		revision int64
+		Fields   map[string]interface{}
+	}
+
+	rec, totalCount, err := DecodeRecordsWithTotalCount(b)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	if totalCount != "9999" {
+		t.Error("totalCount is incorrect")
+	}
+	if len(rec) != 2 {
+		t.Error("length mismatch")
+	}
+	if _, ok := rec[0].Fields["record_id"]; !ok {
+		t.Error("record_id must exist")
+	}
+	dropdown, ok := rec[0].Fields["dropdown"]
+	if !ok {
+		t.Error("null dropdown field must exist")
+	}
+	if dropdown.(SingleSelectField).Valid {
+		t.Error("dropdown must be invalid")
+	}
+}