extract query logic
refactor get to base repo
wrappers in service