beech-api 3.5.12 → 3.7.0

package/packages/lib/src/endpoint.js

@@ -0,0 +1,98 @@
+const Base = (Pj = []) => {
+  Pj.map((Project) => {
+    let endpointName = Object.values(Project)[4];
+    endpoint.get(`/${endpointName}/:limit?/:offset?`, Credentials, async (req, res) => {
+      const results = await Project.findAll({ offset: (parseInt(req.params.offset) || 0), limit: (parseInt(req.params.limit) || 100) });
+      await res.json({
+        code: 200,
+        status: "SUCCESS",
+        results,
+        length: results.length,
+      });
+    });
+    endpoint.post(`/${endpointName}`, Credentials, (req, res) => {
+      Project.create(req.body)
+        .then((created) => {
+          // @return
+          res.status(201).json({
+            code: 201,
+            status: "CREATE_SUCCESS",
+            createdId: created.id,
+          });
+        })
+        .catch((err) => {
+          // @return
+          res.status(501).json({
+            code: 501,
+            status: "CREATE_FAILED",
+            error: err,
+          });
+        });
+    });
+    endpoint.patch(`/${endpointName}/:id`, Credentials, (req, res) => {
+      Project.update(req.body, {
+        where: {
+          id: req.params.id,
+        },
+      })
+        .then((updated) => {
+          // @return
+          res.status(200).json({
+            code: 200,
+            status: "UPDATE_SUCCESS",
+            result: {
+              updateId: req.params.id,
+              affectedRows: updated[0],
+            },
+          });
+        })
+        .catch((err) => {
+          // @return
+          res.status(501).json({
+            code: 501,
+            status: "UPDATE_FAILED",
+            error: err,
+          });
+        });
+    });
+    endpoint.delete(`/${endpointName}/:id`, Credentials, (req, res) => {
+      Project.destroy({
+        where: {
+          id: req.params.id,
+        },
+      })
+        .then((deleted) => {
+          if(deleted) {
+            // @return
+            res.status(200).json({
+              code: 200,
+              status: "DELETE_SUCCESS",
+              result: {
+                deleteId: req.params.id,
+                affectedRows: deleted,
+              },
+            });
+          } else {
+            res.status(406).json({
+              code: 406,
+              status: "NOT_ACCEPTABLE",
+              result: {
+                deleteId: req.params.id,
+                affectedRows: deleted,
+              },
+            });
+          }
+        })
+        .catch((err) => {
+          // @return
+          res.status(501).json({
+            code: 501,
+            status: "DELETE_FAILED",
+            error: err,
+          });
+        });
+    });
+  });
+};
+
+module.exports = { Base };

package/packages/lib/src/salt.js

@@ -0,0 +1,3 @@
+module.exports = {
+  salt: ["?p9E1oXV8My9akelVzsf3"],
+};

package/packages/lib/src/schema.js

@@ -0,0 +1,62 @@
+function Schema(Sequelize) {
+  return {
+    define: (table, schemaProps = {}) => {
+      let Project = Sequelize.define(table, schemaProps);
+      return Object.assign(Project, {
+        query: (
+          rawSql,
+          props = {
+            model: Project,
+            mapToModel: false,
+          }
+        ) => {
+          return new Promise((resolve) => {
+            if (props.mapToModel) {
+              let data = Sequelize.query(rawSql, props);
+              let results = [];
+              mapDataToModel(data, props.model, results, (err, r) => {
+                if (err) {
+                  resolve([]);
+                } else {
+                  resolve(r);
+                }
+              });
+            } else {
+              resolve(Sequelize.query(rawSql, props));
+            }
+          });
+        },
+        Sequelize,
+      });
+    },
+  };
+}
+
+mapDataToModel = async (data, modelsArr = [], results = [], cb) => {
+  let dataArr = await data;
+  var models = modelsArr.length ? modelsArr.slice() : modelsArr;
+  let row = dataArr.shift();
+  let buildModelData = [];
+  recursiveBuildModels(models, row, buildModelData, (builed, e) => {
+    if (builed) {
+      results.push({ ...e });
+      if (dataArr.length > 0) {
+        mapDataToModel(dataArr, modelsArr, results, cb);
+      } else {
+        cb(null, results);
+      }
+    }
+  });
+};
+
+recursiveBuildModels = (models, row, data = [], cb) => {
+  let model = models.length ? models.shift() : models;
+  data.push(model.build(row).dataValues);
+  if (models.length > 0) {
+    recursiveBuildModels(models, row, data, cb);
+  } else {
+    cb(true, { ...Object.assign(...data) });
+  }
+};
+
+module.exports = { Schema };

