-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-web/remove-member
- Loading branch information
Showing
16 changed files
with
467 additions
and
427 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package integration | ||
|
|
||
| import ( | ||
| "encoding/csv" | ||
| "io" | ||
|
|
||
| "github.com/reearth/reearth-cms/server/pkg/integrationapi" | ||
| "github.com/reearth/reearth-cms/server/pkg/item" | ||
| "github.com/reearth/reearth-cms/server/pkg/schema" | ||
| "github.com/reearth/reearthx/i18n" | ||
| "github.com/reearth/reearthx/log" | ||
| "github.com/reearth/reearthx/rerror" | ||
| "github.com/samber/lo" | ||
| ) | ||
|
|
||
| var ( | ||
| pointFieldIsNotSupportedError = rerror.NewE(i18n.T("point type is not supported in any geometry field in this model")) | ||
| ) | ||
|
|
||
| // GeoJSON | ||
| func featureCollectionFromItems(ver item.VersionedList, s *schema.Schema) (*integrationapi.FeatureCollection, error) { | ||
| return integrationapi.FeatureCollectionFromItems(ver, s) | ||
| } | ||
|
|
||
| // CSV | ||
| func csvFromItems(pw *io.PipeWriter, l item.VersionedList, s *schema.Schema) error { | ||
| if !s.IsPointFieldSupported() { | ||
| return pointFieldIsNotSupportedError | ||
| } | ||
|
|
||
| go handleCSVGeneration(pw, l, s) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func handleCSVGeneration(pw *io.PipeWriter, l item.VersionedList, s *schema.Schema) { | ||
| err := generateCSV(pw, l, s) | ||
| if err != nil { | ||
| log.Errorf("failed to generate CSV: %v", err) | ||
| _ = pw.CloseWithError(err) | ||
| } else { | ||
| _ = pw.Close() | ||
| } | ||
| } | ||
|
|
||
| func generateCSV(pw *io.PipeWriter, l item.VersionedList, s *schema.Schema) error { | ||
| w := csv.NewWriter(pw) | ||
| defer w.Flush() | ||
|
|
||
| headers := integrationapi.BuildCSVHeaders(s) | ||
| if err := w.Write(headers); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| nonGeoFields := lo.Filter(s.Fields(), func(f *schema.Field, _ int) bool { | ||
| return !f.IsGeometryField() | ||
| }) | ||
|
|
||
| for _, ver := range l { | ||
| row, ok := integrationapi.RowFromItem(ver.Value(), nonGeoFields) | ||
| if ok { | ||
| if err := w.Write(row); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return w.Error() | ||
| } | ||
|
|
100 changes: 100 additions & 0 deletions
100
server/internal/adapter/integration/item_export_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| package integration | ||
|
|
||
| import ( | ||
| "io" | ||
| "testing" | ||
|
|
||
| "github.com/reearth/reearth-cms/server/pkg/id" | ||
| "github.com/reearth/reearth-cms/server/pkg/item" | ||
| "github.com/reearth/reearth-cms/server/pkg/schema" | ||
| "github.com/reearth/reearth-cms/server/pkg/value" | ||
| "github.com/reearth/reearth-cms/server/pkg/version" | ||
| "github.com/reearth/reearthx/account/accountdomain" | ||
| "github.com/reearth/reearthx/util" | ||
| "github.com/samber/lo" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestCSVFromItems(t *testing.T) { | ||
| iid := id.NewItemID() | ||
| sid := id.NewSchemaID() | ||
| mid := id.NewModelID() | ||
| tid := id.NewThreadID() | ||
| pid := id.NewProjectID() | ||
| gst := schema.GeometryObjectSupportedTypeList{schema.GeometryObjectSupportedTypePoint, schema.GeometryObjectSupportedTypeLineString} | ||
| gest := schema.GeometryEditorSupportedTypeList{schema.GeometryEditorSupportedTypePoint, schema.GeometryEditorSupportedTypeLineString} | ||
| sf1 := schema.NewField(schema.NewGeometryObject(gst).TypeProperty()).NewID().Name("geo1").Key(id.RandomKey()).MustBuild() | ||
| sf3 := schema.NewField(schema.NewGeometryEditor(gest).TypeProperty()).NewID().Name("geo2").Key(id.RandomKey()).MustBuild() | ||
| in4, _ := schema.NewInteger(lo.ToPtr(int64(1)), lo.ToPtr(int64(100))) | ||
| tp4 := in4.TypeProperty() | ||
| sf4 := schema.NewField(tp4).NewID().Name("age").Key(id.RandomKey()).MustBuild() | ||
| sf5 := schema.NewField(schema.NewBool().TypeProperty()).NewID().Name("isMarried").Key(id.RandomKey()).MustBuild() | ||
| s1 := schema.New().ID(sid).Fields([]*schema.Field{sf1, sf3, sf4, sf5}).Workspace(accountdomain.NewWorkspaceID()).Project(pid).MustBuild() | ||
| fi1 := item.NewField(sf1.ID(), value.TypeGeometryObject.Value("{\"coordinates\":[139.28179282584915,36.58570985749664],\"type\":\"Point\"}").AsMultiple(), nil) | ||
| fi2 := item.NewField(sf3.ID(), value.TypeGeometryEditor.Value("{\"coordinates\":[139.28179282584915,36.58570985749664],\"type\":\"Point\"}").AsMultiple(), nil) | ||
| fi3 := item.NewField(sf4.ID(), value.TypeInteger.Value(30).AsMultiple(), nil) | ||
| fi4 := item.NewField(sf5.ID(), value.TypeBool.Value(true).AsMultiple(), nil) | ||
| i1 := item.New(). | ||
| ID(iid). | ||
| Schema(sid). | ||
| Project(pid). | ||
| Fields([]*item.Field{fi1, fi2, fi3, fi4}). | ||
| Model(mid). | ||
| Thread(tid). | ||
| MustBuild() | ||
| v1 := version.New() | ||
| vi1 := version.MustBeValue(v1, nil, version.NewRefs(version.Latest), util.Now(), i1) | ||
|
|
||
| // with geometry fields | ||
| ver1 := item.VersionedList{vi1} | ||
| _, pw := io.Pipe() | ||
| err := csvFromItems(pw, ver1, s1) | ||
| assert.Nil(t, err) | ||
|
|
||
| // no geometry fields | ||
| iid2 := id.NewItemID() | ||
| sid2 := id.NewSchemaID() | ||
| mid2 := id.NewModelID() | ||
| tid2 := id.NewThreadID() | ||
| sf2 := schema.NewField(schema.NewText(lo.ToPtr(10)).TypeProperty()).NewID().Key(id.RandomKey()).MustBuild() | ||
| s2 := schema.New().ID(sid).Fields([]*schema.Field{sf2}).Workspace(accountdomain.NewWorkspaceID()).Project(pid).MustBuild() | ||
| i2 := item.New(). | ||
| ID(iid2). | ||
| Schema(sid2). | ||
| Project(pid). | ||
| Fields([]*item.Field{item.NewField(sf2.ID(), value.TypeText.Value("test").AsMultiple(), nil)}). | ||
| Model(mid2). | ||
| Thread(tid2). | ||
| MustBuild() | ||
| v2 := version.New() | ||
| vi2 := version.MustBeValue(v2, nil, version.NewRefs(version.Latest), util.Now(), i2) | ||
| ver2 := item.VersionedList{vi2} | ||
| expectErr2 := pointFieldIsNotSupportedError | ||
| _, pw1 := io.Pipe() | ||
| err = csvFromItems(pw1, ver2, s2) | ||
| assert.Equal(t, expectErr2, err) | ||
|
|
||
| // point field is not supported | ||
| iid3 := id.NewItemID() | ||
| sid3 := id.NewSchemaID() | ||
| mid3 := id.NewModelID() | ||
| tid3 := id.NewThreadID() | ||
| gst2 := schema.GeometryObjectSupportedTypeList{schema.GeometryObjectSupportedTypeLineString, schema.GeometryObjectSupportedTypePolygon} | ||
| sf6 := schema.NewField(schema.NewGeometryObject(gst2).TypeProperty()).NewID().Name("geo3").Key(id.RandomKey()).MustBuild() | ||
| s3 := schema.New().ID(sid).Fields([]*schema.Field{sf6}).Workspace(accountdomain.NewWorkspaceID()).Project(pid).MustBuild() | ||
| i3 := item.New(). | ||
| ID(iid3). | ||
| Schema(sid3). | ||
| Project(pid). | ||
| Fields([]*item.Field{item.NewField(sf6.ID(), value.TypeText.Value("{\n \"coordinates\": [\n [\n 139.65439725962517,\n 36.34793305387103\n ],\n [\n 139.61688622815393,\n 35.910803456352724\n ]\n ],\n \"type\": \"LineString\"\n}").AsMultiple(), nil)}). | ||
| Model(mid3). | ||
| Thread(tid3). | ||
| MustBuild() | ||
| v3 := version.New() | ||
| vi3 := version.MustBeValue(v3, nil, version.NewRefs(version.Latest), util.Now(), i3) | ||
| ver3 := item.VersionedList{vi3} | ||
| expectErr3 := pointFieldIsNotSupportedError | ||
| _, pw2 := io.Pipe() | ||
| err = csvFromItems(pw2, ver3, s3) | ||
| assert.Equal(t, expectErr3, err) | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.