Sprint6/refactoring job creation eokouya