Skip to content

[HOTFIX] [DEV] es skills #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Production release 2.4.16
merged 2 commits into from
Dec 16, 2019
Merged

[HOTFIX] [DEV] es skills #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d70a183
Merge pull request #407 from topcoder-platform/hotfix/milestone-compl…
Nov 7, 2019
1c24d2a
fix: temporary fix to index TaaS project with skills
maxceem Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/events/projects/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ const indexProject = Promise.coroutine(function* (logger, msg) { // eslint-disab
// removes non required fields from phase objects
data.phases = data.phases.map(phase => _.omit(phase, ['deletedAt', 'deletedBy']));
}
// TEMPORARY FIX: should fix ES mapping instead and reindex all the projects instead
if (typeof _.get(data, 'details.taasDefinition.team.skills') !== 'string') {
_.set(data, 'details.taasDefinition.team.skills', '');
}
// add the record to the index
const result = yield eClient.index({
index: ES_PROJECT_INDEX,
Expand Down Expand Up @@ -91,6 +95,10 @@ const projectUpdatedHandler = Promise.coroutine(function* (logger, msg, channel)
// first get the existing document and than merge the updated changes and save the new document
const doc = yield eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.original.id });
const merged = _.merge(doc._source, data.updated); // eslint-disable-line no-underscore-dangle
// TEMPORARY FIX: should fix ES mapping instead and reindex all the projects instead
if (typeof _.get(merged, 'details.taasDefinition.team.skills') !== 'string') {
_.set(merged, 'details.taasDefinition.team.skills', '');
}
// update the merged document
yield eClient.update({
index: ES_PROJECT_INDEX,
Expand Down Expand Up @@ -173,6 +181,10 @@ async function projectUpdatedKafkaHandler(app, topic, payload) {
try {
const doc = await eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: previousValue.id });
const merged = _.merge(doc._source, project.get({ plain: true })); // eslint-disable-line no-underscore-dangle
// TEMPORARY FIX: should fix ES mapping instead and reindex all the projects instead
if (typeof _.get(merged, 'details.taasDefinition.team.skills') !== 'string') {
_.set(merged, 'details.taasDefinition.team.skills', '');
}
// update the merged document
await eClient.update({
index: ES_PROJECT_INDEX,
Expand Down
4 changes: 4 additions & 0 deletions src/routes/admin/project-index-create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ module.exports = [
projectResponses.map((p) => {
if (p) {
body.push({ index: { _index: indexName, _type: docType, _id: p.id } });
// TEMPORARY FIX: should fix ES mapping instead and reindex all the projects instead
if (typeof _.get(p, 'details.taasDefinition.team.skills') !== 'string') {
_.set(p, 'details.taasDefinition.team.skills', '');
}
body.push(p);
}
// dummy return
Expand Down