Merge pull request #42 from euduardo/master

feat(feat(repository): adds support to identify entity ids automaticallyrepository): adds support to identify entity ids automatically

Author: jhomarolo

README.md

@@ -1,4 +1,4 @@
-[![CI build](https://github.com/herbsjs/herbs2knex/actions/workflows/on_push.yml/badge.svg?branch=master)](https://github.com/herbsjs/herbs2knex/actions/workflows/on_push.yml)
+[![CI build](https://github.com/herbsjs/herbs2knex/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/herbsjs/herbs2knex/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/herbsjs/herbs2knex/branch/master/graph/badge.svg)](https://codecov.io/gh/herbsjs/herbs2knex)
 
 # herbs2knex

package-lock.json

@@ -55,12 +55,8 @@
     "dotenv": "^12.0.3",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-standard": "^4.1.0",
     "lodash": "^4.17.21",
     "mocha": "^9.1.4",
     "mssql": "^7.3.0",

package.json

@@ -1,6 +1,7 @@
 const Convention = require('./convention')
 const DataMapper = require('./dataMapper')
 const { checker } = require('@herbsjs/suma')
+const { BaseEntity } = require("@herbsjs/gotu/src/baseEntity")
 
 module.exports = class Repository {
   constructor(options) {
@@ -11,7 +12,7 @@ module.exports = class Repository {
       ? `${this.schema}.${this.table}`
       : `${this.table}`
     this.entity = options.entity
-    this.entityIDs = options.ids
+    this.entityIDs = this.#getEntityIds(options)
     this.foreignKeys = options.foreignKeys
     this.knex = options.knex
     this.dataMapper = new DataMapper(
@@ -232,6 +233,17 @@ module.exports = class Repository {
     return ret === 1
   }
 
+  #getEntityIds({ entity, ids }) {
+    if (ids) return ids
 
+    if (entity && entity.prototype instanceof BaseEntity) {
+      const fields = Object.values(entity.prototype.meta.schema)
+      const idFields = fields.filter(({ options }) => options.isId)
+      const idFieldsNames = idFields.map(({ name }) => name)
 
-}
+      return idFieldsNames
+    }
+
+    return []
+  }
+}

src/repository.js

@@ -1,5 +1,5 @@
-const { entity, field } = require('@herbsjs/gotu')
-const Repository = require('../../src/repository')
+const { entity, field, id } = require('@herbsjs/gotu')
+const Repository = require('../../../src/repository')
 const db = require('./db')
 const connection = require('../connection')
 const assert = require('assert')
@@ -61,7 +61,7 @@ describe('Delete an Entity', () => {
 
         const givenAnEntity = () => {
             return entity('A entity', {
-                id: field(Number),
+                id: id(Number),
                 stringTest: field(String),
                 booleanTest: field(Boolean)
             })
@@ -84,7 +84,6 @@ describe('Delete an Entity', () => {
                 entity: anEntity,
                 table,
                 database,
-                ids: ['id'],
                 knex: connection
             })
             const aModifiedInstance = givenAnModifiedEntity()

test/integration/mssql/delete.test.js

@@ -1,5 +1,5 @@
-const { entity, field } = require('@herbsjs/gotu')
-const Repository = require('../../src/repository')
+const { entity, field, id } = require('@herbsjs/gotu')
+const Repository = require('../../../src/repository')
 const db = require('./db')
 const connection = require('../connection')
 const assert = require('assert')
@@ -55,7 +55,7 @@ describe('Query Find', () => {
 
     const givenAnEntity = () => {
         return entity('A entity', {
-            id: field(Number),
+            id: id(Number),
             stringTest: field(String),
             booleanTest: field(Boolean)
         })
@@ -68,7 +68,6 @@ describe('Query Find', () => {
             entity: anEntity,
             table,
             database,
-            ids: ['id'],
             knex: connection
         })
         const injection = {}

test/integration/mssql/find.test.js

@@ -1,5 +1,5 @@
-const { entity, field } = require('@herbsjs/gotu')
-const Repository = require('../../src/repository')
+const { entity, field, id } = require('@herbsjs/gotu')
+const Repository = require('../../../src/repository')
 const db = require('./db')
 const connection = require('../connection')
 const assert = require('assert')
@@ -56,7 +56,7 @@ describe('Query Find by ID', () => {
 
     const givenAnEntity = () => {
         return entity('A entity', {
-            id: field(Number),
+            id: id(Number),
             stringTest: field(String),
             booleanTest: field(Boolean)
         })
@@ -69,7 +69,6 @@ describe('Query Find by ID', () => {
             entity: anEntity,
             table,
             database,
-            ids: ['id'],
             knex: connection
         })
         const injection = {}

test/integration/mssql/findByID.test.js

@@ -1,5 +1,5 @@
-const { entity, field } = require('@herbsjs/gotu')
-const Repository = require('../../src/repository')
+const { entity, field, id } = require('@herbsjs/gotu')
+const Repository = require('../../../src/repository')
 const db = require('./db')
 const connection = require('../connection')
 const assert = require('assert')
@@ -55,7 +55,7 @@ describe('Query First', () => {
 
     const givenAnEntity = () => {
         return entity('A entity', {
-            id: field(Number),
+            id: id(Number),
             stringTest: field(String),
             booleanTest: field(Boolean)
         })
@@ -68,7 +68,6 @@ describe('Query First', () => {
             entity: anEntity,
             table,
             database,
-            ids: ['id'],
             knex: connection
         })
         const injection = {}
@@ -91,7 +90,6 @@ describe('Query First', () => {
             entity: anEntity,
             table,
             database,
-            ids: ['id'],
             knex: connection
         })
         const injection = {}        

test/integration/mssql/first.test.js

@@ -1,4 +1,4 @@
-const { entity, field } = require('@herbsjs/gotu')
+const { entity, field, id } = require('@herbsjs/gotu')
 const Repository = require('../../../src/repository')
 const db = require('./db')
 const connection = require('../connection')
@@ -57,7 +57,7 @@ describe('Persist Entity', () => {
 
         const givenAnEntity = () => {
             return entity('A entity', {
-                id: field(Number),
+                id: id(Number),
                 stringTest: field(String),
                 booleanTest: field(Boolean)
             })
@@ -80,7 +80,6 @@ describe('Persist Entity', () => {
                 entity: anEntity,
                 table,
                 database,
-                ids: ['id'],
                 knex: connection
             })
             const aModifiedInstance = givenAnModifiedEntity()

test/integration/mssql/insert.test.js

@@ -1,5 +1,5 @@
-const { entity, field } = require('@herbsjs/gotu')
-const Repository = require('../../src/repository')
+const { entity, field, id } = require('@herbsjs/gotu')
+const Repository = require('../../../src/repository')
 const db = require('./db')
 const connection = require('../connection')
 const assert = require('assert')
@@ -61,7 +61,7 @@ describe('Persist Entity', () => {
 
         const givenAnEntity = () => {
             return entity('A entity', {
-                id: field(Number),
+                id: id(Number),
                 stringTest: field(String),
                 booleanTest: field(Boolean)
             })
@@ -84,7 +84,6 @@ describe('Persist Entity', () => {
                 entity: anEntity,
                 table,
                 database,
-                ids: ['id'],
                 knex: connection
             })
             const aModifiedInstance = givenAnModifiedEntity()