Trending by interval

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

diff --git a/server/models/utils.ts b/server/models/utils.ts
index eb6653f3ddf24d906c4333a7856fd26d8923618c..edb8e1161916abcf8a7da00428a5edf064296d77 100644 (file)
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -1,23 +1,31 @@
-// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
 import { Sequelize } from 'sequelize-typescript'
 
 type SortType = { sortModel: any, sortValue: string }
 
+// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
 function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
-  let field: any
-  let direction: 'ASC' | 'DESC'
+  const { direction, field } = buildDirectionAndField(value)
 
-  if (value.substring(0, 1) === '-') {
-    direction = 'DESC'
-    field = value.substring(1)
-  } else {
-    direction = 'ASC'
-    field = value
-  }
+  return [ [ field, direction ], lastSort ]
+}
+
+function getVideoSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
+  let { direction, field } = buildDirectionAndField(value)
 
   // Alias
   if (field.toLowerCase() === 'match') field = Sequelize.col('similarity')
 
+  // Sort by aggregation
+  if (field.toLowerCase() === 'trending') {
+    return [
+      [ Sequelize.fn('COALESCE', Sequelize.fn('SUM', Sequelize.col('VideoViews.views')), '0'), direction ],
+
+      [ Sequelize.col('VideoModel.views'), direction ],
+
+      lastSort
+    ]
+  }
+
   return [ [ field, direction ], lastSort ]
 }
 
@@ -58,6 +66,7 @@ function createSimilarityAttribute (col: string, value: string) {
 export {
   SortType,
   getSort,
+  getVideoSort,
   getSortOnModel,
   createSimilarityAttribute,
   throwIfNotValid,
@@ -73,3 +82,18 @@ function searchTrigramNormalizeValue (value: string) {
 function searchTrigramNormalizeCol (col: string) {
   return Sequelize.fn('lower', Sequelize.fn('immutable_unaccent', Sequelize.col(col)))
 }
+
+function buildDirectionAndField (value: string) {
+  let field: any
+  let direction: 'ASC' | 'DESC'
+
+  if (value.substring(0, 1) === '-') {
+    direction = 'DESC'
+    field = value.substring(1)
+  } else {
+    direction = 'ASC'
+    field = value
+  }
+
+  return { direction, field }
+}