From e69eba094ac464ca5a68202edfefb38c466f8f8b Mon Sep 17 00:00:00 2001
From: Matt Roberts <roberts.mattroberts@gmail.com>
Date: Mon, 9 Sep 2024 11:05:02 +0100
Subject: [PATCH] Moved the action struct to a dto.

---
 app/handlers/admin.go                   | 3 ++-
 app/handlers/webhooks/paddle.go         | 5 ++---
 app/{actions => models/dto}/userlist.go | 2 +-
 app/tasks/userlist.go                   | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename app/{actions => models/dto}/userlist.go (91%)

diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 896f7a504..030809209 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/getfider/fider/app/actions"
 	"github.com/getfider/fider/app/models/cmd"
+	"github.com/getfider/fider/app/models/dto"
 	"github.com/getfider/fider/app/models/entity"
 	"github.com/getfider/fider/app/models/query"
 	"github.com/getfider/fider/app/pkg/bus"
@@ -63,7 +64,7 @@ func UpdateSettings() web.HandlerFunc {
 
 		// Handle userlist.
 		if env.Config.UserList.Enabled {
-			c.Enqueue(tasks.UserListUpdateCompany(&actions.UserListUpdateCompany{
+			c.Enqueue(tasks.UserListUpdateCompany(&dto.UserListUpdateCompany{
 				TenantID: c.Tenant().ID,
 				Name:     action.Title,
 			}))
diff --git a/app/handlers/webhooks/paddle.go b/app/handlers/webhooks/paddle.go
index 3f5cc8a78..f75c372b8 100644
--- a/app/handlers/webhooks/paddle.go
+++ b/app/handlers/webhooks/paddle.go
@@ -13,7 +13,6 @@ import (
 	"sort"
 	"time"
 
-	"github.com/getfider/fider/app/actions"
 	"github.com/getfider/fider/app/models/cmd"
 	"github.com/getfider/fider/app/models/dto"
 	"github.com/getfider/fider/app/models/enum"
@@ -71,7 +70,7 @@ func handlePaddleSubscriptionCreated(c *web.Context, params url.Values) error {
 
 	// Handle userlist.
 	if env.Config.UserList.Enabled {
-		c.Enqueue(tasks.UserListUpdateCompany(&actions.UserListUpdateCompany{
+		c.Enqueue(tasks.UserListUpdateCompany(&dto.UserListUpdateCompany{
 			TenantID:      passthrough.TenantID,
 			BillingStatus: enum.BillingActive,
 			Name:          c.Tenant().Name,
@@ -105,7 +104,7 @@ func handlePaddleSubscriptionCancelled(c *web.Context, params url.Values) error
 
 	// Handle userlist.
 	if env.Config.UserList.Enabled {
-		c.Enqueue(tasks.UserListUpdateCompany(&actions.UserListUpdateCompany{
+		c.Enqueue(tasks.UserListUpdateCompany(&dto.UserListUpdateCompany{
 			TenantID:      passthrough.TenantID,
 			BillingStatus: enum.BillingCancelled,
 			Name:          c.Tenant().Name,
diff --git a/app/actions/userlist.go b/app/models/dto/userlist.go
similarity index 91%
rename from app/actions/userlist.go
rename to app/models/dto/userlist.go
index 5100f2b93..8679684d9 100644
--- a/app/actions/userlist.go
+++ b/app/models/dto/userlist.go
@@ -1,4 +1,4 @@
-package actions
+package dto
 
 import "github.com/getfider/fider/app/models/enum"
 
diff --git a/app/tasks/userlist.go b/app/tasks/userlist.go
index a15bd7a0a..c5e7ea729 100644
--- a/app/tasks/userlist.go
+++ b/app/tasks/userlist.go
@@ -3,7 +3,6 @@ package tasks
 import (
 	"time"
 
-	"github.com/getfider/fider/app/actions"
 	"github.com/getfider/fider/app/models/cmd"
 	"github.com/getfider/fider/app/models/dto"
 	"github.com/getfider/fider/app/models/entity"
@@ -35,7 +34,7 @@ func UserListCreateCompany(tenant entity.Tenant, user entity.User) worker.Task {
 	})
 }
 
-func UserListUpdateCompany(action *actions.UserListUpdateCompany) worker.Task {
+func UserListUpdateCompany(action *dto.UserListUpdateCompany) worker.Task {
 	return describe("Update Company in UserList", func(c *worker.Context) error {
 		log.Debugf(c, "Updating company @{Tenant} in UserList", dto.Props{
 			"Tenant": action.Name,