fix: conform to schema

Author: xBlaz3kx

ocpp2.1/authorization/authorize.go

@@ -46,7 +46,7 @@ type AuthorizeRequest struct {
 // In case the request was invalid, or couldn't be processed, an error will be sent instead.
 type AuthorizeResponse struct {
 	CertificateStatus     AuthorizeCertificateStatus `json:"certificateStatus,omitempty" validate:"omitempty,authorizeCertificateStatus21"`
-	AllowedEnergyTransfer []types.EnergyTransferMode `json:"allowedEnergyTransfer,omitempty" validate:"omitempty,energyTransferMode"`
+	AllowedEnergyTransfer []types.EnergyTransferMode `json:"allowedEnergyTransfer,omitempty" validate:"omitempty,dive,energyTransferMode21"`
 	IdTokenInfo           types.IdTokenInfo          `json:"idTokenInfo" validate:"required"`
 	Tariff                *types.Tariff              `json:"tariff,omitempty" validate:"omitempty,dive"`
 }

ocpp2.1/smartcharging/notify_ev_charging_needs.go

@@ -14,7 +14,9 @@ const NotifyEVChargingNeedsFeatureName = "NotifyEVChargingNeeds"
 func isValidEnergyTransferMode(fl validator.FieldLevel) bool {
 	status := types.EnergyTransferMode(fl.Field().String())
 	switch status {
-	case types.EnergyTransferModeAC1Phase, types.EnergyTransferModeAC2Phase, types.EnergyTransferModeAC3Phase, types.EnergyTransferModeDC:
+	case types.EnergyTransferModeAC1Phase, types.EnergyTransferModeAC2Phase, types.EnergyTransferModeAC3Phase, types.EnergyTransferModeDC,
+		types.EnergyTransferModeACBPT, types.EnergyTransferModeACBPTDER, types.EnergyTransferModeACDER,
+		types.EnergyTransferModeDCBPT, types.EnergyTransferModeDCACDP, types.EnergyTransferModeDCACDPBPT, types.EnergyTransferModeWPT:
 		return true
 	default:
 		return false

ocpp2.1/types/authorization.go

@@ -63,7 +63,7 @@ func isValidIdToken(sl validator.StructLevel) {
 }
 
 type AdditionalInfo struct {
-	AdditionalIdToken string `json:"additionalIdToken" validate:"required,max=36"`
+	AdditionalIdToken string `json:"additionalIdToken" validate:"required,max=255"`
 	Type              string `json:"type" validate:"required,max=50"`
 }
 
@@ -95,6 +95,7 @@ type IdTokenInfo struct {
 	ChargingPriority    int                 `json:"chargingPriority,omitempty" validate:"min=-9,max=9"`
 	Language1           string              `json:"language1,omitempty" validate:"max=8"`
 	Language2           string              `json:"language2,omitempty" validate:"max=8"`
+	EvseId              []int               `json:"evseId,omitempty" validate:"omitempty,dive,gte=0"`
 	GroupIdToken        *GroupIdToken       `json:"groupIdToken,omitempty"`
 	PersonalMessage     *MessageContent     `json:"personalMessage,omitempty"`
 }

ocpp2.1/types/smart_charging.go

@@ -185,8 +185,15 @@ func NewChargingProfile(id int, stackLevel int, chargingProfilePurpose ChargingP
 type EnergyTransferMode string
 
 const (
-	EnergyTransferModeDC       EnergyTransferMode = "DC"              // DC charging.
-	EnergyTransferModeAC1Phase EnergyTransferMode = "AC_single_phase" // AC single phase charging according to IEC 62196.
-	EnergyTransferModeAC2Phase EnergyTransferMode = "AC_two_phase"    // AC two phase charging according to IEC 62196.
-	EnergyTransferModeAC3Phase EnergyTransferMode = "AC_three_phase"  // AC three phase charging according to IEC 62196.
+	EnergyTransferModeDC          EnergyTransferMode = "DC"              // DC charging.
+	EnergyTransferModeAC1Phase    EnergyTransferMode = "AC_single_phase" // AC single phase charging according to IEC 62196.
+	EnergyTransferModeAC2Phase    EnergyTransferMode = "AC_two_phase"    // AC two phase charging according to IEC 62196.
+	EnergyTransferModeAC3Phase    EnergyTransferMode = "AC_three_phase"  // AC three phase charging according to IEC 62196.
+	EnergyTransferModeACBPT       EnergyTransferMode = "AC_BPT"          // AC bidirectional power transfer.
+	EnergyTransferModeACBPTDER    EnergyTransferMode = "AC_BPT_DER"      // AC bidirectional power transfer with DER control.
+	EnergyTransferModeACDER       EnergyTransferMode = "AC_DER"          // AC with DER control.
+	EnergyTransferModeDCBPT       EnergyTransferMode = "DC_BPT"          // DC bidirectional power transfer.
+	EnergyTransferModeDCACDP      EnergyTransferMode = "DC_ACDP"         // DC charging via ACDP (pantograph).
+	EnergyTransferModeDCACDPBPT   EnergyTransferMode = "DC_ACDP_BPT"    // DC bidirectional power transfer via ACDP.
+	EnergyTransferModeWPT         EnergyTransferMode = "WPT"             // Wireless power transfer.
 )