unleash-server 4.2.0-beta.8 → 4.2.3

package/dist/lib/services/{feature-toggle-service-v2.js → feature-toggle-service.js}

@@ -12,32 +12,58 @@ const events_1 = require("../types/events");
 const notfound_error_1 = __importDefault(require("../error/notfound-error"));
 const constants_1 = require("../util/constants");
 const fast_json_patch_1 = require("fast-json-patch");
-class FeatureToggleServiceV2 {
+class FeatureToggleService {
     constructor({ featureStrategiesStore, featureToggleStore, featureToggleClientStore, projectStore, eventStore, featureTagStore, featureEnvironmentStore, }, { getLogger }) {
         this.logger = getLogger('services/feature-toggle-service-v2.ts');
         this.featureStrategiesStore = featureStrategiesStore;
         this.featureToggleStore = featureToggleStore;
         this.featureToggleClientStore = featureToggleClientStore;
-        this.featureTagStore = featureTagStore;
+        this.tagStore = featureTagStore;
         this.projectStore = projectStore;
         this.eventStore = eventStore;
         this.featureEnvironmentStore = featureEnvironmentStore;
     }
-    async patchFeature(projectId, featureName, userName, operations) {
+    async validateFeatureContext({ featureName, projectId, }) {
+        const id = await this.featureToggleStore.getProjectId(featureName);
+        if (id !== projectId) {
+            throw new invalid_operation_error_1.default('You can not change the projectId for an activation strategy.');
+        }
+    }
+    validateFeatureStrategyContext(strategy, { featureName, projectId }) {
+        if (strategy.projectId !== projectId) {
+            throw new invalid_operation_error_1.default('You can not change the projectId for an activation strategy.');
+        }
+        if (strategy.featureName !== featureName) {
+            throw new invalid_operation_error_1.default('You can not change the featureName for an activation strategy.');
+        }
+    }
+    async patchFeature(project, featureName, createdBy, operations) {
         const featureToggle = await this.getFeatureMetadata(featureName);
         const { newDocument } = (0, fast_json_patch_1.applyPatch)((0, fast_json_patch_1.deepClone)(featureToggle), operations);
-        const updated = await this.updateFeatureToggle(projectId, newDocument, userName);
+        const updated = await this.updateFeatureToggle(project, newDocument, createdBy);
         if (featureToggle.stale !== newDocument.stale) {
-            await this.eventStore.store({
-                type: newDocument.stale ? events_1.FEATURE_STALE_ON : events_1.FEATURE_STALE_OFF,
-                data: updated,
-                project: projectId,
-                createdBy: userName,
-            });
+            const tags = await this.tagStore.getAllTagsForFeature(featureName);
+            await this.eventStore.store(new events_1.FeatureStaleEvent({
+                stale: newDocument.stale,
+                project,
+                featureName,
+                createdBy,
+                tags,
+            }));
         }
         return updated;
     }
-    async createStrategy(strategyConfig, projectId, featureName, userName, environment = constants_1.DEFAULT_ENV) {
+    featureStrategyToPublic(featureStrategy) {
+        return {
+            id: featureStrategy.id,
+            name: featureStrategy.strategyName,
+            constraints: featureStrategy.constraints || [],
+            parameters: featureStrategy.parameters,
+        };
+    }
+    async createStrategy(strategyConfig, context, createdBy) {
+        const { featureName, projectId, environment } = context;
+        await this.validateFeatureContext(context);
         try {
             const newFeatureStrategy = await this.featureStrategiesStore.createStrategyFeatureEnv({
                 strategyName: strategyConfig.name,
@@ -48,24 +74,17 @@ class FeatureToggleServiceV2 {
                 featureName,
                 environment,
             });
-            const data = {
-                id: newFeatureStrategy.id,
-                name: newFeatureStrategy.strategyName,
-                constraints: newFeatureStrategy.constraints,
-                parameters: newFeatureStrategy.parameters,
-            };
-            await this.eventStore.store({
-                type: events_1.FEATURE_STRATEGY_ADD,
+            const tags = await this.tagStore.getAllTagsForFeature(featureName);
+            const strategy = this.featureStrategyToPublic(newFeatureStrategy);
+            await this.eventStore.store(new events_1.FeatureStrategyAddEvent({
                 project: projectId,
-                createdBy: userName,
+                featureName,
+                createdBy,
                 environment,
-                data: {
-                    ...data,
-                    name: featureName,
-                    strategyName: newFeatureStrategy.strategyName,
-                },
-            });
-            return data;
+                data: strategy,
+                tags,
+            }));
+            return strategy;
         }
         catch (e) {
             if (e.code === db_error_1.FOREIGN_KEY_VIOLATION) {
@@ -81,49 +100,51 @@ class FeatureToggleServiceV2 {
      * }
      * @param id
      * @param updates
+     * @param context - Which context does this strategy live in (projectId, featureName, environment)
+     * @param userName - Human readable id of the user performing the update
      */
-    // TODO: verify projectId is not changed from URL!
-    async updateStrategy(id, environment, project, userName, updates) {
+    async updateStrategy(id, updates, context, userName) {
+        const { projectId, environment, featureName } = context;
         const existingStrategy = await this.featureStrategiesStore.get(id);
+        this.validateFeatureStrategyContext(existingStrategy, context);
         if (existingStrategy.id === id) {
             const strategy = await this.featureStrategiesStore.updateStrategy(id, updates);
-            const data = {
-                id: strategy.id,
-                name: strategy.strategyName,
-                featureName: strategy.featureName,
-                constraints: strategy.constraints || [],
-                parameters: strategy.parameters,
-            };
-            await this.eventStore.store({
-                type: events_1.FEATURE_STRATEGY_UPDATE,
-                project,
+            // Store event!
+            const tags = await this.tagStore.getAllTagsForFeature(featureName);
+            const data = this.featureStrategyToPublic(strategy);
+            const preData = this.featureStrategyToPublic(existingStrategy);
+            await this.eventStore.store(new events_1.FeatureStrategyUpdateEvent({
+                project: projectId,
+                featureName,
                 environment,
                 createdBy: userName,
                 data,
-            });
+                preData,
+                tags,
+            }));
             return data;
         }
         throw new notfound_error_1.default(`Could not find strategy with id ${id}`);
     }
-    // TODO: verify projectId is not changed from URL!
-    async updateStrategyParameter(id, name, value, userName, project, environment) {
+    async updateStrategyParameter(id, name, value, context, userName) {
+        const { projectId, environment, featureName } = context;
         const existingStrategy = await this.featureStrategiesStore.get(id);
+        this.validateFeatureStrategyContext(existingStrategy, context);
         if (existingStrategy.id === id) {
             existingStrategy.parameters[name] = value;
             const strategy = await this.featureStrategiesStore.updateStrategy(id, existingStrategy);
-            const data = {
-                id: strategy.id,
-                name: strategy.strategyName,
-                constraints: strategy.constraints || [],
-                parameters: strategy.parameters,
-            };
-            await this.eventStore.store({
-                type: events_1.FEATURE_STRATEGY_UPDATE,
-                project,
+            const tags = await this.tagStore.getAllTagsForFeature(featureName);
+            const data = this.featureStrategyToPublic(strategy);
+            const preData = this.featureStrategyToPublic(existingStrategy);
+            await this.eventStore.store(new events_1.FeatureStrategyUpdateEvent({
+                featureName,
+                project: projectId,
                 environment,
                 createdBy: userName,
                 data,
-            });
+                preData,
+                tags,
+            }));
             return data;
         }
         throw new notfound_error_1.default(`Could not find strategy with id ${id}`);
@@ -134,23 +155,24 @@ class FeatureToggleServiceV2 {
      *
      * }
      * @param id - strategy id
-     * @param featureName - Name of the feature the strategy belongs to
-     * @param userName - Who's doing the change
-     * @param project - Which project does this feature toggle belong to
+     * @param context - Which context does this strategy live in (projectId, featureName, environment)
      * @param environment - Which environment does this strategy belong to
      */
-    async deleteStrategy(id, featureName, userName, project = 'default', environment = constants_1.DEFAULT_ENV) {
+    async deleteStrategy(id, context, createdBy) {
+        const existingStrategy = await this.featureStrategiesStore.get(id);
+        const { featureName, projectId, environment } = context;
+        this.validateFeatureStrategyContext(existingStrategy, context);
         await this.featureStrategiesStore.delete(id);
-        await this.eventStore.store({
-            type: events_1.FEATURE_STRATEGY_REMOVE,
-            project,
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
+        const preData = this.featureStrategyToPublic(existingStrategy);
+        await this.eventStore.store(new events_1.FeatureStrategyRemoveEvent({
+            featureName,
+            project: projectId,
             environment,
-            createdBy: userName,
-            data: {
-                id,
-                featureName,
-            },
-        });
+            createdBy,
+            preData,
+            tags,
+        }));
         // If there are no strategies left for environment disable it
         await this.featureEnvironmentStore.disableEnvironmentIfNoStrategies(featureName, environment);
     }
@@ -202,21 +224,23 @@ class FeatureToggleServiceV2 {
     async getFeatureToggle(featureName) {
         return this.featureStrategiesStore.getFeatureToggleWithEnvs(featureName, false);
     }
-    async createFeatureToggle(projectId, value, userName) {
-        this.logger.info(`${userName} creates feature toggle ${value.name}`);
+    async createFeatureToggle(projectId, value, createdBy) {
+        this.logger.info(`${createdBy} creates feature toggle ${value.name}`);
         await this.validateName(value.name);
         const exists = await this.projectStore.hasProject(projectId);
         if (exists) {
             const featureData = await feature_schema_1.featureMetadataSchema.validateAsync(value);
+            const featureName = featureData.name;
             const createdToggle = await this.featureToggleStore.create(projectId, featureData);
-            await this.featureEnvironmentStore.connectFeatureToEnvironmentsForProject(featureData.name, projectId);
-            const data = { ...featureData, project: projectId };
-            await this.eventStore.store({
-                type: events_1.FEATURE_CREATED,
-                createdBy: userName,
+            await this.featureEnvironmentStore.connectFeatureToEnvironmentsForProject(featureName, projectId);
+            const tags = await this.tagStore.getAllTagsForFeature(featureName);
+            await this.eventStore.store(new events_1.FeatureCreatedEvent({
+                featureName,
+                createdBy,
                 project: projectId,
-                data,
-            });
+                data: createdToggle,
+                tags,
+            }));
             return createdToggle;
         }
         throw new notfound_error_1.default(`Project with id ${projectId} does not exist`);
@@ -235,7 +259,11 @@ class FeatureToggleServiceV2 {
                 s.parameters.groupId = newFeatureName;
             }
             delete s.id;
-            createStrategies.push(this.createStrategy(s, projectId, newFeatureName, userName, e.name));
+            createStrategies.push(this.createStrategy(s, {
+                projectId,
+                featureName: newFeatureName,
+                environment: e.name,
+            }, userName));
         }));
         // Create strategies
         await Promise.allSettled(createStrategies);
@@ -245,15 +273,17 @@ class FeatureToggleServiceV2 {
         const featureName = updatedFeature.name;
         this.logger.info(`${userName} updates feature toggle ${featureName}`);
         const featureData = await feature_schema_1.featureMetadataSchema.validateAsync(updatedFeature);
+        const preData = await this.featureToggleStore.get(featureName);
         const featureToggle = await this.featureToggleStore.update(projectId, featureData);
-        const tags = await this.featureTagStore.getAllTagsForFeature(featureName);
-        await this.eventStore.store({
-            type: events_1.FEATURE_METADATA_UPDATED,
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
+        await this.eventStore.store(new events_1.FeatureMetadataUpdateEvent({
             createdBy: userName,
             data: featureToggle,
+            preData,
+            featureName,
             project: projectId,
             tags,
-        });
+        }));
         return featureToggle;
     }
     async getFeatureCountForProject(projectId) {
@@ -284,6 +314,7 @@ class FeatureToggleServiceV2 {
             strategies,
         };
     }
+    // todo: store events for this change.
     async deleteEnvironment(projectId, environment) {
         await this.featureStrategiesStore.deleteConfigurationsForProjectAndEnvironment(projectId, environment);
         await this.projectStore.deleteEnvironmentForProject(projectId, environment);
@@ -310,38 +341,38 @@ class FeatureToggleServiceV2 {
     async hasFeature(name) {
         return this.featureToggleStore.exists(name);
     }
-    async updateStale(featureName, isStale, userName) {
+    async updateStale(featureName, isStale, createdBy) {
         const feature = await this.featureToggleStore.get(featureName);
+        const { project } = feature;
         feature.stale = isStale;
-        await this.featureToggleStore.update(feature.project, feature);
-        const tags = await this.featureTagStore.getAllTagsForFeature(featureName);
-        const data = await this.getFeatureToggleLegacy(featureName);
-        await this.eventStore.store({
-            type: isStale ? events_1.FEATURE_STALE_ON : events_1.FEATURE_STALE_OFF,
-            createdBy: userName,
-            data,
+        await this.featureToggleStore.update(project, feature);
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
+        await this.eventStore.store(new events_1.FeatureStaleEvent({
+            stale: isStale,
+            project,
+            featureName,
+            createdBy,
             tags,
-            project: feature.project,
-        });
+        }));
         return feature;
     }
-    async archiveToggle(name, userName) {
-        const feature = await this.featureToggleStore.get(name);
-        await this.featureToggleStore.archive(name);
-        const tags = (await this.featureTagStore.getAllTagsForFeature(name)) || [];
-        await this.eventStore.store({
-            type: events_1.FEATURE_ARCHIVED,
-            createdBy: userName,
-            data: { name },
+    // todo: add projectId
+    async archiveToggle(featureName, createdBy) {
+        const feature = await this.featureToggleStore.get(featureName);
+        await this.featureToggleStore.archive(featureName);
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
+        await this.eventStore.store(new events_1.FeatureArchivedEvent({
+            featureName,
+            createdBy,
             project: feature.project,
             tags,
-        });
+        }));
     }
-    async updateEnabled(projectId, featureName, environment, enabled, userName) {
+    async updateEnabled(project, featureName, environment, enabled, createdBy) {
         const hasEnvironment = await this.featureEnvironmentStore.featureHasEnvironment(environment, featureName);
         if (hasEnvironment) {
             if (enabled) {
-                const strategies = await this.getStrategiesForEnvironment(projectId, featureName, environment);
+                const strategies = await this.getStrategiesForEnvironment(project, featureName, environment);
                 if (strategies.length === 0) {
                     throw new invalid_operation_error_1.default('You can not enable the environment before it has strategies');
                 }
@@ -349,28 +380,30 @@ class FeatureToggleServiceV2 {
             const updatedEnvironmentStatus = await this.featureEnvironmentStore.setEnvironmentEnabledStatus(environment, featureName, enabled);
             const feature = await this.featureToggleStore.get(featureName);
             if (updatedEnvironmentStatus > 0) {
-                const tags = await this.featureTagStore.getAllTagsForFeature(featureName);
-                await this.eventStore.store({
-                    type: enabled
-                        ? events_1.FEATURE_ENVIRONMENT_ENABLED
-                        : events_1.FEATURE_ENVIRONMENT_DISABLED,
-                    createdBy: userName,
-                    data: { name: featureName },
-                    tags,
-                    project: projectId,
+                const tags = await this.tagStore.getAllTagsForFeature(featureName);
+                await this.eventStore.store(new events_1.FeatureEnvironmentEvent({
+                    enabled,
+                    project,
+                    featureName,
                     environment,
-                });
+                    createdBy,
+                    tags,
+                }));
             }
             return feature;
         }
         throw new notfound_error_1.default(`Could not find environment ${environment} for feature: ${featureName}`);
     }
-    async storeFeatureUpdatedEventLegacy(featureName, userName) {
-        const tags = await this.featureTagStore.getAllTagsForFeature(featureName);
+    // @deprecated
+    async storeFeatureUpdatedEventLegacy(featureName, createdBy) {
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
         const feature = await this.getFeatureToggleLegacy(featureName);
+        // Legacy event. Will not be used from v4.3.
+        // We do not include 'preData' on purpose.
         await this.eventStore.store({
             type: events_1.FEATURE_UPDATED,
-            createdBy: userName,
+            createdBy,
+            featureName,
             data: feature,
             tags,
             project: feature.project,
@@ -383,6 +416,7 @@ class FeatureToggleServiceV2 {
         const isEnabled = await this.featureEnvironmentStore.isEnvironmentEnabled(featureName, environment);
         return this.updateEnabled(projectId, featureName, environment, !isEnabled, userName);
     }
+    // @deprecated
     async getFeatureToggleLegacy(featureName) {
         const feature = await this.featureStrategiesStore.getFeatureToggleWithEnvs(featureName);
         const { environments, ...legacyFeature } = feature;
@@ -391,47 +425,46 @@ class FeatureToggleServiceV2 {
         const enabled = defaultEnv?.enabled || false;
         return { ...legacyFeature, enabled, strategies };
     }
-    async changeProject(featureName, newProject, userName) {
+    async changeProject(featureName, newProject, createdBy) {
         const feature = await this.featureToggleStore.get(featureName);
         const oldProject = feature.project;
         feature.project = newProject;
         await this.featureToggleStore.update(newProject, feature);
-        const tags = await this.featureTagStore.getAllTagsForFeature(featureName);
-        await this.eventStore.store({
-            type: events_1.FEATURE_PROJECT_CHANGE,
-            createdBy: userName,
-            data: {
-                name: feature.name,
-                oldProject,
-                newProject,
-            },
-            project: newProject,
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
+        await this.eventStore.store(new events_1.FeatureChangeProjectEvent({
+            createdBy,
+            oldProject,
+            newProject,
+            featureName,
             tags,
-        });
+        }));
     }
     async getArchivedFeatures() {
         return this.getFeatureToggles({}, true);
     }
-    async deleteFeature(featureName, userName) {
+    // TODO: add project id.
+    async deleteFeature(featureName, createdBy) {
+        const toggle = await this.featureToggleStore.get(featureName);
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
         await this.featureToggleStore.delete(featureName);
-        await this.eventStore.store({
-            type: events_1.FEATURE_DELETED,
-            createdBy: userName,
-            data: {
-                featureName,
-            },
-        });
+        await this.eventStore.store(new events_1.FeatureDeletedEvent({
+            featureName,
+            project: toggle.project,
+            createdBy,
+            preData: toggle,
+            tags,
+        }));
     }
-    async reviveToggle(featureName, userName) {
-        const data = await this.featureToggleStore.revive(featureName);
-        const tags = await this.featureTagStore.getAllTagsForFeature(featureName);
-        await this.eventStore.store({
-            type: events_1.FEATURE_REVIVED,
-            createdBy: userName,
-            data,
-            project: data.project,
+    // TODO: add project id.
+    async reviveToggle(featureName, createdBy) {
+        const toggle = await this.featureToggleStore.revive(featureName);
+        const tags = await this.tagStore.getAllTagsForFeature(featureName);
+        await this.eventStore.store(new events_1.FeatureRevivedEvent({
+            createdBy,
+            featureName,
+            project: toggle.project,
             tags,
-        });
+        }));
     }
     async getMetadataForAllFeatures(archived) {
         return this.featureToggleStore.getAll({ archived });
@@ -443,6 +476,5 @@ class FeatureToggleServiceV2 {
         await this.featureStrategiesStore.setProjectForStrategiesBelongingToFeature(featureName, newProjectId);
     }
 }
-module.exports = FeatureToggleServiceV2;
-exports.default = FeatureToggleServiceV2;
-//# sourceMappingURL=feature-toggle-service-v2.js.map
+exports.default = FeatureToggleService;
+//# sourceMappingURL=feature-toggle-service.js.map

package/dist/lib/services/feature-toggle-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"feature-toggle-service.js","sourceRoot":"","sources":["../../../src/lib/services/feature-toggle-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/index.js

@@ -25,7 +25,7 @@ const reset_token_service_1 = __importDefault(require("./reset-token-service"));
 const setting_service_1 = __importDefault(require("./setting-service"));
 const session_service_1 = __importDefault(require("./session-service"));
 const user_feedback_service_1 = __importDefault(require("./user-feedback-service"));
-const feature_toggle_service_v2_1 = __importDefault(require("./feature-toggle-service-v2"));
+const feature_toggle_service_1 = __importDefault(require("./feature-toggle-service"));
 const environment_service_1 = __importDefault(require("./environment-service"));
 const feature_tag_service_1 = __importDefault(require("./feature-tag-service"));
 const project_health_service_1 = __importDefault(require("./project-health-service"));
@@ -45,17 +45,18 @@ const createServices = (stores, config) => {
     const tagTypeService = new tag_type_service_1.default(stores, config);
     const addonService = new addon_service_1.default(stores, config, tagTypeService);
     const sessionService = new session_service_1.default(stores, config);
+    const settingService = new setting_service_1.default(stores, config);
     const userService = new user_service_1.default(stores, config, {
         accessService,
         resetTokenService,
         emailService,
         sessionService,
+        settingService,
     });
     const versionService = new version_service_1.default(stores, config);
     const healthService = new health_service_1.default(stores, config);
-    const settingService = new setting_service_1.default(stores, config);
     const userFeedbackService = new user_feedback_service_1.default(stores, config);
-    const featureToggleServiceV2 = new feature_toggle_service_v2_1.default(stores, config);
+    const featureToggleServiceV2 = new feature_toggle_service_1.default(stores, config);
     const environmentService = new environment_service_1.default(stores, config);
     const featureTagService = new feature_tag_service_1.default(stores, config);
     const projectHealthService = new project_health_service_1.default(stores, config, featureToggleServiceV2);
@@ -63,6 +64,7 @@ const createServices = (stores, config) => {
     return {
         accessService,
         addonService,
+        featureToggleService: featureToggleServiceV2,
         featureToggleServiceV2,
         featureTypeService,
         healthService,

package/dist/lib/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/project-health-service.d.ts

@@ -1,7 +1,7 @@
 import { IUnleashStores } from '../types/stores';
 import { IUnleashConfig } from '../types/option';
 import { IProject, IProjectHealthReport, IProjectOverview } from '../types/model';
-import FeatureToggleServiceV2 from './feature-toggle-service-v2';
+import FeatureToggleService from './feature-toggle-service';
 export default class ProjectHealthService {
     private logger;
     private projectStore;
@@ -10,7 +10,7 @@ export default class ProjectHealthService {
     private featureTypes;
     private healthRatingTimer;
     private featureToggleService;
-    constructor({ projectStore, featureTypeStore, featureToggleStore, }: Pick<IUnleashStores, 'projectStore' | 'featureTypeStore' | 'featureToggleStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>, featureToggleService: FeatureToggleServiceV2);
+    constructor({ projectStore, featureTypeStore, featureToggleStore, }: Pick<IUnleashStores, 'projectStore' | 'featureTypeStore' | 'featureToggleStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>, featureToggleService: FeatureToggleService);
     getProjectOverview(projectId: string, archived?: boolean): Promise<IProjectOverview>;
     getProjectHealthReport(projectId: string): Promise<IProjectHealthReport>;
     private potentiallyStaleCount;

package/dist/lib/services/project-health-service.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("../util/constants");
+const date_fns_1 = require("date-fns");
 class ProjectHealthService {
     constructor({ projectStore, featureTypeStore, featureToggleStore, }, { getLogger }, featureToggleService) {
         this.logger = getLogger('services/project-health-service.ts');
@@ -8,7 +8,7 @@ class ProjectHealthService {
         this.featureTypeStore = featureTypeStore;
         this.featureToggleStore = featureToggleStore;
         this.featureTypes = new Map();
-        this.healthRatingTimer = setInterval(() => this.setHealthRating(), constants_1.MILLISECONDS_IN_ONE_HOUR).unref();
+        this.healthRatingTimer = setInterval(() => this.setHealthRating(), (0, date_fns_1.hoursToMilliseconds)(1)).unref();
         this.featureToggleService = featureToggleService;
     }
     // TODO: duplicate from project-service.
@@ -48,7 +48,7 @@ class ProjectHealthService {
             const diff = today - feature.createdAt.valueOf();
             const featureTypeExpectedLifetime = this.featureTypes.get(feature.type);
             return (!feature.stale &&
-                diff >= featureTypeExpectedLifetime * constants_1.MILLISECONDS_IN_DAY);
+                diff >= featureTypeExpectedLifetime * (0, date_fns_1.hoursToMilliseconds)(24));
         }).length;
     }
     activeCount(features) {