fix(signage): playlist filtering using orientation

Author: stakach

spec/playlist_spec.cr

@@ -55,20 +55,24 @@ module PlaceOS::Model
       cs.playlists.size.should eq 0
     end
 
-    it "finds all the playlist ids associated with a system" do
+    it "finds all the playlist ids associated with a system", focus: true do
       playlist = Generator.playlist
       playlist.save!
       play_id = playlist.id.as(String)
 
+      playlist = Generator.playlist
+      playlist.save!
+      play_id2 = playlist.id.as(String)
+
       cs = Generator.control_system
-      cs.playlists = [play_id]
+      cs.playlists = [play_id2]
 
       zone = Generator.zone
       zone.playlists = [play_id]
       zone.save!
 
       zone2 = Generator.zone
-      zone2.playlists = [play_id]
+      zone2.playlists = [play_id2]
       zone2.save!
 
       cs.zones = [zone.id.as(String), zone2.id.as(String)]
@@ -80,16 +84,36 @@ module PlaceOS::Model
       trigger.save!
 
       trigger2 = Generator.trigger_instance control_system: cs
-      trigger2.playlists = [play_id]
+      trigger2.playlists = [play_id2]
       trigger2.save!
 
       cs = ControlSystem.find(cs_id)
       cs.all_playlists.should eq({
-        cs_id                  => [play_id],
+        cs_id                  => [play_id2],
+        zone.id.as(String)     => [play_id],
+        zone2.id.as(String)    => [play_id2],
+        trigger.id.as(String)  => [play_id],
+        trigger2.id.as(String) => [play_id2],
+      })
+
+      # playlists default to this orientation
+      cs.orientation = PlaceOS::Model::Playlist::Orientation::Portrait
+      cs.save!
+      cs.all_playlists.should eq({
+        cs_id                  => [play_id2],
         zone.id.as(String)     => [play_id],
-        zone2.id.as(String)    => [play_id],
+        zone2.id.as(String)    => [play_id2],
         trigger.id.as(String)  => [play_id],
-        trigger2.id.as(String) => [play_id],
+        trigger2.id.as(String) => [play_id2],
+      })
+
+      # playlists directly assigned to the display should not be filtered
+      playlist.orientation = PlaceOS::Model::Playlist::Orientation::Landscape
+      playlist.save!
+      cs.all_playlists.should eq({
+        cs_id                 => [play_id2],
+        zone.id.as(String)    => [play_id],
+        trigger.id.as(String) => [play_id],
       })
     end
 

src/placeos-models/control_system.cr

@@ -386,26 +386,41 @@ module PlaceOS::Model
       # then construct a hash
       sys_id = self.id.as(String)
       sql_query = %[
-        WITH zone_ids AS (
-          SELECT UNNEST(zones) as zone_id
+        WITH settings AS (
+          SELECT
+            zones,
+            orientation
           FROM sys
           WHERE id = $1
         ),
-        zone_playlists AS (
-          SELECT z.id, z.playlists
+        all_playlists AS (
+          -- unnest() in the SELECT is implicitly lateral
+          SELECT
+            z.id                          AS source_id,
+            unnest(z.playlists)          AS playlist_id
           FROM zone z
-          INNER JOIN zone_ids zi ON z.id = zi.zone_id
-          WHERE cardinality(z.playlists) > 0
-        ),
-        trig_playlists AS (
-          SELECT t.id, t.playlists
+          JOIN settings st
+            ON z.id = ANY(st.zones)
+
+          UNION ALL
+
+          SELECT
+            t.id,
+            unnest(t.playlists)
           FROM trig t
-          WHERE t.control_system_id = $1 AND cardinality(t.playlists) > 0
+          WHERE t.control_system_id = $1
         )
-
-        SELECT id, playlists FROM zone_playlists
-        UNION ALL
-        SELECT id, playlists FROM trig_playlists;
+        SELECT
+          ap.source_id,
+          array_agg(ap.playlist_id ORDER BY ap.playlist_id) AS playlists
+        FROM all_playlists ap
+        JOIN settings st   ON TRUE
+        JOIN playlists p    ON p.id = ap.playlist_id
+        WHERE
+            st.orientation = 'UNSPECIFIED'
+          OR p.orientation  = st.orientation
+          OR p.orientation  = 'UNSPECIFIED'
+        GROUP BY ap.source_id;
       ]
 
       playlists = {