From ab1592d924569b1b2a1e3410b011a36b7893ba18 Mon Sep 17 00:00:00 2001 From: orainmers Date: Sun, 2 Mar 2025 13:41:29 +0000 Subject: [PATCH] bug fix --- internal/web/ofederation/api.gen.go | 2 +- internal/web/olegalentities/api.gen.go | 2 +- internal/web/web.go | 15 ++++----------- openapi/openapi.yaml | 1 - 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/internal/web/ofederation/api.gen.go b/internal/web/ofederation/api.gen.go index d3776e6..338b473 100644 --- a/internal/web/ofederation/api.gen.go +++ b/internal/web/ofederation/api.gen.go @@ -109,7 +109,7 @@ type InviteDTO = dto.InviteDTO // LegalEntityDTO defines model for LegalEntityDTO. type LegalEntityDTO struct { CreatedAt *time.Time `json:"created_at,omitempty"` - DeletedAt *time.Time `json:"deleted_at"` + DeletedAt *time.Time `json:"deleted_at,omitempty"` Name *string `json:"name,omitempty"` UpdatedAt *time.Time `json:"updated_at,omitempty"` Uuid *openapi_types.UUID `json:"uuid,omitempty"` diff --git a/internal/web/olegalentities/api.gen.go b/internal/web/olegalentities/api.gen.go index 37c9bc5..e69b017 100644 --- a/internal/web/olegalentities/api.gen.go +++ b/internal/web/olegalentities/api.gen.go @@ -109,7 +109,7 @@ type InviteDTO = dto.InviteDTO // LegalEntityDTO defines model for LegalEntityDTO. type LegalEntityDTO struct { CreatedAt *time.Time `json:"created_at,omitempty"` - DeletedAt *time.Time `json:"deleted_at"` + DeletedAt *time.Time `json:"deleted_at,omitempty"` Name *string `json:"name,omitempty"` UpdatedAt *time.Time `json:"updated_at,omitempty"` Uuid *openapi_types.UUID `json:"uuid,omitempty"` diff --git a/internal/web/web.go b/internal/web/web.go index 13f6ced..9e5230e 100644 --- a/internal/web/web.go +++ b/internal/web/web.go @@ -81,18 +81,10 @@ func (a *Web) GetAllLegalEntities(ctx context.Context, request ofederation.GetAl } dtos := make([]ofederation.LegalEntityDTO, 0, len(entities)) for _, e := range entities { - eUUID := types.UUID(e.UUID) - name := e.Name - namePtr := &name // Приведение string к *string - created := e.CreatedAt - updated := e.UpdatedAt - deleted := e.DeletedAt dtos = append(dtos, ofederation.LegalEntityDTO{ - Uuid: &eUUID, - Name: namePtr, - CreatedAt: &created, - UpdatedAt: &updated, - DeletedAt: deleted, + Uuid: &e.UUID, + Name: &e.Name, + // Исключаем deleted_at }) } return ofederation.GetAllLegalEntities200JSONResponse(dtos), nil @@ -111,6 +103,7 @@ func (a *Web) UpdateLegalEntity(ctx context.Context, request ofederation.UpdateL return &ofederation.UpdateLegalEntity200JSONResponse{ Uuid: &uuidValue, Name: newNamePtr, + // Исключаем deleted_at }, nil } diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index 7576b40..180e382 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -3486,7 +3486,6 @@ components: deleted_at: type: string format: date-time - nullable: true CreateLegalEntityRequest: type: object