feat: policy name, dataset limitation by policies

reearth · Nov 21, 2022 · b721323 · b721323
1 parent ca06266
commit b721323
Show file tree

Hide file tree

Showing 16 changed files with 352 additions and 90 deletions.
diff --git a/server/go.mod b/server/go.mod
@@ -44,6 +44,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.7.0
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
 	golang.org/x/exp v0.0.0-20220706164943-b4a6d9510983
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	golang.org/x/text v0.3.7
 	golang.org/x/tools v0.1.10
@@ -129,7 +130,6 @@ require (
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
-	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect

diff --git a/server/internal/adapter/gql/generated.go b/server/internal/adapter/gql/generated.go
diff --git a/server/internal/adapter/gql/gqlmodel/convert_layer.go b/server/internal/adapter/gql/gqlmodel/convert_layer.go
@@ -44,7 +44,7 @@ func ToLayerGroup(l *layer.Group, parent *id.LayerID) *LayerGroup {
 		LinkedDatasetSchemaID: IDFromRef(l.LinkedDatasetSchema()),
 		LayerIds:              util.Map(l.Layers().Layers(), IDFrom[id.Layer]),
 		Root:                  l.IsRoot(),
-		ParentID:              IDFromRef[id.Layer](parent),
+		ParentID:              IDFromRef(parent),
 		Tags:                  ToLayerTagList(l.Tags(), l.Scene()),
 	}
 }
@@ -80,7 +80,7 @@ func ToInfoboxField(ibf *layer.InfoboxField, parentSceneID id.SceneID, parentDat
 		PluginID:        IDFromPluginID(ibf.Plugin()),
 		ExtensionID:     ID(ibf.Extension()),
 		PropertyID:      IDFrom(ibf.Property()),
-		LinkedDatasetID: IDFromRef[id.Dataset](parentDatasetID),
+		LinkedDatasetID: IDFromRef(parentDatasetID),
 	}
 }
 
@@ -99,7 +99,7 @@ func ToInfobox(ib *layer.Infobox, parent id.LayerID, parentSceneID id.SceneID, p
 		PropertyID:      IDFrom(ib.Property()),
 		Fields:          fields,
 		LayerID:         IDFrom(parent),
-		LinkedDatasetID: IDFromRef[id.Dataset](parentDatasetID),
+		LinkedDatasetID: IDFromRef(parentDatasetID),
 	}
 }
 

diff --git a/server/internal/adapter/gql/gqlmodel/models_gen.go b/server/internal/adapter/gql/gqlmodel/models_gen.go
diff --git a/server/internal/adapter/gql/gqlmodel/workspace.go b/server/internal/adapter/gql/gqlmodel/workspace.go
@@ -1,6 +1,8 @@
 package gqlmodel
 
-import "github.com/reearth/reearth/server/pkg/workspace"
+import (
+	"github.com/reearth/reearth/server/pkg/workspace"
+)
 
 func ToWorkspace(t *workspace.Workspace) *Team {
 	if t == nil {
@@ -53,12 +55,17 @@ func ToPolicy(p *workspace.Policy) *Policy {
 	if p == nil {
 		return nil
 	}
+
 	o := p.Option()
 	return &Policy{
+		ID:                    ID(o.ID),
+		Name:                  o.Name,
 		ProjectCount:          o.ProjectCount,
 		MemberCount:           o.MemberCount,
 		PublishedProjectCount: o.PublishedProjectCount,
 		LayerCount:            o.LayerCount,
 		AssetStorageSize:      o.AssetStorageSize,
+		DatasetSchemaCount:    o.DatasetSchemaCount,
+		DatasetCount:          o.DatasetCount,
 	}
 }