Refactoring to use entities over sites and networks.

This commit is contained in:
2020-06-17 04:07:24 +02:00
parent 1907ce1e54
commit f0a89df6ab
7 changed files with 93 additions and 97 deletions

View File

@@ -34,12 +34,15 @@ async function findSites(baseReleases) {
.filter(Boolean),
));
const siteEntries = await knex('sites')
.leftJoin('networks', 'networks.id', 'sites.network_id')
.select('sites.*', 'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.parameters as network_parameters', 'networks.description as network_description')
.whereIn('sites.slug', siteSlugs);
const siteEntries = await knex('entities')
.leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
.select('entities.*', 'parents.id as network_id', 'parents.name as network_name', 'parents.slug as network_slug', 'parents.url as network_url', 'parents.parameters as network_parameters', 'parents.description as network_description')
.where('entities.type', 2)
.whereIn('entities.slug', siteSlugs);
const networkEntries = await knex('networks').whereIn('slug', siteSlugs);
const networkEntries = await knex('entities')
.where('type', 1)
.whereIn('slug', siteSlugs);
const sites = await curateSites(siteEntries, true, false);
const networks = await curateNetworks(networkEntries, true, false, false);