From 52abe00878e0b0960aaebb8a819a22d522c8fcfc Mon Sep 17 00:00:00 2001 From: mittwald-machine Date: Fri, 31 Jan 2025 19:02:08 +0000 Subject: [PATCH] chore: update auto-generated code --- .../clients/user/changepassword_response.go | 28 +++++++++---------- .../user/changepassword_response_test.go | 12 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mittwaldv2/generated/clients/user/changepassword_response.go b/mittwaldv2/generated/clients/user/changepassword_response.go index 2f1e9c87..851e6e12 100644 --- a/mittwaldv2/generated/clients/user/changepassword_response.go +++ b/mittwaldv2/generated/clients/user/changepassword_response.go @@ -14,17 +14,17 @@ import ( // null type ChangePasswordResponse struct { - AlternativeChangePasswordAcceptedResponse *any AlternativeChangePasswordOKResponse *ChangePasswordOKResponse + AlternativeChangePasswordAcceptedResponse *any } func (a *ChangePasswordResponse) MarshalJSON() ([]byte, error) { - if a.AlternativeChangePasswordAcceptedResponse != nil { - return json.Marshal(a.AlternativeChangePasswordAcceptedResponse) - } if a.AlternativeChangePasswordOKResponse != nil { return json.Marshal(a.AlternativeChangePasswordOKResponse) } + if a.AlternativeChangePasswordAcceptedResponse != nil { + return json.Marshal(a.AlternativeChangePasswordAcceptedResponse) + } return []byte("null"), nil } @@ -34,13 +34,6 @@ func (a *ChangePasswordResponse) UnmarshalJSON(input []byte) error { dec := json.NewDecoder(reader) dec.DisallowUnknownFields() - reader.Reset(input) - var alternativeChangePasswordAcceptedResponse any - if err := dec.Decode(&alternativeChangePasswordAcceptedResponse); err == nil { - a.AlternativeChangePasswordAcceptedResponse = &alternativeChangePasswordAcceptedResponse - decodedAtLeastOnce = true - } - reader.Reset(input) var alternativeChangePasswordOKResponse ChangePasswordOKResponse if err := dec.Decode(&alternativeChangePasswordOKResponse); err == nil { @@ -51,6 +44,13 @@ func (a *ChangePasswordResponse) UnmarshalJSON(input []byte) error { } } + reader.Reset(input) + var alternativeChangePasswordAcceptedResponse any + if err := dec.Decode(&alternativeChangePasswordAcceptedResponse); err == nil { + a.AlternativeChangePasswordAcceptedResponse = &alternativeChangePasswordAcceptedResponse + decodedAtLeastOnce = true + } + if !decodedAtLeastOnce { return fmt.Errorf("could not unmarshal into any alternative for type %T", a) } @@ -58,12 +58,12 @@ func (a *ChangePasswordResponse) UnmarshalJSON(input []byte) error { } func (a *ChangePasswordResponse) Validate() error { + if a.AlternativeChangePasswordOKResponse != nil { + return a.AlternativeChangePasswordOKResponse.Validate() + } // The AlternativeChangePasswordAcceptedResponse subtype does not implement validation, so we consider being non-nil as valid if a.AlternativeChangePasswordAcceptedResponse != nil { return nil } - if a.AlternativeChangePasswordOKResponse != nil { - return a.AlternativeChangePasswordOKResponse.Validate() - } return errors.New("no alternative set") } diff --git a/mittwaldv2/generated/clients/user/changepassword_response_test.go b/mittwaldv2/generated/clients/user/changepassword_response_test.go index 2c609fbd..f22d6729 100644 --- a/mittwaldv2/generated/clients/user/changepassword_response_test.go +++ b/mittwaldv2/generated/clients/user/changepassword_response_test.go @@ -13,21 +13,21 @@ import ( var _ = Describe("ChangePasswordResponse", func() { When("unmarshaling from JSON", func() { - It("should unmarshal into AlternativeChangePasswordAcceptedResponse", func() { - exampleJSON := []byte("null") + It("should unmarshal into AlternativeChangePasswordOKResponse", func() { + exampleJSON := []byte("{\"expires\":\"2006-01-02T15:04:05Z\",\"token\":\"string\"}") sut := user.ChangePasswordResponse{} Expect(json.Unmarshal(exampleJSON, &sut)).To(Succeed()) Expect(sut.Validate()).To(Succeed()) - Expect(sut.AlternativeChangePasswordAcceptedResponse).NotTo(BeNil()) + Expect(sut.AlternativeChangePasswordOKResponse).NotTo(BeNil()) }) - It("should unmarshal into AlternativeChangePasswordOKResponse", func() { - exampleJSON := []byte("{\"expires\":\"2006-01-02T15:04:05Z\",\"token\":\"string\"}") + It("should unmarshal into AlternativeChangePasswordAcceptedResponse", func() { + exampleJSON := []byte("null") sut := user.ChangePasswordResponse{} Expect(json.Unmarshal(exampleJSON, &sut)).To(Succeed()) Expect(sut.Validate()).To(Succeed()) - Expect(sut.AlternativeChangePasswordOKResponse).NotTo(BeNil()) + Expect(sut.AlternativeChangePasswordAcceptedResponse).NotTo(BeNil()) }) }) })