fix (short) : using absolute url links instead unique code only & upd…

…ate responses when create short url
PickHD · Jun 9, 2023 · 9fc5e51 · 9fc5e51
1 parent 362a9cc
commit 9fc5e51
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/user/cmd/v1/example.env b/user/cmd/v1/example.env
@@ -28,4 +28,6 @@ MINIO_ACCESSKEY=singkatin
 MINIO_SECRETKEY=singkatin@dev
 MINIO_BUCKET=public
 MINIO_USE_SSL=true
-MINIO_LOCATION=us-east-1
+MINIO_LOCATION=us-east-1
+
+SHORTENER_BASE_API_URL=http://localhost:8081/v1
diff --git a/user/internal/v1/config/config.go b/user/internal/v1/config/config.go
@@ -4,13 +4,14 @@ import "github.com/PickHD/singkatin-revamp/user/internal/v1/helper"
 
 type (
 	Configuration struct {
-		Server   *Server
-		Common   *Common
-		Database *Database
-		RabbitMQ *RabbitMQ
-		Secret   *Secret
-		Tracer   *Tracer
-		MinIO    *MinIO
+		Server      *Server
+		Common      *Common
+		Database    *Database
+		RabbitMQ    *RabbitMQ
+		Secret      *Secret
+		Tracer      *Tracer
+		MinIO       *MinIO
+		HttpService *HttpService
 	}
 
 	Common struct {
@@ -58,6 +59,10 @@ type (
 		UseSSL    bool
 		Location  string
 	}
+
+	HttpService struct {
+		ShortenerBaseAPIURL string
+	}
 )
 
 func loadConfiguration() *Configuration {
@@ -101,6 +106,9 @@ func loadConfiguration() *Configuration {
 			UseSSL:    helper.GetEnvBool("MINIO_USE_SSL"),
 			Location:  helper.GetEnvString("MINIO_LOCATION"),
 		},
+		HttpService: &HttpService{
+			ShortenerBaseAPIURL: helper.GetEnvString("SHORTENER_BASE_API_URL"),
+		},
 	}
 }
 

diff --git a/user/internal/v1/model/user.go b/user/internal/v1/model/user.go
@@ -32,6 +32,7 @@ type (
 	// ShortUserResponse consist response data when success generate/update short users
 	ShortUserResponse struct {
 		ShortURL string `json:"short_url"`
+		Method   string `json:"method"`
 	}
 
 	// GenerateShortUserMessage consist message short users to publish

diff --git a/user/internal/v1/service/user.go b/user/internal/v1/service/user.go
@@ -98,7 +98,7 @@ func (us *UserServiceImpl) GenerateUserShorts(userID string, req *model.ShortUse
 	msg := model.GenerateShortUserMessage{
 		FullURL:  req.FullURL,
 		UserID:   userID,
-		ShortURL: helper.RandomStringBytesMaskImprSrcSB(8),
+		ShortURL: fmt.Sprintf("%s/%s", us.Config.HttpService.ShortenerBaseAPIURL, helper.RandomStringBytesMaskImprSrcSB(8)),
 	}
 
 	err := us.UserRepo.PublishCreateUserShortener(us.Context, &msg)
@@ -108,6 +108,7 @@ func (us *UserServiceImpl) GenerateUserShorts(userID string, req *model.ShortUse
 
 	return &model.ShortUserResponse{
 		ShortURL: msg.ShortURL,
+		Method:   "GET",
 	}, nil
 }