Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: synch overlaping fields #112

Merged
merged 1 commit into from
Dec 8, 2021
Merged

fix: synch overlaping fields #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/release-on-tag-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Publish release on tag push"

on:
push:
tags:
- "v*"

jobs:
publish_release:
runs-on: ubuntu-latest
steps:
- name: Checkout code for CHANGELOG.md
uses: actions/checkout@v2

- name: Generate postman collection for service
uses: actions/setup-node@v2
with:
node-version: '14'

- run: 'npx openapi-to-postmanv2 -s openapi3.yaml -o dump-server-postman-collection.json'

- name: Publish Release to Github
uses: softprops/action-gh-release@v1
with:
body_path: CHANGELOG.md
files: dump-server-postman-collection.json
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions src/models/common/decorators/fieldConfig/fieldConfig.decorator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface IFieldConfigInfo {
};
infoMsgCode?: string[];
validation?: IValidationConfigInfo[];
default?: string | number;
}

export interface IPropFieldConfigInfo extends IFieldConfigInfo {
Expand Down
30 changes: 19 additions & 11 deletions src/models/layerMetadata/layer3DMetadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,14 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'source_start_date',
type: 'timestamp without time zone',
nullable: false,
},
})
@tsTypes({
mappingType: TsTypes.DATE,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GENERAL,
Expand Down Expand Up @@ -314,13 +315,14 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'source_end_date',
type: 'timestamp without time zone',
nullable: false,
},
})
@tsTypes({
mappingType: TsTypes.DATE,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GENERAL,
Expand Down Expand Up @@ -492,14 +494,14 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'accuracy_le_90',
type: 'real',
nullable: true,
nullable: false,
},
})
@tsTypes({
mappingType: TsTypes.NUMBER,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
Expand Down Expand Up @@ -574,6 +576,7 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'relative_accuracy_le_90',
type: 'real',
nullable: true,
},
})
@tsTypes({
Expand Down Expand Up @@ -686,14 +689,14 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'footprint',
type: 'text',
nullable: true,
nullable: false,
},
})
@tsTypes({
mappingType: TsTypes.OBJECT,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
Expand Down Expand Up @@ -771,18 +774,20 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'srs',
type: 'text',
nullable: true,
nullable: false,
default: '4326',
},
})
@tsTypes({
mappingType: TsTypes.STRING,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
infoMsgCode: ['info-general-tooltip.required'],
default: '4326',
validation: [
{
errorMsgCode: 'validation-general.required',
Expand All @@ -804,18 +809,20 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'srs_name',
type: 'text',
nullable: true,
nullable: false,
default: 'WGS84GEO',
},
})
@tsTypes({
mappingType: TsTypes.STRING,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
infoMsgCode: ['info-general-tooltip.required'],
default: 'WGS84GEO',
validation: [
{
errorMsgCode: 'validation-general.required',
Expand Down Expand Up @@ -896,13 +903,14 @@ export class Layer3DMetadata implements ILayer3DMetadata, IMetadataCommonModel {
column: {
name: 'classification',
type: 'text',
nullable: false,
},
})
@tsTypes({
mappingType: TsTypes.STRING,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GENERAL,
Expand Down
29 changes: 22 additions & 7 deletions src/models/layerMetadata/layerDEMMetadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,26 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
column: {
name: 'srs',
type: 'text',
nullable: true,
nullable: false,
default: '4326',
},
})
@tsTypes({
mappingType: TsTypes.STRING,
})
@graphql({
nullable: true,
nullable: false,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
infoMsgCode: ['info-general-tooltip.required'],
default: '4326',
validation: [
{
errorMsgCode: 'validation-general.required',
required: true,
},
],
})
//#endregion
public srsId: string | undefined = undefined;
Expand All @@ -188,6 +197,7 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
name: 'srs_name',
type: 'text',
nullable: false,
default: 'WGS84GEO',
},
})
@tsTypes({
Expand All @@ -199,6 +209,7 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
@fieldConfig({
category: FieldCategory.GEO_INFO,
infoMsgCode: ['info-general-tooltip.required'],
default: 'WGS84GEO',
validation: [
{
errorMsgCode: 'validation-general.required',
Expand Down Expand Up @@ -279,7 +290,9 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
@tsTypes({
mappingType: TsTypes.DATE,
})
@graphql()
@graphql({
nullable: false,
})
@fieldConfig({
category: FieldCategory.GENERAL,
infoMsgCode: ['info-general-tooltip.required', 'info-field-tooltip.sourceDateStart.max'],
Expand Down Expand Up @@ -315,7 +328,9 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
@tsTypes({
mappingType: TsTypes.DATE,
})
@graphql()
@graphql({
nullable: false,
})
@fieldConfig({
category: FieldCategory.GENERAL,
infoMsgCode: ['info-general-tooltip.required'],
Expand Down Expand Up @@ -544,7 +559,7 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
mappingType: TsTypes.NUMBER,
})
@graphql({
nullable: false,
nullable: true,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
Expand Down Expand Up @@ -719,7 +734,7 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
mappingType: TsTypes.NUMBER,
})
@graphql({
nullable: false,
nullable: true,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
Expand Down Expand Up @@ -767,7 +782,7 @@ export class LayerDEMMetadata implements ILayerMetadata, IMetadataCommonModel {
mappingType: TsTypes.NUMBER,
})
@graphql({
nullable: false,
nullable: true,
})
@fieldConfig({
category: FieldCategory.GEO_INFO,
Expand Down
Loading