From 8a6d261f4fee0c23e4ccb12c3a5c521cf38b3765 Mon Sep 17 00:00:00 2001 From: manuranga perera Date: Tue, 8 Oct 2019 18:55:23 +0530 Subject: [PATCH] Add json_schema column to candidate config --- src/manager/module/moduleManager.js | 11 ++++++----- src/model/Module.js | 4 +++- src/repository/module.js | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/manager/module/moduleManager.js b/src/manager/module/moduleManager.js index 2f44c261..a8f37838 100644 --- a/src/manager/module/moduleManager.js +++ b/src/manager/module/moduleManager.js @@ -55,9 +55,9 @@ const resultMaps = [ properties: ['name', 'created_by', 'module_id', 'status','last_modified'] }, { - mapId: 'candidateConfigMap', + mapId: 'candidateConfigMapData', idProperty: 'id', - properties: ['name', 'created_by', 'module_id', 'status','last_modified'] + properties: ['key_name', 'description', 'json_schema'] }, ]; @@ -155,13 +155,14 @@ console.log("mappedEle",mappedElectionTemplate); const mapToCandidateConfigModel = (templates) => { console.log("mappedElectionTemplate",templates); - const mappedElectionTemplate = joinjs.map(templates, resultMaps, 'candidateConfigMap', 'candidate_config_'); -console.log("mappedEle",mappedElectionTemplate); + const mappedElectionTemplate = joinjs.map(templates, resultMaps, 'candidateConfigMapData', 'candidate_config_'); +console.log("mappedConf",mappedElectionTemplate); return _.reduce(mappedElectionTemplate, (result, election) => { return result.push({ candidate_config_id: election.id, key_name: election.key_name, - description: election.description + description: election.description, + json_schema: election.json_schema }); }, List(CandidateConfig)()); } diff --git a/src/model/Module.js b/src/model/Module.js index 01e64a10..2b79f48d 100644 --- a/src/model/Module.js +++ b/src/model/Module.js @@ -43,7 +43,9 @@ const eligibilityCheckList = Record({ const CandidateConfig = Record({ candidate_config_id: String(), key_name: String(), - description: String() + description: String(), + json_schema: Maybe(String) + }); const ModuleList = Record({ diff --git a/src/repository/module.js b/src/repository/module.js index f501f970..755651d9 100644 --- a/src/repository/module.js +++ b/src/repository/module.js @@ -93,8 +93,9 @@ const TEMPLATE_STATUS_UPDATE_QUERY = `UPDATE ELECTION_MODULE_APPROVAL const CANDIDATE_CONFIG_SELECT_QUERY = `SELECT CC.ID AS candidate_config_id, CC.KEY_NAME AS candidate_config_key_name, - CC.DESCRIPTION AS candidate_config_description - FROM CANDIDATE_CONFIG_DATA CAD LEFT JOIN CANDIDATE_CONFIG CC ON CAD.CANDIDATE_CONFIG_ID=CC.ID + CC.DESCRIPTION AS candidate_config_description, + CC.JSON_SCHEMA AS candidate_config_json_schema + FROM CANDIDATE_CONFIG_DATA CAD LEFT JOIN CANDIDATE_CONFIG CC ON CAD.CANDIDATE_CONFIG_ID=CC.ID WHERE CAD.MODULE_ID=:id`; const fetchModuleById = (moduleId) => {