Bugfix for wrong graphql type when using custom scalars in gqlgen

convert.go

@@ -457,19 +457,32 @@ func enhanceModelsWithFields(enums []*Enum, schema *ast.Schema, cfg *config.Conf
 	}
 }
 
+var ignoreTypePrefixes = []string{"graphql_models", "models"}
+
 func getShortType(longType string) string {
 
+	// longType e.g = gitlab.com/decicify/app/backend/graphql_models.FlowWhere
 	splittedBySlash := strings.Split(longType, "/")
+	// gitlab.com, decicify, app, backend, graphql_models.FlowWhere
+
 	lastPart := splittedBySlash[len(splittedBySlash)-1]
-	splitted := strings.Split(lastPart, ".")
 	isPointer := strings.HasPrefix(longType, "*")
+	isStructInPackage := strings.Count(lastPart, ".") > 0
+
+	if isStructInPackage {
+		// if packages are deeper they don't have pointers but *time.Time will since it's not deep
+		returnType := strings.TrimPrefix(lastPart, "*")
+		for _, ignoreType := range ignoreTypePrefixes {
+			fullIgnoreType := ignoreType + "."
+			returnType = strings.TrimPrefix(returnType, fullIgnoreType)
+		}
 
-	if len(splitted) > 1 {
 		if isPointer {
-			return "*" + splitted[1]
+			return "*" + returnType
 		}
-		return splitted[1]
+		return returnType
 	}
+
 	return longType
 }
 
@@ -814,6 +827,10 @@ func getConvertConfig(enums []*Enum, model *Model, field *Field) (cc ConvertConf
 	} else if graphType != boilType {
 		cc.IsCustom = true
 
+		if strings.ToLower(model.Name) == "blockchoice" {
+			fmt.Println(graphType, boilType)
+		}
+
 		if field.IsPrimaryNumberID || field.IsNumberID {
 
 			cc.ToGraphQL = "VALUE"
@@ -879,16 +896,21 @@ func getToGraphQL(boilType, graphType string) string {
 }
 
 func getBoilerTypeAsText(boilType string) string {
-	if strings.HasPrefix(boilType, "null.") {
-		boilType = strings.TrimPrefix(boilType, "null.")
-		boilType = strcase.ToCamel(boilType)
-		boilType = "NullDot" + boilType
-	}
+
+	// backward compatible missed Dot
 	if strings.HasPrefix(boilType, "types.") {
 		boilType = strings.TrimPrefix(boilType, "types.")
 		boilType = strcase.ToCamel(boilType)
 		boilType = "Types" + boilType
 	}
+
+	// if strings.HasPrefix(boilType, "null.") {
+	// 	boilType = strings.TrimPrefix(boilType, "null.")
+	// 	boilType = strcase.ToCamel(boilType)
+	// 	boilType = "NullDot" + boilType
+	// }
+	boilType = strings.Replace(boilType, ".", "Dot", -1)
+
 	return strcase.ToCamel(boilType)
 }
 

convert_test.go

@@ -0,0 +1,21 @@
+// testing really need more improvements!
+// Please add more tests if you use this
+
+package gqlgen_sqlboiler
+
+import "testing"
+
+func TestShortType(t *testing.T) {
+	testShortType(t, "gitlab.com/decicify/app/backend/graphql_models.FlowWhere", "FlowWhere")
+	testShortType(t, "*gitlab.com/decicify/app/backend/graphql_models.FlowWhere", "*FlowWhere")
+	testShortType(t, "*string", "*string")
+	testShortType(t, "string", "string")
+	testShortType(t, "*time.Time", "*time.Time")
+}
+
+func testShortType(t *testing.T, input, output string) {
+	result := getShortType(input)
+	if result != output {
+		t.Errorf("%v should result in %v but did result in %v", input, output, result)
+	}
+}

preload.gotpl

@@ -30,7 +30,7 @@
 var TablePreloadMap = map[string]map[string]boilergql.ColumnSetting{
 	{{ range $model := .Models -}}
 	{{ if $model.IsPreloadable -}}
-		models.TableNames.{{- $model.Name }}: map[string]boilergql.ColumnSetting{
+		models.TableNames.{{- $model.Name }}: {
 			{{- range $value := $model.PreloadArray }}
 				 "{{$value.Key}}": {
 					 Name: {{$value.ColumnSetting.Name}},