Boolean tokens, 'in' and 'divby' operators, 'geo.intersects' operator, 'IN' operator

.github/workflows/go.yml

@@ -0,0 +1,26 @@
+name: Go
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master, master-intersight ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...
+

errors.go

@@ -1,38 +1,66 @@
 package godata
 
+import "fmt"
+
 type GoDataError struct {
 	ResponseCode int
 	Message      string
+	Cause        error
 }
 
 func (err *GoDataError) Error() string {
 	return err.Message
 }
 
+func (err *GoDataError) Unwrap() error {
+	return err.Cause
+}
+
+func (err *GoDataError) SetCause(e error) *GoDataError {
+	err.Cause = e
+	return err
+}
+
 func BadRequestError(message string) *GoDataError {
-	return &GoDataError{400, message}
+	return &GoDataError{400, message, nil}
 }
 
 func NotFoundError(message string) *GoDataError {
-	return &GoDataError{404, message}
+	return &GoDataError{404, message, nil}
 }
 
 func MethodNotAllowedError(message string) *GoDataError {
-	return &GoDataError{405, message}
+	return &GoDataError{405, message, nil}
 }
 
 func GoneError(message string) *GoDataError {
-	return &GoDataError{410, message}
+	return &GoDataError{410, message, nil}
 }
 
 func PreconditionFailedError(message string) *GoDataError {
-	return &GoDataError{412, message}
+	return &GoDataError{412, message, nil}
 }
 
 func InternalServerError(message string) *GoDataError {
-	return &GoDataError{500, message}
+	return &GoDataError{500, message, nil}
 }
 
 func NotImplementedError(message string) *GoDataError {
-	return &GoDataError{501, message}
+	return &GoDataError{501, message, nil}
+}
+
+type UnsupportedQueryParameterError struct {
+	Parameter string
+}
+
+func (err *UnsupportedQueryParameterError) Error() string {
+	return fmt.Sprintf("Query parameter '%s' is not supported", err.Parameter)
+}
+
+type DuplicateQueryParameterError struct {
+	Parameter string
+}
+
+func (err *DuplicateQueryParameterError) Error() string {
+	return fmt.Sprintf("Query parameter '%s' cannot be specified more than once", err.Parameter)
 }

example/main.go

@@ -1,8 +1,10 @@
 package example
 
