From 29f8c943a693d2a5d24c3a011de96aa7a2c7622e Mon Sep 17 00:00:00 2001
From: phoenix <kundeng00@pm.me>
Date: Wed, 31 Dec 2025 15:11:04 -0500
Subject: [PATCH] tsk-59: Tweaking code

---
 internal/handler/message_event_response.go | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/internal/handler/message_event_response.go b/internal/handler/message_event_response.go
index f90a8bf..646d613 100644
--- a/internal/handler/message_event_response.go
+++ b/internal/handler/message_event_response.go
@@ -1,6 +1,8 @@
 package handler
 
 import (
+	"fmt"
+	"log"
 	"net/http"
 	"time"
 
@@ -47,6 +49,8 @@ func (e *EventResponseHandler) RecordResponse(w http.ResponseWriter, r *http.Req
 	var rp message.MessageEventResponse
 	var resp RecordEventResponse
 
+	defer RespondWithJSON(w, statusCode, &resp)
+
 	if req.Sent == nil {
 		statusCode = http.StatusBadRequest
 		resp.Message = "Sent time is empty"
@@ -60,31 +64,42 @@ func (e *EventResponseHandler) RecordResponse(w http.ResponseWriter, r *http.Req
 		statusCode = http.StatusBadRequest
 		resp.Message = "Scheduled message event Id is empty"
 	} else {
+		log.Println("Starting process to record Message Event Response")
 		rp.ScheduledMessageEventId = req.ScheduledMessageEventId
+		fmt.Println(req.Response)
 		rp.Response = req.Response
 		rp.UserId = req.UserId
 		rp.Sent = *req.Sent
 
-		if req.Status == message.Message_Event_Response_Status_Instant {
+		switch req.Status {
+		case message.Message_Event_Response_Status_Instant: {
+			log.Println("Status:", req.Status)
 			rp.Status = req.Status
 			rp.MessageId = req.MessageId
 			rp.ContactId = req.ContactId
-		} else if req.Status == message.Message_Event_Response_Status_Scheduled {
+		}
+		case message.Message_Event_Response_Status_Scheduled: {
+			log.Println("Status:", req.Status)
 			rp.Status = req.Status
 		}
+		default: {
+			statusCode = http.StatusBadRequest
+			resp.Message = "Status is invalid"
+		}
+		}
 
 		ctx := r.Context()
 		if err := e.MessageEventResponseStore.Create(ctx, &rp); err != nil {
+			log.Println("Error:", err)
 			resp.Message = err.Error()
 			statusCode = http.StatusInternalServerError
 		} else {
+			log.Println("Created Message Event Response")
 			statusCode = http.StatusCreated
 			resp.Message = "Successful"
 			resp.Data = append(resp.Data, &rp)
 		}
 	}
-
-	RespondWithJSON(w, statusCode, &resp)
 }
 
 type GetMessageEventResponseFetchedResponse struct {