refactor: define prepare models function

floydspace · Sep 6, 2021 · 9e7b54b · 9e7b54b
1 parent 637e367
commit 9e7b54b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/.plop/index.ts.hbs b/.plop/index.ts.hbs
@@ -28,26 +28,27 @@ export const createInstance = async () => {
     },
   });
 
+  const models = prepareModels(sequelize);
+
+  await sequelize.authenticate();
+
+  return {
+    sequelize,
+    models,
+  };
+};
+
+function prepareModels(sequelize: Sequelize) {
   const models = {
     {{#each models}}
     {{name}}: {{name}}Factory(sequelize),
     {{/each}}
   };
 
   Object.keys(models).forEach((model) => {
-    if (models[model].associate) {
-      models[model].associate(models);
-    }
-
-    if (models[model].hooks) {
-      models[model].hooks(models);
-    }
+    models[model].associate?.(models);
+    models[model].hooks?.(models);
   });
 
-  await sequelize.authenticate();
-
-  return {
-    sequelize,
-    models,
-  };
-};
+  return models;
+}
diff --git a/prisma/models/index.ts b/prisma/models/index.ts
@@ -55,20 +55,7 @@ export const createInstance = async () => {
     },
   });
 
-  const models = {
-    User: UserFactory(sequelize),
-    Post: PostFactory(sequelize),
-  };
-
-  Object.keys(models).forEach((model) => {
-    if (models[model].associate) {
-      models[model].associate(models);
-    }
-
-    if (models[model].hooks) {
-      models[model].hooks(models);
-    }
-  });
+  const models = prepareModels(sequelize);
 
   await sequelize.authenticate();
 
@@ -77,3 +64,17 @@ export const createInstance = async () => {
     models,
   };
 };
+
+function prepareModels(sequelize: Sequelize) {
+  const models = {
+    User: UserFactory(sequelize),
+    Post: PostFactory(sequelize),
+  };
+
+  Object.keys(models).forEach((model) => {
+    models[model].associate?.(models);
+    models[model].hooks?.(models);
+  });
+
+  return models;
+}