Merge pull request #59 from savagedev/redis-cache-expiration

Correct cache expiration value calculation

provider/github/provider.go

@@ -151,7 +151,7 @@ func (p Provider) isRepoNotInCache(repoID int64) bool {
 
 	switch {
 	case err == redis.Nil:
-		err := p.CacheClient.Set(k, true, time.Duration(p.Config.Periodicity)*time.Minute)
+		err := p.CacheClient.Set(k, true, p.cacheExpirationMinutes())
 		if err != nil {
 			return false
 		}
@@ -165,6 +165,14 @@ func (p Provider) isRepoNotInCache(repoID int64) bool {
 	return false
 }
 
+func (p Provider) cacheExpirationMinutes() time.Duration {
+	expirationMinutes := p.Config.CacheSize * p.Config.Periodicity
+	if expirationMinutes < 0 {
+		expirationMinutes = 0
+	}
+	return time.Duration(expirationMinutes) * time.Minute
+}
+
 func (p Provider) getContent(repo *github.Repository) *domain.Content {
 	c := domain.Content{Title: repo.Name, Subtitle: repo.Description, URL: repo.HTMLURL, ExtraData: []string{}}
 

provider/github/provider_test.go

@@ -448,3 +448,61 @@ func TestGetRepo(t *testing.T) {
 		})
 	}
 }
+
+func TestCacheExpiration(t *testing.T) {
+	for _, tc := range []struct {
+		Name        string
+		mockConfig  config.Config
+		cacheClient mock.CacheClientMock
+		returnValue time.Duration
+	}{
+		{
+			Name: "Test success",
+			mockConfig: config.Config{
+				CacheSize:   10,
+				Periodicity: 2,
+			},
+			cacheClient: mock.CacheClientMock{
+				SetFn: func(key string, value interface{}, exp time.Duration) error {
+					return nil
+				},
+			},
+			returnValue: time.Duration(20) * time.Minute,
+		},
+		{
+			Name: "Test negative cache size",
+			mockConfig: config.Config{
+				CacheSize:   -10,
+				Periodicity: 2,
+			},
+			cacheClient: mock.CacheClientMock{
+				SetFn: func(key string, value interface{}, exp time.Duration) error {
+					return nil
+				},
+			},
+			returnValue: time.Duration(0) * time.Minute,
+		},
+		{
+			Name: "Test negative periodicity",
+			mockConfig: config.Config{
+				CacheSize:   10,
+				Periodicity: -2,
+			},
+			cacheClient: mock.CacheClientMock{
+				SetFn: func(key string, value interface{}, exp time.Duration) error {
+					return nil
+				},
+			},
+			returnValue: time.Duration(0) * time.Minute,
+		},
+	} {
+		t.Run(tc.Name, func(t *testing.T) {
+			p := Provider{Config: tc.mockConfig, CacheClient: tc.cacheClient}
+			resp := p.cacheExpirationMinutes()
+
+			if tc.returnValue != resp {
+				t.Errorf("expected %v as value, got %v instead", tc.returnValue, resp)
+			}
+		})
+	}
+}