Merge pull request #349 from aayushgauba/main

fix:organization_counter for species
Greenstand · Jul 24, 2023 · 91f70d1 · 91f70d1
2 parents 01e6d7c + 9e52d0c
commit 91f70d1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git 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) {

diff --git 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) {