coop-cloud-chaos-patchs
/
go-ssb-room
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #252 from gtim/dashboard-active-invites 

Exclude revoked invites in dashboard invite count (#177)
This commit is contained in:
Henry 2021-06-14 16:37:54 +02:00 committed by GitHub
parent c673872548 b3b2f59f90
commit 499ee484e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roomdb/interface.go
View File

@ -158,8 +158,8 @@ type InvitesService interface {
// List returns a list of all the valid invites
List(ctx context.Context) ([]Invite, error)
// Count returns the total number of invites.
Count(context.Context) (uint, error)
// Count returns the total number of invites, optionally excluding inactive invites
Count(ctx context.Context, onlyActive bool) (uint, error)
// Revoke removes a active invite and invalidates it for future use.
Revoke(ctx context.Context, id int64) error

18
roomdb/mockdb/invites.go
View File

@ -25,10 +25,11 @@ type FakeInvitesService struct {
result1 roomdb.Invite
result2 error
}
CountStub func(context.Context) (uint, error)
CountStub func(context.Context, bool) (uint, error)
countMutex sync.RWMutex
countArgsForCall []struct {
arg1 context.Context
arg2 bool
}
countReturns struct {
result1 uint
@ -175,18 +176,19 @@ func (fake *FakeInvitesService) ConsumeReturnsOnCall(i int, result1 roomdb.Invit
}{result1, result2}
}
func (fake *FakeInvitesService) Count(arg1 context.Context) (uint, error) {
func (fake *FakeInvitesService) Count(arg1 context.Context, arg2 bool) (uint, error) {
fake.countMutex.Lock()
ret, specificReturn := fake.countReturnsOnCall[len(fake.countArgsForCall)]
fake.countArgsForCall = append(fake.countArgsForCall, struct {
arg1 context.Context
}{arg1})
arg2 bool
}{arg1, arg2})
stub := fake.CountStub
fakeReturns := fake.countReturns
fake.recordInvocation("Count", []interface{}{arg1})
fake.recordInvocation("Count", []interface{}{arg1, arg2})
fake.countMutex.Unlock()
if stub != nil {
return stub(arg1)
return stub(arg1, arg2)
}
if specificReturn {
return ret.result1, ret.result2
@ -200,17 +202,17 @@ func (fake *FakeInvitesService) CountCallCount() int {
return len(fake.countArgsForCall)
}
func (fake *FakeInvitesService) CountCalls(stub func(context.Context) (uint, error)) {
func (fake *FakeInvitesService) CountCalls(stub func(context.Context, bool) (uint, error)) {
fake.countMutex.Lock()
defer fake.countMutex.Unlock()
fake.CountStub = stub
}
func (fake *FakeInvitesService) CountArgsForCall(i int) context.Context {
func (fake *FakeInvitesService) CountArgsForCall(i int) (context.Context, bool) {
fake.countMutex.RLock()
defer fake.countMutex.RUnlock()
argsForCall := fake.countArgsForCall[i]
return argsForCall.arg1
return argsForCall.arg1, argsForCall.arg2
}
func (fake *FakeInvitesService) CountReturns(result1 uint, result2 error) {

8
roomdb/sqlite/invites.go
View File

@ -250,8 +250,12 @@ func (i Invites) List(ctx context.Context) ([]roomdb.Invite, error) {
return invs, nil
}
func (i Invites) Count(ctx context.Context) (uint, error) {
count, err := models.Invites().Count(ctx, i.db)
func (i Invites) Count(ctx context.Context, onlyActive bool) (uint, error) {
queryMod := qm.Where("1")
if onlyActive {
queryMod = qm.Where("active = true")
}
count, err := models.Invites(queryMod).Count(ctx, i.db)
if err != nil {
return 0, err
}

4
web/handlers/admin/dashboard.go
View File

@ -77,9 +77,9 @@ func (h dashboardHandler) overview(w http.ResponseWriter, req *http.Request) (in
return nil, fmt.Errorf("failed to count members: %w", err)
}
inviteCount, err := h.dbs.Invites.Count(ctx)
inviteCount, err := h.dbs.Invites.Count(ctx, true)
if err != nil {
return nil, fmt.Errorf("failed to count invites: %w", err)
return nil, fmt.Errorf("failed to count active invites: %w", err)
}
deniedCount, err := h.dbs.DeniedKeys.Count(ctx)