Fixed delete if expired logic

mmacdo54 · Jun 29, 2024 · 5dcd6f9 · 5dcd6f9
1 parent 159dff4
commit 5dcd6f9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 69 deletions.
diff --git a/internal/handlers/list.go b/internal/handlers/list.go
@@ -3,7 +3,6 @@ package handlers
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/mmacdo54/go-redis-clone/internal/storage"
 )
@@ -38,12 +37,6 @@ func lpush(h handlerArgs) handlerResponse {
 
 	el.Key = key
 	el.Typ = LIST
-	now := int(time.Now().Unix()) * 1000
-	if el.Exp > 0 && el.Exp < now {
-		el.Arr = []string{}
-		el.Exp = 0
-	}
-
 	list := []string{}
 	for i := len(h.args) - 1; i >= 1; i-- {
 		list = append(list, h.args[i].Bulk)
@@ -109,12 +102,6 @@ func rpush(h handlerArgs) handlerResponse {
 
 	el.Key = key
 	el.Typ = LIST
-	now := int(time.Now().Unix()) * 1000
-	if el.Exp > 0 && el.Exp < now {
-		el.Arr = []string{}
-		el.Exp = 0
-	}
-
 	for _, v := range h.args[1:] {
 		el.Arr = append(el.Arr, v.Bulk)
 	}
@@ -174,23 +161,6 @@ func lpop(h handlerArgs) handlerResponse {
 		}
 	}
 
-	now := int(time.Now().Unix()) * 1000
-	if el.Exp > 0 && el.Exp < now {
-		if _, err := h.store.DeleteByKey(el, tx); err != nil {
-			return handlerResponse{
-				err: err,
-			}
-		}
-		if err := tx.Commit(); err != nil {
-			return handlerResponse{
-				err: err,
-			}
-		}
-		return handlerResponse{
-			resp: generateNullResponse(),
-		}
-	}
-
 	val := el.Arr[0]
 	if len(el.Arr) == 1 {
 		if _, err := h.store.DeleteByKey(el, tx); err != nil {
@@ -248,18 +218,6 @@ func rpop(h handlerArgs) handlerResponse {
 		}
 	}
 
-	now := int(time.Now().Unix()) * 1000
-	if el.Exp > 0 && el.Exp < now {
-		if _, err := h.store.DeleteByKey(el, tx); err != nil {
-			return handlerResponse{
-				err: err,
-			}
-		}
-		return handlerResponse{
-			resp: generateNullResponse(),
-		}
-	}
-
 	val := el.Arr[len(el.Arr)-1]
 	if len(el.Arr) == 1 {
 		if _, err := h.store.DeleteByKey(el, tx); err != nil {

diff --git a/internal/handlers/string.go b/internal/handlers/string.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/mmacdo54/go-redis-clone/internal/storage"
 )
@@ -61,6 +60,8 @@ func set(h handlerArgs) handlerResponse {
 			kv.Exp = opts.exat
 		case opts.pxat > 0:
 			kv.Exp = opts.pxat
+		default:
+			kv.Exp = 0
 		}
 	}
 
@@ -128,32 +129,6 @@ func get(h handlerArgs) handlerResponse {
 		}
 	}
 
-	now := int(time.Now().Unix()) * 1000
-
-	if v.Exp > 0 && v.Exp < now {
-		tx, err := h.store.InitTransaction()
-		if err != nil {
-			return handlerResponse{
-				err: err,
-			}
-		}
-		if _, err := h.store.DeleteByKey(kv, tx); err != nil {
-			return handlerResponse{
-				err: err,
-			}
-		}
-
-		if err := tx.Commit(); err != nil {
-			return handlerResponse{
-				err: err,
-			}
-		}
-
-		return handlerResponse{
-			resp: generateNullResponse(),
-		}
-	}
-
 	if v.Typ != STRING {
 		return handlerResponse{
 			err: fmt.Errorf("value stored at key is not a string"),

diff --git a/internal/storage/postgres.go b/internal/storage/postgres.go
@@ -1,6 +1,8 @@
 package storage
 
 import (
+	"time"
+
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@@ -79,6 +81,22 @@ func (s *PostgresStore) GetByKey(kv KV) (KV, bool, error) {
 		return keyValue, false, nil
 	}
 
+	now := int(time.Now().Unix()) * 1000
+	if keyValue.Exp > 0 && keyValue.Exp < now {
+		tx, err := s.InitTransaction()
+		if err != nil {
+			return KV{}, false, err
+		}
+		if _, err := s.DeleteByKey(KV{Key: kv.Key}, tx); err != nil {
+			tx.Abort()
+			return KV{}, false, err
+		}
+		if err := tx.Commit(); err != nil {
+			return KV{}, false, err
+		}
+		return KV{}, false, nil
+	}
+
 	return keyValue, true, nil
 }