Refactor: Rename service methods for consistency and clarity

Author: joyguptaa

service/discordBaseService.go

@@ -32,7 +32,7 @@ func DiscordBaseService(response http.ResponseWriter, request *http.Request) {
 
 	case discordgo.InteractionApplicationCommand:
 		mainService := CommandService{discordMessage: &message}
-		mainService.MainService(response, request)
+		mainService.HandleMessage(response, request)
 
 		return
 

service/helloService.go

@@ -7,7 +7,7 @@ import (
 	"github.com/bwmarrin/discordgo"
 )
 
-func (s *CommandService) HelloService(response http.ResponseWriter, request *http.Request) {
+func (s *CommandService) Hello(response http.ResponseWriter, request *http.Request) {
 	messageResponse := &discordgo.InteractionResponse{
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{

service/helloService_test.go

@@ -25,7 +25,7 @@ func TestHelloService(t *testing.T) {
 		CS := CommandService{
 			discordMessage: fixtures.HelloCommand,
 		}
-		CS.HelloService(w, r)
+		CS.Hello(w, r)
 
 		assert.Equal(t, http.StatusOK, w.Code)
 		var response discordgo.InteractionResponse

service/listeningService.go

@@ -11,7 +11,7 @@ import (
 	"github.com/bwmarrin/discordgo"
 )
 
-func (s *CommandService) ListeningService(response http.ResponseWriter, request *http.Request) {
+func (s *CommandService) Listening(response http.ResponseWriter, request *http.Request) {
 	options := s.discordMessage.Data.Options[0]
 	msg := ""
 	requiresUpdate := false
@@ -50,7 +50,7 @@ func (s *CommandService) ListeningService(response http.ResponseWriter, request
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{
 			Content: fmt.Sprintf(msg),
-			Flags:   64, // Ephemeral message flag
+			Flags:   discordgo.MessageFlags(64), // Ephemeral message flag
 		},
 	}
 	utils.Success.NewDiscordResponse(response, "Success", messageResponse)

service/listeningService_test.go

@@ -58,7 +58,7 @@ func TestListeningService(t *testing.T) {
 		}
 
 		commandService := &CommandService{discordMessage: discordMessage}
-		commandService.ListeningService(rr, req)
+		commandService.Listening(rr, req)
 
 		assert.Contains(t, rr.Body.String(), "You are already set to listen.")
 	})
@@ -86,7 +86,7 @@ func TestListeningService(t *testing.T) {
 		}
 
 		commandService := &CommandService{discordMessage: discordMessage}
-		commandService.ListeningService(rr, req)
+		commandService.Listening(rr, req)
 
 		assert.Contains(t, rr.Body.String(), "Your nickname remains unchanged.")
 	})
@@ -119,7 +119,7 @@ func TestListeningService(t *testing.T) {
 		}
 
 		commandService := &CommandService{discordMessage: discordMessage}
-		commandService.ListeningService(rr, req)
+		commandService.Listening(rr, req)
 
 		assert.Contains(t, rr.Body.String(), "Your nickname will be updated shortly.")
 	})

service/main.go

@@ -11,16 +11,16 @@ type CommandService struct {
 	discordMessage *dtos.DiscordMessage
 }
 
-func (s *CommandService) MainService(response http.ResponseWriter, request *http.Request) {
-	switch s.discordMessage.Data.Name {
+func (service *CommandService) HandleMessage(response http.ResponseWriter, request *http.Request) {
+	switch service.discordMessage.Data.Name {
 	case utils.CommandNames.Hello:
-		s.HelloService(response, request)
+		service.Hello(response, request)
 		return
 	case utils.CommandNames.Listening:
-		s.ListeningService(response, request)
+		service.Listening(response, request)
 		return
 	case utils.CommandNames.Verify:
-		s.VerifyService(response, request)
+		service.VerifyService(response, request)
 		return
 	default:
 		utils.Errors.NewBadRequestError(response, "Invalid Command")

service/main_test.go

@@ -20,7 +20,7 @@ func TestMainService(t *testing.T) {
 		CS := CommandService{discordMessage: fixtures.HelloCommand}
 		w := httptest.NewRecorder()
 		r, _ := http.NewRequest("GET", "/", nil)
-		CS.MainService(w, r)
+		CS.HandleMessage(w, r)
 
 		assert.Equal(t, http.StatusOK, w.Code)
 	})
@@ -44,7 +44,7 @@ func TestMainService(t *testing.T) {
 		CS := CommandService{discordMessage: discordMessage}
 		w := httptest.NewRecorder()
 		r, _ := http.NewRequest("GET", "/", nil)
-		CS.MainService(w, r)
+		CS.HandleMessage(w, r)
 		messageResponse := discordgo.InteractionResponse{}
 		err := json.Unmarshal(w.Body.Bytes(), &messageResponse)
 		assert.NoError(t, err)
@@ -65,7 +65,7 @@ func TestMainService(t *testing.T) {
 		CS := CommandService{discordMessage: discordMessage}
 		w := httptest.NewRecorder()
 		r, _ := http.NewRequest("GET", "/", nil)
-		CS.MainService(w, r)
+		CS.HandleMessage(w, r)
 		messageResponse := discordgo.InteractionResponse{}
 		err := json.Unmarshal(w.Body.Bytes(), &messageResponse)
 		assert.NoError(t, err)
@@ -87,7 +87,7 @@ func TestMainService(t *testing.T) {
 
 		w := httptest.NewRecorder()
 		r, _ := http.NewRequest("GET", "/", nil)
-		CS.MainService(w, r)
+		CS.HandleMessage(w, r)
 
 		assert.Equal(t, http.StatusBadRequest, w.Code)
 	})