Removed uuid standalone logic implementations and used uuid-utils-go …

…lib methods.
Financial-Times · May 22, 2017 · b48d5ab · b48d5ab
1 parent 15febb7
commit b48d5ab
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 174 deletions.
diff --git a/UUID.go b/UUID.go
diff --git a/imagesetUUIDGenerator.go b/imagesetUUIDGenerator.go
diff --git a/imagesetUUIDGenerator_test.go b/imagesetUUIDGenerator_test.go
diff --git a/model.go b/model.go
@@ -5,6 +5,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"strings"
 	"time"
+	"github.com/Financial-Times/uuid-utils-go"
 )
 
 const (
@@ -254,12 +255,12 @@ func convertToESContentModel(enrichedContent enrichedContentModel, contentType s
 	if enrichedContent.Content.MainImage != "" {
 		esModel.ThumbnailURL = new(string)
 
-		var imageID UUID
+		var imageID *uuidutils.UUID
 
 		//Generate the actual image UUID from the received image set UUID
-		imageSetUUID, err := NewUUIDFromString(enrichedContent.Content.MainImage)
+		imageSetUUID, err := uuidutils.NewUUIDFromString(enrichedContent.Content.MainImage)
 		if err == nil {
-			imageID, err = GenerateUUID(*imageSetUUID)
+			imageID, err = uuidutils.NewUUIDDeriverWith(uuidutils.IMAGE_SET).From(imageSetUUID)
 		}
 
 		if err != nil {

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -44,6 +44,14 @@
 			"revision": "df2f00c734957c9dd651ce23ab0e0902504c7636",
 			"revisionTime": "2017-03-28T16:39:54Z"
 		},
+		{
+			"checksumSHA1": "OctXH9nxfVzFlVWD7h4K5e+x5/M=",
+			"path": "github.com/Financial-Times/uuid-utils-go",
+			"revision": "e22658edd0f130936e99079bf844bde7087c914c",
+			"revisionTime": "2017-05-16T11:04:27Z",
+			"version": "1.0.1",
+			"versionExact": "1.0.1"
+		},
 		{
 			"checksumSHA1": "ZKxETlJdB2XubMrZnXB0FQimVA8=",
 			"path": "github.com/Sirupsen/logrus",
@@ -126,7 +134,7 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "xegYczAmM0AnZfE/Salv75CB1R0=",
+			"checksumSHA1": "6KZEap6v/5gD+tjiNbpD81kD61o=",
 			"path": "github.com/willf/bitset",
 			"revision": "988f4f24992fc745de53c42df0da6581e42a6686",
 			"revisionTime": "2017-05-05T19:16:46Z"