Removed dependency on engine from persistence

engine/mock_nowplaying_repo.go

@@ -3,6 +3,8 @@ package engine
 import (
 	"errors"
 	"time"
+
+	"github.com/cloudsonic/sonic-server/domain"
 )
 
 func CreateMockNowPlayingRepo() *MockNowPlaying {
@@ -10,8 +12,8 @@ func CreateMockNowPlayingRepo() *MockNowPlaying {
 }
 
 type MockNowPlaying struct {
-	NowPlayingRepository
-	data []NowPlayingInfo
+	domain.NowPlayingRepository
+	data []domain.NowPlayingInfo
 	t    time.Time
 	err  bool
 }
@@ -20,12 +22,12 @@ func (m *MockNowPlaying) SetError(err bool) {
 	m.err = err
 }
 
-func (m *MockNowPlaying) Enqueue(info *NowPlayingInfo) error {
+func (m *MockNowPlaying) Enqueue(info *domain.NowPlayingInfo) error {
 	if m.err {
 		return errors.New("Error!")
 	}
 
-	m.data = append(m.data, NowPlayingInfo{})
+	m.data = append(m.data, domain.NowPlayingInfo{})
 	copy(m.data[1:], m.data[0:])
 	m.data[0] = *info
 
@@ -37,7 +39,7 @@ func (m *MockNowPlaying) Enqueue(info *NowPlayingInfo) error {
 	return nil
 }
 
-func (m *MockNowPlaying) Dequeue(playerId int) (*NowPlayingInfo, error) {
+func (m *MockNowPlaying) Dequeue(playerId int) (*domain.NowPlayingInfo, error) {
 	if len(m.data) == 0 {
 		return nil, nil
 	}
@@ -52,15 +54,15 @@ func (m *MockNowPlaying) Count(playerId int) (int64, error) {
 	return int64(len(m.data)), nil
 }
 
-func (m *MockNowPlaying) GetAll() ([]*NowPlayingInfo, error) {
+func (m *MockNowPlaying) GetAll() ([]*domain.NowPlayingInfo, error) {
 	np, err := m.Head(1)
 	if np == nil || err != nil {
 		return nil, err
 	}
-	return []*NowPlayingInfo{np}, err
+	return []*domain.NowPlayingInfo{np}, err
 }
 
-func (m *MockNowPlaying) Head(playerId int) (*NowPlayingInfo, error) {
+func (m *MockNowPlaying) Head(playerId int) (*domain.NowPlayingInfo, error) {
 	if len(m.data) == 0 {
 		return nil, nil
 	}
@@ -68,7 +70,7 @@ func (m *MockNowPlaying) Head(playerId int) (*NowPlayingInfo, error) {
 	return &info, nil
 }
 
-func (m *MockNowPlaying) Tail(playerId int) (*NowPlayingInfo, error) {
+func (m *MockNowPlaying) Tail(playerId int) (*domain.NowPlayingInfo, error) {
 	if len(m.data) == 0 {
 		return nil, nil
 	}
@@ -77,7 +79,7 @@ func (m *MockNowPlaying) Tail(playerId int) (*NowPlayingInfo, error) {
 }
 
 func (m *MockNowPlaying) ClearAll() {
-	m.data = make([]NowPlayingInfo, 0)
+	m.data = make([]domain.NowPlayingInfo, 0)
 	m.err = false
 }