tsk-19: Update status of scheduled message endpoint (#32)
Closes #19 Reviewed-on: phoenix/textsender-api#32 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -9,3 +9,4 @@ const ScheduleMessageEndpoint = "/api/v1/schedule/message"
|
||||
const AddEventToScheduledMessageEndpoint = "/api/v1/schedule/message/event"
|
||||
const GetScheduledMessageEventEndpoint = "/api/v1/schedule/message/event/{id}"
|
||||
const DeleteScheduledMessageEventEndpoint = "/api/v1/schedule/message/event/{id}"
|
||||
const UpdateScheduledMessageStatusEndpoint = "/api/v1/schedule/message/status/update"
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-api/internal/store"
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
|
||||
)
|
||||
|
||||
type RequestScheduledMessageStatus struct {
|
||||
ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
||||
type ScheduledMessageChange struct {
|
||||
OldStatus string `json:"old_status"`
|
||||
ScheduledMessage scheduling.ScheduledMessage `json:"scheduled_message"`
|
||||
}
|
||||
|
||||
type ScheduledMessageStatusResponse struct {
|
||||
Message string `json:"message"`
|
||||
Data []ScheduledMessageChange `json:"data"`
|
||||
}
|
||||
|
||||
type ScheduledMessageStatusHandler struct {
|
||||
ScheduledMessageEventStore store.ScheduledMessageEventStore
|
||||
ScheduledMessageStore store.ScheduledMessageStore
|
||||
}
|
||||
|
||||
func NewScheduledMessageStatusHandler(str store.ScheduledMessageEventStore, schStore store.ScheduledMessageStore) *ScheduledMessageStatusHandler {
|
||||
return &ScheduledMessageStatusHandler{ScheduledMessageEventStore: str, ScheduledMessageStore: schStore}
|
||||
}
|
||||
|
||||
func (s *ScheduledMessageStatusHandler) UpdateStatus(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPatch {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var req RequestScheduledMessageStatus
|
||||
if err := ExtractFromRequest(r, &req); err != nil {
|
||||
http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
|
||||
}
|
||||
defer r.Body.Close()
|
||||
|
||||
var statusCode int
|
||||
var resp ScheduledMessageStatusResponse
|
||||
|
||||
if req.ScheduledMessageId == uuid.Nil {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "Scheduled messaged Id is nil"
|
||||
} else if len(req.Status) == 0 {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "No status provided"
|
||||
} else {
|
||||
ctx := r.Context()
|
||||
|
||||
if schMsg, err := s.ScheduledMessageStore.Get(ctx, req.ScheduledMessageId); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
if schMsg.Status == scheduling.Done {
|
||||
statusCode = http.StatusNotFound
|
||||
resp.Message = "Scheduled message has already completed"
|
||||
} else {
|
||||
switch req.Status {
|
||||
case scheduling.Pending:
|
||||
{
|
||||
if schMsg.Status == scheduling.Processing {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "Message is currently processing"
|
||||
} else {
|
||||
if returnedStatus, err := s.ScheduledMessageStore.UpdateStatus(ctx, schMsg.Id, req.Status); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
chg := initScheduledMessageChange(schMsg, schMsg.Status, *returnedStatus)
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
resp.Data = append(resp.Data, chg)
|
||||
}
|
||||
}
|
||||
}
|
||||
case scheduling.Ready:
|
||||
{
|
||||
if events, err := s.ScheduledMessageEventStore.GetWithScheduleMessageId(ctx, schMsg.Id); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
oldStatus := schMsg.Status
|
||||
if schMsg.Status != scheduling.Processing && schMsg.Status != scheduling.Ready {
|
||||
// Update status
|
||||
if len(events) > 0 {
|
||||
if returnedStatus, err := s.ScheduledMessageStore.UpdateStatus(ctx, schMsg.Id, req.Status); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
chg := initScheduledMessageChange(schMsg, oldStatus, *returnedStatus)
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
resp.Data = append(resp.Data, chg)
|
||||
}
|
||||
} else {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = "Not enough scheduled message events"
|
||||
}
|
||||
} else {
|
||||
if schMsg.Status == scheduling.Processing {
|
||||
statusCode = http.StatusBadRequest
|
||||
resp.Message = "Scheduled messages are processing"
|
||||
} else {
|
||||
statusCode = http.StatusNotModified
|
||||
resp.Message = "Status is already set"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
case scheduling.Processing, scheduling.Done:
|
||||
{
|
||||
if events, err := s.ScheduledMessageEventStore.GetWithScheduleMessageId(ctx, schMsg.Id); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
if len(events) > 0 {
|
||||
if returnedStatus, err := s.ScheduledMessageStore.UpdateStatus(ctx, schMsg.Id, req.Status); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
chg := initScheduledMessageChange(schMsg, schMsg.Status, *returnedStatus)
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
resp.Data = append(resp.Data, chg)
|
||||
}
|
||||
} else {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = "Not enough scheduled message events"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
RespondWithJSON(w, statusCode, &resp)
|
||||
}
|
||||
|
||||
func initScheduledMessageChange(schMsg *scheduling.ScheduledMessage, oldStatus, newStatus string) ScheduledMessageChange {
|
||||
schMsg.Status = newStatus
|
||||
return ScheduledMessageChange{OldStatus: oldStatus, ScheduledMessage: *schMsg}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/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 TestUpdateScheduledMessageStatusWithMock(t *testing.T) {
|
||||
now := time.Now()
|
||||
|
||||
schMsgEventStore := mock.NewMockScheduledMessageEventStore()
|
||||
contactStore := mock.NewMockContactStore()
|
||||
messageStore := mock.NewMockMessageStore()
|
||||
schMsgStore := mock.NewMockScheduledMessageStore()
|
||||
|
||||
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 := testScheduledMessageEvent(msg.Id, con.Id, schMsg.Id)
|
||||
|
||||
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)
|
||||
} else if err = schMsgEventStore.CreateScheduledMessageEvent(ctx, &event); err != nil {
|
||||
assert.NoError(t, err, "Error creating scheduled message event: %v", err)
|
||||
}
|
||||
|
||||
testReq := RequestScheduledMessageStatus{}
|
||||
testReq.Status = scheduling.Ready
|
||||
testReq.ScheduledMessageId = schMsg.Id
|
||||
jsonValue, _ := json.Marshal(testReq)
|
||||
jsonBody := strings.NewReader(string(jsonValue))
|
||||
|
||||
req, _ := http.NewRequest("PATCH", endpoint.UpdateScheduledMessageStatusEndpoint, jsonBody)
|
||||
rr := httptest.NewRecorder()
|
||||
|
||||
handler := NewScheduledMessageStatusHandler(schMsgEventStore, schMsgStore)
|
||||
handler.UpdateStatus(rr, req)
|
||||
|
||||
assert.Equal(t, http.StatusOK, rr.Code)
|
||||
|
||||
var response ScheduledMessageStatusResponse
|
||||
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")
|
||||
|
||||
changes := response.Data[0]
|
||||
assert.NotEqual(t, changes.OldStatus, changes.ScheduledMessage.Status, "The status should not match")
|
||||
assert.Equal(t, scheduling.Pending, changes.OldStatus, "The Old status does not match Old %s New %s", changes.OldStatus, scheduling.Pending)
|
||||
assert.Equal(t, scheduling.Ready, changes.ScheduledMessage.Status, "Status has not been updated")
|
||||
}
|
||||
@@ -55,7 +55,7 @@ func (c *ScheduledMessageHandler) AddScheduledMessage(w http.ResponseWriter, r *
|
||||
} else {
|
||||
ctx := r.Context()
|
||||
|
||||
if validStatus, err := isStatusValid(&scheduledMessage); err == nil {
|
||||
if validStatus, err := IsStatusValid(&scheduledMessage); err == nil {
|
||||
if validStatus {
|
||||
if valid, err := isScheduledTimeValid(&scheduledMessage); err == nil && valid {
|
||||
if err = c.ScheduledMessageStore.CreateScheduledMessage(ctx, &scheduledMessage); err == nil {
|
||||
@@ -99,7 +99,7 @@ func isScheduledTimeValid(schMsg *scheduling.ScheduledMessage) (bool, error) {
|
||||
}
|
||||
}
|
||||
|
||||
func isStatusValid(schMsg *scheduling.ScheduledMessage) (bool, error) {
|
||||
func IsStatusValid(schMsg *scheduling.ScheduledMessage) (bool, error) {
|
||||
schMsg.Status = strings.ToUpper(schMsg.Status)
|
||||
if schMsg.Status == scheduling.Pending {
|
||||
return true, nil
|
||||
|
||||
Reference in New Issue
Block a user