-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(server): add NLS layer support (#632)
Co-authored-by: YK <[email protected]>
- Loading branch information
1 parent
383ef9b
commit c832483
Showing
40 changed files
with
5,809 additions
and
444 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| package e2e | ||
|
|
||
| // import ( | ||
| // "net/http" | ||
| // "testing" | ||
|
|
||
| // "github.com/gavv/httpexpect/v2" | ||
| // "github.com/reearth/reearth/server/internal/app/config" | ||
| // ) | ||
|
|
||
| // func addNLSLayerSimple(e *httpexpect.Expect, sId string) (GraphQLRequest, *httpexpect.Value, string) { | ||
| // requestBody := GraphQLRequest{ | ||
| // OperationName: "addNLSLayerSimple", | ||
| // Query: `mutation AddNLSLayerSimple($input: AddNLSLayerSimpleInput!) { | ||
| // addNLSLayerSimple(input: $input) { | ||
| // layers { | ||
| // id | ||
| // __typename | ||
| // } | ||
| // __typename | ||
| // } | ||
| // }`, | ||
| // Variables: map[string]any{ | ||
| // "input": map[string]any{ | ||
| // "parentLayerId": "parent12345", | ||
| // "layerType": "SimpleType", | ||
| // "sceneID": sId, | ||
| // "config": map[string]any{ | ||
| // "data": map[string]any{ | ||
| // "type": "ExampleType", | ||
| // "url": "https://example.com/data", | ||
| // "value": "sampleValue", | ||
| // "layers": "sampleLayerData", | ||
| // "jsonProperties": []string{"prop1", "prop2"}, | ||
| // "updateInterval": 10, | ||
| // "parameters": map[string]any{ | ||
| // "sampleKey": "sampleValue", | ||
| // }, | ||
| // "time": map[string]any{ | ||
| // "property": "time", | ||
| // "interval": 5, | ||
| // "updateClockOnLoad": true, | ||
| // }, | ||
| // "csv": map[string]any{ | ||
| // "idColumn": "id", | ||
| // "latColumn": "latitude", | ||
| // "lngColumn": "longitude", | ||
| // "heightColumn": "height", | ||
| // "noHeader": false, | ||
| // "disableTypeConversion": true, | ||
| // }, | ||
| // }, | ||
| // "properties": "sampleProperties", | ||
| // "defines": map[string]string{ | ||
| // "defineKey": "defineValue", | ||
| // }, | ||
| // "events": "sampleEvents", | ||
| // }, | ||
| // "index": 0, | ||
| // }, | ||
| // }, | ||
| // } | ||
|
|
||
| // res := e.POST("/api/graphql"). | ||
| // WithHeader("Origin", "https://example.com"). | ||
| // WithHeader("X-Reearth-Debug-User", uID.String()). | ||
| // WithHeader("Content-Type", "application/json"). | ||
| // WithJSON(requestBody). | ||
| // Expect(). | ||
| // Status(http.StatusOK). | ||
| // JSON() | ||
|
|
||
| // layerId := res.Path("$.data.addNLSLayerSimple.layers.id").Raw().(string) | ||
| // return requestBody, res, layerId | ||
| // } | ||
|
|
||
| // func removeNLSLayer(e *httpexpect.Expect, layerId string) (GraphQLRequest, *httpexpect.Value) { | ||
| // requestBody := GraphQLRequest{ | ||
| // OperationName: "removeNLSLayer", | ||
| // Query: `mutation RemoveNLSLayer($input: RemoveNLSLayerInput!) { | ||
| // removeNLSLayer(input: $input) { | ||
| // layerId | ||
| // } | ||
| // }`, | ||
| // Variables: map[string]any{ | ||
| // "input": map[string]any{ | ||
| // "layerId": layerId, | ||
| // }, | ||
| // }, | ||
| // } | ||
|
|
||
| // res := e.POST("/api/graphql"). | ||
| // WithHeader("Origin", "https://example.com"). | ||
| // WithHeader("X-Reearth-Debug-User", uID.String()). | ||
| // WithHeader("Content-Type", "application/json"). | ||
| // WithJSON(requestBody). | ||
| // Expect(). | ||
| // Status(http.StatusOK). | ||
| // JSON() | ||
|
|
||
| // return requestBody, res | ||
| // } | ||
|
|
||
| // func updateNLSLayer(e *httpexpect.Expect, layerId string) (GraphQLRequest, *httpexpect.Value) { | ||
| // requestBody := GraphQLRequest{ | ||
| // OperationName: "updateNLSLayer", | ||
| // Query: `mutation UpdateNLSLayer($input: UpdateNLSLayerInput!) { | ||
| // updateNLSLayer(input: $input) { | ||
| // layer { | ||
| // id | ||
| // __typename | ||
| // } | ||
| // __typename | ||
| // } | ||
| // }`, | ||
| // Variables: map[string]any{ | ||
| // "input": map[string]any{ | ||
| // "layerId": layerId, | ||
| // "name": "Updated Layer", | ||
| // "visible": true, | ||
| // }, | ||
| // }, | ||
| // } | ||
|
|
||
| // res := e.POST("/api/graphql"). | ||
| // WithHeader("Origin", "https://example.com"). | ||
| // WithHeader("X-Reearth-Debug-User", uID.String()). | ||
| // WithHeader("Content-Type", "application/json"). | ||
| // WithJSON(requestBody). | ||
| // Expect(). | ||
| // Status(http.StatusOK). | ||
| // JSON() | ||
|
|
||
| // return requestBody, res | ||
| // } | ||
|
|
||
| // func TestNLSLayerCRUD(t *testing.T) { | ||
| // e := StartServer(t, &config.Config{ | ||
| // Origins: []string{"https://example.com"}, | ||
| // AuthSrv: config.AuthSrvConfig{ | ||
| // Disabled: true, | ||
| // }, | ||
| // }, true, baseSeeder) | ||
|
|
||
| // pId := createProject(e) | ||
| // _, _, sId := createScene(e, pId) | ||
|
|
||
| // // Add NLSLayer | ||
| // _, _, layerId := addNLSLayerSimple(e, sId) | ||
|
|
||
| // // Update NLSLayer | ||
| // _, _ = updateNLSLayer(e, layerId) | ||
|
|
||
| // // Remove NLSLayer | ||
| // _, _ = removeNLSLayer(e, layerId) | ||
| // } |
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,81 @@ | ||
| # TODO: Make LayerGroup Real | ||
| interface NLSLayer { | ||
| id: ID! | ||
| layerType: String! | ||
| sceneId: ID! | ||
| title: String! | ||
| visible: Boolean! | ||
| infobox: Infobox | ||
| tags: [LayerTag!]! | ||
| } | ||
|
|
||
| type NLSLayerSimple implements NLSLayer { | ||
| id: ID! | ||
| layerType: String! | ||
| sceneId: ID! | ||
| config: JSON | ||
| title: String! | ||
| visible: Boolean! | ||
| infobox: Infobox | ||
| tags: [LayerTag!]! | ||
| scene: Scene | ||
| } | ||
|
|
||
| type NLSLayerGroup implements NLSLayer { | ||
| id: ID! | ||
| layerType: String! | ||
| sceneId: ID! | ||
| children: [NLSLayer]! | ||
| childrenIds: [ID!]! | ||
| config: JSON | ||
| title: String! | ||
| visible: Boolean! | ||
| infobox: Infobox | ||
| tags: [LayerTag!]! | ||
| scene: Scene | ||
| } | ||
|
|
||
| # InputType | ||
|
|
||
| input AddNLSLayerSimpleInput { | ||
| parentLayerId: ID! | ||
| layerType: String! | ||
| sceneID: ID! | ||
| config: JSON | ||
| index: Int | ||
| } | ||
|
|
||
| input RemoveNLSLayerInput { | ||
| layerId: ID! | ||
| } | ||
|
|
||
| input UpdateNLSLayerInput { | ||
| layerId: ID! | ||
| name: String | ||
| visible: Boolean | ||
| } | ||
|
|
||
| # Payload | ||
|
|
||
| type AddNLSLayerSimplePayload { | ||
| layers: NLSLayerSimple! | ||
| } | ||
|
|
||
| type RemoveNLSLayerPayload { | ||
| layerId: ID! | ||
| } | ||
|
|
||
| type UpdateNLSLayerPayload { | ||
| layer: NLSLayer! | ||
| } | ||
|
|
||
| # TODO | ||
| # extend type Query{ | ||
| # newLayer(id: ID!): NLSLayer | ||
| # } | ||
|
|
||
| extend type Mutation { | ||
| addNLSLayerSimple(input: AddNLSLayerSimpleInput!): AddNLSLayerSimplePayload | ||
| removeNLSLayer(input: RemoveNLSLayerInput!): RemoveNLSLayerPayload | ||
| updateNLSLayer(input: UpdateNLSLayerInput!): UpdateNLSLayerPayload | ||
| } |
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
Oops, something went wrong.