From b869d19068f42eb2b7bc33e1e2bff10bd07f3fda Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 26 Oct 2017 11:42:36 +0200
Subject: Fix join in video events

---
 server/models/request/request-video-event.ts | 30 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'server')

diff --git a/server/models/request/request-video-event.ts b/server/models/request/request-video-event.ts
index 34d5c7162..d7dce9bc8 100644
--- a/server/models/request/request-video-event.ts
+++ b/server/models/request/request-video-event.ts
@@ -102,15 +102,20 @@ listWithLimitAndRandom = function (limitPods: number, limitRequestsPerPod: numbe
           model: RequestVideoEvent['sequelize'].models.Video,
           include: [
             {
-              model: RequestVideoEvent['sequelize'].models.Author,
+              model: RequestVideoEvent['sequelize'].models.VideoChannel,
               include: [
                 {
-                  model: RequestVideoEvent['sequelize'].models.Pod,
-                  where: {
-                    id: {
-                      $in: podIds
+                  model: RequestVideoEvent['sequelize'].models.Author,
+                  include: [
+                    {
+                      model: RequestVideoEvent['sequelize'].models.Pod,
+                      where: {
+                        id: {
+                          $in: podIds
+                        }
+                      }
                     }
-                  }
+                  ]
                 }
               ]
             }
@@ -138,10 +143,15 @@ removeByRequestIdsAndPod = function (ids: number[], podId: number) {
         model: RequestVideoEvent['sequelize'].models.Video,
         include: [
           {
-            model: RequestVideoEvent['sequelize'].models.Author,
-            where: {
-              podId
-            }
+            model: RequestVideoEvent['sequelize'].models.VideoChannel,
+            include: [
+              {
+                model: RequestVideoEvent['sequelize'].models.Author,
+                where: {
+                  podId
+                }
+              }
+            ]
           }
         ]
       }
-- 
cgit v1.2.3