From e00edcc044df862218c4fd971a11f9b46eae11d9 Mon Sep 17 00:00:00 2001 From: rahulmadathumpalliyalil Date: Thu, 10 Nov 2022 10:56:27 +0000 Subject: [PATCH 1/3] Update go text version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1fe9ef7..ff14606 100644 --- a/go.mod +++ b/go.mod @@ -80,6 +80,6 @@ require ( golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect - golang.org/x/text v0.3.8 // indirect + golang.org/x/text v0.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 1b95e60..3662bf6 100644 --- a/go.sum +++ b/go.sum @@ -716,8 +716,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From c2a33c3852bb34d4d6c8e77f93c7e22de2502a21 Mon Sep 17 00:00:00 2001 From: rahulmadathumpalliyalil Date: Thu, 10 Nov 2022 17:55:12 +0000 Subject: [PATCH 2/3] Add summary attribute to search data model mapper --- models/mapper.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/mapper.go b/models/mapper.go index 5d54f71..ec65ca4 100644 --- a/models/mapper.go +++ b/models/mapper.go @@ -99,6 +99,7 @@ func MapVersionMetadataToSearchDataImport(cmdData CMDData) SearchDataImport { DatasetID: cmdData.DatasetDetails.DatasetID, Edition: cmdData.DatasetDetails.Edition, DataType: cmdData.DatasetDetails.Type, + Summary: cmdData.DatasetDetails.Summary, } return versionMetaData From 7ed9a3f23d6ea97a1e208296053147c14686449d Mon Sep 17 00:00:00 2001 From: rahulmadathumpalliyalil Date: Thu, 10 Nov 2022 18:17:23 +0000 Subject: [PATCH 3/3] Remove duplicated metadescription field --- models/mapper.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/models/mapper.go b/models/mapper.go index ec65ca4..7fd242d 100644 --- a/models/mapper.go +++ b/models/mapper.go @@ -88,18 +88,17 @@ func ValidateTopics(topics []string) []string { // MapDatasetVersionToSearchDataImport performs default mapping of datasetAPI data to a version metadata struct. func MapVersionMetadataToSearchDataImport(cmdData CMDData) SearchDataImport { versionMetaData := SearchDataImport{ - UID: cmdData.UID, - URI: cmdData.URI, - ReleaseDate: cmdData.VersionDetails.ReleaseDate, - Keywords: cmdData.DatasetDetails.Keywords, - MetaDescription: cmdData.DatasetDetails.Summary, - Title: cmdData.DatasetDetails.Title, - CanonicalTopic: cmdData.DatasetDetails.CanonicalTopic, - Topics: cmdData.DatasetDetails.Subtopics, - DatasetID: cmdData.DatasetDetails.DatasetID, - Edition: cmdData.DatasetDetails.Edition, - DataType: cmdData.DatasetDetails.Type, - Summary: cmdData.DatasetDetails.Summary, + UID: cmdData.UID, + URI: cmdData.URI, + ReleaseDate: cmdData.VersionDetails.ReleaseDate, + Keywords: cmdData.DatasetDetails.Keywords, + Title: cmdData.DatasetDetails.Title, + CanonicalTopic: cmdData.DatasetDetails.CanonicalTopic, + Topics: cmdData.DatasetDetails.Subtopics, + DatasetID: cmdData.DatasetDetails.DatasetID, + Edition: cmdData.DatasetDetails.Edition, + DataType: cmdData.DatasetDetails.Type, + Summary: cmdData.DatasetDetails.Summary, } return versionMetaData