unleash-server 6.1.7 → 6.1.8

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-change-request-access-read-model.d.ts","sourceRoot":"","sources":["../../../../src/lib/features/change-request-access-service/sql-change-request-access-read-model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,qBAAa,4BACT,YAAW,6BAA6B;IAExC,OAAO,CAAC,EAAE,CAAK;IAEf,OAAO,CAAC,aAAa,CAAgB;gBAEzB,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa;IAKnC,sBAAsB,CAC/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACZ,OAAO,CAAC,OAAO,CAAC;IAeN,gCAAgC,CACzC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,IAAI,GACZ,OAAO,CAAC,OAAO,CAAC;IAcN,uBAAuB,CAChC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC;IAYN,iCAAiC,CAC1C,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC;CAWtB"}
+{"version":3,"file":"sql-change-request-access-read-model.d.ts","sourceRoot":"","sources":["../../../../src/lib/features/change-request-access-service/sql-change-request-access-read-model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,qBAAa,4BACT,YAAW,6BAA6B;IAExC,OAAO,CAAC,EAAE,CAAK;IAEf,OAAO,CAAC,aAAa,CAAgB;gBAEzB,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa;IAKnC,sBAAsB,CAC/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACZ,OAAO,CAAC,OAAO,CAAC;IAeN,gCAAgC,CACzC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,IAAI,GACZ,OAAO,CAAC,OAAO,CAAC;IAcN,uBAAuB,CAChC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC;IAYN,iCAAiC,CAC1C,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC;CAiBtB"}

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.js

@@ -34,12 +34,14 @@ class ChangeRequestAccessReadModel {
         return present;
     }
     async isChangeRequestsEnabledForProject(project) {
-        const result = await this.db.raw(`SELECT EXISTS(SELECT 1
-                           FROM change_request_settings
-                           WHERE project = ?
-                           ) AS present`, [project]);
-        const { present } = result.rows[0];
-        return present;
+        const result = await this.db('change_request_settings')
+            .join('project_environments', function () {
+            return this.on('change_request_settings.project', 'project_environments.project_id').andOn('change_request_settings.environment', 'project_environments.environment_name');
+        })
+            .where('change_request_settings.project', project)
+            .select('change_request_settings.project')
+            .first();
+        return Boolean(result);
     }
 }
 exports.ChangeRequestAccessReadModel = ChangeRequestAccessReadModel;

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql-change-request-access-read-model.js","sourceRoot":"","sources":["../../../../src/lib/features/change-request-access-service/sql-change-request-access-read-model.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAMlD,MAAa,4BAA4B;IAOrC,YAAY,EAAM,EAAE,aAA4B;QAC5C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAC/B,OAAe,EACf,WAAmB,EACnB,IAAW;QAEX,MAAM,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnE,IAAI;gBACA,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAC5B,IAAI,EACJ,2BAAmB,EACnB,OAAO,EACP,WAAW,CACd;gBACH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC;SACrD,CAAC,CAAC;QACH,OAAO,oBAAoB,IAAI,CAAC,oBAAoB,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,gCAAgC,CACzC,OAAe,EACf,IAAW;QAEX,MAAM,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnE,IAAI;gBACA,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAC5B,IAAI,EACJ,2BAAmB,EACnB,OAAO,CACV;gBACH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC;SAClD,CAAC,CAAC;QACH,OAAO,oBAAoB,IAAI,CAAC,oBAAoB,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAChC,OAAe,EACf,WAAmB;QAEnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B;;;yDAG6C,EAC7C,CAAC,WAAW,EAAE,OAAO,CAAC,CACzB,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,iCAAiC,CAC1C,OAAe;QAEf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B;;;wCAG4B,EAC5B,CAAC,OAAO,CAAC,CACZ,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AA5ED,oEA4EC"}
+{"version":3,"file":"sql-change-request-access-read-model.js","sourceRoot":"","sources":["../../../../src/lib/features/change-request-access-service/sql-change-request-access-read-model.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAMlD,MAAa,4BAA4B;IAOrC,YAAY,EAAM,EAAE,aAA4B;QAC5C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAC/B,OAAe,EACf,WAAmB,EACnB,IAAW;QAEX,MAAM,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnE,IAAI;gBACA,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAC5B,IAAI,EACJ,2BAAmB,EACnB,OAAO,EACP,WAAW,CACd;gBACH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC;SACrD,CAAC,CAAC;QACH,OAAO,oBAAoB,IAAI,CAAC,oBAAoB,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,gCAAgC,CACzC,OAAe,EACf,IAAW;QAEX,MAAM,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnE,IAAI;gBACA,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAC5B,IAAI,EACJ,2BAAmB,EACnB,OAAO,CACV;gBACH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC;SAClD,CAAC,CAAC;QACH,OAAO,oBAAoB,IAAI,CAAC,oBAAoB,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAChC,OAAe,EACf,WAAmB;QAEnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B;;;yDAG6C,EAC7C,CAAC,WAAW,EAAE,OAAO,CAAC,CACzB,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,iCAAiC,CAC1C,OAAe;QAEf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC;aAClD,IAAI,CAAC,sBAAsB,EAAE;YAC1B,OAAO,IAAI,CAAC,EAAE,CACV,iCAAiC,EACjC,iCAAiC,CACpC,CAAC,KAAK,CACH,qCAAqC,EACrC,uCAAuC,CAC1C,CAAC;QACN,CAAC,CAAC;aACD,KAAK,CAAC,iCAAiC,EAAE,OAAO,CAAC;aACjD,MAAM,CAAC,iCAAiC,CAAC;aACzC,KAAK,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;CACJ;AAlFD,oEAkFC"}

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sql-change-request-access-read-model.test.d.ts.map

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sql-change-request-access-read-model.test.d.ts","sourceRoot":"","sources":["../../../../src/lib/features/change-request-access-service/sql-change-request-access-read-model.test.ts"],"names":[],"mappings":""}

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.test.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const database_init_1 = __importDefault(require("../../../test/e2e/helpers/database-init"));
+const no_logger_1 = __importDefault(require("../../../test/fixtures/no-logger"));
+const createChangeRequestAccessReadModel_1 = require("./createChangeRequestAccessReadModel");
+const test_config_1 = require("../../../test/config/test-config");
+let db;
+let readModel;
+beforeAll(async () => {
+    db = await (0, database_init_1.default)('change_request_access_read_model', no_logger_1.default);
+    const config = (0, test_config_1.createTestConfig)({
+        getLogger: no_logger_1.default,
+    });
+    readModel = (0, createChangeRequestAccessReadModel_1.createChangeRequestAccessReadModel)(db.rawDatabase, config);
+});
+afterAll(async () => {
+    await db.destroy();
+});
+test(`Should indicate change request enabled status`, async () => {
+    // no change requests
+    const defaultStatus = await readModel.isChangeRequestsEnabledForProject('default');
+    expect(defaultStatus).toBe(false);
+    // change request enabled in enabled environment
+    await db.rawDatabase('change_request_settings').insert({
+        project: 'default',
+        environment: 'default',
+        required_approvals: 1,
+    });
+    const enabledStatus = await readModel.isChangeRequestsEnabledForProject('default');
+    expect(enabledStatus).toBe(true);
+    // change request enabled in disabled environment
+    await db.stores.projectStore.deleteEnvironmentForProject('default', 'default');
+    const disabledStatus = await readModel.isChangeRequestsEnabledForProject('default');
+    expect(disabledStatus).toBe(false);
+});
+//# sourceMappingURL=sql-change-request-access-read-model.test.js.map

package/dist/lib/features/change-request-access-service/sql-change-request-access-read-model.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sql-change-request-access-read-model.test.js","sourceRoot":"","sources":["../../../../src/lib/features/change-request-access-service/sql-change-request-access-read-model.test.ts"],"names":[],"mappings":";;;;;AAAA,4FAA+E;AAC/E,iFAAyD;AACzD,6FAA0F;AAC1F,kEAAoE;AAGpE,IAAI,EAAW,CAAC;AAEhB,IAAI,SAAwC,CAAC;AAE7C,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,kCAAkC,EAAE,mBAAS,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,SAAS,EAAT,mBAAS;KACZ,CAAC,CAAC;IAEH,SAAS,GAAG,IAAA,uEAAkC,EAAC,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AAC3E,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;IAC7D,qBAAqB;IACrB,MAAM,aAAa,GACf,MAAM,SAAS,CAAC,iCAAiC,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAElC,gDAAgD;IAChD,MAAM,EAAE,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC,MAAM,CAAC;QACnD,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,SAAS;QACtB,kBAAkB,EAAE,CAAC;KACxB,CAAC,CAAC;IACH,MAAM,aAAa,GACf,MAAM,SAAS,CAAC,iCAAiC,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjC,iDAAiD;IACjD,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,2BAA2B,CACpD,SAAS,EACT,SAAS,CACZ,CAAC;IACF,MAAM,cAAc,GAChB,MAAM,SAAS,CAAC,iCAAiC,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}

package/dist/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.js

@@ -15,7 +15,7 @@ const CR_TITLE = 'My change request';
 const FLAG_NAME = 'crarm-test-flag';
 let readModel;
 beforeAll(async () => {
-    db = await (0, database_init_1.default)('change_request_access_read_model_serial', no_logger_1.default);
+    db = await (0, database_init_1.default)('change_request_segment_usage_read_model', no_logger_1.default);
     user = await db.stores.userStore.insert({
         username: 'cr-creator',
     });

package/package.json

@@ -1,7 +1,7 @@
 {
  "name": "unleash-server",
  "description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
- "version": "6.1.7",
+ "version": "6.1.8",
  "keywords": [
   "unleash",
   "feature toggle",