changes (#55)

Reviewed-on: phoenix/textsender-api#55

.env.docker.sample

@@ -5,3 +5,8 @@ DB_PASSWORD=password
 DB_HOST=main_db
 DB_PORT=5432
 DB_SSLMODE=disable
+TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U
+TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T
+TWILIO_AUTH_TOKEN="f4a1f2b0b79ea3735078c2d8ee9684e1"
+TWILIO_PHONE_NUMBER=+10123456789
+ALLOWED_ORIGINS="http://textsender.com"

.env.local.sample

@@ -0,0 +1,12 @@
+JWT_SECRET=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
+DB_NAME=textsender_db
+DB_USER=textsender
+DB_PASSWORD=password
+DB_HOST=localhost
+DB_PORT=5432
+DB_SSLMODE=disable
+TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U
+TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T
+TWILIO_AUTH_TOKEN="f4a1f2b0b79ea3735078c2d8ee9684e1"
+TWILIO_PHONE_NUMBER=+10123456789
+ALLOWED_ORIGINS="http://textsender.com"

.env.sample

@@ -1,7 +0,0 @@
-JWT_SECRET=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_db
-DB_USER=textsender
-DB_PASSWORD=password
-DB_HOST=localhost
-DB_PORT=5432
-DB_SSLMODE=disable

.gitea/workflows/workflow.yaml

@@ -14,9 +14,9 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v6
       with:
-        go-version: '1.25.3' # You can specify a specific version or 'stable'
+        go-version: '1.25.4' # You can specify a specific version or 'stable'
 
     - name: Build
       run: |
@@ -24,7 +24,7 @@ jobs:
         mkdir -p ~/.ssh
         echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender_models_deploy_key
         chmod 600 ~/.ssh/textsender_models_deploy_key
-        ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
+        ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
  
         eval $(ssh-agent -s)
         ssh-add -v ~/.ssh/textsender_models_deploy_key
@@ -96,22 +96,24 @@ jobs:
           DB_SSLMODE: disable
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
         run: |
-          echo "Parent directory"
+          echo "JWT_SECRET=$SECRET_KEY" > .env
-          echo `pwd`
+          echo "DB_NAME=$DB_NAME" >> .env
-
-          echo "JWT_SECRET=$SECRET_KEY" >> .env
-          echo "DB_NAME=$DB_NAME" > .env
           echo "DB_USER=$DB_USER" >> .env
           echo "DB_PASSWORD=$DB_PASSWORD" >> .env
           echo "DB_HOST=$DB_HOST" >> .env
           echo "DB_PORT=$DB_PORT" >> .env
           echo "DB_SSLMODE=$DB_SSLMODE" >> .env
+          echo "TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U" >> .env
+          echo "TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T" >> .env
+          echo "TWILIO_AUTH_TOKEN=f4a1f2b0b79ea3735078c2d8ee9684e1" >> .env
+          echo "TWILIO_PHONE_NUMBER=10123456789" >> .env
+          echo "ALLOWED_ORIGINS=http://localhost:5173" >> .env
 
           echo "Initializing config"
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender_models_deploy_key
           chmod 600 ~/.ssh/textsender_models_deploy_key
-          ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
    
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender_models_deploy_key

Dockerfile

@@ -1,5 +1,5 @@
 # Multi-stage Dockerfile for Go application
-FROM golang:1.25.3 AS builder
+FROM golang:1.25.4 AS builder
 
 WORKDIR /app
 

README.md

@@ -4,8 +4,9 @@ A software system to process Text messaging queueing
 
 ## Getting started
 
+
 ### Building 
-```BASH
+```SHELL
 make build
 ```
 
@@ -13,7 +14,6 @@ make build
 Generate API documentation
 ```
 go install github.com/swaggo/swag/cmd/swag@latest
-go get -u github.com/swaggo/http-swagger/v2
 
 swag init --generalInfo main.go --dir ./cmd/api,./internal/handler --output docs/ --parseDependency --parseInternal
 ```

cmd/api/main.go

@@ -12,9 +12,11 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
+	"github.com/go-chi/cors"
 	"github.com/swaggo/http-swagger/v2"
 
 	_ "git.kundeng.us/phoenix/textsender-api/docs"
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/config"
 	database "git.kundeng.us/phoenix/textsender-api/internal/db"
 	"git.kundeng.us/phoenix/textsender-api/internal/handler"
@@ -36,18 +38,20 @@ import (
 // @name                        Authorization
 // @description                 JWT Bearer Token
 func main() {
-	cfg := config.Load()
+	cfg, tCfg, err := config.Load()
-	if cfg == nil {
+	if err != nil {
-		fmt.Println("Error initializing config")
+		log.Fatal("Error:", err)
-		os.Exit(-1)
+	} else if cfg == nil {
+		log.Fatal("Error initializing config")
 	} else if cfg.JWTSecret == "" {
-		fmt.Println("Error: JWTSecret not initialized")
+		log.Fatal("Error: JWTSecret not initialized")
-		os.Exit(-1)
 	}
 
+	apiApp := app.App{TwilioConfig: tCfg}
+
 	db, err := database.NewDatabase(cfg.GetDBConnString())
 	if err != nil {
-		log.Fatalf("Failed to connect to database: %v", err)
+		log.Fatal("Failed to connect to database:", err)
 	}
 	defer db.Close()
 
@@ -56,19 +60,18 @@ func main() {
 	if cfg.ResetDB {
 		log.Println("Resetting database")
 		if err := db.ResetDatabase(ctx); err != nil {
-			log.Fatalf("Failed to reset database: %v", err)
+			log.Fatal("Failed to reset database:", err)
 		}
 		log.Println("Database reset completed. Exiting.")
 		return
 	} else {
-		if exists, err := database.TableExists(ctx, db.Pool, "contacts "); err == nil && !exists {
+		if exists, err := database.TableExists(ctx, db.Pool, "contacts"); err == nil && !exists {
-			fmt.Println("Resetting database")
+			log.Println("Resetting database")
-			err = db.ResetDatabase(ctx)
+			if err = db.ResetDatabase(ctx); err != nil {
-			if err != nil {
+				log.Fatal("Error:", err)
-				fmt.Printf("Error:%v", err)
 			}
 		} else {
-			fmt.Printf("Error:%v", err)
+			log.Fatal("Error:", err)
 		}
 	}
 
@@ -78,15 +81,27 @@ func main() {
 	messageStore := store.NewMessageStore(db.Pool)
 	schStore := store.NewScheduledMessageStore(db.Pool)
 	schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool)
+	merStore := store.NewMessageEventResponseStore(db.Pool)
 
-	contactHandler := handler.NewContactHandler(contactStore)
+	contactHandler := handler.NewContactHandler(&apiApp, contactStore)
-	messageHandler := handler.NewMessageHandler(messageStore)
+	messageHandler := handler.NewMessageHandler(&apiApp, messageStore)
-	scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
+	scheduledMessageHandler := handler.NewScheduledMessageHandler(&apiApp, schStore)
-	scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore, schStore)
+	scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(&apiApp, schMsgEventStore, schStore)
-	scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(schMsgEventStore, schStore)
+	scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(&apiApp, schMsgEventStore, schStore)
+	eventHandler := handler.NewEventResponseHandler(&apiApp, merStore)
+	instantMessageHandler := handler.NewSendInstantMessageHandler(&apiApp, merStore, contactStore, messageStore)
 
 	router := chi.NewRouter()
 
+	// Configure CORS
+	router.Use(cors.Handler(cors.Options{
+		AllowedOrigins:   cfg.AllowedOrigins,
+		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
+		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
+		ExposedHeaders:   []string{"Link", "X-Total-Count"},
+		AllowCredentials: true,
+		MaxAge:           300, // 5 minutes
+	}))
 	router.Use(middleware.Logger)
 	router.Use(middleware.Recoverer)
 	router.Use(middleware.Timeout(60 * time.Second))
@@ -103,6 +118,8 @@ func main() {
 	router.Method("PATCH", endpoint.UpdateScheduledMessageStatusEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageStatusHandler.UpdateStatus)))
 	router.Method("GET", endpoint.GetScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.GetScheduledMessage)))
 	router.Method("GET", endpoint.FetchNextScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.FetchNextMessage)))
+	router.Method("POST", endpoint.RecordEventResponse, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(eventHandler.RecordResponse)))
+	router.Method("POST", endpoint.SendInstantMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(instantMessageHandler.Send)))
 
 	router.Method("GET", "/swagger/*", httpSwagger.Handler(
 		httpSwagger.URL(fmt.Sprintf("http://localhost:%s/swagger/doc.json", config.PORT)),

cmd/api/main_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"path"
@@ -12,6 +13,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/joho/godotenv"
 
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/config"
 	"git.kundeng.us/phoenix/textsender-api/internal/db"
 	"git.kundeng.us/phoenix/textsender-api/internal/handler"
@@ -24,7 +26,7 @@ import (
 var testRouter *chi.Mux
 
 func TestMain(m *testing.M) {
-	cfg := load()
+	cfg, apiApp := load()
 
 	database, err := db.NewDatabase(cfg.GetDBConnString())
 	if err != nil {
@@ -58,12 +60,14 @@ func TestMain(m *testing.M) {
 	messageStore := store.NewMessageStore(db.Pool)
 	schStore := store.NewScheduledMessageStore(db.Pool)
 	schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool)
+	merStore := store.NewMessageEventResponseStore(db.Pool)
 
-	contactHandler := handler.NewContactHandler(contactStore)
+	contactHandler := handler.NewContactHandler(apiApp, contactStore)
-	messageHandler := handler.NewMessageHandler(messageStore)
+	messageHandler := handler.NewMessageHandler(apiApp, messageStore)
-	scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
+	scheduledMessageHandler := handler.NewScheduledMessageHandler(apiApp, schStore)
-	scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore, schStore)
+	scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(apiApp, schMsgEventStore, schStore)
-	scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(schMsgEventStore, schStore)
+	scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(apiApp, schMsgEventStore, schStore)
+	eventHandler := handler.NewEventResponseHandler(apiApp, merStore)
 
 	testRouter = chi.NewRouter()
 	testRouter.Handle(endpoint.ADD_CONTACT_ENDPOINT, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(contactHandler.AddContact)))
@@ -76,12 +80,13 @@ func TestMain(m *testing.M) {
 	testRouter.Method("PATCH", endpoint.UpdateScheduledMessageStatusEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageStatusHandler.UpdateStatus)))
 	testRouter.Method("GET", endpoint.GetScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.GetScheduledMessage)))
 	testRouter.Method("GET", endpoint.FetchNextScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.FetchNextMessage)))
+	testRouter.Method("POST", endpoint.RecordEventResponse, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(eventHandler.RecordResponse)))
 
 	code := m.Run()
 	os.Exit(code)
 }
 
-func load() *config.Config {
+func load() (*config.Config, *app.App) {
 	resetDb := flag.Bool("reset-db", false, "Reset the database schema and exit")
 	port := flag.String("port", config.PORT, "Server port")
 	flag.Parse()
@@ -100,10 +105,15 @@ func load() *config.Config {
 	unpackedConnString := config.UnpackDBConnString()
 	dbConnString := unpackedConnString.Parse()
 
-	return &config.Config{
+	if tCfg, err := config.TwilioConfig(); err != nil {
-		DBConnString: dbConnString,
+		log.Fatal("Error: ", err)
-		ServerPort:   *port,
+		return nil, nil
-		ResetDB:      *resetDb,
+	} else {
+		return &config.Config{
+			DBConnString: dbConnString,
+			ServerPort:   *port,
+			ResetDB:      *resetDb,
+		}, &app.App{TwilioConfig: tCfg}
 	}
 }
 

docker-compose.yaml

@@ -5,7 +5,7 @@ services:
     build: # Tells docker-compose to build the Dockerfile in the current directory
       context: .
       ssh: ["default"]  # Uses host's SSH agent
-    container_name: textsender # Optional: Give the container a specific name
+    container_name: textsender_api # Optional: Give the container a specific name
     ports:
       # Map host port 8000 to container port 3000 (adjust as needed)
       - "8080:8080"
@@ -19,7 +19,7 @@ services:
     restart: unless-stopped # Optional: Restart policy
 
   auth_api:
-    build: # Tells docker-compose to build the Dockerfile in the current directory
+    build:
       context: ../textsender-auth
       ssh: ["default"]  # Uses host's SSH agent
       dockerfile: Dockerfile
@@ -36,6 +36,21 @@ services:
       - textsender-network
     restart: unless-stopped # Optional: Restart policy
 
+  catapult:
+    build:
+      context: ../catapult
+      ssh: ["default"]
+      dockerfile: Dockerfile
+    container_name: catapult
+    env_file:
+      - ../catapult/.env
+    depends_on:
+      - auth_api
+      - api
+    networks:
+      - textsender-network
+    restart: unless-stopped
+
   # PostgreSQL Database Service
   main_db:
     image: postgres:18.0-alpine # Use an official Postgres image (Alpine variant is smaller)

docs/docs.go

@@ -122,6 +122,57 @@ const docTemplate = `{
                 }
             }
         },
