Skip to content

fix: prevent DJ enqueue from resetting active playback state #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LivingLikeKrillin merged 1 commit into from
Mar 29, 2026
Merged

fix: prevent DJ enqueue from resetting active playback state #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/src/main/java/com/pfplaybackend/api/party/application/service/DjCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,14 @@ public Long enqueueDj(PartyroomId partyroomId, PlaylistId playlistId) {
DjData dj = DjData.create(partyroom.getPartyroomId(), playlistId, crewId, nextOrder);
DjData saved = aggregatePort.saveDj(dj);

playbackState.activate(null, null);
aggregatePort.savePlaybackState(playbackState);
if (isPostActivationProcessingRequired) {
playbackState.activate(null, null);
aggregatePort.savePlaybackState(playbackState);
}

eventPublisher.publishEvent(new DjQueueChangedEvent(partyroom.getPartyroomId(), DjChangeType.ENQUEUE, crewId));

if(isPostActivationProcessingRequired) {
if (isPostActivationProcessingRequired) {
playbackControlPort.startPlayback(partyroom);
}
return saved.getId();
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/pfplaybackend/api/party/application/service/PartyroomQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public DjQueueInfoResult getDjQueueInfo(PartyroomId partyroomId) {
QueueStatus queueStatus = djQueue.isClosed() ? QueueStatus.CLOSE : QueueStatus.OPEN;
boolean isRegistered = isAlreadyRegistered(partyroom.getPartyroomId());
PlaybackData playback = null;
if (isPlaybackActivated) {
if (isPlaybackActivated && playbackState.getCurrentPlaybackId() != null) {
playback = playbackQueryService.getPlaybackById(playbackState.getCurrentPlaybackId());
}
List<DjWithProfileDto> djWithProfiles = getDjs(partyroom.getPartyroomId());
Expand Down
Loading