feat(subscription): add admin quota reset actions (#5952)
* feat(subscription): add admin quota reset actions * fix(subscription): keep quota reset in plan row actions * refactor(subscription): move user subscription actions into menu
This commit is contained in:
@@ -296,6 +296,16 @@ type SubscriptionSummary struct {
|
||||
Subscription *UserSubscription `json:"subscription"`
|
||||
}
|
||||
|
||||
type SubscriptionResetResult struct {
|
||||
PlanId int `json:"plan_id"`
|
||||
MatchedCount int `json:"matched_count"`
|
||||
ResetCount int `json:"reset_count"`
|
||||
UserCount int `json:"user_count"`
|
||||
AdvanceResetTime bool `json:"advance_reset_time"`
|
||||
PlanTitle string `json:"-"`
|
||||
AffectedUserIds []int `json:"-"`
|
||||
}
|
||||
|
||||
func calcPlanEndTime(start time.Time, plan *SubscriptionPlan) (int64, error) {
|
||||
if plan == nil {
|
||||
return 0, errors.New("plan is nil")
|
||||
@@ -974,6 +984,125 @@ func AdminDeleteUserSubscription(userSubscriptionId int) (string, error) {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
func resetUserSubscriptionTx(tx *gorm.DB, sub *UserSubscription, plan *SubscriptionPlan, now int64, advanceResetTime bool) error {
|
||||
if tx == nil || sub == nil || plan == nil {
|
||||
return errors.New("invalid reset args")
|
||||
}
|
||||
sub.AmountUsed = 0
|
||||
if advanceResetTime {
|
||||
nextReset := calcNextResetTime(time.Unix(now, 0), plan, sub.EndTime)
|
||||
sub.NextResetTime = nextReset
|
||||
if nextReset > 0 {
|
||||
sub.LastResetTime = now
|
||||
} else {
|
||||
sub.LastResetTime = 0
|
||||
}
|
||||
}
|
||||
return tx.Save(sub).Error
|
||||
}
|
||||
|
||||
func buildSubscriptionResetResult(plan *SubscriptionPlan, subs []UserSubscription, advanceResetTime bool) *SubscriptionResetResult {
|
||||
userIds := make([]int, 0, len(subs))
|
||||
seenUsers := make(map[int]struct{}, len(subs))
|
||||
for _, sub := range subs {
|
||||
if _, ok := seenUsers[sub.UserId]; ok {
|
||||
continue
|
||||
}
|
||||
seenUsers[sub.UserId] = struct{}{}
|
||||
userIds = append(userIds, sub.UserId)
|
||||
}
|
||||
return &SubscriptionResetResult{
|
||||
PlanId: plan.Id,
|
||||
MatchedCount: len(subs),
|
||||
ResetCount: len(subs),
|
||||
UserCount: len(userIds),
|
||||
AdvanceResetTime: advanceResetTime,
|
||||
PlanTitle: plan.Title,
|
||||
AffectedUserIds: userIds,
|
||||
}
|
||||
}
|
||||
|
||||
func adminResetUserSubscriptionsByPlanTx(tx *gorm.DB, userId int, plan *SubscriptionPlan, now int64, advanceResetTime bool) (*SubscriptionResetResult, error) {
|
||||
if tx == nil || plan == nil {
|
||||
return nil, errors.New("invalid reset args")
|
||||
}
|
||||
var subs []UserSubscription
|
||||
if err := tx.Set("gorm:query_option", "FOR UPDATE").
|
||||
Where("user_id = ? AND plan_id = ? AND status = ? AND end_time > ?", userId, plan.Id, "active", now).
|
||||
Order("end_time asc, id asc").
|
||||
Find(&subs).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(subs) == 0 {
|
||||
return nil, errors.New("该用户没有有效的此套餐订阅")
|
||||
}
|
||||
for i := range subs {
|
||||
if err := resetUserSubscriptionTx(tx, &subs[i], plan, now, advanceResetTime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return buildSubscriptionResetResult(plan, subs, advanceResetTime), nil
|
||||
}
|
||||
|
||||
func adminResetPlanSubscriptionsTx(tx *gorm.DB, plan *SubscriptionPlan, now int64, advanceResetTime bool) (*SubscriptionResetResult, error) {
|
||||
if tx == nil || plan == nil {
|
||||
return nil, errors.New("invalid reset args")
|
||||
}
|
||||
var subs []UserSubscription
|
||||
if err := tx.Set("gorm:query_option", "FOR UPDATE").
|
||||
Where("plan_id = ? AND status = ? AND end_time > ?", plan.Id, "active", now).
|
||||
Order("user_id asc, end_time asc, id asc").
|
||||
Find(&subs).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for i := range subs {
|
||||
if err := resetUserSubscriptionTx(tx, &subs[i], plan, now, advanceResetTime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return buildSubscriptionResetResult(plan, subs, advanceResetTime), nil
|
||||
}
|
||||
|
||||
func AdminResetUserSubscriptionsByPlan(userId int, planId int, advanceResetTime bool) (*SubscriptionResetResult, error) {
|
||||
if userId <= 0 || planId <= 0 {
|
||||
return nil, errors.New("invalid userId or planId")
|
||||
}
|
||||
var result *SubscriptionResetResult
|
||||
now := GetDBTimestamp()
|
||||
err := DB.Transaction(func(tx *gorm.DB) error {
|
||||
plan, err := getSubscriptionPlanByIdTx(tx, planId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
result, err = adminResetUserSubscriptionsByPlanTx(tx, userId, plan, now, advanceResetTime)
|
||||
return err
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func AdminResetPlanSubscriptions(planId int, advanceResetTime bool) (*SubscriptionResetResult, error) {
|
||||
if planId <= 0 {
|
||||
return nil, errors.New("invalid planId")
|
||||
}
|
||||
var result *SubscriptionResetResult
|
||||
now := GetDBTimestamp()
|
||||
err := DB.Transaction(func(tx *gorm.DB) error {
|
||||
plan, err := getSubscriptionPlanByIdTx(tx, planId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
result, err = adminResetPlanSubscriptionsTx(tx, plan, now, advanceResetTime)
|
||||
return err
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type SubscriptionPreConsumeResult struct {
|
||||
UserSubscriptionId int
|
||||
PreConsumed int64
|
||||
|
||||
@@ -0,0 +1,201 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func seedSubscriptionResetPlan(t *testing.T, plan *SubscriptionPlan) {
|
||||
t.Helper()
|
||||
require.NoError(t, DB.Create(plan).Error)
|
||||
}
|
||||
|
||||
func seedSubscriptionResetSub(t *testing.T, sub *UserSubscription) {
|
||||
t.Helper()
|
||||
require.NoError(t, DB.Create(sub).Error)
|
||||
}
|
||||
|
||||
func getSubscriptionResetSub(t *testing.T, id int) UserSubscription {
|
||||
t.Helper()
|
||||
var sub UserSubscription
|
||||
require.NoError(t, DB.Where("id = ?", id).First(&sub).Error)
|
||||
return sub
|
||||
}
|
||||
|
||||
func TestAdminResetUserSubscriptionsByPlanResetsAllActiveMatchesAndAdvancesTime(t *testing.T) {
|
||||
truncateTables(t)
|
||||
|
||||
now := GetDBTimestamp()
|
||||
plan := &SubscriptionPlan{
|
||||
Id: 9101,
|
||||
Title: "Pro",
|
||||
PriceAmount: 10,
|
||||
DurationUnit: SubscriptionDurationMonth,
|
||||
DurationValue: 1,
|
||||
TotalAmount: 1000,
|
||||
QuotaResetPeriod: SubscriptionResetDaily,
|
||||
}
|
||||
otherPlan := &SubscriptionPlan{
|
||||
Id: 9102,
|
||||
Title: "Basic",
|
||||
PriceAmount: 1,
|
||||
DurationUnit: SubscriptionDurationMonth,
|
||||
DurationValue: 1,
|
||||
TotalAmount: 100,
|
||||
QuotaResetPeriod: SubscriptionResetDaily,
|
||||
}
|
||||
seedSubscriptionResetPlan(t, plan)
|
||||
seedSubscriptionResetPlan(t, otherPlan)
|
||||
|
||||
activeEnd := now + 30*24*3600
|
||||
expiredEnd := now - 1
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9201, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 300, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9202, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 500, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9203, UserId: 101, PlanId: otherPlan.Id, AmountTotal: 100, AmountUsed: 60, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9204, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 700, StartTime: now - 7200, EndTime: expiredEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now - 10})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9205, UserId: 102, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 800, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 120})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9206, UserId: 101, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 900, StartTime: now - 3600, EndTime: activeEnd, Status: "cancelled", LastResetTime: now - 3600, NextResetTime: now + 120})
|
||||
|
||||
beforeReset := GetDBTimestamp()
|
||||
result, err := AdminResetUserSubscriptionsByPlan(101, plan.Id, true)
|
||||
afterReset := GetDBTimestamp()
|
||||
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, result)
|
||||
assert.Equal(t, plan.Id, result.PlanId)
|
||||
assert.Equal(t, 2, result.MatchedCount)
|
||||
assert.Equal(t, 2, result.ResetCount)
|
||||
assert.Equal(t, 1, result.UserCount)
|
||||
assert.Equal(t, []int{101}, result.AffectedUserIds)
|
||||
assert.True(t, result.AdvanceResetTime)
|
||||
|
||||
for _, id := range []int{9201, 9202} {
|
||||
sub := getSubscriptionResetSub(t, id)
|
||||
assert.Zero(t, sub.AmountUsed)
|
||||
assert.GreaterOrEqual(t, sub.LastResetTime, beforeReset)
|
||||
assert.LessOrEqual(t, sub.LastResetTime, afterReset)
|
||||
assert.Equal(t, calcNextResetTime(time.Unix(sub.LastResetTime, 0), plan, sub.EndTime), sub.NextResetTime)
|
||||
}
|
||||
assert.EqualValues(t, 60, getSubscriptionResetSub(t, 9203).AmountUsed)
|
||||
assert.EqualValues(t, 700, getSubscriptionResetSub(t, 9204).AmountUsed)
|
||||
assert.EqualValues(t, 800, getSubscriptionResetSub(t, 9205).AmountUsed)
|
||||
assert.EqualValues(t, 900, getSubscriptionResetSub(t, 9206).AmountUsed)
|
||||
}
|
||||
|
||||
func TestAdminResetUserSubscriptionsByPlanKeepsResetTimes(t *testing.T) {
|
||||
truncateTables(t)
|
||||
|
||||
now := GetDBTimestamp()
|
||||
plan := &SubscriptionPlan{
|
||||
Id: 9301,
|
||||
Title: "Team",
|
||||
PriceAmount: 20,
|
||||
DurationUnit: SubscriptionDurationMonth,
|
||||
DurationValue: 1,
|
||||
TotalAmount: 2000,
|
||||
QuotaResetPeriod: SubscriptionResetMonthly,
|
||||
}
|
||||
seedSubscriptionResetPlan(t, plan)
|
||||
|
||||
lastReset := now - 86400
|
||||
nextReset := now + 86400
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9302, UserId: 201, PlanId: plan.Id, AmountTotal: 2000, AmountUsed: 1200, StartTime: now - 172800, EndTime: now + 30*24*3600, Status: "active", LastResetTime: lastReset, NextResetTime: nextReset})
|
||||
|
||||
result, err := AdminResetUserSubscriptionsByPlan(201, plan.Id, false)
|
||||
|
||||
require.NoError(t, err)
|
||||
assert.False(t, result.AdvanceResetTime)
|
||||
sub := getSubscriptionResetSub(t, 9302)
|
||||
assert.Zero(t, sub.AmountUsed)
|
||||
assert.Equal(t, lastReset, sub.LastResetTime)
|
||||
assert.Equal(t, nextReset, sub.NextResetTime)
|
||||
}
|
||||
|
||||
func TestAdminResetUserSubscriptionsByPlanNoActiveMatchReturnsError(t *testing.T) {
|
||||
truncateTables(t)
|
||||
|
||||
now := GetDBTimestamp()
|
||||
plan := &SubscriptionPlan{
|
||||
Id: 9401,
|
||||
Title: "Expired",
|
||||
PriceAmount: 10,
|
||||
DurationUnit: SubscriptionDurationMonth,
|
||||
DurationValue: 1,
|
||||
TotalAmount: 1000,
|
||||
}
|
||||
seedSubscriptionResetPlan(t, plan)
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9402, UserId: 301, PlanId: plan.Id, AmountTotal: 1000, AmountUsed: 500, StartTime: now - 7200, EndTime: now - 1, Status: "active"})
|
||||
|
||||
result, err := AdminResetUserSubscriptionsByPlan(301, plan.Id, true)
|
||||
|
||||
require.Error(t, err)
|
||||
assert.Nil(t, result)
|
||||
assert.True(t, strings.Contains(err.Error(), "该用户没有有效的此套餐订阅"))
|
||||
}
|
||||
|
||||
func TestAdminResetPlanSubscriptionsResetsAllActiveUsers(t *testing.T) {
|
||||
truncateTables(t)
|
||||
|
||||
now := GetDBTimestamp()
|
||||
plan := &SubscriptionPlan{
|
||||
Id: 9501,
|
||||
Title: "Business",
|
||||
PriceAmount: 30,
|
||||
DurationUnit: SubscriptionDurationMonth,
|
||||
DurationValue: 1,
|
||||
TotalAmount: 3000,
|
||||
QuotaResetPeriod: SubscriptionResetNever,
|
||||
}
|
||||
seedSubscriptionResetPlan(t, plan)
|
||||
|
||||
activeEnd := now + 30*24*3600
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9502, UserId: 401, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1000, StartTime: now - 3600, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 10})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9503, UserId: 401, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1100, StartTime: now - 3500, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 10})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9504, UserId: 402, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1200, StartTime: now - 3400, EndTime: activeEnd, Status: "active", LastResetTime: now - 3600, NextResetTime: now + 10})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9505, UserId: 403, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1300, StartTime: now - 7200, EndTime: now - 1, Status: "active", LastResetTime: now - 3600, NextResetTime: now - 10})
|
||||
seedSubscriptionResetSub(t, &UserSubscription{Id: 9506, UserId: 404, PlanId: plan.Id, AmountTotal: 3000, AmountUsed: 1400, StartTime: now - 3600, EndTime: activeEnd, Status: "cancelled", LastResetTime: now - 3600, NextResetTime: now + 10})
|
||||
|
||||
result, err := AdminResetPlanSubscriptions(plan.Id, true)
|
||||
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, result)
|
||||
assert.Equal(t, 3, result.MatchedCount)
|
||||
assert.Equal(t, 3, result.ResetCount)
|
||||
assert.Equal(t, 2, result.UserCount)
|
||||
assert.Equal(t, []int{401, 402}, result.AffectedUserIds)
|
||||
for _, id := range []int{9502, 9503, 9504} {
|
||||
sub := getSubscriptionResetSub(t, id)
|
||||
assert.Zero(t, sub.AmountUsed)
|
||||
assert.Zero(t, sub.LastResetTime)
|
||||
assert.Zero(t, sub.NextResetTime)
|
||||
}
|
||||
assert.EqualValues(t, 1300, getSubscriptionResetSub(t, 9505).AmountUsed)
|
||||
assert.EqualValues(t, 1400, getSubscriptionResetSub(t, 9506).AmountUsed)
|
||||
}
|
||||
|
||||
func TestAdminResetPlanSubscriptionsNoMatchSucceeds(t *testing.T) {
|
||||
truncateTables(t)
|
||||
|
||||
plan := &SubscriptionPlan{
|
||||
Id: 9601,
|
||||
Title: "Empty",
|
||||
PriceAmount: 10,
|
||||
DurationUnit: SubscriptionDurationMonth,
|
||||
DurationValue: 1,
|
||||
TotalAmount: 1000,
|
||||
}
|
||||
seedSubscriptionResetPlan(t, plan)
|
||||
|
||||
result, err := AdminResetPlanSubscriptions(plan.Id, true)
|
||||
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, result)
|
||||
assert.Zero(t, result.MatchedCount)
|
||||
assert.Zero(t, result.ResetCount)
|
||||
assert.Zero(t, result.UserCount)
|
||||
assert.Empty(t, result.AffectedUserIds)
|
||||
}
|
||||
Reference in New Issue
Block a user