Merge pull request #131 from checkr/zz/add-description-like

Add description_like query param
openflagr · Jun 18, 2018 · 854a5f0 · 854a5f0
2 parents 806b61a + c048085
commit 854a5f0
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 13 deletions.
diff --git a/docs/api_docs/bundle.yaml b/docs/api_docs/bundle.yaml
@@ -51,11 +51,15 @@ paths:
         - in: query
           name: enabled
           type: boolean
-          description: return only flags having given enabled status
+          description: return flags having given enabled status
         - in: query
           name: description
           type: string
-          description: return only flags matching given description
+          description: return flags exactly matching given description
+        - in: query
+          name: description_like
+          type: string
+          description: return flags partially matching given description
       responses:
         '200':
           description: list all the flags

diff --git a/pkg/entity/flag.go b/pkg/entity/flag.go
@@ -3,6 +3,9 @@
 package entity
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/jinzhu/gorm"
 )
 
@@ -67,3 +70,12 @@ func (f *Flag) PrepareEvaluation() error {
 	}
 	return nil
 }
+
+// DescriptionLike patches the autogenerated queryset for find flags that
+// partially match the description
+func (qs FlagQuerySet) DescriptionLike(description string) FlagQuerySet {
+	return qs.w(qs.db.Where(
+		"lower(description) like ?",
+		fmt.Sprintf("%%%s%%", strings.ToLower(description)),
+	))
+}
diff --git a/pkg/handler/crud.go b/pkg/handler/crud.go
@@ -75,6 +75,9 @@ func (c *crud) FindFlags(params flag.FindFlagsParams) middleware.Responder {
 	if params.Description != nil {
 		q = q.DescriptionEq(*params.Description)
 	}
+	if params.DescriptionLike != nil {
+		q = q.DescriptionLike(*params.DescriptionLike)
+	}
 	if params.Limit != nil {
 		q = q.Limit(int(*params.Limit))
 	}

diff --git a/swagger/flags.yaml b/swagger/flags.yaml
@@ -11,11 +11,15 @@ get:
     - in: query
       name: enabled
       type: boolean
-      description: return only flags having given enabled status
+      description: return flags having given enabled status
     - in: query
       name: description
       type: string
-      description: return only flags matching given description
+      description: return flags exactly matching given description
+    - in: query
+      name: description_like
+      type: string
+      description: return flags partially matching given description
   responses:
     200:
       description: list all the flags

diff --git a/swagger_gen/restapi/embedded_spec.go b/swagger_gen/restapi/embedded_spec.go
diff --git a/swagger_gen/restapi/operations/flag/find_flags_parameters.go b/swagger_gen/restapi/operations/flag/find_flags_parameters.go
diff --git a/swagger_gen/restapi/operations/flag/find_flags_urlbuilder.go b/swagger_gen/restapi/operations/flag/find_flags_urlbuilder.go