Refactor

compendium_v2/db/presentation_models.py

@@ -740,7 +740,7 @@ class PertTeam(PresentationModel):
         return {
             **self.nren.to_dict(),
             'year': self.year,
-            'pert_team': self.pert_team.value if self.pert_team is not None else None,
+            'pert_team': self.pert_team.value,
         }
 
 
@@ -757,7 +757,7 @@ class AlienWave(PresentationModel):
         return {
             **self.nren.to_dict(),
             'year': self.year,
-            'alien_wave_third_pary': self.alien_wave_third_pary.value
+            'alien_wave_third_party': self.alien_wave_third_pary.value
             if self.alien_wave_third_pary is not None else None,
             'nr_of_alien_wave_third_party_services': self.nr_of_alien_wave_third_party_services,
             'alien_wave_internal': self.alien_wave_internal
@@ -850,7 +850,7 @@ class OpsAutomation(PresentationModel):
         return {
             **self.nren.to_dict(),
             'year': self.year,
-            'ops_automation': self.ops_automation.value if self.ops_automation is not None else None,
+            'ops_automation': self.ops_automation.value,
             'ops_automation_specifics': self.ops_automation_specifics,
         }
 
@@ -867,7 +867,7 @@ class NetworkFunctionVirtualisation(PresentationModel):
         return {
             **self.nren.to_dict(),
             'year': self.year,
-            'nfv': self.nfv.value if self.nfv is not None else None,
+            'nfv': self.nfv.value,
             'nfv_specifics': self.nfv_specifics
         }
 
@@ -884,8 +884,7 @@ class NetworkAutomation(PresentationModel):
         return {
             **self.nren.to_dict(),
             'year': self.year,
-            'network_automation': self.network_automation.value
-            if self.network_automation is not None else None,
+            'network_automation': self.network_automation.value,
             'network_automation_specifics': self.network_automation_specifics,
         }