From ed779f83dacb8ef17e9e305ba48a62d527d88f8d Mon Sep 17 00:00:00 2001 From: kaysiz Date: Thu, 21 Aug 2025 13:21:19 +0200 Subject: [PATCH 1/5] Update query to count dois and accession numbers --- packages/server/controllers/chart.controllers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/controllers/chart.controllers.js b/packages/server/controllers/chart.controllers.js index 144c0ba..ba86f05 100644 --- a/packages/server/controllers/chart.controllers.js +++ b/packages/server/controllers/chart.controllers.js @@ -98,7 +98,7 @@ const getAssertionsPerYear = async ({ input }) => { const results = await searchedAssertions.search( db.raw( - `count(doi) as countDoi, count(accession_number) as accessionumber, year`, + `COUNT(CASE WHEN dataset LIKE 'https://doi.org%' THEN 1 END) AS doiCount, COUNT(CASE WHEN dataset NOT LIKE 'https://doi.org%' THEN 1 END) AS accessionNumberCount, year`, ), ) @@ -275,7 +275,7 @@ const getAssertionCountsPerSource = async ({ input }) => { results = await searchedAssertions.search( db.raw( - `count(doi) as doiCount, count(accession_number) as accessionNumberCount , source_id`, + `COUNT(CASE WHEN dataset LIKE 'https://doi.org%' THEN 1 END) AS doiCount, COUNT(CASE WHEN dataset NOT LIKE 'https://doi.org%' THEN 1 END) AS accessionNumberCount, source_id`, ), ) From b8b69b3471e6df26a132ca8d87a76a75c7031344 Mon Sep 17 00:00:00 2001 From: kaysiz Date: Thu, 21 Aug 2025 21:45:32 +0200 Subject: [PATCH 2/5] revert changes on getAssertionsperyear --- packages/server/controllers/chart.controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/controllers/chart.controllers.js b/packages/server/controllers/chart.controllers.js index ba86f05..24e056b 100644 --- a/packages/server/controllers/chart.controllers.js +++ b/packages/server/controllers/chart.controllers.js @@ -98,7 +98,7 @@ const getAssertionsPerYear = async ({ input }) => { const results = await searchedAssertions.search( db.raw( - `COUNT(CASE WHEN dataset LIKE 'https://doi.org%' THEN 1 END) AS doiCount, COUNT(CASE WHEN dataset NOT LIKE 'https://doi.org%' THEN 1 END) AS accessionNumberCount, year`, + `count(doi) as doiCount, count(accession_number) as accessionNumberCount, year`, ), ) From 5aa5b3eb6133a1846e954485f01447effc21ed89 Mon Sep 17 00:00:00 2001 From: kaysiz Date: Thu, 21 Aug 2025 21:54:43 +0200 Subject: [PATCH 3/5] Update query to count dois and accession numbers --- packages/server/controllers/chart.controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/controllers/chart.controllers.js b/packages/server/controllers/chart.controllers.js index 24e056b..ac0fe18 100644 --- a/packages/server/controllers/chart.controllers.js +++ b/packages/server/controllers/chart.controllers.js @@ -98,7 +98,7 @@ const getAssertionsPerYear = async ({ input }) => { const results = await searchedAssertions.search( db.raw( - `count(doi) as doiCount, count(accession_number) as accessionNumberCount, year`, + `COUNT(CASE WHEN dataset LIKE 'https://doi.org%' THEN 1 END) AS countDoi, COUNT(CASE WHEN dataset NOT LIKE 'https://doi.org%' THEN 1 END) AS accessionumber, year`, ), ) From 39eb83f63256a6f1ee05a78d3b2a0dcd38881f28 Mon Sep 17 00:00:00 2001 From: kaysiz Date: Thu, 21 Aug 2025 21:59:00 +0200 Subject: [PATCH 4/5] revert changes on getAssertionsperyear --- packages/server/controllers/chart.controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/controllers/chart.controllers.js b/packages/server/controllers/chart.controllers.js index ac0fe18..66f70dc 100644 --- a/packages/server/controllers/chart.controllers.js +++ b/packages/server/controllers/chart.controllers.js @@ -98,7 +98,7 @@ const getAssertionsPerYear = async ({ input }) => { const results = await searchedAssertions.search( db.raw( - `COUNT(CASE WHEN dataset LIKE 'https://doi.org%' THEN 1 END) AS countDoi, COUNT(CASE WHEN dataset NOT LIKE 'https://doi.org%' THEN 1 END) AS accessionumber, year`, + `count(doi) as countDoi, count(accession_number) as accessionumber, year`, ), ) From 1cbdf4a54cd44aabb94ad6f8288b84ca85a16e7c Mon Sep 17 00:00:00 2001 From: kaysiz Date: Thu, 21 Aug 2025 22:17:49 +0200 Subject: [PATCH 5/5] Update query to count dois and accession numbers --- packages/server/controllers/chart.controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/controllers/chart.controllers.js b/packages/server/controllers/chart.controllers.js index 66f70dc..ac0fe18 100644 --- a/packages/server/controllers/chart.controllers.js +++ b/packages/server/controllers/chart.controllers.js @@ -98,7 +98,7 @@ const getAssertionsPerYear = async ({ input }) => { const results = await searchedAssertions.search( db.raw( - `count(doi) as countDoi, count(accession_number) as accessionumber, year`, + `COUNT(CASE WHEN dataset LIKE 'https://doi.org%' THEN 1 END) AS countDoi, COUNT(CASE WHEN dataset NOT LIKE 'https://doi.org%' THEN 1 END) AS accessionumber, year`, ), )