Skip to content

Commit 7c92dab

Browse files
authored
Merge pull request #12 from PDOK/PDOK-17552-atom-operator-v3-mappings
Pdok 17552 atom operator v3 mappings
2 parents 37191d6 + 7c567ee commit 7c92dab

File tree

6 files changed

+327
-135
lines changed

6 files changed

+327
-135
lines changed

api/v3/atom_types.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ type Service struct {
6363
OwnerInfoRef string `json:"ownerInfoRef"`
6464
ServiceMetadataLinks MetadataLink `json:"serviceMetadataLinks,omitempty"`
6565
Rights string `json:"rights,omitempty"`
66-
66+
Author Author `json:"author,omitempty"`
67+
6768
// +kubebuilder:validation:Optional
6869
GeneratorConfig string `json:"-"` // Skip this field in the CRD schema
6970
}
@@ -78,7 +79,6 @@ type Link struct {
7879
Title string `json:"title,omitempty"`
7980
}
8081

81-
// Author todo: move to higher level
8282
// Author specifies the author or owner information
8383
type Author struct {
8484
Name string `json:"name"`
@@ -87,15 +87,14 @@ type Author struct {
8787

8888
// DatasetFeed represents individual dataset feeds within the Atom service
8989
type DatasetFeed struct {
90-
TechnicalName string `json:"technicalName"`
91-
Title string `json:"title"`
92-
Subtitle string `json:"subtitle,omitempty"`
93-
Links []Link `json:"links,omitempty"`
94-
DatasetMetadataLinks MetadataLink `json:"datasetMetadataLinks,omitempty"`
95-
Author Author `json:"author,omitempty"`
96-
SpatialDatasetIdentifierCode string `json:"spatial_dataset_identifier_code,omitempty"`
97-
SpatialDatasetIdentifierNamespace string `json:"spatial_dataset_identifier_namespace,omitempty"`
98-
Entries []Entry `json:"entries,omitempty"`
90+
TechnicalName string `json:"technicalName"`
91+
Title string `json:"title"`
92+
Subtitle string `json:"subtitle,omitempty"`
93+
Links []Link `json:"links,omitempty"` // Todo kan weg?
94+
DatasetMetadataLinks MetadataLink `json:"datasetMetadataLinks,omitempty"`
95+
SpatialDatasetIdentifierCode string `json:"spatial_dataset_identifier_code,omitempty"`
96+
SpatialDatasetIdentifierNamespace string `json:"spatial_dataset_identifier_namespace,omitempty"`
97+
Entries []Entry `json:"entries,omitempty"`
9998
}
10099

101100
// MetadataLink represents a link in the service or dataset feed

api/v3/zz_generated.deepcopy.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.23.0
55
godebug default=go1.23
66

77
require (
8+
github.com/cbroglie/mustache v1.4.0
89
github.com/go-logr/logr v1.4.2
910
github.com/onsi/ginkgo/v2 v2.21.0
1011
github.com/onsi/gomega v1.35.1

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
1010
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
1111
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
1212
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
13+
github.com/cbroglie/mustache v1.4.0 h1:Azg0dVhxTml5me+7PsZ7WPrQq1Gkf3WApcHMjMprYoU=
14+
github.com/cbroglie/mustache v1.4.0/go.mod h1:SS1FTIghy0sjse4DUVGV1k/40B1qE1XkD9DtDsHo9iM=
1315
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
1416
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
1517
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

0 commit comments

Comments
 (0)