Refactor ApiBundle/GoodsPassport