From 86709a6270d4ece4f75f4395e8a99cee83e070c7 Mon Sep 17 00:00:00 2001 From: Florian Kotthoff Date: Mon, 23 Oct 2023 10:10:54 +0200 Subject: [PATCH 1/2] Add newly introduced columns #466 --- open_mastr/utils/orm.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/open_mastr/utils/orm.py b/open_mastr/utils/orm.py index 6557fb7d..ac5a5e5b 100644 --- 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) From e00ad1b14d902a81fa89b7756fb9fce98d472a4e Mon Sep 17 00:00:00 2001 From: Florian Kotthoff Date: Mon, 23 Oct 2023 10:14:04 +0200 Subject: [PATCH 2/2] Update changelog #466 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d0fcf27..74858379 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ### Added - User-defined output path for csv, xml, database [#402](https://github.com/OpenEnergyPlatform/open-MaStR/pull/402) - Add date=existing parameter to Mastr.download [#452](https://github.com/OpenEnergyPlatform/open-MaStR/pull/452) +- Adapt column names to the API web service update [#472](https://github.com/OpenEnergyPlatform/open-MaStR/pull/472) ### Changed - Using sphinx version <7 to build documentation [#454](https://github.com/OpenEnergyPlatform/open-MaStR/pull/454) ### Removed