fix: translated fields in plugin gql

reearth · Sep 29, 2021 · 0a658a8 · 0a658a8
1 parent 92d1373
commit 0a658a8
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 60 deletions.
diff --git a/internal/adapter/gql/generated.go b/internal/adapter/gql/generated.go
diff --git a/internal/adapter/gql/gqlmodel/models_gen.go b/internal/adapter/gql/gqlmodel/models_gen.go
diff --git a/internal/adapter/gql/resolver_plugin.go b/internal/adapter/gql/resolver_plugin.go
@@ -81,13 +81,6 @@ func (r *pluginExtensionResolver) PropertySchema(ctx context.Context, obj *gqlmo
 	return DataLoadersFromContext(ctx).PropertySchema.Load(obj.PropertySchemaID)
 }
 
-func (r *pluginExtensionResolver) TranslatedName(ctx context.Context, obj *gqlmodel.PluginExtension, lang *string) (string, error) {
-	if s, ok := obj.AllTranslatedName[getLang(ctx, lang)]; ok {
-		return s, nil
-	}
-	return obj.Name, nil
-}
-
 func (r *pluginExtensionResolver) SceneWidget(ctx context.Context, obj *gqlmodel.PluginExtension, sceneID id.ID) (*gqlmodel.SceneWidget, error) {
 	exit := trace(ctx)
 	defer exit()
@@ -96,6 +89,16 @@ func (r *pluginExtensionResolver) SceneWidget(ctx context.Context, obj *gqlmodel
 	return s.Widget(obj.PluginID, obj.ExtensionID), err
 }
 
+func (r *pluginExtensionResolver) TranslatedName(ctx context.Context, obj *gqlmodel.PluginExtension, lang *string) (string, error) {
+	exit := trace(ctx)
+	defer exit()
+
+	if s, ok := obj.AllTranslatedName[getLang(ctx, lang)]; ok {
+		return s, nil
+	}
+	return obj.Name, nil
+}
+
 func (r *pluginExtensionResolver) TranslatedDescription(ctx context.Context, obj *gqlmodel.PluginExtension, lang *string) (string, error) {
 	exit := trace(ctx)
 	defer exit()

diff --git a/schema.graphql b/schema.graphql
@@ -251,12 +251,12 @@ type Plugin {
   repositoryUrl: String!
   propertySchemaId: PropertySchemaID
   extensions: [PluginExtension!]!
-  scene: Scene @goField(forceResolver: true)
   scenePlugin(sceneId: ID): ScenePlugin
   allTranslatedDescription: TranslatedString
   allTranslatedName: TranslatedString
-  translatedName(lang: String): String!
-  translatedDescription(lang: String): String!
+  scene: Scene @goField(forceResolver: true)
+  translatedName(lang: String): String! @goField(forceResolver: true)
+  translatedDescription(lang: String): String! @goField(forceResolver: true)
   propertySchema: PropertySchema @goField(forceResolver: true)
 }