tsk-20: Modify how Twilio message is sent out (#21)

Closes #20

Reviewed-on: #21
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.dockerignore.yaml

@@ -0,0 +1,6 @@
+vendor/
+
+.git/
+.gitea/
+
+.env

.env.docker.sample

@@ -0,0 +1,8 @@
+AUTH_URL=https://auth.txt.com
+API_URL=https://txt.com
+SERVICE_USERNAME=suave
+SERVICE_PASSPHRASE=9238urc9328nr329
+TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U
+TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T
+TWILIO_AUTH_TOKEN="f4a1f2b0b79ea3735078c2d8ee9684e1"
+TWILIO_PHONE_NUMBER=10123456789

.gitignore

@@ -3,3 +3,4 @@ catapult
 
 .env
 .env.local
+.env.docker

Dockerfile

@@ -0,0 +1,45 @@
+FROM golang:1.25.4 AS builder
+
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    openssh-client git
+
+RUN mkdir -p -m 0700 ~/.ssh && \
+    ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts
+
+# Configure Git to use SSH for GitHub
+RUN git config --global url."ssh://git@git.kundeng.us".insteadOf "https://git.kundeng.us"
+
+# Set up the Go environment for private modules
+ENV GOPRIVATE=git.kundeng.us
+
+# Copy go mod and sum files
+COPY go.mod go.sum ./
+
+RUN --mount=type=ssh mkdir src && \
+    go mod download
+
+# Copy source code
+COPY ./cmd ./cmd
+COPY ./internal ./internal
+COPY ./Makefile .
+COPY ./.env .
+
+# Build the application
+RUN CGO_ENABLED=0 GOOS=linux make build
+
+# Runtime stage
+FROM alpine:latest AS production
+
+RUN apk --no-cache add ca-certificates
+
+WORKDIR /root/
+
+# Copy the pre-built binary file from the previous stage
+COPY --from=builder /app/catapult .
+COPY --from=builder /app/.env ./
+
+# Command to run the executable
+CMD ["./catapult"]

docker-compose.taml

@@ -0,0 +1,11 @@
+version: '3.8' # Use a recent version
+
+services:
+  catapult_service:
+    build: # Tells docker-compose to build the Dockerfile in the current directory
+      context: .
+      ssh: ["default"]  # Uses host's SSH agent
+    container_name: catapult # Optional: Give the container a specific name
+    env_file:
+      - .env
+    restart: unless-stopped # Optional: Restart policy

go.mod

@@ -3,8 +3,8 @@ module git.kundeng.us/phoenix/catapult
 go 1.25.4
 
 require (
-	git.kundeng.us/phoenix/swoosh v0.0.6
+	git.kundeng.us/phoenix/swoosh v0.1.0
-	git.kundeng.us/phoenix/textsender-models v0.0.11
+	git.kundeng.us/phoenix/textsender-models v0.1.6
 	github.com/google/uuid v1.6.0
 	github.com/joho/godotenv v1.5.1
 )
@@ -13,5 +13,5 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/twilio/twilio-go v1.28.7 // indirect
+	github.com/twilio/twilio-go v1.28.8 // indirect
 )

go.sum

@@ -1,7 +1,7 @@
-git.kundeng.us/phoenix/swoosh v0.0.6 h1:9+BFsmuxufEPJErMJUioyRGb0KoIPdwW+PSbEva5UuU=
+git.kundeng.us/phoenix/swoosh v0.1.0 h1:9P+wLuJsIZmVcRoG+W22l06hwp54eNrYbsBtGjucnjI=
-git.kundeng.us/phoenix/swoosh v0.0.6/go.mod h1:czsMdVpt7HKkaP1HOl5+j9ePOQCA0r9UW4uAxwAbTPk=
+git.kundeng.us/phoenix/swoosh v0.1.0/go.mod h1:6/97/aS8KVdYqlczQ9ALvS3GVoce1UVl+D8VQK42Bd0=
-git.kundeng.us/phoenix/textsender-models v0.0.11 h1:kd2FdeZJhJJAXBm8MoyadtgNGyzC+puU1oR8B8N+MfE=
+git.kundeng.us/phoenix/textsender-models v0.1.6 h1:d/rhvqjFSt1Ty/3UfwS21be+lYb9EtWEaDtkzfbzEp0=
-git.kundeng.us/phoenix/textsender-models v0.0.11/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
+git.kundeng.us/phoenix/textsender-models v0.1.6/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -29,8 +29,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/twilio/twilio-go v1.28.7 h1:WzzQDR/rqmNkVs1TwtcHFPYGTdSdPnx/eAZf5UIXzr4=
+github.com/twilio/twilio-go v1.28.8 h1:wbFz7Wt4S5mCEaes6FcM/ddcJGIhdjwp/9CHb9e+4fk=
-github.com/twilio/twilio-go v1.28.7/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
+github.com/twilio/twilio-go v1.28.8/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

