Merge pull request #10 from PickHD/SRS-06

SRS-06

auth/internal/v1/model/user.go

@@ -1,13 +1,18 @@
 package model
 
-import "go.mongodb.org/mongo-driver/bson/primitive"
+import (
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
 
 type (
 	// User consist data of users
 	User struct {
-		ID       primitive.ObjectID `bson:"_id,omitempty"`
-		FullName string             `bson:"fullname,omitempty"`
-		Email    string             `bson:"email,omitempty"`
-		Password string             `bson:"password,omitempty"`
+		ID        primitive.ObjectID `bson:"_id,omitempty"`
+		FullName  string             `bson:"fullname,omitempty"`
+		Email     string             `bson:"email,omitempty"`
+		Password  string             `bson:"password,omitempty"`
+		CreatedAt time.Time          `bson:"created_at,omitempty"`
 	}
 )

auth/internal/v1/repository/auth.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"time"
 
 	"github.com/PickHD/singkatin-revamp/auth/internal/v1/config"
 	"github.com/PickHD/singkatin-revamp/auth/internal/v1/model"
@@ -44,9 +45,10 @@ func (ar *AuthRepositoryImpl) CreateUser(ctx context.Context, req *model.User) (
 		// if doc not exists, create new one
 		if err == mongo.ErrNoDocuments {
 			res, err := ar.DB.Collection(ar.Config.Database.UsersCollection).InsertOne(ctx, model.User{
-				FullName: req.FullName,
-				Email:    req.Email,
-				Password: req.Password,
+				FullName:  req.FullName,
+				Email:     req.Email,
+				Password:  req.Password,
+				CreatedAt: time.Now(),
 			})
 			if err != nil {
 				ar.Logger.Error("AuthRepositoryImpl.CreateUser InsertOne ERROR, ", err)

shortener/cmd/v1/main.go

@@ -138,6 +138,15 @@ func main() {
 			app.Logger.Error("Error received by channel", err)
 		}
 	case consumerMode:
-		infrastructure.ConsumeMessages(app, app.Config.RabbitMQ.QueueCreateShortener)
+		// Make a channel to receive messages into infinite loop.
+		forever := make(chan bool)
+
+		queues := []string{app.Config.RabbitMQ.QueueCreateShortener, app.Config.RabbitMQ.QueueUpdateVisitor}
+
+		for _, q := range queues {
+			go infrastructure.ConsumeMessages(app, q)
+		}
+
+		<-forever
 	}
 }

shortener/docs/swagger.json

@@ -45,6 +45,55 @@
                     }
                 }
             }
