Merge branch 'develop' into develop

OpenEnergyPlatform · Nov 2, 2023 · a48cf53 · a48cf53
2 parents 61f2e22 + 83aee16
commit a48cf53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 - Add a Mastr.translate method for english translation [##471](https://github.com/OpenEnergyPlatform/open-MaStR/pull/471)
 ### Changed
 - Using sphinx version <7 to build documentation [#454](https://github.com/OpenEnergyPlatform/open-MaStR/pull/454)
+- Adapt column names to the API web service update [#472](https://github.com/OpenEnergyPlatform/open-MaStR/pull/472)
 ### Removed
 - Delete `on push` for github workflow [#445](https://github.com/OpenEnergyPlatform/open-MaStR/pull/445)
 

diff --git a/open_mastr/utils/orm.py b/open_mastr/utils/orm.py
@@ -18,7 +18,6 @@
 
 
 class ParentAllTables(object):
-
     DatenQuelle = Column(String)
     DatumDownload = Column(Date)
 
@@ -74,7 +73,6 @@ class MissedAdditionalData(Base):
 
 
 class Extended(object):
-
     NetzbetreiberMastrNummer = Column(String)
     Registrierungsdatum = Column(Date)
     EinheitMastrNummer = Column(String, primary_key=True)
@@ -192,6 +190,7 @@ class SolarExtended(Extended, ParentAllTables, Base):
     Buergerenergie = Column(Boolean)
     EegMastrNummer = Column(String)
     ArtDerFlaecheIds = Column(String)
+    Zaehlernummer = Column(String)
 
 
 class BiomassExtended(Extended, ParentAllTables, Base):
@@ -281,10 +280,10 @@ class StorageExtended(Extended, ParentAllTables, Base):
     EegMastrNummer = Column(String)
     EegAnlagentyp = Column(String)
     Technologie = Column(String)
+    LeistungsaufnahmeBeimEinspeichern = Column(Float)
 
 
 class Eeg(object):
-
     Registrierungsdatum = Column(Date)
     EegMastrNummer = Column(String, primary_key=True)
     Meldedatum = Column(Date)