refactor(routes): improve conditons flow
refactor(models:module): improve validator