Refactor analyzeCommand()

analyze_command.go

@@ -3,6 +3,8 @@ package main
 import (
 	"net/http"
 
+	"golang.org/x/net/context"
+
 	"github.com/line/line-bot-sdk-go/linebot"
 
 	"google.golang.org/appengine"
@@ -12,10 +14,11 @@ import (
 
 /**
  * コマンド解析
+ *
+ * 引数にContextとhttp.Clientを取るインナーメソッド
  */
-func analyzeCommand(w http.ResponseWriter, r *http.Request) {
-	c := appengine.NewContext(r)
-	bot, err := createBotClient(c, urlfetch.Client(c))
+func analyzeCommandWithContext(c context.Context, client *http.Client, w http.ResponseWriter, r *http.Request) {
+	bot, err := createBotClient(c, client)
 	if err != nil {
 		return
 	}
@@ -29,3 +32,11 @@ func analyzeCommand(w http.ResponseWriter, r *http.Request) {
 		log.Errorf(c, "Error occurred at reply-message for command. mid:%v, err: %v", mid, err)
 	}
 }
+
+/**
+ * コマンド解析
+ */
+func analyzeCommand(w http.ResponseWriter, r *http.Request) {
+	c := appengine.NewContext(r)
+	analyzeCommandWithContext(c, urlfetch.Client(c), w, r)
+}

leave.go

@@ -14,6 +14,8 @@ import (
 
 /**
  * 友だち削除（データストアから削除）
+ *
+ * 引数にContextとhttp.Clientを取るインナーメソッド
  */
 func leaveWithContext(c context.Context, client *http.Client, w http.ResponseWriter, r *http.Request) {
 	bot, err := createBotClient(c, client)