* chore: rewrite query using query builder (cherry picked from commit25718f5cc7) * chore: fix shopping cart tests (cherry picked from commitfb51cae88b) * chore: fix test case --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>