From 65e3a1852d257b497ffa999685bcca398c19fa62 Mon Sep 17 00:00:00 2001
From: Sebastian Rindom <skrindom@gmail.com>
Date: Tue, 24 Mar 2020 14:35:37 +0100
Subject: [PATCH] load core models and app models separately

---
 packages/medusa/src/loaders/models.js | 73 ++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/packages/medusa/src/loaders/models.js b/packages/medusa/src/loaders/models.js
index bcd1b21dab..ff91b349df 100644
--- a/packages/medusa/src/loaders/models.js
+++ b/packages/medusa/src/loaders/models.js
@@ -1,28 +1,63 @@
+import { BaseModel } from "medusa-interfaces"
 import { Lifetime } from "awilix"
+import glob from "glob"
+import path from "path"
+import { Lifetime } from "awilix"
+import { asFunction } from "awilix"
 
 /**
  * Registers all models in the model directory
  */
 export default ({ container }) => {
-  // service/auth.js -> authService
-  container.loadModules(["src/models/*.js"], {
-    resolverOptions: {
-      lifetime: Lifetime.SINGLETON,
-    },
-    formatName: (rawname, descriptor) => {
-      const parts = rawname.split("-").map((n, index) => {
-        if (index !== 0) {
-          return n.charAt(0).toUpperCase() + n.slice(1)
-        }
-        return n
-      })
-      const name = parts.join("")
+  let corePath = "../models/*.js"
+  let appPath = "src/models/*.js"
 
-      const splat = descriptor.path.split("/")
-      const namespace = splat[splat.length - 2]
-      const upperNamespace =
-        namespace.charAt(0).toUpperCase() + namespace.slice(1, -1)
-      return name + upperNamespace
-    },
+  const corefull = path.resolve(corePath)
+  const appfull = path.resolve(corePath)
+
+  const core = glob.sync(corePath, { cwd: __dirname })
+  core.forEach(fn => {
+    const loaded = require(fn).default
+    const name = formatRegistrationName(fn)
+    container.register({
+      [name]: asFunction(cradle => new loaded(cradle)),
+    })
   })
+
+  if (corefull !== appfull) {
+    const files = glob.sync(appPath)
+    files.forEach(fn => {
+      const loaded = require(fn).default
+
+      if (!(loaded.prototype instanceof BaseModel)) {
+        const logger = container.resolve("logger")
+        const message = `Models must inherit from BaseModel, please check ${fn}`
+        logger.error(message)
+        throw new Error(message)
+      }
+
+      const name = formatRegistrationName(fn)
+      container.register({
+        [name]: asFunction(cradle => new loaded(cradle)),
+      })
+    })
+  }
+}
+
+function formatRegistrationName(fn) {
+  const descriptorIndex = fn.split(".").length - 2
+  const descriptor = fn.split(".")[descriptorIndex]
+  const splat = descriptor.split("/")
+  const rawname = splat[splat.length - 1]
+  const namespace = splat[splat.length - 2]
+  const upperNamespace =
+    namespace.charAt(0).toUpperCase() + namespace.slice(1, -1)
+
+  const parts = rawname.split("-").map((n, index) => {
+    if (index !== 0) {
+      return n.charAt(0).toUpperCase() + n.slice(1)
+    }
+    return n
+  })
+  return parts.join("") + upperNamespace
 }