feat: admin search and search-ability of JSON fields (#11)

* feat: search with admin params

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

* missing annotation

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

* more ports

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

* fix admin search

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

* test and cleanup

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

* add type, allow JSON fields to be searched

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

* fix imports

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

---------

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

annotation.go

@@ -34,12 +34,12 @@ type ThroughCleanup struct {
 }
 
 // SchemaGenAnnotation is an annotation used to indicate that schema generation should be skipped for this type
-// Searchable will be ignored if Skip is set to true
-// Searchable and SkipSearch allow for schemas to be be opt in or opt out
+// When Skip is true, the search schema generation is always skipped
+// SkipSearch allow for schemas to be be opt out of search schema generation
 type SchemaGenAnnotation struct {
 	// Skip indicates that the schema generation should be skipped for this type
 	Skip bool
-	// SkipSearch indicates that the schema should not be searchable, this is ignored if Skip is set to true
+	// SkipSearch indicates that the schema should not be searchable
 	// Schemas are also not searchable if not fields are marked as searchable
 	SkipSearch bool
 }
@@ -53,6 +53,8 @@ type QueryGenAnnotation struct {
 type SearchFieldAnnotation struct {
 	// Searchable indicates that the field should be searchable
 	Searchable bool
+	// ExcludeAdmin indicates that the field will be excluded from the admin search which includes all fields by default
+	ExcludeAdmin bool
 }
 
 // Name returns the name of the CascadeAnnotation
@@ -122,6 +124,13 @@ func FieldSearchable() *SearchFieldAnnotation {
 	}
 }
 
+// FieldAdminSearchable returns a new SearchFieldAnnotation with the exclude admin searchable flag set
+func FieldAdminSearchable(s bool) *SearchFieldAnnotation {
+	return &SearchFieldAnnotation{
+		ExcludeAdmin: !s,
+	}
+}
+
 // Decode unmarshalls the CascadeAnnotation
 func (a *CascadeAnnotation) Decode(annotation interface{}) error {
 	buf, err := json.Marshal(annotation)

genhooks/gen.go

@@ -27,13 +27,3 @@ func isSoftDeleteField(f *gen.Field) bool {
 func getFileName(dir, name string) string {
 	return filepath.Clean(dir + strings.ToLower(name) + ".graphql")
 }
-
-// toFirstLower converts the first character of a string to lowercase
-// except if the entire string is uppercase, e.g TTL, should remain as TTL
-func toFirstLower(s string) string {
-	if strings.ToUpper(s) == s {
-		return s
-	}
-
-	return strings.ToLower(s[:1]) + s[1:]
-}

genhooks/gen_query.go → genhooks/genquery.go

@@ -9,8 +9,8 @@ import (
 
 	"entgo.io/contrib/entgql"
 	"entgo.io/ent/entc/gen"
+	"github.com/99designs/gqlgen/codegen/templates"
 	"github.com/gertd/go-pluralize"
-	"github.com/stoewer/go-strcase"
 
 	"github.com/theopenlane/entx"
 )
@@ -97,7 +97,7 @@ func getFieldNames(fields []*gen.Field) []string {
 			continue
 		}
 
-		fieldNames = append(fieldNames, toFirstLower(f.StructField()))
+		fieldNames = append(fieldNames, templates.ToGoPrivate(f.StructField()))
 	}
 
 	// sort field names
@@ -167,7 +167,7 @@ func isHistorySchema(node *gen.Type) bool {
 func createQuery() *template.Template {
 	// function map for template
 	fm := template.FuncMap{
-		"ToLowerCamel": strcase.LowerCamelCase,
+		"ToLowerCamel": templates.ToGoPrivate,
 		"ToPlural":     pluralize.NewClient().Plural,
 	}
 

genhooks/gen_schema.go → genhooks/genschema.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"entgo.io/ent/entc/gen"
+	"github.com/99designs/gqlgen/codegen/templates"
 	"github.com/gertd/go-pluralize"
-	"github.com/stoewer/go-strcase"
 
 	"github.com/theopenlane/entx"
 )
@@ -77,7 +77,7 @@ func checkSchemaGenSkip(node *gen.Type) bool {
 func createTemplate() *template.Template {
 	// function map for template
 	fm := template.FuncMap{
-		"ToLowerCamel": strcase.LowerCamelCase,
+		"ToLowerCamel": templates.ToGoPrivate,
 		"ToPlural":     pluralize.NewClient().Plural,
 	}