tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

#3552 Fixes Sound Exchange Media Query (#3554) 

* Fixes media query. Fixes album name not being pulled in due to incorrect IDs being used.

* Change to DQL, add a functional test that can catch this sort of thing in the future.
This commit is contained in:
Ben Benesh 2020-12-14 12:15:07 -06:00 committed by GitHub
parent 1b499a0ed1
commit c4279608e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Controller/Stations/Reports/SoundExchangeController.php
View File

@ -60,21 +60,37 @@ class SoundExchangeController
$all_media = $this->em->createQuery(
<<<'DQL'
SELECT sm
SELECT PARTIAL sm.{
id,
unique_id,
art_updated_at,
path,
length,
length_text,
artist,
title,
album,
genre
}, PARTIAL spm.{id}, PARTIAL sp.{id, name}, PARTIAL smcf.{id, field_id, value}
FROM App\Entity\StationMedia sm
WHERE sm.station_id = :station_id
LEFT JOIN sm.custom_fields smcf
LEFT JOIN sm.playlists spm
LEFT JOIN spm.playlist sp
WHERE sm.storage_location = :storageLocation
AND sp.station IS NULL OR sp.station = :station
DQL
)->setParameter('station_id', $station->getId())
)->setParameter('station', $station)
->setParameter('storageLocation', $station->getMediaStorageLocation())
->getArrayResult();
$media_by_id = [];
foreach ($all_media as $media_row) {
$media_by_id[$media_row['song_id']] = $media_row;
$media_by_id[$media_row['id']] = $media_row;
}
$history_rows = $this->em->createQuery(
<<<'DQL'
SELECT sh.song_id AS song_id, sh.text, sh.artist, sh.title, COUNT(sh.id) AS plays,
SELECT sh.song_id AS song_id, sh.text, sh.artist, sh.title, sh.media_id, COUNT(sh.id) AS plays,
SUM(sh.unique_listeners) AS unique_listeners
FROM App\Entity\SongHistory sh
WHERE sh.station_id = :station_id
@ -89,7 +105,7 @@ class SoundExchangeController
$history_rows_by_id = [];
foreach ($history_rows as $history_row) {
$history_rows_by_id[$history_row['song_id']] = $history_row;
$history_rows_by_id[$history_row['media_id']] = $history_row;
}
// Remove any reference to the "Stream Offline" song.

10
tests/functional/C04_Station_ReportsCest.php
View File

@ -42,5 +42,15 @@ class C04_Station_ReportsCest extends CestAbstract
$I->seeResponseCodeIs(200);
$I->see('Listeners');
$I->amOnPage('/station/' . $station_id . '/reports/soundexchange');
$I->seeResponseCodeIs(200);
$I->see('SoundExchange Report');
$I->submitForm(
'form#azuraforms_form',
['azuraforms_form_start_date' => '11/01/2020', 'azuraforms_form_end_date' => '11/30/2020']
);
$I->seeResponseCodeIs(200);
}
}