makayabou/asg-server
1
0
Fork 0
mirror of https://github.com/makayabou/asg-server.git synced 2026-05-02 17:43:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

add message content

Browse Source
This commit is contained in:
Florian du Garage Num 2025-09-19 03:59:25 +02:00
parent 332a6e0a85
commit afdbc07b30
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
project_name = sms-gateway
image_name = capcom6/$(project_name):latest
image_name = gn/$(project_name):latest
extension=
ifeq ($(OS),Windows_NT)

8
internal/sms-gateway/handlers/messages/3rdparty.go
View File

@ -207,8 +207,8 @@ func (h *ThirdPartyController) list(user models.User, c *fiber.Ctx) error {
)
}
// @Summary Get message state
// @Description Returns message state by ID
// @Summary Get message state and text
// @Description Returns message state and text by ID
// @Security ApiAuth
// @Tags User, Messages
// @Produce json
@ -223,7 +223,7 @@ func (h *ThirdPartyController) list(user models.User, c *fiber.Ctx) error {
func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
id := c.Params("id")
state, err := h.messagesSvc.GetState(user, id)
msg, err := h.messagesSvc.GetMessage(user, id)
if err != nil {
if errors.Is(err, messages.ErrMessageNotFound) {
return fiber.NewError(fiber.StatusNotFound, err.Error())
@ -232,7 +232,7 @@ func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
return err
}
return c.JSON(converters.MessageStateToDTO(state))
return c.JSON(converters.MessageToMobileDTO(msg))
}
// @Summary Request inbox messages export

15
internal/sms-gateway/modules/messages/service.go
View File

@ -159,6 +159,21 @@ func (s *Service) GetState(user models.User, ID string) (MessageStateOut, error)
return modelToMessageState(message), nil
}
func (s *Service) GetMessage(user models.User, ID string) (MessageOut, error) {
message, err := s.messages.Get(
MessagesSelectFilter{ExtID: ID, UserID: user.ID},
MessagesSelectOptions{WithRecipients: true, WithDevice: true, WithStates: true},
)
if err != nil {
if errors.Is(err, ErrMessageNotFound) {
return MessageOut{}, ErrMessageNotFound
}
return MessageOut{}, err
}
return messageToDomain(message)
}
func (s *Service) Enqueue(device models.Device, message MessageIn, opts EnqueueOptions) (MessageStateOut, error) {
state := MessageStateOut{
DeviceID: device.ID,