followup fix (#1389)

lolopinto · Mar 15, 2023 · 01bf6fc · 01bf6fc
1 parent 41ffbb7
commit 01bf6fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/internal/schema/node_data.go b/internal/schema/node_data.go
@@ -531,9 +531,9 @@ type entLoadPrivacyInfo struct {
 	Fields    []*field.Field
 }
 
-func (nodeData *NodeData) GetOnEntLoadPrivacyInfo(cfg codegenapi.Config) (*entLoadPrivacyInfo, error) {
+func (nodeData *NodeData) GetOnEntLoadPrivacyInfo(cfg codegenapi.Config) *entLoadPrivacyInfo {
 	if !nodeData.OnEntLoadFieldPrivacy(cfg) {
-		return nil, fmt.Errorf("cannot call GetOnEntLoadPrivacyInfo for node which doesn't use on ent load privacy")
+		return nil
 	}
 
 	var fields []*field.Field
@@ -546,13 +546,16 @@ func (nodeData *NodeData) GetOnEntLoadPrivacyInfo(cfg codegenapi.Config) (*entLo
 		}
 	}
 
-	ret := &entLoadPrivacyInfo{
-		Interface: fmt.Sprintf("%sData", nodeData.Node),
-		Extends:   fmt.Sprintf("Omit<%s, %s>", nodeData.GetRawDBDataName(), strings.Join(names, " | ")),
-		Fields:    fields,
+	if len(fields) != 0 {
+		ret := &entLoadPrivacyInfo{
+			Interface: fmt.Sprintf("%sData", nodeData.Node),
+			Extends:   fmt.Sprintf("Omit<%s, %s>", nodeData.GetRawDBDataName(), strings.Join(names, " | ")),
+			Fields:    fields,
+		}
+		return ret
 	}
 
-	return ret, nil
+	return nil
 }
 
 type extraCustomQueryInfo struct {

diff --git a/internal/tscode/base.tmpl b/internal/tscode/base.tmpl
@@ -47,15 +47,15 @@
 {{$dataType := $rawDBDataType -}}
 {{$customQueryDataType := $rawDBDataType -}}
 
-{{if .OnEntLoadFieldPrivacy $cfg -}}
-  {{$info := .GetOnEntLoadPrivacyInfo $cfg -}}
+{{$info := .GetOnEntLoadPrivacyInfo $cfg -}}
+{{ if $info -}}
   {{$dataType = $info.Interface -}}
   interface {{$info.Interface}} extends {{$info.Extends}} {
     {{range $field := $info.Fields -}}
       {{$field.GetDbColName}}: {{$field.TsType}};
     {{ end -}}
   }
-{{ end -}}
+{{end}}
 
 {{ $customQuery := .GetExtraCustomQueryInfo -}} 
 {{ if $customQuery -}}