[MM-29999] User Limit Email Notifications (Part 2) (#16220)
* Adding files commiting to do something else * Stashing to merge master * Adding files, commit of working code, pre-test * Changing up logic according to new conversations, adding template and functions for 7 day and 14 day emails * Add subscription active check * Add a comment around subscription status * Fix i18n * Update jobs/cloud/worker.go Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> * Add a check for cloud license and exit early * remove log * Update jobs/cloud/worker.go Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> * Remove case for 91st day * Change var name * Fix i18n * Change value for dates in email * Add email template and send logic for support email on 30th day of arrears * Fix EETests? * add one to the day so the count starts on first day of next cycle * use the license for the enabled check * Moved scheduler and worker into enterprise * Add the user count to the support email * remove a line * Use the date for the 14 day email * Fix for design review * More font changes * Fixes for PR * Change feature flag name * Add cloud_interface to einterfaces/jobs * Add back & for running job server * Remove unused constant Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
@@ -81,6 +81,7 @@ type Subscription struct {
|
||||
EndAt int64 `json:"end_at"`
|
||||
CreateAt int64 `json:"create_at"`
|
||||
Seats int `json:"seats"`
|
||||
Status string `json:"status"`
|
||||
DNS string `json:"dns"`
|
||||
IsPaidTier string `json:"is_paid_tier"`
|
||||
LastInvoice *Invoice `json:"last_invoice"`
|
||||
|
||||
@@ -7,8 +7,12 @@ type FeatureFlags struct {
|
||||
// Exists only for unit and manual testing.
|
||||
// When set to a value, will be returned by the ping endpoint.
|
||||
TestFeature string
|
||||
|
||||
// Toggle on and off scheduled jobs for cloud user limit emails see MM-29999
|
||||
CloudDelinquentEmailJobsEnabled bool
|
||||
}
|
||||
|
||||
func (f *FeatureFlags) SetDefaults() {
|
||||
f.TestFeature = "off"
|
||||
f.CloudDelinquentEmailJobsEnabled = false
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ const (
|
||||
JOB_TYPE_EXPIRY_NOTIFY = "expiry_notify"
|
||||
JOB_TYPE_PRODUCT_NOTICES = "product_notices"
|
||||
JOB_TYPE_ACTIVE_USERS = "active_users"
|
||||
JOB_TYPE_CLOUD = "cloud"
|
||||
|
||||
JOB_STATUS_PENDING = "pending"
|
||||
JOB_STATUS_IN_PROGRESS = "in_progress"
|
||||
@@ -65,6 +66,7 @@ func (j *Job) IsValid() *AppError {
|
||||
case JOB_TYPE_PRODUCT_NOTICES:
|
||||
case JOB_TYPE_EXPIRY_NOTIFY:
|
||||
case JOB_TYPE_ACTIVE_USERS:
|
||||
case JOB_TYPE_CLOUD:
|
||||
default:
|
||||
return NewAppError("Job.IsValid", "model.job.is_valid.type.app_error", nil, "id="+j.Id, http.StatusBadRequest)
|
||||
}
|
||||
|
||||
@@ -33,6 +33,8 @@ const (
|
||||
SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY = "LastWarnMetricRunTimestamp"
|
||||
AWS_METERING_REPORT_INTERVAL = 1
|
||||
AWS_METERING_DIMENSION_USAGE_HRS = "UsageHrs"
|
||||
USER_LIMIT_OVERAGE_CYCLE_END_DATE = "UserLimitOverageCycleEndDate"
|
||||
OVER_USER_LIMIT_FORGIVEN_COUNT = "OverUserLimitForgivenCount"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
Ссылка в новой задаче
Block a user