hola-server 0.2.8 → 0.3.1

package/core/type.js

@@ -1,4 +1,4 @@
-const { has_value } = require('./validate');
+const { has_value, is_undefined } = require('./validate');
 const { encrypt_pwd } = require('./encrypt');
 const type_manager = {};
 
@@ -304,4 +304,26 @@ const convert_type = function (obj, fields) {
     return { obj: result, error_field_names: error_field_names };
 }
 
-module.exports = { register_type, convert_type, get_type }
+const convert_update_type = function (obj, fields) {
+    const result = {};
+    const error_field_names = [];
+
+    fields.forEach(function (field) {
+        const field_value = obj[field.name];
+        if (has_value(field_value)) {
+            const type_name = field.type ? field.type : "string";
+            const type = get_type(type_name);
+            const { value, err } = type.convert(field_value);
+            if (err) {
+                error_field_names.push(field.name);
+            } else {
+                result[field.name] = value;
+            }
+        } else if (!is_undefined(field_value)) {
+            result[field.name] = "";
+        }
+    });
+    return { obj: result, error_field_names: error_field_names };
+}
+
+module.exports = { register_type, convert_type, convert_update_type, get_type }

package/db/entity.js

@@ -1,7 +1,7 @@
 const { SUCCESS, ERROR, NO_PARAMS, INVALID_PARAMS, DUPLICATE_KEY, NOT_FOUND, REF_NOT_FOUND, REF_NOT_UNIQUE, HAS_REF } = require('../http/code');
 const { validate_required_fields, has_value } = require('../core/validate');
 const { required_params } = require('../http/params');
-const { convert_type, get_type } = require('../core/type');
+const { convert_type, convert_update_type, get_type } = require('../core/type');
 const { get_entity_meta } = require('../core/meta');
 const { unique, map_array_to_obj } = require('../core/array');
 const { LOG_ENTITY, get_db, oid_query, oid_queries, is_log_debug, is_log_error, log_debug, log_error, get_session_userid } = require('./db');
@@ -317,7 +317,7 @@ class Entity {
      * 
      */
     async update_entity(_id, param_obj) {
-        const { obj, error_field_names } = convert_type(param_obj, this.meta.update_fields);
+        const { obj, error_field_names } = convert_update_type(param_obj, this.meta.update_fields);
         if (error_field_names.length > 0) {
             if (is_log_error()) {
                 log_error(LOG_ENTITY, "update_entity error fields:" + JSON.stringify(error_field_names));
@@ -399,7 +399,7 @@ class Entity {
      * 
      */
     async batch_update_entity(_ids, param_obj) {
-        const { obj, error_field_names } = convert_type(param_obj, this.meta.update_fields);
+        const { obj, error_field_names } = convert_update_type(param_obj, this.meta.update_fields);
         if (error_field_names.length > 0) {
             if (is_log_error()) {
                 log_error(LOG_ENTITY, "batch_update_entity error fields:" + JSON.stringify(error_field_names));
@@ -524,6 +524,16 @@ class Entity {
 
         const results = await this.find(query, attrs);
         if (results && results.length == 1) {
+            if (this.meta.after_read) {
+                const { code, err } = await this.meta.after_read(_id, attr_names, results[0]);
+                if (err || code != SUCCESS) {
+                    if (is_log_error()) {
+                        log_error(LOG_ENTITY, "after_read error:" + JSON.stringify(err) + ", with code:" + code);
+                    }
+                    return { code: code, err: err };
+                }
+            }
+
             const converted = await this.convert_ref_attrs(results);
             if (converted && converted.length == 1) {
                 if (is_log_debug()) {

package/db/gridfs.js

@@ -77,6 +77,24 @@ class GridFS {
         });
     }
 
+    /**
+     * 
+     * @param {mongodb bucket name} bucketname
+     * @param {the file name} filename
+     * @param {the dest file name} dest_file 
+     */
+    async pipe_file(bucketname, filename, dest_filename) {
+        const bucket = new GridFSBucket(this.db, { chunkSizeBytes: 1024 * 1024, bucketName: bucketname });
+        const stream = bucket.openDownloadStreamByName(filename);
+        const write_stream = require("fs").createWriteStream(dest_filename);
+
+        return new Promise((resolve, reject) => {
+            stream.pipe(write_stream)
+                .on('error', err => reject(err))
+                .on('finish', item => resolve(item));
+        });
+    }
+
     /**
      * Delete the files by file name
      * @param {bucket name} bucketname 
@@ -179,6 +197,17 @@ const read_file = async (collection, filename, response) => {
     await instance.read_file(collection, filename, response);
 }
 
+/**
+ * pipe file from gridfs
+ * @param {collection name} collection 
+ * @param {file name} filename 
+ * @param {dest file name} dest_filename
+ */
+const pipe_file = async (collection, filename, dest_filename) => {
+    const instance = await get_gridfs_instance();
+    await instance.pipe_file(collection, filename, dest_filename);
+}
+
 /**
  * delete file from gridfs
  * @param {collection name} collection 
@@ -189,4 +218,4 @@ const delete_file = async (collection, filename) => {
     await instance.delete_files(collection, filename);
 }
 
-module.exports = { set_file_fields, save_file_fields_to_db, save_file, read_file, delete_file };
+module.exports = { set_file_fields, save_file_fields_to_db, save_file, read_file, pipe_file, delete_file };

package/http/params.js

@@ -1,4 +1,4 @@
-const { has_value } = require('../core/validate');
+const { has_value, is_undefined } = require('../core/validate');
 
 const parse_params = function (input, params) {
     const obj = {};
@@ -18,6 +18,17 @@ const post_params = function (req, params) {
     return parse_params(req.body, params);
 };
 
+const post_update_params = function (req, params) {
+    const input = req.body;
+    const obj = {};
+    params.forEach(function (param) {
+        if (!is_undefined(input[param])) {
+            obj[param] = input[param];
+        }
+    });
+    return obj;
+};
+
 const required_params = function (input, params) {
     const obj = {};
     let passed = true;
@@ -43,4 +54,4 @@ const required_post_params = function (req, params) {
     return required_params(req.body, params);
 };
 
-module.exports = { get_params, post_params, required_get_params, required_post_params, required_params }
+module.exports = { get_params, post_params, post_update_params, required_get_params, required_post_params, required_params }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.2.8",
+  "version": "0.3.1",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {

package/router/update.js

@@ -1,5 +1,5 @@
 const { set_file_fields, save_file_fields_to_db } = require('../db/gridfs');
-const { required_post_params, post_params } = require('../http/params');
+const { required_post_params, post_update_params } = require('../http/params');
 const { SUCCESS, NO_PARAMS } = require('../http/code');
 const { has_value } = require('../core/validate');
 const { wrap_http } = require('../http/error');
@@ -27,7 +27,7 @@ const init_update_router = function (router, meta) {
             }
         }
 
-        const param_obj = post_params(req, meta.field_names);
+        const param_obj = post_update_params(req, meta.field_names);
         set_file_fields(meta, req, param_obj);
 
         const { code, err } = await entity.update_entity(params["_id"], param_obj);
@@ -49,7 +49,7 @@ const init_update_router = function (router, meta) {
             return;
         }
 
-        const param_obj = post_params(req, meta.field_names);
+        const param_obj = post_update_params(req, meta.field_names);
         set_file_fields(meta, req, param_obj);
 
         const { code, err } = await entity.batch_update_entity(params["_ids"], param_obj);