Check out dbt - it's a great tool for organizing queries and solving such patterns