Merge pull request #248 from dadiorchen/new-country

new country

Author: dadiorchen

server/infra/database/CountryRepository.ts

@@ -1,3 +1,4 @@
+import log from 'loglevel';
 import Country from 'interfaces/Country';
 import HttpError from 'utils/HttpError';
 import BaseRepository from './BaseRepository';
@@ -88,48 +89,17 @@ export default class CountryRepository extends BaseRepository<Country> {
         regionName = 'South America';
         break;
       default:
-        regionName = '';
+        regionName = 'Global';
     }
 
-    let sql: string;
-
-    if (regionName === '') {
-      sql = `
-        select r2.*,region.name, ST_AsGeoJSON(centroid) as centroid from (
-          select count(r.region_id) as planted,r.region_id as region_id from (
-            select distinct(tree_id),region_id  from public.active_tree_region
-            left join region_type on type_id = region_type.id
-            where region_type.type = 'country') r
-          group by region_id
-          order by planted desc
-          limit ${10}) r2
-        left join region
-        on r2.region_id = region.id
-        `;
-    } else {
-      sql = `
-      select r.*, region.name, ST_AsGeoJSON(region.centroid) as centroid  from (
-      select count(region.id) as planted, region.id
-      from (
-        select trees.*  from trees, region c
-        where c.name = '${regionName}' and ST_WITHIN(trees.estimated_geometric_location, c.geom)
-      ) as trees_in_continent
-      LEFT JOIN region
-      on ST_WITHIN(trees_in_continent.estimated_geometric_location, region.geom)
-      left join region_type
-      on region.type_id = region_type.id
-      where
-      region_type.type = 'country'
-      group by region.id
-      order by count(region.id) desc
-      limit 10
-      ) r left join region
-      on r.id = region.id
-      `;
-    }
+    const sql = "select * from webmap.config where name = 'country-leader-board'";
 
     const object = await this.session.getDB().raw(sql);
-    return object.rows;
+    if (object.rows.length === 0) {
+      throw new HttpError(404, `Can not found data`);
+    }
+    log.warn('countries result:', object);
+    return object.rows[0].data[regionName];
 
     // The sql is too slow, need to optimize TODO
     // return [