yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-24 22:21:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize code

Browse Source
This commit is contained in:
Jim LAURIE 2018-06-20 20:47:45 +02:00
parent 75c1c4bac5
commit b7fe5f7821
1 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/strapi-bookshelf/lib/index.js
View File

@ -137,8 +137,18 @@ module.exports = function(strapi) {
const done = _.after(_.size(definition.attributes), () => {
try {
// External function to map key that has been updated with `columnName`
const mapper = (params = {}) =>
_.mapKeys(params, (value, key) => {
const mapper = (params = {}) => {
if (definition.client === 'mysql') {
Object.keys(params).map((key) => {
const attr = definition.attributes[key] || {};
if (attr.type === 'json') {
params[key] = JSON.stringify(params[key]);
}
});
}
return _.mapKeys(params, (value, key) => {
const attr = definition.attributes[key] || {};
return _.isPlainObject(attr) &&
@ -146,6 +156,7 @@ module.exports = function(strapi) {
? attr['columnName']
: key;
});
};
// Update serialize to reformat data for polymorphic associations.
loadedModel.serialize = function(options) {
@ -289,6 +300,17 @@ module.exports = function(strapi) {
// Convert to JSON format stringify json for mysql database
if (definition.client === 'mysql') {
const events = [{
name: 'saved',
target: 'afterSave'
}, {
name: 'fetched',
target: 'afterFetch'
}, {
name: 'fetched:collection',
target: 'afterFetchCollection'
}];
const jsonFormatter = (attributes) => {
Object.keys(attributes).map((key) => {
const attr = definition.attributes[key] || {};
@ -298,37 +320,24 @@ module.exports = function(strapi) {
}
});
};
this.on('saved', (instance) => {
jsonFormatter(instance.attributes);
return _.isFunction(
target[model.toLowerCase()]['afterSave']
)
? target[model.toLowerCase()]['afterSave']
: Promise.resolve();
});
this.on('fetched', (instance) => {
jsonFormatter(instance.attributes);
return _.isFunction(
target[model.toLowerCase()]['afterFetch']
)
? target[model.toLowerCase()]['afterFetch']
: Promise.resolve();
});
this.on('fetched:collection', (instance) => {
events.forEach((event) => {
this.on(event.name, (instance) => {
if (instance.models) {
instance.models.map((entry) => {
jsonFormatter(entry.attributes);
});
} else {
jsonFormatter(instance.attributes);
}
return _.isFunction(
target[model.toLowerCase()]['afterFetchCollection']
target[model.toLowerCase()][event.target]
)
? target[model.toLowerCase()]['afterFetchCollection']
? target[model.toLowerCase()][event.target]
: Promise.resolve();
});
});
}
};