From 67d0953985460c3b0375174179bbe24d9935c1a1 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 05:18:52 +0600 Subject: [PATCH 1/7] fix: typo --- src/common/helper.js | 1 - src/controllers/ChallengeTimelineTemplateController.js | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/helper.js b/src/common/helper.js index 4d1e8abb..f0ab9e0b 100644 --- a/src/common/helper.js +++ b/src/common/helper.js @@ -1287,6 +1287,5 @@ module.exports = { sendSelfServiceNotification, getMemberByHandle, submitZendeskRequest, - getMemberById, updateSelfServiceProjectInfo } diff --git a/src/controllers/ChallengeTimelineTemplateController.js b/src/controllers/ChallengeTimelineTemplateController.js index 5b9a43fd..28eb54bb 100644 --- a/src/controllers/ChallengeTimelineTemplateController.js +++ b/src/controllers/ChallengeTimelineTemplateController.js @@ -32,7 +32,7 @@ async function createChallengeTimelineTemplate (req, res) { * @param {Object} res the response */ async function getChallengeTimelineTemplate (req, res) { - const result = await service.getChallengeTimelineTemplate(req.params.challengeTypeTimelineTemplateId) + const result = await service.getChallengeTimelineTemplate(req.params.challengeTimelineTemplateId) res.send(result) } @@ -42,7 +42,7 @@ async function getChallengeTimelineTemplate (req, res) { * @param {Object} res the response */ async function fullyUpdateChallengeTimelineTemplate (req, res) { - const result = await service.fullyUpdateChallengeTimelineTemplate(req.params.challengeTypeTimelineTemplateId, req.body) + const result = await service.fullyUpdateChallengeTimelineTemplate(req.params.challengeTimelineTemplateId, req.body) res.send(result) } @@ -52,7 +52,7 @@ async function fullyUpdateChallengeTimelineTemplate (req, res) { * @param {Object} res the response */ async function deleteChallengeTimelineTemplate (req, res) { - const result = await service.deleteChallengeTimelineTemplate(req.params.challengeTypeTimelineTemplateId) + const result = await service.deleteChallengeTimelineTemplate(req.params.challengeTimelineTemplateId) res.send(result) } From 701de8e44dc13305775119098f3a60447a3be2bf Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 05:20:31 +0600 Subject: [PATCH 2/7] fix: deploy to dev --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c857aaf..741fc836 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,7 @@ workflows: branches: only: - develop + - fix/challenge-timelines-edit-routes # Production builds are exectuted only on tagged commits to the # master branch. From c81ba9b22bd5d0defd8ffe7e14bcbfad2eb77087 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 05:36:12 +0600 Subject: [PATCH 3/7] logs --- src/common/helper.js | 3 +++ src/services/ChallengeTimelineTemplateService.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/helper.js b/src/common/helper.js index f0ab9e0b..9107d22a 100644 --- a/src/common/helper.js +++ b/src/common/helper.js @@ -193,9 +193,12 @@ function checkIfExists (source, term) { * @returns {Promise} */ async function getById (modelName, id) { + console.log('model name', modelName) + console.log('id', id) return new Promise((resolve, reject) => { models[modelName].query('id').eq(id).exec((err, result) => { if (err) { + console.log('failed', err) return reject(err) } if (result.length > 0) { diff --git a/src/services/ChallengeTimelineTemplateService.js b/src/services/ChallengeTimelineTemplateService.js index 9390d139..411884ce 100644 --- a/src/services/ChallengeTimelineTemplateService.js +++ b/src/services/ChallengeTimelineTemplateService.js @@ -108,8 +108,9 @@ getChallengeTimelineTemplate.schema = { * @returns {Object} the updated challenge type timeline template */ async function fullyUpdateChallengeTimelineTemplate (challengeTimelineTemplateId, data) { + console.log('getting template by id', challengeTimelineTemplateId) const record = await helper.getById('ChallengeTimelineTemplate', challengeTimelineTemplateId) - + console.log('template', record) if (record.typeId === data.typeId && record.trackId === data.trackId && record.timelineTemplateId === data.timelineTemplateId && From 7f8625af9e8ad2af47a4ad527f4200e26ce52df7 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 05:46:20 +0600 Subject: [PATCH 4/7] logs --- src/common/helper.js | 3 --- src/services/ChallengeTimelineTemplateService.js | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/common/helper.js b/src/common/helper.js index 9107d22a..f0ab9e0b 100644 --- a/src/common/helper.js +++ b/src/common/helper.js @@ -193,12 +193,9 @@ function checkIfExists (source, term) { * @returns {Promise} */ async function getById (modelName, id) { - console.log('model name', modelName) - console.log('id', id) return new Promise((resolve, reject) => { models[modelName].query('id').eq(id).exec((err, result) => { if (err) { - console.log('failed', err) return reject(err) } if (result.length > 0) { diff --git a/src/services/ChallengeTimelineTemplateService.js b/src/services/ChallengeTimelineTemplateService.js index 411884ce..58c6852a 100644 --- a/src/services/ChallengeTimelineTemplateService.js +++ b/src/services/ChallengeTimelineTemplateService.js @@ -45,6 +45,7 @@ searchChallengeTimelineTemplates.schema = { */ async function unsetDefaultTimelineTemplate (typeId, trackId) { const records = await searchChallengeTimelineTemplates({ typeId, trackId, isDefault: true }) + console.log('records to unset', records); if (records.length === 0) { return } From 422f26f9727dfc19213f3e5ec1cc0b56f99a5211 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 05:58:02 +0600 Subject: [PATCH 5/7] fix: invalid use of searchChallengeTimelineTeamplates result --- src/services/ChallengeTimelineTemplateService.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/services/ChallengeTimelineTemplateService.js b/src/services/ChallengeTimelineTemplateService.js index 58c6852a..28642aaa 100644 --- a/src/services/ChallengeTimelineTemplateService.js +++ b/src/services/ChallengeTimelineTemplateService.js @@ -45,11 +45,10 @@ searchChallengeTimelineTemplates.schema = { */ async function unsetDefaultTimelineTemplate (typeId, trackId) { const records = await searchChallengeTimelineTemplates({ typeId, trackId, isDefault: true }) - console.log('records to unset', records); - if (records.length === 0) { + if (records.total === 0) { return } - for (const record of records) { + for (const record of records.result) { await fullyUpdateChallengeTimelineTemplate(record.id, { ...record, isDefault: false }) } } From 587ae414f9f3ead9f085e4a91079e4ef21982859 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 05:59:09 +0600 Subject: [PATCH 6/7] fix: invalid use of searchChallengeTimelineTeamplates result --- src/services/ChallengeTimelineTemplateService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/ChallengeTimelineTemplateService.js b/src/services/ChallengeTimelineTemplateService.js index 28642aaa..658f6445 100644 --- a/src/services/ChallengeTimelineTemplateService.js +++ b/src/services/ChallengeTimelineTemplateService.js @@ -61,7 +61,7 @@ async function unsetDefaultTimelineTemplate (typeId, trackId) { async function createChallengeTimelineTemplate (data) { // check duplicate const records = await searchChallengeTimelineTemplates(data) - if (records.length > 0) { + if (records.total > 0) { throw new errors.ConflictError('The challenge type timeline template is already defined.') } // check exists @@ -121,7 +121,7 @@ async function fullyUpdateChallengeTimelineTemplate (challengeTimelineTemplateId // check duplicate const records = await searchChallengeTimelineTemplates(data) - if (records.length > 0) { + if (records.total > 0) { throw new errors.ConflictError('The challenge type timeline template is already defined.') } // check exists From cb5fb12a1cfad43b05167fe6a21762fb4aacd363 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 11 Apr 2022 06:23:41 +0600 Subject: [PATCH 7/7] chore: cleanup unnecessary logs --- src/services/ChallengeTimelineTemplateService.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/services/ChallengeTimelineTemplateService.js b/src/services/ChallengeTimelineTemplateService.js index 658f6445..a7484ef2 100644 --- a/src/services/ChallengeTimelineTemplateService.js +++ b/src/services/ChallengeTimelineTemplateService.js @@ -108,9 +108,7 @@ getChallengeTimelineTemplate.schema = { * @returns {Object} the updated challenge type timeline template */ async function fullyUpdateChallengeTimelineTemplate (challengeTimelineTemplateId, data) { - console.log('getting template by id', challengeTimelineTemplateId) const record = await helper.getById('ChallengeTimelineTemplate', challengeTimelineTemplateId) - console.log('template', record) if (record.typeId === data.typeId && record.trackId === data.trackId && record.timelineTemplateId === data.timelineTemplateId &&