From 8aab3d5f917e1f1b3109b37205f09156ca787e72 Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Wed, 17 Jul 2024 14:46:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2=20=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D0=B4=20ListLocales=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=20Delivery=20=D0=B4=D0=BB=D1=8F=20=D0=B2?= =?UTF-8?q?=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D1=82=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=BE=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BB=D0=BE=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/delivery/service/service.go | 12 +++++- pkg/delivery/service/service_test.go | 57 ++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkg/delivery/service/service_test.go diff --git a/pkg/delivery/service/service.go b/pkg/delivery/service/service.go index ed1b5091..be711481 100644 --- a/pkg/delivery/service/service.go +++ b/pkg/delivery/service/service.go @@ -34,7 +34,17 @@ type deliveryService struct { } func (s deliveryService) ListLocales(ctx context.Context, spaceId string) (locales []*locales.Locale, err error) { - return s.Locales.List(ctx, spaceId) + res, err := s.Locales.List(ctx, spaceId) + if err != nil { + return nil, err + } + for _, l := range res { + if l.NoPublish || l.Disabled { + continue + } + locales = append(locales, l) + } + return locales, nil } func (s deliveryService) GetEnvironment(ctx context.Context, spaceId, envId string) (env *environments.Environment, err error) { diff --git a/pkg/delivery/service/service_test.go b/pkg/delivery/service/service_test.go new file mode 100644 index 00000000..88bcc16f --- /dev/null +++ b/pkg/delivery/service/service_test.go @@ -0,0 +1,57 @@ +package service + +import ( + "context" + "testing" + + "git.perx.ru/perxis/perxis-go/pkg/locales" + "git.perx.ru/perxis/perxis-go/pkg/locales/mocks" + "github.com/stretchr/testify/assert" +) + +func Test_deliveryService_ListLocales(t *testing.T) { + tests := []struct { + name string + mockcall func(locSvs *mocks.Locales) + wantLocales []*locales.Locale + wantErr bool + }{ + { + name: "Returned locales without NoPublish and Disabled", + mockcall: func(locSvs *mocks.Locales) { + locSvs.On("List", context.Background(), "space").Return([]*locales.Locale{ + {ID: "en_EN", SpaceID: "space", Name: "english", Code: "en", NoPublish: false, Disabled: false}, + {ID: "de_DE", SpaceID: "space", Name: "deutsch", Code: "de", NoPublish: false, Disabled: false}, + {ID: "ru_RU", SpaceID: "space", Name: "russian", Code: "ru", NoPublish: false, Disabled: false}, + {ID: "by_BY", SpaceID: "space", Name: "belarus", Code: "by", NoPublish: true, Disabled: false}, + {ID: "es_ES", SpaceID: "space", Name: "spain", Code: "by", NoPublish: false, Disabled: true}}, nil) + }, + wantLocales: []*locales.Locale{ + {ID: "en_EN", SpaceID: "space", Name: "english", Code: "en", NoPublish: false, Disabled: false}, + {ID: "de_DE", SpaceID: "space", Name: "deutsch", Code: "de", NoPublish: false, Disabled: false}, + {ID: "ru_RU", SpaceID: "space", Name: "russian", Code: "ru", NoPublish: false, Disabled: false}, + }, + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + localesService := &mocks.Locales{} + if tt.mockcall != nil { + tt.mockcall(localesService) + } + s := deliveryService{ + Locales: localesService, + } + + gotLocales, err := s.ListLocales(context.Background(), "space") + if tt.wantErr { + assert.Error(t, err) + return + } + assert.NoError(t, err) + assert.Equal(t, tt.wantLocales, gotLocales) + localesService.AssertExpectations(t) + }) + } +} -- GitLab