dyo-tools 0.2.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dyo-tools",
-  "version": "0.2.0",
+  "version": "0.3.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -13,8 +13,7 @@
     "test": "jest",
     "test:coverage": "c8 --check-coverage npm test",
     "test:coverage:verify": "c8 --check-coverage --lines 97 --functions 97 --branches 97 --statements 97 npm test",
-    "e2e": "cucumber-js --config cucumber.js",
-    "typedoc": "typedoc --tsconfig tsconfig.dev.json src/**/*.ts"
+    "typedoc": "typedoc --plugin typedoc-plugin-rename-defaults --entryPointStrategy expand ./src --exclude 'src/index.ts'"
   },
   "repository": {
     "type": "git",
@@ -30,23 +29,23 @@
   },
   "homepage": "https://gitlab.com/dyo-system/dyo-tools#readme",
   "devDependencies": {
-    "@babel/preset-env": "^7.22.5",
-    "@types/jest": "^27.5.2",
-    "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
-    "c8": "^8.0.0",
-    "eslint": "^8.42.0",
+    "@babel/preset-env": "^7.23.9",
+    "@types/jest": "^29.5.12",
+    "@types/uuid": "^9.0.8",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "c8": "^9.1.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "jest": "^27.5.1",
-    "ts-jest": "^27.1.5",
-    "typedoc": "^0.24.8",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "typedoc": "^0.25.8",
+    "typedoc-plugin-rename-defaults": "^0.7.0",
     "typescript": "4.8.4"
   },
   "dependencies": {
-    "@cucumber/cucumber": "^9.1.2",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.1"
   }
 }

package/src/constants.ts

@@ -17,7 +17,7 @@ export const bunchDefaultOptions: DTBunchOptions = {
   uniqueKey: false,
   inheritOwner: false,
   replaceIndex: false,
-  virtualContext: false,
+  virtualContainer: false,
 };
 
 /** DTManager constants * */
