Implement Redis caching for Reddit image fetching

http/handler.go

@@ -1,110 +1,25 @@
 package http
 
 import (
-	"context"
 	"github.com/labstack/echo/v4"
-	client "github.com/siteworxpro/top-wallpaper/reddit"
-	"github.com/siteworxpro/top-wallpaper/resize"
-	"io"
+	"github.com/siteworxpro/top-wallpaper/redis"
 	"net/http"
-	"os"
-	"strconv"
-	"time"
 )
 
 func Get(c echo.Context) error {
-	cc := c.(*CustomContext)
 
-	var size int
-	var err error
-
-	if sizeS, ok := os.LookupEnv("MAX_SIZE"); ok {
-		size, err = strconv.Atoi(sizeS)
-		if err != nil {
-			size = 1200
-		}
-	} else {
-		size = 1200
-	}
-
-	if size < 100 {
-		size = 1200
-	}
-
-	var latestImageVal string
-	if cc.redis != nil {
-		latestImage := cc.redis.Get(context.TODO(), "latestImage")
-		latestImageVal, err = latestImage.Result()
-	}
-
-	if err != nil || latestImageVal == "" {
-		c.Logger().Info("Fetching latest image")
-		latestImageVal, err = client.GetLatestImage(func(url string) (*http.Response, error) {
-			return http.Get(url)
-		})
-		if err != nil {
-			return c.String(http.StatusInternalServerError, "Error fetching latest image")
-		}
-
-		if cc.redis != nil {
-			cmd := cc.redis.Set(context.TODO(), "latestImage", latestImageVal, 600*time.Second)
-			if cmd.Err() != nil {
-				c.Logger().Warn("could not cache image")
-			}
-		}
-	} else {
-		c.Logger().Info("Image name fetched from cache")
-	}
-
-	var imageData string
-	if cc.redis != nil {
-		latestImageBin := cc.redis.Get(context.TODO(), "latestImage:bin:"+latestImageVal)
-		imageData = latestImageBin.Val()
-	}
-
-	if imageData != "" {
-		c.Logger().Info("Image data fetched from cache")
-
-		return c.Blob(http.StatusOK, "image/jpeg", []byte(imageData))
-	}
-
-	response, err := http.Get(latestImageVal)
+	rc, err := redis.NewRedis()
 	if err != nil {
-		return c.String(http.StatusInternalServerError, "Error fetching image")
+		return c.String(http.StatusInternalServerError, "Internal Server Error: "+err.Error())
 	}
 
-	if response.StatusCode != http.StatusOK {
-		return c.String(http.StatusInternalServerError, "Error fetching image")
+	val, err := rc.Get(redis.CacheKey)
+
+	if err != nil || val == "" {
+		return c.NoContent(http.StatusNoContent)
 	}
 
-	defer func(Body io.ReadCloser) {
-		_ = Body.Close()
-	}(response.Body)
-
-	imageDataBytes, err := io.ReadAll(response.Body)
-	if err != nil {
-		return c.String(http.StatusInternalServerError, "Error fetching image")
-	}
-
-	imageData = string(imageDataBytes)
-	resized, err := resize.Shrink(imageData, uint(size), 70)
-
-	if err != nil {
-		return c.String(http.StatusInternalServerError, "Error resizing image")
-	}
-
-	go func(data string) {
-		if cc.redis == nil {
-			return
-		}
-
-		_, err = cc.redis.Set(context.TODO(), "latestImage:bin:"+latestImageVal, data, 600*time.Second).Result()
-		if err != nil {
-			c.Logger().Warn("could not cache image")
-		}
-	}(resized)
-
 	c.Response().Header().Set("Cache-Control", "public, max-age=600")
 
-	return c.Blob(http.StatusOK, "image/jpeg", []byte(resized))
+	return c.Blob(http.StatusOK, "image/jpeg", []byte(val))
 }

http/middleware.go

@@ -1,59 +0,0 @@
-package http
-
-import (
-	"context"
-	"fmt"
-	"github.com/labstack/echo/v4"
-	"github.com/redis/go-redis/v9"
-	"os"
-	"strconv"
-)
-
-type CustomContext struct {
-	echo.Context
-	redis *redis.Client
-}
-
-func GetCustomContext(next echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		redisUrl := os.Getenv("REDIS_URL")
-		if redisUrl == "" {
-			c.Logger().Warn("REDIS_URL not set, skipping redis connection. Use REDIS_URL to cache the image")
-
-			return next(&CustomContext{c, nil})
-		}
-
-		redisPort := os.Getenv("REDIS_PORT")
-		if redisPort == "" {
-			redisPort = "6379"
-		}
-
-		redisDb := os.Getenv("REDIS_DB")
-		if redisDb == "" {
-			redisDb = "0"
-		}
-
-		redisDbInt, err := strconv.ParseInt(redisDb, 10, 64)
-		if err != nil {
-			c.Logger().Warn("REDIS_DB is not a valid integer, skipping redis connection. Use REDIS_DB to cache the image")
-
-			return next(&CustomContext{})
-		}
-
-		cc := &CustomContext{c, redis.NewClient(&redis.Options{
-			Addr:     fmt.Sprintf("%s:%s", redisUrl, redisPort),
-			Password: os.Getenv("REDIS_PASSWORD"),
-			DB:       int(redisDbInt),
-		})}
-
-		cmd := cc.redis.Ping(context.Background())
-
-		if cmd.Err() != nil {
-			c.Logger().Warn("could not connect to redis")
-
-			cc.redis = nil
-		}
-
-		return next(cc)
-	}
-}