Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c857772953 | ||
|
|
ec371ec86b | ||
|
|
f4e2336771 | ||
|
|
6f9e112b72 | ||
|
|
7c21f243ed | ||
|
|
7db9914bc4 | ||
|
|
564a3936e3 |
@@ -18,14 +18,14 @@ jobs:
|
|||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v6
|
uses: actions/setup-go@v6
|
||||||
with:
|
with:
|
||||||
go-version: '1.25.4'
|
go-version: '1.26.1'
|
||||||
|
|
||||||
- name: Create version
|
- name: Create version
|
||||||
id: version
|
id: version
|
||||||
run: |
|
run: |
|
||||||
echo "Creating version"
|
echo "Creating version"
|
||||||
|
|
||||||
VERSION="0.1.1"
|
VERSION="0.2.0"
|
||||||
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
|
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
|
||||||
BRANCH_REF="${{ gitea.ref }}"
|
BRANCH_REF="${{ gitea.ref }}"
|
||||||
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v6
|
uses: actions/setup-go@v6
|
||||||
with:
|
with:
|
||||||
go-version: '1.25.4'
|
go-version: '1.26.1'
|
||||||
- name: Configure Git for SSH
|
- name: Configure Git for SSH
|
||||||
run: |
|
run: |
|
||||||
git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"
|
git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
module git.kundeng.us/phoenix/textsender-models
|
module git.kundeng.us/phoenix/textsender-models
|
||||||
|
|
||||||
go 1.25.4
|
go 1.26.1
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.0
|
github.com/golang-jwt/jwt/v5 v5.3.1
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
|
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
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/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package config
|
package auxiliary
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package event
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MessageEventResponse struct {
|
||||||
|
Id uuid.UUID `json:"id,omitempty"`
|
||||||
|
ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id,omitempty"`
|
||||||
|
Response map[string]any `json:"response"`
|
||||||
|
UserId uuid.UUID `json:"user_id,omitempty"`
|
||||||
|
ContactId *uuid.UUID `json:"contact_id,omitempty"`
|
||||||
|
MessageId *uuid.UUID `json:"message_id,omitempty"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Sent time.Time `json:"sent"`
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
package event
|
||||||
|
|
||||||
|
const (
|
||||||
|
Message_Event_Response_Status_Instant = "INSTANT"
|
||||||
|
Message_Event_Response_Status_Scheduled = "SCHEDULED"
|
||||||
|
)
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package message
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-models/tx0/types"
|
|
||||||
)
|
|
||||||
|
|
||||||
type MessageEventResponse struct {
|
|
||||||
Id uuid.UUID `json:"id,omitempty"`
|
|
||||||
ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id,omitempty"`
|
|
||||||
Response types.JSONB `json:"response"`
|
|
||||||
UserId uuid.UUID `json:"user_id,omitempty"`
|
|
||||||
ContactId *uuid.UUID `json:"contact_id,omitempty"`
|
|
||||||
MessageId *uuid.UUID `json:"message_id,omitempty"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
Sent time.Time `json:"sent"`
|
|
||||||
}
|
|
||||||
|
|
||||||
const (
|
|
||||||
Message_Event_Response_Status_Instant = "INSTANT"
|
|
||||||
Message_Event_Response_Status_Scheduled = "SCHEDULED"
|
|
||||||
)
|
|
||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
type ScheduledMessageEvent struct {
|
type ScheduledMessageEvent struct {
|
||||||
Id uuid.UUID `json:"id"`
|
Id uuid.UUID `json:"id"`
|
||||||
RecipientId uuid.UUID `json:"recipient_id"`
|
ContactId uuid.UUID `json:"contact_id"`
|
||||||
MessageId uuid.UUID `json:"message_id"`
|
MessageId uuid.UUID `json:"message_id"`
|
||||||
ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
|
ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
|
||||||
Created time.Time `json:"created"`
|
Created time.Time `json:"created"`
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// NOTE: Might end up removing this
|
||||||
type JSONB json.RawMessage
|
type JSONB json.RawMessage
|
||||||
|
|
||||||
// Scan implements sql.Scanner
|
// Scan implements sql.Scanner
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import (
|
|||||||
type ServiceUser struct {
|
type ServiceUser struct {
|
||||||
Id uuid.UUID `json:"id"`
|
Id uuid.UUID `json:"id"`
|
||||||
// TODO: Remove the omitempty tags at a later point
|
// TODO: Remove the omitempty tags at a later point
|
||||||
Username string `json:"username,omitempty"`
|
Username string `json:"username,omitempty"`
|
||||||
Passphrase string `json:"passphrase,omitempty"`
|
Passphrase string `json:"passphrase,omitempty"`
|
||||||
Created time.Time `json:"created"`
|
Created time.Time `json:"created"`
|
||||||
|
LastLogin *time.Time `json:"last_login,omitempty"`
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user