Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Bugfix #466 Web service update #472

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Bugfix #466 Web service update #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86709a6
Add newly introduced columns #466
FlorianK13 Oct 23, 2023
e00ad1b
Update changelog #466
FlorianK13 Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions open_mastr/utils/orm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@


class ParentAllTables(object):

DatenQuelle = Column(String)
DatumDownload = Column(Date)

Expand Down Expand Up @@ -74,7 +73,6 @@ class MissedAdditionalData(Base):


class Extended(object):

NetzbetreiberMastrNummer = Column(String)
Registrierungsdatum = Column(Date)
EinheitMastrNummer = Column(String, primary_key=True)
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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)
Expand Down