Merge pull request #75 from partyoffice/feature/only-refresh-recently-updated-sessions

Only refresh recently updated sessions

Author: Nikos410

listeningSession/listeningSession.go

@@ -237,7 +237,7 @@ func RequestSong(session model.FullListeningSession, trackId string, username st
 			return errors.New("rolling back transaction")
 		}
 
-		queue, err := GetLimitedQueue(session.SimpleListeningSession, 3)
+		queue, err := GetLimitedQueueInTransaction(session.SimpleListeningSession, 3, tx)
 		if err != nil {
 			return err
 		}
@@ -313,6 +313,9 @@ func createNewSongRequestInTransaction(session model.FullListeningSession, track
 		return model.SongRequest{}, NewInternalError("could not save new request", err)
 	}
 
+	session.UpdatedAt = time.Now()
+	tx.Save(session.SimpleListeningSession)
+
 	return newSongRequest, nil
 }
 
@@ -342,6 +345,9 @@ func UpdateSessionIfNecessary(session model.FullListeningSession) *SpotifeteErro
 		if err != nil {
 			return NewInternalError("could not update session", err)
 		}
+
+		session.UpdatedAt = time.Now()
+		database.GetConnection().Save(session.SimpleListeningSession)
 	}
 
 	return updatePlaylistIfNecessary(session, queue)

listeningSession/polling.go

@@ -17,11 +17,28 @@ func pollSessionsLoop() {
 }
 
 func pollSessions() {
+
+	sessionsToUpdate := findSessionsToUpdate()
+
+	for _, session := range sessionsToUpdate {
+		UpdateSessionIfNecessary(session)
+	}
+}
+
+func findSessionsToUpdate() []model.FullListeningSession {
+
 	activeSessions := FindFullListeningSessions(model.SimpleListeningSession{
 		Active: true,
 	})
 
-	for _, session := range activeSessions {
-		UpdateSessionIfNecessary(session)
+	recentlyUpdatedThreshold := time.Now().Add(-1 * time.Hour)
+
+	var recentlyUpdatedSessions []model.FullListeningSession
+	for _, s := range activeSessions {
+		if s.UpdatedAt.After(recentlyUpdatedThreshold) {
+			recentlyUpdatedSessions = append(recentlyUpdatedSessions, s)
+		}
 	}
+
+	return recentlyUpdatedSessions
 }

listeningSession/songRequest.go

@@ -52,24 +52,34 @@ func FindSongRequestCountInTransaction(filter interface{}, tx *gorm.DB) (int64,
 
 func GetFullQueue(session model.SimpleListeningSession) ([]model.SongRequest, error) {
 
-	query := buildGetQueueQuery(session)
+	return GetFullQueueInTransaction(session, database.GetConnection())
+}
+
+func GetFullQueueInTransaction(session model.SimpleListeningSession, tx *gorm.DB) ([]model.SongRequest, error) {
+
+	query := buildGetQueueQuery(session, tx)
 	return FindSongRequests(query)
 }
 
 func GetLimitedQueue(session model.SimpleListeningSession, limit int) ([]model.SongRequest, error) {
 
-	query := buildGetQueueQuery(session).Limit(limit)
+	return GetLimitedQueueInTransaction(session, limit, database.GetConnection())
+}
+
+func GetLimitedQueueInTransaction(session model.SimpleListeningSession, limit int, tx *gorm.DB) ([]model.SongRequest, error) {
+
+	query := buildGetQueueQuery(session, tx).Limit(limit)
 	return FindSongRequests(query)
 }
 
-func buildGetQueueQuery(session model.SimpleListeningSession) *gorm.DB {
+func buildGetQueueQuery(session model.SimpleListeningSession, tx *gorm.DB) *gorm.DB {
 
 	filter := map[string]interface{}{
 		"session_id": session.ID,
 		"played":     false,
 	}
 
-	return database.GetConnection().Where(filter).Order("locked desc, weight asc, created_at asc")
+	return tx.Where(filter).Order("locked desc, weight asc, created_at asc")
 }
 
 func GetQueueLastUpdated(session model.SimpleListeningSession) time.Time {