Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Review web service update: WSDL Patchnotes V24.1.128 #499

Merged
merged 15 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- No longer require web scraping for bulk download [#488](https://github.com/OpenEnergyPlatform/open-MaStR/pull/488)
- Replace deprecated pandas map function [#491](https://github.com/OpenEnergyPlatform/open-MaStR/pull/491)
- Fix the handling of corrupted xml syntax in the downloaded files [#494](https://github.com/OpenEnergyPlatform/open-MaStR/pull/494)
- Implement relevant API WSDL Patchnotes V24.1.128 [#499](https://github.com/OpenEnergyPlatform/open-MaStR/pull/499)
### Removed

## [v0.14.1] Hotfix - 2024-01-17
Expand Down
6 changes: 5 additions & 1 deletion open_mastr/utils/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
"AuflagenAbschaltungTierschutz": "requirementShutdownAnimalProtection",
"AnlagenkennzifferAnlagenregister_nv": "plantIdentificationNumberRegister_nv",
"BiogasDatumLeistungserhoehung": "biogasCapacityIncreaseDate",
"InAnspruchGenommeneAckerflaeche": "areaOfAgriculturalLandInUse",
"InAnspruchGenommeneLandwirtschaftlichGenutzteFlaeche": "areaOfAgriculturalLandInUse",
"Aktenzeichen": "fileReference",
"NetzbetreiberpruefungStatus": "gridOperatorCheckStatus",
"AnlageBetriebsstatus": "plantOperatingStatus",
Expand Down Expand Up @@ -511,4 +511,8 @@
"MastrNummer": "mastrNumber",
"Kuestenentfernung": "distanceToCoast",
"eegAusschreibungZuschlag": "eegAuctionBidAward",
"DatumUeberfuehrungInReserve": "dateTransferToReserve",
"ReserveartNachDemEnWG": "typeOfReserveFromEnWG",
"WebportalDesNetzbetreibers": "webPortalGridOperator",
"RegisternummerPraefix": "registerNumberPrefix",
}
18 changes: 8 additions & 10 deletions open_mastr/utils/orm.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ class Extended(object):
PraequalifiziertFuerRegelenergie = Column(Boolean)
GenMastrNummer = Column(String)
Netzbetreiberzuordnungen = Column(String)
ReserveartNachDemEnWG = Column(String)
DatumUeberfuehrungInReserve = Column(Date)
# from bulk download
Hausnummer_nv = Column(Boolean)
Weic_nv = Column(Boolean)
Expand Down Expand Up @@ -185,7 +187,7 @@ class SolarExtended(Extended, ParentAllTables, Base):
NebenausrichtungNeigungswinkel = Column(String)
InAnspruchGenommeneFlaeche = Column(Float)
ArtDerFlaeche = Column(String)
InAnspruchGenommeneAckerflaeche = Column(Float)
InAnspruchGenommeneLandwirtschaftlichGenutzteFlaeche = Column(Float)
Nutzungsbereich = Column(String)
Buergerenergie = Column(Boolean)
EegMastrNummer = Column(String)
Expand All @@ -202,16 +204,12 @@ class BiomassExtended(Extended, ParentAllTables, Base):
EegMastrNummer = Column(String)
KwkMastrNummer = Column(String)


class CombustionExtended(Extended, ParentAllTables, Base):
__tablename__ = "combustion_extended"

NameKraftwerk = Column(String)
NameKraftwerksblock = Column(String)
DatumBaubeginn = Column(Date)
AnzeigeEinerStilllegung = Column(Boolean)
ArtDerStilllegung = Column(String)
DatumBeginnVorlaeufigenOderEndgueltigenStilllegung = Column(Date)
SteigerungNettonennleistungKombibetrieb = Column(Float)
AnlageIstImKombibetrieb = Column(Boolean)
MastrNummernKombibetrieb = Column(String)
Expand All @@ -230,7 +228,6 @@ class CombustionExtended(Extended, ParentAllTables, Base):
Technologie = Column(String)
AusschliesslicheVerwendungImKombibetrieb = Column(Boolean)


class GsgkExtended(Extended, ParentAllTables, Base):
__tablename__ = "gsgk_extended"

Expand All @@ -244,9 +241,6 @@ class HydroExtended(Extended, ParentAllTables, Base):

NameKraftwerk = Column(String)
ArtDerWasserkraftanlage = Column(String)
AnzeigeEinerStilllegung = Column(Boolean)
ArtDerStilllegung = Column(String)
DatumBeginnVorlaeufigenOderEndgueltigenStilllegung = Column(Date)
MinderungStromerzeugung = Column(Boolean)
BestandteilGrenzkraftwerk = Column(Boolean)
NettonennleistungDeutschland = Column(Float)
Expand Down Expand Up @@ -274,7 +268,7 @@ class StorageExtended(Extended, ParentAllTables, Base):
Notstromaggregat = Column(Boolean)
BestandteilGrenzkraftwerk = Column(Boolean)
NettonennleistungDeutschland = Column(Float)
ZugeordnenteWirkleistungWechselrichter = Column(Float)
ZugeordneteWirkleistungWechselrichter = Column(Float)
NutzbareSpeicherkapazitaet = Column(Float)
SpeMastrNummer = Column(String)
EegMastrNummer = Column(String)
Expand Down Expand Up @@ -510,6 +504,7 @@ class GasStorageExtended(ParentAllTables, Base):
DatumBeginnVoruebergehendeStilllegung = Column(Date)
DatumDesBetreiberwechsels = Column(Date)
DatumRegistrierungDesBetreiberwechsels = Column(Date)
DatumEndgueltigeStilllegung = Column(Date)


class StorageUnits(ParentAllTables, Base):
Expand Down Expand Up @@ -570,6 +565,7 @@ class GasProducer(ParentAllTables, Base):
FlurFlurstuecknummern = Column(String)
GeplantesInbetriebnahmedatum = Column(Date)
DatumBeginnVoruebergehendeStilllegung = Column(Date)
DatumEndgueltigeStilllegung = Column(Date)


class GasConsumer(ParentAllTables, Base):
Expand Down Expand Up @@ -734,6 +730,8 @@ class MarketActors(ParentAllTables, Base):
Stromgrosshaendler = Column(Boolean)
MarktakteurVorname = Column(String)
MarktakteurNachname = Column(String)
WebportalDesNetzbetreibers = Column(String)
RegisternummerPraefix = Column(String)


class Grids(ParentAllTables, Base):
Expand Down
Loading