Merge pull request #189 from camphor-/set-position-to-zero

camphor- · Aug 6, 2020 · fbafd5c · fbafd5c
2 parents 61feab1 + ce1867f
commit fbafd5c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 32 deletions.
diff --git a/domain/mock_spotify/player.go b/domain/mock_spotify/player.go
diff --git a/domain/spotify/player.go b/domain/spotify/player.go
@@ -12,8 +12,6 @@ import (
 // Player はSpotifyの曲の操作に関連するAPIを呼び出すためのインターフェースです。
 type Player interface {
 	CurrentlyPlaying(ctx context.Context) (*entity.CurrentPlayingInfo, error)
-	Play(ctx context.Context, deviceID string) error
-	PlayWithTracks(ctx context.Context, deviceID string, trackURIs []string) error
 	PlayWithTracksAndPosition(ctx context.Context, deviceID string, trackURIs []string, position time.Duration) error
 	Pause(ctx context.Context, deviceID string) error
 	Enqueue(ctx context.Context, trackURI string, deviceID string) error

diff --git a/usecase/session_state.go b/usecase/session_state.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/camphor-/relaym-server/domain/entity"
 	"github.com/camphor-/relaym-server/domain/event"
@@ -230,7 +231,7 @@ func (s *SessionStateUseCase) stopToPlay(ctx context.Context, sess *entity.Sessi
 	}
 	for i := 0; i < len(trackURIs); i++ {
 		if i == 0 {
-			if err := s.playerCli.PlayWithTracks(ctx, sess.DeviceID, trackURIs[:1]); err != nil {
+			if err := s.playerCli.PlayWithTracksAndPosition(ctx, sess.DeviceID, trackURIs[:1], 500*time.Millisecond); err != nil {
 				return fmt.Errorf("call play api with tracks %v: %w", trackURIs[:1], err)
 			}
 			continue

diff --git a/web/handler/session_state_test.go b/web/handler/session_state_test.go
@@ -242,7 +242,7 @@ func TestSessionHandler_State_PLAY(t *testing.T) {
 				m.EXPECT().SetRepeatMode(gomock.Any(), false, "device_id").Return(nil)
 				m.EXPECT().SetShuffleMode(gomock.Any(), false, "device_id").Return(nil)
 				m.EXPECT().DeleteAllTracksInQueue(gomock.Any(), "device_id", "spotify:track:5uQ0vKy2973Y9IUCd1wMEF").Return(nil)
-				m.EXPECT().PlayWithTracks(gomock.Any(), "device_id", []string{"spotify:track:5uQ0vKy2973Y9IUCd1wMEF"}).Return(nil)
+				m.EXPECT().PlayWithTracksAndPosition(gomock.Any(), "device_id", []string{"spotify:track:5uQ0vKy2973Y9IUCd1wMEF"}, 500*time.Millisecond).Return(nil)
 				m.EXPECT().Enqueue(gomock.Any(), "spotify:track:49BRCNV7E94s7Q2FUhhT3w", "device_id").Return(nil)
 				m.EXPECT().Enqueue(gomock.Any(), "spotify:track:3", "device_id").Return(nil)
 			},