Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-08-23 13:46:45 +02:00
Code Issues Projects Releases Wiki Activity

Refactor/move features to feature oriented architecture (#4994)

Browse Source 
This PR gathers feature related files in the same folder.
This commit is contained in:
Fredrik Strand Oseberg 2023-10-11 09:38:57 +02:00 committed by GitHub
parent a3b4e9db5f
commit bc96216daa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
51 changed files with 183 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/db/feature-strategy-store.test.ts
View File

@ -1,7 +1,7 @@
import dbInit from '../../test/e2e/helpers/database-init'; import dbInit from '../../test/e2e/helpers/database-init';
import getLogger from '../../test/fixtures/no-logger'; import getLogger from '../../test/fixtures/no-logger';
import FeatureStrategiesStore from './feature-strategy-store'; import FeatureStrategiesStore from '../features/feature-toggle/feature-toggle-strategies-store';
import FeatureToggleStore from './feature-toggle-store'; import FeatureToggleStore from '../features/feature-toggle/feature-toggle-store';
import StrategyStore from './strategy-store'; import StrategyStore from './strategy-store';
import { IFeatureStrategy, PartialSome } from '../types'; import { IFeatureStrategy, PartialSome } from '../types';

2
src/lib/db/feature-toggle-client-store.ts
View File

@ -13,7 +13,7 @@ import {
} from '../types'; } from '../types';
import { DEFAULT_ENV, ensureStringValue, mapValues } from '../util'; import { DEFAULT_ENV, ensureStringValue, mapValues } from '../util';
import EventEmitter from 'events'; import EventEmitter from 'events';
import FeatureToggleStore from './feature-toggle-store'; import FeatureToggleStore from '../features/feature-toggle/feature-toggle-store';
import { Db } from './db'; import { Db } from './db';
import Raw = Knex.Raw; import Raw = Knex.Raw;

4
src/lib/db/index.ts
View File

@ -1,7 +1,7 @@
import { IUnleashConfig, IUnleashStores } from '../types'; import { IUnleashConfig, IUnleashStores } from '../types';
import EventStore from './event-store'; import EventStore from './event-store';
import FeatureToggleStore from './feature-toggle-store'; import FeatureToggleStore from '../features/feature-toggle/feature-toggle-store';
import FeatureTypeStore from './feature-type-store'; import FeatureTypeStore from './feature-type-store';
import StrategyStore from './strategy-store'; import StrategyStore from './strategy-store';
import ClientInstanceStore from './client-instance-store'; import ClientInstanceStore from './client-instance-store';
@ -18,7 +18,7 @@ import SessionStore from './session-store';
import { AccessStore } from './access-store'; import { AccessStore } from './access-store';
import { ResetTokenStore } from './reset-token-store'; import { ResetTokenStore } from './reset-token-store';
import UserFeedbackStore from './user-feedback-store'; import UserFeedbackStore from './user-feedback-store';
import FeatureStrategyStore from './feature-strategy-store'; import FeatureStrategyStore from '../features/feature-toggle/feature-toggle-strategies-store';
import FeatureToggleClientStore from './feature-toggle-client-store'; import FeatureToggleClientStore from './feature-toggle-client-store';
import EnvironmentStore from './environment-store'; import EnvironmentStore from './environment-store';
import FeatureTagStore from './feature-tag-store'; import FeatureTagStore from './feature-tag-store';

8
src/lib/features/export-import-toggles/createExportImportService.ts
View File

