From e75bc52e3bbacee9c3f414bf9ae0788bcc25ad07 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 4 Oct 2018 16:59:46 +0530 Subject: [PATCH 1/4] getting raw response from sequelize operation instead of sequelize objects --- src/routes/admin/project-index-create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/admin/project-index-create.js b/src/routes/admin/project-index-create.js index a57444b3..d0f4499d 100644 --- a/src/routes/admin/project-index-create.js +++ b/src/routes/admin/project-index-create.js @@ -51,7 +51,7 @@ module.exports = [ logger.debug('fields', fields); const eClient = util.getElasticSearchClient(); - return models.Project.findProjectRange(models, projectIdStart, projectIdEnd, fields, false) + return models.Project.findProjectRange(models, projectIdStart, projectIdEnd, fields, true) .then((_projects) => { const projects = _projects.map((_project) => { const project = _project; From 713e1e9ae1a081a50e0c1d3618a693913732f2d8 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 4 Oct 2018 17:32:26 +0530 Subject: [PATCH 2/4] Using raw for nested models as well --- src/models/project.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/models/project.js b/src/models/project.js index 7fdf81d0..dfa83dcd 100644 --- a/src/models/project.js +++ b/src/models/project.js @@ -169,11 +169,13 @@ module.exports = function defineProject(sequelize, DataTypes) { include: [{ model: models.ProjectPhase, as: 'phases', + raw, order: [['startDate', 'asc']], // where: phasesWhere, include: [{ model: models.PhaseProduct, as: 'products', + raw, }], }], }); From ba36b2f043e7d8b4db8d2c77e46d9dc0cc448de2 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 4 Oct 2018 17:50:42 +0530 Subject: [PATCH 3/4] checking if phases are returned successfully with raw being true --- src/models/project.js | 2 -- src/routes/admin/project-index-create.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/models/project.js b/src/models/project.js index dfa83dcd..7fdf81d0 100644 --- a/src/models/project.js +++ b/src/models/project.js @@ -169,13 +169,11 @@ module.exports = function defineProject(sequelize, DataTypes) { include: [{ model: models.ProjectPhase, as: 'phases', - raw, order: [['startDate', 'asc']], // where: phasesWhere, include: [{ model: models.PhaseProduct, as: 'products', - raw, }], }], }); diff --git a/src/routes/admin/project-index-create.js b/src/routes/admin/project-index-create.js index d0f4499d..a57444b3 100644 --- a/src/routes/admin/project-index-create.js +++ b/src/routes/admin/project-index-create.js @@ -51,7 +51,7 @@ module.exports = [ logger.debug('fields', fields); const eClient = util.getElasticSearchClient(); - return models.Project.findProjectRange(models, projectIdStart, projectIdEnd, fields, true) + return models.Project.findProjectRange(models, projectIdStart, projectIdEnd, fields, false) .then((_projects) => { const projects = _projects.map((_project) => { const project = _project; From 61f1b90bc7a8705233abbb01d1ed335d9fbe83b1 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Fri, 5 Oct 2018 15:33:44 +0530 Subject: [PATCH 4/4] Possible fix for indexing issues for members --- src/routes/admin/project-index-create.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/admin/project-index-create.js b/src/routes/admin/project-index-create.js index a57444b3..9a421516 100644 --- a/src/routes/admin/project-index-create.js +++ b/src/routes/admin/project-index-create.js @@ -54,10 +54,10 @@ module.exports = [ return models.Project.findProjectRange(models, projectIdStart, projectIdEnd, fields, false) .then((_projects) => { const projects = _projects.map((_project) => { - const project = _project; - if (!project) { + if (!_project) { return Promise.resolve(null); } + const project = _project.toJSON(); logger.debug('phases', project.phases); if (project.phases) { // removs the delete audit fields from the index data