Add column, free_sms_fragment_limit, to services & services_history

- Created new column in both tables
- Modified model and Service schema
- Modifed existing test
This commit is contained in:
venusbb
2017-10-10 15:33:31 +01:00
committed by Katie Smith
parent fe37313d18
commit f95282a84d
4 changed files with 29 additions and 15 deletions

View File

@@ -211,6 +211,7 @@ class Service(db.Model, Versioned):
_letter_contact_block = db.Column('letter_contact_block', db.Text, index=False, unique=False, nullable=True)
sms_sender = db.Column(db.String(11), nullable=False, default=lambda: current_app.config['FROM_NUMBER'])
organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True)
free_sms_fragment_limit = db.Column(db.BigInteger, index=False, unique=False, nullable=True)
organisation = db.relationship('Organisation')
dvla_organisation_id = db.Column(
db.String,
@@ -230,10 +231,6 @@ class Service(db.Model, Versioned):
association_proxy('permissions', 'service_permission_types')
@staticmethod
def free_sms_fragment_limit():
return current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT']
@classmethod
def from_json(cls, data):
"""

View File

@@ -175,20 +175,17 @@ class ProviderDetailsHistorySchema(BaseSchema):
class ServiceSchema(BaseSchema):
free_sms_fragment_limit = fields.Method(method_name='get_free_sms_fragment_limit')
created_by = field_for(models.Service, 'created_by', required=True)
organisation = field_for(models.Service, 'organisation')
branding = field_for(models.Service, 'branding')
dvla_organisation = field_for(models.Service, 'dvla_organisation')
free_sms_fragment_limit = field_for(models.Service, 'free_sms_fragment_limit')
permissions = fields.Method("service_permissions")
override_flag = False
reply_to_email_address = fields.Method(method_name="get_reply_to_email_address")
sms_sender = fields.Method(method_name="get_sms_sender")
letter_contact_block = fields.Method(method_name="get_letter_contact")
def get_free_sms_fragment_limit(selfs, service):
return service.free_sms_fragment_limit()
def service_permissions(self, service):
return [p.permission for p in service.permissions]
@@ -203,7 +200,7 @@ class ServiceSchema(BaseSchema):
class Meta:
model = models.Service
dump_only = ['free_sms_fragment_limit', 'reply_to_email_address', 'letter_contact_block']
dump_only = ['reply_to_email_address', 'letter_contact_block']
exclude = (
'updated_at',
'created_at',
@@ -252,11 +249,6 @@ class ServiceSchema(BaseSchema):
class DetailedServiceSchema(BaseSchema):
statistics = fields.Dict()
free_sms_fragment_limit = fields.Method(method_name='get_free_sms_fragment_limit')
def get_free_sms_fragment_limit(selfs, service):
return service.free_sms_fragment_limit()
class Meta:
model = models.Service
exclude = (