hyperswitch

refactor(v1v2): refactor database queries for v1 and v2

#7244

Merged