From ed6b496b2337ad5935326ede8b2237af3d122355 Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Tue, 21 Nov 2023 13:18:22 +0100 Subject: [PATCH] feat: rename type --- src/lib/segments/segment-service-interface.ts | 9 ++++++--- src/lib/services/segment-service.ts | 6 +++--- src/test/e2e/api/admin/segment.e2e.test.ts | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lib/segments/segment-service-interface.ts b/src/lib/segments/segment-service-interface.ts index 3f909b26c3..08fc3b0cb8 100644 --- a/src/lib/segments/segment-service-interface.ts +++ b/src/lib/segments/segment-service-interface.ts @@ -2,7 +2,7 @@ import { ChangeRequestStrategy } from 'lib/features/change-request-segment-usage import { UpsertSegmentSchema } from 'lib/openapi'; import { IClientSegment, IFeatureStrategy, ISegment, IUser } from 'lib/types'; -export type UsedStrategies = { +export type StrategiesUsingSegment = { strategies: IFeatureStrategy[]; changeRequestStrategies: ChangeRequestStrategy[]; }; @@ -24,9 +24,12 @@ export interface ISegmentService { * This is NOT considering the private projects * For most use cases, use `getVisibleStrategies` */ - getAllStrategies(id: number): Promise; + getAllStrategies(id: number): Promise; - getVisibleStrategies(id: number, userId: number): Promise; + getVisibleStrategies( + id: number, + userId: number, + ): Promise; validateName(name: string): Promise; diff --git a/src/lib/services/segment-service.ts b/src/lib/services/segment-service.ts index 7441cff49c..875196212d 100644 --- a/src/lib/services/segment-service.ts +++ b/src/lib/services/segment-service.ts @@ -20,7 +20,7 @@ import { IFeatureStrategiesStore } from '../features/feature-toggle/types/featur import BadDataError from '../error/bad-data-error'; import { ISegmentService, - UsedStrategies, + StrategiesUsingSegment, } from '../segments/segment-service-interface'; import { PermissionError } from '../error'; import { IChangeRequestAccessReadModel } from '../features/change-request-access-service/change-request-access-read-model'; @@ -93,7 +93,7 @@ export class SegmentService implements ISegmentService { async getVisibleStrategies( id: number, userId: number, - ): Promise { + ): Promise { const allStrategies = await this.getAllStrategies(id); if (this.flagResolver.isEnabled('privateProjects')) { const accessibleProjects = @@ -115,7 +115,7 @@ export class SegmentService implements ISegmentService { return allStrategies; } - async getAllStrategies(id: number): Promise { + async getAllStrategies(id: number): Promise { const strategies = await this.featureStrategiesStore.getStrategiesBySegment(id); diff --git a/src/test/e2e/api/admin/segment.e2e.test.ts b/src/test/e2e/api/admin/segment.e2e.test.ts index 4326b8eb41..03ea5280d2 100644 --- a/src/test/e2e/api/admin/segment.e2e.test.ts +++ b/src/test/e2e/api/admin/segment.e2e.test.ts @@ -15,7 +15,7 @@ import { IUnleashTest, setupAppWithCustomConfig, } from '../../helpers/test-helper'; -import { UsedStrategies } from 'lib/segments/segment-service-interface'; +import { StrategiesUsingSegment } from 'lib/segments/segment-service-interface'; let app: IUnleashTest; let db: ITestDb; @@ -48,7 +48,9 @@ const fetchFeatures = (): Promise => .expect(200) .then((res) => res.body.features); -const fetchSegmentStrategies = (segmentId: number): Promise => +const fetchSegmentStrategies = ( + segmentId: number, +): Promise => app.request .get(`${SEGMENTS_BASE_PATH}/${segmentId}/strategies`) .expect(200)