Simplify message test setup

This commit is contained in:
Denis Arh
2019-09-10 19:40:56 +02:00
parent 0f500dfdbb
commit 9cedb5f71b
3 changed files with 8 additions and 28 deletions
+2 -14
View File
@@ -4,29 +4,17 @@ import (
"context"
"time"
"github.com/titpetric/factory"
"github.com/cortezaproject/corteza-server/messaging/repository"
"github.com/cortezaproject/corteza-server/messaging/types"
sysTypes "github.com/cortezaproject/corteza-server/system/types"
)
func (h helper) repoChannel() repository.ChannelRepository {
var (
ctx = context.Background()
db = factory.Database.MustGet("messaging").With(ctx)
)
return repository.Channel(ctx, db)
return repository.Channel(context.Background(), db())
}
func (h helper) repoChMember() repository.ChannelMemberRepository {
var (
ctx = context.Background()
db = factory.Database.MustGet("messaging").With(ctx)
)
return repository.ChannelMember(ctx, db)
return repository.ChannelMember(context.Background(), db())
}
func (h helper) repoMakePublicCh() *types.Channel {
+4
View File
@@ -46,6 +46,10 @@ var (
p = permissions.NewTestService()
)
func db() *factory.DB {
return factory.Database.MustGet("messaging").With(context.Background())
}
func InitConfig() {
var err error
+2 -14
View File
@@ -3,28 +3,16 @@ package messaging
import (
"context"
"github.com/titpetric/factory"
"github.com/cortezaproject/corteza-server/messaging/repository"
"github.com/cortezaproject/corteza-server/messaging/types"
sysTypes "github.com/cortezaproject/corteza-server/system/types"
)
func (h helper) repoMessage() repository.MessageRepository {
var (
ctx = context.Background()
db = factory.Database.MustGet("messaging").With(ctx)
)
return repository.Message(ctx, db)
return repository.Message(context.Background(), db())
}
func (h helper) repoMessageFlag() repository.MessageFlagRepository {
var (
ctx = context.Background()
db = factory.Database.MustGet("messaging").With(ctx)
)
return repository.MessageFlag(ctx, db)
return repository.MessageFlag(context.Background(), db())
}
func (h helper) repoMakeMessage(msg string, ch *types.Channel, u *sysTypes.User) *types.Message {