fix(server): datacatalog v3 bugs

server/datacatalog/datacatalogv2/datacatalogv2adapter/cache.go

@@ -18,14 +18,16 @@ func New(cmsbase, project string) (*plateauapi.RepoWrapper, error) {
 }
 
 func From(fetcher datacatalogv2.Fetchable, project string) *plateauapi.RepoWrapper {
-	return plateauapi.NewRepoWrapper(nil, func(ctx context.Context, repo *plateauapi.Repo) error {
+	r := plateauapi.NewRepoWrapper(nil, func(ctx context.Context, repo *plateauapi.Repo) error {
 		r, err := fetchAndCreateCache(ctx, project, fetcher, datacatalogv2.FetcherDoOptions{})
 		if err != nil {
 			return err
 		}
 		*repo = r
 		return nil
 	})
+	r.SetName(fmt.Sprintf("%s(v2)", project))
+	return r
 }
 
 func fetchAndCreateCache(ctx context.Context, project string, fetcher datacatalogv2.Fetchable, opts datacatalogv2.FetcherDoOptions) (*plateauapi.InMemoryRepo, error) {

server/datacatalog/datacatalogv3/cms.go

@@ -18,7 +18,9 @@ func NewCMS(cms cms.Interface) *CMS {
 }
 
 func (c *CMS) GetAll(ctx context.Context, project string) (*AllData, error) {
-	all := AllData{}
+	all := AllData{
+		Name: project,
+	}
 
 	// TODO: get CMSInfo
 

server/datacatalog/datacatalogv3/conv.go

@@ -9,6 +9,7 @@ import (
 
 func (all *AllData) Into() (res *plateauapi.InMemoryRepoContext, warning []string) {
 	res = &plateauapi.InMemoryRepoContext{
+		Name:     all.Name,
 		Areas:    plateauapi.Areas{},
 		Datasets: plateauapi.Datasets{},
 	}

server/datacatalog/datacatalogv3/conv_dataset_plateau_seed.go

@@ -41,12 +41,22 @@ func plateauDatasetSeedsFrom(i *PlateauFeatureItem, dt *plateauapi.PlateauDatase
 		return
 	}
 
-	if dt.Code == "bldg" && len(i.Items) == 0 {
+	items := i.Items
+	if len(i.Data) > 0 {
+		items = append(items, lo.Map(i.Data, func(url string, _ int) PlateauFeatureItemDatum {
+			return PlateauFeatureItemDatum{
+				Data: []string{url},
+				Desc: i.Desc,
+			}
+		})...)
+	}
+
+	if dt.Code == "bldg" {
 		seeds, w := plateauDatasetSeedsFromBldg(i, dt, cityCode, area.Wards)
 		warning = append(warning, w...)
 		res = append(res, seeds...)
 	} else {
-		for _, item := range i.Items {
+		for _, item := range items {
 			seeds, w := plateauDatasetSeedsFromItem(i, item, dt, dic, cityCode)
 			warning = append(warning, w...)
 			res = append(res, seeds)
@@ -70,13 +80,13 @@ func plateauDatasetSeedsFrom(i *PlateauFeatureItem, dt *plateauapi.PlateauDatase
 }
 
 func plateauDatasetSeedsFromItem(i *PlateauFeatureItem, item PlateauFeatureItemDatum, dt *plateauapi.PlateauDatasetType, dic Dic, cityCode string) (res plateauDatasetSeed, warning []string) {
-	assets := lo.Map(item.Data, func(url string, _ int) *AssetName {
+	assets := lo.FilterMap(item.Data, func(url string, _ int) (*AssetName, bool) {
 		n := nameWithoutExt(nameFromURL(url))
 		an := ParseAssetName(n)
 		if an == nil || !an.Ex.IsValid() {
 			warning = append(warning, fmt.Sprintf("plateau %s %s: invalid asset name: %s", cityCode, dt.Code, n))
 		}
-		return an
+		return an, an != nil
 	})
 	if len(assets) == 0 {
 		// warning = append(warning, fmt.Sprintf("plateau %s %s: no assets", cityCode, dt.Code))
@@ -86,7 +96,7 @@ func plateauDatasetSeedsFromItem(i *PlateauFeatureItem, item PlateauFeatureItemD
 	assetName := assets[0]
 	key, dickey := assetName.Ex.ItemKey(), assetName.Ex.DicKey()
 	if key == "" || dickey == "" {
-		warning = append(warning, fmt.Sprintf("plateau %s %s: invalid asset name key: %s", cityCode, dt.Code, assets[0].Ex.Ex))
+		warning = append(warning, fmt.Sprintf("plateau %s %s: invalid asset name key: %s", cityCode, dt.Code, assetName.Ex.Ex))
 		return
 	}
 

server/datacatalog/datacatalogv3/model.go

@@ -3,6 +3,7 @@ package datacatalogv3
 import "github.com/eukarya-inc/reearth-plateauview/server/datacatalog/plateauapi"
 
 type AllData struct {
+	Name         string
 	PlateauSpecs []plateauapi.PlateauSpecSimple
 	FeatureTypes FeatureTypes
 	City         []*CityItem

server/datacatalog/datacatalogv3/repo.go

@@ -79,7 +79,7 @@ func (r *Repos) Update(ctx context.Context, project string, rawcms cms.Interface
 		r.cms[project] = cms
 	}
 
-	log.Infofc(ctx, "datacatalogv3: updating project %s", project)
+	log.Infofc(ctx, "datacatalogv3: updating repo %s", project)
 	data, err := cms.GetAll(ctx, project)
 	if err != nil {
 		return err
@@ -97,6 +97,7 @@ func (r *Repos) Update(ctx context.Context, project string, rawcms cms.Interface
 	adminRepoWrapper := r.adminRepos[project]
 	if adminRepoWrapper == nil {
 		adminRepoWrapper = plateauapi.NewRepoWrapper(adminRepo, nil)
+		adminRepoWrapper.SetName(fmt.Sprintf("%s(admin)", project))
 		r.adminRepos[project] = adminRepoWrapper
 	} else {
 		adminRepoWrapper.SetRepo(adminRepo)
@@ -105,6 +106,7 @@ func (r *Repos) Update(ctx context.Context, project string, rawcms cms.Interface
 	repoWrapper := r.repos[project]
 	if repoWrapper == nil {
 		repoWrapper = plateauapi.NewRepoWrapper(repo, nil)
+		repoWrapper.SetName(project)
 		r.repos[project] = repoWrapper
 	} else {
 		repoWrapper.SetRepo(repo)
@@ -116,7 +118,7 @@ func (r *Repos) Update(ctx context.Context, project string, rawcms cms.Interface
 		r.updatedAt[project] = time.Now()
 	}
 
-	log.Infofc(ctx, "datacatalogv3: updated project %s", project)
+	log.Infofc(ctx, "datacatalogv3: updated repo %s", project)
 	return nil
 }
 

server/datacatalog/plateauapi/gqlgen.yml

@@ -90,7 +90,7 @@ models:
         resolver: true
       type:
         resolver: true
-      plateauSpec:
+      plateauSpecMinor:
         resolver: true
   PlateauDatasetItem:
     fields:

server/datacatalog/plateauapi/inmemory.go

@@ -2,6 +2,7 @@ package plateauapi
 
 import (
 	"context"
+	"fmt"
 	"slices"
 
 	"github.com/reearth/reearthx/util"
@@ -10,6 +11,7 @@ import (
 )
 
 type InMemoryRepoContext struct {
+	Name         string
 	Areas        Areas
 	DatasetTypes DatasetTypes
 	Datasets     Datasets
@@ -34,6 +36,13 @@ func NewInMemoryRepo(ctx *InMemoryRepoContext) *InMemoryRepo {
 	return r
 }
 
+func (c *InMemoryRepo) Name() string {
+	if c.ctx == nil || c.ctx.Name == "" {
+		return "inmemory"
+	}
+	return fmt.Sprintf("inmemory(%s)", c.ctx.Name)
+}
+
 func (c *InMemoryRepo) SetContext(ctx *InMemoryRepoContext) {
 	c.ctx = ctx
 	c.areasForDataTypes = areasForDatasetTypes(ctx.Datasets.All())

server/datacatalog/plateauapi/inmemory_wrapper.go

@@ -10,6 +10,7 @@ type RepoUpdater func(ctx context.Context, repo *Repo) error
 // RepoWrapper is a thread-safe wrapper of Repo.
 type RepoWrapper struct {
 	repo    Repo
+	name    string
 	lock    sync.RWMutex
 	updater RepoUpdater
 }
@@ -36,6 +37,10 @@ func (a *RepoWrapper) SetRepo(repo Repo) {
 	a.repo = repo
 }
 
+func (a *RepoWrapper) SetName(name string) {
+	a.name = name
+}
+
 func (a *RepoWrapper) Update(ctx context.Context) error {
 	if a.updater == nil {
 		return nil
@@ -59,6 +64,16 @@ func (a *RepoWrapper) use(f func(r Repo) error) error {
 
 var _ Repo = (*RepoWrapper)(nil)
 
+func (a *RepoWrapper) Name() string {
+	if a.name != "" {
+		return a.name
+	}
+	if a.repo == nil {
+		return "wrapper"
+	}
+	return a.repo.Name()
+}
+
 func (a *RepoWrapper) Node(ctx context.Context, id ID) (res Node, err error) {
 	err = a.use(func(r Repo) (err error) {
 		res, err = r.Node(ctx, id)

server/datacatalog/plateauapi/merge.go

@@ -2,6 +2,7 @@ package plateauapi
 
 import (
 	"context"
+	"fmt"
 	"sort"
 
 	"github.com/reearth/reearthx/util"
@@ -19,6 +20,15 @@ func NewMerger(repos ...Repo) *Merger {
 
 var _ Repo = (*Merger)(nil)
 
+func (m *Merger) Name() string {
+	return fmt.Sprintf("merger(%s)", lo.Map(m.repos, func(r Repo, _ int) string {
+		if r == nil {
+			return "nil"
+		}
+		return r.Name()
+	}))
+}
+
 func (m *Merger) Node(ctx context.Context, id ID) (Node, error) {
 	nodes, err := getRepoResults(m.repos, func(r Repo) (Node, error) {
 		return r.Node(ctx, id)
@@ -118,7 +128,11 @@ func getRepoResults[T any](repos []Repo, f func(r Repo) (T, error)) ([]T, error)
 		if r == nil {
 			return
 		}
-		return f(r)
+		res, err := f(r)
+		if err != nil {
+			return res, fmt.Errorf("repo %s: %w", r.Name(), err)
+		}
+		return res, nil
 	})
 }
 
@@ -152,6 +166,9 @@ func sortNodes[T IDNode](nodes []T) {
 }
 
 func getLatestYearNode[T any](results []T) T {
+	results = lo.Filter(results, func(a T, _ int) bool {
+		return isNodePresent(a)
+	})
 	return lo.MaxBy(results, func(a, b T) bool {
 		return getYear(a) > getYear(b)
 	})
@@ -181,6 +198,13 @@ type YearNode interface {
 	GetYear() int
 }
 
+func isNodePresent(n any) bool {
+	if n, ok := n.(Node); ok {
+		return n != nil
+	}
+	return false
+}
+
 func getYear(n any) int {
 	if yn, ok := n.(YearNode); ok {
 		return yn.GetYear()

server/datacatalog/plateauapi/resolver.go

@@ -35,6 +35,7 @@ var ErrDatacatalogUnavailable = errors.New("datacatalog is currently unavailable
 
 type Repo interface {
 	QueryResolver
+	Name() string
 }
 
 type Resolver struct {