Merge branch 'release/0.22.0'

ONSdigital · Oct 28, 2022 · 2e78929 · 2e78929
2 parents 9496ef3 + 51fae0f
commit 2e78929
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/handler/handler.go b/handler/handler.go
@@ -104,12 +104,13 @@ func (h *ContentPublishedHandler) Handle(ctx context.Context, cpEvent *models.Co
 
 		datasetDetailsData := models.DatasetDetails{
 			Title:          datasetMetadataPublished.Title,
-			Description:    datasetMetadataPublished.Description,
+			Summary:        datasetMetadataPublished.Description,
 			CanonicalTopic: datasetMetadataPublished.CanonicalTopic,
 			Subtopics:      datasetMetadataPublished.Subtopics,
 			Edition:        edition,
 			DatasetID:      datasetID,
 			URI:            cpEvent.URI,
+			Type:           "dataset_landing_page",
 		}
 
 		if datasetMetadataPublished.Keywords != nil {

diff --git a/models/mapper.go b/models/mapper.go
@@ -92,7 +92,7 @@ func MapVersionMetadataToSearchDataImport(cmdData CMDData) SearchDataImport {
 		URI:             cmdData.URI,
 		ReleaseDate:     cmdData.VersionDetails.ReleaseDate,
 		Keywords:        cmdData.DatasetDetails.Keywords,
-		MetaDescription: cmdData.DatasetDetails.Description,
+		MetaDescription: cmdData.DatasetDetails.Summary,
 		Title:           cmdData.DatasetDetails.Title,
 		CanonicalTopic:  cmdData.DatasetDetails.CanonicalTopic,
 		Topics:          cmdData.DatasetDetails.Subtopics,

diff --git a/models/mapper_test.go b/models/mapper_test.go
@@ -314,9 +314,9 @@ func TestMapDatasetVersionMetadataToSearchDataImport(t *testing.T) {
 				ReleaseDate: someReleaseDate,
 			},
 			DatasetDetails: models.DatasetDetails{
-				Title:       someTitle,
-				Description: someMetaDescription,
-				Keywords:    []string{somekeyword0, somekeyword1, somekeyword2, somekeyword3},
+				Title:    someTitle,
+				Summary:  someMetaDescription,
+				Keywords: []string{somekeyword0, somekeyword1, somekeyword2, somekeyword3},
 			},
 		}
 		Convey("When passed to rectify the keywords with keywords limit as 5", func() {

diff --git a/models/metadata.go b/models/metadata.go
@@ -2,25 +2,26 @@ package models
 
 // CMDData provides model for datasetAPI metadata response
 type CMDData struct {
-	UID            string         `json:"uid"`
-	URI            string         `json:"uri"`
-	VersionDetails VersionDetails `json:"version"`
-	DatasetDetails DatasetDetails `json:"datasetdetails"`
+	UID            string
+	URI            string
+	VersionDetails VersionDetails
+	DatasetDetails DatasetDetails
 }
 
 // Version represents a version for an edition within a dataset
 type VersionDetails struct {
-	ReleaseDate string `json:"release_date,omitempty"`
+	ReleaseDate string
 }
 
 // DatasetDetails represents a DatasetDetails for an edition within a dataset
 type DatasetDetails struct {
-	CanonicalTopic string   `json:"canonical_topic,omitempty"`
-	DatasetID      string   `json:"dataset_id,omitempty"`
-	Description    string   `json:"description"`
-	Edition        string   `json:"edition,omitempty"`
-	Keywords       []string `json:"keywords,omitempty"`
-	Subtopics      []string `json:"subtopics,omitempty"`
-	Title          string   `json:"title"`
-	URI            string   `json:"uri,omitempty"`
+	CanonicalTopic string
+	DatasetID      string
+	Summary        string
+	Edition        string
+	Keywords       []string
+	Subtopics      []string
+	Title          string
+	URI            string
+	Type           string
 }