Begin tests for user quota

[github/Chocobozzz/PeerTube.git] / server / models / user / user.ts

diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index 12a7547f5d3cf953b1dc37c69e01e26ee0ebb74b..9bf13ad243e5098cef1fd806332344bd3d64567e 100644 (file)
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -244,7 +244,7 @@ loadByUsernameOrEmail = function (username: string, email: string) {
 function getOriginalVideoFileTotalFromUser (user: UserInstance) {
   const query = {
     attributes: [
-      Sequelize.fn('COUNT', Sequelize.col('VideoFile.size'), 'totalVideoBytes')
+      Sequelize.fn('COUNT', Sequelize.col('User.Author.Video.VideoFile.size'), 'totalVideoBytes')
     ],
     where: {
       id: user.id
@@ -252,12 +252,15 @@ function getOriginalVideoFileTotalFromUser (user: UserInstance) {
     include: [
       {
         model: User['sequelize'].models.Author,
+        required: true,
         include: [
           {
             model: User['sequelize'].models.Video,
+            required: true,
             include: [
               {
-                model: User['sequelize'].models.VideoFile
+                model: User['sequelize'].models.VideoFile,
+                required: true
               }
             ]
           }