@kinotic-ai/persistence 1.1.0 → 1.2.0

package/dist/index.d.ts

@@ -210,166 +210,166 @@ import { IServiceProxy, Page, Pageable, IterablePage } from "@kinotic-ai/core";
 interface IEntitiesRepository {
 	/**
 	* Saves all given entities.
-	* @param structureId the id of the structure to save the entities for
+	* @param entityDefinitionId the id of the structure to save the entities for
 	* @param entities all the entities to save
 	* @return Promise that will complete when all entities have been saved
 	*/
-	bulkSave<T>(structureId: string, entities: T[]): Promise<void>;
+	bulkSave<T>(entityDefinitionId: string, entities: T[]): Promise<void>;
 	/**
 	* Updates all given entities.
-	* @param structureId the id of the structure to update the entities for
+	* @param entityDefinitionId the id of the structure to update the entities for
 	* @param entities all the entities to save
 	* @return Promise that will complete when all entities have been saved
 	*/
-	bulkUpdate<T>(structureId: string, entities: T[]): Promise<void>;
+	bulkUpdate<T>(entityDefinitionId: string, entities: T[]): Promise<void>;
 	/**
 	* Returns the number of entities available.
-	* @param structureId the id of the structure to count
+	* @param entityDefinitionId the id of the structure to count
 	* @return {@link Promise} emitting the number of entities.
 	*/
-	count(structureId: string): Promise<number>;
+	count(entityDefinitionId: string): Promise<number>;
 	/**
 	* Returns the number of entities available for the given query.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param query       the query used to limit result
 	* @return Promise    emitting the number of entities
 	*/
-	countByQuery(structureId: string, query: string): Promise<number>;
+	countByQuery(entityDefinitionId: string, query: string): Promise<number>;
 	/**
 	* Deletes the entity with the given id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param id          must not be {@literal null}
 	* @return {@link Promise} emitting when delete is complete
 	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
 	*/
-	deleteById(structureId: string, id: string): Promise<void>;
+	deleteById(entityDefinitionId: string, id: string): Promise<void>;
 	/**
 	* Deletes the entity with the given id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param query      the query used to filter records to delete, must not be {@literal null}
 	* @return Promise signaling when operation has completed
 	* @throws Error in case the given {@literal query} is {@literal null}
 	*/
-	deleteByQuery(structureId: string, query: string): Promise<void>;
+	deleteByQuery(entityDefinitionId: string, query: string): Promise<void>;
 	/**
 	* Returns a {@link IterablePage} of entities meeting the paging restriction provided in the {@link Pageable} object.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param pageable    the page settings to be used
 	* @return a page of entities
 	*/
-	findAll<T>(structureId: string, pageable: Pageable): Promise<IterablePage<T>>;
+	findAll<T>(entityDefinitionId: string, pageable: Pageable): Promise<IterablePage<T>>;
 	/**
 	* Returns a single {@link Page} of entities meeting the paging restriction provided in the {@link Pageable} object.
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param pageable the page settings to be used
 	*/
-	findAllSinglePage<T>(structureId: string, pageable: Pageable): Promise<Page<T>>;
+	findAllSinglePage<T>(entityDefinitionId: string, pageable: Pageable): Promise<Page<T>>;
 	/**
 	* Retrieves an entity by its id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param id          must not be {@literal null}
 	* @return {@link Promise} with the entity with the given id or {@link Promise} emitting null if none found
 	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
 	*/
-	findById<T>(structureId: string, id: string): Promise<T>;
+	findById<T>(entityDefinitionId: string, id: string): Promise<T | null>;
 	/**
 	* Retrieves a list of entities by their id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param ids      must not be {@literal null}
 	* @return Promise emitting the entities with the given ids or Promise emitting null if none found
 	* @throws Error in case the given {@literal ids} is {@literal null}
 	*/
-	findByIds<T>(structureId: string, ids: string[]): Promise<T[]>;
+	findByIds<T>(entityDefinitionId: string, ids: string[]): Promise<T[]>;
 	/**
 	* Executes a named query.
-	* @param structureId the id of the structure that this named query is defined for
+	* @param entityDefinitionId the id of the structure that this named query is defined for
 	* @param queryName the name of the function that defines the query
 	* @param parameters to pass to the query
 	* @returns Promise with the result of the query
 	*/
-	namedQuery<T>(structureId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
 	/**
 	* Executes a named query and returns a Page of results.
-	* @param structureId the id of the structure that this named query is defined for
+	* @param entityDefinitionId the id of the structure that this named query is defined for
 	* @param queryName the name of the function that defines the query
 	* @param parameters to pass to the query
 	* @param pageable the page settings to be used
 	* @returns Promise with the result of the query
 	*/
-	namedQueryPage<T>(structureId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable): Promise<IterablePage<T>>;
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable): Promise<IterablePage<T>>;
 	/**
 	* Saves a given entity. Use the returned instance for further operations as the save operation might have changed the
 	* entity instance completely.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param entity      must not be {@literal null}
 	* @return {@link Promise} emitting the saved entity
 	* @throws IllegalArgumentException in case the given {@literal entity} is {@literal null}
 	*/
-	save<T>(structureId: string, entity: T): Promise<T>;
+	save<T>(entityDefinitionId: string, entity: T): Promise<T>;
 	/**
 	* Returns a {@link IterablePage} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param searchText  the text to search for entities for
 	* @param pageable    the page settings to be used
 	* @return a page of entities
 	*/
-	search<T>(structureId: string, searchText: string, pageable: Pageable): Promise<IterablePage<T>>;
+	search<T>(entityDefinitionId: string, searchText: string, pageable: Pageable): Promise<IterablePage<T>>;
 	/**
 	* Returns a single {@link Page} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param searchText  the text to search for entities for
 	* @param pageable    the page settings to be used
 	* @return a page of entities
 	*/
-	searchSinglePage<T>(structureId: string, searchText: string, pageable: Pageable): Promise<Page<T>>;
+	searchSinglePage<T>(entityDefinitionId: string, searchText: string, pageable: Pageable): Promise<Page<T>>;
 	/**
 	* This operation makes all the recent writes immediately available for search.
-	* @param structureId the id of the structure to sync the index for.
+	* @param entityDefinitionId the id of the structure to sync the index for.
 	* @return a Promise that resolves when the operation is complete
 	*/
-	syncIndex(structureId: string): Promise<void>;
+	syncIndex(entityDefinitionId: string): Promise<void>;
 	/**
 	* Updates a given entity. This will only override the fields that are present in the given entity.
 	* If any fields are not present in the given entity data, they will not be changed.
 	* If the entity does not exist, it will be created.
 	*
-	* @param structureId the id of the structure to update the entity for
+	* @param entityDefinitionId the id of the structure to update the entity for
 	* @param entity      must not be {@literal null}
 	* @return Promise emitting the saved entity
 	* @throws Error in case the given {@literal entity} is {@literal null}
 	*/
-	update<T>(structureId: string, entity: T): Promise<T>;
+	update<T>(entityDefinitionId: string, entity: T): Promise<T>;
 }
 declare class EntitiesRepository implements IEntitiesRepository {
 	protected serviceProxy: IServiceProxy;
 	constructor(kinotic: IKinotic);
-	bulkSave<T>(structureId: string, entities: T[]): Promise<void>;
-	bulkUpdate<T>(structureId: string, entities: T[]): Promise<void>;
-	count(structureId: string): Promise<number>;
-	countByQuery(structureId: string, query: string): Promise<number>;
-	deleteById(structureId: string, id: string): Promise<void>;
-	deleteByQuery(structureId: string, query: string): Promise<void>;
-	findAll<T>(structureId: string, pageable: Pageable): Promise<IterablePage<T>>;
-	findAllSinglePage<T>(structureId: string, pageable: Pageable): Promise<Page<T>>;
-	findById<T>(structureId: string, id: string): Promise<T>;
-	findByIds<T>(structureId: string, ids: string[]): Promise<T[]>;
-	namedQuery<T>(structureId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
-	namedQueryPage<T>(structureId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable): Promise<IterablePage<T>>;
-	namedQuerySinglePage<T>(structureId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable): Promise<Page<T>>;
-	save<T>(structureId: string, entity: T): Promise<T>;
-	search<T>(structureId: string, searchText: string, pageable: Pageable): Promise<IterablePage<T>>;
-	searchSinglePage<T>(structureId: string, searchText: string, pageable: Pageable): Promise<Page<T>>;
-	syncIndex(structureId: string): Promise<void>;
-	update<T>(structureId: string, entity: T): Promise<T>;
+	bulkSave<T>(entityDefinitionId: string, entities: T[]): Promise<void>;
+	bulkUpdate<T>(entityDefinitionId: string, entities: T[]): Promise<void>;
+	count(entityDefinitionId: string): Promise<number>;
+	countByQuery(entityDefinitionId: string, query: string): Promise<number>;
+	deleteById(entityDefinitionId: string, id: string): Promise<void>;
+	deleteByQuery(entityDefinitionId: string, query: string): Promise<void>;
+	findAll<T>(entityDefinitionId: string, pageable: Pageable): Promise<IterablePage<T>>;
+	findAllSinglePage<T>(entityDefinitionId: string, pageable: Pageable): Promise<Page<T>>;
+	findById<T>(entityDefinitionId: string, id: string): Promise<T | null>;
+	findByIds<T>(entityDefinitionId: string, ids: string[]): Promise<T[]>;
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable): Promise<IterablePage<T>>;
+	namedQuerySinglePage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable): Promise<Page<T>>;
+	save<T>(entityDefinitionId: string, entity: T): Promise<T>;
+	search<T>(entityDefinitionId: string, searchText: string, pageable: Pageable): Promise<IterablePage<T>>;
+	searchSinglePage<T>(entityDefinitionId: string, searchText: string, pageable: Pageable): Promise<Page<T>>;
+	syncIndex(entityDefinitionId: string): Promise<void>;
+	update<T>(entityDefinitionId: string, entity: T): Promise<T>;
 }
 import { IKinotic as IKinotic2 } from "@kinotic-ai/core";
 import { IServiceProxy as IServiceProxy2, Page as Page2, Pageable as Pageable2, IterablePage as IterablePage2 } from "@kinotic-ai/core";
