Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

feature: lock expirted tenants

goenningf18bf6041c0f
diff --git a/app/cmd/server.go b/app/cmd/server.go
index 918a80771..323ba8fa4 100644
--- a/app/cmd/server.go
+++ b/app/cmd/server.go
@@ -57,6 +57,7 @@ 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{}))
c.Start()
}
diff --git a/app/jobs/expired_trials.go b/app/jobs/expired_trials.go
new file mode 100644
index 000000000..8657e046e
--- /dev/null
+++ b/app/jobs/expired_trials.go
@@ -0,0 +1,29 @@
+package jobs
+
+import (
+ "github.com/getfider/fider/app/models/cmd"
+ "github.com/getfider/fider/app/models/dto"
+ "github.com/getfider/fider/app/pkg/bus"
+ "github.com/getfider/fider/app/pkg/log"
+)
+
+type LockExpiredTrialTenantsJobHandler struct {
+}
+
+func (e LockExpiredTrialTenantsJobHandler) Schedule() string {
+ return "0 0 0 * * *" // every day at minute 0
+}
+
+func (e LockExpiredTrialTenantsJobHandler) Run(ctx Context) error {
+ c := &cmd.LockExpiredTrialTenants{}
+ err := bus.Dispatch(ctx, c)
+ if err != nil {
+ return err
+ }
+
+ log.Debugf(ctx, "@{Count} tenants marked as locked", dto.Props{
+ "Count": c.NumOfTenantsLocked,
+ })
+
+ return nil
+}
diff --git a/app/models/cmd/billing.go b/app/models/cmd/billing.go
index ad9fbf662..75f710619 100644
--- a/app/models/cmd/billing.go
+++ b/app/models/cmd/billing.go
@@ -25,3 +25,8 @@ type CancelBillingSubscription struct {
TenantID int
SubscriptionEndsAt time.Time
}
+
+type LockExpiredTrialTenants struct {
+ //Output
+ NumOfTenantsLocked int64
+}
diff --git a/app/services/sqlstore/postgres/billing.go b/app/services/sqlstore/postgres/billing.go
index 223cf2ced..891077a09 100644
--- a/app/services/sqlstore/postgres/billing.go
+++ b/app/services/sqlstore/postgres/billing.go
@@ -2,6 +2,7 @@ package postgres
import (
"context"
+ "time"
"github.com/getfider/fider/app/models/cmd"
"github.com/getfider/fider/app/models/entity"
@@ -88,3 +89,22 @@ func cancelBillingSubscription(ctx context.Context, c *cmd.CancelBillingSubscrip
return nil
})
}
+
+func lockExpiredTrialTenants(ctx context.Context, c *cmd.LockExpiredTrialTenants) error {
+ return using(ctx, func(trx *dbx.Trx, _ *entity.Tenant, _ *entity.User) error {
+ now := time.Now()
+
+ count, err := trx.Execute(`
+ UPDATE tenants
+ SET status = $1
+ WHERE id IN (SELECT tenant_id FROM tenants_billing WHERE status = $2 AND trial_ends_at <= $3)
+ AND status <> $1
+ `, enum.TenantLocked, enum.BillingTrial, now)
+ if err != nil {
+ return errors.Wrap(err, "failed to lock expired trial tenants")
+ }
+
+ c.NumOfTenantsLocked = count
+ return nil
+ })
+}
diff --git a/app/services/sqlstore/postgres/postgres.go b/app/services/sqlstore/postgres/postgres.go
index 84fad1157..b0dcaab84 100644
--- a/app/services/sqlstore/postgres/postgres.go
+++ b/app/services/sqlstore/postgres/postgres.go
@@ -129,6 +129,7 @@ func (s Service) Init() {
bus.AddHandler(getBillingState)
bus.AddHandler(activateBillingSubscription)
bus.AddHandler(cancelBillingSubscription)
+ bus.AddHandler(lockExpiredTrialTenants)
bus.AddHandler(setSystemSettings)
bus.AddHandler(getSystemSettings)
diff --git a/app/services/sqlstore/postgres/system.go b/app/services/sqlstore/postgres/system.go
index 6e5d90faf..89cc5d30b 100644
--- a/app/services/sqlstore/postgres/system.go
+++ b/app/services/sqlstore/postgres/system.go
@@ -3,6 +3,7 @@ package postgres
import (
"context"
+ "github.com/getfider/fider/app"
"github.com/getfider/fider/app/models/cmd"
"github.com/getfider/fider/app/models/entity"
"github.com/getfider/fider/app/models/query"
@@ -15,7 +16,7 @@ func getSystemSettings(ctx context.Context, q *query.GetSystemSettings) error {
var value string
err := trx.Scalar(&value, `SELECT value FROM system_settings WHERE key = $1`, q.Key)
- if err != nil {
+ if err != nil && err != app.ErrNotFound {
return errors.Wrap(err, "failed to query system_settings with key '%s'", q.Key)
}