phoenix/schedtxt_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tsk-62: Modify how the Response from event.MessageEventResponse is handled (#63)

Browse Source 
Closes #62

Reviewed-on: phoenix/textsender-api#63
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
phoenix
2026-01-01 01:39:12 +00:00
committed by phoenix
parent 8860d6c801
commit 6641f384ab
4 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/instant_message.go
+17 -22
View File
@@ -2,7 +2,6 @@ package handler
import (
"context"
"encoding/json"
"fmt"
"log"
"net/http"
@@ -12,6 +11,7 @@ import (
"git.kundeng.us/phoenix/swoosh/swoop/send"
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
"git.kundeng.us/phoenix/textsender-models/tx0/message"
"git.kundeng.us/phoenix/textsender-models/tx0/message/event"
"github.com/google/uuid"
"git.kundeng.us/phoenix/textsender-api/internal/app"
@@ -38,8 +38,8 @@ type SendInstantMessageRequest struct {
}
type SendInstantMessageResponse struct {
Message string `json:"message"`
Data []*message.MessageEventResponse `json:"data"`
Message string `json:"message"`
Data []*event.MessageEventResponse `json:"data"`
}
// Sent godoc
@@ -93,34 +93,29 @@ func (s *SendInstantMessageHandler) Send(w http.ResponseWriter, r *http.Request)
if s.App != nil {
msgSender := send.MessageSender{Config: s.App.TwilioConfig}
for _, c := range contacts {
if twilioResp, err := msgSender.Send(*msg, *c, nil); err != nil {
if twilioResp, twilioRespObject, err := msgSender.Send(*msg, *c, nil); err != nil {
statusCode = http.StatusInternalServerError
resp.Message = err.Error()
} else {
if data, err := json.Marshal(twilioResp); err != nil {
dateStr := strings.TrimSpace(*twilioResp.DateUpdated)
if parsedTime, err := time.Parse(time.RFC1123Z, dateStr); err != nil {
statusCode = http.StatusInternalServerError
resp.Message = err.Error()
} else {
dateStr := strings.TrimSpace(*twilioResp.DateUpdated)
if parsedTime, err := time.Parse(time.RFC1123Z, dateStr); err != nil {
mer := event.MessageEventResponse{}
mer.Response = twilioRespObject
mer.UserId = req.UserId
mer.Sent = parsedTime
mer.Status = event.Message_Event_Response_Status_Instant
mer.ContactId = c.Id
mer.MessageId = msg.Id
if err := s.MERStore.Create(ctx, &mer); err != nil {
statusCode = http.StatusInternalServerError
resp.Message = err.Error()
} else {
mer := message.MessageEventResponse{}
mer.Response = data
mer.UserId = req.UserId
mer.Sent = parsedTime
mer.Status = message.Message_Event_Response_Status_Instant
mer.ContactId = c.Id
mer.MessageId = &msg.Id
if err := s.MERStore.Create(ctx, &mer); err != nil {
statusCode = http.StatusInternalServerError
resp.Message = err.Error()
} else {
statusCode = http.StatusOK
resp.Message = "Successful"
resp.Data = append(resp.Data, &mer)
}
statusCode = http.StatusOK
resp.Message = "Successful"
resp.Data = append(resp.Data, &mer)
}
}
}