From b06eda9704f09f71d427a6811a4ea18a1dca7c61 Mon Sep 17 00:00:00 2001
From: aayushgauba <55630226+aayushgauba@users.noreply.github.com>
Date: Sun, 23 Jul 2023 12:48:35 +0530
Subject: [PATCH 1/2] fix:organization_counter for species

---
 server/infra/database/SpeciesRepository.ts | 43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/server/infra/database/SpeciesRepository.ts b/server/infra/database/SpeciesRepository.ts
index ce75b0c..3bc8ec6 100644
--- a/server/infra/database/SpeciesRepository.ts
+++ b/server/infra/database/SpeciesRepository.ts
@@ -43,30 +43,31 @@ export default class SpeciesRepository extends BaseRepository<Species> {
   async countByOrganization(organization_id: number) {
     const totalSql = `
     SELECT 
-    species_id as id, total, ts.name, ts.desc
-    FROM 
-    (
-    SELECT 
-    ss.species_id, count(ss.species_id) as total
-    from webmap.species_stat ss
-    WHERE
-    ss.planter_id IN (
-      SELECT
-        id
-      FROM planter p
+      species_id as id, total, ts.name, ts.desc
+      FROM 
+      (
+      SELECT 
+      ss.species_id, count(ss.species_id) as total
+      from webmap.species_stat ss
       WHERE
-          p.organization_id in ( SELECT entity_id from getEntityRelationshipChildren(${organization_id}))
-    )
-    OR
-      ss.planting_organization_id = ${organization_id}
-    GROUP BY ss.species_id
-    ) s_count
-    JOIN tree_species ts
-    ON ts.id = s_count.species_id
-    ORDER BY total DESC
+      ss.planter_id IN (
+        SELECT
+          id
+        FROM planter p
+        WHERE
+            p.organization_id in ( SELECT entity_id from getEntityRelationshipChildren(${organization_id}))
+      )
+      OR
+        ss.planting_organization_id = ${organization_id}
+      GROUP BY ss.species_id
+      ) s_count
+      JOIN tree_species ts
+      ON ts.id = s_count.species_id
+      ORDER BY total DESC
+
     `;
     const total = await this.session.getDB().raw(totalSql);
-    return parseInt(total.rows[0].count.toString());
+    return parseInt(total.rows.length);
   }
 
   async getByPlanter(planter_id: number, options: FilterOptions) {

From 9e52d0c8c27256163b833ebb2e559a9afea29867 Mon Sep 17 00:00:00 2001
From: aayushgauba <55630226+aayushgauba@users.noreply.github.com>
Date: Sun, 23 Jul 2023 12:57:49 +0530
Subject: [PATCH 2/2] fix:organization_counter for speciesV2

---
 server/infra/database/SpeciesRepositoryV2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/infra/database/SpeciesRepositoryV2.ts b/server/infra/database/SpeciesRepositoryV2.ts
index b4dcb32..1974645 100644
--- a/server/infra/database/SpeciesRepositoryV2.ts
+++ b/server/infra/database/SpeciesRepositoryV2.ts
@@ -66,7 +66,7 @@ export default class SpeciesRepositoryV2 extends BaseRepository<Species> {
     ORDER BY total DESC
     `;
     const total = await this.session.getDB().raw(totalSql);
-    return parseInt(total.rows[0].count.toString());
+    return parseInt(total.rows.length);
   }
 
   async getByPlanter(planter_id: number, options: FilterOptions) {