finish refactor

Author: 6543

models/webhook_test.go

@@ -185,28 +185,6 @@ func TestDeleteWebhookByOrgID(t *testing.T) {
 	assert.True(t, IsErrWebhookNotExist(err))
 }
 
-func TestToHookTaskType(t *testing.T) {
-	assert.Equal(t, GOGS, ToHookTaskType("gogs"))
-	assert.Equal(t, SLACK, ToHookTaskType("slack"))
-	assert.Equal(t, GITEA, ToHookTaskType("gitea"))
-	assert.Equal(t, TELEGRAM, ToHookTaskType("telegram"))
-}
-
-func TestHookTaskType_Name(t *testing.T) {
-	assert.Equal(t, "gogs", GOGS.Name())
-	assert.Equal(t, "slack", SLACK.Name())
-	assert.Equal(t, "gitea", GITEA.Name())
-	assert.Equal(t, "telegram", TELEGRAM.Name())
-}
-
-func TestIsValidHookTaskType(t *testing.T) {
-	assert.True(t, IsValidHookTaskType("gogs"))
-	assert.True(t, IsValidHookTaskType("slack"))
-	assert.True(t, IsValidHookTaskType("gitea"))
-	assert.True(t, IsValidHookTaskType("telegram"))
-	assert.False(t, IsValidHookTaskType("invalid"))
-}
-
 func TestHookTasks(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	hookTasks, err := HookTasks(1, 1)
@@ -225,7 +203,7 @@ func TestCreateHookTask(t *testing.T) {
 	hookTask := &HookTask{
 		RepoID:    3,
 		HookID:    3,
-		Type:      GITEA,
+		Typ:       GITEA,
 		URL:       "http://www.example.com/unit_test",
 		Payloader: &api.PushPayload{},
 	}

services/webhook/webhook.go

@@ -27,31 +27,31 @@ type webhook struct {
 
 var (
 	webhooks = map[models.HookTaskType]*webhook{
-		models.SLACK: &webhook{
+		models.SLACK: {
 			name:           models.SLACK,
 			payloadCreator: GetSlackPayload,
 		},
-		models.DISCORD: &webhook{
+		models.DISCORD: {
 			name:           models.DISCORD,
 			payloadCreator: GetDiscordPayload,
 		},
-		models.DINGTALK: &webhook{
+		models.DINGTALK: {
 			name:           models.DINGTALK,
 			payloadCreator: GetDingtalkPayload,
 		},
-		models.TELEGRAM: &webhook{
+		models.TELEGRAM: {
 			name:           models.TELEGRAM,
 			payloadCreator: GetTelegramPayload,
 		},
-		models.MSTEAMS: &webhook{
+		models.MSTEAMS: {
 			name:           models.MSTEAMS,
 			payloadCreator: GetMSTeamsPayload,
 		},
-		models.FEISHU: &webhook{
+		models.FEISHU: {
 			name:           models.FEISHU,
 			payloadCreator: GetFeishuPayload,
 		},
-		models.MATRIX: &webhook{
+		models.MATRIX: {
 			name:           models.MATRIX,
 			payloadCreator: GetMatrixPayload,
 		},