Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#51: feat: implement get countries leaderboard #88

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#51: feat: implement get countries leaderboard #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 22 additions & 99 deletions server/infra/database/CountryRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export default class CountryRepository extends BaseRepository<Country> {
St_asgeojson(centroid) as centroid
FROM
region
WHERE
WHERE
ST_Contains(geom, ST_GeomFromText('POINT(${lon} ${lat})', 4326)) = true
AND
AND
type_id in (select id from country_id);
`;
const object = await this.session.getDB().raw(sql);
Expand All @@ -59,102 +59,25 @@ export default class CountryRepository extends BaseRepository<Country> {
return object.rows;
}

// eslint-disable-next-line class-methods-use-this
getLeaderBoard(/* top = 10 */) {
// const sql = `
// select r.*, region.name, ST_AsGeoJSON(centroid) as centroid from (
// select count(region.id) as planted, region.id
// from trees
// LEFT JOIN region
// on ST_WITHIN(trees.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 ${top}
// ) r left join region
// on r.id = region.id
// ;
// `;
// const object = await this.session
// .getDB()
// .raw(sql);
// return object.rows;

// The sql is too slow, need to optimize TODO
return [
{
planted: '182499',
id: 6632405,
name: 'Sierra Leone',
centroid:
'{"type":"Point","coordinates":[-11.7927124667898,8.56329593037589]}',
},
{
planted: '38178',
id: 6632386,
name: 'Tanzania',
centroid:
'{"type":"Point","coordinates":[34.8130998093246,-6.27565408331664]}',
},
{
planted: '22384',
id: 6632488,
name: 'India',
centroid:
'{"type":"Point","coordinates":[79.6119760945121,22.8857819800289]}',
},
{
planted: '11156',
id: 6632357,
name: 'United States',
centroid:
'{"type":"Point","coordinates":[-112.461673699567,45.679547202551]}',
},
{
planted: '4218',
id: 6632460,
name: 'Malaysia',
centroid:
'{"type":"Point","coordinates":[109.697622842647,3.78986845571309]}',
},
{
planted: '3830',
id: 6632393,
name: 'South Sudan',
centroid:
'{"type":"Point","coordinates":[30.2479000185772,7.30877944922343]}',
},
{
planted: '2955',
id: 6632375,
name: 'Uganda',
centroid:
'{"type":"Point","coordinates":[32.3690797137035,1.27469298730871]}',
},
{
planted: '1804',
id: 6632492,
name: 'Haiti',
centroid:
'{"type":"Point","coordinates":[-72.6852750898533,18.935025634308]}',
},
{
planted: '1004',
id: 6632436,
name: 'Nigeria',
centroid:
'{"type":"Point","coordinates":[8.08943894770572,9.59411452232656]}',
},
{
planted: '898',
id: 6632538,
name: 'Democratic Republic of the Congo',
centroid:
'{"type":"Point","coordinates":[23.6439610660395,-2.87746288969974]}',
},
];
async getLeaderBoard(top = 10) {
const sql = `
select r.*, region.name, ST_AsGeoJSON(centroid) as centroid from (
select count(region.id) as planted, region.id
from trees
LEFT JOIN region
on ST_WITHIN(trees.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 ${top}
) r left join region
on r.id = region.id
;
`;
const object = await this.session.getDB().raw(sql);
return object.rows;
}
}