From 4253d14367ba855ac874d619f6e58c5744639a2e Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 14 Sep 2023 12:22:57 +0200 Subject: [PATCH] chore(webhooks): remove WebhookEvent interface --- pkg/models/events.go | 64 ------------------------------------------ pkg/models/webhooks.go | 7 +---- 2 files changed, 1 insertion(+), 70 deletions(-) diff --git a/pkg/models/events.go b/pkg/models/events.go index b42f6d7ba1c..5fd75bf5d11 100644 --- a/pkg/models/events.go +++ b/pkg/models/events.go @@ -36,10 +36,6 @@ func (t *TaskCreatedEvent) Name() string { return "task.created" } -func (t *TaskCreatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskUpdatedEvent represents an event where a task has been updated type TaskUpdatedEvent struct { Task *Task `json:"task"` @@ -51,10 +47,6 @@ func (t *TaskUpdatedEvent) Name() string { return "task.updated" } -func (t *TaskUpdatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskDeletedEvent represents a TaskDeletedEvent event type TaskDeletedEvent struct { Task *Task `json:"task"` @@ -66,10 +58,6 @@ func (t *TaskDeletedEvent) Name() string { return "task.deleted" } -func (t *TaskDeletedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskAssigneeCreatedEvent represents an event where a task has been assigned to a user type TaskAssigneeCreatedEvent struct { Task *Task `json:"task"` @@ -82,10 +70,6 @@ func (t *TaskAssigneeCreatedEvent) Name() string { return "task.assignee.created" } -func (t *TaskAssigneeCreatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskAssigneeDeletedEvent represents a TaskAssigneeDeletedEvent event type TaskAssigneeDeletedEvent struct { Task *Task `json:"task"` @@ -98,10 +82,6 @@ func (t *TaskAssigneeDeletedEvent) Name() string { return "task.assignee.deleted" } -func (t *TaskAssigneeDeletedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskCommentCreatedEvent represents an event where a task comment has been created type TaskCommentCreatedEvent struct { Task *Task `json:"task"` @@ -114,10 +94,6 @@ func (t *TaskCommentCreatedEvent) Name() string { return "task.comment.created" } -func (t *TaskCommentCreatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskCommentUpdatedEvent represents a TaskCommentUpdatedEvent event type TaskCommentUpdatedEvent struct { Task *Task `json:"task"` @@ -130,10 +106,6 @@ func (t *TaskCommentUpdatedEvent) Name() string { return "task.comment.edited" } -func (t *TaskCommentUpdatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskCommentDeletedEvent represents a TaskCommentDeletedEvent event type TaskCommentDeletedEvent struct { Task *Task `json:"task"` @@ -146,10 +118,6 @@ func (t *TaskCommentDeletedEvent) Name() string { return "task.comment.deleted" } -func (t *TaskCommentDeletedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskAttachmentCreatedEvent represents a TaskAttachmentCreatedEvent event type TaskAttachmentCreatedEvent struct { Task *Task `json:"task"` @@ -162,10 +130,6 @@ func (t *TaskAttachmentCreatedEvent) Name() string { return "task.attachment.created" } -func (t *TaskAttachmentCreatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskAttachmentDeletedEvent represents a TaskAttachmentDeletedEvent event type TaskAttachmentDeletedEvent struct { Task *Task `json:"task"` @@ -178,10 +142,6 @@ func (t *TaskAttachmentDeletedEvent) Name() string { return "task.attachment.deleted" } -func (t *TaskAttachmentDeletedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskRelationCreatedEvent represents a TaskRelationCreatedEvent event type TaskRelationCreatedEvent struct { Task *Task `json:"task"` @@ -194,10 +154,6 @@ func (t *TaskRelationCreatedEvent) Name() string { return "task.relation.created" } -func (t *TaskRelationCreatedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - // TaskRelationDeletedEvent represents a TaskRelationDeletedEvent event type TaskRelationDeletedEvent struct { Task *Task `json:"task"` @@ -210,10 +166,6 @@ func (t *TaskRelationDeletedEvent) Name() string { return "task.relation.deleted" } -func (t *TaskRelationDeletedEvent) ProjectID() int64 { - return t.Task.ProjectID -} - //////////////////// // Project Events // //////////////////// @@ -240,10 +192,6 @@ func (p *ProjectUpdatedEvent) Name() string { return "project.updated" } -func (p *ProjectUpdatedEvent) ProjectID() int64 { - return p.Project.ID -} - // ProjectDeletedEvent represents an event where a project has been deleted type ProjectDeletedEvent struct { Project *Project `json:"project"` @@ -255,10 +203,6 @@ func (p *ProjectDeletedEvent) Name() string { return "project.deleted" } -func (p *ProjectDeletedEvent) ProjectID() int64 { - return p.Project.ID -} - //////////////////// // Sharing Events // //////////////////// @@ -275,10 +219,6 @@ func (p *ProjectSharedWithUserEvent) Name() string { return "project.shared.user" } -func (p *ProjectSharedWithUserEvent) ProjectID() int64 { - return p.Project.ID -} - // ProjectSharedWithTeamEvent represents an event where a project has been shared with a team type ProjectSharedWithTeamEvent struct { Project *Project `json:"project"` @@ -291,10 +231,6 @@ func (p *ProjectSharedWithTeamEvent) Name() string { return "project.shared.team" } -func (p *ProjectSharedWithTeamEvent) ProjectID() int64 { - return p.Project.ID -} - ///////////////// // Team Events // ///////////////// diff --git a/pkg/models/webhooks.go b/pkg/models/webhooks.go index 35510150e9b..94e5285545c 100644 --- a/pkg/models/webhooks.go +++ b/pkg/models/webhooks.go @@ -49,11 +49,6 @@ func (w *Webhook) TableName() string { return "webhooks" } -type WebhookEvent interface { - events.Event - ProjectID() int64 -} - var availableWebhookEvents map[string]bool var availableWebhookEventsLock *sync.Mutex @@ -62,7 +57,7 @@ func init() { availableWebhookEventsLock = &sync.Mutex{} } -func RegisterEventForWebhook(event WebhookEvent) { +func RegisterEventForWebhook(event events.Event) { availableWebhookEventsLock.Lock() defer availableWebhookEventsLock.Unlock()