@@ -381,106 +381,106 @@ interface IAdminEntitiesRepository {
 	* @param tenantSelection the list of tenants to use when retrieving the entity records
 	* @return {@link Promise} emitting the number of entities.
 	*/
-	count(structureId: string, tenantSelection: TenantSelection): Promise<number>;
+	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
 	/**
 	* Returns the number of entities available for the given query.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param query       the query used to limit result
 	* @param tenantSelection the list of tenants to use when retrieving the entity records
 	* @return Promise    emitting the number of entities
 	*/
-	countByQuery(structureId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
+	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
 	/**
 	* Deletes the entity with the given id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param id          must not be {@literal null}
 	* @return {@link Promise} emitting when delete is complete
 	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
 	*/
-	deleteById(structureId: string, id: TenantSpecificId): Promise<void>;
+	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
 	/**
 	* Deletes the entity with the given id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param query      the query used to filter records to delete, must not be {@literal null}
 	* @param tenantSelection the list of tenants to use when deleting the entity records
 	* @return Promise signaling when operation has completed
 	* @throws Error in case the given {@literal query} is {@literal null}
 	*/
-	deleteByQuery(structureId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
+	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
 	/**
 	* Returns a {@link IterablePage} of entities meeting the paging restriction provided in the {@link Pageable} object.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param tenantSelection the list of tenants to use when retrieving the entity records
 	* @param pageable    the page settings to be used
 	* @return a page of entities
 	*/
-	findAll<T>(structureId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
+	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
 	/**
 	* Retrieves an entity by its id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param id          must not be {@literal null}
 	* @return {@link Promise} with the entity with the given id or {@link Promise} emitting null if none found
 	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
 	*/
-	findById<T>(structureId: string, id: TenantSpecificId): Promise<T>;
+	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T | null>;
 	/**
 	* Retrieves a list of entities by their id.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param ids      must not be {@literal null}
 	* @return Promise emitting the entities with the given ids or Promise emitting null if none found
 	* @throws Error in case the given {@literal ids} is {@literal null}
 	*/
-	findByIds<T>(structureId: string, ids: TenantSpecificId[]): Promise<T[]>;
+	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
 	/**
 	* Executes a named query.
-	* @param structureId the id of the structure that this named query is defined for
+	* @param entityDefinitionId the id of the structure that this named query is defined for
 	* @param queryName the name of the function that defines the query
 	* @param parameters to pass to the query
 	* @returns Promise with the result of the query
 	*/
-	namedQuery<T>(structureId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
 	/**
 	* Executes a named query and returns a Page of results.
-	* @param structureId the id of the structure that this named query is defined for
+	* @param entityDefinitionId the id of the structure that this named query is defined for
 	* @param queryName the name of the function that defines the query
 	* @param parameters to pass to the query
 	* @param pageable the page settings to be used
 	* @returns Promise with the result of the query
 	*/
-	namedQueryPage<T>(structureId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
 	/**
 	* Returns a {@link IterablePage} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
 	*
-	* @param structureId the id of the structure to save the entity for
+	* @param entityDefinitionId the id of the structure to save the entity for
 	* @param searchText  the text to search for entities for
 	* @param tenantSelection the list of tenants to use when retrieving the entity records
 	* @param pageable    the page settings to be used
 	* @return a page of entities
 	*/
-	search<T>(structureId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
+	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
 }
 declare class AdminEntitiesRepository implements IAdminEntitiesRepository {
 	protected serviceProxy: IServiceProxy2;
 	constructor(kinotic: IKinotic2);
-	count(structureId: string, tenantSelection: TenantSelection): Promise<number>;
-	countByQuery(structureId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
-	deleteById(structureId: string, id: TenantSpecificId): Promise<void>;
-	deleteByQuery(structureId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
-	findAll<T>(structureId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	findAllSinglePage<T>(structureId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
-	findById<T>(structureId: string, id: TenantSpecificId): Promise<T>;
-	findByIds<T>(structureId: string, ids: TenantSpecificId[]): Promise<T[]>;
-	namedQuery<T>(structureId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
-	namedQueryPage<T>(structureId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
-	namedQuerySinglePage<T>(structureId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<Page2<T>>;
-	search<T>(structureId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	searchSinglePage<T>(structureId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
+	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
+	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
+	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
+	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
+	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
+	findAllSinglePage<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
+	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T>;
+	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
+	namedQuerySinglePage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<Page2<T>>;
+	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
+	searchSinglePage<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
 }
 import { Pageable as Pageable3, IterablePage as IterablePage3 } from "@kinotic-ai/core";
 /**
@@ -488,6 +488,10 @@ import { Pageable as Pageable3, IterablePage as IterablePage3 } from "@kinotic-a
 * It provides the basic CRUD operations for entities.
 */
 interface IEntityRepository<T> {
+	/**
+	* The organizationId of the Entity this repository is for
+	*/
+	entityOrganizationId: string;
 	/**
 	* The applicationId of the Entity this repository is for
 	*/
@@ -498,7 +502,7 @@ interface IEntityRepository<T> {
 	entityName: string;
 	/**
 	* The id of the Entity this repository is for
-	* Which is the applicationId + '.' + name
+	* Which is the organizationId + '.' + applicationId + '.' + name
 	*/
 	entityId: string;
 	/**
@@ -556,7 +560,7 @@ interface IEntityRepository<T> {
 	* @return Promise emitting the entity with the given id or Promise emitting null if none found
 	* @throws Error in case the given {@literal id} is {@literal null}
 	*/
-	findById(id: string): Promise<T>;
+	findById(id: string): Promise<T | null>;
 	/**
 	* Retrieves a list of entities by their id.
 	*
@@ -618,11 +622,12 @@ interface IEntityRepository<T> {
 * It provides the basic CRUD operations for entities.
 */
 declare class EntityRepository<T> implements IEntityRepository<T> {
+	entityOrganizationId: string;
 	entityApplicationId: string;
 	entityName: string;
 	entityId: string;
 	private readonly entitiesRepository;
-	constructor(structureApplicationId: string, structureName: string, entitiesRepository?: IEntitiesRepository);
+	constructor(entityOrganizationId: string, entityApplicationId: string, entityName: string, entitiesRepository?: IEntitiesRepository);
 	bulkSave(entities: T[]): Promise<void>;
 	bulkUpdate(entities: T[]): Promise<void>;
 	count(): Promise<number>;
@@ -630,7 +635,7 @@ declare class EntityRepository<T> implements IEntityRepository<T> {
 	deleteById(id: string): Promise<void>;
 	deleteByQuery(query: string): Promise<void>;
 	findAll(pageable: Pageable3): Promise<IterablePage3<T>>;
-	findById(id: string): Promise<T>;
+	findById(id: string): Promise<T | null>;
 	findByIds(ids: string[]): Promise<T[]>;
 	namedQuery<U>(queryName: string, queryParameters: QueryParameter[]): Promise<U>;
 	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<U>>;
@@ -647,6 +652,10 @@ import { Pageable as Pageable4, IterablePage as IterablePage4 } from "@kinotic-a
 * It provides the basic CRUD operations for entities with multi-tenancy support.
 */
 interface IAdminEntityRepository<T> {
+	/**
+	* The organization id of the Entity this repository is for
+	*/
+	entityOrganizationId: string;
 	/**
 	* The application id of the Entity this repository is for
 	*/
@@ -657,7 +666,7 @@ interface IAdminEntityRepository<T> {
 	entityName: string;
 	/**
 	* The id of the Entity this repository is for
-	* Which is the applicationId + '.' + name
+	* Which is the organizationId + '.' + applicationId + '.' + name
 	*/
 	entityId: string;
 	/**
@@ -707,7 +716,7 @@ interface IAdminEntityRepository<T> {
 	* @return Promise emitting the entity with the given id or Promise emitting null if none found
 	* @throws Error in case the given {@literal id} is {@literal null}
 	*/
-	findById(id: TenantSpecificId): Promise<T>;
+	findById(id: TenantSpecificId): Promise<T | null>;
 	/**
 	* Retrieves a list of entities by their id.
 	*
@@ -746,11 +755,12 @@ interface IAdminEntityRepository<T> {
 * It provides the basic CRUD operations for entities with multi-tenancy support.
 */
 declare class AdminEntityRepository<T> implements IAdminEntityRepository<T> {
+	entityOrganizationId: string;
 	entityApplicationId: string;
 	entityName: string;
 	entityId: string;
 	private readonly adminEntitiesRepository;
-	constructor(structureApplicationId: string, structureName: string, adminEntitiesRepository?: IAdminEntitiesRepository);
+	constructor(entityOrganizationId: string, entityApplicationId: string, entityName: string, adminEntitiesRepository?: IAdminEntitiesRepository);
 	count(tenantSelection: TenantSelection): Promise<number>;
 	countByQuery(query: string, tenantSelection: TenantSelection): Promise<number>;
 	deleteById(id: TenantSpecificId): Promise<void>;