From 908a682fcf3bbc48db75099f636d627616757b24 Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Fri, 20 Jul 2018 12:03:08 -0400
Subject: make GetChannelByName take teamId first (#9134)

* make GetChannelByName take teamId first

I think it is more natural to accept `teamId`, then `channelName`,
given the pattern followed by other Plugin API methods and even the SQL
Store itself. The App layer seems unusual in accepting `channelName`
first.

This also re-generates the mocks fixing the parameter order for the
recently added `UserStatus` APIs.

* add GetChannelByNameForTeamName
---
 plugin/plugintest/api.go   | 47 +++++++++++++++++++++++++++++++++++-----------
 plugin/plugintest/hooks.go |  2 +-
 2 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'plugin/plugintest')

diff --git a/plugin/plugintest/api.go b/plugin/plugintest/api.go
index 06ab02560..473ef6d2b 100644
--- a/plugin/plugintest/api.go
+++ b/plugin/plugintest/api.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v1.0.0
+// Code generated by mockery v1.0.0. DO NOT EDIT.
 
 // Regenerate this file using `make plugin-mocks`.
 
@@ -308,13 +308,13 @@ func (_m *API) GetChannel(channelId string) (*model.Channel, *model.AppError) {
 	return r0, r1
 }
 
-// GetChannelByName provides a mock function with given fields: name, teamId
-func (_m *API) GetChannelByName(name string, teamId string) (*model.Channel, *model.AppError) {
-	ret := _m.Called(name, teamId)
+// GetChannelByName provides a mock function with given fields: teamId, name
+func (_m *API) GetChannelByName(teamId string, name string) (*model.Channel, *model.AppError) {
+	ret := _m.Called(teamId, name)
 
 	var r0 *model.Channel
 	if rf, ok := ret.Get(0).(func(string, string) *model.Channel); ok {
-		r0 = rf(name, teamId)
+		r0 = rf(teamId, name)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*model.Channel)
@@ -323,7 +323,32 @@ func (_m *API) GetChannelByName(name string, teamId string) (*model.Channel, *mo
 
 	var r1 *model.AppError
 	if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
-		r1 = rf(name, teamId)
+		r1 = rf(teamId, name)
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*model.AppError)
+		}
+	}
+
+	return r0, r1
+}
+
+// GetChannelByNameForTeamName provides a mock function with given fields: teamName, channelName
+func (_m *API) GetChannelByNameForTeamName(teamName string, channelName string) (*model.Channel, *model.AppError) {
+	ret := _m.Called(teamName, channelName)
+
+	var r0 *model.Channel
+	if rf, ok := ret.Get(0).(func(string, string) *model.Channel); ok {
+		r0 = rf(teamName, channelName)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*model.Channel)
+		}
+	}
+
+	var r1 *model.AppError
+	if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
+		r1 = rf(teamName, channelName)
 	} else {
 		if ret.Get(1) != nil {
 			r1 = ret.Get(1).(*model.AppError)
@@ -1067,13 +1092,13 @@ func (_m *API) UpdateUser(user *model.User) (*model.User, *model.AppError) {
 	return r0, r1
 }
 
-// UpdateUserStatus provides a mock function with given fields: status, userId
-func (_m *API) UpdateUserStatus(status string, userId string) (*model.Status, *model.AppError) {
-	ret := _m.Called(status, userId)
+// UpdateUserStatus provides a mock function with given fields: userId, status
+func (_m *API) UpdateUserStatus(userId string, status string) (*model.Status, *model.AppError) {
+	ret := _m.Called(userId, status)
 
 	var r0 *model.Status
 	if rf, ok := ret.Get(0).(func(string, string) *model.Status); ok {
-		r0 = rf(status, userId)
+		r0 = rf(userId, status)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(*model.Status)
@@ -1082,7 +1107,7 @@ func (_m *API) UpdateUserStatus(status string, userId string) (*model.Status, *m
 
 	var r1 *model.AppError
 	if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
-		r1 = rf(status, userId)
+		r1 = rf(userId, status)
 	} else {
 		if ret.Get(1) != nil {
 			r1 = ret.Get(1).(*model.AppError)
diff --git a/plugin/plugintest/hooks.go b/plugin/plugintest/hooks.go
index 61268c299..d88792f58 100644
--- a/plugin/plugintest/hooks.go
+++ b/plugin/plugintest/hooks.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v1.0.0
+// Code generated by mockery v1.0.0. DO NOT EDIT.
 
 // Regenerate this file using `make plugin-mocks`.
 
-- 
cgit v1.2.3-1-g7c22