@@ -54,7 +54,7 @@ export const componentPhysicalDefaultFinderConfiguration: DYOFinderConfiguration
   },
   owner: {
     operators: baseOperators,
-    getValue: (item: DTComponentPhysical<DTAcceptedMetaData>) => (item.getOwner() ? item.getOwner().getId() : null),
+    getValue: (item: DTComponentPhysical<DTAcceptedMetaData>) => item.getOwner(),
     objectSearch: false,
   },
   meta: {
@@ -77,9 +77,9 @@ export const componentManagerDefaultFinderConfiguration: DYOFinderConfiguration
 
 export const componentBunchDefaultFinderConfiguration: DYOFinderConfiguration = {
   ...componentPhysicalDefaultFinderConfiguration,
-  context: {
+  container: {
     operators: baseOperators,
-    getValue: (item: DTComponentPhysical<DTAcceptedMetaData>) => (item.getContext() ? item.getContext().getId() : null),
+    getValue: (item: DTElement<DTAcceptedMetaData>) => (item.getContainer() ? item.getContainer().getId() : null),
     objectSearch: false,
   },
 };

package/src/core/DTAction.ts

@@ -0,0 +1,52 @@
+import DYOToolsComponent from './DTComponent';
+import { DTComponentToObject } from '../types';
+import DYOToolsMaster from './DTMaster';
+
+export default abstract class DYOToolsAction<Payload = unknown> extends DYOToolsComponent {
+  /**
+   * Defining component type to "action".
+   */
+  protected _componentType: string = 'action';
+
+  /**
+   * Returns Master component from context, or undefined.
+   */
+  getMaster(): DYOToolsMaster | undefined {
+    return this.getContext<DYOToolsMaster>('master');
+  }
+
+  /**
+   * Abstract method for action execution process.
+   *
+   * @param payload Object Payload to pass for action execution.
+   * @returns Promise
+   */
+  abstract execute(payload: Payload): Promise<void>;
+
+  /**
+   * Return String representation of the Action instance.
+   *
+   * @returns String representation of the Action.
+   */
+  toString(): string {
+    return `Component ${this._key} - Type: Action`;
+  }
+
+  /**
+   * Return JSON Object representation of the Action instance.
+   *
+   * JSON Object returned has the following structure :
+   * * **id** : _id property of the Action.
+   * * **key** : _key property of the Action.
+   * * **type** : _componentType property of the Action.
+   *
+   * @returns JSON Object representation of the Action.
+   */
+  toObject(): DTComponentToObject {
+    return {
+      id: this._id,
+      key: this._key,
+      type: this._componentType,
+    };
+  }
+}

package/src/core/DTBunch.ts

@@ -3,14 +3,13 @@ import DYOToolsManager from './DTManager';
 import {
   DTAcceptedMetaData, DTBunchFilters, DTBunchOptions, DTBunchToObject, DYOFinderConfiguration,
 } from '../types';
-import DYOToolsPlayer from './DTPlayer';
 import DYOToolsError from './DTError';
 import DYOToolsComponentPhysical from './DTComponentPhysical';
 import { bunchDefaultOptions as defaultOptions, componentBunchDefaultFinderConfiguration } from '../constants';
 import DYOFinder from '../libs/DYOFinder';
 
 export default class DYOToolsBunch<
-    IBunchItem extends DYOToolsElement<DTAcceptedMetaData>,
+    IBunchItem extends DYOToolsElement<DTAcceptedMetaData> = DYOToolsElement<DTAcceptedMetaData>,
     IComponentMeta extends DTAcceptedMetaData = DTAcceptedMetaData,
   > extends DYOToolsComponentPhysical<IComponentMeta, DTBunchOptions> {
   /**
@@ -68,7 +67,7 @@ export default class DYOToolsBunch<
    *
    * If **inheritOwner** is *true*, apply new **owner** to each item.
    */
-  setOwner(value: DYOToolsPlayer<DTAcceptedMetaData>): void {
+  setOwner(value: string): void {
     super.setOwner(value);
 
     // Update owner elements
@@ -102,7 +101,7 @@ export default class DYOToolsBunch<
    * saved in current _options property. Available Options are : **uniqueKey**, **inheritOwner**, **replaceIndex**
    * and **errors**.
    */
-  add(item: IBunchItem, options: Partial<Omit<DTBunchOptions, 'virtualContext'>> = {}): void {
+  add(item: IBunchItem, options: Partial<Omit<DTBunchOptions, 'virtualContainer'>> = {}): void {
     this.addAtIndex(item, this._items.length, options);
   }
 
@@ -114,8 +113,8 @@ export default class DYOToolsBunch<
    * * Option **uniqueKey** = *true*. If the added item has the same _key than existing item,
    * an error occurred (depending on **errors** option).
    * * Option **inheritOwner** = *true*. When the new item is added, its owner is replaced by the current bunch owner.
-   * * Option **virtualContext** = *false*. When the new item is added, its context is replaced by the current bunch
-   * instance. The item is removed from the old context.
+   * * Option **virtualContainer** = *false*. When the new item is added, its container is replaced by the current bunch
+   * instance. The item is removed from the old container.
    * * If an item already exists at the specified index, the new item is added at the index, and following items are
    * automatically affected at next indexes. If **replaceIndex** option is *true*, the new item replaces the former one
    * at the index instead.
@@ -129,9 +128,9 @@ export default class DYOToolsBunch<
    * saved in current _options property. Available Options are : **uniqueKey**, **inheritOwner**, **replaceIndex**
    * and **errors**.
    */
-  addAtIndex(item: IBunchItem, index: number, options: Partial<Omit<DTBunchOptions, 'virtualContext'>> = {}): void {
+  addAtIndex(item: IBunchItem, index: number, options: Partial<Omit<DTBunchOptions, ''>> = {}): void {
     const {
-      uniqueKey, replaceIndex, inheritOwner, virtualContext,
+      uniqueKey, replaceIndex, inheritOwner, virtualContainer,
     }: Partial<DTBunchOptions> = { ...this._options, ...options };
     let hasError = false;
     let finalIndex = index;
@@ -171,13 +170,17 @@ export default class DYOToolsBunch<
         finalIndex = this._items.length;
       }
 
-      // Update Context
-      if (!virtualContext) {
-        const oldContext = item.getContext();
-        if (oldContext && oldContext.getComponentType() === 'bunch') {
-          (oldContext as DYOToolsBunch<IBunchItem, DTAcceptedMetaData>).remove(item.getId());
+      // Update Context with manager
+      if (this._context) {
+        item.setContext(this._context);
+      }
+
+      if (!virtualContainer) {
+        const oldContainer = item.getContainer();
+        if (oldContainer && oldContainer.getComponentType() === 'bunch') {
+          (oldContainer as DYOToolsBunch<IBunchItem, DTAcceptedMetaData>).remove(item.getId());
         }
-        item.setContext(this);
+        item.setContainer(this);
       }
 
       // Update Owner
@@ -188,7 +191,7 @@ export default class DYOToolsBunch<
       // Update Manager library
       if (this.getContext('manager')) {
         const manager: DYOToolsManager<IBunchItem> = this.getContext('manager') as DYOToolsManager<IBunchItem>;
-        if (!manager.getLibrary().get(item.getId())) {
+        if (manager.getLibrary().getId() !== this._id && !manager.getLibrary().get(item.getId())) {
           manager.getLibrary().add(item);
         }
       }
@@ -214,7 +217,7 @@ export default class DYOToolsBunch<
    * saved in current _options property. Available Options are : **uniqueKey**, **inheritOwner**, **replaceIndex**
    * and **errors**.
    */
-  addMany(items: IBunchItem[], options: Partial<Omit<DTBunchOptions, 'virtualContext'>> = {}): void {
+  addMany(items: IBunchItem[], options: Partial<Omit<DTBunchOptions, 'virtualContainer'>> = {}): void {
     this.addManyAtIndex(items, this._items.length, options);
   }
 
@@ -231,7 +234,7 @@ export default class DYOToolsBunch<
    * saved in current _options property. Available Options are : **uniqueKey**, **inheritOwner**, **replaceIndex**
    * and **errors**.
    */
-  addManyAtIndex(items: IBunchItem[], index: number, options: Partial<Omit<DTBunchOptions, 'virtualContext'>> = {}): void {
+  addManyAtIndex(items: IBunchItem[], index: number, options: Partial<Omit<DTBunchOptions, 'virtualContainer'>> = {}): void {
     const previousItems = this._items;
     const { errors }: Partial<DTBunchOptions> = { ...this._options, ...options };
     let currentIndex = index;
@@ -302,7 +305,8 @@ export default class DYOToolsBunch<
    * * If a Number is provided, remove the DTElement instance at the corresponding index into _items.
    * * If a String is provided, remove the DTElement instance with the corresponding _id property into _items.
    *
-   * Note : Remove also the current context of the removed item (only if Option **virtualContext** is *false*).
+   * Note : Remove also affectation to the current container of the removed item
+   * (only if Option **virtualContainer** is *false*).
    *
    * @param index Number index value or String _id value.
    */
@@ -321,24 +325,25 @@ export default class DYOToolsBunch<
    * * If a Number Array is provided, remove DTElement instances at corresponding indexes into _items.
    * * If a String Array is provided, remove DTElement instances with corresponding _id properties into _items.
    *
-   * Note : Remove also the current context of removed items (only if Option **virtualContext** is *false*).
+   * Note : Remove also affectation to the current container of removed items
+   * (only if Option **virtualContainer** is *false*).
    *
    * @param indexes Number Array index values or String Array _id values.
    */
   removeMany(indexes: string[] | number[]): void {
-    const { virtualContext } = this._options;
+    const { virtualContainer } = this._options;
     const newItems = [];
     for (let i = 0; i < this._items.length; i += 1) {
       if (typeof indexes[0] === 'number') {
         if (!(indexes as number[]).includes(i)) {
           newItems.push(this._items[i]);
-        } else if (!virtualContext) {
-          this._items[i].removeContext();
+        } else if (!virtualContainer) {
+          this._items[i].removeContainer();
         }
       } else if (!(indexes as string[]).includes(this._items[i].getId())) {
         newItems.push(this._items[i]);
-      } else if (!virtualContext) {
-        this._items[i].removeContext();
+      } else if (!virtualContainer) {
+        this._items[i].removeContainer();
       }
     }
 
@@ -348,7 +353,8 @@ export default class DYOToolsBunch<
   /**
    * Remove all DTElement instances into the _items property.
    *
-   * Note : Remove also the current context of removed items (only if Option **virtualContext** is *false*).
+   * Note : Remove also affectation to the current container of removed items
+   * (only if Option **virtualContainer** is *false*).
    */
   removeAll(): void {
     const keysToRemove: number[] = this._items.map((item, index) => index);
@@ -363,8 +369,8 @@ export default class DYOToolsBunch<
    * Search filters can be applied on following DTElement properties :
    * * **id** : property _id. Basic operators only.
    * * **key** : property _key. Basic operators only.
-   * * **context** : property _id of current _context instance. Basic operators only.
-   * * **owner** : property _id of current _owner instance. Basic operators only.
+   * * **container** : property _id of current _container instance. Basic operators only.
+   * * **owner** : property _owner. Basic operators only.
    * * **meta** : each meta Key of _meta property. Extended operators can be used.
    *
    * Examples of **filters** argument :
@@ -397,7 +403,7 @@ export default class DYOToolsBunch<
    */
   copy(): DYOToolsBunch<IBunchItem, IComponentMeta> {
     let copyItems;
-    if (this._options.virtualContext) {
+    if (this._options.virtualContainer) {
       copyItems = this._items;
     } else {
       copyItems = this._items.length === 0 ? [] : this._items.map((item) => item.copy() as IBunchItem);
@@ -417,7 +423,7 @@ export default class DYOToolsBunch<
    * * **key** : _key property of the Bunch.
    * * **type** : _componentType property of the Bunch.
    * * **items** : Array of JSON Object representation for each DTElement instance in _items property of the Bunch.
-   * * **owner** : String representation of the current _owner property of the Bunch (only if defined).
+   * * **owner** : String current value of _owner property of the Bunch (only if defined).
    * * **meta** : JSON Object of all current metadata in _meta property of the Bunch (only if not empty).
    *
    * @returns JSON Object representation of the Bunch.
@@ -453,7 +459,7 @@ export default class DYOToolsBunch<
   toString(): string {
     let ownerKey = '';
     if (this._owner) {
-      ownerKey = ` - Owner: ${this._owner.getKey()}`;
+      ownerKey = ` - Owner: ${this._owner}`;
     }
 
     return `Component ${this._key} - Type: Bunch${ownerKey} - Items: ${this._items.length}`;

package/src/core/DTComponent.ts

@@ -20,7 +20,7 @@ export default abstract class DYOToolsComponent<IComponentOptions extends DTComp
   /**
    * Component Parent Context.
    *
-   * A component can have only one *physical context*, and be managed by a parent Component.
+   * A component can have only one *context*, and be managed by a parent Component.
    */
   protected _context?: DYOToolsComponent;
 

package/src/core/DTComponentPhysical.ts

@@ -1,27 +1,42 @@
 import { DTAcceptedMetaData, DTComponentOptions } from '../types';
 import DYOToolsComponentWithMeta from './DTComponentWithMeta';
-import DYOToolsPlayer from './DTPlayer';
+import DYOToolsMaster from './DTMaster';
+import DYOToolsManager from "./DTManager";
 
 export default abstract class DYOToolsComponentPhysical<
   IComponentMeta extends DTAcceptedMetaData,
   IComponentOptions extends DTComponentOptions = DTComponentOptions,
   > extends DYOToolsComponentWithMeta<IComponentMeta, IComponentOptions> {
   /**
-   * Owner DTPlayer instance if defined
+   * Owner string representation, if defined.
    */
-  protected _owner?: DYOToolsPlayer<DTAcceptedMetaData>;
+  protected _owner?: string;
+
+  /**
+   * Returns Manager component from context, or undefined.
+   */
+  getManager(): DYOToolsManager | undefined {
+    return this.getContext<DYOToolsManager>('manager');
+  }
+
+  /**
+   * Returns Master component from context, or undefined.
+   */
+  getMaster(): DYOToolsMaster | undefined {
+    return this.getContext<DYOToolsMaster>('master');
+  }
 
   /**
    * Getter for _owner property.
    */
-  getOwner(): DYOToolsPlayer<DTAcceptedMetaData> {
+  getOwner(): string {
     return this._owner;
   }
 
   /**
    * Setter for _owner property.
    */
-  setOwner(value: DYOToolsPlayer<DTAcceptedMetaData>): void {
+  setOwner(value: string): void {
     this._owner = value;
   }
 

package/src/core/DTElement.ts

@@ -1,5 +1,6 @@
 import { DTAcceptedMetaData, DTElementToObject } from '../types';
 import DYOToolsComponentPhysical from './DTComponentPhysical';
+import DYOToolsBunch from './DTBunch';
 
 export default class DYOToolsElement<
   IComponentMeta extends DTAcceptedMetaData,
@@ -9,6 +10,37 @@ export default class DYOToolsElement<
    */
   protected _componentType = 'element';
 
+  /**
+   * Component current **Container**.
+   *
+   * A container is a parent component which "contains" the current instance.
+   * **Context** and **container** are different components, with different purpose.
+   * For DYOToolsElement instances, a container is a DYOToolsBunch instance.
+   * @protected
+   */
+  protected _container: DYOToolsBunch;
+
+  /**
+   * Getter for _container property.
+   */
+  getContainer(): DYOToolsBunch | undefined {
+    return this._container;
+  }
+
+  /**
+   * Setter for _container property.
+   */
+  setContainer(container: DYOToolsBunch): void {
+    this._container = container;
+  }
+
+  /**
+   * Remove the current container of Element instance.
+   */
+  removeContainer(): void {
+    this._container = undefined;
+  }
+
   /**
    * Create and return a new DTElement instance by applying from current instance :
    * - Copy _key property
@@ -61,9 +93,10 @@ export default class DYOToolsElement<
   toString(): string {
     let ownerKey = '';
     if (this._owner) {
-      ownerKey = ` - Owner: ${this._owner.getKey()}`;
+      ownerKey = ` - Owner: ${this._owner}`;
     }
+    const domainLabel = this._domain ? ` ${this._domain}` : '';
 
-    return `Component ${this._key} - Type: Element${ownerKey}`;
+    return `Component${domainLabel} ${this._key} - Type: Element${ownerKey}`;
   }
 }

package/src/core/DTManager.ts

@@ -14,9 +14,10 @@ import {
 import DYOFinder from '../libs/DYOFinder';
 import { componentManagerDefaultFinderConfiguration, managerDefaultOptions as defaultOptions } from '../constants';
 import DYOToolsElement from './DTElement';
+import DYOToolsMaster from './DTMaster';
 
 export default class DYOToolsManager<
-  IBunchItem extends DYOToolsElement<DTAcceptedMetaData>,
+  IBunchItem extends DYOToolsElement<DTAcceptedMetaData> = DYOToolsElement<DTAcceptedMetaData>,
 > extends DYOToolsComponent<DTManagerOptions> {
   /**
    * Defining component type to "manager".
@@ -81,7 +82,9 @@ export default class DYOToolsManager<
       'virtual',
       ...scopes,
     ];
-    this._library = new DYOToolsBunch('library', elements, { virtualContext: true });
+    this._library = new DYOToolsBunch('library', elements, { virtualContainer: true });
+    this._library.setContext(this);
+
     this._finder = new DYOFinder(this, this.getFinderConfiguration());
   }
 
@@ -126,8 +129,8 @@ export default class DYOToolsManager<
    * The adding process has the following specifications :
    * * If the added item has the same _id than existing item, an error occurred (depending on **errors** option).
    * * The bunch item is automatically added to a scope depending on its virtual context :
-   * * * *default* if the bunch option **virtualContext** is false.
-   * * * *virtual* if the bunch option **virtualContext** is true.
+   * * * *default* if the bunch option **virtualContainer** is false.
+   * * * *virtual* if the bunch option **virtualContainer** is true.
    * * An optional parameter **targetScope** can be passed to force the scope affectation.
    * An error occurred if the affection doesn't conform to the following restrictions :
    * * * Virtual context bunch must be affected to the 'virtual' scope.
@@ -154,12 +157,12 @@ export default class DYOToolsManager<
     }
 
     // Define scope validity
-    const { virtualContext } = item.getOptions();
+    const { virtualContainer } = item.getOptions();
     let scope;
     if (!targetScope) {
-      scope = virtualContext ? 'virtual' : 'default';
+      scope = virtualContainer ? 'virtual' : 'default';
     } else {
-      const { code: errorCode, message: errorMessage } = this.getErrorDataForScope(targetScope, virtualContext);
+      const { code: errorCode, message: errorMessage } = this.getErrorDataForScope(targetScope, virtualContainer);
 
       if (errorCode && errorMessage) {
         this.triggerError(new DYOToolsError(errorCode, errorMessage, this, item));
@@ -178,12 +181,18 @@ export default class DYOToolsManager<
     }
 
     // Update context
+    // Bunch
     item.setContext<DYOToolsManager<IBunchItem>>(this);
     const oldContext = item.getContext();
     if (oldContext && oldContext.getComponentType() === 'manager') {
       (oldContext as DYOToolsManager<IBunchItem>).remove(item.getId());
     }
 
+    // Elements children
+    item.getAll().forEach((element) => {
+      element.setContext<DYOToolsManager<IBunchItem>>(this);
+    });
+
     // Add the new item
     this._items[item.getId()] = {
       scope,
@@ -235,8 +244,8 @@ export default class DYOToolsManager<
 
     const bunch = this._items[bunchId].item;
 
-    const { virtualContext } = bunch.getOptions();
-    const { code: errorCode, message: errorMessage } = this.getErrorDataForScope(targetScope, virtualContext);
+    const { virtualContainer } = bunch.getOptions();
+    const { code: errorCode, message: errorMessage } = this.getErrorDataForScope(targetScope, virtualContainer);
     if (errorCode && errorMessage) {
       this.triggerError(new DYOToolsError(errorCode, errorMessage, this, bunch));
       return;
@@ -282,6 +291,13 @@ export default class DYOToolsManager<
     return this._items[id] && this._items[id].scope;
   }
 
+  /**
+   * Returns Master component from context, or undefined.
+   */
+  getMaster(): DYOToolsMaster | undefined {
+    return this.getContext<DYOToolsMaster>('master');
+  }
+
   /**
    * Remove one bunch into the _items property of the Manager, depending on its id.
    *
@@ -309,12 +325,14 @@ export default class DYOToolsManager<
 
     ids.forEach((id: string) => {
       if (this._items[id]) {
-        if (libraryDeletion) {
-          this._items[id].item.getAll().forEach((item: IBunchItem) => {
+        this._items[id].item.getAll().forEach((item: IBunchItem) => {
+          if (libraryDeletion) {
             this._library.remove(item.getId());
-          });
-        }
+          }
+          item.removeContext();
+        });
 
+        this._items[id].item.removeContext();
         delete this._items[id];
       }
     });
@@ -415,28 +433,29 @@ export default class DYOToolsManager<
    */
   toString(): string {
     const libraryLabel = `Library: ${this._library.getAll().length}`;
+    const domainLabel = this._domain ? ` ${this._domain}` : '';
 
-    return `Component ${this._key} - Type: Manager - ${libraryLabel} - Items: ${Object.keys(this._items).length}`;
+    return `Component${domainLabel} ${this._key} - Type: Manager - ${libraryLabel} - Items: ${Object.keys(this._items).length}`;
   }
 
   /**
    * Get error data for scope affectation. Used in method which performs scope affectation.
    *
    * @param targetScope scope name to check for affectation.
-   * @param virtualContext boolean if the bunch to affect has **virtualContext** option enabled or not. Default *false*.
+   * @param virtualContainer boolean if the bunch to affect has **virtualContainer** option enabled or not. Default *false*.
    * @returns An Object with error code and message.
    */
-  private getErrorDataForScope(targetScope: string, virtualContext = false): { code: string, message: string } {
+  private getErrorDataForScope(targetScope: string, virtualContainer = false): { code: string, message: string } {
     const response = { code: '', message: '' };
     if (!this.isValidScope(targetScope)) {
       response.code = 'invalid_scope';
       response.message = "Scope provided doesn't exist in the manager";
     }
-    if (virtualContext && targetScope !== 'virtual') {
+    if (virtualContainer && targetScope !== 'virtual') {
       response.code = 'forbidden_scope';
       response.message = 'Scope provided cannot be associated to a virtual bunch';
     }
-    if (!virtualContext && targetScope === 'virtual') {
+    if (!virtualContainer && targetScope === 'virtual') {
       response.code = 'forbidden_virtual_scope';
       response.message = 'Virtual Scope provided cannot be associated to a physical bunch';
     }