Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix web hooks updating deleted packages

Browse Source
This commit is contained in:
rubenwardy
2023-03-18 14:22:39 +00:00
parent 32f353af8f
commit 7eca06a097
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/querybuilder.py
View File

@@ -109,9 +109,9 @@ class QueryBuilder:
if self.version:
releases_query = releases_query \
.filter(or_(PackageRelease.min_rel_id == None,
.filter(or_(PackageRelease.min_rel_id.is_(None),
PackageRelease.min_rel_id <= self.version.id)) \
.filter(or_(PackageRelease.max_rel_id == None,
.filter(or_(PackageRelease.max_rel_id.is_(None),
PackageRelease.max_rel_id >= self.version.id))
return releases_query.all()
@@ -173,16 +173,16 @@ class QueryBuilder:
query = query.filter(Package.media_license.has(License.is_foss == True))
if self.hide_wip:
query = query.filter(or_(Package.dev_state == None, Package.dev_state != PackageDevState.WIP))
query = query.filter(or_(Package.dev_state.is_(None), Package.dev_state != PackageDevState.WIP))
if self.hide_deprecated:
query = query.filter(or_(Package.dev_state == None, Package.dev_state != PackageDevState.DEPRECATED))
query = query.filter(or_(Package.dev_state.is_(None), Package.dev_state != PackageDevState.DEPRECATED))
if self.version:
query = query.join(Package.releases) \
.filter(PackageRelease.approved == True) \
.filter(or_(PackageRelease.min_rel_id == None,
.filter(or_(PackageRelease.min_rel_id.is_(None),
PackageRelease.min_rel_id <= self.version.id)) \
.filter(or_(PackageRelease.max_rel_id == None,
.filter(or_(PackageRelease.max_rel_id.is_(None),
PackageRelease.max_rel_id >= self.version.id))
return query