From a908c85e7ba97517a8e6a74d06eda173a3e25bb9 Mon Sep 17 00:00:00 2001 From: andreas-unleash <104830839+andreas-unleash@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:20:38 +0200 Subject: [PATCH] Revert "Add changeRequestEnabled to project and project_environments (#2357)" This reverts commit 47a617c78b98a9f0d0c2bc1d6e22add29b109084. --- src/lib/db/project-store.ts | 21 ++++--------------- .../spec/project-environment-schema.ts | 3 --- src/lib/openapi/spec/project-schema.test.ts | 16 -------------- src/lib/openapi/spec/project-schema.ts | 3 --- src/lib/types/model.ts | 2 +- src/lib/types/stores/project-store.ts | 8 ------- ...07132528-change-request-project-options.js | 21 ------------------- .../__snapshots__/openapi.e2e.test.ts.snap | 6 ------ 8 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 src/migrations/20221107132528-change-request-project-options.js diff --git a/src/lib/db/project-store.ts b/src/lib/db/project-store.ts index 2476e42b1d..5f46bba893 100644 --- a/src/lib/db/project-store.ts +++ b/src/lib/db/project-store.ts @@ -21,14 +21,12 @@ const COLUMNS = [ 'created_at', 'health', 'updated_at', - 'change_request_enabled', ]; const TABLE = 'projects'; export interface IEnvironmentProjectLink { environmentName: string; projectId: string; - changeRequestsEnabled?: string; } export interface IProjectMembersCount { @@ -80,7 +78,7 @@ class ProjectStore implements IProjectStore { let projects = this.db(TABLE) .select( this.db.raw( - 'projects.id, projects.name, projects.description, projects.health, projects.updated_at, projects.change_request_enabled, count(features.name) AS number_of_features', + 'projects.id, projects.name, projects.description, projects.health, projects.updated_at, count(features.name) AS number_of_features', ), ) .leftJoin('features', 'features.project', 'projects.id') @@ -117,7 +115,6 @@ class ProjectStore implements IProjectStore { featureCount: Number(row.number_of_features) || 0, memberCount: Number(row.number_of_users) || 0, updatedAt: row.updated_at, - changeRequestsEnabled: row.change_request_enabled || false, }; } @@ -199,7 +196,6 @@ class ProjectStore implements IProjectStore { const environments = projects.map((p) => ({ project_id: p.id, environment_name: DEFAULT_ENV, - change_request_enabled: p.change_request_enabled, })); await this.db('project_environments') .insert(environments) @@ -244,13 +240,8 @@ class ProjectStore implements IProjectStore { id: string, environment: string, ): Promise { - const project = await this.get(id); await this.db('project_environments') - .insert({ - project_id: id, - environment_name: environment, - change_request_enabled: project.changeRequestsEnabled, - }) + .insert({ project_id: id, environment_name: environment }) .onConflict(['project_id', 'environment_name']) .ignore(); } @@ -259,12 +250,10 @@ class ProjectStore implements IProjectStore { environment: string, projects: string[], ): Promise { - const rows = projects.map(async (projectId) => { - const project = await this.get(projectId); + const rows = projects.map((project) => { return { - project_id: projectId, + project_id: project, environment_name: environment, - change_request_enabled: project.changeRequestsEnabled || false, }; }); @@ -381,7 +370,6 @@ class ProjectStore implements IProjectStore { return { environmentName: row.environment_name, projectId: row.project_id, - changeRequestsEnabled: row.change_request_enabled, }; } @@ -398,7 +386,6 @@ class ProjectStore implements IProjectStore { createdAt: row.created_at, health: row.health || 100, updatedAt: row.updated_at || new Date(), - changeRequestsEnabled: row.change_request_enabled || false, }; } } diff --git a/src/lib/openapi/spec/project-environment-schema.ts b/src/lib/openapi/spec/project-environment-schema.ts index 072df4897e..0cc6f61ffe 100644 --- a/src/lib/openapi/spec/project-environment-schema.ts +++ b/src/lib/openapi/spec/project-environment-schema.ts @@ -9,9 +9,6 @@ export const projectEnvironmentSchema = { environment: { type: 'string', }, - changeRequestsEnabled: { - type: 'boolean', - }, }, components: {}, } as const; diff --git a/src/lib/openapi/spec/project-schema.test.ts b/src/lib/openapi/spec/project-schema.test.ts index ce231dd847..9909014019 100644 --- a/src/lib/openapi/spec/project-schema.test.ts +++ b/src/lib/openapi/spec/project-schema.test.ts @@ -10,22 +10,6 @@ test('projectSchema', () => { featureCount: 10, memberCount: 3, updatedAt: '2022-06-28T17:33:53.963Z', - changeRequestsEnabled: false, - }; - - expect( - validateSchema('#/components/schemas/projectSchema', {}), - ).not.toBeUndefined(); - - expect( - validateSchema('#/components/schemas/projectSchema', data), - ).toBeUndefined(); -}); - -test('projectSchema with only required', () => { - const data: ProjectSchema = { - name: 'Default', - id: 'default', }; expect( diff --git a/src/lib/openapi/spec/project-schema.ts b/src/lib/openapi/spec/project-schema.ts index 0fab13a074..23740bec00 100644 --- a/src/lib/openapi/spec/project-schema.ts +++ b/src/lib/openapi/spec/project-schema.ts @@ -33,9 +33,6 @@ export const projectSchema = { format: 'date-time', nullable: true, }, - changeRequestsEnabled: { - type: 'boolean', - }, }, components: {}, } as const; diff --git a/src/lib/types/model.ts b/src/lib/types/model.ts index 00771d6d50..abe274446a 100644 --- a/src/lib/types/model.ts +++ b/src/lib/types/model.ts @@ -345,8 +345,8 @@ export interface IProject { health?: number; createdAt?: Date; updatedAt?: Date; - changeRequestsEnabled?: boolean; } + export interface ICustomRole { id: number; name: string; diff --git a/src/lib/types/stores/project-store.ts b/src/lib/types/stores/project-store.ts index c574d318b5..82dc6ad877 100644 --- a/src/lib/types/stores/project-store.ts +++ b/src/lib/types/stores/project-store.ts @@ -10,7 +10,6 @@ export interface IProjectInsert { name: string; description: string; updatedAt?: Date; - changeRequestsEnabled?: boolean; } export interface IProjectArchived { @@ -27,11 +26,6 @@ export interface IProjectQuery { id?: string; } -export interface IProjectEnvironmentWithChangeRequests { - environment: string; - changeRequestsEnabled: boolean; -} - export interface IProjectStore extends Store { hasProject(id: string): Promise; updateHealth(healthUpdate: IProjectHealthUpdate): Promise; @@ -50,11 +44,9 @@ export interface IProjectStore extends Store { getProjectsWithCounts(query?: IProjectQuery): Promise; count(): Promise; getAll(query?: IProjectQuery): Promise; - getProjectLinksForEnvironments( environments: string[], ): Promise; - addEnvironmentToProjects( environment: string, projects: string[], diff --git a/src/migrations/20221107132528-change-request-project-options.js b/src/migrations/20221107132528-change-request-project-options.js deleted file mode 100644 index 208eac22bd..0000000000 --- a/src/migrations/20221107132528-change-request-project-options.js +++ /dev/null @@ -1,21 +0,0 @@ -'use strict'; - -exports.up = function (db, callback) { - db.runSql( - ` - ALTER TABLE project_environments add column if not exists change_request_enabled bool default false; - ALTER TABLE projects add column if not exists change_request_enabled bool default false; - `, - callback, - ); -}; - -exports.down = function (db, callback) { - db.runSql( - ` - ALTER TABLE project_environments drop column if exists change_request_enabled; - ALTER TABLE projects drop column if exists change_request_enabled; - `, - callback, - ); -}; diff --git a/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap b/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap index 097e791975..56ed7e7911 100644 --- a/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap +++ b/src/test/e2e/api/openapi/__snapshots__/openapi.e2e.test.ts.snap @@ -2255,9 +2255,6 @@ exports[`should serve the OpenAPI spec 1`] = ` "projectEnvironmentSchema": { "additionalProperties": false, "properties": { - "changeRequestsEnabled": { - "type": "boolean", - }, "environment": { "type": "string", }, @@ -2270,9 +2267,6 @@ exports[`should serve the OpenAPI spec 1`] = ` "projectSchema": { "additionalProperties": false, "properties": { - "changeRequestsEnabled": { - "type": "boolean", - }, "createdAt": { "format": "date-time", "type": "string",