diff --git a/backend/models/list.model.js b/backend/models/list.model.js index e872b28..e265ae9 100644 --- a/backend/models/list.model.js +++ b/backend/models/list.model.js @@ -11,15 +11,14 @@ exports.getUnboughtItems = async () => { ENCODE(gl.item_image, 'base64') as item_image, gl.image_mime_type, ( - SELECT ARRAY_AGG(u.name ORDER BY gh.added_on DESC) + SELECT ARRAY_AGG(DISTINCT u.name) FROM ( - SELECT gh.added_by, gh.added_on, - ROW_NUMBER() OVER (PARTITION BY gh.list_item_id ORDER BY gh.added_on DESC) as rn + SELECT DISTINCT gh.added_by FROM grocery_history gh WHERE gh.list_item_id = gl.id + ORDER BY gh.added_by ) gh JOIN users u ON gh.added_by = u.id - WHERE gh.rn <= gl.quantity ) as added_by_users, gl.modified_on as last_added_on, ic.item_type, @@ -126,15 +125,14 @@ exports.getRecentlyBoughtItems = async () => { ENCODE(gl.item_image, 'base64') as item_image, gl.image_mime_type, ( - SELECT ARRAY_AGG(u.name ORDER BY gh.added_on DESC) + SELECT ARRAY_AGG(DISTINCT u.name) FROM ( - SELECT gh.added_by, gh.added_on, - ROW_NUMBER() OVER (PARTITION BY gh.list_item_id ORDER BY gh.added_on DESC) as rn + SELECT DISTINCT gh.added_by FROM grocery_history gh WHERE gh.list_item_id = gl.id + ORDER BY gh.added_by ) gh JOIN users u ON gh.added_by = u.id - WHERE gh.rn <= gl.quantity ) as added_by_users, gl.modified_on as last_added_on FROM grocery_list gl