Merge branch 'develop' into feature/handle-null-keywords

Makefile

@@ -16,6 +16,7 @@ fmt:
 .PHONY: audit
 audit:
 	go list -m all | nancy sleuth
+
 .PHONY: lint
 lint:
 	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0

event/producer_test.go

@@ -39,6 +39,7 @@ var (
 		Summary:         "",
 		ReleaseDate:     "",
 		Title:           "",
+		Topics:          []string{""},
 	}
 
 	expectedVersionMetadataEvent = models.SearchDataImport{
@@ -52,6 +53,7 @@ var (
 		Summary:         "",
 		ReleaseDate:     someReleaseDate,
 		Title:           someTitle,
+		Topics:          []string{"testtopic1", "testtopic2"},
 	}
 )
 

handler/handler_test.go

@@ -86,6 +86,7 @@ func TestHandlerForZebedeeReturningMandatoryFields(t *testing.T) {
 		Summary:         "",
 		ReleaseDate:     "",
 		Title:           "testTitle",
+		Topics:          []string{"testtopic1", "testtopic2"},
 	}
 
 	kafkaProducerMock := &kafkatest.IProducerMock{
@@ -181,6 +182,7 @@ func TestHandlerForZebedeeReturningAllFields(t *testing.T) {
 		Summary:         "testSummary",
 		ReleaseDate:     "testReleaseDate",
 		Title:           "testTitle",
+		Topics:          []string{"testtopic"},
 	}
 
 	kafkaProducerMock := &kafkatest.IProducerMock{
@@ -264,6 +266,7 @@ func TestHandlerForDatasetVersionMetadata(t *testing.T) {
 		Summary:         "",
 		ReleaseDate:     "2020-11-07T00:00:00.000Z",
 		Title:           "someTitle",
+		Topics:          []string{"testtopic1", "testtopic2"},
 	}
 
 	kafkaProducerMock := &kafkatest.IProducerMock{

models/event.go

@@ -23,5 +23,6 @@ type SearchDataImport struct {
 	ReleaseDate     string   `avro:"release_date"`
 	Summary         string   `avro:"summary"`
 	Title           string   `avro:"title"`
+	Topics          []string `avro:"topics"`
 	TraceID         string   `avro:"trace_id"`
 }

models/mapper.go

@@ -18,6 +18,7 @@ func MapZebedeeDataToSearchDataImport(zebedeeData ZebedeeData, keywordsLimit int
 		Summary:         zebedeeData.Description.Summary,
 		ReleaseDate:     zebedeeData.Description.ReleaseDate,
 		Title:           zebedeeData.Description.Title,
+		Topics:          ValidateTopics(zebedeeData.Description.Topics),
 	}
 	return searchData
 }
@@ -49,6 +50,13 @@ func RectifyKeywords(keywords []string, keywordsLimit int) []string {
 	return rectifiedKeywords[:keywordsLimit]
 }
 
+func ValidateTopics(topics []string) []string {
+	if topics == nil {
+		topics = []string{""}
+	}
+	return topics
+}
+
 // MapDatasetVersionToSearchDataImport performs default mapping of datasetAPI data to a version metadata struct.
 func MapVersionMetadataToSearchDataImport(cmdData CMDData) SearchDataImport {
 	versionMetaData := SearchDataImport{

models/mapper_test.go

@@ -22,6 +22,9 @@ const (
 	someReleaseDate     = "2021-12-13"
 	someSummary         = "Some Amazing Summary"
 	someTitle           = "Some Incredible Title"
+
+	sometopic0 = "topic0"
+	sometopic1 = "topic1"
 )
 
 func TestMapZebedeeDataToSearchDataImport(t *testing.T) {
@@ -38,6 +41,7 @@ func TestMapZebedeeDataToSearchDataImport(t *testing.T) {
 				ReleaseDate:     someReleaseDate,
 				Summary:         someSummary,
 				Title:           someTitle,
+				Topics:          []string{sometopic0, sometopic1},
 			},
 		}
 		Convey("When mapped with a default keywords limit", func() {
@@ -58,6 +62,11 @@ func TestMapZebedeeDataToSearchDataImport(t *testing.T) {
 				So(result.Keywords[1], ShouldResemble, somekeyword1)
 				So(result.Keywords[2], ShouldResemble, somekeyword2)
 				So(result.Keywords[3], ShouldResemble, somekeyword3)
+
+				So(result.Topics, ShouldNotBeEmpty)
+				So(result.Topics, ShouldHaveLength, 2)
+				So(result.Topics[0], ShouldResemble, sometopic0)
+				So(result.Topics[1], ShouldResemble, sometopic1)
 			})
 		})
 		Convey("When mapped with a keywords limit of 2", func() {
@@ -170,6 +179,39 @@ func TestRectifyKeywords_EightKeywordsAndTenAsLimit(t *testing.T) {
 	})
 }
 
+func TestValidate_WithNiltopics(t *testing.T) {
+	Convey("Given a topics array is missing in zebedee response", t, func() {
+		Convey("When passed to validate the topics", func() {
+			actual := models.ValidateTopics(nil)
+			Convey("Then topics should be populated with an empty string array", func() {
+				So(actual, ShouldResemble, []string{""})
+			})
+		})
+	})
+}
+
+func TestValidate_WithEmptytopics(t *testing.T) {
+	Convey("Given a empty topics array as received from zebedee", t, func() {
+		Convey("When passed to validate the topics", func() {
+			actual := models.ValidateTopics([]string{""})
+			Convey("Then topics should be populated with an empty string array", func() {
+				So(actual, ShouldResemble, []string{""})
+			})
+		})
+	})
+}
+
+func TestValidate_WithEmptytopicsSize0(t *testing.T) {
+	Convey("Given a topics array of size 0 received from zebedee", t, func() {
+		Convey("When passed to validate the topics", func() {
+			actual := models.ValidateTopics([]string{})
+			Convey("Then topics should be populated with an string array of size 0", func() {
+				So(actual, ShouldResemble, []string{})
+			})
+		})
+	})
+}
+
 func TestMapDatasetVersionMetadataToSearchDataImport(t *testing.T) {
 	Convey("Given some valid DatasetAPI data with", t, func() {
 		CMDTestData := models.CMDData{

models/zebedee.go

@@ -16,4 +16,5 @@ type Description struct {
 	ReleaseDate     string   `json:"releaseDate"`
 	Summary         string   `json:"summary"`
 	Title           string   `json:"title"`
+	Topics          []string `json:"topics,omitempty"`
 }

schema/schema.go

@@ -37,6 +37,7 @@ var searchDataImport = `{
     {"name": "release_date", "type": "string", "default": ""},
     {"name": "summary", "type": "string", "default": ""},
     {"name": "title", "type": "string", "default": ""},
+    {"name": "topics", "type": {"type":"array","items":"string"}},
     {"name": "trace_id", "type": "string", "default": ""}
   ]
 }`