From bfeafcb367db09d36327ac0d3c440f618381a072 Mon Sep 17 00:00:00 2001 From: Shreyas Devalapurkar Date: Thu, 16 Sep 2021 11:51:03 -0700 Subject: [PATCH] Revert "update queries to get version as well as name for csm (#498)" (#521) This reverts commit 80cb225fa6901c6b96652c79276851a3db51c935. --- api/src/queries/codes/code-queries.ts | 2 +- api/src/queries/survey/survey-view-queries.ts | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/src/queries/codes/code-queries.ts b/api/src/queries/codes/code-queries.ts index 73c8bf0b03..7542d84867 100644 --- a/api/src/queries/codes/code-queries.ts +++ b/api/src/queries/codes/code-queries.ts @@ -45,7 +45,7 @@ export const getActivitySQL = (): SQLStatement => SQL`SELECT activity_id as id, * @returns {SQLStatement} sql query object */ export const getCommonSurveyMethodologiesSQL = (): SQLStatement => - SQL`SELECT common_survey_methodology_id as id, CONCAT(name, ' - ', version) as name from common_survey_methodology;`; + SQL`SELECT common_survey_methodology_id as id, name from common_survey_methodology;`; /** * SQL query to fetch project type codes. diff --git a/api/src/queries/survey/survey-view-queries.ts b/api/src/queries/survey/survey-view-queries.ts index d4e459ab90..d4af83e488 100644 --- a/api/src/queries/survey/survey-view-queries.ts +++ b/api/src/queries/survey/survey-view-queries.ts @@ -163,10 +163,7 @@ export const getSurveyForViewSQL = (surveyId: number): SQLStatement | null => { s.geojson as geometry, per.number, per.type, - CASE - WHEN s.common_survey_methodology_id IS NOT NULL THEN CONCAT(csm.name, ' - ', csm.version) - WHEN s.common_survey_methodology_id IS NULL THEN null - END as common_survey_methodology, + csm.name as common_survey_methodology, sfs.project_funding_source_id as pfs_id, pfs.funding_amount::numeric::int, pfs.funding_start_date,