Leverage GetChannelByNameForTeamName (#2)

* update to reflect GetChannelByName taking teamId first

* switch to using GetChannelByNameForTeamName

plugin.go

@@ -44,9 +44,7 @@ func (p *Plugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Req
 		http.Error(w, "You must provide a channel.", http.StatusBadRequest)
 	} else if user, err := p.API.GetUserByUsername(p.UserName); err != nil {
 		http.Error(w, err.Message, err.StatusCode)
-	} else if team, err := p.API.GetTeamByName(r.URL.Query().Get("team")); err != nil {
-		http.Error(w, err.Message, err.StatusCode)
-	} else if channel, err := p.API.GetChannelByName(r.URL.Query().Get("channel"), team.Id); err != nil {
+	} else if channel, err := p.API.GetChannelByNameForTeamName(r.URL.Query().Get("team"), r.URL.Query().Get("channel")); err != nil {
 		http.Error(w, err.Message, err.StatusCode)
 	} else if _, err := p.API.CreatePost(&model.Post{
 		ChannelId: channel.Id,

plugin.yaml

@@ -3,7 +3,7 @@ backend:
     executable: plugin.exe
 name: JIRA
 description: Receives webhook events from JIRA and makes Mattermost posts for them.
-version: '1.0.0'
+version: '1.0.1'
 settings_schema:
   settings:
     - key: Enabled

plugin_test.go

@@ -134,18 +134,14 @@ func TestPlugin(t *testing.T) {
 			}, (*model.AppError)(nil))
 			api.On("GetUserByUsername", "nottheuser").Return((*model.User)(nil), model.NewAppError("foo", "bar", nil, "", http.StatusBadRequest))
 
-			api.On("GetTeamByName", "theteam").Return(&model.Team{
-				Id: "theteamid",
-			}, (*model.AppError)(nil))
-			api.On("GetTeamByName", "nottheteam").Return((*model.Team)(nil), model.NewAppError("foo", "bar", nil, "", http.StatusBadRequest))
-
-			api.On("GetChannelByName", "thechannel", "theteamid").Run(func(args mock.Arguments) {
+			api.On("GetChannelByNameForTeamName", "nottheteam", "thechannel").Return((*model.Channel)(nil), model.NewAppError("foo", "bar", nil, "", http.StatusBadRequest))
+			api.On("GetChannelByNameForTeamName", "theteam", "notthechannel").Return((*model.Channel)(nil), model.NewAppError("foo", "bar", nil, "", http.StatusBadRequest))
+			api.On("GetChannelByNameForTeamName", "theteam", "thechannel").Run(func(args mock.Arguments) {
 				api.On("CreatePost", mock.AnythingOfType("*model.Post")).Return(&model.Post{}, tc.CreatePostError)
 			}).Return(&model.Channel{
 				Id:     "thechannelid",
 				TeamId: "theteamid",
 			}, (*model.AppError)(nil))
-			api.On("GetChannelByName", "notthechannel", "theteamid").Return((*model.Channel)(nil), model.NewAppError("foo", "bar", nil, "", http.StatusBadRequest))
 
 			p := Plugin{}
 			p.Enabled = tc.Configuration.Enabled