internal/app/app.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path"
 
-	"git.kundeng.us/phoenix/textsender-models/tx0/config"
+	auxcfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary"
 	"github.com/joho/godotenv"
 )
 
@@ -16,7 +16,7 @@ type App struct {
 	AuthUrl           string
 	ServiceUsername   string
 	ServicePassphrase string
-	TwilioConfig      *config.TwiloConfig
+	TwilioConfig      *auxcfg.TwilioConfig
 }
 
 func Load() (*App, error) {
@@ -56,7 +56,7 @@ func Load() (*App, error) {
 	}
 }
 
-func loadTwilioConfig() (*config.TwiloConfig, error) {
+func loadTwilioConfig() (*auxcfg.TwilioConfig, error) {
 	authSid := os.Getenv("TWILIO_AUTH_SID")
 	serviceSid := os.Getenv("TWILIO_SERVICE_SID")
 	authToken := os.Getenv("TWILIO_AUTH_TOKEN")
@@ -71,7 +71,7 @@ func loadTwilioConfig() (*config.TwiloConfig, error) {
 	} else if len(phoneNumber) == 0 {
 		return nil, fmt.Errorf("Twilio config phone number not provided")
 	} else {
-		cfg := config.TwiloConfig{}
+		cfg := auxcfg.TwilioConfig{}
 		cfg.AccountSID = authSid
 		cfg.AuthToken = authToken
 		cfg.ServiceSID = serviceSid

internal/service/auth.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"time"
 
 	"git.kundeng.us/phoenix/textsender-models/tx0/token"
 
@@ -53,3 +54,45 @@ func (a *Auth) GetToken() (*token.Login, error) {
 
 	return r.Data[0], nil
 }
+
+type refreshTokenRequest struct {
+	AccessToken string `json:"access_token"`
+}
+
+func (a *Auth) GetRefreshToken(tok *token.Login) (*token.Login, error) {
+	req := refreshTokenRequest{AccessToken: tok.AccessToken}
+
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := http.Post(fmt.Sprintf("%s/api/v1/token/refresh", a.Application.AuthUrl), "application/json", bytes.NewBuffer(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var r tokenResponse
+	err = json.NewDecoder(resp.Body).Decode(&r)
+	if err != nil {
+		return nil, err
+	} else {
+		if len(r.Data) == 0 {
+			return nil, nil
+		} else {
+			return r.Data[0], nil
+		}
+	}
+}
+
+func (s *Auth) TokenExpired(tok *token.Login) bool {
+	now := time.Now()
+	expiredTime := time.Unix(tok.ExpiresIn, 0)
+
+	if now.After(expiredTime) {
+		return true
+	} else {
+		return false
+	}
+}

internal/service/core/service.go

@@ -2,8 +2,6 @@ package core
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
 	"log"
 	"sync"
 	"time"
@@ -57,77 +55,66 @@ func (s *Service) worker1() {
 			// Do some work
 			now := time.Now()
 			log.Println("Worker 1: Processing...")
+			catapultAuth := service.Auth{Application: s.App}
 			if s.token == nil {
-				catapultAuth := service.Auth{Application: s.App}
+				log.Println("Token has not been fetched")
+				log.Println("Fetching token")
 				if token, err := catapultAuth.GetToken(); err != nil {
-					fmt.Println("Error:", err)
+					log.Println("Error:", err)
 				} else {
-					fmt.Println("Access token:", token.AccessToken)
+					log.Println("Token fetched")
 					s.token = token
 				}
+			} else if catapultAuth.TokenExpired(s.token) {
+				// Get refresh token
+				log.Println("Token expired")
+				log.Println("Fetching refresh token")
+				refreshToken, err := catapultAuth.GetRefreshToken(s.token)
+				if err != nil {
+					log.Println("Error getting refresh token:", err)
+				} else {
+					log.Println("Refresh token fetched")
+					s.token = refreshToken
+				}
 			}
 
-			log.Println("Twilio config account sid:", s.App.TwilioConfig.AccountSID)
-			log.Println("Twilio config auth token:", s.App.TwilioConfig.AuthToken)
-			log.Println("Twilio config service sid:", s.App.TwilioConfig.ServiceSID)
-			log.Println("Twilio config number:", s.App.TwilioConfig.Number)
-
 			queue := service.Queue{Application: s.App, Token: s.token}
 			if item, exists, err := queue.GetQueue(); err != nil {
-				fmt.Println("Error:", err)
+				log.Println("Error:", err)
 			} else {
 				if *exists {
-					fmt.Println("Scheduled message Id:", item.Id)
+					log.Println("Scheduled message Id:", item.Id)
-					fmt.Println("Created:", item.Created)
+					log.Println("Created:", item.Created)
-					fmt.Println("Scheduled:", item.Scheduled)
+					log.Println("Scheduled:", item.Scheduled)
-					fmt.Println("Status:", item.Status)
+					log.Println("Status:", item.Status)
 					log.Println("User Id:", item.UserId)
 					if scheduledMessageValid(item, now) {
-						fmt.Println("Scheduled Message can be sent")
+						log.Println("Scheduled Message can be sent")
 						scheduler := service.Scheduler{Application: s.App, Token: s.token}
 						if events, err := scheduler.GetEvents(item.Id); err != nil {
-							fmt.Println("Error getting event:", err)
+							log.Println("Error getting event:", err)
 						} else {
 							for _, event := range events {
 								if msg, err := scheduler.GetMessage(event.MessageId); err != nil {
-									fmt.Println("Error getting message:", err)
+									log.Println("Error getting message:", err)
 								} else {
-									if c, err := scheduler.GetContact(event.RecipientId); err != nil {
+									if c, err := scheduler.GetContact(event.ContactId); err != nil {
-										fmt.Println("Error getting contact:", err)
+										log.Println("Error getting contact:", err)
 									} else {
-										fmt.Println("Message Id:", msg.Id)
+										log.Println("Message Id:", msg.Id)
-										fmt.Println("Contact Id:", c.Id)
+										log.Println("Contact Id:", c.Id)
-										if res, sent, err := scheduler.ScheduleMessage(*item, *event, *c, *msg); err != nil {
+										if res, resRaw, sent, err := scheduler.ScheduleMessage(*item, *event, *c, *msg); err != nil {
 											log.Println("Failure with scheduling the message:", err)
 										} else {
 											if res != nil {
-												bytes, err := json.Marshal(res)
+												if eventResponse, err := scheduler.RecordEventResponse(event, item.UserId, resRaw, sent); err != nil {
-												if err != nil {
+													log.Println("Failure recording event response:", err)
-													log.Println("Error parsing result:", err)
 												} else {
-													jsonValue := string(bytes)
+													if len(eventResponse) == 0 {
-													log.Println("Result:", jsonValue)
+														log.Println("No event responses")
-
-													if eventResponse, err := scheduler.RecordEventResponse(event, item.UserId, bytes, sent); err != nil {
-														log.Println("Failure recording event response:", err)
 													} else {
-														if len(eventResponse) == 0 {
+														eventResponse := eventResponse[0]
-															log.Println("No event responses")
+														log.Println("Event response saved. Id:", eventResponse.Id)
-														} else {
-															eventResponse := eventResponse[0]
-															log.Println("Event response saved. Id:", eventResponse.Id)
-															sameJsonValue := string(eventResponse.Response)
-
-															if jsonValue == sameJsonValue {
-																log.Println("Matches")
-															} else if len(jsonValue) == len(sameJsonValue) {
-																log.Println("Same size")
-																log.Println(jsonValue)
-																log.Println(sameJsonValue)
-															} else {
-																log.Println("Not the same")
-															}
-														}
 													}
 												}
 											} else {
@@ -139,10 +126,10 @@ func (s *Service) worker1() {
 							}
 						}
 					} else {
-						fmt.Println("Invalid scheduled message")
+						log.Println("Invalid scheduled message")
 					}
 				} else {
-					fmt.Println("Empty queue")
+					log.Println("Empty queue")
 				}
 			}
 		}

internal/service/message_event_response.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/event"
 	"git.kundeng.us/phoenix/textsender-models/tx0/token"
 
 	"git.kundeng.us/phoenix/catapult/internal/app"
@@ -18,11 +18,11 @@ type MessageEventResponse struct {
 }
 
 type recordMessageEventResponse struct {
-	Message string                          `json:"message"`
+	Message string                        `json:"message"`
-	Data    []*message.MessageEventResponse `json:"data"`
+	Data    []*event.MessageEventResponse `json:"data"`
 }
 
-func (m *MessageEventResponse) RecordEventResponse(mer *message.MessageEventResponse) ([]*message.MessageEventResponse, error) {
+func (m *MessageEventResponse) RecordEventResponse(mer *event.MessageEventResponse) ([]*event.MessageEventResponse, error) {
 	fullUrl := fmt.Sprintf("%s/api/v1/schedule/message/event/response/record", m.Application.ApiUrl)
 	jsonData, err := json.Marshal(mer)
 	if err != nil {

internal/service/scheduler.go

@@ -7,6 +7,7 @@ import (
 	"git.kundeng.us/phoenix/swoosh/swoop/types"
 	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
 	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	evnt "git.kundeng.us/phoenix/textsender-models/tx0/message/event"
 	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"git.kundeng.us/phoenix/textsender-models/tx0/token"
 	"github.com/google/uuid"
@@ -46,18 +47,18 @@ func (s *Scheduler) GetContact(id uuid.UUID) (*contact.Contact, error) {
 	}
 }
 
-func (s *Scheduler) ScheduleMessage(schMsg scheduling.ScheduledMessage, event scheduling.ScheduledMessageEvent, c contact.Contact, msg message.Message) (*types.TwilioResult, *time.Time, error) {
+func (s *Scheduler) ScheduleMessage(schMsg scheduling.ScheduledMessage, event scheduling.ScheduledMessageEvent, c contact.Contact, msg message.Message) (*types.TwilioResult, map[string]any, *time.Time, error) {
 	msgSender := send.MessageSender{Config: s.Application.TwilioConfig}
-	if res, err := msgSender.Send(msg, c, &schMsg.Scheduled); err != nil {
+	if res, resRaw, err := msgSender.Send(msg, c, &schMsg.Scheduled); err != nil {
-		return nil, nil, err
+		return nil, nil, nil, err
 	} else {
 		sent := time.Now()
-		return res, &sent, nil
+		return res, resRaw, &sent, nil
 	}
 }
 
-func (s *Scheduler) RecordEventResponse(schMsgEvent *scheduling.ScheduledMessageEvent, userId uuid.UUID, bytes []byte, sent *time.Time) ([]*message.MessageEventResponse, error) {
+func (s *Scheduler) RecordEventResponse(schMsgEvent *scheduling.ScheduledMessageEvent, userId uuid.UUID, bytes map[string]any, sent *time.Time) ([]*evnt.MessageEventResponse, error) {
-	mre := message.MessageEventResponse{ScheduledMessageEventId: schMsgEvent.Id, UserId: userId, Response: bytes, Sent: *sent}
+	mre := evnt.MessageEventResponse{ScheduledMessageEventId: schMsgEvent.Id, UserId: userId, Response: bytes, Sent: *sent, Status: evnt.Message_Event_Response_Status_Scheduled}
 
 	msgEventResponse := MessageEventResponse{Application: s.Application, Token: s.Token}
 	if responses, err := msgEventResponse.RecordEventResponse(&mre); err != nil {