Open platform to collect and prioritize feedback
Updating a user feeds into userlist
Matt Roberts7a9a625f8604
diff --git a/app/handlers/admin.go b/app/handlers/admin.goindex 38959925b..c1b03d7b6 100644--- a/app/handlers/admin.go+++ b/app/handlers/admin.go@@ -8,7 +8,9 @@ import ("github.com/getfider/fider/app/models/entity""github.com/getfider/fider/app/models/query""github.com/getfider/fider/app/pkg/bus"+ "github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/tasks")// GeneralSettingsPage is the general settings page@@ -59,6 +61,11 @@ func UpdateSettings() web.HandlerFunc {return c.Failure(err)}+ // Handle userlist.+ if env.Config.UserList.Enabled {+ c.Enqueue(tasks.UserListUpdateCompany(action))+ }+return c.Ok(web.Map{})}}diff --git a/app/handlers/settings.go b/app/handlers/settings.goindex 4080e2e75..9dbedda4f 100644--- a/app/handlers/settings.go+++ b/app/handlers/settings.go@@ -9,6 +9,7 @@ import ("github.com/getfider/fider/app/models/cmd""github.com/getfider/fider/app/pkg/bus"+ "github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/tasks"@@ -112,6 +113,10 @@ func UpdateUserSettings() web.HandlerFunc {return c.Failure(err)}+ if env.Config.UserList.Enabled {+ c.Enqueue(tasks.UserListUpdateUser(*c.User(), action.Name))+ }+return c.Ok(web.Map{})}}diff --git a/app/handlers/signup.go b/app/handlers/signup.goindex b28df8c2d..22de2ef5e 100644--- a/app/handlers/signup.go+++ b/app/handlers/signup.go@@ -192,7 +192,7 @@ func VerifySignUpKey() web.HandlerFunc {// Handle userlist.if env.Config.UserList.Enabled {- c.Enqueue(tasks.CreateUserListCompany(*c.Tenant(), *user))+ c.Enqueue(tasks.UserListCreateCompany(*c.Tenant(), *user))}webutil.AddAuthUserCookie(c, user)diff --git a/app/models/cmd/userlist.go b/app/models/cmd/userlist.goindex 932276980..345e7460d 100644--- a/app/models/cmd/userlist.go+++ b/app/models/cmd/userlist.go@@ -1,6 +1,6 @@package cmd-type CreateUserListCompany struct {+type UserListCreateCompany struct {Name stringTenantId intSignedUpAt string@@ -10,3 +10,16 @@ type CreateUserListCompany struct {UserEmail stringUserName string}++type UserListUpdateCompany struct {+ Id int+ Name string+ BillingStatus string+ Subdomain string+}++type UpdateUserListUser struct {+ Id int+ Email string+ Name string+}diff --git a/app/services/userlist/userlist.go b/app/services/userlist/userlist.goindex 1d53e74d2..070ba0a11 100644--- a/app/services/userlist/userlist.go+++ b/app/services/userlist/userlist.go@@ -62,9 +62,28 @@ func (s Service) Enabled() bool {func (s Service) Init() {bus.AddHandler(createUserListCompany)+ bus.AddHandler(updateUserListCompany)}-func createUserListCompany(ctx context.Context, c *cmd.CreateUserListCompany) error {+func updateUserListCompany(ctx context.Context, c *cmd.UserListUpdateCompany) error {+ company := &Company{+ Identifier: strconv.Itoa(c.Id),+ Name: c.Name,+ Properties: map[string]interface{}{+ "billing_status": c.BillingStatus,+ "subdomain": c.Subdomain,+ },+ }++ err := pushCompanyUpdate(company, ctx)+ if err != nil {+ return err+ }+ return nil++}++func createUserListCompany(ctx context.Context, c *cmd.UserListCreateCompany) error {company := &Company{Identifier: strconv.Itoa(c.TenantId),@@ -72,7 +91,6 @@ func createUserListCompany(ctx context.Context, c *cmd.CreateUserListCompany) erSignedUpAt: c.SignedUpAt,Properties: map[string]interface{}{"billing_status": c.BillingStatus,- "user_count": 1,"subdomain": c.Subdomain,},Users: []UserListUser{@@ -87,7 +105,17 @@ func createUserListCompany(ctx context.Context, c *cmd.CreateUserListCompany) er},}- jsonContent, err := json.Marshal(company)+ err := pushCompanyUpdate(company, ctx)+ if err != nil {+ return err+ }+ return nil++}++func pushCompanyUpdate(c *Company, ctx context.Context) error {++ jsonContent, err := json.Marshal(c)if err != nil {return errors.Wrap(err, "failed to marshal company object")}@@ -103,7 +131,7 @@ func createUserListCompany(ctx context.Context, c *cmd.CreateUserListCompany) er}if err := bus.Dispatch(ctx, req); err != nil {- return errors.Wrap(err, "Failed to create userlist company")+ return errors.Wrap(err, "Failed to send userlist company")}if req.ResponseStatusCode >= 300 {@@ -111,5 +139,4 @@ func createUserListCompany(ctx context.Context, c *cmd.CreateUserListCompany) er}return nil-}diff --git a/app/services/userlist/userlist_test.go b/app/services/userlist/userlist_test.goindex 3f7df81d0..cc5dece31 100644--- a/app/services/userlist/userlist_test.go+++ b/app/services/userlist/userlist_test.go@@ -30,7 +30,7 @@ func TestCreatTenant_Success(t *testing.T) {env.Config.HostMode = "multi"reset()- createCompanyCmd := &cmd.CreateUserListCompany{+ createCompanyCmd := &cmd.UserListCreateCompany{Name: "Fider",UserId: 1,UserEmail: "[email protected]",@@ -48,3 +48,23 @@ func TestCreatTenant_Success(t *testing.T) {Expect(httpclientmock.RequestsHistory[0].Header.Get("Authorization")).Equals("Push abcdefg")Expect(httpclientmock.RequestsHistory[0].Header.Get("Content-Type")).Equals("application/json")}++func TestUdpateTenant_Success(t *testing.T) {+ RegisterT(t)+ env.Config.HostMode = "multi"+ reset()++ updateCompanyCmd := &cmd.UserListUpdateCompany{+ Name: "Fider",+ Id: 1,+ BillingStatus: "active",+ Subdomain: "got",+ }++ bus.Dispatch(ctx, updateCompanyCmd)++ Expect(httpclientmock.RequestsHistory).HasLen(1)+ Expect(httpclientmock.RequestsHistory[0].URL.String()).Equals("https://push.userlist.com/companies")+ Expect(httpclientmock.RequestsHistory[0].Header.Get("Authorization")).Equals("Push abcdefg")+ Expect(httpclientmock.RequestsHistory[0].Header.Get("Content-Type")).Equals("application/json")+}diff --git a/app/tasks/userlist.go b/app/tasks/userlist.goindex f731b67bb..876361b0b 100644--- a/app/tasks/userlist.go+++ b/app/tasks/userlist.go@@ -3,6 +3,7 @@ package tasksimport ("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"@@ -12,13 +13,13 @@ import ("github.com/getfider/fider/app/pkg/worker")-func CreateUserListCompany(tenant entity.Tenant, user entity.User) worker.Task {+func UserListCreateCompany(tenant entity.Tenant, user entity.User) worker.Task {return describe("Create UserList Company", func(c *worker.Context) error {log.Debugf(c, "Sending new tenant @{Tenant} to userlist with user email @{User}", dto.Props{"Tenant": tenant.Name,"User": user.Email,})- if err := bus.Dispatch(c, &cmd.CreateUserListCompany{+ if err := bus.Dispatch(c, &cmd.UserListCreateCompany{Name: tenant.Name,TenantId: tenant.ID,SignedUpAt: time.Now().Format(time.RFC3339),@@ -33,3 +34,35 @@ func CreateUserListCompany(tenant entity.Tenant, user entity.User) worker.Task {return nil})}++func UserListUpdateCompany(action *actions.UpdateTenantSettings) 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.Title,+ })+ if err := bus.Dispatch(c, &cmd.UserListUpdateCompany{+ Id: c.Tenant().ID,+ Name: action.Title,+ Subdomain: action.CNAME,+ }); err != nil {+ return c.Failure(err)+ }+ return nil+ })+}++func UserListUpdateUser(user entity.User, userName string) worker.Task {+ return describe("Update User in UserList", func(c *worker.Context) error {+ log.Debugf(c, "Updating user @{User} in UserList", dto.Props{+ "User": user.Email,+ })+ if err := bus.Dispatch(c, &cmd.UpdateUserListUser{+ Id: user.ID,+ Email: user.Email,+ Name: userName,+ }); err != nil {+ return c.Failure(err)+ }+ return nil+ })+}