fixed doc env vars + mongo v2 migration
This commit is contained in:
@@ -3,7 +3,7 @@ package model
|
||||
import (
|
||||
"github.com/tech/sendico/pkg/db/storable"
|
||||
"github.com/tech/sendico/pkg/mservice"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
@@ -49,11 +49,11 @@ func (a *Account) MatchPassword(password string) bool {
|
||||
return err == nil
|
||||
}
|
||||
|
||||
func AnonymousUserName(orgRef primitive.ObjectID) string {
|
||||
func AnonymousUserName(orgRef bson.ObjectID) string {
|
||||
return "anonymous@" + orgRef.Hex()
|
||||
}
|
||||
|
||||
func AccountIsAnonymous(account *UserDataBase, orgRef primitive.ObjectID) bool {
|
||||
func AccountIsAnonymous(account *UserDataBase, orgRef bson.ObjectID) bool {
|
||||
if account == nil {
|
||||
return false
|
||||
}
|
||||
@@ -61,13 +61,13 @@ func AccountIsAnonymous(account *UserDataBase, orgRef primitive.ObjectID) bool {
|
||||
}
|
||||
|
||||
type AccountBound interface {
|
||||
GetAccountRef() primitive.ObjectID
|
||||
GetAccountRef() bson.ObjectID
|
||||
}
|
||||
|
||||
type AccountBoundStorable interface {
|
||||
storable.Storable
|
||||
OrganizationBound
|
||||
GetAccountRef() *primitive.ObjectID
|
||||
GetAccountRef() *bson.ObjectID
|
||||
}
|
||||
|
||||
const (
|
||||
@@ -77,9 +77,9 @@ const (
|
||||
type AccountBoundBase struct {
|
||||
storable.Base `bson:",inline" json:",inline"`
|
||||
OrganizationBoundBase `bson:",inline" json:",inline"`
|
||||
AccountRef *primitive.ObjectID `bson:"accountRef,omitempty" json:"accountRef,omitempty"`
|
||||
AccountRef *bson.ObjectID `bson:"accountRef,omitempty" json:"accountRef,omitempty"`
|
||||
}
|
||||
|
||||
func (a *AccountBoundBase) GetAccountRef() *primitive.ObjectID {
|
||||
func (a *AccountBoundBase) GetAccountRef() *bson.ObjectID {
|
||||
return a.AccountRef
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user