tsk-13: Retrieve scheduled message endpoint (#36)
Closes #13 Reviewed-on: phoenix/textsender-api#36 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -6,6 +6,7 @@ const GET_MESSAGE = "/api/v1/message"
|
||||
const GET_CONTACT = "/api/v1/contact"
|
||||
const ADD_CONTACT_ENDPOINT = "/api/v1/contact/new"
|
||||
const ScheduleMessageEndpoint = "/api/v1/schedule/message"
|
||||
const GetScheduledMessageEndpoint = "/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}"
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
package handler
|
||||
|
||||
import "encoding/json"
|
||||
import "log"
|
||||
import "net/http"
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func ExtractFromRequest(r *http.Request, reqItem interface{}) error {
|
||||
err := json.NewDecoder(r.Body).Decode(&reqItem)
|
||||
@@ -21,3 +24,18 @@ func RespondWithJSON(w http.ResponseWriter, statusCode int, data interface{}) {
|
||||
log.Printf("Error encoding JSON: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Gets the query parameter from the URL
|
||||
func ParseQueryParams(r *http.Request, query string) (*string, error) {
|
||||
queryParams := r.URL.Query()
|
||||
if _, exists := queryParams[query]; exists {
|
||||
value := queryParams.Get(query)
|
||||
if len(value) == 0 {
|
||||
return nil, fmt.Errorf("Value of query parameter is empty")
|
||||
} else {
|
||||
return &value, nil
|
||||
}
|
||||
} else {
|
||||
return nil, fmt.Errorf("Could not find query %s", query)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,11 @@ type AddScheduledMessageResponse struct {
|
||||
Data []scheduling.ScheduledMessage `json:"data"`
|
||||
}
|
||||
|
||||
type GetScheduledMessageResponse struct {
|
||||
Message string `json:"message"`
|
||||
Data []scheduling.ScheduledMessage `json:"data"`
|
||||
}
|
||||
|
||||
type ScheduledMessageHandler struct {
|
||||
ScheduledMessageStore store.ScheduledMessageStore
|
||||
}
|
||||
@@ -83,6 +88,70 @@ func (c *ScheduledMessageHandler) AddScheduledMessage(w http.ResponseWriter, r *
|
||||
RespondWithJSON(w, statusCode, &resp)
|
||||
}
|
||||
|
||||
func (c *ScheduledMessageHandler) GetScheduledMessage(w http.ResponseWriter, r *http.Request) {
|
||||
var id, userId uuid.UUID
|
||||
|
||||
if idParam, err := ParseQueryParams(r, "id"); err == nil {
|
||||
var err error
|
||||
id, err = uuid.Parse(*idParam)
|
||||
if err != nil {
|
||||
http.Error(w, "Error parsing Id", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
}
|
||||
if userIdParam, err := ParseQueryParams(r, "user_id"); err == nil {
|
||||
userId, err = uuid.Parse(*userIdParam)
|
||||
if err != nil {
|
||||
http.Error(w, "Error parsing Id", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
var resp GetScheduledMessageResponse
|
||||
var statusCode int
|
||||
ctx := r.Context()
|
||||
|
||||
if userId == uuid.Nil && id == uuid.Nil {
|
||||
http.Error(w, "Invalid query parameters", http.StatusBadRequest)
|
||||
return
|
||||
} else if userId != uuid.Nil && id != uuid.Nil {
|
||||
if schMsgs, err := c.ScheduledMessageStore.GetWithUserId(ctx, userId); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
for _, schMsg := range schMsgs {
|
||||
if schMsg.Id == id {
|
||||
resp.Data = append(resp.Data, *schMsg)
|
||||
}
|
||||
}
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
}
|
||||
} else if id != uuid.Nil {
|
||||
if schMsg, err := c.ScheduledMessageStore.Get(ctx, id); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
resp.Data = append(resp.Data, *schMsg)
|
||||
}
|
||||
} else {
|
||||
if schMsgs, err := c.ScheduledMessageStore.GetWithUserId(ctx, userId); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
for _, schMsg := range schMsgs {
|
||||
resp.Data = append(resp.Data, *schMsg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RespondWithJSON(w, statusCode, &resp)
|
||||
}
|
||||
|
||||
func isScheduledTimeValid(schMsg *scheduling.ScheduledMessage) (bool, error) {
|
||||
now := time.Now()
|
||||
timeCutOff := now.Add(-5 * time.Minute)
|
||||
|
||||
@@ -2,6 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
@@ -28,8 +29,7 @@ func TestCreateScheduledMessageWithMock(t *testing.T) {
|
||||
handler := NewScheduledMessageHandler(mockStore)
|
||||
|
||||
testUserId := uuid.New()
|
||||
scheduled := now.Add(5 * time.Minute)
|
||||
testBody := CreateScheduledMessageRequest{Status: scheduling.Pending, UserId: testUserId, Scheduled: scheduled}
|
||||
testBody := testCreateScheduledMessageRequest(testUserId, now)
|
||||
jsonValue, _ := json.Marshal(testBody)
|
||||
|
||||
req, _ := http.NewRequest("POST", endpoint.ScheduleMessageEndpoint, strings.NewReader(string(jsonValue)))
|
||||
@@ -47,3 +47,38 @@ func TestCreateScheduledMessageWithMock(t *testing.T) {
|
||||
|
||||
assert.NotNil(t, response.Data[0].Id, "Id should not be nil")
|
||||
}
|
||||
|
||||
func TestGetScheduledMessageWithMock(t *testing.T) {
|
||||
now := time.Now()
|
||||
mockStore := mock.NewMockScheduledMessageStore()
|
||||
|
||||
testUserId := uuid.New()
|
||||
testBody := testCreateScheduledMessageRequest(testUserId, now)
|
||||
|
||||
ctx := t.Context()
|
||||
schMsg := scheduling.ScheduledMessage{}
|
||||
schMsg.Scheduled = testBody.Scheduled
|
||||
schMsg.Status = testBody.Status
|
||||
schMsg.UserId = testBody.UserId
|
||||
if err := mockStore.CreateScheduledMessage(ctx, &schMsg); err != nil {
|
||||
assert.NoError(t, err, "Error Creating message %v", err)
|
||||
}
|
||||
|
||||
url := fmt.Sprintf("%s?id=%s&user_id=%s", endpoint.GetScheduledMessageEndpoint, schMsg.Id, schMsg.UserId)
|
||||
req, _ := http.NewRequest("GET", url, nil)
|
||||
rr := httptest.NewRecorder()
|
||||
|
||||
handler := NewScheduledMessageHandler(mockStore)
|
||||
handler.GetScheduledMessage(rr, req)
|
||||
|
||||
assert.Equal(t, http.StatusOK, rr.Code)
|
||||
|
||||
var response GetScheduledMessageResponse
|
||||
err := json.Unmarshal(rr.Body.Bytes(), &response)
|
||||
assert.NoError(t, err, "Error parsing response %v", err)
|
||||
}
|
||||
|
||||
func testCreateScheduledMessageRequest(userId uuid.UUID, now time.Time) CreateScheduledMessageRequest {
|
||||
scheduled := now.Add(5 * time.Minute)
|
||||
return CreateScheduledMessageRequest{Status: scheduling.Pending, UserId: userId, Scheduled: scheduled}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user