order validation for chat id

src/controllers/api_handlers_untested.go

@@ -79,15 +79,6 @@ func SendAny(w http.ResponseWriter, r *http.Request) {
 	// Declare a new request struct.
 	request := &models.QpSendAnyRequest{}
 
-	// Getting ChatId parameter
-	err = request.EnsureValidChatId(r)
-	if err != nil {
-		metrics.MessageSendErrors.Inc()
-		response.ParseError(err)
-		RespondInterface(w, response)
-		return
-	}
-
 	switch os := r.Method; os {
 	case http.MethodPost:
 		// Try to decode the request body into the struct. If there is an error,
@@ -110,6 +101,15 @@ func SendAny(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// Getting ChatId parameter
+	err = request.EnsureValidChatId(r)
+	if err != nil {
+		metrics.MessageSendErrors.Inc()
+		response.ParseError(err)
+		RespondInterface(w, response)
+		return
+	}
+
 	// override trackid if passed throw any other way
 	trackid := GetTrackId(r)
 	if len(trackid) > 0 {

src/models/qp_send_request.go

@@ -50,10 +50,13 @@ func (source *QpSendRequest) GetLogger() *log.Entry {
 }
 
 func (source *QpSendRequest) EnsureChatId(r *http.Request) (err error) {
-	if len(source.ChatId) == 0 {
-		source.ChatId = GetChatId(r)
+
+	// already set ?
+	if len(source.ChatId) > 0 {
+		return
 	}
 
+	source.ChatId = GetChatId(r)
 	if len(source.ChatId) == 0 {
 		err = fmt.Errorf("chat id missing")
 	}