+/*
 import (
 	. "godata"
 )
+*/
 
 func HelloWorld() {
 
@@ -17,58 +19,60 @@ func AuthorizationMiddleware() {
 }
 
 func main() {
-	provider := &MySQLGoDataProvider{
-		Hostname: "localhost",
-		Port:     "3306",
-		Database: "Coffee",
-		Username: "dev",
-		Password: "dev",
-	}
-
-	roaster := provider.ExposeEntity("roaster", "Roaster")
-	roaster.ExposeKey("id", "RoasterID", GoDataInt32)
-	roaster.ExposePrimitive("name", "Name", GoDataString)
-	roaster.ExposePrimitive("location", "Location", GoDataString)
-	roaster.ExposePrimitive("website", "Website", GoDataString)
-	roasterSet := provider.ExposeEntitySet(roaster, "Roasters")
-
-	variety := provider.ExposeEntity("variety", "Variety")
-	variety.ExposeKey("id", "VarietyID", GoDataInt32)
-	variety.ExposePrimitive("name", "Name", GoDataString)
-	varietySet := provider.ExposeEntitySet(variety, "Varieties")
-
-	roastLevel := provider.ExposeEntity("roast_level", "RoastLevel")
-	roastLevel.ExposeKey("id", "RoastLevelID", GoDataInt32)
-	roastLevel.ExposePrimitive("order", "Order", GoDataInt32)
-	roastLevel.ExposePrimitive("name", "Name", GoDataString)
-	roastLevel.ExposePrimitive("qualifier", "Qualifier", GoDataString)
-	roastLevelSet := provider.ExposeEntitySet(roastLevel, "RoastLevels")
-
-	process := provider.ExposeEntity("process", "Process")
-	process.ExposeKey("id", "ProcessID", GoDataInt32)
-	process.ExposePrimitive("name", "Name", GoDataString)
-	processSet := provider.ExposeEntitySet(process, "Processes")
-
-	bean := provider.ExposeEntity("bean", "Bean")
-	bean.ExposeKey("id", "BeanID", GoDataInt32)
-	bean.ExposePrimitive("country", "Country", GoDataString)
-	bean.ExposePrimitive("region", "Region", GoDataString)
-	bean.ExposePrimitive("min_elevation", "MinElevation", GoDataInt32)
-	bean.ExposePrimitive("max_elevation", "MaxElevation", GoDataInt32)
-	beanSet := provider.ExposeEntitySet(bean, "Beans")
-
-	// map many beans to one roaster
-	provider.ExposeManyToOne(bean, roaster, "roaster_id", "Roaster", "Beans")
-	provider.ExposeManyToOne(bean, roastLevel, "roaster_level_id", "RoastLevel", "Beans")
-	provider.ExposeManyToOne(bean, process, "process_id", "Process", "Beans")
-	provider.ExposeManyToMany(bean, variety, "bean_variety_map", "Varieties", "Beans")
-	provider.BindProperty(beanSet, roasterSet, "Roaster", "Roaster", "Beans", "Beans")
-	provider.BindProperty(beanSet, roastLevelSet, "RoastLevel", "RoastLevel", "Beans", "Beans")
-	provider.BindProperty(beanSet, processSet, "Process", "Process", "Beans", "Beans")
-	provider.BindProperty(beanSet, varietySet, "Varieties", "Varieties", "Beans", "Beans")
-
-	service := BuildService(provider)
-	service.ListenAndServe(":8080", "http://localhost")
+	/*
+		provider := &MySQLGoDataProvider{
+			Hostname: "localhost",
+			Port:     "3306",
+			Database: "Coffee",
+			Username: "dev",
+			Password: "dev",
+		}
+
+		roaster := provider.ExposeEntity("roaster", "Roaster")
+		roaster.ExposeKey("id", "RoasterID", GoDataInt32)
+		roaster.ExposePrimitive("name", "Name", GoDataString)
+		roaster.ExposePrimitive("location", "Location", GoDataString)
+		roaster.ExposePrimitive("website", "Website", GoDataString)
+		roasterSet := provider.ExposeEntitySet(roaster, "Roasters")
+
+		variety := provider.ExposeEntity("variety", "Variety")
+		variety.ExposeKey("id", "VarietyID", GoDataInt32)
+		variety.ExposePrimitive("name", "Name", GoDataString)
+		varietySet := provider.ExposeEntitySet(variety, "Varieties")
+
+		roastLevel := provider.ExposeEntity("roast_level", "RoastLevel")
+		roastLevel.ExposeKey("id", "RoastLevelID", GoDataInt32)
+		roastLevel.ExposePrimitive("order", "Order", GoDataInt32)
+		roastLevel.ExposePrimitive("name", "Name", GoDataString)
+		roastLevel.ExposePrimitive("qualifier", "Qualifier", GoDataString)
+		roastLevelSet := provider.ExposeEntitySet(roastLevel, "RoastLevels")
+
+		process := provider.ExposeEntity("process", "Process")
+		process.ExposeKey("id", "ProcessID", GoDataInt32)
+		process.ExposePrimitive("name", "Name", GoDataString)
+		processSet := provider.ExposeEntitySet(process, "Processes")
+
+		bean := provider.ExposeEntity("bean", "Bean")
+		bean.ExposeKey("id", "BeanID", GoDataInt32)
+		bean.ExposePrimitive("country", "Country", GoDataString)
+		bean.ExposePrimitive("region", "Region", GoDataString)
+		bean.ExposePrimitive("min_elevation", "MinElevation", GoDataInt32)
+		bean.ExposePrimitive("max_elevation", "MaxElevation", GoDataInt32)
+		beanSet := provider.ExposeEntitySet(bean, "Beans")
+
+		// map many beans to one roaster
+		provider.ExposeManyToOne(bean, roaster, "roaster_id", "Roaster", "Beans")
+		provider.ExposeManyToOne(bean, roastLevel, "roaster_level_id", "RoastLevel", "Beans")
+		provider.ExposeManyToOne(bean, process, "process_id", "Process", "Beans")
+		provider.ExposeManyToMany(bean, variety, "bean_variety_map", "Varieties", "Beans")
+		provider.BindProperty(beanSet, roasterSet, "Roaster", "Roaster", "Beans", "Beans")
+		provider.BindProperty(beanSet, roastLevelSet, "RoastLevel", "RoastLevel", "Beans", "Beans")
+		provider.BindProperty(beanSet, processSet, "Process", "Process", "Beans", "Beans")
+		provider.BindProperty(beanSet, varietySet, "Varieties", "Varieties", "Beans", "Beans")
+
+		service := BuildService(provider)
+		service.ListenAndServe(":8080", "http://localhost")
+	*/
 
 	//service.AttachMiddleware(CacheMiddleware)
 	//service.AttachMiddleware(AuthorizationMiddleware)

expand_parser.go

@@ -21,6 +21,7 @@ var GlobalExpandTokenizer = ExpandTokenizer()
 type ExpandItem struct {
 	Path    []*Token
 	Filter  *GoDataFilterQuery
+	At      *GoDataFilterQuery
 	Search  *GoDataSearchQuery
 	OrderBy *GoDataOrderByQuery
 	Skip    *GoDataSkipQuery
@@ -161,7 +162,7 @@ func ParseExpandOption(queue *tokenQueue, item *ExpandItem) error {
 		return BadRequestError("Invalid expand clause.")
 	}
 	queue.Dequeue() // drop the '=' from the front of the queue
-	body := queue.String()
+	body := queue.GetValue()
 
 	if head == "$filter" {
 		filter, err := ParseFilterString(body)
@@ -172,6 +173,15 @@ func ParseExpandOption(queue *tokenQueue, item *ExpandItem) error {
 		}
 	}
 
+	if head == "at" {
+		at, err := ParseFilterString(body)
+		if err == nil {
+			item.At = at
+		} else {
+			return err
+		}
+	}
+
 	if head == "$search" {
 		search, err := ParseSearchString(body)
 		if err == nil {

expand_parser_test.go

@@ -72,13 +72,13 @@ func TestExpandNestedCommas(t *testing.T) {
 
 	if output.ExpandItems[0].Select.SelectItems[0].Segments[0].Value != "FirstName" {
 		actual := output.ExpandItems[0].Select.SelectItems[0].Segments[0]
-		t.Error("First select segment is '" + actual.Value + "' not 'FirstName'")
+		t.Error("First select segment is '" + actual.Value + "', expected 'FirstName'")
 		return
 	}
 
 	if output.ExpandItems[0].Select.SelectItems[1].Segments[0].Value != "LastName" {
 		actual := output.ExpandItems[0].Select.SelectItems[1].Segments[0]
-		t.Error("First select segment is '" + actual.Value + "' not 'LastName'")
+		t.Error("First select segment is '" + actual.Value + "', expected 'LastName'")
 		return
 	}