diff --git a/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts b/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts index f2581c2208..489900b128 100644 --- a/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts +++ b/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts @@ -100,40 +100,6 @@ const updateStrategyInCr = async ( }); }; -describe.each([ - [ - 'updateStrategy', - (segmentId: number) => - updateStrategyInCr(randomId(), segmentId, FLAG_NAME), - ], - [ - 'addStrategy', - (segmentId: number) => addStrategyToCr(segmentId, FLAG_NAME), - ], -])('Should handle %s changes correctly', (_, addOrUpdateStrategy) => { - test.each([ - ['Draft', true], - ['In review', true], - ['Scheduled', true], - ['Approved', true], - ['Rejected', false], - ['Cancelled', false], - ['Applied', false], - ])( - 'Changes in %s CRs should make it %s', - async (state, expectedOutcome) => { - await createCR(state); - - const segmentId = 3; - await addOrUpdateStrategy(segmentId); - - expect( - await readModel.isSegmentUsedInActiveChangeRequests(segmentId), - ).toBe(expectedOutcome); - }, - ); -}); - test.each([ ['Draft', true], ['In review', true], diff --git a/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.ts b/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.ts index 4b680fd006..7eead7db03 100644 --- a/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.ts +++ b/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.ts @@ -10,7 +10,6 @@ type ExistingStrategy = NewStrategy & { id: string }; export type ChangeRequestStrategy = NewStrategy | ExistingStrategy; export interface IChangeRequestSegmentUsageReadModel { - isSegmentUsedInActiveChangeRequests(segmentId: number): Promise; getStrategiesUsedInActiveChangeRequests( segmentId: number, ): Promise; diff --git a/src/lib/features/change-request-segment-usage-service/fake-change-request-segment-usage-read-model.ts b/src/lib/features/change-request-segment-usage-service/fake-change-request-segment-usage-read-model.ts index a5e0573b45..4c8414f023 100644 --- a/src/lib/features/change-request-segment-usage-service/fake-change-request-segment-usage-read-model.ts +++ b/src/lib/features/change-request-segment-usage-service/fake-change-request-segment-usage-read-model.ts @@ -6,24 +6,13 @@ import { export class FakeChangeRequestSegmentUsageReadModel implements IChangeRequestSegmentUsageReadModel { - private isSegmentUsedInActiveChangeRequestsValue: boolean; strategiesUsedInActiveChangeRequests: ChangeRequestStrategy[]; - constructor( - isSegmentUsedInActiveChangeRequests = false, - strategiesUsedInActiveChangeRequests = [], - ) { - this.isSegmentUsedInActiveChangeRequestsValue = - isSegmentUsedInActiveChangeRequests; - + constructor(strategiesUsedInActiveChangeRequests = []) { this.strategiesUsedInActiveChangeRequests = strategiesUsedInActiveChangeRequests; } - public async isSegmentUsedInActiveChangeRequests(): Promise { - return this.isSegmentUsedInActiveChangeRequestsValue; - } - public async getStrategiesUsedInActiveChangeRequests(): Promise< ChangeRequestStrategy[] > { diff --git a/src/lib/features/change-request-segment-usage-service/sql-change-request-segment-usage-read-model.ts b/src/lib/features/change-request-segment-usage-service/sql-change-request-segment-usage-read-model.ts index f33f5606cc..6c437ff3ee 100644 --- a/src/lib/features/change-request-segment-usage-service/sql-change-request-segment-usage-read-model.ts +++ b/src/lib/features/change-request-segment-usage-service/sql-change-request-segment-usage-read-model.ts @@ -12,23 +12,6 @@ export class ChangeRequestSegmentUsageReadModel constructor(db: Db) { this.db = db; } - public async isSegmentUsedInActiveChangeRequests( - segmentId: number, - ): Promise { - const result = await this.db.raw( - `SELECT events.* - FROM change_request_events events - JOIN change_requests cr ON events.change_request_id = cr.id - WHERE cr.state IN ('Draft', 'In review', 'Scheduled', 'Approved') - AND events.action IN ('updateStrategy', 'addStrategy');`, - ); - - const isUsed = result.rows.some((row) => - row.payload?.segments?.includes(segmentId), - ); - - return isUsed; - } mapRow = (row): ChangeRequestStrategy => { const { payload, project, environment, feature } = row;