Move models to typescript-sequelize

1 files changed, 9 insertions, 8 deletions

diff --git a/server/models/utils.ts b/server/models/utils.ts
index 1bf61d2a6..1606453e0 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -14,22 +14,23 @@ function getSort (value: string) {
   return [ field, direction ]
 }
 
-function addMethodsToModel (model: any, classMethods: Function[], instanceMethods: Function[] = []) {
-  classMethods.forEach(m => model[m.name] = m)
-  instanceMethods.forEach(m => model.prototype[m.name] = m)
-}
-
 function getSortOnModel (model: any, value: string) {
   let sort = getSort(value)
 
-  if (model) return [ { model: model }, sort[0], sort[1] ]
+  if (model) return [ model, sort[0], sort[1] ]
   return sort
 }
 
+function throwIfNotValid (value: any, validator: (value: any) => boolean, fieldName = 'value') {
+  if (validator(value) === false) {
+    throw new Error(`"${value}" is not a valid ${fieldName}.`)
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  addMethodsToModel,
   getSort,
-  getSortOnModel
+  getSortOnModel,
+  throwIfNotValid
 }