DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Decupling system & messaging, removing Organisation type mess

Browse Source
This commit is contained in:
Denis Arh
2019-04-26 14:37:23 +02:00
parent 8f7c7651a0
commit 3026a594ed
15 changed files with 66 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crm/internal/repository/repository.go
-9
View File
@@ -6,8 +6,6 @@ import (
"github.com/titpetric/factory"
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/internal/organization"
"github.com/crusttech/crust/messaging/types"
)
type (
@@ -27,13 +25,6 @@ func Identity(ctx context.Context) uint64 {
return auth.GetIdentityFromContext(ctx).Identity()
}
// Organisation returns the Organisation from context
func Organization(ctx context.Context) *types.Organisation {
return &types.Organisation{
organization.GetFromContext(ctx),
}
}
// With updates repository and database contexts
func (r *repository) With(ctx context.Context, db *factory.DB) *repository {
return &repository{
internal/mail/mail_mock_test.go
+2
View File
@@ -35,6 +35,7 @@ func (m *MockDialer) EXPECT() *MockDialerMockRecorder {
// DialAndSend mocks base method
func (m *MockDialer) DialAndSend(arg0 ...*mail_v2.Message) error {
m.ctrl.T.Helper()
varargs := []interface{}{}
for _, a := range arg0 {
varargs = append(varargs, a)
@@ -46,5 +47,6 @@ func (m *MockDialer) DialAndSend(arg0 ...*mail_v2.Message) error {
// DialAndSend indicates an expected call of DialAndSend
func (mr *MockDialerMockRecorder) DialAndSend(arg0 ...interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DialAndSend", reflect.TypeOf((*MockDialer)(nil).DialAndSend), arg0...)
}
internal/rules/resources_mock_test.go
+12
View File
@@ -36,6 +36,7 @@ func (m *MockResourcesInterface) EXPECT() *MockResourcesInterfaceMockRecorder {
// With mocks base method
func (m *MockResourcesInterface) With(ctx context.Context, db *factory.DB) ResourcesInterface {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "With", ctx, db)
ret0, _ := ret[0].(ResourcesInterface)
return ret0
@@ -43,11 +44,13 @@ func (m *MockResourcesInterface) With(ctx context.Context, db *factory.DB) Resou
// With indicates an expected call of With
func (mr *MockResourcesInterfaceMockRecorder) With(ctx, db interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockResourcesInterface)(nil).With), ctx, db)
}
// Check mocks base method
func (m *MockResourcesInterface) Check(resource Resource, operation string, fallbacks ...CheckAccessFunc) Access {
m.ctrl.T.Helper()
varargs := []interface{}{resource, operation}
for _, a := range fallbacks {
varargs = append(varargs, a)
@@ -59,12 +62,14 @@ func (m *MockResourcesInterface) Check(resource Resource, operation string, fall
// Check indicates an expected call of Check
func (mr *MockResourcesInterfaceMockRecorder) Check(resource, operation interface{}, fallbacks ...interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]interface{}{resource, operation}, fallbacks...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Check", reflect.TypeOf((*MockResourcesInterface)(nil).Check), varargs...)
}
// Grant mocks base method
func (m *MockResourcesInterface) Grant(roleID uint64, rules []Rule) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Grant", roleID, rules)
ret0, _ := ret[0].(error)
return ret0
@@ -72,11 +77,13 @@ func (m *MockResourcesInterface) Grant(roleID uint64, rules []Rule) error {
// Grant indicates an expected call of Grant
func (mr *MockResourcesInterfaceMockRecorder) Grant(roleID, rules interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Grant", reflect.TypeOf((*MockResourcesInterface)(nil).Grant), roleID, rules)
}
// Read mocks base method
func (m *MockResourcesInterface) Read(roleID uint64) ([]Rule, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Read", roleID)
ret0, _ := ret[0].([]Rule)
ret1, _ := ret[1].(error)
@@ -85,11 +92,13 @@ func (m *MockResourcesInterface) Read(roleID uint64) ([]Rule, error) {
// Read indicates an expected call of Read
func (mr *MockResourcesInterfaceMockRecorder) Read(roleID interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockResourcesInterface)(nil).Read), roleID)
}
// Delete mocks base method
func (m *MockResourcesInterface) Delete(roleID uint64) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", roleID)
ret0, _ := ret[0].(error)
return ret0
@@ -97,11 +106,13 @@ func (m *MockResourcesInterface) Delete(roleID uint64) error {
// Delete indicates an expected call of Delete
func (mr *MockResourcesInterfaceMockRecorder) Delete(roleID interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockResourcesInterface)(nil).Delete), roleID)
}
// Reset mocks base method
func (m *MockResourcesInterface) Reset(rules []Rule) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Reset", rules)
ret0, _ := ret[0].(error)
return ret0
@@ -109,5 +120,6 @@ func (m *MockResourcesInterface) Reset(rules []Rule) error {
// Reset indicates an expected call of Reset
func (mr *MockResourcesInterfaceMockRecorder) Reset(rules interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Reset", reflect.TypeOf((*MockResourcesInterface)(nil).Reset), rules)
}
messaging/internal/repository/repository.go
-9
View File
@@ -6,8 +6,6 @@ import (
"github.com/titpetric/factory"
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/internal/organization"
"github.com/crusttech/crust/messaging/types"
)
type (
@@ -27,13 +25,6 @@ func Identity(ctx context.Context) uint64 {
return auth.GetIdentityFromContext(ctx).Identity()
}
// Organisation returns the Organisation from context
func Organization(ctx context.Context) *types.Organisation {
return &types.Organisation{
organization.GetFromContext(ctx),
}
}
// With updates repository and database contexts
func (r *repository) With(ctx context.Context, db *factory.DB) *repository {
return &repository{
messaging/internal/service/attachment.go
-10
View File
@@ -19,7 +19,6 @@ import (
"github.com/crusttech/crust/internal/store"
"github.com/crusttech/crust/messaging/internal/repository"
"github.com/crusttech/crust/messaging/types"
systemService "github.com/crusttech/crust/system/service"
)
const (
@@ -33,7 +32,6 @@ type (
ctx context.Context
store store.Store
user systemService.UserService
event EventService
attachment repository.AttachmentRepository
@@ -63,7 +61,6 @@ func (svc *attachment) With(ctx context.Context) AttachmentService {
ctx: ctx,
store: svc.store,
user: systemService.User(ctx),
event: Event(ctx),
attachment: repository.Attachment(ctx, db),
@@ -287,13 +284,6 @@ func (svc *attachment) processImage(original io.ReadSeeker, att *types.Attachmen
//
// It also preloads user
func (svc *attachment) sendEvent(msg *types.Message) (err error) {
if msg.User == nil {
// @todo pull user from cache
if msg.User, err = svc.user.FindByID(msg.UserID); err != nil {
return
}
}
return svc.event.Message(msg)
}
messaging/internal/service/channel.go
+1 -35
View File
@@ -11,7 +11,6 @@ import (
"github.com/crusttech/crust/internal/organization"
"github.com/crusttech/crust/messaging/internal/repository"
"github.com/crusttech/crust/messaging/types"
systemService "github.com/crusttech/crust/system/service"
)
type (
@@ -19,8 +18,6 @@ type (
db db
ctx context.Context
user systemService.UserService
event EventService
perms PermissionsService
@@ -77,7 +74,6 @@ func (svc *channel) With(ctx context.Context) ChannelService {
db: db,
ctx: ctx,
user: systemService.User(ctx),
event: Event(ctx),
perms: Permissions(ctx),
@@ -187,14 +183,7 @@ func (svc *channel) FindMembers(channelID uint64) (out types.ChannelMemberSet, e
return err
}
if uu, err := svc.user.Find(nil); err != nil {
return err
} else {
return out.Walk(func(member *types.ChannelMember) error {
member.User = uu.FindByID(member.UserID)
return nil
})
}
return
})
}
@@ -579,20 +568,9 @@ func (svc *channel) InviteUser(channelID uint64, memberIDs ...uint64) (out types
return
}
users, err := svc.user.Find(nil)
if err != nil {
return err
}
for _, memberID := range memberIDs {
user := users.FindByID(memberID)
if user == nil {
return errors.New("unexisting user")
}
if e := existing.FindByUserID(memberID); e != nil {
// Already a member/invited
e.User = user
out = append(out, e)
continue
}
@@ -638,22 +616,11 @@ func (svc *channel) AddMember(channelID uint64, memberIDs ...uint64) (out types.
return
}
users, err := svc.user.Find(nil)
if err != nil {
return err
}
for _, memberID := range memberIDs {
var exists bool
user := users.FindByID(memberID)
if user == nil {
return errors.New("unexisting user")
}
if e := existing.FindByUserID(memberID); e != nil {
if e.Type != types.ChannelMembershipTypeInvitee {
e.User = user
out = append(out, e)
continue
} else {
@@ -679,7 +646,6 @@ func (svc *channel) AddMember(channelID uint64, memberIDs ...uint64) (out types.
ChannelID: channelID,
UserID: memberID,
Type: types.ChannelMembershipTypeOwner,
User: user,
}
if exists {
messaging/internal/service/message.go
-35
View File
@@ -11,8 +11,6 @@ import (
"github.com/crusttech/crust/internal/payload"
"github.com/crusttech/crust/messaging/internal/repository"
"github.com/crusttech/crust/messaging/types"
systemService "github.com/crusttech/crust/system/service"
systemTypes "github.com/crusttech/crust/system/types"
)
type (
@@ -28,7 +26,6 @@ type (
mflag repository.MessageFlagRepository
mentions repository.MentionRepository
usr systemService.UserService
event EventService
prm PermissionsService
}
@@ -77,7 +74,6 @@ func (svc *message) With(ctx context.Context) MessageService {
db: db,
ctx: ctx,
usr: systemService.User(ctx),
event: Event(ctx),
prm: Permissions(ctx),
@@ -536,10 +532,6 @@ func (svc *message) flag(messageID uint64, flag string, remove bool) error {
}
func (svc *message) preload(mm types.MessageSet) (err error) {
if err = svc.preloadUsers(mm); err != nil {
return
}
if err = svc.preloadAttachments(mm); err != nil {
return
}
@@ -559,28 +551,6 @@ func (svc *message) preload(mm types.MessageSet) (err error) {
return
}
// Preload for all messages
func (svc *message) preloadUsers(mm types.MessageSet) (err error) {
var uu systemTypes.UserSet
for _, msg := range mm {
if msg.User != nil || msg.UserID == 0 {
continue
}
if msg.User = uu.FindByID(msg.UserID); msg.User != nil {
continue
}
if msg.User, _ = svc.usr.FindByID(msg.UserID); msg.User != nil {
// @todo fix this handler errors (ignore user-not-found, return others)
uu = append(uu, msg.User)
}
}
return
}
// Preload for all messages
func (svc *message) preloadFlags(mm types.MessageSet) (err error) {
var ff types.MessageFlagSet
@@ -650,11 +620,6 @@ func (svc *message) sendEvent(mm ...*types.Message) (err error) {
}
for _, msg := range mm {
if msg.User == nil {
// @todo fix this handler errors (ignore user-not-found, return others)
msg.User, _ = svc.usr.FindByID(msg.UserID)
}
if err = svc.event.Message(msg); err != nil {
return
}
messaging/types/channel_member.go
+1 -4
View File
@@ -2,16 +2,13 @@ package types
import (
"time"
systemTypes "github.com/crusttech/crust/system/types"
)
type (
ChannelMember struct {
ChannelID uint64 `db:"rel_channel"`
UserID uint64 `db:"rel_user"`
User *systemTypes.User `db:"-"`
UserID uint64 `db:"rel_user"`
Type ChannelMembershipType `db:"type"`
Flag ChannelMembershipFlag `db:"flag"`
messaging/types/message.go
+2 -4
View File
@@ -10,7 +10,6 @@ import (
"github.com/pkg/errors"
"github.com/crusttech/crust/internal/rules"
systemTypes "github.com/crusttech/crust/system/types"
)
type (
@@ -27,9 +26,8 @@ type (
UpdatedAt *time.Time `json:"updatedAt,omitempty" db:"updated_at"`
DeletedAt *time.Time `json:"deletedAt,omitempty" db:"deleted_at"`
Attachment *Attachment `json:"attachment,omitempty"`
User *systemTypes.User `json:"user,omitempty"`
Flags MessageFlagSet `json:"flags,omitempty"`
Attachment *Attachment `json:"attachment,omitempty"`
Flags MessageFlagSet `json:"flags,omitempty"`
Mentions MentionSet
RepliesFrom []uint64
messaging/types/organisation.go
-13
View File
@@ -1,13 +0,0 @@
package types
import (
"github.com/crusttech/crust/system/types"
)
type (
// Organisations - Organisations represent a top-level grouping entity.
// There may be many organisations defined in a single deployment.
Organisation struct {
types.Organisation
}
)
messaging/websocket/session.go
+2 -6
View File
@@ -15,8 +15,6 @@ import (
"github.com/crusttech/crust/messaging/internal/repository"
"github.com/crusttech/crust/messaging/internal/service"
"github.com/crusttech/crust/messaging/types"
systemService "github.com/crusttech/crust/system/service"
)
type (
@@ -39,9 +37,8 @@ type (
user auth.Identifiable
svc struct {
user systemService.UserService
ch service.ChannelService
msg service.MessageService
ch service.ChannelService
msg service.MessageService
}
}
)
@@ -56,7 +53,6 @@ func (Session) New(ctx context.Context, config *repository.Flags, conn *websocke
stop: make(chan []byte, 1),
}
s.svc.user = systemService.DefaultUser
s.svc.ch = service.DefaultChannel
s.svc.msg = service.DefaultMessage
messaging/websocket/websocket.go
+2 -12
View File
@@ -10,14 +10,10 @@ import (
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/messaging/internal/repository"
systemService "github.com/crusttech/crust/system/service"
)
type (
Websocket struct {
svc struct {
user systemService.UserService
}
config *repository.Flags
}
)
@@ -26,7 +22,7 @@ func (Websocket) New(config *repository.Flags) *Websocket {
ws := &Websocket{
config: config,
}
ws.svc.user = systemService.DefaultUser
return ws
}
@@ -49,12 +45,6 @@ func (ws Websocket) Open(w http.ResponseWriter, r *http.Request) {
return
}
user, err := systemService.User(ctx).FindByID(identity.Identity())
if err != nil {
resputil.JSON(w, err)
return
}
conn, err := upgrader.Upgrade(w, r, nil)
if _, ok := err.(websocket.HandshakeError); ok {
resputil.JSON(w, errors.Wrap(err, "ws: need a websocket handshake"))
@@ -65,7 +55,7 @@ func (ws Websocket) Open(w http.ResponseWriter, r *http.Request) {
}
session := store.Save((&Session{}).New(ctx, ws.config, conn))
session.user = user
session.user = identity
if err := session.Handle(); err != nil {
log.Printf("Session handler returned an error: %v", err)
system/internal/repository/mocks/credentials.go
+20
View File
@@ -38,6 +38,7 @@ func (m *MockCredentialsRepository) EXPECT() *MockCredentialsRepositoryMockRecor
// With mocks base method
func (m *MockCredentialsRepository) With(ctx context.Context, db *factory.DB) repository.CredentialsRepository {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "With", ctx, db)
ret0, _ := ret[0].(repository.CredentialsRepository)
return ret0
@@ -45,11 +46,13 @@ func (m *MockCredentialsRepository) With(ctx context.Context, db *factory.DB) re
// With indicates an expected call of With
func (mr *MockCredentialsRepositoryMockRecorder) With(ctx, db interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockCredentialsRepository)(nil).With), ctx, db)
}
// FindByID mocks base method
func (m *MockCredentialsRepository) FindByID(ID uint64) (*types.Credentials, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByID", ID)
ret0, _ := ret[0].(*types.Credentials)
ret1, _ := ret[1].(error)
@@ -58,11 +61,13 @@ func (m *MockCredentialsRepository) FindByID(ID uint64) (*types.Credentials, err
// FindByID indicates an expected call of FindByID
func (mr *MockCredentialsRepositoryMockRecorder) FindByID(ID interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByID", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByID), ID)
}
// FindByCredentials mocks base method
func (m *MockCredentialsRepository) FindByCredentials(kind, credentials string) (types.CredentialsSet, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByCredentials", kind, credentials)
ret0, _ := ret[0].(types.CredentialsSet)
ret1, _ := ret[1].(error)
@@ -71,11 +76,13 @@ func (m *MockCredentialsRepository) FindByCredentials(kind, credentials string)
// FindByCredentials indicates an expected call of FindByCredentials
func (mr *MockCredentialsRepositoryMockRecorder) FindByCredentials(kind, credentials interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByCredentials", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByCredentials), kind, credentials)
}
// FindByKind mocks base method
func (m *MockCredentialsRepository) FindByKind(ownerID uint64, kind string) (types.CredentialsSet, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByKind", ownerID, kind)
ret0, _ := ret[0].(types.CredentialsSet)
ret1, _ := ret[1].(error)
@@ -84,11 +91,13 @@ func (m *MockCredentialsRepository) FindByKind(ownerID uint64, kind string) (typ
// FindByKind indicates an expected call of FindByKind
func (mr *MockCredentialsRepositoryMockRecorder) FindByKind(ownerID, kind interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByKind", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByKind), ownerID, kind)
}
// FindByOwnerID mocks base method
func (m *MockCredentialsRepository) FindByOwnerID(ownerID uint64) (types.CredentialsSet, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByOwnerID", ownerID)
ret0, _ := ret[0].(types.CredentialsSet)
ret1, _ := ret[1].(error)
@@ -97,11 +106,13 @@ func (m *MockCredentialsRepository) FindByOwnerID(ownerID uint64) (types.Credent
// FindByOwnerID indicates an expected call of FindByOwnerID
func (mr *MockCredentialsRepositoryMockRecorder) FindByOwnerID(ownerID interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByOwnerID", reflect.TypeOf((*MockCredentialsRepository)(nil).FindByOwnerID), ownerID)
}
// Find mocks base method
func (m *MockCredentialsRepository) Find() (types.CredentialsSet, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Find")
ret0, _ := ret[0].(types.CredentialsSet)
ret1, _ := ret[1].(error)
@@ -110,11 +121,13 @@ func (m *MockCredentialsRepository) Find() (types.CredentialsSet, error) {
// Find indicates an expected call of Find
func (mr *MockCredentialsRepositoryMockRecorder) Find() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockCredentialsRepository)(nil).Find))
}
// Create mocks base method
func (m *MockCredentialsRepository) Create(c *types.Credentials) (*types.Credentials, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", c)
ret0, _ := ret[0].(*types.Credentials)
ret1, _ := ret[1].(error)
@@ -123,11 +136,13 @@ func (m *MockCredentialsRepository) Create(c *types.Credentials) (*types.Credent
// Create indicates an expected call of Create
func (mr *MockCredentialsRepositoryMockRecorder) Create(c interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockCredentialsRepository)(nil).Create), c)
}
// Update mocks base method
func (m *MockCredentialsRepository) Update(c *types.Credentials) (*types.Credentials, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", c)
ret0, _ := ret[0].(*types.Credentials)
ret1, _ := ret[1].(error)
@@ -136,11 +151,13 @@ func (m *MockCredentialsRepository) Update(c *types.Credentials) (*types.Credent
// Update indicates an expected call of Update
func (mr *MockCredentialsRepositoryMockRecorder) Update(c interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockCredentialsRepository)(nil).Update), c)
}
// DeleteByID mocks base method
func (m *MockCredentialsRepository) DeleteByID(id uint64) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DeleteByID", id)
ret0, _ := ret[0].(error)
return ret0
@@ -148,11 +165,13 @@ func (m *MockCredentialsRepository) DeleteByID(id uint64) error {
// DeleteByID indicates an expected call of DeleteByID
func (mr *MockCredentialsRepositoryMockRecorder) DeleteByID(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByID", reflect.TypeOf((*MockCredentialsRepository)(nil).DeleteByID), id)
}
// DeleteByKind mocks base method
func (m *MockCredentialsRepository) DeleteByKind(ownerID uint64, kind string) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DeleteByKind", ownerID, kind)
ret0, _ := ret[0].(error)
return ret0
@@ -160,5 +179,6 @@ func (m *MockCredentialsRepository) DeleteByKind(ownerID uint64, kind string) er
// DeleteByKind indicates an expected call of DeleteByKind
func (mr *MockCredentialsRepositoryMockRecorder) DeleteByKind(ownerID, kind interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByKind", reflect.TypeOf((*MockCredentialsRepository)(nil).DeleteByKind), ownerID, kind)
}
system/internal/repository/mocks/user.go
+24
View File
@@ -39,6 +39,7 @@ func (m *MockUserRepository) EXPECT() *MockUserRepositoryMockRecorder {
// With mocks base method
func (m *MockUserRepository) With(ctx context.Context, db *factory.DB) repository.UserRepository {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "With", ctx, db)
ret0, _ := ret[0].(repository.UserRepository)
return ret0
@@ -46,11 +47,13 @@ func (m *MockUserRepository) With(ctx context.Context, db *factory.DB) repositor
// With indicates an expected call of With
func (mr *MockUserRepositoryMockRecorder) With(ctx, db interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "With", reflect.TypeOf((*MockUserRepository)(nil).With), ctx, db)
}
// FindByEmail mocks base method
func (m *MockUserRepository) FindByEmail(email string) (*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByEmail", email)
ret0, _ := ret[0].(*types.User)
ret1, _ := ret[1].(error)
@@ -59,11 +62,13 @@ func (m *MockUserRepository) FindByEmail(email string) (*types.User, error) {
// FindByEmail indicates an expected call of FindByEmail
func (mr *MockUserRepositoryMockRecorder) FindByEmail(email interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByEmail", reflect.TypeOf((*MockUserRepository)(nil).FindByEmail), email)
}
// FindByUsername mocks base method
func (m *MockUserRepository) FindByUsername(username string) (*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByUsername", username)
ret0, _ := ret[0].(*types.User)
ret1, _ := ret[1].(error)
@@ -72,11 +77,13 @@ func (m *MockUserRepository) FindByUsername(username string) (*types.User, error
// FindByUsername indicates an expected call of FindByUsername
func (mr *MockUserRepositoryMockRecorder) FindByUsername(username interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByUsername", reflect.TypeOf((*MockUserRepository)(nil).FindByUsername), username)
}
// FindByID mocks base method
func (m *MockUserRepository) FindByID(id uint64) (*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "FindByID", id)
ret0, _ := ret[0].(*types.User)
ret1, _ := ret[1].(error)
@@ -85,11 +92,13 @@ func (m *MockUserRepository) FindByID(id uint64) (*types.User, error) {
// FindByID indicates an expected call of FindByID
func (mr *MockUserRepositoryMockRecorder) FindByID(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByID", reflect.TypeOf((*MockUserRepository)(nil).FindByID), id)
}
// FindByIDs mocks base method
func (m *MockUserRepository) FindByIDs(id ...uint64) (types.UserSet, error) {
m.ctrl.T.Helper()
varargs := []interface{}{}
for _, a := range id {
varargs = append(varargs, a)
@@ -102,11 +111,13 @@ func (m *MockUserRepository) FindByIDs(id ...uint64) (types.UserSet, error) {
// FindByIDs indicates an expected call of FindByIDs
func (mr *MockUserRepositoryMockRecorder) FindByIDs(id ...interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByIDs", reflect.TypeOf((*MockUserRepository)(nil).FindByIDs), id...)
}
// Find mocks base method
func (m *MockUserRepository) Find(filter *types.UserFilter) ([]*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Find", filter)
ret0, _ := ret[0].([]*types.User)
ret1, _ := ret[1].(error)
@@ -115,11 +126,13 @@ func (m *MockUserRepository) Find(filter *types.UserFilter) ([]*types.User, erro
// Find indicates an expected call of Find
func (mr *MockUserRepositoryMockRecorder) Find(filter interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Find", reflect.TypeOf((*MockUserRepository)(nil).Find), filter)
}
// Create mocks base method
func (m *MockUserRepository) Create(mod *types.User) (*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", mod)
ret0, _ := ret[0].(*types.User)
ret1, _ := ret[1].(error)
@@ -128,11 +141,13 @@ func (m *MockUserRepository) Create(mod *types.User) (*types.User, error) {
// Create indicates an expected call of Create
func (mr *MockUserRepositoryMockRecorder) Create(mod interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockUserRepository)(nil).Create), mod)
}
// Update mocks base method
func (m *MockUserRepository) Update(mod *types.User) (*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", mod)
ret0, _ := ret[0].(*types.User)
ret1, _ := ret[1].(error)
@@ -141,11 +156,13 @@ func (m *MockUserRepository) Update(mod *types.User) (*types.User, error) {
// Update indicates an expected call of Update
func (mr *MockUserRepositoryMockRecorder) Update(mod interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockUserRepository)(nil).Update), mod)
}
// BindAvatar mocks base method
func (m *MockUserRepository) BindAvatar(user *types.User, avatar io.Reader) (*types.User, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "BindAvatar", user, avatar)
ret0, _ := ret[0].(*types.User)
ret1, _ := ret[1].(error)
@@ -154,11 +171,13 @@ func (m *MockUserRepository) BindAvatar(user *types.User, avatar io.Reader) (*ty
// BindAvatar indicates an expected call of BindAvatar
func (mr *MockUserRepositoryMockRecorder) BindAvatar(user, avatar interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BindAvatar", reflect.TypeOf((*MockUserRepository)(nil).BindAvatar), user, avatar)
}
// SuspendByID mocks base method
func (m *MockUserRepository) SuspendByID(id uint64) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "SuspendByID", id)
ret0, _ := ret[0].(error)
return ret0
@@ -166,11 +185,13 @@ func (m *MockUserRepository) SuspendByID(id uint64) error {
// SuspendByID indicates an expected call of SuspendByID
func (mr *MockUserRepositoryMockRecorder) SuspendByID(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SuspendByID", reflect.TypeOf((*MockUserRepository)(nil).SuspendByID), id)
}
// UnsuspendByID mocks base method
func (m *MockUserRepository) UnsuspendByID(id uint64) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "UnsuspendByID", id)
ret0, _ := ret[0].(error)
return ret0
@@ -178,11 +199,13 @@ func (m *MockUserRepository) UnsuspendByID(id uint64) error {
// UnsuspendByID indicates an expected call of UnsuspendByID
func (mr *MockUserRepositoryMockRecorder) UnsuspendByID(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnsuspendByID", reflect.TypeOf((*MockUserRepository)(nil).UnsuspendByID), id)
}
// DeleteByID mocks base method
func (m *MockUserRepository) DeleteByID(id uint64) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DeleteByID", id)
ret0, _ := ret[0].(error)
return ret0
@@ -190,5 +213,6 @@ func (m *MockUserRepository) DeleteByID(id uint64) error {
// DeleteByID indicates an expected call of DeleteByID
func (mr *MockUserRepositoryMockRecorder) DeleteByID(id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByID", reflect.TypeOf((*MockUserRepository)(nil).DeleteByID), id)
}
system/internal/repository/repository.go
-9
View File
@@ -6,8 +6,6 @@ import (
"github.com/titpetric/factory"
"github.com/crusttech/crust/internal/auth"
"github.com/crusttech/crust/internal/organization"
"github.com/crusttech/crust/messaging/types"
)
type (
@@ -27,13 +25,6 @@ func Identity(ctx context.Context) uint64 {
return auth.GetIdentityFromContext(ctx).Identity()
}
// Organisation returns the Organisation from context
func Organization(ctx context.Context) *types.Organisation {
return &types.Organisation{
organization.GetFromContext(ctx),
}
}
// With updates repository and database contexts
func (r *repository) With(ctx context.Context, db *factory.DB) *repository {
return &repository{