mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-17 14:57:27 +00:00
feat(subscription): 支持恢复已撤销订阅
This commit is contained in:
1 parent
7dc7cfce1d
commit
b26dcc3da2
17 files changed
+382
-19
No files matched your search
@@ -75,6 +75,21 @@ func (r *userSubscriptionRepository) GetByID(ctx context.Context, id int64) (*se
|
||||
return userSubscriptionEntityToService(m), nil
|
||||
}
|
||||
|
||||
func (r *userSubscriptionRepository) GetByIDIncludeDeleted(ctx context.Context, id int64) (*service.UserSubscription, error) {
|
||||
client := clientFromContext(ctx, r.client)
|
||||
queryCtx := mixins.SkipSoftDelete(ctx)
|
||||
m, err := client.UserSubscription.Query().
|
||||
Where(usersubscription.IDEQ(id)).
|
||||
WithUser().
|
||||
WithGroup().
|
||||
WithAssignedByUser().
|
||||
Only(queryCtx)
|
||||
if err != nil {
|
||||
return nil, translatePersistenceError(err, service.ErrSubscriptionNotFound, nil)
|
||||
}
|
||||
return userSubscriptionEntityToServicePreserveStatus(m), nil
|
||||
}
|
||||
|
||||
func (r *userSubscriptionRepository) GetByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (*service.UserSubscription, error) {
|
||||
client := clientFromContext(ctx, r.client)
|
||||
m, err := client.UserSubscription.Query().
|
||||
@@ -141,6 +156,20 @@ func (r *userSubscriptionRepository) Delete(ctx context.Context, id int64) error
|
||||
return err
|
||||
}
|
||||
|
||||
func (r *userSubscriptionRepository) Restore(ctx context.Context, subscriptionID int64, restoredStatus string) (*service.UserSubscription, error) {
|
||||
client := clientFromContext(ctx, r.client)
|
||||
queryCtx := mixins.SkipSoftDelete(ctx)
|
||||
_, err := client.UserSubscription.UpdateOneID(subscriptionID).
|
||||
SetStatus(restoredStatus).
|
||||
ClearDeletedAt().
|
||||
SetUpdatedAt(time.Now()).
|
||||
Save(queryCtx)
|
||||
if err != nil {
|
||||
return nil, translatePersistenceError(err, service.ErrSubscriptionNotFound, service.ErrSubscriptionRestoreConflict)
|
||||
}
|
||||
return r.GetByID(ctx, subscriptionID)
|
||||
}
|
||||
|
||||
func (r *userSubscriptionRepository) ListByUserID(ctx context.Context, userID int64) ([]service.UserSubscription, error) {
|
||||
client := clientFromContext(ctx, r.client)
|
||||
subs, err := client.UserSubscription.Query().
|
||||
@@ -299,6 +328,10 @@ func (r *userSubscriptionRepository) ExistsByUserIDAndGroupID(ctx context.Contex
|
||||
Exist(ctx)
|
||||
}
|
||||
|
||||
func (r *userSubscriptionRepository) ExistsActiveByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (bool, error) {
|
||||
return r.ExistsByUserIDAndGroupID(ctx, userID, groupID)
|
||||
}
|
||||
|
||||
func (r *userSubscriptionRepository) ExtendExpiry(ctx context.Context, subscriptionID int64, newExpiresAt time.Time) error {
|
||||
client := clientFromContext(ctx, r.client)
|
||||
_, err := client.UserSubscription.UpdateOneID(subscriptionID).
|
||||
@@ -520,11 +553,19 @@ func uniqueInt64s(values []int64) []int64 {
|
||||
}
|
||||
|
||||
func userSubscriptionEntityToService(m *dbent.UserSubscription) *service.UserSubscription {
|
||||
return userSubscriptionEntityToServiceWithStatusMapping(m, true)
|
||||
}
|
||||
|
||||
func userSubscriptionEntityToServicePreserveStatus(m *dbent.UserSubscription) *service.UserSubscription {
|
||||
return userSubscriptionEntityToServiceWithStatusMapping(m, false)
|
||||
}
|
||||
|
||||
func userSubscriptionEntityToServiceWithStatusMapping(m *dbent.UserSubscription, mapDeletedToRevoked bool) *service.UserSubscription {
|
||||
if m == nil {
|
||||
return nil
|
||||
}
|
||||
status := m.Status
|
||||
if m.DeletedAt != nil {
|
||||
if mapDeletedToRevoked && m.DeletedAt != nil {
|
||||
status = service.SubscriptionStatusRevoked
|
||||
}
|
||||
out := &service.UserSubscription{
|
||||
|
||||
@@ -157,6 +157,41 @@ func (s *UserSubscriptionRepoSuite) TestDelete() {
|
||||
s.Require().Error(err, "expected error after delete")
|
||||
}
|
||||
|
||||
func (s *UserSubscriptionRepoSuite) TestGetByIDIncludeDeleted_PreservesPersistedStatus() {
|
||||
user := s.mustCreateUser("include-deleted@test.com", service.RoleUser)
|
||||
group := s.mustCreateGroup("g-include-deleted")
|
||||
sub := s.mustCreateSubscription(user.ID, group.ID, func(c *dbent.UserSubscriptionCreate) {
|
||||
c.SetStatus(service.SubscriptionStatusActive)
|
||||
})
|
||||
|
||||
s.Require().NoError(s.repo.Delete(s.ctx, sub.ID), "Delete")
|
||||
|
||||
got, err := s.repo.GetByIDIncludeDeleted(s.ctx, sub.ID)
|
||||
s.Require().NoError(err, "GetByIDIncludeDeleted")
|
||||
s.Require().Equal(service.SubscriptionStatusActive, got.Status)
|
||||
s.Require().NotNil(got.DeletedAt)
|
||||
s.Require().NotNil(got.User)
|
||||
s.Require().NotNil(got.Group)
|
||||
}
|
||||
|
||||
func (s *UserSubscriptionRepoSuite) TestRestore() {
|
||||
user := s.mustCreateUser("restore@test.com", service.RoleUser)
|
||||
group := s.mustCreateGroup("g-restore")
|
||||
sub := s.mustCreateSubscription(user.ID, group.ID, nil)
|
||||
|
||||
s.Require().NoError(s.repo.Delete(s.ctx, sub.ID), "Delete")
|
||||
|
||||
restored, err := s.repo.Restore(s.ctx, sub.ID, service.SubscriptionStatusExpired)
|
||||
s.Require().NoError(err, "Restore")
|
||||
s.Require().Equal(service.SubscriptionStatusExpired, restored.Status)
|
||||
s.Require().Nil(restored.DeletedAt)
|
||||
|
||||
got, err := s.repo.GetByID(s.ctx, sub.ID)
|
||||
s.Require().NoError(err, "GetByID after restore")
|
||||
s.Require().Nil(got.DeletedAt)
|
||||
s.Require().Equal(service.SubscriptionStatusExpired, got.Status)
|
||||
}
|
||||
|
||||
func (s *UserSubscriptionRepoSuite) TestDelete_Idempotent() {
|
||||
s.Require().NoError(s.repo.Delete(s.ctx, 42424242), "Delete should be idempotent")
|
||||
}
|
||||
@@ -587,6 +622,22 @@ func (s *UserSubscriptionRepoSuite) TestExistsByUserIDAndGroupID() {
|
||||
s.Require().False(notExists)
|
||||
}
|
||||
|
||||
func (s *UserSubscriptionRepoSuite) TestExistsActiveByUserIDAndGroupID_IgnoresSoftDeletedRows() {
|
||||
user := s.mustCreateUser("exists-active@test.com", service.RoleUser)
|
||||
group := s.mustCreateGroup("g-exists-active")
|
||||
sub := s.mustCreateSubscription(user.ID, group.ID, nil)
|
||||
|
||||
exists, err := s.repo.ExistsActiveByUserIDAndGroupID(s.ctx, user.ID, group.ID)
|
||||
s.Require().NoError(err, "ExistsActiveByUserIDAndGroupID")
|
||||
s.Require().True(exists)
|
||||
|
||||
s.Require().NoError(s.repo.Delete(s.ctx, sub.ID), "Delete")
|
||||
|
||||
exists, err = s.repo.ExistsActiveByUserIDAndGroupID(s.ctx, user.ID, group.ID)
|
||||
s.Require().NoError(err, "ExistsActiveByUserIDAndGroupID after delete")
|
||||
s.Require().False(exists)
|
||||
}
|
||||
|
||||
// --- CountByGroupID / CountActiveByGroupID ---
|
||||
|
||||
func (s *UserSubscriptionRepoSuite) TestCountByGroupID() {
|
||||
|
||||
Reference in new issue
Block a user