+        "/instant/message": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Send a message without the constraints of scheduled messages (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "messages"
+                ],
+                "summary": "Send instant message",
+                "parameters": [
+                    {
+                        "description": "Send an instnt message",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "Created",
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/message": {
             "get": {
                 "security": [
@@ -214,6 +265,12 @@ const docTemplate = `{
                             "$ref": "#/definitions/handler.AddMessageResponse"
                         }
                     },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.AddMessageResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -822,6 +879,37 @@ const docTemplate = `{
                 }
             }
         },
+        "handler.SendInstantMessageRequest": {
+            "type": "object",
+            "properties": {
+                "contact_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "message_id": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.SendInstantMessageResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/message.MessageEventResponse"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
         "message.Message": {
             "type": "object",
             "properties": {
@@ -836,6 +924,29 @@ const docTemplate = `{
                 }
             }
         },
+        "message.MessageEventResponse": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "response": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "scheduled_message_event_id": {
+                    "type": "string"
+                },
+                "sent": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
         "scheduling.ScheduledMessage": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -116,6 +116,57 @@
                 }
             }
         },
+        "/instant/message": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Send a message without the constraints of scheduled messages (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "messages"
+                ],
+                "summary": "Send instant message",
+                "parameters": [
+                    {
+                        "description": "Send an instnt message",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "Created",
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.SendInstantMessageResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/message": {
             "get": {
                 "security": [
@@ -208,6 +259,12 @@
                             "$ref": "#/definitions/handler.AddMessageResponse"
                         }
                     },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.AddMessageResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -816,6 +873,37 @@
                 }
             }
         },
+        "handler.SendInstantMessageRequest": {
+            "type": "object",
+            "properties": {
+                "contact_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "message_id": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.SendInstantMessageResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/message.MessageEventResponse"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
         "message.Message": {
             "type": "object",
             "properties": {
@@ -830,6 +918,29 @@
                 }
             }
         },
+        "message.MessageEventResponse": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "response": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "scheduled_message_event_id": {
+                    "type": "string"
+                },
+                "sent": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
         "scheduling.ScheduledMessage": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -154,6 +154,26 @@ definitions:
       message:
         type: string
     type: object
+  handler.SendInstantMessageRequest:
+    properties:
+      contact_ids:
+        items:
+          type: string
+        type: array
+      message_id:
+        type: string
+      user_id:
+        type: string
+    type: object
+  handler.SendInstantMessageResponse:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/message.MessageEventResponse'
+        type: array
+      message:
+        type: string
+    type: object
   message.Message:
     properties:
       content:
@@ -163,6 +183,21 @@ definitions:
       user_id:
         type: string
     type: object
+  message.MessageEventResponse:
+    properties:
+      id:
+        type: string
+      response:
+        items:
+          type: integer
+        type: array
+      scheduled_message_event_id:
+        type: string
+      sent:
+        type: string
+      user_id:
+        type: string
+    type: object
   scheduling.ScheduledMessage:
     properties:
       created:
@@ -266,6 +301,39 @@ paths:
       summary: Add contact
       tags:
       - contacts
+  /instant/message:
+    post:
+      consumes:
+      - application/json
+      description: Send a message without the constraints of scheduled messages (requires
+        JWT)
+      parameters:
+      - description: Send an instnt message
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/handler.SendInstantMessageRequest'
+      produces:
+      - application/json
+      responses:
+        "201":
+          description: Created
+          schema:
+            $ref: '#/definitions/handler.SendInstantMessageResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/handler.SendInstantMessageResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/handler.SendInstantMessageResponse'
+      security:
+      - BearerAuth: []
+      summary: Send instant message
+      tags:
+      - messages
   /message:
     get:
       consumes:
@@ -322,6 +390,10 @@ paths:
           description: Created
           schema:
             $ref: '#/definitions/handler.AddMessageResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/handler.AddMessageResponse'
         "500":
           description: Internal Server Error
           schema:

go.mod

@@ -1,10 +1,12 @@
 module git.kundeng.us/phoenix/textsender-api
 
-go 1.25.3
+go 1.25.4
 
 require (
-	git.kundeng.us/phoenix/textsender-models v0.0.6-4-e124bcfda8-556
+	git.kundeng.us/phoenix/swoosh v0.0.7-8-523c7cf67c-556
+	git.kundeng.us/phoenix/textsender-models v0.0.12
 	github.com/go-chi/chi/v5 v5.2.3
+	github.com/go-chi/cors v1.2.2
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.6
@@ -17,24 +19,27 @@ require (
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-openapi/jsonpointer v0.22.1 // indirect
+	github.com/go-openapi/jsonpointer v0.22.3 // indirect
 	github.com/go-openapi/jsonreference v0.21.3 // indirect
 	github.com/go-openapi/spec v0.22.1 // indirect
-	github.com/go-openapi/swag/conv v0.25.1 // indirect
+	github.com/go-openapi/swag/conv v0.25.4 // indirect
-	github.com/go-openapi/swag/jsonname v0.25.1 // indirect
+	github.com/go-openapi/swag/jsonname v0.25.4 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
+	github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
-	github.com/go-openapi/swag/loading v0.25.1 // indirect
+	github.com/go-openapi/swag/loading v0.25.4 // indirect
-	github.com/go-openapi/swag/stringutils v0.25.1 // indirect
+	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
-	github.com/go-openapi/swag/typeutils v0.25.1 // indirect
+	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
-	github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
+	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
+	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/swaggo/files/v2 v2.0.2 // indirect
+	github.com/twilio/twilio-go v1.28.8 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.44.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/mod v0.30.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect
 	golang.org/x/text v0.31.0 // indirect

go.sum

@@ -1,39 +1,50 @@
-git.kundeng.us/phoenix/textsender-models v0.0.6-4-e124bcfda8-556 h1:2shgOKmglCODswpCJeCuyPiUAph3wfc0Ep1z6b/ifis=
+git.kundeng.us/phoenix/swoosh v0.0.7-8-523c7cf67c-556 h1:vzTrhx7auc8OlUGmfTDektHXCkoFOKzVhdsW+6oKXMI=
-git.kundeng.us/phoenix/textsender-models v0.0.6-4-e124bcfda8-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
+git.kundeng.us/phoenix/swoosh v0.0.7-8-523c7cf67c-556/go.mod h1:OAh9jVBQ3vRJ1EHTM6pFyWd9eXf1H+CevbDKkJuoDZU=
+git.kundeng.us/phoenix/textsender-models v0.0.12 h1:ps9H3FS5LyCwQhAiIvg4vYyfLZZ64dex1y9ytb0o9C4=
+git.kundeng.us/phoenix/textsender-models v0.0.12/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+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=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
 github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk=
+github.com/go-chi/cors v1.2.2 h1:Jmey33TE+b+rB7fT8MUy1u0I4L+NARQlK6LhzKPSyQE=
-github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM=
+github.com/go-chi/cors v1.2.2/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-openapi/jsonpointer v0.22.3 h1:dKMwfV4fmt6Ah90zloTbUKWMD+0he+12XYAsPotrkn8=
+github.com/go-openapi/jsonpointer v0.22.3/go.mod h1:0lBbqeRsQ5lIanv3LHZBrmRGHLHcQoOXQnf88fHlGWo=
 github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc=
 github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4=
 github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k=
 github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA=
 github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
-github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0=
+github.com/go-openapi/swag/conv v0.25.4 h1:/Dd7p0LZXczgUcC/Ikm1+YqVzkEeCc9LnOWjfkpkfe4=
-github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs=
+github.com/go-openapi/swag/conv v0.25.4/go.mod h1:3LXfie/lwoAv0NHoEuY1hjoFAYkvlqI/Bn5EQDD3PPU=
-github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU=
+github.com/go-openapi/swag/jsonname v0.25.4 h1:bZH0+MsS03MbnwBXYhuTttMOqk+5KcQ9869Vye1bNHI=
-github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo=
+github.com/go-openapi/swag/jsonname v0.25.4/go.mod h1:GPVEk9CWVhNvWhZgrnvRA6utbAltopbKwDu8mXNUMag=
-github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8=
+github.com/go-openapi/swag/jsonutils v0.25.4 h1:VSchfbGhD4UTf4vCdR2F4TLBdLwHyUDTd1/q4i+jGZA=
-github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo=
+github.com/go-openapi/swag/jsonutils v0.25.4/go.mod h1:7OYGXpvVFPn4PpaSdPHJBtF0iGnbEaTk8AvBkoWnaAY=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1 h1:DSQGcdB6G0N9c/KhtpYc71PzzGEIc/fZ1no35x4/XBY=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4 h1:IACsSvBhiNJwlDix7wq39SS2Fh7lUOCJRmx/4SN4sVo=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1/go.mod h1:kjmweouyPwRUEYMSrbAidoLMGeJ5p6zdHi9BgZiqmsg=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4/go.mod h1:Mt0Ost9l3cUzVv4OEZG+WSeoHwjWLnarzMePNDAOBiM=
-github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw=
+github.com/go-openapi/swag/loading v0.25.4 h1:jN4MvLj0X6yhCDduRsxDDw1aHe+ZWoLjW+9ZQWIKn2s=
-github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc=
+github.com/go-openapi/swag/loading v0.25.4/go.mod h1:rpUM1ZiyEP9+mNLIQUdMiD7dCETXvkkC30z53i+ftTE=
-github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw=
+github.com/go-openapi/swag/stringutils v0.25.4 h1:O6dU1Rd8bej4HPA3/CLPciNBBDwZj9HiEpdVsb8B5A8=
-github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg=
+github.com/go-openapi/swag/stringutils v0.25.4/go.mod h1:GTsRvhJW5xM5gkgiFe0fV3PUlFm0dr8vki6/VSRaZK0=
-github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA=
+github.com/go-openapi/swag/typeutils v0.25.4 h1:1/fbZOUN472NTc39zpa+YGHn3jzHWhv42wAJSN91wRw=
-github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8=
+github.com/go-openapi/swag/typeutils v0.25.4/go.mod h1:Ou7g//Wx8tTLS9vG0UmzfCsjZjKhpjxayRKTHXf2pTE=
-github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk=
+github.com/go-openapi/swag/yamlutils v0.25.4 h1:6jdaeSItEUb7ioS9lFoCZ65Cne1/RZtPBZ9A56h92Sw=
-github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg=
+github.com/go-openapi/swag/yamlutils v0.25.4/go.mod h1:MNzq1ulQu+yd8Kl7wPOut/YHAAU/H6hL91fF+E2RFwc=
+github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4=
+github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg=
 github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=
 github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -48,10 +59,17 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275 h1:IZycmTpoUtQK3PD60UYBwjaCUHUP7cML494ao9/O8+Q=
+github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275/go.mod h1:zt6UU74K6Z6oMOYJbJzYpYucqdcQwSMPBEdSvGiaUMw=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -67,19 +85,45 @@ github.com/swaggo/http-swagger/v2 v2.0.2 h1:FKCdLsl+sFCx60KFsyM0rDarwiUSZ8DqbfSy
 github.com/swaggo/http-swagger/v2 v2.0.2/go.mod h1:r7/GBkAWIfK6E/OLnE8fXnviHiDeAHmgIyooa4xm3AQ=
 github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI=
 github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg=
+github.com/twilio/twilio-go v1.28.8 h1:wbFz7Wt4S5mCEaes6FcM/ddcJGIhdjwp/9CHb9e+4fk=
+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=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
 golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
 golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
 golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
 golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/app/app.go

@@ -0,0 +1,9 @@
+package app
+
+import (
+	"git.kundeng.us/phoenix/textsender-models/tx0/config"
+)
+
+type App struct {
+	TwilioConfig *config.TwilioConfig
+}

internal/config/config.go

@@ -3,20 +3,23 @@ package config
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"strconv"
+	"strings"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/config"
 	"github.com/joho/godotenv"
 
 	"git.kundeng.us/phoenix/textsender-api/internal/version"
 )
 
 type Config struct {
-	DBConnString string
+	DBConnString   string
-	ServerPort   string
+	ServerPort     string
-	ResetDB      bool
+	ResetDB        bool
-	JWTSecret    string `env:"JWT_SECRET" required:"true"`
+	JWTSecret      string `env:"JWT_SECRET" required:"true"`
+	TwilioConfig   *config.TwilioConfig
+	AllowedOrigins []string
 }
 
 type ConnectionInfo struct {
@@ -46,7 +49,7 @@ func PrintName() {
 	fmt.Println(version.String())
 }
 
-func Load() *Config {
+func Load() (*Config, *config.TwilioConfig, error) {
 	versionFlag := flag.Bool("version", false, "Print version information")
 	resetDb := flag.Bool("reset-db", false, "Reset the database schema and exit")
 	port := flag.String("port", PORT, "Server port")
@@ -57,19 +60,24 @@ func Load() *Config {
 		os.Exit(-1)
 	}
 
-	err := godotenv.Load()
+	if err := godotenv.Load(); err != nil {
-	if err != nil {
+		return nil, nil, fmt.Errorf("Error loading .env file")
-		log.Fatal("Error loading .env file")
 	}
 
 	unpackedConnString := UnpackDBConnString()
 	dbConnString := unpackedConnString.Parse()
 
-	return &Config{
+	if cfg, err := TwilioConfig(); err != nil {
-		DBConnString: dbConnString,
+		return nil, nil, err
-		ServerPort:   *port,
+	} else {
-		ResetDB:      *resetDb,
+		allowedOrigins := unpackAllowedOrigins()
-		JWTSecret:    os.Getenv("JWT_SECRET"),
+		return &Config{
+			DBConnString:   dbConnString,
+			ServerPort:     *port,
+			ResetDB:        *resetDb,
+			JWTSecret:      os.Getenv("JWT_SECRET"),
+			AllowedOrigins: allowedOrigins,
+		}, cfg, nil
 	}
 }
 
@@ -124,6 +132,37 @@ func UnpackDBConnString() (connInfo ConnectionInfo) {
 	return
 }
 
+func unpackAllowedOrigins() []string {
+	allowedOriginsRaw := os.Getenv("ALLOWED_ORIGINS")
+	allowedOriginsSplit := strings.Split(allowedOriginsRaw, ",")
+	return allowedOriginsSplit
+}
+
+func TwilioConfig() (*config.TwilioConfig, error) {
+	authSid := os.Getenv("TWILIO_AUTH_SID")
+	serviceSid := os.Getenv("TWILIO_SERVICE_SID")
+	authToken := os.Getenv("TWILIO_AUTH_TOKEN")
+	phoneNumber := os.Getenv("TWILIO_PHONE_NUMBER")
+
+	if len(authSid) == 0 {
+		return nil, fmt.Errorf("Twilio config account sid not found")
+	} else if len(serviceSid) == 0 {
+		return nil, fmt.Errorf("Twilio config service sid not found")
+	} else if len(authToken) == 0 {
+		return nil, fmt.Errorf("Twilio config auth token not found")
+	} else if len(phoneNumber) == 0 {
+		return nil, fmt.Errorf("Twilio config phone number not found")
+	} else {
+		var cfg config.TwilioConfig
+		cfg.AccountSID = authSid
+		cfg.ServiceSID = serviceSid
+		cfg.AuthToken = authToken
+		cfg.Number = phoneNumber
+
+		return &cfg, nil
+	}
+}
+
 func (c *Config) GetDBConnString() string {
 	return c.DBConnString
 }

internal/handler/contact.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"net/http"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
 	"github.com/google/uuid"
 
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/store"
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
 )
 
 type RequestAddContact struct {
@@ -20,17 +21,13 @@ type AddContactResponse struct {
 	Data    []contact.Contact `json:"data"`
 }
 
-type GetContactResponse struct {
-	Message string            `json:"message"`
-	Data    []contact.Contact `json:"data"`
-}
-
 type ContactHandler struct {
+	App          *app.App
 	ContactStore store.ContactStore
 }
 
-func NewContactHandler(str store.ContactStore) *ContactHandler {
+func NewContactHandler(apiApp *app.App, str store.ContactStore) *ContactHandler {
-	return &ContactHandler{ContactStore: str}
+	return &ContactHandler{App: apiApp, ContactStore: str}
 }
 
 // AddContact godoc
@@ -57,14 +54,14 @@ func (c *ContactHandler) AddContact(w http.ResponseWriter, r *http.Request) {
 	}
 	defer r.Body.Close()
 
-	newContact := contact.Contact{PhoneNumber: req.PhoneNumber, UserId: req.UserId}
+	newContact := contact.Contact{PhoneNumber: req.PhoneNumber, UserId: &req.UserId}
 
 	var statusCode int
 	var resp AddContactResponse
 
 	ctx := r.Context()
 
-	if exists, err := c.ContactStore.ContactExists(ctx, newContact.PhoneNumber, newContact.UserId); err != nil {
+	if exists, err := c.ContactStore.ContactExists(ctx, newContact.PhoneNumber, *newContact.UserId); err != nil {
 		fmt.Printf("Error: %v", err)
 		statusCode = http.StatusInternalServerError
 		resp.Message = err.Error()
@@ -88,6 +85,11 @@ func (c *ContactHandler) AddContact(w http.ResponseWriter, r *http.Request) {
 	RespondWithJSON(w, statusCode, &resp)
 }
 
+type GetContactResponse struct {
+	Message string            `json:"message"`
+	Data    []contact.Contact `json:"data"`
+}
+
 // GetContact godoc
 // @Summary      Get contact
 // @Description  Get a contact record to have a recipient to send a text to (requires JWT)
@@ -155,7 +157,7 @@ func (c *ContactHandler) GetContact(w http.ResponseWriter, r *http.Request) {
 		fmt.Println("Checking with User Id")
 		if contacts, err := c.ContactStore.GetAllContacts(ctx); err == nil {
 			for _, con := range contacts {
-				if con.UserId == userId {
+				if *con.UserId == userId {
 					resp.Data = append(resp.Data, *con)
 				}
 			}

internal/handler/contact_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 
@@ -25,7 +25,10 @@ type Request struct {
 
 func TestCreateContactWithMock(t *testing.T) {
 	mockstore := mock.NewMockContactStore()
-	handler := NewContactHandler(mockstore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+
+	handler := NewContactHandler(apiApp, mockstore)
 
 	testUserId := uuid.New()
 	testBody := Request{PhoneNumber: "+12335403383", UserId: testUserId}
@@ -39,7 +42,7 @@ func TestCreateContactWithMock(t *testing.T) {
 	assert.Equal(t, http.StatusCreated, rr.Code)
 
 	var response AddContactResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error Creating contact %v", err)
 
 	assert.NotEmpty(t, response.Data, "No Contact created")
@@ -51,7 +54,7 @@ func TestGetContactWithMock(t *testing.T) {
 	mockstore := mock.NewMockContactStore()
 	testUserId := uuid.New()
 
-	testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: testUserId}
+	testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: &testUserId}
 	ctx := t.Context()
 	if err := mockstore.CreateContact(ctx, &testCon); err != nil {
 		assert.NoError(t, err, "Error creating contact")
@@ -62,13 +65,15 @@ func TestGetContactWithMock(t *testing.T) {
 	req, _ := http.NewRequest("GET", url, nil)
 	rr := httptest.NewRecorder()
 
-	contactHandler := NewContactHandler(mockstore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	contactHandler := NewContactHandler(apiApp, mockstore)
 	contactHandler.GetContact(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response GetContactResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error getting contact %v", err)
 
 	assert.NotEmpty(t, response.Data, "No Contact retrieved")

internal/handler/endpoint/endpoint.go

@@ -12,3 +12,5 @@ const GetScheduledMessageEventEndpoint = "/api/v1/schedule/message/event"
 const DeleteScheduledMessageEventEndpoint = "/api/v1/schedule/message/event/{id}"
 const UpdateScheduledMessageStatusEndpoint = "/api/v1/schedule/message/status/update"
 const FetchNextScheduledMessageEndpoint = "/api/v1/schedule/message/fetch"
+const RecordEventResponse = "/api/v1/schedule/message/event/response/record"
+const SendInstantMessageEndpoint = "/api/v1/instant/message"

internal/handler/helper.go

@@ -16,7 +16,12 @@ func ExtractFromRequest(r *http.Request, reqItem interface{}) error {
 	}
 }
 
+func InvalidJson(err error) string {
+	return fmt.Sprintf("Invalid JSON: %s", err.Error())
+}
+
 // Helper function to send JSON responses
+// TODO: Change type of data to any
 func RespondWithJSON(w http.ResponseWriter, statusCode int, data interface{}) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(statusCode)

internal/handler/helper_test.go

@@ -0,0 +1,31 @@
+package handler
+
+import (
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/joho/godotenv"
+
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
+	"git.kundeng.us/phoenix/textsender-api/internal/config"
+)
+
+func GetApp() (*app.App, error) {
+	cwd, _ := os.Getwd()
+	envPath := path.Join(cwd, ".env")
+
+	err := godotenv.Load(envPath)
+	if err != nil {
+		envPath = path.Join(cwd, "../..", ".env")
+		if err := godotenv.Load(envPath); err != nil {
+			panic("Error loading .env file: " + err.Error())
+		}
+	}
+
+	if tCfg, err := config.TwilioConfig(); err != nil {
+		return nil, fmt.Errorf("Error: %v", err)
+	} else {
+		return &app.App{TwilioConfig: tCfg}, nil
+	}
+}

internal/handler/instant_message.go

@@ -0,0 +1,194 @@
+package handler
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"strings"
+	"time"
+
+	"git.kundeng.us/phoenix/swoosh/swoop/send"
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"github.com/google/uuid"
+
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
+	"git.kundeng.us/phoenix/textsender-api/internal/store"
+)
+
+const Contact_Limit = 400
+
+type SendInstantMessageHandler struct {
+	App          *app.App
+	MERStore     store.MessageEventResponseStore
+	ContactStore store.ContactStore
+	MessageStore store.MessageStore
+}
+
+func NewSendInstantMessageHandler(apiApp *app.App, str store.MessageEventResponseStore, cStore store.ContactStore, mStore store.MessageStore) *SendInstantMessageHandler {
+	return &SendInstantMessageHandler{App: apiApp, MERStore: str, ContactStore: cStore, MessageStore: mStore}
+}
+
+type SendInstantMessageRequest struct {
+	ContactIds []uuid.UUID `json:"contact_ids"`
+	MessageId  uuid.UUID   `json:"message_id"`
+	UserId     uuid.UUID   `json:"user_id"`
+}
+
+type SendInstantMessageResponse struct {
+	Message string                          `json:"message"`
+	Data    []*message.MessageEventResponse `json:"data"`
+}
+
+// Sent godoc
+// @Summary      Send instant message
+// @Description  Send a message without the constraints of scheduled messages (requires JWT)
+// @Tags         messages
+// @Accept       json
+// @Produce      json
+// @Security     BearerAuth
+// @Param 	 request body 	SendInstantMessageRequest true "Send an instnt message"
+// @Success      201  {object}  SendInstantMessageResponse
+// @Failure      400  {object}  SendInstantMessageResponse
+// @Failure      500  {object}  SendInstantMessageResponse
+// @Router       /instant/message [post]
+func (s *SendInstantMessageHandler) Send(w http.ResponseWriter, r *http.Request) {
+	var req SendInstantMessageRequest
+	if err := ExtractFromRequest(r, &req); err != nil {
+		http.Error(w, InvalidJson(err), http.StatusBadRequest)
+	}
+	defer r.Body.Close()
+
+	var statusCode int
+	var resp SendInstantMessageResponse
+
+	if req.UserId == uuid.Nil {
+		statusCode = http.StatusBadRequest
+		resp.Message = "User Id is nil"
+	} else if req.MessageId == uuid.Nil {
+		statusCode = http.StatusBadRequest
+		resp.Message = "Message Id is nil"
+	} else if len(req.ContactIds) == 0 {
+		statusCode = http.StatusBadRequest
+		resp.Message = "No contacts provided"
+	} else {
+		if len(req.ContactIds) > Contact_Limit {
+			statusCode = http.StatusBadRequest
+			resp.Message = "Too many contacts"
+		} else {
+			ctx := r.Context()
+			if msg, contacts, err := s.verify(ctx, &req); err != nil {
+				statusCode = http.StatusInternalServerError
+				resp.Message = err.Error()
+			} else {
+				if msg == nil {
+					statusCode = http.StatusBadRequest
+					resp.Message = "Message is empty"
+				} else if len(contacts) == 0 {
+					statusCode = http.StatusBadRequest
+					resp.Message = "Contacts not found"
+				} else {
+					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 {
+								statusCode = http.StatusInternalServerError
+								resp.Message = err.Error()
+							} else {
+								if data, err := json.Marshal(twilioResp); 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 {
+										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)
+										}
+									}
+								}
+							}
+						}
+					} else {
+						statusCode = http.StatusInternalServerError
+						resp.Message = "Config not properly configured"
+					}
+				}
+			}
+		}
+	}
+
+	RespondWithJSON(w, statusCode, &resp)
+}
+
+func (s *SendInstantMessageHandler) verify(ctx context.Context, req *SendInstantMessageRequest) (*message.Message, []*contact.Contact, error) {
+	if msg, err := s.verifyMessage(ctx, req.MessageId); err != nil {
+		log.Println("Huh?")
+		return nil, nil, fmt.Errorf("Error:%v", err)
+	} else {
+		log.Println("Okay")
+		if msg != nil {
+			if contacts, err := s.verifyContacts(ctx, req.ContactIds); err != nil {
+				return nil, nil, fmt.Errorf("Error:%v", err)
+			} else {
+				if len(contacts) == 0 {
+					return msg, nil, nil
+				} else {
+					return msg, contacts, nil
+				}
+			}
+		} else {
+			log.Println("How can this be?")
+			return nil, nil, fmt.Errorf("Could not verify message")
+		}
+	}
+}
+
+func (s *SendInstantMessageHandler) verifyMessage(ctx context.Context, messageId uuid.UUID) (*message.Message, error) {
+	if msg, err := s.MessageStore.GetMessageByID(ctx, messageId); err != nil {
+		return nil, fmt.Errorf("Error getting message:%v", err)
+	} else {
+		if msg == nil {
+			log.Println("Message is nil")
+			return nil, nil
+		} else {
+			return msg, nil
+		}
+	}
+}
+
+func (s *SendInstantMessageHandler) verifyContacts(ctx context.Context, contactIds []uuid.UUID) ([]*contact.Contact, error) {
+	var contacts []*contact.Contact
+
+	for _, contactId := range contactIds {
+		if c, err := s.ContactStore.GetContactByID(ctx, contactId); err != nil {
+			return nil, fmt.Errorf("Error getting contacts:%v", err)
+		} else {
+			if c != nil {
+				contacts = append(contacts, c)
+			}
+		}
+	}
+
+	if len(contacts) == 0 {
+		return nil, nil
+	} else {
+		return contacts, nil
+	}
+}

internal/handler/message.go

@@ -2,12 +2,14 @@ package handler
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
 	"github.com/google/uuid"
 
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/store"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
 )
 
 type RequestAddMessage struct {
@@ -20,19 +22,17 @@ type AddMessageResponse struct {
 	Data    []message.Message `json:"data"`
 }
 
-type GetMessageResponse struct {
-	Message string            `json:"message"`
-	Data    []message.Message `json:"data"`
-}
-
 type MessageHandler struct {
+	App          *app.App
 	MessageStore store.MessageStore
 }
 
-func NewMessageHandler(str store.MessageStore) *MessageHandler {
+func NewMessageHandler(apiApp *app.App, str store.MessageStore) *MessageHandler {
-	return &MessageHandler{MessageStore: str}
+	return &MessageHandler{App: apiApp, MessageStore: str}
 }
 
+const Message_Limit = 200
+
 // AddMessage godoc
 // @Summary      Add message
 // @Description  Add a message record to send a text to (requires JWT)
@@ -42,6 +42,7 @@ func NewMessageHandler(str store.MessageStore) *MessageHandler {
 // @Security     BearerAuth
 // @Param 	 request body 	RequestAddMessage true "Data to add message"
 // @Success      201  {object}  AddMessageResponse
+// @Failure      400  {object}  AddMessageResponse
 // @Failure      500  {object}  AddMessageResponse
 // @Router       /message/new [post]
 func (m *MessageHandler) AddMessage(w http.ResponseWriter, r *http.Request) {
@@ -60,21 +61,39 @@ func (m *MessageHandler) AddMessage(w http.ResponseWriter, r *http.Request) {
 	var resp AddMessageResponse
 	newMessage := message.Message{Content: req.Content, UserId: req.UserId}
 
-	ctx := r.Context()
+	if isMessageValid(&newMessage) {
+		ctx := r.Context()
 
-	if err := m.MessageStore.CreateMessage(ctx, &newMessage); err != nil {
+		if err := m.MessageStore.CreateMessage(ctx, &newMessage); err != nil {
-		fmt.Println("Error:", err)
+			fmt.Println("Error:", err)
-		statusCode = http.StatusInternalServerError
+			statusCode = http.StatusInternalServerError
-		resp.Message = err.Error()
+			resp.Message = err.Error()
+		} else {
+			statusCode = http.StatusCreated
+			resp.Message = "Message created"
+			resp.Data = append(resp.Data, newMessage)
+		}
 	} else {
-		statusCode = http.StatusCreated
+		statusCode = http.StatusBadRequest
-		resp.Message = "Message created"
+		resp.Message = fmt.Sprintf("Message length exceeds maximum limit. Current size: %d Limit: %d", len(newMessage.Content), Message_Limit)
-		resp.Data = append(resp.Data, newMessage)
 	}
 
 	RespondWithJSON(w, statusCode, &resp)
 }
 
+func isMessageValid(msg *message.Message) bool {
+	if len(msg.Content) <= Message_Limit {
+		return true
+	} else {
+		return false
+	}
+}
+
+type GetMessageResponse struct {
+	Message string            `json:"message"`
+	Data    []message.Message `json:"data"`
+}
+
 // GetMessage godoc
 // @Summary      Get message
 // @Description  Get a message record to have a recipient to send a text to (requires JWT)
@@ -127,7 +146,7 @@ func (c *MessageHandler) GetMessage(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	if id != uuid.Nil {
-		fmt.Println("Checking with Id")
+		log.Println("Checking with Id")
 		if con, err := c.MessageStore.GetMessageByID(ctx, id); err == nil {
 			statusCode = http.StatusOK
 			resp.Message = "Successful"
@@ -137,8 +156,9 @@ func (c *MessageHandler) GetMessage(w http.ResponseWriter, r *http.Request) {
 			resp.Message = err.Error()
 		}
 	} else if userId != uuid.Nil {
-		fmt.Println("Checking with User Id")
+		log.Println("Checking with User Id")
 		if messages, err := c.MessageStore.GetAllMessages(ctx); err == nil {
+			log.Println("Amount of messages:", len(messages))
 			for _, msg := range messages {
 				if msg.UserId == userId {
 					resp.Data = append(resp.Data, *msg)

internal/handler/message_event_response.go

@@ -0,0 +1,88 @@
+package handler
+
+import (
+	"net/http"
+	"time"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"git.kundeng.us/phoenix/textsender-models/tx0/types"
+	"github.com/google/uuid"
+
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
+	"git.kundeng.us/phoenix/textsender-api/internal/store"
+)
+
+type EventResponseHandler struct {
+	App                       *app.App
+	MessageEventResponseStore store.MessageEventResponseStore
+}
+
+func NewEventResponseHandler(apiApp *app.App, str store.MessageEventResponseStore) *EventResponseHandler {
+	return &EventResponseHandler{App: apiApp, MessageEventResponseStore: str}
+}
+
+type RecordEventRequest struct {
+	ScheduledMessageEventId uuid.UUID   `json:"scheduled_message_event_id"`
+	Response                types.JSONB `json:"response"`
+	UserId                  uuid.UUID   `json:"user_id"`
+	Sent                    *time.Time  `json:"sent,omitempty"`
+	Status                  string      `json:"status"`
+	ContactId               *uuid.UUID  `json:"contact_id"`
+	MessageId               *uuid.UUID  `json:"message_id"`
+}
+
+type RecordEventResponse struct {
+	Message string                          `json:"message"`
+	Data    []*message.MessageEventResponse `json:"data"`
+}
+
+func (e *EventResponseHandler) RecordResponse(w http.ResponseWriter, r *http.Request) {
+	var req RecordEventRequest
+	if err := ExtractFromRequest(r, &req); err != nil {
+		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
+	}
+	defer r.Body.Close()
+
+	var statusCode int
+	var rp message.MessageEventResponse
+	var resp RecordEventResponse
+
+	if req.Sent == nil {
+		statusCode = http.StatusBadRequest
+		resp.Message = "Sent time is empty"
+	} else if req.UserId == uuid.Nil {
+		statusCode = http.StatusBadRequest
+		resp.Message = "User Id is empty"
+	} else if len(req.Response) == 0 {
+		statusCode = http.StatusBadRequest
+		resp.Message = "Response is empty"
+	} else if req.ScheduledMessageEventId == uuid.Nil {
+		statusCode = http.StatusBadRequest
+		resp.Message = "Scheduled message event Id is empty"
+	} else {
+		rp.ScheduledMessageEventId = req.ScheduledMessageEventId
+		rp.Response = req.Response
+		rp.UserId = req.UserId
+		rp.Sent = *req.Sent
+
+		if req.Status == message.Message_Event_Response_Status_Instant {
+			rp.Status = req.Status
+			rp.MessageId = req.MessageId
+			rp.ContactId = req.ContactId
+		} else if req.Status == message.Message_Event_Response_Status_Scheduled {
+			rp.Status = req.Status
+		}
+
+		ctx := r.Context()
+		if err := e.MessageEventResponseStore.Create(ctx, &rp); err != nil {
+			resp.Message = err.Error()
+			statusCode = http.StatusInternalServerError
+		} else {
+			statusCode = http.StatusCreated
+			resp.Message = "Successful"
+			resp.Data = append(resp.Data, &rp)
+		}
+	}
+
+	RespondWithJSON(w, statusCode, &resp)
+}

internal/handler/message_event_response_test.go

@@ -0,0 +1,84 @@
+package handler
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+
+	"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
+	"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
+)
+
+func TestRecordMessageEventResponseWithMock(t *testing.T) {
+	now := time.Now()
+
+	mockStore := mock.NewMockScheduledMessageEventStore()
+	contactStore := mock.NewMockContactStore()
+	messageStore := mock.NewMockMessageStore()
+	schMsgStore := mock.NewMockScheduledMessageStore()
+	merStore := mock.NewMockMessageEventResponseStore()
+
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewEventResponseHandler(apiApp, merStore)
+
+	recipientId := uuid.New()
+	messageId := uuid.New()
+	scheduledMessageId := uuid.New()
+	testUserId := uuid.New()
+
+	con := testContact(recipientId, testUserId)
+	msg := testMessage(messageId, testUserId)
+	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
+	event := scheduling.ScheduledMessageEvent{}
+
+	ctx := t.Context()
+
+	if err := contactStore.CreateContact(ctx, &con); err != nil {
+		assert.NoError(t, err, "Error creating contact: %v", err)
+	} else if err = messageStore.CreateMessage(ctx, &msg); err != nil {
+		assert.NoError(t, err, "Error creating message: %v", err)
+	} else if err = schMsgStore.CreateScheduledMessage(ctx, &schMsg); err != nil {
+		assert.NoError(t, err, "Error creating scheduled message: %v", err)
+	}
+
+	event.MessageId = msg.Id
+	event.RecipientId = *con.Id
+	event.ScheduledMessageId = schMsg.Id
+	if err := mockStore.CreateScheduledMessageEvent(ctx, &event); err != nil {
+		assert.NoError(t, err, "Error creating scheduled message event: %v", err)
+	}
+
+	sent := now.Add(30 * time.Minute)
+	bytes := []byte("{\"body\":\"Whoknows?\",\"num_segments\":\"0\",\"direction\":\"outbound-api\",\"from\":\"+12243026041\",\"to\":\"+16303831708\",\"date_updated\":\"Sat,29Nov202519:06:59+0000\",\"uri\":\"/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SM1193a529e7f7a840667cd1e0f13ea95a.json\",\"account_sid\":\"ACefa1ef516314c9d1a68cbd657de49277\",\"num_media\":\"0\",\"status\":\"scheduled\",\"messaging_service_sid\":\"MG803f3676706b92eb02e18dd820c447f2\",\"sid\":\"SM1193a529e7f7a840667cd1e0f13ea95a\",\"date_created\":\"Sat,29Nov202519:06:59+0000\",\"api_version\":\"2010-04-01\",\"subresource_uris\":{\"media\":\"/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SM1193a529e7f7a840667cd1e0f13ea95a/Media.json\"}}")
+
+	testReq := RecordEventRequest{ScheduledMessageEventId: event.Id, Response: bytes, UserId: schMsg.UserId, Sent: &sent, Status: message.Message_Event_Response_Status_Scheduled}
+	jsonValue, _ := json.Marshal(testReq)
+
+	req, _ := http.NewRequest("POST", endpoint.RecordEventResponse, strings.NewReader(string(jsonValue)))
+	rr := httptest.NewRecorder()
+
+	handler.RecordResponse(rr, req)
+
+	assert.Equal(t, http.StatusCreated, rr.Code)
+
+	var response RecordEventResponse
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
+	assert.NoError(t, err, "Error parsing message event response:%v", err)
+
+	assert.NotEmpty(t, response.Data, "No message event response created")
+
+	var msgEventResp message.MessageEventResponse
+	msgEventResp = *response.Data[0]
+
+	assert.NotEmpty(t, msgEventResp.Response, "The response of the message event response is empty")
+	assert.Equal(t, msgEventResp.Response, testReq.Response, "Responses do not match")
+}

internal/handler/message_test.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 
@@ -23,7 +23,9 @@ type CreateMessageRequest struct {
 
 func TestCreateMessageWithMock(t *testing.T) {
 	mockStore := mock.NewMockMessageStore()
-	handler := NewMessageHandler(mockStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewMessageHandler(apiApp, mockStore)
 
 	testUserId := uuid.New()
 	testBody := CreateMessageRequest{Content: "Who could tell?", UserId: testUserId}
@@ -37,7 +39,7 @@ func TestCreateMessageWithMock(t *testing.T) {
 	assert.Equal(t, http.StatusCreated, rr.Code)
 
 	var response AddMessageResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error Creating message %v", err)
 
 	assert.NotEmpty(t, response.Data, "No Message created")
@@ -60,13 +62,15 @@ func TestGetMessageWithMock(t *testing.T) {
 	req, _ := http.NewRequest("GET", url, nil)
 	rr := httptest.NewRecorder()
 
-	messageHandler := NewMessageHandler(mockstore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	messageHandler := NewMessageHandler(apiApp, mockstore)
 	messageHandler.GetMessage(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response GetMessageResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error getting message %v", err)
 
 	assert.NotEmpty(t, response.Data, "No Message retrieved")

internal/handler/schedule_message_status.go

@@ -3,10 +3,11 @@ package handler
 import (
 	"net/http"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/store"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type RequestScheduledMessageStatus struct {
@@ -25,12 +26,13 @@ type ScheduledMessageStatusResponse struct {
 }
 
 type ScheduledMessageStatusHandler struct {
+	App                        *app.App
 	ScheduledMessageEventStore store.ScheduledMessageEventStore
 	ScheduledMessageStore      store.ScheduledMessageStore
 }
 
-func NewScheduledMessageStatusHandler(str store.ScheduledMessageEventStore, schStore store.ScheduledMessageStore) *ScheduledMessageStatusHandler {
+func NewScheduledMessageStatusHandler(apiApp *app.App, str store.ScheduledMessageEventStore, schStore store.ScheduledMessageStore) *ScheduledMessageStatusHandler {
-	return &ScheduledMessageStatusHandler{ScheduledMessageEventStore: str, ScheduledMessageStore: schStore}
+	return &ScheduledMessageStatusHandler{App: apiApp, ScheduledMessageEventStore: str, ScheduledMessageStore: schStore}
 }
 
 // UpdateStatus godoc

internal/handler/schedule_message_status_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 
@@ -32,7 +32,7 @@ func TestUpdateScheduledMessageStatusWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
@@ -55,13 +55,15 @@ func TestUpdateScheduledMessageStatusWithMock(t *testing.T) {
 	req, _ := http.NewRequest("PATCH", endpoint.UpdateScheduledMessageStatusEndpoint, jsonBody)
 	rr := httptest.NewRecorder()
 
-	handler := NewScheduledMessageStatusHandler(schMsgEventStore, schMsgStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageStatusHandler(apiApp, schMsgEventStore, schMsgStore)
 	handler.UpdateStatus(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response ScheduledMessageStatusResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error creating event %v", err)
 
 	assert.NotEmpty(t, response.Data, "Data should not be empty")

internal/handler/scheduled_message.go

@@ -6,10 +6,11 @@ import (
 	"strings"
 	"time"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/store"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type RequestAddScheduledMessage struct {
@@ -34,11 +35,12 @@ type FetchNextMessageResponse struct {
 }
 
 type ScheduledMessageHandler struct {
+	App                   *app.App
 	ScheduledMessageStore store.ScheduledMessageStore
 }
 
-func NewScheduledMessageHandler(str store.ScheduledMessageStore) *ScheduledMessageHandler {
+func NewScheduledMessageHandler(apiApp *app.App, str store.ScheduledMessageStore) *ScheduledMessageHandler {
-	return &ScheduledMessageHandler{ScheduledMessageStore: str}
+	return &ScheduledMessageHandler{App: apiApp, ScheduledMessageStore: str}
 }
 
 // AddScheduledMessage godoc

internal/handler/scheduled_message_event.go

@@ -4,11 +4,12 @@ import (
 	"net/http"
 	"strings"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 
+	"git.kundeng.us/phoenix/textsender-api/internal/app"
 	"git.kundeng.us/phoenix/textsender-api/internal/store"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type RequestAddScheduledMessageEvent struct {
@@ -33,12 +34,13 @@ type DeleteScheduledMessageEventResponse struct {
 }
 
 type ScheduledMessageEventHandler struct {
+	App                        *app.App
 	ScheduledMessageEventStore store.ScheduledMessageEventStore
 	ScheduledMessageStore      store.ScheduledMessageStore
 }
 
-func NewScheduledMessageEventHandler(str store.ScheduledMessageEventStore, schStore store.ScheduledMessageStore) *ScheduledMessageEventHandler {
+func NewScheduledMessageEventHandler(apiApp *app.App, str store.ScheduledMessageEventStore, schStore store.ScheduledMessageStore) *ScheduledMessageEventHandler {
-	return &ScheduledMessageEventHandler{ScheduledMessageEventStore: str, ScheduledMessageStore: schStore}
+	return &ScheduledMessageEventHandler{App: apiApp, ScheduledMessageEventStore: str, ScheduledMessageStore: schStore}
 }
 
 // AddContact godoc

internal/handler/scheduled_message_event_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 
@@ -40,7 +40,9 @@ func TestCreateScheduledMessageEventWithMock(t *testing.T) {
 	messageStore := mock.NewMockMessageStore()
 	schMsgStore := mock.NewMockScheduledMessageStore()
 
-	handler := NewScheduledMessageEventHandler(mockStore, schMsgStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageEventHandler(apiApp, mockStore, schMsgStore)
 
 	recipientId := uuid.New()
 	messageId := uuid.New()
@@ -72,7 +74,7 @@ func TestCreateScheduledMessageEventWithMock(t *testing.T) {
 	assert.Equal(t, http.StatusCreated, rr.Code)
 
 	var response AddScheduledMessageEventResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error creating event %v", err)
 
 	assert.NotEmpty(t, response.Data, "No event created")
@@ -90,7 +92,9 @@ func TestGetScheduledMessageEventWithMock(t *testing.T) {
 	messageStore := mock.NewMockMessageStore()
 	schMsgStore := mock.NewMockScheduledMessageStore()
 	schMsgEventStore := mock.NewMockScheduledMessageEventStore()
-	handler := NewScheduledMessageEventHandler(schMsgEventStore, schMsgStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageEventHandler(apiApp, schMsgEventStore, schMsgStore)
 
 	recipientId := uuid.New()
 	messageId := uuid.New()
@@ -100,7 +104,7 @@ func TestGetScheduledMessageEventWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
@@ -123,7 +127,7 @@ func TestGetScheduledMessageEventWithMock(t *testing.T) {
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response GetScheduledMessageEventResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error creating event %v", err)
 
 	assert.NotEmpty(t, response.Data, "No event created")
@@ -139,12 +143,14 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
 	messageStore := mock.NewMockMessageStore()
 	schMsgStore := mock.NewMockScheduledMessageStore()
 	schMsgEventStore := mock.NewMockScheduledMessageEventStore()
-	handler := NewScheduledMessageEventHandler(schMsgEventStore, schMsgStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageEventHandler(apiApp, schMsgEventStore, schMsgStore)
 
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
@@ -167,7 +173,7 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response DeleteScheduledMessageEventResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error creating event %v", err)
 
 	assert.NotEmpty(t, response.Data, "No event created")
@@ -179,9 +185,10 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
 
 func testContact(id uuid.UUID, userId uuid.UUID) contact.Contact {
 	if id == uuid.Nil {
-		return contact.Contact{Id: uuid.New(), PhoneNumber: "+10123456789", UserId: userId}
+		id = uuid.New()
+		return contact.Contact{Id: &id, PhoneNumber: "+10123456789", UserId: &userId}
 	} else {
-		return contact.Contact{Id: id, PhoneNumber: "+10123456789", UserId: userId}
+		return contact.Contact{Id: &id, PhoneNumber: "+10123456789", UserId: &userId}
 	}
 }
 

internal/handler/scheduled_message_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 
@@ -26,7 +26,9 @@ type CreateScheduledMessageRequest struct {
 func TestCreateScheduledMessageWithMock(t *testing.T) {
 	now := time.Now()
 	mockStore := mock.NewMockScheduledMessageStore()
-	handler := NewScheduledMessageHandler(mockStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageHandler(apiApp, mockStore)
 
 	testUserId := uuid.New()
 	testBody := testCreateScheduledMessageRequest(testUserId, now)
@@ -40,7 +42,7 @@ func TestCreateScheduledMessageWithMock(t *testing.T) {
 	assert.Equal(t, http.StatusCreated, rr.Code)
 
 	var response AddScheduledMessageResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error Creating message %v", err)
 
 	assert.NotEmpty(t, response.Data, "No Message created")
@@ -68,13 +70,15 @@ func TestGetScheduledMessageWithMock(t *testing.T) {
 	req, _ := http.NewRequest("GET", url, nil)
 	rr := httptest.NewRecorder()
 
-	handler := NewScheduledMessageHandler(mockStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageHandler(apiApp, mockStore)
 	handler.GetScheduledMessage(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response GetScheduledMessageResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error parsing response %v", err)
 }
 
@@ -93,7 +97,7 @@ func TestFetchScheduledMessageWithMock(t *testing.T) {
 	con := testContact(recipientId, testUserId)
 	msg := testMessage(messageId, testUserId)
 	schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
-	event := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
+	event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
 
 	ctx := t.Context()
 
@@ -114,13 +118,15 @@ func TestFetchScheduledMessageWithMock(t *testing.T) {
 	req, _ := http.NewRequest("GET", endpoint.FetchNextScheduledMessageEndpoint, nil)
 	rr := httptest.NewRecorder()
 
-	handler := NewScheduledMessageHandler(mockStore)
+	apiApp, err := GetApp()
+	assert.NoError(t, err, "Error getting app")
+	handler := NewScheduledMessageHandler(apiApp, mockStore)
 	handler.FetchNextMessage(rr, req)
 
 	assert.Equal(t, http.StatusOK, rr.Code)
 
 	var response FetchNextMessageResponse
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err, "Error fetching scheduled message: %v", err)
 
 	assert.NotEmpty(t, response.Data, "No data")

internal/services/jwt_service.go

@@ -3,10 +3,9 @@ package services
 import (
 	"time"
 
+	txtmodels_token "git.kundeng.us/phoenix/textsender-models/tx0/token"
+	txtmodels_user "git.kundeng.us/phoenix/textsender-models/tx0/user"
 	"github.com/golang-jwt/jwt/v5"
-
-	txtmodels_token "git.kundeng.us/phoenix/textsender-models/pkg/token"
-	txtmodels_user "git.kundeng.us/phoenix/textsender-models/pkg/user"
 )
 
 type JWTService struct {

internal/store/contact_store.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
 )
 
 type ContactStore interface {

internal/store/message_event_response_store.go

@@ -0,0 +1,36 @@
+package store
+
+import (
+	"context"
+	"fmt"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+type MessageEventResponseStore interface {
+	Create(ctx context.Context, mer *message.MessageEventResponse) error
+}
+
+type PGMessageEventResponseStore struct {
+	db *pgxpool.Pool
+}
+
+func NewMessageEventResponseStore(db *pgxpool.Pool) *PGMessageEventResponseStore {
+	return &PGMessageEventResponseStore{db: db}
+}
+
+func (m *PGMessageEventResponseStore) Create(ctx context.Context, mer *message.MessageEventResponse) error {
+	var query string
+	queryBase := "INSERT INTO message_event_responses"
+	queryReturn := "RETURNING id"
+
+	if mer.ScheduledMessageEventId == uuid.Nil {
+		query = fmt.Sprintf("%s (response, user_id, sent, contact_id, message_id) VALUES ($1, $2, $3, $4, $5) %s", queryBase, queryReturn)
+		return m.db.QueryRow(ctx, query, mer.Response, mer.UserId, mer.Sent, mer.ContactId, mer.MessageId).Scan(&mer.Id)
+	} else {
+		query = fmt.Sprintf("%s (scheduled_message_event_id, response, user_id, sent, contact_id, message_id) VALUES ($1, $2, $3, $4, $5, $6) %s", queryBase, queryReturn)
+		return m.db.QueryRow(ctx, query, mer.ScheduledMessageEventId, mer.Response, mer.UserId, mer.Sent, mer.ContactId, mer.MessageId).Scan(&mer.Id)
+	}
+}

internal/store/message_store.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
 )
 
 type MessageStore interface {

internal/store/mock/contact_store.go

@@ -5,10 +5,8 @@ import (
 	"errors"
 	"sync"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
 	"github.com/google/uuid"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
-	"git.kundeng.us/phoenix/textsender-models/pkg/message"
 )
 
 type Key struct {
@@ -38,16 +36,18 @@ func (m *MockContactStore) CreateContact(ctx context.Context, con *contact.Conta
 		return m.Error
 	}
 
-	if con.Id == uuid.Nil {
+	var id uuid.UUID
-		con.Id = uuid.New()
+	if con.Id == nil {
+		id = uuid.New()
+		con.Id = &id
 	}
 
-	key := Key{PhoneNumber: con.PhoneNumber, UserId: con.UserId}
+	key := Key{PhoneNumber: con.PhoneNumber, UserId: *con.UserId}
 	if _, exists := m.ContactsByKey[key]; exists {
 		return errors.New("Contact with phone number already exists")
 	}
 
-	m.Contacts[con.Id] = con
+	m.Contacts[*con.Id] = con
 	m.ContactsByKey[key] = con
 	return nil
 }
@@ -116,87 +116,3 @@ func (m *MockContactStore) ContactExists(ctx context.Context, phoneNumber string
 
 	return exists, nil
 }
-
-type MessageKey struct {
-	Content string
-	UserId  uuid.UUID
-}
-
-type MockMessageStore struct {
-	Messages      map[uuid.UUID]*message.Message
-	MessagesByKey map[MessageKey]*message.Message
-	mu            sync.RWMutex
-	Error         error // Optional: simulate errors
-}
-
-func NewMockMessageStore() *MockMessageStore {
-	return &MockMessageStore{
-		Messages:      make(map[uuid.UUID]*message.Message),
-		MessagesByKey: make(map[MessageKey]*message.Message),
-	}
-}
-
-func (m *MockMessageStore) CreateMessage(ctx context.Context, msg *message.Message) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return m.Error
-	}
-
-	if msg.Id == uuid.Nil {
-		msg.Id = uuid.New()
-	}
-
-	key := MessageKey{Content: msg.Content, UserId: msg.UserId}
-	if _, exists := m.MessagesByKey[key]; exists {
-		return errors.New("Message already exists")
-	}
-
-	m.Messages[msg.Id] = msg
-	m.MessagesByKey[key] = msg
-	return nil
-}
-
-func (m *MockMessageStore) GetAllMessages(ctx context.Context) ([]*message.Message, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	var msgs []*message.Message
-
-	for _, msg := range m.Messages {
-		msgs = append(msgs, msg)
-	}
-
-	return msgs, nil
-}
-
-func (m *MockMessageStore) GetMessageByID(ctx context.Context, id uuid.UUID) (*message.Message, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return nil, m.Error
-	}
-
-	msg := m.Messages[id]
-
-	return msg, nil
-}
-
-func (m *MockMessageStore) MessageExists(ctx context.Context, msg *message.Message) (bool, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.Error != nil {
-		return false, m.Error
-	}
-
-	_, exists := m.MessagesByKey[MessageKey{Content: msg.Content, UserId: msg.UserId}]
-
-	return exists, nil
-}

internal/store/mock/message_event_response_store.go

@@ -0,0 +1,62 @@
+package mock
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"time"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"github.com/google/uuid"
+)
+
+type MessageEventResponseKey struct {
+	ScheduledMessageEventId uuid.UUID
+	UserId                  uuid.UUID
+}
+type MockMessageEventResponseStore struct {
+	MessageEventResponses      map[uuid.UUID]*message.MessageEventResponse
+	MessageEventResponsesByKey map[MessageEventResponseKey]*message.MessageEventResponse
+	mu                         sync.RWMutex
+	Error                      error
+}
+
+func NewMockMessageEventResponseStore() *MockMessageEventResponseStore {
+	return &MockMessageEventResponseStore{
+		MessageEventResponses:      make(map[uuid.UUID]*message.MessageEventResponse),
+		MessageEventResponsesByKey: make(map[MessageEventResponseKey]*message.MessageEventResponse),
+	}
+}
+
+func (m *MockMessageEventResponseStore) Create(ctx context.Context, mer *message.MessageEventResponse) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return m.Error
+	}
+
+	if mer.Id == uuid.Nil {
+		mer.Id = uuid.New()
+	}
+
+	if len(mer.Response) == 0 {
+		return fmt.Errorf("Response is empty")
+	} else if mer.UserId == uuid.Nil {
+		return fmt.Errorf("User Id is nil")
+	} else {
+		key := MessageEventResponseKey{ScheduledMessageEventId: mer.ScheduledMessageEventId, UserId: mer.UserId}
+		if mer.ScheduledMessageEventId == uuid.Nil {
+			key.ScheduledMessageEventId = uuid.Nil
+		} else {
+			key.ScheduledMessageEventId = mer.ScheduledMessageEventId
+		}
+		sent := time.Now()
+		mer.Sent = sent
+
+		m.MessageEventResponses[mer.Id] = mer
+		m.MessageEventResponsesByKey[key] = mer
+
+		return nil
+	}
+}

internal/store/mock/scheduled_message_event_store.go

@@ -6,9 +6,8 @@ import (
 	"sync"
 	"time"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type ScheduledMessageEventKey struct {

internal/store/mock/scheduled_message_store.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"sync"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type ScheduledMessageKey struct {

internal/store/mock/store.go

@@ -0,0 +1,94 @@
+package mock
+
+import (
+	"context"
+	"errors"
+	"sync"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/message"
+	"github.com/google/uuid"
+)
+
+type MessageKey struct {
+	Content string
+	UserId  uuid.UUID
+}
+
+type MockMessageStore struct {
+	Messages      map[uuid.UUID]*message.Message
+	MessagesByKey map[MessageKey]*message.Message
+	mu            sync.RWMutex
+	Error         error // Optional: simulate errors
+}
+
+func NewMockMessageStore() *MockMessageStore {
+	return &MockMessageStore{
+		Messages:      make(map[uuid.UUID]*message.Message),
+		MessagesByKey: make(map[MessageKey]*message.Message),
+	}
+}
+
+func (m *MockMessageStore) CreateMessage(ctx context.Context, msg *message.Message) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return m.Error
+	}
+
+	if msg.Id == uuid.Nil {
+		msg.Id = uuid.New()
+	}
+
+	key := MessageKey{Content: msg.Content, UserId: msg.UserId}
+	if _, exists := m.MessagesByKey[key]; exists {
+		return errors.New("Message already exists")
+	}
+
+	m.Messages[msg.Id] = msg
+	m.MessagesByKey[key] = msg
+	return nil
+}
+
+func (m *MockMessageStore) GetAllMessages(ctx context.Context) ([]*message.Message, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return nil, m.Error
+	}
+
+	var msgs []*message.Message
+
+	for _, msg := range m.Messages {
+		msgs = append(msgs, msg)
+	}
+
+	return msgs, nil
+}
+
+func (m *MockMessageStore) GetMessageByID(ctx context.Context, id uuid.UUID) (*message.Message, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return nil, m.Error
+	}
+
+	msg := m.Messages[id]
+
+	return msg, nil
+}
+
+func (m *MockMessageStore) MessageExists(ctx context.Context, msg *message.Message) (bool, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return false, m.Error
+	}
+
+	_, exists := m.MessagesByKey[MessageKey{Content: msg.Content, UserId: msg.UserId}]
+
+	return exists, nil
+}

internal/store/scheduled_message_event_store.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type ScheduledMessageEventStore interface {

internal/store/scheduled_message_store.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
 )
 
 type ScheduledMessageStore interface {

migrations/schema.sql

@@ -1,6 +1,10 @@
 CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 
 DROP TABLE IF EXISTS contacts CASCADE;
+DROP TABLE IF EXISTS messages CASCADE;
+DROP TABLE IF EXISTS scheduled_messages CASCADE;
+DROP TABLE IF EXISTS scheduled_message_events CASCADE;
+DROP TABLE IF EXISTS message_event_responses CASCADE;
 
 CREATE TABLE IF NOT EXISTS contacts (
     id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
@@ -28,4 +32,15 @@ CREATE TABLE IF NOT EXISTS scheduled_message_events (
     message_id UUID NOT NULL,
     scheduled_message_id UUID NOT NULL,
     created timestamptz DEFAULT now()
-)
+);
+
+CREATE TABLE IF NOT EXISTS message_event_responses (
+    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    scheduled_message_event_id UUID NULL,
+    response JSONB NOT NULL,
+    user_id UUID NOT NULL,
+    sent timestamptz NOT NULL,
+    contact_id UUID NULL,
+    message_id UUID NULL,
+    status TEXT CHECK (status IN ('INSTANT', 'SCHEDULED'))
+);