refactor code to follow DRY in zone model fixes #5532
refactor code to follow DRY in zone model
fixes #5532

ckk-scratch/solidus,jordan-brough/solidus,lsirivong/solidus,net2b/spree,athal7/solidus,jsurdilla/solidus,richardnuno/solidus,forkata/solidus,devilcoders/solidus,scottcrawford03/solidus,bonobos/solidus,net2b/spree,athal7/solidus,bonobos/solidus,Senjai/solidus,scottcrawford03/solidus,jsurdilla/solidus,devilcoders/solidus,scottcrawford03/solidus,forkata/solidus,jordan-brough/solidus,lsirivong/solidus,xuewenfei/solidus,net2b/spree,richardnuno/solidus,jsurdilla/solidus,ckk-scratch/solidus,net2b/spree,ckk-scratch/solidus,grzlus/solidus,athal7/solidus,athal7/solidus,Arpsara/solidus,bonobos/solidus,scottcrawford03/solidus,jordan-brough/solidus,jordan-brough/solidus,Senjai/solidus,richardnuno/solidus,pervino/solidus,xuewenfei/solidus,Senjai/solidus,bonobos/solidus,Arpsara/solidus,xuewenfei/solidus,pervino/solidus,devilcoders/solidus,pervino/solidus,devilcoders/solidus,xuewenfei/solidus,grzlus/solidus,lsirivong/solidus,jsurdilla/solidus,grzlus/solidus,richardnuno/solidus,pervino/solidus,grzlus/solidus,Senjai/solidus,ckk-scratch/solidus,lsirivong/solidus,forkata/solidus,forkata/solidus,Arpsara/solidus,Arpsara/solidus