tsk-33: Tweak get schedule message event endpoint (#37)
Closes #33 Reviewed-on: phoenix/textsender-api#37 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -109,26 +109,23 @@ func (s *ScheduledMessageEventHandler) GetScheduledMessageEvent(w http.ResponseW
|
||||
return
|
||||
}
|
||||
|
||||
id := chi.URLParam(r, "id")
|
||||
if len(id) == 0 {
|
||||
pathParts := strings.Split(r.URL.Path, "/")
|
||||
if len(pathParts) < 7 {
|
||||
http.Error(w, "Id not provided", http.StatusBadRequest)
|
||||
return
|
||||
} else {
|
||||
id = pathParts[6]
|
||||
}
|
||||
var id, scheduledMessageId uuid.UUID
|
||||
if idParam, err := ParseQueryParams(r, "id"); err == nil {
|
||||
id, err = uuid.Parse(*idParam)
|
||||
}
|
||||
if scheduledMessageIdParam, err := ParseQueryParams(r, "scheduled_message_id"); err == nil {
|
||||
scheduledMessageId, err = uuid.Parse(*scheduledMessageIdParam)
|
||||
}
|
||||
|
||||
var statusCode int
|
||||
var resp GetScheduledMessageEventResponse
|
||||
ctx := r.Context()
|
||||
|
||||
if parsedId, err := uuid.Parse(id); err != nil {
|
||||
resp.Message = err.Error()
|
||||
if id == uuid.Nil && scheduledMessageId == uuid.Nil {
|
||||
statusCode = http.StatusBadRequest
|
||||
} else {
|
||||
ctx := r.Context()
|
||||
if event, err := s.ScheduledMessageEventStore.Get(ctx, parsedId); err != nil {
|
||||
resp.Message = "Query parameters missing"
|
||||
} else if id != uuid.Nil {
|
||||
if event, err := s.ScheduledMessageEventStore.Get(ctx, id); err != nil {
|
||||
resp.Message = err.Error()
|
||||
statusCode = http.StatusInternalServerError
|
||||
} else {
|
||||
@@ -141,6 +138,17 @@ func (s *ScheduledMessageEventHandler) GetScheduledMessageEvent(w http.ResponseW
|
||||
resp.Message = "Scheduled message event not found"
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if events, err := s.ScheduledMessageEventStore.GetWithScheduleMessageId(ctx, scheduledMessageId); err != nil {
|
||||
statusCode = http.StatusInternalServerError
|
||||
resp.Message = err.Error()
|
||||
} else {
|
||||
statusCode = http.StatusOK
|
||||
resp.Message = "Successful"
|
||||
for _, event := range events {
|
||||
resp.Data = append(resp.Data, *event)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RespondWithJSON(w, statusCode, &resp)
|
||||
|
||||
Reference in New Issue
Block a user