Fixed extracting uuids from incoming message

Financial-Times · Dec 4, 2017 · 53b76bf · 53b76bf
1 parent 15b4225
commit 53b76bf
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/common_test.go b/common_test.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	whitelistedCollection  = "content-package"
-	inputFile              = "content-collection.json"
+	inputFile              = "content-collection-full-msg.json"
 	collectionUuid         = "45163790-eec9-11e6-abbc-ee7d9c5b3b90"
 	leadArticleUuid        = "ddda0e1c-a9b2-11e7-8e2d-6debe43a48b4"
 	firstExistingItemUuid  = "aaaac4c6-dcc6-11e6-86ac-f253db7791c6"

diff --git a/resolver/uuidResolver.go b/resolver/uuidResolver.go
@@ -48,7 +48,7 @@ func (r *fromRequestResolver) Resolve(reqData []byte) (UuidsAndDate, error) {
 
 func resolveUuids(cc contentCollection) ([]string, error) {
 	var uuidArr []string
-	for _, item := range cc.Items {
+	for _, item := range cc.Payload.Items {
 		err := uuidutils.ValidateUUID(item.Uuid)
 		if err != nil {
 			return nil, fmt.Errorf("UUID validation error: %v", err)
@@ -69,8 +69,16 @@ func resolveLastModified(cc contentCollection) (string, error) {
 }
 
 type contentCollection struct {
+	Payload      payload `json:"payload"`
+	ContentUri   string  `json:"contentUri"`
+	LastModified string  `json:"lastModified"`
+	Uuid         string  `json:"uuid"`
+}
+
+type payload struct {
 	LastModified string                  `json:"lastModified"`
 	Items        []contentCollectionItem `json:"items"`
+	Uuid         string                  `json:"uuid"`
 }
 
 type contentCollectionItem struct {

diff --git a/resolver/uuidResolver_test.go b/resolver/uuidResolver_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestValidInput(t *testing.T) {
-	ccBytes := readTestFile(t, "content-collection.json")
+	ccBytes := readTestFile(t, "content-collection-full-msg.json")
 
 	r := NewUuidResolver()
 	uuidsAndDate, err := r.Resolve(ccBytes)

diff --git a/test-resources/content-collection-full-msg.json b/test-resources/content-collection-full-msg.json
@@ -0,0 +1,21 @@
+{
+  "payload":{
+    "uuid":"45163790-eec9-11e6-abbc-ee7d9c5b3b90",
+    "items":[
+      {
+        "uuid": "aaaac4c6-dcc6-11e6-86ac-f253db7791c6"
+      },
+      {
+        "uuid": "bbbbc4c6-dcc6-11e6-86ac-f253db7791c6"
+      },
+      {
+        "uuid": "d4986a58-de3b-11e6-86ac-f253db7791c6"
+      }
+    ],
+    "publishReference":"tdi23377744",
+    "lastModified":"2017-01-31T15:33:21.687Z"
+  },
+  "contentUri":"http://methode-content-collection-mapper.svc.ft.com/content-collection/content-package/45163790-eec9-11e6-abbc-ee7d9c5b3b90",
+  "lastModified":"2017-01-31T15:33:21.687Z",
+  "uuid":"45163790-eec9-11e6-abbc-ee7d9c5b3b90"
+}
diff --git a/test-resources/content-collection.json b/test-resources/content-collection.json