gru/lista_zakupowa_live
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

sortowanie_w_mass_add #10

Merged
gru merged 90 commits from sortowanie_w_mass_add into master 2025-09-02 17:08:55 +02:00
Conversation 0 Commits 90 Files Changed 23 +4 -5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4e10ef209 - Show all commits

9
app.py
View File

@@ -2069,14 +2069,13 @@ def all_products():
limit = request.args.get("limit", type=int) or 100
offset = request.args.get("offset", type=int) or 0
# Produkty z Item z faktyczną popularnością
products_from_items = (
db.session.query(
func.lower(func.trim(Item.name)).label("normalized_name"),
func.min(Item.name).label("display_name"),
func.count(func.distinct(Item.list_id)).label("count"),
)
.group_by("normalized_name")
.group_by(func.lower(func.trim(Item.name)))
)
products_from_suggested = (
@@ -2088,7 +2087,7 @@ def all_products():
.filter(~func.lower(func.trim(SuggestedProduct.name)).in_(
db.session.query(func.lower(func.trim(Item.name)))
))
.group_by("normalized_name")
.group_by(func.lower(func.trim(SuggestedProduct.name)))
)
union_q = products_from_items.union_all(products_from_suggested).subquery()
@@ -2096,10 +2095,10 @@ def all_products():
final_q = (
db.session.query(
union_q.c.normalized_name,
func.min(union_q.c.display_name).label("display_name"),
union_q.c.display_name,
func.sum(union_q.c.count).label("count"),
)
.group_by(union_q.c.normalized_name)
.group_by(union_q.c.normalized_name, union_q.c.display_name)
)
if sort == "alphabetical":