PDOK-17552 Operator uitwerken voor ATOM v3. Mapping

Author: rahmabPublic

api/v3/atom_types.go

@@ -77,14 +77,15 @@ type Author struct {
 
 // DatasetFeed represents individual dataset feeds within the Atom service
 type DatasetFeed struct {
-	TechnicalName                     string       `json:"technicalName"`
-	Title                             string       `json:"title"`
-	Subtitle                          string       `json:"subtitle,omitempty"`
-	Links                             []Link       `json:"links,omitempty"` // Todo kan weg?
-	DatasetMetadataLinks              MetadataLink `json:"datasetMetadataLinks,omitempty"`
-	SpatialDatasetIdentifierCode      string       `json:"spatial_dataset_identifier_code,omitempty"`
-	SpatialDatasetIdentifierNamespace string       `json:"spatial_dataset_identifier_namespace,omitempty"`
-	Entries                           []Entry      `json:"entries,omitempty"`
+	TechnicalName        string       `json:"technicalName"`
+	Title                string       `json:"title"`
+	Subtitle             string       `json:"subtitle,omitempty"`
+	Links                []Link       `json:"links,omitempty"` // Todo kan weg?
+	DatasetMetadataLinks MetadataLink `json:"datasetMetadataLinks,omitempty"`
+	//Author                            Author       `json:"author,omitempty"`
+	SpatialDatasetIdentifierCode      string  `json:"spatial_dataset_identifier_code,omitempty"`
+	SpatialDatasetIdentifierNamespace string  `json:"spatial_dataset_identifier_namespace,omitempty"`
+	Entries                           []Entry `json:"entries,omitempty"`
 }
 
 // MetadataLink represents a link in the service or dataset feed

api/v3/zz_generated.deepcopy.go

@@ -26,7 +26,13 @@ func MapAtomV3ToAtomGeneratorConfig(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo)
 		return atom_feed.Feeds{}, err
 	}
 	relatedLink, err = getHTMLRelatedLink(atom, language, ownerInfo)
-	latestUpdated := getLatestUpdate(atom.Spec.DatasetFeeds)
+	if err != nil {
+		return atom_feed.Feeds{}, err
+	}
+	latestUpdated, err := getLatestUpdate(atom.Spec.DatasetFeeds)
+	if err != nil {
+		return atom_feed.Feeds{}, err
+	}
 
 	atomGeneratorConfig = atom_feed.Feeds{
 		Feeds: []atom_feed.Feed{
@@ -57,7 +63,10 @@ func MapAtomV3ToAtomGeneratorConfig(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo)
 	return atomGeneratorConfig, err
 }
 
-func getLatestUpdate(feeds []pdoknlv3.DatasetFeed) string {
+func getLatestUpdate(feeds []pdoknlv3.DatasetFeed) (string, error) {
+	if len(feeds) == 0 {
+		return "", fmt.Errorf("OwnerInfo heeft geen html template")
+	}
 	updateTime := feeds[0].Entries[0].Updated
 	for _, datasetFeed := range feeds {
 		for _, entry := range datasetFeed.Entries {
@@ -66,7 +75,7 @@ func getLatestUpdate(feeds []pdoknlv3.DatasetFeed) string {
 			}
 		}
 	}
-	return updateTime.Format(time.RFC3339)
+	return updateTime.Format(time.RFC3339), nil
 }
 
 func getEntriesArray(atom pdoknlv3.Atom, ownerInfo v1.OwnerInfo) []atom_feed.Entry {

internal/controller/atom_generator/mapping.go

@@ -0,0 +1,45 @@
+package atom_generator
+
+import (
+	"github.com/pdok/atom-generator/feeds"
+	v3 "github.com/pdok/atom-operator/api/v3"
+	v1 "github.com/pdok/smooth-operator/api/v1"
+	"reflect"
+	"testing"
+)
+
+func TestMapAtomV3ToAtomGeneratorConfig(t *testing.T) {
+	type args struct {
+		atom      v3.Atom
+		ownerInfo v1.OwnerInfo
+	}
+	tests := []struct {
+		name                    string
+		args                    args
+		wantAtomGeneratorConfig feeds.Feeds
+		wantErr                 bool
+	}{
+		// TODO: Add test cases.
+		{
+			name: "error_empty_scenario_01",
+			args: args{
+				atom:      v3.Atom{},
+				ownerInfo: v1.OwnerInfo{},
+			},
+			wantAtomGeneratorConfig: feeds.Feeds{},
+			wantErr:                 true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotAtomGeneratorConfig, err := MapAtomV3ToAtomGeneratorConfig(tt.args.atom, tt.args.ownerInfo)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("MapAtomV3ToAtomGeneratorConfig() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(gotAtomGeneratorConfig, tt.wantAtomGeneratorConfig) {
+				t.Errorf("MapAtomV3ToAtomGeneratorConfig() gotAtomGeneratorConfig = %v, want %v", gotAtomGeneratorConfig, tt.wantAtomGeneratorConfig)
+			}
+		})
+	}
+}