WIP

Author: ebroberson

models/helpers.go

@@ -2,7 +2,7 @@ package models
 
 func GetResource(resource *Resource) *Resource {
 	r := &Resource{Key: resource.Key, Owner: resource.Owner, Value: resource.Value}
-	if resource.TypeCode == TypeCode_UNKNOWN {
+	if resource.TypeCode == UNKNOWN {
 		r.TypeCode = GetTypeCode(resource.Type)
 		r.Type = resource.Type
 	} else {
@@ -15,19 +15,19 @@ func GetResource(resource *Resource) *Resource {
 func GetTypeCode(lockType string) TypeCode {
 	switch lockType {
 	case LockType:
-		return TypeCode_LOCK
+		return LOCK
 	case PresenceType:
-		return TypeCode_PRESENCE
+		return PRESENCE
 	default:
-		return TypeCode_UNKNOWN
+		return UNKNOWN
 	}
 }
 
 func GetType(resource *Resource) string {
 	switch resource.TypeCode {
-	case TypeCode_LOCK:
+	case LOCK:
 		return LockType
-	case TypeCode_PRESENCE:
+	case PRESENCE:
 		return PresenceType
 	default:
 		return resource.Type

models/helpers_test.go

@@ -9,17 +9,17 @@ import (
 var _ = Describe("helpers", func() {
 	Describe("GetType", func() {
 		It("matches the correct type to the type code", func() {
-			Expect(models.GetType(&models.Resource{TypeCode: models.TypeCode_PRESENCE})).To(Equal("presence"))
-			Expect(models.GetType(&models.Resource{TypeCode: models.TypeCode_LOCK})).To(Equal("lock"))
-			Expect(models.GetType(&models.Resource{Type: "sandwich", TypeCode: models.TypeCode_UNKNOWN})).To(Equal("sandwich"))
+			Expect(models.GetType(&models.Resource{TypeCode: models.PRESENCE})).To(Equal("presence"))
+			Expect(models.GetType(&models.Resource{TypeCode: models.LOCK})).To(Equal("lock"))
+			Expect(models.GetType(&models.Resource{Type: "sandwich", TypeCode: models.UNKNOWN})).To(Equal("sandwich"))
 		})
 	})
 
 	Describe("GetTypeCode", func() {
 		It("matches the correct type code to the type", func() {
-			Expect(models.GetTypeCode("presence")).To(Equal(models.TypeCode_PRESENCE))
-			Expect(models.GetTypeCode("lock")).To(Equal(models.TypeCode_LOCK))
-			Expect(models.GetTypeCode("sandwich")).To(Equal(models.TypeCode_UNKNOWN))
+			Expect(models.GetTypeCode("presence")).To(Equal(models.PRESENCE))
+			Expect(models.GetTypeCode("lock")).To(Equal(models.LOCK))
+			Expect(models.GetTypeCode("sandwich")).To(Equal(models.UNKNOWN))
 		})
 	})
 
@@ -29,22 +29,22 @@ var _ = Describe("helpers", func() {
 				Owner:    "thelizardking",
 				Value:    "candoanything",
 				Key:      "sandwich",
-				TypeCode: models.TypeCode_UNKNOWN,
+				TypeCode: models.UNKNOWN,
 				Type:     "lock",
 			}
 
 			resource2 := &models.Resource{
 				Owner:    "thelizardking",
 				Value:    "candoanything",
 				Key:      "sandwich",
-				TypeCode: models.TypeCode_UNKNOWN,
+				TypeCode: models.UNKNOWN,
 				Type:     "whut",
 			}
 
-			Expect(models.GetResource(resource1).TypeCode).To(Equal(models.TypeCode_LOCK))
+			Expect(models.GetResource(resource1).TypeCode).To(Equal(models.LOCK))
 			Expect(models.GetResource(resource1).Type).To(Equal("lock"))
 
-			Expect(models.GetResource(resource2).TypeCode).To(Equal(models.TypeCode_UNKNOWN))
+			Expect(models.GetResource(resource2).TypeCode).To(Equal(models.UNKNOWN))
 			Expect(models.GetResource(resource2).Type).To(Equal("whut"))
 		})
 
@@ -53,22 +53,22 @@ var _ = Describe("helpers", func() {
 				Owner:    "thelizardking",
 				Value:    "candoanything",
 				Key:      "sandwich",
-				TypeCode: models.TypeCode_LOCK,
+				TypeCode: models.LOCK,
 				Type:     "whut",
 			}
 
 			resource2 := &models.Resource{
 				Owner:    "thelizardking",
 				Value:    "candoanything",
 				Key:      "sandwich",
-				TypeCode: models.TypeCode_PRESENCE,
+				TypeCode: models.PRESENCE,
 				Type:     "whut",
 			}
 
-			Expect(models.GetResource(resource1).TypeCode).To(Equal(models.TypeCode_LOCK))
+			Expect(models.GetResource(resource1).TypeCode).To(Equal(models.LOCK))
 			Expect(models.GetResource(resource1).Type).To(Equal("lock"))
 
-			Expect(models.GetResource(resource2).TypeCode).To(Equal(models.TypeCode_PRESENCE))
+			Expect(models.GetResource(resource2).TypeCode).To(Equal(models.PRESENCE))
 			Expect(models.GetResource(resource2).Type).To(Equal("presence"))
 		})
 	})