diff --git a/model/model.go b/model/model.go index 7503018..0119e49 100644 --- a/model/model.go +++ b/model/model.go @@ -266,6 +266,11 @@ type ShortPrivilege struct { CreatedAt time.Time `json:"created_at"` } +type ExpiredPrivileges struct { + UserID string + Privilege ShortPrivilege +} + type Account struct { ID string `json:"id"` UserID string `json:"user_id"` diff --git a/repository/account/account.go b/repository/account/account.go index 635a0ab..fec5f2a 100644 --- a/repository/account/account.go +++ b/repository/account/account.go @@ -206,13 +206,13 @@ func (r *AccountRepository) InsertPrivilege(ctx context.Context, privilege *mode } // test + -func (r *AccountRepository) GetExpired(ctx context.Context, privilegeID string) ([]model.ShortPrivilege, error) { +func (r *AccountRepository) GetExpired(ctx context.Context, privilegeID string) ([]model.ExpiredPrivileges, error) { rows, err := r.queries.GetExpiredDayPrivilege(ctx, sql.NullString{String: privilegeID, Valid: privilegeID != ""}) if err != nil { return nil, err } - var expiredRecords []model.ShortPrivilege + var expiredRecords []model.ExpiredPrivileges for _, row := range rows { privilege := model.ShortPrivilege{ @@ -222,20 +222,23 @@ func (r *AccountRepository) GetExpired(ctx context.Context, privilegeID string) Amount: uint64(row.Amount.Int32), CreatedAt: row.CreatedAt.Time, } - expiredRecords = append(expiredRecords, privilege) + expiredRecords = append(expiredRecords, model.ExpiredPrivileges{ + UserID: row.UserID.String, + Privilege: privilege, + }) } return expiredRecords, nil } -func (r *AccountRepository) GetExpiredCount(ctx context.Context, privilegeID string) ([]model.ShortPrivilege, error) { +func (r *AccountRepository) GetExpiredCount(ctx context.Context, privilegeID string) ([]model.ExpiredPrivileges, error) { rows, err := r.queries.GetExpiredCountPrivilege(ctx, sql.NullString{String: privilegeID, Valid: privilegeID != ""}) if err != nil { return nil, err } - var expiredRecords []model.ShortPrivilege + var expiredRecords []model.ExpiredPrivileges for _, row := range rows { privilege := model.ShortPrivilege{ @@ -245,7 +248,10 @@ func (r *AccountRepository) GetExpiredCount(ctx context.Context, privilegeID str Amount: uint64(row.Amount.Int32), CreatedAt: row.CreatedAt.Time, } - expiredRecords = append(expiredRecords, privilege) + expiredRecords = append(expiredRecords, model.ExpiredPrivileges{ + UserID: row.UserID.String, + Privilege: privilege, + }) }