+        },
+        "/{short_url}": {
+            "get": {
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Shortener"
+                ],
+                "summary": "Click Shorteners URL",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "short urls",
+                        "name": "short_url",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/helper.BaseResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/helper.BaseResponse"
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/helper.BaseResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/helper.BaseResponse"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {

shortener/docs/swagger.yaml

@@ -29,6 +29,38 @@ info:
   title: Singkatin Revamp API
   version: "1.0"
 paths:
+  /{short_url}:
+    get:
+      consumes:
+      - application/json
+      parameters:
+      - description: short urls
+        in: path
+        name: short_url
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/helper.BaseResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/helper.BaseResponse'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/helper.BaseResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/helper.BaseResponse'
+      summary: Click Shorteners URL
+      tags:
+      - Shortener
   /health-check:
     get:
       consumes:

shortener/internal/v1/application/app.go

@@ -94,7 +94,7 @@ func SetupApplication(ctx context.Context) (*App, error) {
 	app.Application = echo.New()
 	app.Application.Use(middleware.CORSWithConfig(middleware.CORSConfig{
 		AllowOrigins: []string{"*"},
-		AllowHeaders: []string{echo.HeaderOrigin, echo.HeaderContentType, echo.HeaderAccept},
+		AllowHeaders: []string{echo.HeaderOrigin, echo.HeaderContentType, echo.HeaderAccept, echo.HeaderAuthorization},
 	}))
 
 	app.GRPC = grpc.NewServer()

shortener/internal/v1/application/dependency.go

@@ -14,7 +14,7 @@ type Dependency struct {
 func SetupDependencyInjection(app *App) *Dependency {
 	// repository
 	healthCheckRepoImpl := repository.NewHealthCheckRepository(app.Context, app.Config, app.Logger, app.DB, app.Redis)
-	shortRepoImpl := repository.NewShortRepository(app.Context, app.Config, app.Logger, app.DB)
+	shortRepoImpl := repository.NewShortRepository(app.Context, app.Config, app.Logger, app.DB, app.Redis, app.RabbitMQ)
 
 	// service
 	healthCheckSvcImpl := service.NewHealthCheckService(app.Context, app.Config, healthCheckRepoImpl)

shortener/internal/v1/config/config.go

@@ -57,7 +57,7 @@ func loadConfiguration() *Configuration {
 		RabbitMQ: &RabbitMQ{
 			ConnURL:              helper.GetEnvString("AMQP_SERVER_URL"),
 			QueueCreateShortener: helper.GetEnvString("AMQP_QUEUE_CREATE_SHORTENER"),
-			QueueUpdateVisitor:   helper.GetEnvString("AMQP_QUEUE_UPDATE_VISITOR"),
+			QueueUpdateVisitor:   helper.GetEnvString("AMQP_QUEUE_UPDATE_VISITOR_COUNT"),
 		},
 	}
 }

shortener/internal/v1/controller/short.go

@@ -2,11 +2,15 @@ package controller
 
 import (
 	"context"
+	"net/http"
+	"strings"
 
 	"github.com/PickHD/singkatin-revamp/shortener/internal/v1/config"
+	"github.com/PickHD/singkatin-revamp/shortener/internal/v1/helper"
 	"github.com/PickHD/singkatin-revamp/shortener/internal/v1/model"
 	"github.com/PickHD/singkatin-revamp/shortener/internal/v1/service"
 	shortenerpb "github.com/PickHD/singkatin-revamp/shortener/pkg/api/v1/proto/shortener"
+	"github.com/labstack/echo/v4"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -15,8 +19,15 @@ import (
 type (
 	// ShortController is an interface that has all the function to be implemented inside short controller
 	ShortController interface {
+		// grpc
 		GetListShortenerByUserID(ctx context.Context, req *shortenerpb.ListShortenerRequest) (*shortenerpb.ListShortenerResponse, error)
+
+		// http
+		ClickShortener(ctx echo.Context) error
+
+		// rabbitmq
 		ProcessCreateShortUser(ctx context.Context, req *model.CreateShortRequest) error
+		ProcessUpdateVisitorCount(ctx context.Context, req *model.UpdateVisitorRequest) error
 	}
 
 	// ShortControllerImpl is an app short struct that consists of all the dependencies needed for short controller
@@ -65,6 +76,34 @@ func (sc *ShortControllerImpl) GetListShortenerByUserID(ctx context.Context, req
 	}, nil
 }
 
+// Check godoc
+// @Summary      Click Shorteners URL
+// @Tags         Shortener
+// @Accept       json
+// @Produce      json
+// @Param        short_url   path string  true  "short urls"
+// @Success      200  {object}  helper.BaseResponse
+// @Failure      400  {object}  helper.BaseResponse
+// @Failure      404  {object}  helper.BaseResponse
+// @Failure      500  {object}  helper.BaseResponse
+// @Router       /{short_url} [get]
+func (sc *ShortControllerImpl) ClickShortener(ctx echo.Context) error {
+	data, err := sc.ShortSvc.ClickShort(ctx.Param("short_url"))
+	if err != nil {
+		if strings.Contains(err.Error(), string(model.Validation)) {
+			return helper.NewResponses[any](ctx, http.StatusBadRequest, err.Error(), ctx.Param("short_url"), err, nil)
+		}
+
+		if strings.Contains(err.Error(), string(model.NotFound)) {
+			return helper.NewResponses[any](ctx, http.StatusNotFound, err.Error(), ctx.Param("short_url"), err, nil)
+		}
+
+		return helper.NewResponses[any](ctx, http.StatusInternalServerError, "failed click shortener", ctx.Param("short_url"), err, nil)
+	}
+
+	return ctx.Redirect(http.StatusTemporaryRedirect, data.FullURL)
+}
+
 func (sc *ShortControllerImpl) ProcessCreateShortUser(ctx context.Context, req *model.CreateShortRequest) error {
 	err := sc.ShortSvc.CreateShort(ctx, req)
 	if err != nil {
@@ -73,3 +112,12 @@ func (sc *ShortControllerImpl) ProcessCreateShortUser(ctx context.Context, req *
 
 	return nil
 }
+
+func (sc *ShortControllerImpl) ProcessUpdateVisitorCount(ctx context.Context, req *model.UpdateVisitorRequest) error {
+	err := sc.ShortSvc.UpdateVisitorShort(ctx, req)
+	if err != nil {
+		return model.NewError(model.Internal, err.Error())
+	}
+
+	return nil
+}

shortener/internal/v1/infrastructure/http.go

@@ -24,6 +24,8 @@ func setupRouter(app *application.App) {
 		v1.GET("/swagger/*any", echoSwagger.WrapHandler)
 
 		v1.GET("/health-check", dep.HealthCheckController.Check)
+
+		v1.GET("/:short_url", dep.ShortController.ClickShortener)
 	}
 
 }

shortener/internal/v1/infrastructure/rabbitmq.go

@@ -2,11 +2,13 @@ package infrastructure
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/PickHD/singkatin-revamp/shortener/internal/v1/application"
 	"github.com/PickHD/singkatin-revamp/shortener/internal/v1/model"
 )
 
+// ConsumeMessages generic function to consume message from defined param queues
 func ConsumeMessages(app *application.App, queueName string) {
 	dep := application.SetupDependencyInjection(app)
 
@@ -26,9 +28,6 @@ func ConsumeMessages(app *application.App, queueName string) {
 
 	app.Logger.Info("Waiting Message in Queues ", queueName, ".....")
 
-	// Make a channel to receive messages into infinite loop.
-	forever := make(chan bool)
-
 	go func() {
 		for msg := range messages {
 			switch queueName {
@@ -40,18 +39,32 @@ func ConsumeMessages(app *application.App, queueName string) {
 					app.Logger.Error("Unmarshal JSON ERROR, ", err)
 				}
 
-				app.Logger.Info("Success Consume Message :", req)
+				app.Logger.Info(fmt.Sprintf("[%s] Success Consume Message :", queueName), req)
 
 				err = dep.ShortController.ProcessCreateShortUser(app.Context, &req)
 				if err != nil {
 					app.Logger.Error("ProcessCreateShortUser ERROR, ", err)
 				}
 
-				app.Logger.Info("Success Process Message : ", req)
+				app.Logger.Info(fmt.Sprintf("[%s] Success Process Message :", queueName), req)
 			case app.Config.RabbitMQ.QueueUpdateVisitor:
+				var req model.UpdateVisitorRequest
+
+				err := json.Unmarshal(msg.Body, &req)
+				if err != nil {
+					app.Logger.Error("Unmarshal JSON ERROR, ", err)
+				}
+
+				app.Logger.Info(fmt.Sprintf("[%s] Success Consume Message :", queueName), req)
+
+				err = dep.ShortController.ProcessUpdateVisitorCount(app.Context, &req)
+				if err != nil {
+					app.Logger.Error("ProcessUpdateVisitorCount ERROR, ", err)
+				}
+
+				app.Logger.Info(fmt.Sprintf("[%s] Success Process Message :", queueName), req)
+
 			}
 		}
 	}()
-
-	<-forever
 }

shortener/internal/v1/model/key.go

@@ -0,0 +1,5 @@
+package model
+
+const (
+	KeyShortURL = "short_url:%s"
+)