Added shopId at deal schema and unit-test