Merge pull request #15 from fastbill/improve-error-handlling-cache

Implement ErrNotFound in cache.Cache#GetJSON()

cache/cache.go

@@ -90,7 +90,10 @@ func (r *RedisClient) GetBool(key string) (bool, error) {
 	result, err := r.Get(key)
 	if err == redis.Nil {
 		return false, ErrNotFound
+	} else if err != nil {
+		return false, err
 	}
+
 	return strconv.ParseBool(result)
 }
 
@@ -109,9 +112,12 @@ func (r *RedisClient) SetJSON(key string, value interface{}, expiration time.Dur
 // If the client was set up with a prefix it will be added in front of the key.
 func (r *RedisClient) GetJSON(key string, result interface{}) error {
 	resultStr, err := r.Get(key)
-	if err != nil {
+	if err == redis.Nil {
+		return ErrNotFound
+	} else if err != nil {
 		return err
 	}
+
 	return json.Unmarshal([]byte(resultStr), &result)
 }
 

cache/cache_test.go

@@ -120,6 +120,13 @@ func TestGetBool(t *testing.T) {
 			assert.Error(t, err)
 		})
 	})
+
+	t.Run("value not found", func(t *testing.T) {
+		withRedis(t, func(redis *miniredis.Miniredis, client *RedisClient) {
+			_, err := client.GetBool("someKey")
+			assert.Equal(t, ErrNotFound, err)
+		})
+	})
 }
 
 func TestSetJSON(t *testing.T) {
@@ -178,6 +185,14 @@ func TestGetJSON(t *testing.T) {
 			assert.Error(t, err)
 		})
 	})
+
+	t.Run("value not found", func(t *testing.T) {
+		withRedis(t, func(redis *miniredis.Miniredis, client *RedisClient) {
+			result := &testStruct{}
+			err := client.GetJSON("foo", result)
+			assert.Equal(t, ErrNotFound, err)
+		})
+	})
 }
 
 func TestDel(t *testing.T) {