feat: Refine dataset import (#26)

* - Declare DatasetSchemaFieldID scalar - Extend AddLayerGroupInput to accept optional markerTitleFieldId - Use selected Field value as layer name * - fix mutation variable name - use representativeFieldID to set layer title
reearth · Jul 28, 2021 · 5dd3dba · 5dd3dba
1 parent 8ad1f80
commit 5dd3dba
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 7 deletions.
diff --git a/gqlgen.yml b/gqlgen.yml
@@ -31,6 +31,8 @@ models:
     model: github.com/reearth/reearth-backend/internal/adapter/graphql.PropertySchemaID
   PropertySchemaFieldID:
     model: github.com/reearth/reearth-backend/internal/adapter/graphql.PropertySchemaFieldID
+  DatasetSchemaFieldID:
+    model: github.com/reearth/reearth-backend/internal/adapter/graphql.DatasetSchemaFieldID
   TranslatedString:
     model: github.com/reearth/reearth-backend/internal/adapter/graphql.Map
   Lang:

diff --git a/internal/adapter/graphql/controller_layer.go b/internal/adapter/graphql/controller_layer.go
@@ -56,6 +56,7 @@ func (c *LayerController) AddGroup(ctx context.Context, ginput *AddLayerGroupInp
 		Index:                 ginput.Index,
 		Name:                  refToString(ginput.Name),
 		LinkedDatasetSchemaID: id.DatasetSchemaIDFromRefID(ginput.LinkedDatasetSchemaID),
+		RepresentativeFieldId: ginput.RepresentativeFieldID,
 	}, operator)
 	if err != nil {
 		return nil, err

diff --git a/internal/adapter/graphql/models_gen.go b/internal/adapter/graphql/models_gen.go
diff --git a/internal/adapter/graphql/scalar.go b/internal/adapter/graphql/scalar.go
@@ -129,6 +129,19 @@ func UnmarshalPropertySchemaFieldID(v interface{}) (id.PropertySchemaFieldID, er
 	return id.PropertySchemaFieldID(""), errors.New("invalid ID")
 }
 
+func MarshalDatasetSchemaFieldID(t id.DatasetSchemaFieldID) graphql1.Marshaler {
+	return graphql1.WriterFunc(func(w io.Writer) {
+		_, _ = io.WriteString(w, strconv.Quote(t.String()))
+	})
+}
+
+func UnmarshalDatasetSchemaFieldID(v interface{}) (id.DatasetSchemaFieldID, error) {
+	if tmpStr, ok := v.(string); ok {
+		return id.DatasetSchemaFieldIDFrom(tmpStr)
+	}
+	return id.NewDatasetSchemaFieldID(), errors.New("invalid ID")
+}
+
 func MarshalMap(val map[string]string) graphql1.Marshaler {
 	return graphql1.WriterFunc(func(w io.Writer) {
 		_ = json.NewEncoder(w).Encode(val)

diff --git a/internal/graphql/generated.go b/internal/graphql/generated.go
diff --git a/internal/usecase/interactor/layer.go b/internal/usecase/interactor/layer.go
@@ -354,7 +354,13 @@ func (i *Layer) AddGroup(ctx context.Context, inp interfaces.AddLayerGroupInput,
 	}
 
 	// create item layers
-	representativeFieldID := datasetSchema.RepresentativeFieldID()
+	var representativeFieldID *id.DatasetSchemaFieldID
+	if inp.RepresentativeFieldId != nil {
+		representativeFieldID = inp.RepresentativeFieldId
+	} else {
+		representativeFieldID = datasetSchema.RepresentativeFieldID()
+	}
+
 	layerItems := make([]*layer.Item, 0, len(ds))
 	layerItemProperties := make([]*property.Property, 0, len(ds))
 	index := -1

diff --git a/internal/usecase/interfaces/layer.go b/internal/usecase/interfaces/layer.go
@@ -28,6 +28,7 @@ type AddLayerGroupInput struct {
 	ExtensionID           *id.PluginExtensionID
 	Index                 *int
 	LinkedDatasetSchemaID *id.DatasetSchemaID
+	RepresentativeFieldId *id.DatasetSchemaFieldID
 	Name                  string
 }
 

diff --git a/schema.graphql b/schema.graphql
@@ -25,6 +25,7 @@ scalar PluginExtensionID
 scalar PropertySchemaID
 scalar PropertySchemaFieldID
 scalar TranslatedString
+scalar DatasetSchemaFieldID
 
 type LatLng {
   lat: Float!
@@ -995,6 +996,7 @@ input AddLayerGroupInput {
   index: Int
   linkedDatasetSchemaID: ID
   name: String
+  representativeFieldId: DatasetSchemaFieldID
 }
 
 input RemoveLayerInput {