Open platform to collect and prioritize feedback
feature: lock cancelled subs
goenning4f47cd277d8b
diff --git a/app/cmd/server.go b/app/cmd/server.goindex 323ba8fa4..9fb87da2a 100644--- a/app/cmd/server.go+++ b/app/cmd/server.go@@ -57,7 +57,9 @@ func startJobs(ctx context.Context) {c := cron.New()_ = c.AddJob(jobs.NewJob(ctx, "PurgeExpiredNotificationsJob", jobs.PurgeExpiredNotificationsJobHandler{}))_ = c.AddJob(jobs.NewJob(ctx, "EmailSupressionJob", jobs.EmailSupressionJobHandler{}))- _ = c.AddJob(jobs.NewJob(ctx, "LockExpiredTrialTenantsJob", jobs.LockExpiredTrialTenantsJobHandler{}))+ if env.IsBillingEnabled() {+ _ = c.AddJob(jobs.NewJob(ctx, "LockExpiredTenantsJob", jobs.LockExpiredTenantsJobHandler{}))+ }c.Start()}diff --git a/app/jobs/expired_trials.go b/app/jobs/lock_expired_tenants_job.gosimilarity index 59%rename from app/jobs/expired_trials.gorename to app/jobs/lock_expired_tenants_job.goindex 8657e046e..f29209086 100644--- a/app/jobs/expired_trials.go+++ b/app/jobs/lock_expired_tenants_job.go@@ -7,15 +7,15 @@ import ("github.com/getfider/fider/app/pkg/log")-type LockExpiredTrialTenantsJobHandler struct {+type LockExpiredTenantsJobHandler struct {}-func (e LockExpiredTrialTenantsJobHandler) Schedule() string {- return "0 0 0 * * *" // every day at minute 0+func (e LockExpiredTenantsJobHandler) Schedule() string {+ return "0 0 0 * * *" // every day at 0:00}-func (e LockExpiredTrialTenantsJobHandler) Run(ctx Context) error {- c := &cmd.LockExpiredTrialTenants{}+func (e LockExpiredTenantsJobHandler) Run(ctx Context) error {+ c := &cmd.LockExpiredTenants{}err := bus.Dispatch(ctx, c)if err != nil {return errdiff --git a/app/models/cmd/billing.go b/app/models/cmd/billing.goindex 75f710619..ea06757d7 100644--- a/app/models/cmd/billing.go+++ b/app/models/cmd/billing.go@@ -26,7 +26,7 @@ type CancelBillingSubscription struct {SubscriptionEndsAt time.Time}-type LockExpiredTrialTenants struct {+type LockExpiredTenants struct {//OutputNumOfTenantsLocked int64}diff --git a/app/services/sqlstore/postgres/billing.go b/app/services/sqlstore/postgres/billing.goindex 891077a09..8519e7efe 100644--- a/app/services/sqlstore/postgres/billing.go+++ b/app/services/sqlstore/postgres/billing.go@@ -90,11 +90,12 @@ func cancelBillingSubscription(ctx context.Context, c *cmd.CancelBillingSubscrip})}-func lockExpiredTrialTenants(ctx context.Context, c *cmd.LockExpiredTrialTenants) error {+func lockExpiredTenants(ctx context.Context, c *cmd.LockExpiredTenants) error {return using(ctx, func(trx *dbx.Trx, _ *entity.Tenant, _ *entity.User) error {now := time.Now()- count, err := trx.Execute(`+ //Lock expired tenants in trial+ countTrialLocked, err := trx.Execute(`UPDATE tenantsSET status = $1WHERE id IN (SELECT tenant_id FROM tenants_billing WHERE status = $2 AND trial_ends_at <= $3)@@ -104,7 +105,18 @@ func lockExpiredTrialTenants(ctx context.Context, c *cmd.LockExpiredTrialTenantsreturn errors.Wrap(err, "failed to lock expired trial tenants")}- c.NumOfTenantsLocked = count+ //Lock tenants with expired cancelled subscription+ countCancelledLocked, err := trx.Execute(`+ UPDATE tenants+ SET status = $1+ WHERE id IN (SELECT tenant_id FROM tenants_billing WHERE status = $2 AND subscription_ends_at <= $3)+ AND status <> $1+ `, enum.TenantLocked, enum.BillingCancelled, now)+ if err != nil {+ return errors.Wrap(err, "failed to lock expired cancelled tenants")+ }++ c.NumOfTenantsLocked = countTrialLocked + countCancelledLockedreturn nil})}diff --git a/app/services/sqlstore/postgres/postgres.go b/app/services/sqlstore/postgres/postgres.goindex b0dcaab84..00fb82953 100644--- a/app/services/sqlstore/postgres/postgres.go+++ b/app/services/sqlstore/postgres/postgres.go@@ -129,7 +129,7 @@ func (s Service) Init() {bus.AddHandler(getBillingState)bus.AddHandler(activateBillingSubscription)bus.AddHandler(cancelBillingSubscription)- bus.AddHandler(lockExpiredTrialTenants)+ bus.AddHandler(lockExpiredTenants)bus.AddHandler(setSystemSettings)bus.AddHandler(getSystemSettings)