Adjust + Test
This commit is contained in:
@@ -18,34 +18,48 @@ type MockWorkspaceAccessor struct {
|
||||
workspace.Workspace
|
||||
}
|
||||
|
||||
func safeDBObject(v interface{}) utils.DBObject {
|
||||
if v == nil {
|
||||
return nil
|
||||
}
|
||||
return v.(utils.DBObject)
|
||||
}
|
||||
|
||||
func safeShallowList(v interface{}) []utils.ShallowDBObject {
|
||||
if v == nil {
|
||||
return nil
|
||||
}
|
||||
return v.([]utils.ShallowDBObject)
|
||||
}
|
||||
|
||||
func (m *MockWorkspaceAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
|
||||
args := m.Called(data)
|
||||
return args.Get(0).(utils.DBObject), args.Int(1), args.Error(2)
|
||||
return safeDBObject(args.Get(0)), args.Int(1), args.Error(2)
|
||||
}
|
||||
|
||||
func (m *MockWorkspaceAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
|
||||
args := m.Called(set, id)
|
||||
return args.Get(0).(utils.DBObject), args.Int(1), args.Error(2)
|
||||
return safeDBObject(args.Get(0)), args.Int(1), args.Error(2)
|
||||
}
|
||||
|
||||
func (m *MockWorkspaceAccessor) DeleteOne(id string) (utils.DBObject, int, error) {
|
||||
args := m.Called(id)
|
||||
return args.Get(0).(utils.DBObject), args.Int(1), args.Error(2)
|
||||
return safeDBObject(args.Get(0)), args.Int(1), args.Error(2)
|
||||
}
|
||||
|
||||
func (m *MockWorkspaceAccessor) LoadOne(id string) (utils.DBObject, int, error) {
|
||||
args := m.Called(id)
|
||||
return args.Get(0).(utils.DBObject), args.Int(1), args.Error(2)
|
||||
return safeDBObject(args.Get(0)), args.Int(1), args.Error(2)
|
||||
}
|
||||
|
||||
func (m *MockWorkspaceAccessor) LoadAll(isDraft bool) ([]utils.ShallowDBObject, int, error) {
|
||||
args := m.Called(isDraft)
|
||||
return args.Get(0).([]utils.ShallowDBObject), args.Int(1), args.Error(2)
|
||||
return safeShallowList(args.Get(0)), args.Int(1), args.Error(2)
|
||||
}
|
||||
|
||||
func (m *MockWorkspaceAccessor) Search(filters *dbs.Filters, search string, isDraft bool) ([]utils.ShallowDBObject, int, error) {
|
||||
args := m.Called(filters, search, isDraft)
|
||||
return args.Get(0).([]utils.ShallowDBObject), args.Int(1), args.Error(2)
|
||||
return safeShallowList(args.Get(0)), args.Int(1), args.Error(2)
|
||||
}
|
||||
|
||||
func TestStoreOne_Success(t *testing.T) {
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
|
||||
// Workspace is a struct that represents a workspace
|
||||
type workspaceMongoAccessor struct {
|
||||
utils.AbstractAccessor // AbstractAccessor contains the basic fields of an accessor (model, caller)
|
||||
utils.AbstractAccessor[*Workspace] // AbstractAccessor contains the basic fields of an accessor (model, caller)
|
||||
}
|
||||
|
||||
// New creates a new instance of the workspaceMongoAccessor
|
||||
@@ -28,10 +28,11 @@ func NewAccessor(request *tools.APIRequest) *workspaceMongoAccessor {
|
||||
// New creates a new instance of the workspaceMongoAccessor
|
||||
func new(t tools.DataType, request *tools.APIRequest) *workspaceMongoAccessor {
|
||||
return &workspaceMongoAccessor{
|
||||
utils.AbstractAccessor{
|
||||
utils.AbstractAccessor[*Workspace]{
|
||||
Logger: logs.CreateLogger(t.String()), // Create a logger with the data type
|
||||
Request: request,
|
||||
Type: t,
|
||||
New: func() *Workspace { return &Workspace{} },
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -87,11 +88,6 @@ func (a *workspaceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject,
|
||||
return utils.GenericStoreOne(d, a)
|
||||
}
|
||||
|
||||
// CopyOne copies a workspace in the database
|
||||
func (a *workspaceMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, int, error) {
|
||||
return utils.GenericStoreOne(data, a)
|
||||
}
|
||||
|
||||
func (a *workspaceMongoAccessor) LoadOne(id string) (utils.DBObject, int, error) {
|
||||
return utils.GenericLoadOne[*Workspace](id, func(d utils.DBObject) (utils.DBObject, int, error) {
|
||||
d.(*Workspace).Fill(a.GetRequest())
|
||||
|
||||
Reference in New Issue
Block a user