feat(generators/with-postgres/templates): change implementation of repository & model

Author: phatpham9

generators/with-postgres-typeorm/templates/<%= compNameParamCasePlural %>/schema.ts

@@ -15,3 +15,4 @@ class Schema implements <%= compNamePascalCase %> {
 }
 
 export default Schema;
+export { Schema };

generators/with-postgres/templates/<%= compNameParamCasePlural %>/model.ts

@@ -1,13 +1,18 @@
-import { Model as SequelizeModel, ModelCtor, DataTypes } from 'sequelize';
+import {
+  Model as SequelizeModel,
+  ModelAttributes,
+  ModelOptions,
+  DataTypes,
+} from 'sequelize';
 
-import postgres from '../../db/postgres';
 import { <%= compNamePascalCase %> } from './types';
 import { ENTITY } from './constants';
 
-interface Instance extends SequelizeModel<<%= compNamePascalCase %>, Omit<<%= compNamePascalCase %>, 'id'>>, <%= compNamePascalCase %> {}
-interface Model extends ModelCtor<Instance> {}
+interface Model extends SequelizeModel<<%= compNamePascalCase %>, Omit<<%= compNamePascalCase %>, 'id'>>, <%= compNamePascalCase %> {}
 
-const schema = {
+const name = ENTITY;
+
+const attributes: ModelAttributes<Model> = {
   id: {
     type: DataTypes.INTEGER,
     primaryKey: true,
@@ -17,7 +22,7 @@ const schema = {
   // TODO: add more fields
 };
 
-export default postgres.createModel<Instance, Model>(ENTITY, schema, {
-  timestamps: false,
-});
-export { Instance, Model };
+const options: ModelOptions<SequelizeModel> = {};
+
+export default { name, attributes, options };
+export { Model };

generators/with-postgres/templates/<%= compNameParamCasePlural %>/repository.ts

@@ -1,66 +1,73 @@
+import { ModelCtor } from 'sequelize';
 import { MyError } from '@boringcodes/utils/error';
 
 import { <%= compNamePascalCase %> } from './types';
-import Model, { Instance } from './model';
+import model, { Model } from './model';
+import postgres from '../../db/postgres';
+
+// get model
+const getModel = (): ModelCtor<Model> => {
+  return postgres.getModel<Model>(model);
+};
 
 const list = async (): Promise<<%= compNamePascalCase %>[]> => {
-  // list instances
-  const instances = await Model.findAll();
+  // list documents
+  const documents = await getModel().findAll();
 
-  return instances.map(transform);
+  return documents.map(transform);
 };
 
 const create = async (object: Omit<<%= compNamePascalCase %>, 'id'>): Promise<<%= compNamePascalCase %>> => {
-  // create instance
-  const instance = Model.build(object);
-  await instance.save();
+  // create document
+  const document = getModel().build(object);
+  await document.save();
 
-  return transform(instance);
+  return transform(document);
 };
 
 const get = async (id: number): Promise<<%= compNamePascalCase %>> => {
-  // get instance
-  const instance = await Model.findByPk(id);
-  if (instance === null) {
-    throw new MyError('Instance not found');
+  // get document
+  const document = await getModel().findByPk(id);
+  if (document === null) {
+    throw new MyError('Document not found');
   }
 
-  return transform(instance);
+  return transform(document);
 };
 
 const update = async (
   id: number,
   object: Omit<<%= compNamePascalCase %>, 'id'>,
 ): Promise<<%= compNamePascalCase %>> => {
-  // get instance
-  const instance = await Model.findByPk(id);
-  if (instance === null) {
-    throw new MyError('Instance not found');
+  // get document
+  const document = await getModel().findByPk(id);
+  if (document === null) {
+    throw new MyError('Document not found');
   }
 
-  // update instance
-  instance.set(object);
-  await instance.save();
+  // update document
+  document.set(object);
+  await document.save();
 
-  return transform(instance);
+  return transform(document);
 };
 
 const del = async (id: number): Promise<<%= compNamePascalCase %>> => {
-  // get instance
-  const instance = await Model.findByPk(id);
-  if (instance === null) {
-    throw new MyError('Instance not found');
+  // get document
+  const document = await getModel().findByPk(id);
+  if (document === null) {
+    throw new MyError('Document not found');
   }
 
-  // delete instance
-  await instance.destroy();
+  // delete document
+  await document.destroy();
 
-  return transform(instance);
+  return transform(document);
 };
 
-// transform instance to <%= compNamePascalCase %>
-const transform = (instance: Instance): <%= compNamePascalCase %> => {
-  return instance.toJSON() as <%= compNamePascalCase %>;
+// transform document to <%= compNamePascalCase %>
+const transform = (document: Model): <%= compNamePascalCase %> => {
+  return document.toJSON() as <%= compNamePascalCase %>;
 };
 
 export default { list, create, get, update, del };