Skip to content

Rename BoTyp to Typ #620

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.

Sign up for GitHub

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

Merged
lord-haffi merged 4 commits into from
Oct 6, 2023
Merged

Rename BoTyp to Typ #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc59d37
Rename `BoTyp` to `Typ`
lord-haffi Oct 6, 2023
df6b0a5
More renaming
lord-haffi Oct 6, 2023
ecfedd8
🩹
lord-haffi Oct 6, 2023
c9ff019
Regenerate json schemas
lord-haffi Oct 6, 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
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ from typing import Optional, Dict, Any

from bo4e.bo.geschaeftsobjekt import Geschaeftsobjekt
from bo4e.com.menge import Menge
from bo4e.enum.botyp import BoTyp
from bo4e.enum.typ import BoTyp


# pylint: disable=too-few-public-methods
Expand All @@ -95,6 +95,7 @@ class MeinBo(Geschaeftsobjekt):
Anzahl Freudensprünge beschreibt, wie oft der CEO des Stromkonzerns in die Luft gesprungen ist, als ich den Vertrag unterschrieben habe.
Dieser Wert sollte im Normalfall mindestens 5 sein.
"""

# pylint:disable=unused-argument, no-self-argument
@validator("anzahl_freudenspruenge")
def validate_freudenspruenge(cls, anzahl_freudenspruenge: int, values: Dict[str, Any]) -> int:
Expand Down
156 changes: 84 additions & 72 deletions json_schemas/bo/Angebot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,17 @@
"default": null,
"title": " Id"
},
"_typ": {
"anyOf": [
{
"$ref": "#/$defs/Typ"
},
{
"type": "null"
}
],
"default": "ANSPRECHPARTNER"
},
"adresse": {
"anyOf": [
{
Expand All @@ -447,14 +458,6 @@
],
"default": null
},
"boTyp": {
"allOf": [
{
"$ref": "#/$defs/BoTyp"
}
],
"default": "ANSPRECHPARTNER"
},
"eMailAdresse": {
"anyOf": [
{
Expand Down Expand Up @@ -652,46 +655,6 @@
"title": "Bilanzierungsmethode",
"type": "string"
},
"BoTyp": {
"description": "Auflistung sämtlicher existierender Geschäftsobjekte.",
"enum": [
"ANGEBOT",
"ANSPRECHPARTNER",
"AUSSCHREIUNG",
"BUENDELVERTRAG",
"ENERGIEMENGE",
"FREMDKOSTEN",
"GESCHAEFTSOBJEKT",
"GESCHAEFTSPARTNER",
"KOSTEN",
"LASTGANG",
"LASTGANG_KOMPAKT",
"MARKTLOKATION",
"MESSLOKATION",
"MARKTTEILNEHMER",
"NETZNUTZUNGSRECHNUNG",
"PREISBLATT",
"PREISBLATTDIENSTLEISTUNG",
"PREISBLATTHARDWARE",
"PREISBLATTKONZESSIONSABGABE",
"PREISBLATTMESSUNG",
"PREISBLATTNETZNUTZUNG",
"PREISBLATTUMLAGEN",
"RECHNUNG",
"REGION",
"REGIONALTARIF",
"STANDORTEIGENSCHAFTEN",
"TARIF",
"TARIFINFO",
"TARIFKOSTEN",
"TARIFPREISBLATT",
"VERTRAG",
"ZAEHLER",
"ZEITREIHE"
],
"title": "BoTyp",
"type": "string"
},
"Energierichtung": {
"description": "Spezifiziert die Energierichtung einer Markt- und/oder Messlokation",
"enum": [
Expand Down Expand Up @@ -836,6 +799,17 @@
"default": null,
"title": " Id"
},
"_typ": {
"anyOf": [
{
"$ref": "#/$defs/Typ"
},
{
"type": "null"
}
],
"default": "GESCHAEFTSPARTNER"
},
"amtsgericht": {
"anyOf": [
{
Expand All @@ -859,14 +833,6 @@
],
"default": null
},
"boTyp": {
"allOf": [
{
"$ref": "#/$defs/BoTyp"
}
],
"default": "GESCHAEFTSPARTNER"
},
"eMailAdresse": {
"anyOf": [
{
Expand Down Expand Up @@ -1402,6 +1368,17 @@
"default": null,
"title": " Id"
},
"_typ": {
"anyOf": [
{
"$ref": "#/$defs/Typ"
},
{
"type": "null"
}
],
"default": "MARKTLOKATION"
},
"bilanzierungsgebiet": {
"anyOf": [
{
Expand All @@ -1425,14 +1402,6 @@
],
"default": null
},
"boTyp": {
"allOf": [
{
"$ref": "#/$defs/BoTyp"
}
],
"default": "MARKTLOKATION"
},
"endkunde": {
"anyOf": [
{
Expand Down Expand Up @@ -2032,6 +2001,46 @@
"title": "Titel",
"type": "string"
},
"Typ": {
"description": "Auflistung sämtlicher existierender Geschäftsobjekte.",
"enum": [
"ANGEBOT",
"ANSPRECHPARTNER",
"AUSSCHREIUNG",
"BUENDELVERTRAG",
"ENERGIEMENGE",
"FREMDKOSTEN",
"GESCHAEFTSOBJEKT",
"GESCHAEFTSPARTNER",
"KOSTEN",
"LASTGANG",
"LASTGANG_KOMPAKT",
"MARKTLOKATION",
"MESSLOKATION",
"MARKTTEILNEHMER",
"NETZNUTZUNGSRECHNUNG",
"PREISBLATT",
"PREISBLATTDIENSTLEISTUNG",
"PREISBLATTHARDWARE",
"PREISBLATTKONZESSIONSABGABE",
"PREISBLATTMESSUNG",
"PREISBLATTNETZNUTZUNG",
"PREISBLATTUMLAGEN",
"RECHNUNG",
"REGION",
"REGIONALTARIF",
"STANDORTEIGENSCHAFTEN",
"TARIF",
"TARIFINFO",
"TARIFKOSTEN",
"TARIFPREISBLATT",
"VERTRAG",
"ZAEHLER",
"ZEITREIHE"
],
"title": "Typ",
"type": "string"
},
"Verbrauchsart": {
"description": "Verbrauchsart einer Marktlokation.",
"enum": [
Expand Down Expand Up @@ -2428,6 +2437,17 @@
"default": null,
"title": " Id"
},
"_typ": {
"anyOf": [
{
"$ref": "#/$defs/Typ"
},
{
"type": "null"
}
],
"default": "ANGEBOT"
},
"anfragereferenz": {
"anyOf": [
{
Expand Down Expand Up @@ -2500,14 +2520,6 @@
"default": null,
"title": "Bindefrist"
},
"boTyp": {
"allOf": [
{
"$ref": "#/$defs/BoTyp"
}
],
"default": "ANGEBOT"
},
"externeReferenzen": {
"anyOf": [
{
Expand Down
Loading