Merge branch 'main' into worker-improved

eukarya-inc · Feb 29, 2024 · 57340d3 · 57340d3
2 parents d7f5613 + 6eefd3f
commit 57340d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/server/datacatalog/datacatalogv3/cms_model.go b/server/datacatalog/datacatalogv3/cms_model.go
@@ -283,7 +283,7 @@ func (c *GenericItem) Stage() stage {
 
 type GenericItemDataset struct {
 	ID         string `json:"id,omitempty" cms:"id"`
-	Name       string `json:"name,omitempty" cms:"name,text"`
+	Name       string `json:"name,omitempty" cms:"item_name,text"`
 	Data       string `json:"data,omitempty" cms:"data,-"`
 	Desc       string `json:"desc,omitempty" cms:"desc,textarea"`
 	DataURL    string `json:"url,omitempty" cms:"url,url"`

diff --git a/server/datacatalog/datacatalogv3/conv_dataset_generic.go b/server/datacatalog/datacatalogv3/conv_dataset_generic.go
@@ -57,7 +57,7 @@ func (i *GenericItem) toDatasets(area *areaContext, dts []plateauapi.DatasetType
 		ID:                id,
 		Name:              standardItemName(i.Name, "", area.Name()),
 		Description:       lo.EmptyableToPtr(i.Desc),
-		Year:              area.CityItem.YearInt(),
+		Year:              year,
 		RegisterationYear: year,
 		OpenDataURL:       lo.EmptyableToPtr(i.OpenDataURL),
 		PrefectureID:      area.PrefID,

diff --git a/server/datacatalog/datacatalogv3/conv_dataset_plateau_seed.go b/server/datacatalog/datacatalogv3/conv_dataset_plateau_seed.go
@@ -330,9 +330,7 @@ func plateauDatasetItemSeedFrom(seed plateauDatasetSeed) (items []plateauDataset
 		}
 
 		warning = append(warning, w...)
-		if item != nil {
-			items = append(items, *item)
-		}
+		items = append(items, *item)
 	}
 
 	return