From 98204e311d0df129789d5c78c1bd385fdc780f63 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 3 Jul 2015 10:48:38 +0200 Subject: [PATCH 1/3] Change Serializer to Schema --- empowering/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/empowering/models.py b/empowering/models.py index a0ccc79..4ed7e00 100644 --- a/empowering/models.py +++ b/empowering/models.py @@ -49,11 +49,11 @@ class CustomerProfile(Schema): femalePersonsNumber = fields.Integer() educationLevel = fields.Nested(CustomerProfileEducationLevel) -class CustomerCustomisedGroupingCriteria(Serializer): +class CustomerCustomisedGroupingCriteria(Schema): pass -class CustomerCustomisedServiceParameters(Serializer): +class CustomerCustomisedServiceParameters(Schema): OT101 = fields.String() OT103 = fields.String() OT105 = fields.String() @@ -85,7 +85,7 @@ class Device(Schema): deviceId = fields.UUID() -class Contract(Serializer): +class Contract(Schema): payerId = fields.UUID() ownerId = fields.UUID() signerId = fields.UUID() From 0fb657d6abb81dad71df6ea5bb0fe322bcdb69e3 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 3 Jul 2015 10:49:08 +0200 Subject: [PATCH 2/3] Use our Integer() which defaults to None --- empowering/models.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/empowering/models.py b/empowering/models.py index 4ed7e00..b4a07dd 100644 --- a/empowering/models.py +++ b/empowering/models.py @@ -20,9 +20,9 @@ class CustomerAddress(Schema): class CustomerBuildingData(Schema): - buildingConstructionYear = fields.Integer() - dwellingArea = fields.Integer() - buildingVolume = fields.Integer() + buildingConstructionYear = Integer() + dwellingArea = Integer() + buildingVolume = Integer() buildingType = fields.Select(['Single_house', 'Apartment']) dwellingPositionInBuilding = fields.Select(['first_floor', 'middle_floor', 'last_floor', 'other']) dwellingOrientation = fields.Select(['S', 'SE', 'E', 'NE', 'N', 'NW', 'W', 'SW']) @@ -34,19 +34,19 @@ class CustomerBuildingData(Schema): class CustomerProfileEducationLevel(Schema): - edu_prim = fields.Integer() - edu_sec = fields.Integer() - edu_uni = fields.Integer() - edu_noStudies = fields.Integer() + edu_prim = Integer() + edu_sec = Integer() + edu_uni = Integer() + edu_noStudies = Integer() class CustomerProfile(Schema): - totalPersonNumber = fields.Integer() - minorsPersonsNumber = fields.Integer() - workingAgePersonsNumber = fields.Integer() - retiredAgePersonsNumber = fields.Integer() - malePersonsNumber = fields.Integer() - femalePersonsNumber = fields.Integer() + totalPersonNumber = Integer() + minorsPersonsNumber = Integer() + workingAgePersonsNumber = Integer() + retiredAgePersonsNumber = Integer() + malePersonsNumber = Integer() + femalePersonsNumber = Integer() educationLevel = fields.Nested(CustomerProfileEducationLevel) class CustomerCustomisedGroupingCriteria(Schema): @@ -94,7 +94,7 @@ class Contract(Schema): dateEnd = fields.DateTime(format='iso') contractId = fields.String() tariffId = fields.String() - version = fields.Integer() + version = Integer() activityCode = fields.String() meteringPointId = fields.UUID() weatherStationId = fields.UUID() From 34156ac83263e008cd754dd4ef4c5e80f5098cd7 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 3 Jul 2015 10:49:33 +0200 Subject: [PATCH 3/3] Improve PEP8 --- empowering/models.py | 46 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/empowering/models.py b/empowering/models.py index b4a07dd..4dbb3c2 100644 --- a/empowering/models.py +++ b/empowering/models.py @@ -24,13 +24,28 @@ class CustomerBuildingData(Schema): dwellingArea = Integer() buildingVolume = Integer() buildingType = fields.Select(['Single_house', 'Apartment']) - dwellingPositionInBuilding = fields.Select(['first_floor', 'middle_floor', 'last_floor', 'other']) - dwellingOrientation = fields.Select(['S', 'SE', 'E', 'NE', 'N', 'NW', 'W', 'SW']) - buildingWindowsType = fields.Select(['single_panel', 'double_panel', 'triple_panel', 'low_emittance', 'other']) - buildingWindowsFrame = fields.Select(['PVC', 'wood', 'aluminium', 'steel', 'other']) - buildingHeatingSource = fields.Select(['electricity', 'gas', 'gasoil', 'district_heating', 'biomass', 'other']) - buildingHeatingSourceDhw = fields.Select(['electricity', 'gas', 'gasoil', 'district_heating', 'biomass', 'other']) - buildingSolarSystem = fields.Select(['PV', 'solar_thermal_heating', 'solar_thermal_DHW', 'other', 'not_installed']) + dwellingPositionInBuilding = fields.Select([ + 'first_floor', 'middle_floor', 'last_floor', 'other' + ]) + dwellingOrientation = fields.Select([ + 'S', 'SE', 'E', 'NE', 'N', 'NW', 'W', 'SW' + ]) + buildingWindowsType = fields.Select([ + 'single_panel', 'double_panel', 'triple_panel', 'low_emittance', 'other' + ]) + buildingWindowsFrame = fields.Select([ + 'PVC', 'wood', 'aluminium', 'steel', 'other' + ]) + buildingHeatingSource = fields.Select([ + 'electricity', 'gas', 'gasoil', 'district_heating', 'biomass', 'other' + ]) + buildingHeatingSourceDhw = fields.Select([ + 'electricity', 'gas', 'gasoil', 'district_heating', 'biomass', 'other' + ]) + buildingSolarSystem = fields.Select([ + 'PV', 'solar_thermal_heating', 'solar_thermal_DHW', 'other', + 'not_installed' + ]) class CustomerProfileEducationLevel(Schema): @@ -75,8 +90,12 @@ class Customer(Schema): address = fields.Nested(CustomerAddress) buildingData = fields.Nested(CustomerBuildingData) profile = fields.Nested(CustomerProfile) - customisedGroupingCriteria = fields.Nested(CustomerCustomisedGroupingCriteria) - customisedServiceParameters = fields.Nested(CustomerCustomisedServiceParameters) + customisedGroupingCriteria = fields.Nested( + CustomerCustomisedGroupingCriteria + ) + customisedServiceParameters = fields.Nested( + CustomerCustomisedServiceParameters + ) class Device(Schema): @@ -107,9 +126,12 @@ class Contract(Schema): class Reading(Schema): - type = fields.Select(['electricityConsumption', 'electricityKiloVoltAmpHours', 'heatConsumption', 'gasConsumption', - 'estimatedElectricityConsumption', 'estimatedElectricityKiloVoltAmpHours', - 'estimatedHeatConsumption', 'estimatedGasConsumption']) + type = fields.Select([ + 'electricityConsumption', 'electricityKiloVoltAmpHours', + 'heatConsumption', 'gasConsumption', 'estimatedElectricityConsumption', + 'estimatedElectricityKiloVoltAmpHours', 'estimatedHeatConsumption', + 'estimatedGasConsumption' + ]) unit = fields.Select(['kWh', 'Wh']) period = fields.Select(['INSTANT', 'CUMULATIVE', 'PULSE'])