From a8466334d9e179dbcf5bf455cb559303e52190ef Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 20 Jun 2026 23:19:28 -0400 Subject: [PATCH] Removing go files --- .dockerignore.yaml | 6 - Dockerfile | 46 ----- Makefile | 22 --- README.md | 8 - cmd/catapult/main.go | 39 ---- docker-compose.taml | 11 -- go.mod | 17 -- go.sum | 49 ----- internal/app/app.go | 81 --------- internal/config/version.go | 12 -- internal/service/auth.go | 98 ---------- internal/service/contact.go | 58 ------ internal/service/core/service.go | 187 -------------------- internal/service/message.go | 58 ------ internal/service/message_event_response.go | 58 ------ internal/service/queue.go | 54 ------ internal/service/scheduled_message_event.go | 58 ------ internal/service/scheduler.go | 69 -------- internal/version/version.go | 17 -- 19 files changed, 948 deletions(-) delete mode 100644 .dockerignore.yaml delete mode 100644 Dockerfile delete mode 100644 Makefile delete mode 100644 README.md delete mode 100644 cmd/catapult/main.go delete mode 100644 docker-compose.taml delete mode 100644 go.mod delete mode 100644 go.sum delete mode 100644 internal/app/app.go delete mode 100644 internal/config/version.go delete mode 100644 internal/service/auth.go delete mode 100644 internal/service/contact.go delete mode 100644 internal/service/core/service.go delete mode 100644 internal/service/message.go delete mode 100644 internal/service/message_event_response.go delete mode 100644 internal/service/queue.go delete mode 100644 internal/service/scheduled_message_event.go delete mode 100644 internal/service/scheduler.go delete mode 100644 internal/version/version.go diff --git a/.dockerignore.yaml b/.dockerignore.yaml deleted file mode 100644 index fb2ce37..0000000 --- a/.dockerignore.yaml +++ /dev/null @@ -1,6 +0,0 @@ -vendor/ - -.git/ -.gitea/ - -.env diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8effff8..0000000 --- a/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM golang:1.26.2 AS builder - -WORKDIR /app - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - openssh-client git - -RUN mkdir -p -m 0700 ~/.ssh && \ - ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts - -# Configure Git to use SSH for GitHub -RUN git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/" && \ - git config --global url."git@git.kundeng.us:".insteadOf "http://git.kundeng.us/" - -# Set up the Go environment for private modules -ENV GOPRIVATE=git.kundeng.us - -# Copy go mod and sum files -COPY go.mod go.sum ./ - -RUN --mount=type=ssh mkdir src && \ - go mod download - -# Copy source code -COPY ./cmd ./cmd -COPY ./internal ./internal -COPY ./Makefile . -COPY ./.env . - -# Build the application -RUN CGO_ENABLED=0 GOOS=linux make build - -# Runtime stage -FROM alpine:latest AS production - -RUN apk --no-cache add ca-certificates - -WORKDIR /root/ - -# Copy the pre-built binary file from the previous stage -COPY --from=builder /app/catapult . -COPY --from=builder /app/.env ./ - -# Command to run the executable -CMD ["./catapult"] diff --git a/Makefile b/Makefile deleted file mode 100644 index a189b6c..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -VERSION ?= $(shell git describe --tags 2>/dev/null || echo "dev") -COMMIT ?= $(shell git rev-parse --short HEAD) -BUILD_TIME ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ) -GO_VERSION ?= $(shell go version | awk '{print $$3}') - -.PHONY: build -build: - go build -ldflags="\ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.GoVersion=$(GO_VERSION)'" \ - -o catapult cmd/catapult/main.go - -.PHONY: install -install: - go install -ldflags="\ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.GoVersion=$(GO_VERSION)'" - -o catapult cmd/catapult/main.go diff --git a/README.md b/README.md deleted file mode 100644 index cd19078..0000000 --- a/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Catapult -A service used to send text messages - - -Building the service -``` -make build -``` diff --git a/cmd/catapult/main.go b/cmd/catapult/main.go deleted file mode 100644 index f5cb847..0000000 --- a/cmd/catapult/main.go +++ /dev/null @@ -1,39 +0,0 @@ -package main - -import ( - "fmt" - "log" - "os" - "os/signal" - "syscall" - - "git.kundeng.us/phoenix/catapult/internal/app" - "git.kundeng.us/phoenix/catapult/internal/config" - "git.kundeng.us/phoenix/catapult/internal/service/core" - "git.kundeng.us/phoenix/catapult/internal/version" -) - -func main() { - log.Println(app.App_Name) - - versionFlag := config.CheckVersionFlag() - if *versionFlag { - fmt.Println(version.String()) - return - } - - myApp, err := app.Load() - if err != nil { - log.Println("Error loading app: %w", err) - return - } - - service := core.NewService(myApp) - sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) - - service.Start() - - <-sigChan - service.Stop() -} diff --git a/docker-compose.taml b/docker-compose.taml deleted file mode 100644 index 40c3e93..0000000 --- a/docker-compose.taml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3.8' # Use a recent version - -services: - catapult_service: - build: # Tells docker-compose to build the Dockerfile in the current directory - context: . - ssh: ["default"] # Uses host's SSH agent - container_name: catapult # Optional: Give the container a specific name - env_file: - - .env - restart: unless-stopped # Optional: Restart policy diff --git a/go.mod b/go.mod deleted file mode 100644 index dfbc149..0000000 --- a/go.mod +++ /dev/null @@ -1,17 +0,0 @@ -module git.kundeng.us/phoenix/catapult - -go 1.26.2 - -require ( - git.kundeng.us/phoenix/swoosh v0.2.1 - git.kundeng.us/phoenix/textsender-models v0.2.1 - github.com/google/uuid v1.6.0 - github.com/joho/godotenv v1.5.1 -) - -require ( - github.com/golang-jwt/jwt/v5 v5.3.1 // indirect - github.com/golang/mock v1.6.0 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/twilio/twilio-go v1.30.5 // indirect -) diff --git a/go.sum b/go.sum deleted file mode 100644 index 920c35b..0000000 --- a/go.sum +++ /dev/null @@ -1,49 +0,0 @@ -git.kundeng.us/phoenix/swoosh v0.2.1 h1:mJ/zXBOqzi0YTrSm5kxvahzp2WH7lx4R3iIO0s9VFFI= -git.kundeng.us/phoenix/swoosh v0.2.1/go.mod h1:81XNzmTmDPuDPmXMUmKTLErNSKKBM+hsW5U60Lm78ww= -git.kundeng.us/phoenix/textsender-models v0.2.1 h1:21br4NF58aUFuCx8laKxC5RvZMl4GsSIaMX4bvf5plw= -git.kundeng.us/phoenix/textsender-models v0.2.1/go.mod h1:nu5QWy9o+spx/t9NFipaGmF5qiBJS/0QhxyCjoi3Z3E= -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/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= -github.com/golang-jwt/jwt/v5 v5.3.1/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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -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/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/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/twilio/twilio-go v1.30.5 h1:hi6+2kMte29zrFBsw7VSSNtbF30GPMGz/4LRIUgXng8= -github.com/twilio/twilio-go v1.30.5/go.mod h1:QbitvbvtkV77Jn4BABAKVmxabYSjMyQG4tHey9gfPqg= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -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/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/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/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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/app/app.go b/internal/app/app.go deleted file mode 100644 index 10e27aa..0000000 --- a/internal/app/app.go +++ /dev/null @@ -1,81 +0,0 @@ -package app - -import ( - "fmt" - "os" - "path" - - auxcfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary" - "github.com/joho/godotenv" -) - -const App_Name = "catapult" - -type App struct { - ApiUrl string - AuthUrl string - ServiceUsername string - ServicePassphrase string - TwilioConfig *auxcfg.TwilioConfig -} - -func Load() (*App, error) { - err := godotenv.Load() - if err != nil { - cwd, _ := os.Getwd() - envPath := path.Join(cwd, "../..", ".env") - if err = godotenv.Load(envPath); err != nil { - prevPath := path.Join(envPath, "../..", ".env") - if err = godotenv.Load(prevPath); err != nil { - return nil, fmt.Errorf("Error loading .env file: %w", err) - } - } - } - - apiUrl := os.Getenv("API_URL") - authUrl := os.Getenv("AUTH_URL") - serviceUsername := os.Getenv("SERVICE_USERNAME") - servicePassphrase := os.Getenv("SERVICE_PASSPHRASE") - - if len(apiUrl) == 0 { - return nil, fmt.Errorf("Api Url not provided") - } else if len(authUrl) == 0 { - return nil, fmt.Errorf("Auth url not provided") - } else if len(serviceUsername) == 0 { - return nil, fmt.Errorf("Service username not provided") - } else if len(servicePassphrase) == 0 { - return nil, fmt.Errorf("Service passphrase not provided") - } else { - if cfg, err := loadTwilioConfig(); err != nil { - return nil, err - } else { - return &App{ - ApiUrl: apiUrl, AuthUrl: authUrl, ServiceUsername: serviceUsername, ServicePassphrase: servicePassphrase, TwilioConfig: cfg, - }, nil - } - } -} - -func loadTwilioConfig() (*auxcfg.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 auth sid not provided") - } else if len(serviceSid) == 0 { - return nil, fmt.Errorf("Twilio config service sid not provided") - } else if len(authToken) == 0 { - return nil, fmt.Errorf("Twilio config token not provided") - } else if len(phoneNumber) == 0 { - return nil, fmt.Errorf("Twilio config phone number not provided") - } else { - cfg := auxcfg.TwilioConfig{} - cfg.AccountSID = authSid - cfg.AuthToken = authToken - cfg.ServiceSID = serviceSid - cfg.Number = phoneNumber - return &cfg, nil - } -} diff --git a/internal/config/version.go b/internal/config/version.go deleted file mode 100644 index 81b9574..0000000 --- a/internal/config/version.go +++ /dev/null @@ -1,12 +0,0 @@ -package config - -import ( - "flag" -) - -func CheckVersionFlag() *bool { - versionFlag := flag.Bool("version", false, "Print version information") - flag.Parse() - - return versionFlag -} diff --git a/internal/service/auth.go b/internal/service/auth.go deleted file mode 100644 index ed128e6..0000000 --- a/internal/service/auth.go +++ /dev/null @@ -1,98 +0,0 @@ -package service - -import ( - "bytes" - "encoding/json" - "fmt" - "net/http" - "time" - - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Auth struct { - Application *app.App -} - -type service struct { - Username string `json:"username"` - Passphrase string `json:"passphrase"` -} - -type tokenResponse struct { - Message string `json:"message"` - Data []*token.Login `json:"data"` -} - -func (a *Auth) GetToken() (*token.Login, error) { - serv := service{ - Username: a.Application.ServiceUsername, - Passphrase: a.Application.ServicePassphrase, - } - - jsonData, err := json.Marshal(serv) - if err != nil { - return nil, err - } - resp, err := http.Post( - fmt.Sprintf("%s/api/v1/service/login", a.Application.AuthUrl), - "application/json", - bytes.NewBuffer(jsonData), - ) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r tokenResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } - - return r.Data[0], nil -} - -type refreshTokenRequest struct { - AccessToken string `json:"access_token"` -} - -func (a *Auth) GetRefreshToken(tok *token.Login) (*token.Login, error) { - req := refreshTokenRequest{AccessToken: tok.AccessToken} - - jsonData, err := json.Marshal(req) - if err != nil { - return nil, err - } - - resp, err := http.Post(fmt.Sprintf("%s/api/v1/token/refresh", a.Application.AuthUrl), "application/json", bytes.NewBuffer(jsonData)) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r tokenResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data[0], nil - } - } -} - -func (s *Auth) TokenExpired(tok *token.Login) bool { - now := time.Now() - expiredTime := time.Unix(tok.ExpiresIn, 0) - - if now.After(expiredTime) { - return true - } else { - return false - } -} diff --git a/internal/service/contact.go b/internal/service/contact.go deleted file mode 100644 index 988080e..0000000 --- a/internal/service/contact.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "net/url" - - "git.kundeng.us/phoenix/textsender-models/tx0/contact" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Contact struct { - Application *app.App - Token *token.Login -} - -type getContactResponse struct { - Message string `json:"message"` - Data []*contact.Contact `json:"data"` -} - -func (c *Contact) GetContact(id uuid.UUID) (*contact.Contact, error) { - params := url.Values{} - params.Add("id", id.String()) - pm := params.Encode() - fullUrl := fmt.Sprintf("%s/api/v1/contact?%s", c.Application.ApiUrl, pm) - fmt.Println("Url:", fullUrl) - req, err := http.NewRequest("GET", fullUrl, nil) - if err != nil { - return nil, err - } - - token := c.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r getContactResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data[0], nil - } - } -} diff --git a/internal/service/core/service.go b/internal/service/core/service.go deleted file mode 100644 index ac59b56..0000000 --- a/internal/service/core/service.go +++ /dev/null @@ -1,187 +0,0 @@ -package core - -import ( - "context" - "log" - "sync" - "time" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" - "git.kundeng.us/phoenix/catapult/internal/service" -) - -type Service struct { - wg sync.WaitGroup - ctx context.Context - cancel context.CancelFunc - App *app.App - token *token.Login -} - -func NewService(application *app.App) *Service { - ctx, cancel := context.WithCancel(context.Background()) - return &Service{ - ctx: ctx, - cancel: cancel, - App: application, - } -} - -func (s *Service) Start() { - log.Println("Starting service...") - - // Start multiple background workers - s.wg.Add(3) - go s.worker1() - go s.worker2() - go s.healthChecker() -} - -func (s *Service) worker1() { - defer s.wg.Done() - - ticker := time.NewTicker(5 * time.Second) - defer ticker.Stop() - - for { - select { - case <-s.ctx.Done(): - log.Println("Worker 1 shutting down...") - return - case <-ticker.C: - // Do some work - now := time.Now() - log.Println("Worker 1: Processing...") - catapultAuth := service.Auth{Application: s.App} - if s.token == nil { - log.Println("Token has not been fetched") - log.Println("Fetching token") - if token, err := catapultAuth.GetToken(); err != nil { - log.Println("Error:", err) - } else { - log.Println("Token fetched") - s.token = token - } - } else if catapultAuth.TokenExpired(s.token) { - // Get refresh token - log.Println("Token expired") - log.Println("Fetching refresh token") - refreshToken, err := catapultAuth.GetRefreshToken(s.token) - if err != nil { - log.Println("Error getting refresh token:", err) - } else { - log.Println("Refresh token fetched") - s.token = refreshToken - } - } - - queue := service.Queue{Application: s.App, Token: s.token} - if item, exists, err := queue.GetQueue(); err != nil { - log.Println("Error:", err) - } else { - if *exists { - log.Println("Scheduled message Id:", item.Id) - log.Println("Created:", item.Created) - log.Println("Scheduled:", item.Scheduled) - log.Println("Status:", item.Status) - log.Println("User Id:", item.UserId) - if scheduledMessageValid(item, now) { - log.Println("Scheduled Message can be sent") - scheduler := service.Scheduler{Application: s.App, Token: s.token} - if events, err := scheduler.GetEvents(item.Id); err != nil { - log.Println("Error getting event:", err) - } else { - for _, event := range events { - if msg, err := scheduler.GetMessage(event.MessageId); err != nil { - log.Println("Error getting message:", err) - } else { - if c, err := scheduler.GetContact(event.ContactId); err != nil { - log.Println("Error getting contact:", err) - } else { - log.Println("Message Id:", msg.Id) - log.Println("Contact Id:", c.Id) - if res, resRaw, sent, err := scheduler.ScheduleMessage(*item, *event, *c, *msg); err != nil { - log.Println("Failure with scheduling the message:", err) - } else { - if res != nil { - if eventResponse, err := scheduler.RecordEventResponse(event, item.UserId, resRaw, sent); err != nil { - log.Println("Failure recording event response:", err) - } else { - if len(eventResponse) == 0 { - log.Println("No event responses") - } else { - eventResponse := eventResponse[0] - log.Println("Event response saved. Id:", eventResponse.Id) - } - } - } else { - log.Println("Result should not be empty") - } - } - } - } - } - } - } else { - log.Println("Invalid scheduled message") - } - } else { - log.Println("Empty queue") - } - } - } - } -} - -func (s *Service) worker2() { - defer s.wg.Done() - - ticker := time.NewTicker(10 * time.Second) - defer ticker.Stop() - - for { - select { - case <-s.ctx.Done(): - log.Println("Worker 2 shutting down...") - return - case <-ticker.C: - // Do some work - log.Println("Worker 2: Processing...") - } - } -} - -func (s *Service) healthChecker() { - defer s.wg.Done() - - ticker := time.NewTicker(30 * time.Second) - defer ticker.Stop() - - for { - select { - case <-s.ctx.Done(): - log.Println("Health checker shutting down...") - return - case <-ticker.C: - log.Println("Health check: Service is healthy") - } - } -} - -func (s *Service) Stop() { - log.Println("Shutting down service...") - s.cancel() - s.wg.Wait() - log.Println("Service stopped gracefully") -} - -func scheduledMessageValid(schMsg *scheduling.ScheduledMessage, now time.Time) bool { - if schMsg.Scheduled.Before(now) { - return false - } else { - return true - } -} diff --git a/internal/service/message.go b/internal/service/message.go deleted file mode 100644 index ed32e88..0000000 --- a/internal/service/message.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "net/url" - - "git.kundeng.us/phoenix/textsender-models/tx0/message" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Message struct { - Application *app.App - Token *token.Login -} - -type getMessageResponse struct { - Message string `json:"message"` - Data []*message.Message `json:"data"` -} - -func (m *Message) GetMessage(id uuid.UUID) (*message.Message, error) { - params := url.Values{} - params.Add("id", id.String()) - pm := params.Encode() - fullUrl := fmt.Sprintf("%s/api/v1/message?%s", m.Application.ApiUrl, pm) - fmt.Println("Url:", fullUrl) - req, err := http.NewRequest("GET", fullUrl, nil) - if err != nil { - return nil, err - } - - token := m.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r getMessageResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data[0], nil - } - } -} diff --git a/internal/service/message_event_response.go b/internal/service/message_event_response.go deleted file mode 100644 index c4a1c3f..0000000 --- a/internal/service/message_event_response.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "strings" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/event" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type MessageEventResponse struct { - Application *app.App - Token *token.Login -} - -type recordMessageEventResponse struct { - Message string `json:"message"` - Data []*event.MessageEventResponse `json:"data"` -} - -func (m *MessageEventResponse) RecordEventResponse(mer *event.MessageEventResponse) ([]*event.MessageEventResponse, error) { - fullUrl := fmt.Sprintf("%s/api/v1/schedule/message/event/response/record", m.Application.ApiUrl) - jsonData, err := json.Marshal(mer) - if err != nil { - return nil, err - } - - req, err := http.NewRequest("POST", fullUrl, strings.NewReader(string(jsonData))) - if err != nil { - return nil, err - } - - token := m.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r recordMessageEventResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data, nil - } - } -} diff --git a/internal/service/queue.go b/internal/service/queue.go deleted file mode 100644 index 13f60ea..0000000 --- a/internal/service/queue.go +++ /dev/null @@ -1,54 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Queue struct { - Application *app.App - Token *token.Login -} - -type queueResponse struct { - Message string `json:"message"` - Data []*scheduling.ScheduledMessage `json:"data"` -} - -func (q *Queue) GetQueue() (*scheduling.ScheduledMessage, *bool, error) { - req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/schedule/message/fetch", q.Application.ApiUrl), nil) - if err != nil { - return nil, nil, err - } - - token := q.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, nil, err - } - defer resp.Body.Close() - - var r queueResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, nil, err - } else { - var exists bool - if len(r.Data) == 0 { - exists = false - return nil, &exists, nil - } else { - exists = true - return r.Data[0], &exists, nil - } - } -} diff --git a/internal/service/scheduled_message_event.go b/internal/service/scheduled_message_event.go deleted file mode 100644 index a83f57c..0000000 --- a/internal/service/scheduled_message_event.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "net/url" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type ScheduledMessageEvent struct { - Application *app.App - Token *token.Login -} - -type getScheduledMessageEventResponse struct { - Message string `json:"message"` - Data []*scheduling.ScheduledMessageEvent `json:"data"` -} - -func (s *ScheduledMessageEvent) GetEvents(scheduledMessageId uuid.UUID) ([]*scheduling.ScheduledMessageEvent, error) { - params := url.Values{} - params.Add("scheduled_message_id", scheduledMessageId.String()) - pm := params.Encode() - fullUrl := fmt.Sprintf("%s/api/v1/schedule/message/event?%s", s.Application.ApiUrl, pm) - - req, err := http.NewRequest("GET", fullUrl, nil) - if err != nil { - return nil, err - } - - token := s.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r getScheduledMessageEventResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data, nil - } - } -} diff --git a/internal/service/scheduler.go b/internal/service/scheduler.go deleted file mode 100644 index 5ad5b0c..0000000 --- a/internal/service/scheduler.go +++ /dev/null @@ -1,69 +0,0 @@ -package service - -import ( - "time" - - "git.kundeng.us/phoenix/swoosh/swoop/send" - "git.kundeng.us/phoenix/swoosh/swoop/types" - "git.kundeng.us/phoenix/textsender-models/tx0/contact" - "git.kundeng.us/phoenix/textsender-models/tx0/message" - evnt "git.kundeng.us/phoenix/textsender-models/tx0/message/event" - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Scheduler struct { - Application *app.App - Token *token.Login -} - -func (s *Scheduler) GetEvents(scheduledMessageId uuid.UUID) ([]*scheduling.ScheduledMessageEvent, error) { - sme := ScheduledMessageEvent{Application: s.Application, Token: s.Token} - if events, err := sme.GetEvents(scheduledMessageId); err != nil { - return nil, err - } else { - return events, nil - } -} - -func (s *Scheduler) GetMessage(id uuid.UUID) (*message.Message, error) { - msg := Message{Application: s.Application, Token: s.Token} - if letter, err := msg.GetMessage(id); err != nil { - return nil, err - } else { - return letter, nil - } -} - -func (s *Scheduler) GetContact(id uuid.UUID) (*contact.Contact, error) { - ctct := Contact{Application: s.Application, Token: s.Token} - if c, err := ctct.GetContact(id); err != nil { - return nil, err - } else { - return c, nil - } -} - -func (s *Scheduler) ScheduleMessage(schMsg scheduling.ScheduledMessage, event scheduling.ScheduledMessageEvent, c contact.Contact, msg message.Message) (*types.TwilioResult, map[string]any, *time.Time, error) { - msgSender := send.MessageSender{Config: s.Application.TwilioConfig} - if res, resRaw, err := msgSender.Send(msg, c, &schMsg.Scheduled); err != nil { - return nil, nil, nil, err - } else { - sent := time.Now() - return res, resRaw, &sent, nil - } -} - -func (s *Scheduler) RecordEventResponse(schMsgEvent *scheduling.ScheduledMessageEvent, userId uuid.UUID, bytes map[string]any, sent *time.Time) ([]*evnt.MessageEventResponse, error) { - mre := evnt.MessageEventResponse{ScheduledMessageEventId: schMsgEvent.Id, UserId: userId, Response: bytes, Sent: *sent, Status: evnt.Message_Event_Response_Status_Scheduled} - - msgEventResponse := MessageEventResponse{Application: s.Application, Token: s.Token} - if responses, err := msgEventResponse.RecordEventResponse(&mre); err != nil { - return nil, err - } else { - return responses, nil - } -} diff --git a/internal/version/version.go b/internal/version/version.go deleted file mode 100644 index 91e3782..0000000 --- a/internal/version/version.go +++ /dev/null @@ -1,17 +0,0 @@ -package version - -import "fmt" - -var ( - Version = "dev" - BuildTime = "unknown" - Commit = "unknown" - GoVersion = "unknown" -) - -func String() string { - return fmt.Sprintf( - "Version: %s\nBuild Date: %s\nCommit: %s\nGo Version: %s", - Version, BuildTime, Commit, GoVersion, - ) -}