Fix 3cx handler logic

AchoArnold · AchoArnold · commit 171da3e7b745 · 2023-09-24T19:34:12.000+03:00
diff --git a/api/cmd/experiments/main.go b/api/cmd/experiments/main.go
@@ -6,6 +6,11 @@ import (
 	"log"
 	"os"
 	"sync"
+	"time"
+
+	"github.com/NdoleStudio/httpsms/pkg/di"
+	"github.com/NdoleStudio/httpsms/pkg/entities"
+	"github.com/google/uuid"
 
 	"github.com/carlmjohnson/requests"
 
@@ -18,7 +23,19 @@ func main() {
 		log.Fatal("Error loading .env file")
 	}
 
-	loadTest()
+	container := di.NewLiteContainer()
+	repo := container.Integration3CXRepository()
+
+	err = repo.Save(context.Background(), &entities.Integration3CX{
+		ID:         uuid.MustParse("b0b1acdc-69dd-4aee-8277-ba4adc5d2e90"),
+		UserID:     "XtABz6zdeFMoBLoltz6SREDvRSh2",
+		WebhookURL: "https://lagomtest.3cx.com.au/sms/generic/155e125bf7874f8fae5adbcaac49fdf8",
+		CreatedAt:  time.Now().UTC(),
+		UpdatedAt:  time.Now().UTC(),
+	})
+	if err != nil {
+		container.Logger().Fatal(err)
+	}
 }
 
 func loadTest() {
diff --git a/api/pkg/di/container.go b/api/pkg/di/container.go
@@ -560,6 +560,16 @@ func (container *Container) MessageRepository() (repository repositories.Message
 	)
 }
 
+// Integration3CXRepository creates a new instance of repositories.Integration3CxRepository
+func (container *Container) Integration3CXRepository() (repository repositories.Integration3CxRepository) {
+	container.logger.Debug("creating GORM repositories.Integration3CxRepository")
+	return repositories.NewGormIntegration3CXRepository(
+		container.Logger(),
+		container.Tracer(),
+		container.DB(),
+	)
+}
+
 // PhoneRepository creates a new instance of repositories.PhoneRepository
 func (container *Container) PhoneRepository() (repository repositories.PhoneRepository) {
 	container.logger.Debug("creating GORM repositories.PhoneRepository")
diff --git a/api/pkg/entities/integration_3cx.go b/api/pkg/entities/integration_3cx.go
@@ -14,3 +14,8 @@ type Integration3CX struct {
 	CreatedAt  time.Time `json:"created_at" example:"2022-06-05T14:26:02.302718+03:00"`
 	UpdatedAt  time.Time `json:"updated_at" example:"2022-06-05T14:26:10.303278+03:00"`
 }
+
+// TableName overrides the table name used by Integration3CX
+func (Integration3CX) TableName() string {
+	return "integration_3cx"
+}
diff --git a/api/pkg/handlers/integration_3cx_handler.go b/api/pkg/handlers/integration_3cx_handler.go
@@ -72,12 +72,20 @@ func (h *Integration3CXHandler) Messages(c *fiber.Ctx) error {
 		return h.responsePaymentRequired(c, *msg)
 	}
 
+	request.Sanitize()
 	message, err := h.messageService.SendMessage(ctx, request.ToMessageSendParams(h.userIDFomContext(c), c.OriginalURL()))
 	if err != nil {
 		msg := fmt.Sprintf("cannot send [3cx] message with paylod [%s]", c.Body())
 		ctxLogger.Error(stacktrace.Propagate(err, msg))
 		return h.responseInternalServerError(c)
 	}
 
-	return h.responseOK(c, "message added to queue", message)
+	ctxLogger.Info(fmt.Sprintf("[3cx] message sent with ID [%s]", message.ID))
+	return c.Status(fiber.StatusOK).JSON(fiber.Map{
+		"data": fiber.Map{
+			"payload": fiber.Map{
+				"id": message.ID.String(),
+			},
+		},
+	})
 }

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,8 @@ type Integration3CX struct {`
`14`	`14`	CreatedAt time.Time `json:"created_at" example:"2022-06-05T14:26:02.302718+03:00"`
`15`	`15`	UpdatedAt time.Time `json:"updated_at" example:"2022-06-05T14:26:10.303278+03:00"`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+// TableName overrides the table name used by Integration3CX`
	`19`	`+func (Integration3CX) TableName() string {`
	`20`	`+ return "integration_3cx"`
	`21`	`+}`