new model model
This commit is contained in:
@ -32,7 +32,7 @@ function processKeys(map, data, partial){
|
||||
continue;
|
||||
}
|
||||
|
||||
out[key] = data.hasOwnProperty(key) ? data[key] : returnOrCall(map[key].default);
|
||||
out[key] = data.hasOwnProperty(key) && data[key] !== undefined ? data[key] : returnOrCall(map[key].default);
|
||||
|
||||
if(data.hasOwnProperty(key) && process_type[map[key].type]){
|
||||
let typeError = process_type[map[key].type](map[key], data[key]);
|
||||
@ -54,15 +54,13 @@ function processKeys(map, data, partial){
|
||||
|
||||
function parseFromString(map, data){
|
||||
let types = {
|
||||
boolean: function(value){ return value === 'true' ? true : false },
|
||||
boolean: function(value){ return value === 'false' ? false : true },
|
||||
number: Number,
|
||||
string: String,
|
||||
};
|
||||
|
||||
for(let key of Object.keys(data)){
|
||||
console.log('looking at', key)
|
||||
if(map[key] && map[key].type){
|
||||
console.log('converting', data[key], 'to', map[key].type)
|
||||
data[key] = types[map[key].type](data[key]);
|
||||
}
|
||||
}
|
||||
@ -75,41 +73,8 @@ function ObjectValidateError(message) {
|
||||
this.message = (message || {});
|
||||
this.status = 422;
|
||||
}
|
||||
|
||||
ObjectValidateError.prototype = Error.prototype;
|
||||
|
||||
|
||||
module.exports = {processKeys, parseFromString, ObjectValidateError};
|
||||
|
||||
if (require.main === module) {
|
||||
const keys_map = {
|
||||
'host': {isRequired: true, type: 'string', min: 3, max: 500},
|
||||
'ip': {isRequired: true, type: 'string', min: 3, max: 500},
|
||||
'updated': {default: function(){return (new Date).getTime()}, always:true},
|
||||
'username': {isRequired: true, type: 'string', always: true},
|
||||
'targetport': {isRequired: true, type: 'number', min:0, max:65535},
|
||||
'forcessl': {isRequired: false, default: true, type: 'boolean'},
|
||||
'targetssl': {isRequired: false, default: false, type: 'boolean'},
|
||||
}
|
||||
|
||||
console.log(processKeys(keys_map, {
|
||||
host:'asdqwwd',
|
||||
ip: 'sdfwef',
|
||||
username: '',
|
||||
targetport: 8000,
|
||||
updated: 'dqwqwdq'
|
||||
}));
|
||||
|
||||
|
||||
console.log(parseFromString(keys_map, {
|
||||
host: 'stest.theta42.com',
|
||||
ip: 'googs',
|
||||
updated: '1577054966047',
|
||||
username: 'william',
|
||||
targetport: '8080',
|
||||
forcessl: 'true',
|
||||
targetssl: 'false' }
|
||||
))
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
191
nodejs/utils/redis_model.js
Normal file
191
nodejs/utils/redis_model.js
Normal file
@ -0,0 +1,191 @@
|
||||
'use strict';
|
||||
|
||||
const client = require('../utils/redis');
|
||||
const objValidate = require('../utils/object_validate');
|
||||
|
||||
|
||||
let table = {};
|
||||
|
||||
table.get = async function(data){
|
||||
try{
|
||||
// if the data argument was passed as the index key value, make a data
|
||||
// object and add the index key to it.
|
||||
if(typeof data !== 'object'){
|
||||
let key = data;
|
||||
data = {};
|
||||
data[this._key] = key;
|
||||
}
|
||||
|
||||
// Get all the hash keys for the passed index key.
|
||||
let res = await client.HGETALL(`${this._name}_${data[this._key]}`);
|
||||
|
||||
// If the redis query resolved to something, prepare the data.
|
||||
if(res){
|
||||
|
||||
// Redis always returns strings, use the keyMap schema to turn them
|
||||
// back to native values.
|
||||
res = objValidate.parseFromString(this._keyMap, res);
|
||||
|
||||
// Make sure the index key in in the returned object.
|
||||
res[this._key] = data[this._key];
|
||||
|
||||
// Create a instance for this redis entry.
|
||||
var entry = Object.create(this);
|
||||
|
||||
// Insert the redis response into the instance.
|
||||
Object.assign(entry, res);
|
||||
|
||||
// Return the instance to the caller.
|
||||
return entry;
|
||||
}
|
||||
|
||||
}catch(error){
|
||||
throw error
|
||||
}
|
||||
|
||||
let error = new Error('EntryNotFound');
|
||||
error.name = 'EntryNotFound';
|
||||
error.message = `${this._name}:${data[this._key]} does not exists`;
|
||||
error.status = 404;
|
||||
throw error;
|
||||
};
|
||||
|
||||
table.exists = async function(data){
|
||||
// Return true or false if the requested entry exists ignoring error's.
|
||||
try{
|
||||
await this.get(data);
|
||||
|
||||
return true
|
||||
}catch(error){
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
table.list = async function(){
|
||||
// return a list of all the index keys for this table.
|
||||
try{
|
||||
|
||||
return await client.SMEMBERS(this._name);
|
||||
|
||||
}catch(error){
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
table.listDetail = async function(){
|
||||
// Return a list of the entries as instances.
|
||||
let out = [];
|
||||
|
||||
for(let entry of await this.list()){
|
||||
out.push(await this.get(entry));
|
||||
}
|
||||
|
||||
return out
|
||||
};
|
||||
|
||||
table.add = async function(data){
|
||||
// Add a entry to this redis table.
|
||||
try{
|
||||
|
||||
// Validate the passed data by the keyMap schema.
|
||||
data = objValidate.processKeys(this._keyMap, data);
|
||||
|
||||
// Do not allow the caller to overwrite an existing index key,
|
||||
if(data[this._key] && await this.exists(data)){
|
||||
let error = new Error('EntryNameUsed');
|
||||
error.name = 'EntryNameUsed';
|
||||
error.message = `${this._name}:${data[this._key]} already exists`;
|
||||
error.status = 409;
|
||||
|
||||
throw error;
|
||||
}
|
||||
|
||||
// Add the key to the members for this redis table
|
||||
await client.SADD(this._name, data[this._key]);
|
||||
|
||||
// Add the values for this entry.
|
||||
for(let key of Object.keys(data)){
|
||||
await client.HSET(`${this._name}_${data[this._key]}`, key, data[key]);
|
||||
}
|
||||
|
||||
// return the created redis entry as entry instance.
|
||||
return await this.get(data[this._key]);
|
||||
} catch(error){
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
table.update = async function(data, key){
|
||||
// Update an existing entry.
|
||||
try{
|
||||
// If an index key is passed, we assume is passed, assume we are not
|
||||
// part of an entry instance. Make one and recall this from from a entry
|
||||
// instance,
|
||||
if(key) return await (await this.get(key)).update(data);
|
||||
|
||||
// Check to see if entry name changed.
|
||||
if(data[this._key] && data[this._key] !== this[this._key]){
|
||||
|
||||
// Merge the current data into with the updated data
|
||||
let newData = Object.assign({}, this, data);
|
||||
|
||||
// Remove the updated failed so it doesnt keep it
|
||||
delete newData.updated;
|
||||
|
||||
// Create a new record for the updated entry. If that succeeds,
|
||||
// delete the old recored
|
||||
if(await this.add(newData)) await this.remove();
|
||||
|
||||
}else{
|
||||
// Update what ever fields that where passed.
|
||||
|
||||
// Validate the passed data, ignoring required fields.
|
||||
data = objValidate.processKeys(this._keyMap, data, true);
|
||||
|
||||
// Loop over the data fields and apply them to redis
|
||||
for(let key of Object.keys(data)){
|
||||
this[key] = data[key];
|
||||
await client.HSET(`${this._name}_${this[this._key]}`, key, data[key]);
|
||||
}
|
||||
}
|
||||
|
||||
return this;
|
||||
|
||||
} catch(error){
|
||||
// Pass any error to the calling function
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
table.remove = async function(data){
|
||||
// Remove an entry from this table.
|
||||
|
||||
data = data || this;
|
||||
try{
|
||||
// Remove the index key from the tables members list.
|
||||
await client.SREM(this._name, data[this._key]);
|
||||
|
||||
// Remove the entries hash values.
|
||||
let count = await client.DEL(`${this._name}_${data[this._key]}`);
|
||||
|
||||
// Return the number of removed values to the caller.
|
||||
return count;
|
||||
|
||||
} catch(error) {
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
function Table(data){
|
||||
// Create a table instance.
|
||||
let obj = Object.create(table);
|
||||
|
||||
// Insert the user assigned options
|
||||
Object.assign(obj, data);
|
||||
|
||||
// Return the table instance to the caller.
|
||||
return obj;
|
||||
|
||||
};
|
||||
|
||||
module.exports = Table;
|
||||
Reference in New Issue
Block a user