package/packages/lib/src/user.js

@@ -0,0 +1,196 @@
+const appRoot = require("app-root-path");
+const md5 = require("md5");
+const secret = require("./salt").salt;
+const { findPassportPk } = require("../../cli/core/helpers/poolEntity");
+
+async function FindOne(fields, fieldCondArr, cb) {
+  try {
+    const passport_config = require(appRoot + "/passport.config.js");
+    let stm = '';
+    let cond = '1';
+    let passportTable = await [passport_config.model.table || "users"];
+    const pool = await eval("sql." + passport_config.model.name);
+    let expectFields = await (fields[0]) ? fields : (passport_config.model.fields.length) ? passport_config.model.fields : [];
+    await findPassportPk(pool_base, pool, passportTable, expectFields, async (err, passportFields) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        // Generate condition
+        await Object.keys(fieldCondArr).forEach(key => {
+          cond += ' AND ' + key + '=' + fieldCondArr[key]
+        });
+        // check base pool
+        if (pool_base == "basic") {
+          // pool base is MySQL
+          stm += 'SELECT ?? FROM ?? WHERE ' + cond;
+          await pool.query(stm, [passportFields, passportTable], (err, row) => {
+            if(err) {
+              cb(err, null);
+            } else {
+              cb(null, row);
+            }
+          });
+        } else if (pool_base == "sequelize") {
+          // pool base is Sequelize
+          try {
+            stm += `SELECT ${passportFields} FROM ${passportTable} WHERE ` + cond;
+            let result = await pool.query(stm, {
+              type: QueryTypes.SELECT
+            });
+            return cb(null, result);
+          } catch (error) {
+            return cb(error.errors[0], null);
+          }
+        } else {
+          return cb({ error: "The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'" }, null);
+        }
+      }
+    });
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+async function Store(fields, cb) {
+  try {
+    const passport_config = require(appRoot + "/passport.config.js");
+    let stm = '';
+    let keys = [];
+    let escaped = [];
+    let values = await [passport_config.model.table || "users"];
+    let usernameField = await String(passport_config.model.username_field || "username");
+    let passwordField = await String(passport_config.model.password_field || "password");
+    const pool = await eval("sql." + passport_config.model.name);
+    // declare for check have a username and password ?
+    let haveUsernameAndPassword = 0;
+    // sql generate
+    await Object.keys(fields).forEach(key => {
+      // check have a username and password fields
+      if(key == usernameField) {
+        haveUsernameAndPassword += 1;
+      }
+      if(key == passwordField) {
+        haveUsernameAndPassword += 1;
+      }
+      keys.push(key);
+      values.push(fields[key]);
+      escaped.push('?');
+    });
+    if(haveUsernameAndPassword > 1) {
+      // asign password hash
+      fields[passwordField] = md5(fields[passwordField] + secret);
+      // check base pool
+      if (pool_base == "basic") {
+        // pool base is MySQL
+        stm += 'INSERT INTO ?? (' + keys.join() + ') VALUES (' + escaped.join() + ')';
+        await pool.query(stm, values, (err, result) => {
+          if(err) {
+            let error = JSON.parse(JSON.stringify(err));
+            delete error.sql;
+            cb(error, null);
+          } else {
+            cb(null, {
+              insertId: result.insertId,
+              affectedRows: result.affectedRows,
+            });
+          }
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        try {
+          stm += `INSERT INTO ${values.shift()} (` + keys.join() + ') VALUES (' + escaped.join() + ')';
+          let result = await pool.query(stm, {
+            replacements: values,
+            type: QueryTypes.INSERT
+          });
+          return cb(null, {
+            insertId: result[0],
+            affectedRows: result[1]
+          });
+        } catch (error) {
+          return cb(error.errors[0], null);
+        }
+      } else {
+        return cb({ error: "The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'" }, null);
+      }
+    } else {
+      cb({ code: "ER_BAD_FIELD_ERROR", message: `You lost some fields ${usernameField} or ${passwordField} ?` }, null);
+    }
+  } catch (error) {
+    cb(`${error}`, null);
+  }
+}
+
+async function Update(someFields, id, cb) {
+  try {
+    const passport_config = require(appRoot + "/passport.config.js");
+    let stm = '';
+    let keys = [];
+    let values = await [passport_config.model.table || "users"];
+    let passwordField = await String(passport_config.model.password_field || "password");
+    const pool = await eval("sql." + passport_config.model.name);
+    // check password body for asign hash
+    if (someFields[passwordField]) {
+      someFields[passwordField] = md5(someFields[passwordField] + secret);
+    }
+    // sql generate
+    Object.keys(someFields).forEach(key => {
+      keys.push(`${key}=?`);
+      values.push(someFields[key]);
+    });
+    values.push(id);
+    // check base pool
+    if (pool_base == "basic") {
+      // pool base is MySQL
+      pool.query("SHOW KEYS FROM " + values[0] + " WHERE Key_name = 'PRIMARY'", (err, pk) => {
+        if(err) {
+          return done(err, null);
+        } else {
+          let fieldPk = pk[0].Column_name;
+          stm += 'UPDATE ?? SET ' + keys.join() + ' WHERE ' + fieldPk + ' = ?';
+          pool.query(stm, values, (err, result) => {
+            if(err) {
+              let error = JSON.parse(JSON.stringify(err));
+              delete error.sql;
+              cb(error, null);
+            } else {
+              cb(null, {
+                updateId: parseInt(id),
+                affectedRows: result.changedRows
+              });
+            }
+          });
+        }
+      });
+    } else if (pool_base == "sequelize") {
+      // pool base is Sequelize
+      try {
+        pool.query("SHOW KEYS FROM " + values[0] + " WHERE Key_name = 'PRIMARY'", { type: QueryTypes.SELECT }).then((pk) => {
+          let fieldPk = pk[0].Column_name;
+          stm += `UPDATE ${values.shift()} SET ` + keys.join() + ' WHERE ' + fieldPk + ' = ?';
+          pool.query(stm, {
+            replacements: values,
+            type: QueryTypes.UPDATE
+          }).then((result) => {
+            return cb(null, {
+              updateId: parseInt(id),
+              affectedRows: result[1]
+            });
+          }).catch((err) => {
+            return cb(err.errors[0], null);
+          });
+        }).catch((err) => {
+          return cb(err, null);
+        });
+      } catch (error) {
+        return cb(error.errors[0], null);
+      }
+    } else {
+      return cb({ error: "The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'" }, null);
+    }
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+module.exports = { Store, Update, FindOne };

package/packages/package.json

@@ -2,19 +2,16 @@
   "name": "application",
   "version": "0.1.0",
   "description": "The project is powered by Beech API framework",
+  "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "start": "npx run ./node_modules/beech-api/packages/cli/beech",
+    "start": "beech-service serve",
     "test": "node ./node_modules/jest/bin/jest __tests__ -o --watch --config"
   },
   "dependencies": {
-    "beech-api": "^3.5.11",
-    "nodemon": "^3.0.1",
-    "sqlite3": "^5.0.11",
-    "tedious": "^15.0.1"
+    "beech-api": "^3.7.10"
   },
   "devDependencies": {
-    "jest": "^25.2.7",
-    "sequelize-cli": "^5.5.1"
+    "jest": "^28.1.3"
   }
 }

package/packages/cli/core/generator/_create

@@ -1,7 +0,0 @@
-
-Usage:
-  $ beech-app create <app-name>
-
-Options:
-  ?|-h, --help          Display this help message
-  -v, --version         Display this application version

package/packages/lib/beech.js

@@ -1,136 +0,0 @@
-const appRoot = require("app-root-path");
-const passport_config = require(appRoot + "/passport.config.js");
-const md5 = require("md5");
-const secret = require("./salt").salt;
-
-module.exports = {
-  async findOne(fields, fieldCondArr, cb) {
-    try {
-      let stm = '';
-      let cond = '1';
-      let table = await [passport_config.model.table || "users"];
-      let passportFields = await (fields[0]) ? fields : (passport_config.model.fields.length) ? passport_config.model.fields : ["id", "name", "email"];
-      const pool = await eval("sql." + passport_config.model.name);
-      // Generate condition
-      await Object.keys(fieldCondArr).forEach(key => {
-        cond += ' AND ' + key + '=' + fieldCondArr[key]
-      });
-      // check base pool
-      if (pool_base == "basic") {
-        // pool base is MySQL
-        stm += 'SELECT ?? FROM ?? WHERE ' + cond;
-        await pool.query(stm, [passportFields, table], (err, row) => {
-          cb(err, row);
-        });
-      } else if (pool_base == "sequelize") {
-        // pool base is Sequelize
-        try {
-          stm += `SELECT ${passportFields} FROM ${table} WHERE ` + cond;
-          let result = await pool.query(stm, {
-            type: QueryTypes.SELECT
-          });
-          return cb(null, result);
-        } catch (error) {
-          return cb(error, null);
-        }
-      } else {
-        return cb({ error: "Base pool SQL error." }, null);
-      }
-    } catch (error) {
-      cb(error, null);
-    }
-  },
-  async store(fields, cb) {
-    try {
-      let stm = '';
-      let keys = [];
-      let escaped = [];
-      let values = await [passport_config.model.table || "users"];
-      let passwordField = await String(passport_config.model.password_field || "password");
-      const pool = await eval("sql." + passport_config.model.name);
-      // asign password hash
-      fields[passwordField] = md5(fields[passwordField] + secret);
-      // sql generate
-      await Object.keys(fields).forEach(key => {
-        keys.push(key);
-        values.push(fields[key]);
-        escaped.push('?');
-      });
-      // check base pool
-      if (pool_base == "basic") {
-        // pool base is MySQL
-        stm += 'INSERT INTO ?? (' + keys.join() + ') VALUES (' + escaped.join() + ')';
-        await pool.query(stm, values, (err, result) => {
-          cb(err, result);
-        });
-      } else if (pool_base == "sequelize") {
-        // pool base is Sequelize
-        try {
-          stm += `INSERT INTO ${values.shift()} (` + keys.join() + ') VALUES (' + escaped.join() + ')';
-          let result = await pool.query(stm, {
-            replacements: values,
-            type: QueryTypes.INSERT
-          });
-          return cb(null, {
-            insertId: result[0],
-            affectedRows: result[1]
-          });
-        } catch (error) {
-          return cb(error, null);
-        }
-      } else {
-        return cb({ error: "Base pool SQL error." }, null);
-      }
-    } catch (error) {
-      cb(error, null);
-    }
-  },
-  async update(someFields, id, cb) {
-    try {
-      let stm = '';
-      let keys = [];
-      let values = await [passport_config.model.table || "users"];
-      let passwordField = await String(passport_config.model.password_field || "password");
-      const pool = await eval("sql." + passport_config.model.name);
-      // check password body for asign hash
-      if (someFields[passwordField]) {
-        someFields[passwordField] = md5(someFields[passwordField] + secret);
-      }
-      // sql generate
-      Object.keys(someFields).forEach(key => {
-        keys.push(`${key}=?`);
-        values.push(someFields[key]);
-      });
-      values.push(id);
-      // check base pool
-      if (pool_base == "basic") {
-        // pool base is MySQL
-        stm += 'UPDATE ?? SET ' + keys.join() + ' WHERE id = ?';
-        await pool.query(stm, values, (err, result) => {
-          cb(err, result);
-        });
-      } else if (pool_base == "sequelize") {
-        // pool base is Sequelize
-        try {
-          stm += `UPDATE ${values.shift()} SET ` + keys.join() + ' WHERE id = ?';
-          console.log(stm, values);
-          let result = await pool.query(stm, {
-            replacements: values,
-            type: QueryTypes.UPDATE
-          });
-          return cb(null, {
-            updateId: parseInt(id),
-            affectedRows: result[1]
-          });
-        } catch (error) {
-          return cb(error, null);
-        }
-      } else {
-        return cb({ error: "Base pool SQL error." }, null);
-      }
-
-    } catch (error) {
-      cb(error, null);
-    }
-  },
-}

package/packages/lib/salt.js

@@ -1,3 +0,0 @@
-module.exports = {
-  salt: ["?p9E1oXV8My9akelVzsf3"]
-}

package/packages/src-/Add-on.js

@@ -1,9 +0,0 @@
-//const Users = require("@/models/Users");
-
-exports.init = () => {
-
-  //Users.findAll().then(console.log)
-
-  console.log("Add-on is work!")
-
-}

package/packages/src-/endpoints/hello-endpoints.js

@@ -1,118 +0,0 @@
-const Beech = require("../../lib/beech");
-const Users = require("@/models/Users");
-const Users2 = require("@/models/Users-sqlite");
-const User2Sequelize = require("@/models/User2Sequelize");
-const Map_master = require("@/models/Map_master");
-
-exports.init = () => {
-  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
-
-  /@GET/
-  endpoint.get('/hello', Credentials, async (req, res) => {
-    // basic get method
-    let data = {};
-    data.code = 200;
-    data.message = 'Got a GET request.';
-
-    /* await Users.findAll().then(e=> {
-      data.results = e
-    }); */
-
-    let fields = {
-      username: "eiei",
-      password: "xxx",
-      email: "bomb@bomb.com",
-      name: "jubu eiei"
-    }
-
-
-    /* Beech.store(fields, (err, result) => {
-      if(err) {
-        console.log(err);
-      } else {
-        console.log(result);
-      }
-    }); */
-
-    /* await Beech.findOne([], { id: 66 }, (err, result) => {
-      data.result = result
-    }) */
-
-    /* Beech.update({ username: "eiei", name: 'eiei222' }, 69, (err, result) => {
-      console.log(result);
-    }) */
-
-    data.result = await Users2.findAll(); // basic
-    //data.results = await User2Sequelize.findAll(); // sequelize
-    //data.results = await User2Sequelize.findUser2SequelizeById(7) // sequelize
-
-    //data.results = await Map_master.findAll() // sequelize
-
-
-
-
-
-    // @return
-    res.json(data);
-  });
-
-  /@POST/
-  endpoint.post('/hello', Credentials, (req, res) => {
-    /**
-     * @param Integer id
-     *
-     * @return json
-     */
-    let id = req.body.id;
-    let data = {};
-    data.code = 200;
-    data.message = 'Got a POST request.';
-    // @return
-    res.json(data);
-  });
-
-  /@PUT/
-  endpoint.put('/hello/:id', Credentials, (req, res) => {
-    /**
-     * @param Integer id
-     *
-     * @return json
-     */
-    let id = req.params.id;
-    let data = {};
-    data.code = 200;
-    data.message = 'Got a PUT request at /hello/' + id;
-    // @return
-    res.json(data);
-  });
-
-  /@PATCH/
-  endpoint.patch('/hello/:id', Credentials, (req, res) => {
-    /**
-     * @param Integer id
-     *
-     * @return json
-     */
-    let id = req.params.id;
-    let data = {};
-    data.code = 200;
-    data.message = 'Got a PATCH request at /hello/' + id;
-    // @return
-    res.json(data);
-  });
-
-  /@DELETE/
-  endpoint.delete('/hello/:id', Credentials, (req, res) => {
-    /**
-     * @param Integer id
-     *
-     * @return json
-     */
-    let id = req.params.id;
-    let data = {};
-    data.code = 200;
-    data.message = 'Got a DELETE request at /hello/' + id;
-    // @return
-    res.json(data);
-  });
-}