Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async function findBestRepoForPurl(qx: QueryExecutor, purl: string): Promise<Sin
SELECT pr.repo_id
FROM package_repos pr
WHERE pr.package_id = p.id
ORDER BY pr.confidence DESC, (pr.source = 'declared') DESC
ORDER BY pr.confidence DESC, (pr.source = 'declared') DESC, pr.repo_id DESC
LIMIT 1
) best ON true
JOIN repos r ON r.id = best.repo_id
Expand Down
10 changes: 5 additions & 5 deletions services/libs/data-access-layer/src/osspckgs/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export async function getPackageStatusCounts(
FROM package_repos pr
JOIN repos r ON r.id = pr.repo_id
WHERE pr.package_id = p.id
ORDER BY pr.confidence DESC
ORDER BY pr.confidence DESC, (pr.source = 'declared') DESC, pr.repo_id DESC
LIMIT 1
) r_sc ON true
${where}
Expand Down Expand Up @@ -521,7 +521,7 @@ export async function listPackagesForApi(
FROM package_repos pr
JOIN repos r ON r.id = pr.repo_id
WHERE pr.package_id = p.id
ORDER BY pr.confidence DESC
ORDER BY pr.confidence DESC, (pr.source = 'declared') DESC, pr.repo_id DESC
LIMIT 1
) r_sc ON true`

Expand Down Expand Up @@ -976,7 +976,7 @@ export async function listPackagesForScatter(
FROM package_repos pr
JOIN repos r ON r.id = pr.repo_id
WHERE pr.package_id = p.id
ORDER BY pr.confidence DESC
ORDER BY pr.confidence DESC, (pr.source = 'declared') DESC, pr.repo_id DESC
LIMIT 1
) r_sc ON true
WHERE p.is_critical = true
Expand Down Expand Up @@ -1203,7 +1203,7 @@ export async function getReportingProtocolByPurl(
SELECT pr2.repo_id
FROM package_repos pr2
WHERE pr2.package_id = p.id
ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC
ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC, pr2.repo_id DESC
LIMIT 1
) pr ON true
JOIN repo_reporting_protocols rp ON rp.repo_id = pr.repo_id
Expand Down Expand Up @@ -1235,7 +1235,7 @@ export async function getReportingProtocolsByPurls(
SELECT pr2.repo_id
FROM package_repos pr2
WHERE pr2.package_id = p.id
ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC
ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC, pr2.repo_id DESC
LIMIT 1
) pr ON true
JOIN repo_reporting_protocols rp ON rp.repo_id = pr.repo_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const BEST_REPO_LINK_JOIN = `LEFT JOIN LATERAL (
SELECT pr2.repo_id, pr2.confidence
FROM package_repos pr2
WHERE pr2.package_id = p.id
ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC
ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC, pr2.repo_id DESC
LIMIT 1
) pr ON true
LEFT JOIN repos r ON r.id = pr.repo_id`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ export async function listMyPackages(
FROM package_repos pr
JOIN repos r ON r.id = pr.repo_id
WHERE pr.package_id = p.id
ORDER BY pr.confidence DESC
ORDER BY pr.confidence DESC, (pr.source = 'declared') DESC, pr.repo_id DESC
LIMIT 1
) r_sc ON true
LEFT JOIN LATERAL (
Expand Down
5 changes: 4 additions & 1 deletion services/libs/tinybird/pipes/ossPackages_enriched.pipe
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ SQL >

NODE ossPackages_enriched_pkg_repo
SQL >
SELECT packageId, argMax(repoId, (toFloat64OrZero(confidence), verifiedAt)) AS repoId, 1 AS hasRepo
SELECT
packageId,
argMax(repoId, (toFloat64OrZero(confidence), verifiedAt, repoId)) AS repoId,
1 AS hasRepo
FROM packageRepos FINAL
GROUP BY packageId

Expand Down
Loading