redis-manager and read-api are added.

cemayan · cemayan · commit bd8b0f4dbd65 · 2023-02-26T13:25:13.000+03:00
diff --git a/cmd/api/read/main.go b/cmd/api/read/main.go
@@ -3,7 +3,10 @@ package main
 import (
 	"github.com/cemayan/url-shortener/config/api"
 	"github.com/cemayan/url-shortener/internal/api/read/adapter/database"
+	"github.com/cemayan/url-shortener/internal/api/read/application/router"
 	"github.com/cemayan/url-shortener/managers/db"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"os"
@@ -43,5 +46,15 @@ func init() {
 }
 
 func main() {
+	app := fiber.New()
+	app.Use(cors.New())
 
+	router.SetupRoutes(app, configs, _log.WithFields(logrus.Fields{"service": "read-api"}))
+
+	v.WatchConfig()
+
+	err := app.Listen(":8081")
+	if err != nil {
+		return
+	}
 }
diff --git a/cmd/event_handler/main.go b/cmd/event_handler/main.go
@@ -1,20 +1,20 @@
 package main
 
 import (
-	"github.com/apache/pulsar-client-go/pulsar"
 	pulsar_handler "github.com/cemayan/url-shortener/common/adapters/pulsar"
+	"github.com/cemayan/url-shortener/common/adapters/redis"
 	"github.com/cemayan/url-shortener/common/ports/output"
 	"github.com/cemayan/url-shortener/config/event_handler"
 	"github.com/cemayan/url-shortener/internal/event_handler/adapter/database"
 	"github.com/cemayan/url-shortener/internal/event_handler/domain/service"
 	"github.com/cemayan/url-shortener/internal/event_handler/helper"
+	"github.com/cemayan/url-shortener/managers/cache"
 	"github.com/cemayan/url-shortener/managers/db"
 	"github.com/cemayan/url-shortener/managers/hook"
 	"github.com/cemayan/url-shortener/managers/mq"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"os"
-	"time"
 )
 
 var _log *logrus.Logger
@@ -56,22 +56,18 @@ func init() {
 
 func main() {
 
-	client, err := pulsar.NewClient(pulsar.ClientOptions{
-		URL:               configs.Pulsar.Url,
-		OperationTimeout:  30 * time.Second,
-		ConnectionTimeout: 30 * time.Second,
-	})
-	if err != nil {
-		_log.WithFields(logrus.Fields{"method": "NewPulsarClient", "message": err.Error()}).Log(logrus.FatalLevel)
-		return
-	}
-
 	var pulsarManager mq.PulsarManager
-	pulsarManager = mq.NewPulsarManager(client, configs.Pulsar, _log.WithFields(logrus.Fields{"service": "event-handler"}))
+	pulsarManager = mq.NewPulsarManager(pulsarManager.New(), configs.Pulsar, _log.WithFields(logrus.Fields{"service": "event-handler"}))
 
 	var pulsarPort output.PulsarPort
 	pulsarPort = pulsar_handler.NewPulsarHandler(pulsarManager, configs.Pulsar, _log.WithFields(logrus.Fields{"service": "event-handler"}))
 
-	eventService := service.NewEventService(pulsarPort, configs, _log.WithFields(logrus.Fields{"service": "event-service"}))
+	var redisManager cache.RedisManager
+	redisManager = cache.NewRedisManager(configs.Redis, _log.WithFields(logrus.Fields{"service": "cache-manager"}))
+
+	var redisPort output.RedisPort
+	redisPort = redis.NewRedisHandler(redisManager.New(), _log.WithFields(logrus.Fields{"service": "cache-service"}))
+
+	eventService := service.NewEventService(redisPort, pulsarPort, configs, _log.WithFields(logrus.Fields{"service": "event-service"}))
 	eventService.Consume()
 }
diff --git a/common/adapters/redis/redis.go b/common/adapters/redis/redis.go
@@ -0,0 +1,40 @@
+package redis
+
+import (
+	"context"
+	"github.com/cemayan/url-shortener/common/ports/output"
+	"github.com/redis/go-redis/v9"
+	log "github.com/sirupsen/logrus"
+	"time"
+)
+
+var Ctx = context.Background()
+
+// A RedisSvc  contains the required dependencies for this service
+type RedisSvc struct {
+	client *redis.Client
+	log    *log.Entry
+}
+
+func (r RedisSvc) Remove(key string) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+// Get is command of Redis's Get
+func (r RedisSvc) Get(key string) (string, error) {
+	return r.client.Get(Ctx, key).Result()
+}
+
+// Set is command of Redis's Set
+func (r RedisSvc) Set(key string, data string) error {
+	err := r.client.Set(Ctx, key, data, 30*time.Minute).Err()
+	if err != nil {
+		r.log.WithFields(log.Fields{"method": "Set"}).Infof("An error occurred when set value to redis %v", err)
+	}
+	return err
+}
+
+func NewRedisHandler(client *redis.Client, log *log.Entry) output.RedisPort {
+	return &RedisSvc{client: client, log: log}
+}
diff --git a/common/common.go b/common/common.go
@@ -16,6 +16,11 @@ type Cockroach struct {
 	Name     string `json:"name,omitempty"`
 }
 
+type Redis struct {
+	Address     string `json:"address,omitempty"`
+	AddressPort string `json:"addressPort,omitempty"`
+}
+
 type Mongo struct {
 	Uri    string `json:"uri,omitempty"`
 	DbName string `json:"dbName,omitempty"`
diff --git a/common/ports/output/redis_port.go b/common/ports/output/redis_port.go
@@ -0,0 +1,7 @@
+package output
+
+type RedisPort interface {
+	Get(key string) (string, error)
+	Set(key string, data string) error
+	Remove(key string) error
+}
diff --git a/config/api/config.go b/config/api/config.go
@@ -23,6 +23,7 @@ type AppConfig struct {
 	Cockroach common.Cockroach `json:"cockroach"`
 	Mongo     common.Mongo     `json:"mongo"`
 	Pulsar    common.Pulsar    `json:"pulsar"`
+	Redis     common.Redis     `json:"redis"`
 }
 
 // Load config file from given path
diff --git a/config/event_handler/config-dev.yml b/config/event_handler/config-dev.yml
@@ -6,6 +6,9 @@ cockroach:
 mongo:
   dbName: urlShortener
   uri: mongodb://localhost:27017
+redis:
+  address: localhost
+  addressPort: 6379
 pulsar:
   url: pulsar://localhost:6650
   topic: events
diff --git a/config/event_handler/config.go b/config/event_handler/config.go
@@ -23,6 +23,7 @@ type AppConfig struct {
 	Cockroach common.Cockroach `json:"cockroach" `
 	Kafka     common.Kafka     `json:"kafka"`
 	Pulsar    common.Pulsar    `json:"pulsar"`
+	Redis     common.Redis     `json:"redis"`
 }
 
 // Load config file from given path
diff --git a/go.mod b/go.mod
@@ -28,6 +28,7 @@ require (
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
@@ -62,6 +63,7 @@ require (
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.39.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/redis/go-redis/v9 v9.0.2 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
 	github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect
diff --git a/go.sum b/go.sum
@@ -100,6 +100,8 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnG
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA=
 github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0=
 github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM=
@@ -393,6 +395,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
 github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
+github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
+github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
diff --git a/internal/api/read/adapter/cockroach/repo.go b/internal/api/read/adapter/cockroach/repo.go
@@ -0,0 +1,27 @@
+package cockroach
+
+import (
+	"github.com/cemayan/url-shortener/internal/api/read/domain/model"
+	"github.com/cemayan/url-shortener/internal/api/read/domain/port/output"
+
+	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
+)
+
+type UserUrlrepo struct {
+	db  *gorm.DB
+	log *log.Entry
+}
+
+func (u UserUrlrepo) GetUserUrl(longUrl string) (model.UserUrl, error) {
+	var url model.UserUrl
+	tx := u.db.Where("long_url = ? ", longUrl).First(&url)
+	return url, tx.Error
+}
+
+func NewUserUrlRepo(db *gorm.DB, log *log.Entry) output.CockroachPort {
+	return &UserUrlrepo{
+		db:  db,
+		log: log,
+	}
+}
diff --git a/internal/api/read/application/middleware/middleware/auth.go b/internal/api/read/application/middleware/middleware/auth.go
@@ -0,0 +1,28 @@
+package middleware
+
+import (
+	"github.com/cemayan/url-shortener/common"
+	"github.com/cemayan/url-shortener/config/user"
+	"github.com/gofiber/fiber/v2"
+	jwtware "github.com/gofiber/jwt/v2"
+)
+
+// Protected protect routes
+func Protected(configs *user.AppConfig) fiber.Handler {
+	return jwtware.New(jwtware.Config{
+		SigningKey:   []byte(configs.Secret),
+		ErrorHandler: jwtError,
+	})
+}
+
+func jwtError(c *fiber.Ctx, err error) error {
+	if err.Error() == "Missing or malformed JWT" {
+		return c.Status(400).JSON(common.Response{
+			Message: "Missing or malformed JWT",
+		})
+
+	}
+	return c.Status(401).JSON(common.Response{
+		Message: "Invalid or expired JWT",
+	})
+}
diff --git a/internal/api/read/application/router/router.go b/internal/api/read/application/router/router.go
@@ -1,9 +1,18 @@
 package router
 
 import (
+	"github.com/cemayan/url-shortener/common/adapters/redis"
+	common_port "github.com/cemayan/url-shortener/common/ports/output"
 	"github.com/cemayan/url-shortener/config/api"
+	"github.com/cemayan/url-shortener/internal/api/read/adapter/cockroach"
+	"github.com/cemayan/url-shortener/internal/api/read/adapter/database"
+	"github.com/cemayan/url-shortener/internal/api/read/domain/port/input"
+	"github.com/cemayan/url-shortener/internal/api/read/domain/port/output"
+	"github.com/cemayan/url-shortener/internal/api/read/domain/service"
+	"github.com/cemayan/url-shortener/managers/cache"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/logger"
+	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -15,6 +24,18 @@ func SetupRoutes(app *fiber.App, configs *api.AppConfig, _log *log.Entry) {
 	apiGroup := app.Group("/api", logger.New())
 	v1Group := apiGroup.Group("/v1")
 
+	var redisManager cache.RedisManager
+	redisManager = cache.NewRedisManager(configs.Redis, _log.WithFields(logrus.Fields{"service": "cache-manager"}))
+
+	var redisPort common_port.RedisPort
+	redisPort = redis.NewRedisHandler(redisManager.New(), _log.WithFields(logrus.Fields{"service": "cache-service"}))
+
+	var cockroachPort output.CockroachPort
+	cockroachPort = cockroach.NewUserUrlRepo(database.DB, _log.WithFields(logrus.Fields{"service": "cockroach-repo"}))
+
+	var apiUseCase input.ApiUseCase
+	apiUseCase = service.NewApiService(redisPort, cockroachPort, configs, _log)
+
 	usGroup := v1Group.Group("/url")
-	usGroup.Get("/:id", nil)
+	usGroup.Get("/:id", apiUseCase.GetUserUrl)
 }
diff --git a/internal/api/read/domain/model/user_urls.go b/internal/api/read/domain/model/user_urls.go
@@ -0,0 +1,11 @@
+package model
+
+import "gorm.io/gorm"
+
+type UserUrl struct {
+	gorm.Model
+	UserId    string `json:"userId,omitempty"`
+	ShortUrl  string `json:"shortUrl,omitempty"`
+	LongUrl   string `json:"longUrl,omitempty"`
+	UrlString string ` gorm:"uniqueIndex" json:"urlStr,omitempty"`
+}
diff --git a/internal/api/read/domain/port/input/api_usecase.go b/internal/api/read/domain/port/input/api_usecase.go
@@ -0,0 +1,7 @@
+package input
+
+import "github.com/gofiber/fiber/v2"
+
+type ApiUseCase interface {
+	GetUserUrl(c *fiber.Ctx) error
+}
diff --git a/internal/api/read/domain/port/output/cockroach_port.go b/internal/api/read/domain/port/output/cockroach_port.go
@@ -0,0 +1,7 @@
+package output
+
+import "github.com/cemayan/url-shortener/internal/api/read/domain/model"
+
+type CockroachPort interface {
+	GetUserUrl(longUrl string) (model.UserUrl, error)
+}
diff --git a/internal/api/read/domain/port/port/input/api_usecase.go b/internal/api/read/domain/port/port/input/api_usecase.go
diff --git a/internal/api/read/domain/port/port/output/cockroach.go b/internal/api/read/domain/port/port/output/cockroach.go
diff --git a/internal/api/read/domain/service/api_service.go b/internal/api/read/domain/service/api_service.go
@@ -0,0 +1,44 @@
+package service
+
+import (
+	"fmt"
+	"github.com/cemayan/url-shortener/common"
+	common_port "github.com/cemayan/url-shortener/common/ports/output"
+	"github.com/cemayan/url-shortener/config/api"
+	"github.com/cemayan/url-shortener/internal/api/read/domain/port/input"
+	"github.com/cemayan/url-shortener/internal/api/read/domain/port/output"
+	"github.com/gofiber/fiber/v2"
+	log "github.com/sirupsen/logrus"
+)
+
+type ApiSvc struct {
+	configs       *api.AppConfig
+	log           *log.Entry
+	redisPort     common_port.RedisPort
+	cockroachPort output.CockroachPort
+}
+
+func (a ApiSvc) GetUserUrl(c *fiber.Ctx) error {
+
+	url, err := a.cockroachPort.GetUserUrl("")
+	if err != nil {
+		return c.Status(400).JSON(common.Response{
+			StatusCode: 400,
+			Message:    fmt.Sprintf("Url not found or request is bad %v", err),
+		})
+	}
+
+	return c.Status(200).JSON(common.Response{
+		Data:       url,
+		StatusCode: 200,
+	})
+}
+
+func NewApiService(redisPort common_port.RedisPort, cockroachPort output.CockroachPort, configs *api.AppConfig, log *log.Entry) input.ApiUseCase {
+	return &ApiSvc{
+		configs:       configs,
+		log:           log,
+		redisPort:     redisPort,
+		cockroachPort: cockroachPort,
+	}
+}
diff --git a/internal/api/write/application/handler/api_handler.go b/internal/api/write/application/handler/api_handler.go
diff --git a/internal/event_handler/domain/service/event_service.go b/internal/event_handler/domain/service/event_service.go
diff --git a/managers/cache/redis.go b/managers/cache/redis.go
diff --git a/managers/mq/pulsar.go b/managers/mq/pulsar.go

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ type AppConfig struct {`
`23`	`23`	Cockroach common.Cockroach `json:"cockroach"`
`24`	`24`	Mongo common.Mongo `json:"mongo"`
`25`	`25`	Pulsar common.Pulsar `json:"pulsar"`
	`26`	+ Redis common.Redis `json:"redis"`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`// Load config file from given path`