@ -2,14 +2,14 @@ import { Db } from '../../db/db';
import { IUnleashConfig } from '../../types'; import { IUnleashConfig } from '../../types';
import ExportImportService from './export-import-service'; import ExportImportService from './export-import-service';
import { ImportTogglesStore } from './import-toggles-store'; import { ImportTogglesStore } from './import-toggles-store';
import FeatureToggleStore from '../../db/feature-toggle-store'; import FeatureToggleStore from '../feature-toggle/feature-toggle-store';
import TagStore from '../../db/tag-store'; import TagStore from '../../db/tag-store';
import TagTypeStore from '../../db/tag-type-store'; import TagTypeStore from '../../db/tag-type-store';
import ProjectStore from '../../db/project-store'; import ProjectStore from '../../db/project-store';
import FeatureTagStore from '../../db/feature-tag-store'; import FeatureTagStore from '../../db/feature-tag-store';
import StrategyStore from '../../db/strategy-store'; import StrategyStore from '../../db/strategy-store';
import ContextFieldStore from '../../db/context-field-store'; import ContextFieldStore from '../../db/context-field-store';
import FeatureStrategiesStore from '../../db/feature-strategy-store'; import FeatureStrategiesStore from '../feature-toggle/feature-toggle-strategies-store';
import { import {
ContextService, ContextService,
EventService, EventService,
@ -27,7 +27,7 @@ import {
} from '../feature-toggle/createFeatureToggleService'; } from '../feature-toggle/createFeatureToggleService';
import SegmentStore from '../../db/segment-store'; import SegmentStore from '../../db/segment-store';
import { FeatureEnvironmentStore } from '../../db/feature-environment-store'; import { FeatureEnvironmentStore } from '../../db/feature-environment-store';
import FakeFeatureToggleStore from '../../../test/fixtures/fake-feature-toggle-store'; import FakeFeatureToggleStore from '../feature-toggle/fakes/fake-feature-toggle-store';
import FakeTagStore from '../../../test/fixtures/fake-tag-store'; import FakeTagStore from '../../../test/fixtures/fake-tag-store';
import FakeTagTypeStore from '../../../test/fixtures/fake-tag-type-store'; import FakeTagTypeStore from '../../../test/fixtures/fake-tag-type-store';
import FakeSegmentStore from '../../../test/fixtures/fake-segment-store'; import FakeSegmentStore from '../../../test/fixtures/fake-segment-store';
@ -35,7 +35,7 @@ import FakeProjectStore from '../../../test/fixtures/fake-project-store';
import FakeFeatureTagStore from '../../../test/fixtures/fake-feature-tag-store'; import FakeFeatureTagStore from '../../../test/fixtures/fake-feature-tag-store';
import FakeContextFieldStore from '../../../test/fixtures/fake-context-field-store'; import FakeContextFieldStore from '../../../test/fixtures/fake-context-field-store';
import FakeEventStore from '../../../test/fixtures/fake-event-store'; import FakeEventStore from '../../../test/fixtures/fake-event-store';
import FakeFeatureStrategiesStore from '../../../test/fixtures/fake-feature-strategies-store'; import FakeFeatureStrategiesStore from '../feature-toggle/fakes/fake-feature-strategies-store';
import FakeFeatureEnvironmentStore from '../../../test/fixtures/fake-feature-environment-store'; import FakeFeatureEnvironmentStore from '../../../test/fixtures/fake-feature-environment-store';
import FakeStrategiesStore from '../../../test/fixtures/fake-strategies-store'; import FakeStrategiesStore from '../../../test/fixtures/fake-strategies-store';
import EventStore from '../../db/event-store'; import EventStore from '../../db/event-store';

6
src/lib/features/export-import-toggles/export-import-service.ts
View File

@ -9,8 +9,8 @@ import { Logger } from '../../logger';
import { IFeatureTagStore } from '../../types/stores/feature-tag-store'; import { IFeatureTagStore } from '../../types/stores/feature-tag-store';
import { ITagTypeStore } from '../../types/stores/tag-type-store'; import { ITagTypeStore } from '../../types/stores/tag-type-store';
import { IStrategy } from '../../types/stores/strategy-store'; import { IStrategy } from '../../types/stores/strategy-store';
import { IFeatureToggleStore } from '../../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../feature-toggle/types/feature-toggle-store-type';
import { IFeatureStrategiesStore } from '../../types/stores/feature-strategies-store'; import { IFeatureStrategiesStore } from '../feature-toggle/types/feature-toggle-strategies-store-type';
import { IFeatureEnvironmentStore } from '../../types/stores/feature-environment-store'; import { IFeatureEnvironmentStore } from '../../types/stores/feature-environment-store';
import { IContextFieldStore, IUnleashStores } from '../../types/stores'; import { IContextFieldStore, IUnleashStores } from '../../types/stores';
import { ISegmentStore } from '../../types/stores/segment-store'; import { ISegmentStore } from '../../types/stores/segment-store';
@ -48,7 +48,7 @@ import {
import { ImportPermissionsService, Mode } from './import-permissions-service'; import { ImportPermissionsService, Mode } from './import-permissions-service';
import { ImportValidationMessages } from './import-validation-messages'; import { ImportValidationMessages } from './import-validation-messages';
import { findDuplicates } from '../../util/findDuplicates'; import { findDuplicates } from '../../util/findDuplicates';
import { FeatureNameCheckResultWithFeaturePattern } from '../../services/feature-toggle-service'; import { FeatureNameCheckResultWithFeaturePattern } from '../feature-toggle/feature-toggle-service';
export default class ExportImportService { export default class ExportImportService {
private logger: Logger; private logger: Logger;

2
src/lib/features/export-import-toggles/import-validation-messages.ts
View File

@ -3,7 +3,7 @@ import {
ImportTogglesValidateItemSchema, ImportTogglesValidateItemSchema,
} from '../../openapi'; } from '../../openapi';
import { IContextFieldDto } from '../../types/stores/context-field-store'; import { IContextFieldDto } from '../../types/stores/context-field-store';
import { FeatureNameCheckResultWithFeaturePattern } from '../../services/feature-toggle-service'; import { FeatureNameCheckResultWithFeaturePattern } from '../feature-toggle/feature-toggle-service';
import { ProjectFeaturesLimit } from './import-toggles-store-type'; import { ProjectFeaturesLimit } from './import-toggles-store-type';
export interface IErrorsParams { export interface IErrorsParams {

8
src/lib/features/feature-toggle/createFeatureToggleService.ts
View File

@ -4,8 +4,8 @@ import {
FeatureToggleService, FeatureToggleService,
GroupService, GroupService,
} from '../../services'; } from '../../services';
import FeatureStrategiesStore from '../../db/feature-strategy-store'; import FeatureStrategiesStore from './feature-toggle-strategies-store';
import FeatureToggleStore from '../../db/feature-toggle-store'; import FeatureToggleStore from './feature-toggle-store';
import FeatureToggleClientStore from '../../db/feature-toggle-client-store'; import FeatureToggleClientStore from '../../db/feature-toggle-client-store';
import ProjectStore from '../../db/project-store'; import ProjectStore from '../../db/project-store';
import { FeatureEnvironmentStore } from '../../db/feature-environment-store'; import { FeatureEnvironmentStore } from '../../db/feature-environment-store';
@ -18,8 +18,8 @@ import EnvironmentStore from '../../db/environment-store';
import { Db } from '../../db/db'; import { Db } from '../../db/db';
import { IUnleashConfig } from '../../types'; import { IUnleashConfig } from '../../types';
import FakeEventStore from '../../../test/fixtures/fake-event-store'; import FakeEventStore from '../../../test/fixtures/fake-event-store';
import FakeFeatureStrategiesStore from '../../../test/fixtures/fake-feature-strategies-store'; import FakeFeatureStrategiesStore from './fakes/fake-feature-strategies-store';
import FakeFeatureToggleStore from '../../../test/fixtures/fake-feature-toggle-store'; import FakeFeatureToggleStore from './fakes/fake-feature-toggle-store';
import FakeFeatureToggleClientStore from '../../../test/fixtures/fake-feature-toggle-client-store'; import FakeFeatureToggleClientStore from '../../../test/fixtures/fake-feature-toggle-client-store';
import FakeProjectStore from '../../../test/fixtures/fake-project-store'; import FakeProjectStore from '../../../test/fixtures/fake-project-store';
import FakeFeatureEnvironmentStore from '../../../test/fixtures/fake-feature-environment-store'; import FakeFeatureEnvironmentStore from '../../../test/fixtures/fake-feature-environment-store';

8
src/test/fixtures/fake-feature-strategies-store.ts → src/lib/features/feature-toggle/fakes/fake-feature-strategies-store.ts
View File

@ -6,10 +6,10 @@ import {
IFeatureToggleQuery, IFeatureToggleQuery,
IFeatureStrategy, IFeatureStrategy,
FeatureToggle, FeatureToggle,
} from '../../lib/types/model'; } from '../../../types/model';
import NotFoundError from '../../lib/error/notfound-error'; import NotFoundError from '../../../error/notfound-error';
import { IFeatureStrategiesStore } from '../../lib/types/stores/feature-strategies-store'; import { IFeatureStrategiesStore } from '../types/feature-toggle-strategies-store-type';
import { IFeatureProjectUserParams } from '../../lib/routes/admin-api/project/project-features'; import { IFeatureProjectUserParams } from '../feature-toggle-controller';
interface ProjectEnvironment { interface ProjectEnvironment {
projectName: string; projectName: string;

8
src/test/fixtures/fake-feature-toggle-store.ts → src/lib/features/feature-toggle/fakes/fake-feature-toggle-store.ts
View File

@ -1,16 +1,16 @@
import { import {
IFeatureToggleQuery, IFeatureToggleQuery,
IFeatureToggleStore, IFeatureToggleStore,
} from '../../lib/types/stores/feature-toggle-store'; } from '../types/feature-toggle-store-type';
import NotFoundError from '../../lib/error/notfound-error'; import NotFoundError from '../../../error/notfound-error';
import { import {
FeatureToggle, FeatureToggle,
FeatureToggleDTO, FeatureToggleDTO,
IFeatureEnvironment, IFeatureEnvironment,
IVariant, IVariant,
} from 'lib/types/model'; } from 'lib/types/model';
import { LastSeenInput } from '../../lib/services/client-metrics/last-seen/last-seen-service'; import { LastSeenInput } from '../../../services/client-metrics/last-seen/last-seen-service';
import { EnvironmentFeatureNames } from '../../lib/db/feature-toggle-store'; import { EnvironmentFeatureNames } from '../feature-toggle-store';
export default class FakeFeatureToggleStore implements IFeatureToggleStore { export default class FakeFeatureToggleStore implements IFeatureToggleStore {
features: FeatureToggle[] = []; features: FeatureToggle[] = [];

25
src/lib/routes/admin-api/project/project-features.ts → src/lib/features/feature-toggle/feature-toggle-controller.ts
View File

@ -1,6 +1,6 @@
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import { applyPatch, Operation } from 'fast-json-patch'; import { applyPatch, Operation } from 'fast-json-patch';
import Controller from '../../controller'; import Controller from '../../routes/controller';
import { import {
CREATE_FEATURE, CREATE_FEATURE,
CREATE_FEATURE_STRATEGY, CREATE_FEATURE_STRATEGY,
@ -14,10 +14,10 @@ import {
UPDATE_FEATURE, UPDATE_FEATURE,
UPDATE_FEATURE_ENVIRONMENT, UPDATE_FEATURE_ENVIRONMENT,
UPDATE_FEATURE_STRATEGY, UPDATE_FEATURE_STRATEGY,
} from '../../../types'; } from '../../types';
import { Logger } from '../../../logger'; import { Logger } from '../../logger';
import { extractUsername } from '../../../util'; import { extractUsername } from '../../util';
import { IAuthRequest } from '../../unleash-types'; import { IAuthRequest } from '../../routes/unleash-types';
import { import {
AdminFeaturesQuerySchema, AdminFeaturesQuerySchema,
BulkToggleFeaturesSchema, BulkToggleFeaturesSchema,
@ -40,19 +40,16 @@ import {
TagSchema, TagSchema,
UpdateFeatureSchema, UpdateFeatureSchema,
UpdateFeatureStrategySchema, UpdateFeatureStrategySchema,
} from '../../../openapi'; } from '../../openapi';
import { import {
FeatureTagService, FeatureTagService,
FeatureToggleService, FeatureToggleService,
OpenApiService, OpenApiService,
} from '../../../services'; } from '../../services';
import { querySchema } from '../../../schema/feature-schema'; import { querySchema } from '../../schema/feature-schema';
import { BatchStaleSchema } from '../../../openapi/spec/batch-stale-schema'; import { BatchStaleSchema } from '../../openapi/spec/batch-stale-schema';
import { import { TransactionCreator, UnleashTransaction } from '../../db/transaction';
TransactionCreator, import { BadDataError } from '../../error';
UnleashTransaction,
} from '../../../db/transaction';
import { BadDataError } from '../../../error';
interface FeatureStrategyParams { interface FeatureStrategyParams {
projectId: string; projectId: string;

44
src/lib/services/feature-toggle-service.ts → src/lib/features/feature-toggle/feature-toggle-service.ts
View File

@ -45,36 +45,36 @@ import {
StrategyIds, StrategyIds,
Unsaved, Unsaved,
WeightType, WeightType,
} from '../types'; } from '../../types';
import { Logger } from '../logger'; import { Logger } from '../../logger';
import { import {
ForbiddenError, ForbiddenError,
FOREIGN_KEY_VIOLATION, FOREIGN_KEY_VIOLATION,
OperationDeniedError, OperationDeniedError,
PatternError, PatternError,
PermissionError, PermissionError,
} from '../error'; } from '../../error';
import BadDataError from '../error/bad-data-error'; import BadDataError from '../../error/bad-data-error';
import NameExistsError from '../error/name-exists-error'; import NameExistsError from '../../error/name-exists-error';
import InvalidOperationError from '../error/invalid-operation-error'; import InvalidOperationError from '../../error/invalid-operation-error';
import { import {
constraintSchema, constraintSchema,
featureMetadataSchema, featureMetadataSchema,
nameSchema, nameSchema,
variantsArraySchema, variantsArraySchema,
} from '../schema/feature-schema'; } from '../../schema/feature-schema';
import NotFoundError from '../error/notfound-error'; import NotFoundError from '../../error/notfound-error';
import { import {
FeatureConfigurationClient, FeatureConfigurationClient,
IFeatureStrategiesStore, IFeatureStrategiesStore,
} from '../types/stores/feature-strategies-store'; } from './types/feature-toggle-strategies-store-type';
import { import {
DATE_OPERATORS, DATE_OPERATORS,
DEFAULT_ENV, DEFAULT_ENV,
NUM_OPERATORS, NUM_OPERATORS,
SEMVER_OPERATORS, SEMVER_OPERATORS,
STRING_OPERATORS, STRING_OPERATORS,
} from '../util'; } from '../../util';
import { applyPatch, deepClone, Operation } from 'fast-json-patch'; import { applyPatch, deepClone, Operation } from 'fast-json-patch';
import { import {
validateDate, validateDate,
@ -82,24 +82,24 @@ import {
validateNumber, validateNumber,
validateSemver, validateSemver,
validateString, validateString,
} from '../util/validators/constraint-types'; } from '../../util/validators/constraint-types';
import { IContextFieldStore } from 'lib/types/stores/context-field-store'; import { IContextFieldStore } from 'lib/types/stores/context-field-store';
import { SetStrategySortOrderSchema } from 'lib/openapi/spec/set-strategy-sort-order-schema'; import { SetStrategySortOrderSchema } from 'lib/openapi/spec/set-strategy-sort-order-schema';
import { import {
getDefaultStrategy, getDefaultStrategy,
getProjectDefaultStrategy, getProjectDefaultStrategy,
} from '../features/playground/feature-evaluator/helpers'; } from '../playground/feature-evaluator/helpers';
import { AccessService } from './access-service'; import { AccessService } from '../../services/access-service';
import { User } from '../server-impl'; import { User } from '../../server-impl';
import { IFeatureProjectUserParams } from '../routes/admin-api/project/project-features'; import { IFeatureProjectUserParams } from './feature-toggle-controller';
import { unique } from '../util/unique'; import { unique } from '../../util/unique';
import { ISegmentService } from 'lib/segments/segment-service-interface'; import { ISegmentService } from 'lib/segments/segment-service-interface';
import { IChangeRequestAccessReadModel } from '../features/change-request-access-service/change-request-access-read-model'; import { IChangeRequestAccessReadModel } from '../change-request-access-service/change-request-access-read-model';
import { checkFeatureFlagNamesAgainstPattern } from '../features/feature-naming-pattern/feature-naming-validation'; import { checkFeatureFlagNamesAgainstPattern } from '../feature-naming-pattern/feature-naming-validation';
import { IPrivateProjectChecker } from '../features/private-project/privateProjectCheckerType'; import { IPrivateProjectChecker } from '../private-project/privateProjectCheckerType';
import { IDependentFeaturesReadModel } from '../features/dependent-features/dependent-features-read-model-type'; import { IDependentFeaturesReadModel } from '../dependent-features/dependent-features-read-model-type';
import EventService from './event-service'; import EventService from '../../services/event-service';
import { DependentFeaturesService } from '../features/dependent-features/dependent-features-service'; import { DependentFeaturesService } from '../dependent-features/dependent-features-service';
interface IFeatureContext { interface IFeatureContext {
featureName: string; featureName: string;

18
src/lib/db/feature-toggle-store.ts → src/lib/features/feature-toggle/feature-toggle-store.ts
View File

@ -1,14 +1,14 @@
import { Knex } from 'knex'; import { Knex } from 'knex';
import EventEmitter from 'events'; import EventEmitter from 'events';
import metricsHelper from '../util/metrics-helper'; import metricsHelper from '../../util/metrics-helper';
import { DB_TIME } from '../metric-events'; import { DB_TIME } from '../../metric-events';
import NotFoundError from '../error/notfound-error'; import NotFoundError from '../../error/notfound-error';
import { Logger, LogProvider } from '../logger'; import { Logger, LogProvider } from '../../logger';
import { FeatureToggle, FeatureToggleDTO, IVariant } from '../types/model'; import { FeatureToggle, FeatureToggleDTO, IVariant } from '../../types/model';
import { IFeatureToggleStore } from '../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from './types/feature-toggle-store-type';
import { Db } from './db'; import { Db } from '../../db/db';
import { LastSeenInput } from '../services/client-metrics/last-seen/last-seen-service'; import { LastSeenInput } from '../../services/client-metrics/last-seen/last-seen-service';
import { NameExistsError } from '../error'; import { NameExistsError } from '../../error';
export type EnvironmentFeatureNames = { [key: string]: string[] }; export type EnvironmentFeatureNames = { [key: string]: string[] };

16
src/lib/db/feature-strategy-store.ts → src/lib/features/feature-toggle/feature-toggle-strategies-store.ts
View File

@ -1,10 +1,10 @@
import { Knex } from 'knex'; import { Knex } from 'knex';
import EventEmitter from 'events'; import EventEmitter from 'events';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import metricsHelper from '../util/metrics-helper'; import metricsHelper from '../../util/metrics-helper';
import { DB_TIME } from '../metric-events'; import { DB_TIME } from '../../metric-events';
import { Logger, LogProvider } from '../logger'; import { Logger, LogProvider } from '../../logger';
import NotFoundError from '../error/notfound-error'; import NotFoundError from '../../error/notfound-error';
import { import {
FeatureToggleWithEnvironment, FeatureToggleWithEnvironment,
IConstraint, IConstraint,
@ -19,11 +19,11 @@ import {
ITag, ITag,
PartialDeep, PartialDeep,
PartialSome, PartialSome,
} from '../types'; } from '../../types';
import FeatureToggleStore from './feature-toggle-store'; import FeatureToggleStore from './feature-toggle-store';
import { ensureStringValue, mapValues } from '../util'; import { ensureStringValue, mapValues } from '../../util';
import { IFeatureProjectUserParams } from '../routes/admin-api/project/project-features'; import { IFeatureProjectUserParams } from './feature-toggle-controller';
import { Db } from './db'; import { Db } from '../../db/db';
import Raw = Knex.Raw; import Raw = Knex.Raw;
const COLUMNS = [ const COLUMNS = [

42
src/lib/routes/admin-api/feature.ts → src/lib/features/feature-toggle/legacy/feature-toggle-legacy-controller.ts
View File

@ -1,35 +1,35 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import Controller from '../controller'; import Controller from '../../../routes/controller';
import { extractUsername } from '../../util/extract-user'; import { extractUsername } from '../../../util/extract-user';
import { NONE, UPDATE_FEATURE } from '../../types/permissions'; import { NONE, UPDATE_FEATURE } from '../../../types/permissions';
import { IUnleashConfig } from '../../types/option'; import { IUnleashConfig } from '../../../types/option';
import { IUnleashServices } from '../../types'; import { IUnleashServices } from '../../../types';
import FeatureToggleService from '../../services/feature-toggle-service'; import FeatureToggleService from '../feature-toggle-service';
import { featureSchema, querySchema } from '../../schema/feature-schema'; import { featureSchema, querySchema } from '../../../schema/feature-schema';
import { IFeatureToggleQuery } from '../../types/model'; import { IFeatureToggleQuery } from '../../../types/model';
import FeatureTagService from '../../services/feature-tag-service'; import FeatureTagService from '../../../services/feature-tag-service';
import { IAuthRequest } from '../unleash-types'; import { IAuthRequest } from '../../../routes/unleash-types';
import { DEFAULT_ENV } from '../../util/constants'; import { DEFAULT_ENV } from '../../../util/constants';
import { import {
featuresSchema, featuresSchema,
FeaturesSchema, FeaturesSchema,
} from '../../openapi/spec/features-schema'; } from '../../../openapi/spec/features-schema';
import { TagSchema } from '../../openapi/spec/tag-schema'; import { TagSchema } from '../../../openapi/spec/tag-schema';
import { TagsSchema } from '../../openapi/spec/tags-schema'; import { TagsSchema } from '../../../openapi/spec/tags-schema';
import { serializeDates } from '../../types/serialize-dates'; import { serializeDates } from '../../../types/serialize-dates';
import { OpenApiService } from '../../services/openapi-service'; import { OpenApiService } from '../../../services/openapi-service';
import { createRequestSchema } from '../../openapi/util/create-request-schema'; import { createRequestSchema } from '../../../openapi/util/create-request-schema';
import { import {
createResponseSchema, createResponseSchema,
resourceCreatedResponseSchema, resourceCreatedResponseSchema,
} from '../../openapi/util/create-response-schema'; } from '../../../openapi/util/create-response-schema';
import { import {
emptyResponse, emptyResponse,
getStandardResponses, getStandardResponses,
} from '../../openapi/util/standard-responses'; } from '../../../openapi/util/standard-responses';
import { UpdateTagsSchema } from '../../openapi/spec/update-tags-schema'; import { UpdateTagsSchema } from '../../../openapi/spec/update-tags-schema';
import { ValidateFeatureSchema } from '../../openapi/spec/validate-feature-schema'; import { ValidateFeatureSchema } from '../../../openapi/spec/validate-feature-schema';
const version = 1; const version = 1;

31
src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts → src/lib/features/feature-toggle/tests/feature-toggle-service.e2e.test.ts
View File

@ -1,30 +1,23 @@
import FeatureToggleService from '../../../lib/services/feature-toggle-service'; import FeatureToggleService from '../feature-toggle-service';
import { createTestConfig } from '../../config/test-config'; import { createTestConfig } from '../../../../test/config/test-config';
import dbInit from '../helpers/database-init'; import dbInit from '../../../../test/e2e/helpers/database-init';
import { DEFAULT_ENV } from '../../../lib/util'; import { DEFAULT_ENV } from '../../../util';
import { FeatureStrategySchema } from '../../../lib/openapi'; import { FeatureStrategySchema } from '../../../openapi';
import User from '../../../lib/types/user'; import User from '../../../types/user';
import { import {
IConstraint, IConstraint,
IUnleashStores, IUnleashStores,
IVariant, IVariant,
SKIP_CHANGE_REQUEST, SKIP_CHANGE_REQUEST,
} from '../../../lib/types'; } from '../../../types';
import EnvironmentService from '../../../lib/services/environment-service'; import EnvironmentService from '../../../services/environment-service';
import { import { ForbiddenError, PatternError, PermissionError } from '../../../error';
ForbiddenError, import { ISegmentService } from '../../../segments/segment-service-interface';
PatternError, import { createFeatureToggleService, createSegmentService } from '../..';
PermissionError,
} from '../../../lib/error';
import { ISegmentService } from '../../../lib/segments/segment-service-interface';
import {
createFeatureToggleService,
createSegmentService,
} from '../../../lib/features';
import { import {
insertFeatureEnvironmentsLastSeen, insertFeatureEnvironmentsLastSeen,
insertLastSeenAt, insertLastSeenAt,
} from '../api/admin/project/projects.e2e.test'; } from '../../../../test/e2e/api/admin/project/projects.e2e.test';
let stores: IUnleashStores; let stores: IUnleashStores;
let db; let db;

6
src/test/e2e/stores/feature-toggle-store.e2e.test.ts → src/lib/features/feature-toggle/tests/feature-toggle-store.e2e.test.ts
View File

@ -1,6 +1,6 @@
import dbInit from '../helpers/database-init'; import dbInit from '../../../../test/e2e/helpers/database-init';
import getLogger from '../../fixtures/no-logger'; import getLogger from '../../../../test/fixtures/no-logger';
import { FeatureToggleDTO, IFeatureToggleStore } from '../../../lib/types'; import { FeatureToggleDTO, IFeatureToggleStore } from '../../../types';
let stores; let stores;
let db; let db;

8
src/test/e2e/stores/feature-strategies-store.e2e.test.ts → src/lib/features/feature-toggle/tests/feature-toggle-strategies-store.e2e.test.ts
View File

@ -1,7 +1,7 @@
import { IFeatureStrategiesStore } from 'lib/types/stores/feature-strategies-store'; import { IFeatureStrategiesStore } from 'lib/features/feature-toggle/types/feature-toggle-strategies-store-type';
import { IFeatureToggleStore } from 'lib/types/stores/feature-toggle-store'; import { IFeatureToggleStore } from 'lib/features/feature-toggle/types/feature-toggle-store-type';
import dbInit from '../helpers/database-init'; import dbInit from '../../../../test/e2e/helpers/database-init';
import getLogger from '../../fixtures/no-logger'; import getLogger from '../../../../test/fixtures/no-logger';
let stores; let stores;
let db; let db;

13
src/test/e2e/api/admin/project/features.auth.e2e.test.ts → src/lib/features/feature-toggle/tests/feature-toggles.auth.e2e.test.ts
View File

@ -1,8 +1,11 @@
import dbInit, { ITestDb } from '../../../helpers/database-init'; import dbInit, { ITestDb } from '../../../../test/e2e/helpers/database-init';
import { IUnleashTest, setupAppWithAuth } from '../../../helpers/test-helper'; import {
import getLogger from '../../../../fixtures/no-logger'; IUnleashTest,
import { DEFAULT_ENV } from '../../../../../lib/util'; setupAppWithAuth,
import { RoleName, CREATE_FEATURE_STRATEGY } from '../../../../../lib/types'; } from '../../../../test/e2e/helpers/test-helper';
import getLogger from '../../../../test/fixtures/no-logger';
import { DEFAULT_ENV } from '../../../util';
import { RoleName, CREATE_FEATURE_STRATEGY } from '../../../types';
let app: IUnleashTest; let app: IUnleashTest;
let db: ITestDb; let db: ITestDb;

24
src/test/e2e/api/admin/project/features.e2e.test.ts → src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts
View File

@ -1,10 +1,10 @@
import dbInit, { ITestDb } from '../../../helpers/database-init'; import dbInit, { ITestDb } from '../../../../test/e2e/helpers/database-init';
import { import {
IUnleashTest, IUnleashTest,
setupAppWithCustomConfig, setupAppWithCustomConfig,
} from '../../../helpers/test-helper'; } from '../../../../test/e2e/helpers/test-helper';
import getLogger from '../../../../fixtures/no-logger'; import getLogger from '../../../../test/fixtures/no-logger';
import { DEFAULT_ENV } from '../../../../../lib/util/constants'; import { DEFAULT_ENV } from '../../../util/constants';
import { import {
FEATURE_ENVIRONMENT_DISABLED, FEATURE_ENVIRONMENT_DISABLED,
FEATURE_ENVIRONMENT_ENABLED, FEATURE_ENVIRONMENT_ENABLED,
@ -12,22 +12,22 @@ import {
FEATURE_STALE_OFF, FEATURE_STALE_OFF,
FEATURE_STALE_ON, FEATURE_STALE_ON,
FEATURE_STRATEGY_REMOVE, FEATURE_STRATEGY_REMOVE,
} from '../../../../../lib/types/events'; } from '../../../types/events';
import ApiUser from '../../../../../lib/types/api-user'; import ApiUser from '../../../types/api-user';
import { ApiTokenType } from '../../../../../lib/types/models/api-token'; import { ApiTokenType } from '../../../types/models/api-token';
import IncompatibleProjectError from '../../../../../lib/error/incompatible-project-error'; import IncompatibleProjectError from '../../../error/incompatible-project-error';
import { import {
IStrategyConfig, IStrategyConfig,
IVariant, IVariant,
RoleName, RoleName,
WeightType, WeightType,
} from '../../../../../lib/types/model'; } from '../../../types/model';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import supertest from 'supertest'; import supertest from 'supertest';
import { randomId } from '../../../../../lib/util/random-id'; import { randomId } from '../../../util/random-id';
import { DEFAULT_PROJECT } from '../../../../../lib/types'; import { DEFAULT_PROJECT } from '../../../types';
import { FeatureStrategySchema, SetStrategySortOrderSchema } from 'lib/openapi'; import { FeatureStrategySchema, SetStrategySortOrderSchema } from 'lib/openapi';
import { ForbiddenError } from '../../../../../lib/error'; import { ForbiddenError } from '../../../error';
let app: IUnleashTest; let app: IUnleashTest;
let db: ITestDb; let db: ITestDb;

10
src/lib/types/stores/feature-toggle-store.ts → src/lib/features/feature-toggle/types/feature-toggle-store-type.ts
View File

@ -1,6 +1,10 @@
import { FeatureToggle, FeatureToggleDTO, IVariant } from '../model'; import {
import { Store } from './store'; FeatureToggle,
import { LastSeenInput } from '../../services/client-metrics/last-seen/last-seen-service'; FeatureToggleDTO,
IVariant,
} from '../../../types/model';
import { Store } from '../../../types/stores/store';
import { LastSeenInput } from '../../../services/client-metrics/last-seen/last-seen-service';
export interface IFeatureToggleQuery { export interface IFeatureToggleQuery {
archived: boolean; archived: boolean;

6
src/lib/types/stores/feature-strategies-store.ts → src/lib/features/feature-toggle/types/feature-toggle-strategies-store-type.ts
View File

@ -5,9 +5,9 @@ import {
IFeatureStrategy, IFeatureStrategy,
IStrategyConfig, IStrategyConfig,
IVariant, IVariant,
} from '../model'; } from '../../../types/model';
import { Store } from './store'; import { Store } from '../../../types/stores/store';
import { IFeatureProjectUserParams } from '../../routes/admin-api/project/project-features'; import { IFeatureProjectUserParams } from '../feature-toggle-controller';
export interface FeatureConfigurationClient { export interface FeatureConfigurationClient {
name: string; name: string;

2
src/lib/features/instance-stats/instance-stats-service.ts
View File

@ -8,7 +8,7 @@ import {
} from '../../types/stores'; } from '../../types/stores';
import { IContextFieldStore } from '../../types/stores/context-field-store'; import { IContextFieldStore } from '../../types/stores/context-field-store';
import { IEnvironmentStore } from '../../types/stores/environment-store'; import { IEnvironmentStore } from '../../types/stores/environment-store';
import { IFeatureToggleStore } from '../../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../feature-toggle/types/feature-toggle-store-type';
import { IGroupStore } from '../../types/stores/group-store'; import { IGroupStore } from '../../types/stores/group-store';
import { IProjectStore } from '../../types/stores/project-store'; import { IProjectStore } from '../../types/stores/project-store';
import { IStrategyStore } from '../../types/stores/strategy-store'; import { IStrategyStore } from '../../types/stores/strategy-store';

2
src/lib/features/playground/offline-unleash-client.ts
View File

@ -1,6 +1,6 @@
import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema'; import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema';
import { InMemStorageProvider, FeatureEvaluator } from './feature-evaluator'; import { InMemStorageProvider, FeatureEvaluator } from './feature-evaluator';
import { FeatureConfigurationClient } from 'lib/types/stores/feature-strategies-store'; import { FeatureConfigurationClient } from 'lib/features/feature-toggle/types/feature-toggle-strategies-store-type';
import { Segment } from './feature-evaluator/strategy/strategy'; import { Segment } from './feature-evaluator/strategy/strategy';
import { ISegment } from 'lib/types/model'; import { ISegment } from 'lib/types/model';
import { serializeDates } from '../../types/serialize-dates'; import { serializeDates } from '../../types/serialize-dates';

4
src/lib/features/playground/playground-service.ts
View File

@ -1,4 +1,4 @@
import FeatureToggleService from '../../services/feature-toggle-service'; import FeatureToggleService from '../feature-toggle/feature-toggle-service';
import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema'; import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema';
import { IUnleashServices } from 'lib/types/services'; import { IUnleashServices } from 'lib/types/services';
import { ALL } from '../../types/models/api-token'; import { ALL } from '../../types/models/api-token';
@ -12,7 +12,7 @@ import {
FeatureStrategiesEvaluationResult, FeatureStrategiesEvaluationResult,
} from 'lib/features/playground/feature-evaluator/client'; } from 'lib/features/playground/feature-evaluator/client';
import { ISegmentService } from 'lib/segments/segment-service-interface'; import { ISegmentService } from 'lib/segments/segment-service-interface';
import { FeatureConfigurationClient } from '../../types/stores/feature-strategies-store'; import { FeatureConfigurationClient } from '../feature-toggle/types/feature-toggle-strategies-store-type';
import { generateObjectCombinations } from './generateObjectCombinations'; import { generateObjectCombinations } from './generateObjectCombinations';
import groupBy from 'lodash.groupby'; import groupBy from 'lodash.groupby';
import { omitKeys } from '../../util'; import { omitKeys } from '../../util';

4
src/lib/features/project/createProjectService.ts
View File

@ -13,7 +13,7 @@ import {
import FakeGroupStore from '../../../test/fixtures/fake-group-store'; import FakeGroupStore from '../../../test/fixtures/fake-group-store';
import FakeEventStore from '../../../test/fixtures/fake-event-store'; import FakeEventStore from '../../../test/fixtures/fake-event-store';
import ProjectStore from '../../db/project-store'; import ProjectStore from '../../db/project-store';
import FeatureToggleStore from '../../db/feature-toggle-store'; import FeatureToggleStore from '../feature-toggle/feature-toggle-store';
import FeatureTypeStore from '../../db/feature-type-store'; import FeatureTypeStore from '../../db/feature-type-store';
import { FeatureEnvironmentStore } from '../../db/feature-environment-store'; import { FeatureEnvironmentStore } from '../../db/feature-environment-store';
import ProjectStatsStore from '../../db/project-stats-store'; import ProjectStatsStore from '../../db/project-stats-store';
@ -28,7 +28,7 @@ import {
import { FavoriteFeaturesStore } from '../../db/favorite-features-store'; import { FavoriteFeaturesStore } from '../../db/favorite-features-store';
import { FavoriteProjectsStore } from '../../db/favorite-projects-store'; import { FavoriteProjectsStore } from '../../db/favorite-projects-store';
import FakeProjectStore from '../../../test/fixtures/fake-project-store'; import FakeProjectStore from '../../../test/fixtures/fake-project-store';
import FakeFeatureToggleStore from '../../../test/fixtures/fake-feature-toggle-store'; import FakeFeatureToggleStore from '../feature-toggle/fakes/fake-feature-toggle-store';
import FakeFeatureTypeStore from '../../../test/fixtures/fake-feature-type-store'; import FakeFeatureTypeStore from '../../../test/fixtures/fake-feature-type-store';
import FakeEnvironmentStore from '../../../test/fixtures/fake-environment-store'; import FakeEnvironmentStore from '../../../test/fixtures/fake-environment-store';
import FakeFeatureEnvironmentStore from '../../../test/fixtures/fake-feature-environment-store'; import FakeFeatureEnvironmentStore from '../../../test/fixtures/fake-feature-environment-store';

4
src/lib/features/segment/createSegmentService.ts
View File

@ -3,10 +3,10 @@ import EventStore from '../../db/event-store';
import { EventService, SegmentService } from '../../services'; import { EventService, SegmentService } from '../../services';
import FakeEventStore from '../../../test/fixtures/fake-event-store'; import FakeEventStore from '../../../test/fixtures/fake-event-store';
import { ISegmentService } from '../../segments/segment-service-interface'; import { ISegmentService } from '../../segments/segment-service-interface';
import FeatureStrategiesStore from '../../db/feature-strategy-store'; import FeatureStrategiesStore from '../feature-toggle/feature-toggle-strategies-store';
import SegmentStore from '../../db/segment-store'; import SegmentStore from '../../db/segment-store';
import FakeSegmentStore from '../../../test/fixtures/fake-segment-store'; import FakeSegmentStore from '../../../test/fixtures/fake-segment-store';
import FakeFeatureStrategiesStore from '../../../test/fixtures/fake-feature-strategies-store'; import FakeFeatureStrategiesStore from '../feature-toggle/fakes/fake-feature-strategies-store';
import { import {
createChangeRequestAccessReadModel, createChangeRequestAccessReadModel,
createFakeChangeRequestAccessService, createFakeChangeRequestAccessService,

4
src/lib/middleware/rbac-middleware.test.ts
View File

@ -4,8 +4,8 @@ import * as perms from '../types/permissions';
import { IUnleashConfig } from '../types/option'; import { IUnleashConfig } from '../types/option';
import { createTestConfig } from '../../test/config/test-config'; import { createTestConfig } from '../../test/config/test-config';
import ApiUser from '../types/api-user'; import ApiUser from '../types/api-user';
import { IFeatureToggleStore } from '../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../features/feature-toggle/types/feature-toggle-store-type';
import FakeFeatureToggleStore from '../../test/fixtures/fake-feature-toggle-store'; import FakeFeatureToggleStore from '../features/feature-toggle/fakes/fake-feature-toggle-store';
import { ApiTokenType } from '../types/models/api-token'; import { ApiTokenType } from '../types/models/api-token';
let config: IUnleashConfig; let config: IUnleashConfig;

2
src/lib/routes/admin-api/archive.ts
View File

@ -4,7 +4,7 @@ import { IUnleashServices } from '../../types';
import Controller from '../controller'; import Controller from '../controller';
import { extractUsername } from '../../util/extract-user'; import { extractUsername } from '../../util/extract-user';
import { DELETE_FEATURE, NONE, UPDATE_FEATURE } from '../../types/permissions'; import { DELETE_FEATURE, NONE, UPDATE_FEATURE } from '../../types/permissions';
import FeatureToggleService from '../../services/feature-toggle-service'; import FeatureToggleService from '../../features/feature-toggle/feature-toggle-service';
import { IAuthRequest } from '../unleash-types'; import { IAuthRequest } from '../unleash-types';
import { import {
featuresSchema, featuresSchema,

2
src/lib/routes/admin-api/constraints.ts
View File

@ -1,5 +1,5 @@
import { Request, Response } from 'express'; import { Request, Response } from 'express';
import FeatureToggleService from '../../services/feature-toggle-service'; import FeatureToggleService from '../../features/feature-toggle/feature-toggle-service';
import { IUnleashConfig } from '../../types/option'; import { IUnleashConfig } from '../../types/option';
import { IUnleashServices } from '../../types'; import { IUnleashServices } from '../../types';
import { NONE } from '../../types/permissions'; import { NONE } from '../../types/permissions';

2
src/lib/routes/admin-api/index.ts
View File

@ -1,6 +1,6 @@
import Controller from '../controller'; import Controller from '../controller';
import { IUnleashServices, IUnleashConfig } from '../../types'; import { IUnleashServices, IUnleashConfig } from '../../types';
import FeatureController from './feature'; import FeatureController from '../../features/feature-toggle/legacy/feature-toggle-legacy-controller';
import { FeatureTypeController } from './feature-type'; import { FeatureTypeController } from './feature-type';
import ArchiveController from './archive'; import ArchiveController from './archive';
import StrategyController from './strategy'; import StrategyController from './strategy';

1
src/lib/routes/admin-api/project/api-token.ts
View File

@ -151,7 +151,6 @@ export class ProjectApiTokenController extends Controller {
const { projectId } = req.params; const { projectId } = req.params;
const project = await this.projectService.getProject(projectId); // Validates that the project exists const project = await this.projectService.getProject(projectId); // Validates that the project exists
console.log('project', project);
const projectTokens = await this.accessibleTokens(user, projectId); const projectTokens = await this.accessibleTokens(user, projectId);
this.openApiService.respondWithValidation( this.openApiService.respondWithValidation(
200, 200,

2
src/lib/routes/admin-api/project/index.ts
View File

@ -8,7 +8,7 @@ import {
NONE, NONE,
serializeDates, serializeDates,
} from '../../../types'; } from '../../../types';
import ProjectFeaturesController from './project-features'; import ProjectFeaturesController from '../../../features/feature-toggle/feature-toggle-controller';
import EnvironmentsController from './environments'; import EnvironmentsController from './environments';
import ProjectHealthReport from './health-report'; import ProjectHealthReport from './health-report';
import ProjectService from '../../../services/project-service'; import ProjectService from '../../../services/project-service';

2
src/lib/routes/admin-api/project/project-archive.ts
View File

@ -9,7 +9,7 @@ import {
import { Logger } from '../../../logger'; import { Logger } from '../../../logger';
import { extractUsername } from '../../../util/extract-user'; import { extractUsername } from '../../../util/extract-user';
import { DELETE_FEATURE } from '../../../types/permissions'; import { DELETE_FEATURE } from '../../../types/permissions';
import FeatureToggleService from '../../../services/feature-toggle-service'; import FeatureToggleService from '../../../features/feature-toggle/feature-toggle-service';
import { IAuthRequest } from '../../unleash-types'; import { IAuthRequest } from '../../unleash-types';
import { OpenApiService } from '../../../services/openapi-service'; import { OpenApiService } from '../../../services/openapi-service';
import { import {

2
src/lib/routes/admin-api/project/variants.ts
View File

@ -1,4 +1,4 @@
import FeatureToggleService from '../../../services/feature-toggle-service'; import FeatureToggleService from '../../../features/feature-toggle/feature-toggle-service';
import { Logger } from '../../../logger'; import { Logger } from '../../../logger';
import Controller from '../../controller'; import Controller from '../../controller';
import { IUnleashConfig } from '../../../types/option'; import { IUnleashConfig } from '../../../types/option';

4
src/lib/routes/client-api/feature.ts
View File

@ -4,7 +4,7 @@ import { Response } from 'express';
import hashSum from 'hash-sum'; import hashSum from 'hash-sum';
import Controller from '../controller'; import Controller from '../controller';
import { IClientSegment, IUnleashConfig, IUnleashServices } from '../../types'; import { IClientSegment, IUnleashConfig, IUnleashServices } from '../../types';
import FeatureToggleService from '../../services/feature-toggle-service'; import FeatureToggleService from '../../features/feature-toggle/feature-toggle-service';
import { Logger } from '../../logger'; import { Logger } from '../../logger';
import { querySchema } from '../../schema/feature-schema'; import { querySchema } from '../../schema/feature-schema';
import { IFeatureToggleQuery } from '../../types/model'; import { IFeatureToggleQuery } from '../../types/model';
@ -12,7 +12,7 @@ import NotFoundError from '../../error/notfound-error';
import { IAuthRequest } from '../unleash-types'; import { IAuthRequest } from '../unleash-types';
import ApiUser from '../../types/api-user'; import ApiUser from '../../types/api-user';
import { ALL, isAllProjects } from '../../types/models/api-token'; import { ALL, isAllProjects } from '../../types/models/api-token';
import { FeatureConfigurationClient } from '../../types/stores/feature-strategies-store'; import { FeatureConfigurationClient } from '../../features/feature-toggle/types/feature-toggle-strategies-store-type';
import { ClientSpecService } from '../../services/client-spec-service'; import { ClientSpecService } from '../../services/client-spec-service';
import { OpenApiService } from '../../services/openapi-service'; import { OpenApiService } from '../../services/openapi-service';
import { NONE } from '../../types/permissions'; import { NONE } from '../../types/permissions';

2
src/lib/services/addon-service.ts
View File

@ -4,7 +4,7 @@ import { getAddons, IAddonProviders } from '../addons';
import * as events from '../types/events'; import * as events from '../types/events';
import { addonSchema } from './addon-schema'; import { addonSchema } from './addon-schema';
import NameExistsError from '../error/name-exists-error'; import NameExistsError from '../error/name-exists-error';
import { IFeatureToggleStore } from '../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../features/feature-toggle/types/feature-toggle-store-type';
import { Logger } from '../logger'; import { Logger } from '../logger';
import TagTypeService from './tag-type-service'; import TagTypeService from './tag-type-service';
import { IAddon, IAddonDto, IAddonStore } from '../types/stores/addon-store'; import { IAddon, IAddonDto, IAddonStore } from '../types/stores/addon-store';

2
src/lib/services/client-metrics/instance-service.ts
View File

@ -7,7 +7,7 @@ import {
IClientApplication, IClientApplication,
IClientApplicationsStore, IClientApplicationsStore,
} from '../../types/stores/client-applications-store'; } from '../../types/stores/client-applications-store';
import { IFeatureToggleStore } from '../../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../../features/feature-toggle/types/feature-toggle-store-type';
import { IStrategyStore } from '../../types/stores/strategy-store'; import { IStrategyStore } from '../../types/stores/strategy-store';
import { IClientInstanceStore } from '../../types/stores/client-instance-store'; import { IClientInstanceStore } from '../../types/stores/client-instance-store';
import { IApplicationQuery } from '../../types/query'; import { IApplicationQuery } from '../../types/query';

4
src/lib/services/client-metrics/last-seen/createLastSeenService.ts
View File

@ -1,5 +1,5 @@
import FakeFeatureToggleStore from '../../../../test/fixtures/fake-feature-toggle-store'; import FakeFeatureToggleStore from '../../../features/feature-toggle/fakes/fake-feature-toggle-store';
import FeatureToggleStore from '../../../db/feature-toggle-store'; import FeatureToggleStore from '../../../features/feature-toggle/feature-toggle-store';
import { Db, IUnleashConfig } from '../../../server-impl'; import { Db, IUnleashConfig } from '../../../server-impl';
import { FakeLastSeenStore } from './fake-last-seen-store'; import { FakeLastSeenStore } from './fake-last-seen-store';
import { LastSeenService } from './last-seen-service'; import { LastSeenService } from './last-seen-service';

2
src/lib/services/feature-service-potentially-stale.test.ts
View File

@ -5,7 +5,7 @@ import {
IUnleashStores, IUnleashStores,
} from '../types'; } from '../types';
import { createTestConfig } from '../../test/config/test-config'; import { createTestConfig } from '../../test/config/test-config';
import FeatureToggleService from './feature-toggle-service'; import FeatureToggleService from '../features/feature-toggle/feature-toggle-service';
import { AccessService } from './access-service'; import { AccessService } from './access-service';
import { IChangeRequestAccessReadModel } from 'lib/features/change-request-access-service/change-request-access-read-model'; import { IChangeRequestAccessReadModel } from 'lib/features/change-request-access-service/change-request-access-read-model';
import { ISegmentService } from 'lib/segments/segment-service-interface'; import { ISegmentService } from 'lib/segments/segment-service-interface';

2
src/lib/services/index.ts
View File

@ -21,7 +21,7 @@ import ResetTokenService from './reset-token-service';
import SettingService from './setting-service'; import SettingService from './setting-service';
import SessionService from './session-service'; import SessionService from './session-service';
import UserFeedbackService from './user-feedback-service'; import UserFeedbackService from './user-feedback-service';
import FeatureToggleService from './feature-toggle-service'; import FeatureToggleService from '../features/feature-toggle/feature-toggle-service';
import EnvironmentService from './environment-service'; import EnvironmentService from './environment-service';
import FeatureTagService from './feature-tag-service'; import FeatureTagService from './feature-tag-service';
import ProjectHealthService from './project-health-service'; import ProjectHealthService from './project-health-service';

2
src/lib/services/project-health-service.ts
View File

@ -2,7 +2,7 @@ import { IUnleashStores } from '../types/stores';
import { IUnleashConfig } from '../types/option'; import { IUnleashConfig } from '../types/option';
import { Logger } from '../logger'; import { Logger } from '../logger';
import type { IProject, IProjectHealthReport } from '../types/model'; import type { IProject, IProjectHealthReport } from '../types/model';
import type { IFeatureToggleStore } from '../types/stores/feature-toggle-store'; import type { IFeatureToggleStore } from '../features/feature-toggle/types/feature-toggle-store-type';
import type { IFeatureTypeStore } from '../types/stores/feature-type-store'; import type { IFeatureTypeStore } from '../types/stores/feature-type-store';
import type { IProjectStore } from '../types/stores/project-store'; import type { IProjectStore } from '../types/stores/project-store';
import ProjectService from './project-service'; import ProjectService from './project-service';

2
src/lib/services/project-service.ts
View File

@ -50,7 +50,7 @@ import {
IProjectAccessModel, IProjectAccessModel,
IRoleDescriptor, IRoleDescriptor,
} from '../types/stores/access-store'; } from '../types/stores/access-store';
import FeatureToggleService from './feature-toggle-service'; import FeatureToggleService from '../features/feature-toggle/feature-toggle-service';
import IncompatibleProjectError from '../error/incompatible-project-error'; import IncompatibleProjectError from '../error/incompatible-project-error';
import ProjectWithoutOwnerError from '../error/project-without-owner-error'; import ProjectWithoutOwnerError from '../error/project-without-owner-error';
import { arraysHaveSameItems } from '../util'; import { arraysHaveSameItems } from '../util';

2
src/lib/services/segment-service.ts
View File

@ -16,7 +16,7 @@ import {
SEGMENT_UPDATED, SEGMENT_UPDATED,
} from '../types/events'; } from '../types/events';
import User from '../types/user'; import User from '../types/user';
import { IFeatureStrategiesStore } from '../types/stores/feature-strategies-store'; import { IFeatureStrategiesStore } from '../features/feature-toggle/types/feature-toggle-strategies-store-type';
import BadDataError from '../error/bad-data-error'; import BadDataError from '../error/bad-data-error';
import { ISegmentService } from '../segments/segment-service-interface'; import { ISegmentService } from '../segments/segment-service-interface';
import { PermissionError } from '../error'; import { PermissionError } from '../error';

4
src/lib/services/state-service.ts
View File

@ -40,8 +40,8 @@ import { IProjectStore } from '../types/stores/project-store';
import { ITagType, ITagTypeStore } from '../types/stores/tag-type-store'; import { ITagType, ITagTypeStore } from '../types/stores/tag-type-store';
import { ITagStore } from '../types/stores/tag-store'; import { ITagStore } from '../types/stores/tag-store';
import { IStrategy, IStrategyStore } from '../types/stores/strategy-store'; import { IStrategy, IStrategyStore } from '../types/stores/strategy-store';
import { IFeatureToggleStore } from '../types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../features/feature-toggle/types/feature-toggle-store-type';
import { IFeatureStrategiesStore } from '../types/stores/feature-strategies-store'; import { IFeatureStrategiesStore } from '../features/feature-toggle/types/feature-toggle-strategies-store-type';
import { IEnvironmentStore } from '../types/stores/environment-store'; import { IEnvironmentStore } from '../types/stores/environment-store';
import { IFeatureEnvironmentStore } from '../types/stores/feature-environment-store'; import { IFeatureEnvironmentStore } from '../types/stores/feature-environment-store';
import { IUnleashStores } from '../types/stores'; import { IUnleashStores } from '../types/stores';

2
src/lib/types/services.ts
View File

@ -18,7 +18,7 @@ import HealthService from '../services/health-service';
import SettingService from '../services/setting-service'; import SettingService from '../services/setting-service';
import SessionService from '../services/session-service'; import SessionService from '../services/session-service';
import UserFeedbackService from '../services/user-feedback-service'; import UserFeedbackService from '../services/user-feedback-service';
import FeatureToggleService from '../services/feature-toggle-service'; import FeatureToggleService from '../features/feature-toggle/feature-toggle-service';
import EnvironmentService from '../services/environment-service'; import EnvironmentService from '../services/environment-service';
import FeatureTagService from '../services/feature-tag-service'; import FeatureTagService from '../services/feature-tag-service';
import ProjectHealthService from '../services/project-health-service'; import ProjectHealthService from '../services/project-health-service';

4
src/lib/types/stores.ts
View File

@ -4,7 +4,7 @@ import { IFeatureTypeStore } from './stores/feature-type-store';
import { IStrategyStore } from './stores/strategy-store'; import { IStrategyStore } from './stores/strategy-store';
import { IClientApplicationsStore } from './stores/client-applications-store'; import { IClientApplicationsStore } from './stores/client-applications-store';
import { IClientInstanceStore } from './stores/client-instance-store'; import { IClientInstanceStore } from './stores/client-instance-store';
import { IFeatureToggleStore } from './stores/feature-toggle-store'; import { IFeatureToggleStore } from '../features/feature-toggle/types/feature-toggle-store-type';
import { IContextFieldStore } from './stores/context-field-store'; import { IContextFieldStore } from './stores/context-field-store';
import { ISettingStore } from './stores/settings-store'; import { ISettingStore } from './stores/settings-store';
import { ISessionStore } from './stores/session-store'; import { ISessionStore } from './stores/session-store';
@ -18,7 +18,7 @@ import { IApiTokenStore } from './stores/api-token-store';
import { IResetTokenStore } from './stores/reset-token-store'; import { IResetTokenStore } from './stores/reset-token-store';
import { IUserFeedbackStore } from './stores/user-feedback-store'; import { IUserFeedbackStore } from './stores/user-feedback-store';
import { IFeatureEnvironmentStore } from './stores/feature-environment-store'; import { IFeatureEnvironmentStore } from './stores/feature-environment-store';
import { IFeatureStrategiesStore } from './stores/feature-strategies-store'; import { IFeatureStrategiesStore } from '../features/feature-toggle/types/feature-toggle-strategies-store-type';
import { IEnvironmentStore } from './stores/environment-store'; import { IEnvironmentStore } from './stores/environment-store';
import { IFeatureToggleClientStore } from './stores/feature-toggle-client-store'; import { IFeatureToggleClientStore } from './stores/feature-toggle-client-store';
import { IClientMetricsStoreV2 } from './stores/client-metrics-store-v2'; import { IClientMetricsStoreV2 } from './stores/client-metrics-store-v2';

2
src/test/e2e/services/playground-service.test.ts
View File

@ -11,7 +11,7 @@ import fc from 'fast-check';
import { createTestConfig } from '../../config/test-config'; import { createTestConfig } from '../../config/test-config';
import dbInit, { ITestDb } from '../helpers/database-init'; import dbInit, { ITestDb } from '../helpers/database-init';
import { IUnleashStores } from '../../../lib/types/stores'; import { IUnleashStores } from '../../../lib/types/stores';
import FeatureToggleService from '../../../lib/services/feature-toggle-service'; import FeatureToggleService from '../../../lib/features/feature-toggle/feature-toggle-service';
import { FeatureToggle, ISegment, WeightType } from '../../../lib/types/model'; import { FeatureToggle, ISegment, WeightType } from '../../../lib/types/model';
import { PlaygroundFeatureSchema } from '../../../lib/openapi/spec/playground-feature-schema'; import { PlaygroundFeatureSchema } from '../../../lib/openapi/spec/playground-feature-schema';
import { offlineUnleashClientNode } from '../../../lib/features/playground/offline-unleash-client.test'; import { offlineUnleashClientNode } from '../../../lib/features/playground/offline-unleash-client.test';

2
src/test/e2e/services/project-service.e2e.test.ts
View File

@ -1,6 +1,6 @@
import dbInit, { ITestDb } from '../helpers/database-init'; import dbInit, { ITestDb } from '../helpers/database-init';
import getLogger from '../../fixtures/no-logger'; import getLogger from '../../fixtures/no-logger';
import FeatureToggleService from '../../../lib/services/feature-toggle-service'; import FeatureToggleService from '../../../lib/features/feature-toggle/feature-toggle-service';
import ProjectService from '../../../lib/services/project-service'; import ProjectService from '../../../lib/services/project-service';
import { AccessService } from '../../../lib/services/access-service'; import { AccessService } from '../../../lib/services/access-service';
import { MOVE_FEATURE_TOGGLE } from '../../../lib/types/permissions'; import { MOVE_FEATURE_TOGGLE } from '../../../lib/types/permissions';

2
src/test/e2e/stores/feature-environment-store.e2e.test.ts
View File

@ -2,7 +2,7 @@ import { IUnleashStores } from '../../../lib/types';
import dbInit from '../helpers/database-init'; import dbInit from '../helpers/database-init';
import getLogger from '../../fixtures/no-logger'; import getLogger from '../../fixtures/no-logger';
import { IFeatureEnvironmentStore } from '../../../lib/types/stores/feature-environment-store'; import { IFeatureEnvironmentStore } from '../../../lib/types/stores/feature-environment-store';
import { IFeatureToggleStore } from '../../../lib/types/stores/feature-toggle-store'; import { IFeatureToggleStore } from '../../../lib/features/feature-toggle/types/feature-toggle-store-type';
import { IEnvironmentStore } from '../../../lib/types/stores/environment-store'; import { IEnvironmentStore } from '../../../lib/types/stores/environment-store';
let db; let db;

2
src/test/e2e/stores/feature-tag-store.e2e.test.ts
View File

@ -1,5 +1,5 @@
import { IFeatureTagStore } from 'lib/types/stores/feature-tag-store'; import { IFeatureTagStore } from 'lib/types/stores/feature-tag-store';
import { IFeatureToggleStore } from 'lib/types/stores/feature-toggle-store'; import { IFeatureToggleStore } from 'lib/features/feature-toggle/types/feature-toggle-store-type';
import dbInit from '../helpers/database-init'; import dbInit from '../helpers/database-init';
import getLogger from '../../fixtures/no-logger'; import getLogger from '../../fixtures/no-logger';
import NotFoundError from '../../../lib/error/notfound-error'; import NotFoundError from '../../../lib/error/notfound-error';

4
src/test/fixtures/store.ts vendored
View File

@ -1,7 +1,7 @@
import FakeFeatureStrategiesStore from './fake-feature-strategies-store'; import FakeFeatureStrategiesStore from '../../lib/features/feature-toggle/fakes/fake-feature-strategies-store';
import FakeClientInstanceStore from './fake-client-instance-store'; import FakeClientInstanceStore from './fake-client-instance-store';
import FakeClientApplicationsStore from './fake-client-applications-store'; import FakeClientApplicationsStore from './fake-client-applications-store';
import FakeFeatureToggleStore from './fake-feature-toggle-store'; import FakeFeatureToggleStore from '../../lib/features/feature-toggle/fakes/fake-feature-toggle-store';
import FakeTagStore from './fake-tag-store'; import FakeTagStore from './fake-tag-store';
import FakeTagTypeStore from './fake-tag-type-store'; import FakeTagTypeStore from './fake-tag-type-store';
import FakeEventStore from './fake-event-store'; import FakeEventStore from './fake-event-store';