@webiny/api-headless-cms 6.4.11 → 6.6.0-alpha.1

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.js

@@ -1,26 +1,26 @@
-import { Result, createImplementation } from "@webiny/feature/api";
+import { Result } from "@webiny/feature/api";
 import { CreateGroupRepository } from "./abstractions.js";
 import { GroupCache, PluginGroupsProvider } from "../shared/abstractions.js";
 import { GroupPersistenceError, GroupSlugTakenError } from "../../../domain/contentModelGroup/errors.js";
-import { StorageOperations } from "../../shared/abstractions.js";
+import { ListGroupsStorageOperation } from "../../shared/storageOperations/group/ListGroupsStorageOperation.js";
+import { CreateGroupStorageOperation } from "../../shared/storageOperations/group/CreateGroupStorageOperation.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
-import { toSlug } from "../../../utils/toSlug.js";
+import { StringFormatter } from "@webiny/api-core/features/stringFormatter/index.js";
 import { generateAlphaNumericId } from "@webiny/utils";
-import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
 class CreateGroupRepositoryImpl {
-    constructor(groupCache, pluginGroupsProvider, storageOperations, tenantContext, runtimeTenant){
+    constructor(groupCache, pluginGroupsProvider, listGroups, createGroup, tenantContext, stringFormatter){
         this.groupCache = groupCache;
         this.pluginGroupsProvider = pluginGroupsProvider;
-        this.storageOperations = storageOperations;
+        this.listGroups = listGroups;
+        this.createGroup = createGroup;
         this.tenantContext = tenantContext;
-        this.runtimeTenant = runtimeTenant;
+        this.stringFormatter = stringFormatter;
     }
-    async execute(initialGroup) {
-        const group = this.runtimeTenant.assign(initialGroup);
+    async execute(group) {
         try {
             const tenant = this.tenantContext.getTenant();
             if (group.id) {
-                const existingById = await this.storageOperations.groups.list({
+                const existingById = await this.listGroups.execute({
                     where: {
                         tenant: tenant.id,
                         id: group.id
@@ -33,18 +33,18 @@ class CreateGroupRepositoryImpl {
             const pluginGroups = await this.pluginGroupsProvider.getGroups();
             const pluginGroupConflict = pluginGroups.find((pg)=>pg.slug === group.slug);
             if (pluginGroupConflict) return Result.fail(new GroupSlugTakenError(group.slug));
-            await this.storageOperations.groups.create({
+            await this.createGroup.execute({
                 group
             });
             this.groupCache.clear();
-            return Result.ok(group);
+            return Result.ok();
         } catch (error) {
             return Result.fail(new GroupPersistenceError(error));
         }
     }
     async isSlugTaken(group, tenant) {
         if (group.slug && group.slug.trim()) {
-            const existingBySlug = await this.storageOperations.groups.list({
+            const existingBySlug = await this.listGroups.execute({
                 where: {
                     tenant,
                     slug: group.slug
@@ -52,8 +52,8 @@ class CreateGroupRepositoryImpl {
             });
             return existingBySlug.length > 0;
         }
-        const baseSlug = toSlug(group.name);
-        const existingBySlug = await this.storageOperations.groups.list({
+        const baseSlug = this.stringFormatter.slugify(group.name);
+        const existingBySlug = await this.listGroups.execute({
             where: {
                 tenant,
                 slug: baseSlug
@@ -64,15 +64,15 @@ class CreateGroupRepositoryImpl {
         return false;
     }
 }
-const CreateGroupRepository_CreateGroupRepository = createImplementation({
-    abstraction: CreateGroupRepository,
+const CreateGroupRepository_CreateGroupRepository = CreateGroupRepository.createImplementation({
     implementation: CreateGroupRepositoryImpl,
     dependencies: [
         GroupCache,
         PluginGroupsProvider,
-        StorageOperations,
+        ListGroupsStorageOperation,
+        CreateGroupStorageOperation,
         TenantContext,
-        RuntimeTenant
+        StringFormatter
     ]
 });
 export { CreateGroupRepository_CreateGroupRepository as CreateGroupRepository };

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupSlugTakenError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { toSlug } from \"~/utils/toSlug.js\";\nimport { generateAlphaNumericId } from \"@webiny/utils\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * CreateGroupRepository - Validates and persists a new group.\n *\n * Responsibilities:\n * - Validate ID uniqueness (if provided)\n * - Validate slug uniqueness (or generate unique slug)\n * - Check for plugin group conflicts\n * - Persist to storage\n * - Clear GroupCache after successful create\n */\nclass CreateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private tenantContext: TenantContext.Interface,\n        private runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialGroup: CmsGroup): Promise<Result<CmsGroup, RepositoryAbstraction.Error>> {\n        const group = this.runtimeTenant.assign(initialGroup);\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // 1. Validate ID uniqueness (if provided)\n            if (group.id) {\n                const existingById = await this.storageOperations.groups.list({\n                    where: {\n                        tenant: tenant.id,\n                        id: group.id\n                    }\n                });\n\n                if (existingById.length > 0) {\n                    return Result.fail(new GroupSlugTakenError(group.slug));\n                }\n            }\n\n            // 2. Generate or validate slug\n            const slugTaken = await this.isSlugTaken(group, tenant.id);\n            if (slugTaken) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 3. Check for plugin group conflicts\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);\n            if (pluginGroupConflict) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 4. Persist to storage\n            await this.storageOperations.groups.create({ group });\n\n            // 5. Clear cache\n            this.groupCache.clear();\n\n            return Result.ok(group);\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async isSlugTaken(group: CmsGroup, tenant: string): Promise<boolean> {\n        // If slug is provided and not empty, validate it\n        if (group.slug && group.slug.trim()) {\n            const existingBySlug = await this.storageOperations.groups.list({\n                where: {\n                    tenant,\n                    slug: group.slug\n                }\n            });\n\n            return existingBySlug.length > 0;\n        }\n\n        // Generate slug from name\n        const baseSlug = toSlug(group.name);\n        const existingBySlug = await this.storageOperations.groups.list({\n            where: {\n                tenant,\n                slug: baseSlug\n            }\n        });\n\n        if (existingBySlug.length === 0) {\n            // No conflict, use base slug\n            group.slug = baseSlug;\n        } else {\n            // Conflict, append random suffix\n            group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;\n        }\n\n        return false;\n    }\n}\n\nexport const CreateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: CreateGroupRepositoryImpl,\n    dependencies: [\n        GroupCache,\n        PluginGroupsProvider,\n        StorageOperations,\n        TenantContext,\n        RuntimeTenant\n    ]\n});\n"],"names":["CreateGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","tenantContext","runtimeTenant","initialGroup","group","tenant","existingById","Result","GroupSlugTakenError","slugTaken","pluginGroups","pluginGroupConflict","pg","error","GroupPersistenceError","existingBySlug","baseSlug","toSlug","generateAlphaNumericId","CreateGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","TenantContext","RuntimeTenant"],"mappings":";;;;;;;;;AAwBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,EACtCC,aAAsC,CAChD;aALUJ,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,YAAsB,EAA0D;QAC1F,MAAMC,QAAQ,IAAI,CAAC,aAAa,CAAC,MAAM,CAACD;QACxC,IAAI;YACA,MAAME,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,IAAID,MAAM,EAAE,EAAE;gBACV,MAAME,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC1D,OAAO;wBACH,QAAQD,OAAO,EAAE;wBACjB,IAAID,MAAM,EAAE;oBAChB;gBACJ;gBAEA,IAAIE,aAAa,MAAM,GAAG,GACtB,OAAOC,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAE7D;YAGA,MAAMK,YAAY,MAAM,IAAI,CAAC,WAAW,CAACL,OAAOC,OAAO,EAAE;YACzD,IAAII,WACA,OAAOF,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAMM,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,sBAAsBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKR,MAAM,IAAI;YAC1E,IAAIO,qBACA,OAAOJ,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOG,OAAO,EAAE,CAACH;QACrB,EAAE,OAAOS,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;IAEA,MAAc,YAAYT,KAAe,EAAEC,MAAc,EAAoB;QAEzE,IAAID,MAAM,IAAI,IAAIA,MAAM,IAAI,CAAC,IAAI,IAAI;YACjC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,OAAO;oBACHV;oBACA,MAAMD,MAAM,IAAI;gBACpB;YACJ;YAEA,OAAOW,eAAe,MAAM,GAAG;QACnC;QAGA,MAAMC,WAAWC,OAAOb,MAAM,IAAI;QAClC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5D,OAAO;gBACHV;gBACA,MAAMW;YACV;QACJ;QAEA,IAAID,AAA0B,MAA1BA,eAAe,MAAM,EAErBX,MAAM,IAAI,GAAGY;aAGbZ,MAAM,IAAI,GAAG,GAAGY,SAAS,CAAC,EAAEE,uBAAuB,IAAI;QAG3D,OAAO;IACX;AACJ;AAEO,MAAMC,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBxB;IAChB,cAAc;QACVyB;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupSlugTakenError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { ListGroupsStorageOperation } from \"~/features/shared/storageOperations/group/ListGroupsStorageOperation.js\";\nimport { CreateGroupStorageOperation } from \"~/features/shared/storageOperations/group/CreateGroupStorageOperation.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { StringFormatter } from \"@webiny/api-core/features/stringFormatter/index.js\";\nimport { generateAlphaNumericId } from \"@webiny/utils\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * CreateGroupRepository - Validates and persists a new group.\n *\n * Responsibilities:\n * - Validate ID uniqueness (if provided)\n * - Validate slug uniqueness (or generate unique slug)\n * - Check for plugin group conflicts\n * - Persist to storage\n * - Clear GroupCache after successful create\n */\nclass CreateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private listGroups: ListGroupsStorageOperation.Interface,\n        private createGroup: CreateGroupStorageOperation.Interface,\n        private tenantContext: TenantContext.Interface,\n        private stringFormatter: StringFormatter.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // 1. Validate ID uniqueness (if provided)\n            if (group.id) {\n                const existingById = await this.listGroups.execute({\n                    where: {\n                        tenant: tenant.id,\n                        id: group.id\n                    }\n                });\n\n                if (existingById.length > 0) {\n                    return Result.fail(new GroupSlugTakenError(group.slug));\n                }\n            }\n\n            // 2. Generate or validate slug\n            const slugTaken = await this.isSlugTaken(group, tenant.id);\n            if (slugTaken) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 3. Check for plugin group conflicts\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);\n            if (pluginGroupConflict) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 4. Persist to storage\n            await this.createGroup.execute({ group });\n\n            // 5. Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async isSlugTaken(group: CmsGroup, tenant: string): Promise<boolean> {\n        // If slug is provided and not empty, validate it\n        if (group.slug && group.slug.trim()) {\n            const existingBySlug = await this.listGroups.execute({\n                where: {\n                    tenant,\n                    slug: group.slug\n                }\n            });\n\n            return existingBySlug.length > 0;\n        }\n\n        // Generate slug from name\n        const baseSlug = this.stringFormatter.slugify(group.name);\n        const existingBySlug = await this.listGroups.execute({\n            where: {\n                tenant,\n                slug: baseSlug\n            }\n        });\n\n        if (existingBySlug.length === 0) {\n            // No conflict, use base slug\n            group.slug = baseSlug;\n        } else {\n            // Conflict, append random suffix\n            group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;\n        }\n\n        return false;\n    }\n}\n\nexport const CreateGroupRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateGroupRepositoryImpl,\n    dependencies: [\n        GroupCache,\n        PluginGroupsProvider,\n        ListGroupsStorageOperation,\n        CreateGroupStorageOperation,\n        TenantContext,\n        StringFormatter\n    ]\n});\n"],"names":["CreateGroupRepositoryImpl","groupCache","pluginGroupsProvider","listGroups","createGroup","tenantContext","stringFormatter","group","tenant","existingById","Result","GroupSlugTakenError","slugTaken","pluginGroups","pluginGroupConflict","pg","error","GroupPersistenceError","existingBySlug","baseSlug","generateAlphaNumericId","CreateGroupRepository","RepositoryAbstraction","GroupCache","PluginGroupsProvider","ListGroupsStorageOperation","CreateGroupStorageOperation","TenantContext","StringFormatter"],"mappings":";;;;;;;;;AAuBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,UAAgD,EAChDC,WAAkD,EAClDC,aAAsC,EACtCC,eAA0C,CACpD;aANUL,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,UAAU,GAAVA;aACAC,WAAW,GAAXA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YACA,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,IAAID,MAAM,EAAE,EAAE;gBACV,MAAME,eAAe,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;oBAC/C,OAAO;wBACH,QAAQD,OAAO,EAAE;wBACjB,IAAID,MAAM,EAAE;oBAChB;gBACJ;gBAEA,IAAIE,aAAa,MAAM,GAAG,GACtB,OAAOC,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAE7D;YAGA,MAAMK,YAAY,MAAM,IAAI,CAAC,WAAW,CAACL,OAAOC,OAAO,EAAE;YACzD,IAAII,WACA,OAAOF,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAMM,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,sBAAsBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKR,MAAM,IAAI;YAC1E,IAAIO,qBACA,OAAOJ,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBAAEA;YAAM;YAGvC,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOG,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;IAEA,MAAc,YAAYT,KAAe,EAAEC,MAAc,EAAoB;QAEzE,IAAID,MAAM,IAAI,IAAIA,MAAM,IAAI,CAAC,IAAI,IAAI;YACjC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACjD,OAAO;oBACHV;oBACA,MAAMD,MAAM,IAAI;gBACpB;YACJ;YAEA,OAAOW,eAAe,MAAM,GAAG;QACnC;QAGA,MAAMC,WAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAACZ,MAAM,IAAI;QACxD,MAAMW,iBAAiB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YACjD,OAAO;gBACHV;gBACA,MAAMW;YACV;QACJ;QAEA,IAAID,AAA0B,MAA1BA,eAAe,MAAM,EAErBX,MAAM,IAAI,GAAGY;aAGbZ,MAAM,IAAI,GAAG,GAAGY,SAAS,CAAC,EAAEC,uBAAuB,IAAI;QAG3D,OAAO;IACX;AACJ;AAEO,MAAMC,8CAAwBC,sBAAAA,oBAA0C,CAAC;IAC5E,gBAAgBtB;IAChB,cAAc;QACVuB;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/CreateGroup/CreateGroupUseCase.d.ts

@@ -5,6 +5,7 @@ import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.j
 import { AccessControl } from "../../../features/shared/abstractions.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { CmsContext } from "../../../features/shared/abstractions.js";
 import type { CmsGroup } from "../../../types/index.js";
 import type { CmsGroupCreateInput } from "../../../types/index.js";
 /**
@@ -24,8 +25,11 @@ declare class CreateGroupUseCaseImpl implements UseCaseAbstraction.Interface {
     private accessControl;
     private tenantContext;
     private identityContext;
-    constructor(eventPublisher: EventPublisher.Interface, repository: CreateGroupRepository.Interface, accessControl: AccessControl.Interface, tenantContext: TenantContext.Interface, identityContext: IdentityContext.Interface);
+    private cmsContext;
+    constructor(eventPublisher: EventPublisher.Interface, repository: CreateGroupRepository.Interface, accessControl: AccessControl.Interface, tenantContext: TenantContext.Interface, identityContext: IdentityContext.Interface, cmsContext: CmsContext.Interface);
     execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseAbstraction.Error>>;
 }
-export declare const CreateGroupUseCase: import("@webiny/di").Implementation<typeof CreateGroupUseCaseImpl>;
+export declare const CreateGroupUseCase: typeof CreateGroupUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ICreateGroupUseCase>;
+};
 export {};

package/features/contentModelGroup/CreateGroup/CreateGroupUseCase.js

@@ -1,20 +1,21 @@
-import { Result, createImplementation } from "@webiny/feature/api";
+import { Result } from "@webiny/feature/api";
 import { CreateGroupRepository, CreateGroupUseCase } from "./abstractions.js";
 import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
 import { GroupAfterCreateEvent, GroupBeforeCreateEventEvent, GroupCreateErrorEvent } from "./events.js";
-import { AccessControl } from "../../shared/abstractions.js";
+import { AccessControl, CmsContext } from "../../shared/abstractions.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { GroupNotAuthorizedError, GroupValidationError } from "../../../domain/contentModelGroup/errors.js";
 import { createZodError, mdbid } from "@webiny/utils";
 import { createGroupCreateValidation } from "../../../domain/contentModelGroup/validation.js";
 class CreateGroupUseCaseImpl {
-    constructor(eventPublisher, repository, accessControl, tenantContext, identityContext){
+    constructor(eventPublisher, repository, accessControl, tenantContext, identityContext, cmsContext){
         this.eventPublisher = eventPublisher;
         this.repository = repository;
         this.accessControl = accessControl;
         this.tenantContext = tenantContext;
         this.identityContext = identityContext;
+        this.cmsContext = cmsContext;
     }
     async execute(input) {
         const canAccess = await this.accessControl.canAccessGroup({
@@ -61,9 +62,9 @@ class CreateGroupUseCaseImpl {
                 return Result.fail(result.error);
             }
             await this.eventPublisher.publish(new GroupAfterCreateEvent({
-                group: result.value
+                group
             }));
-            return Result.ok(result.value);
+            return Result.ok(group);
         } catch (error) {
             await this.eventPublisher.publish(new GroupCreateErrorEvent({
                 input,
@@ -74,15 +75,15 @@ class CreateGroupUseCaseImpl {
         }
     }
 }
-const CreateGroupUseCase_CreateGroupUseCase = createImplementation({
-    abstraction: CreateGroupUseCase,
+const CreateGroupUseCase_CreateGroupUseCase = CreateGroupUseCase.createImplementation({
     implementation: CreateGroupUseCaseImpl,
     dependencies: [
         EventPublisher,
         CreateGroupRepository,
         AccessControl,
         TenantContext,
-        IdentityContext
+        IdentityContext,
+        CmsContext
     ]
 });
 export { CreateGroupUseCase_CreateGroupUseCase as CreateGroupUseCase };

package/features/contentModelGroup/CreateGroup/CreateGroupUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateGroupRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeCreateEventEvent } from \"./events.js\";\nimport { GroupAfterCreateEvent } from \"./events.js\";\nimport { GroupCreateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport {\n    GroupNotAuthorizedError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { mdbid } from \"@webiny/utils\";\nimport { createGroupCreateValidation } from \"~/domain/contentModelGroup/validation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport type { CmsGroupCreateInput } from \"~/types/index.js\";\n\n/**\n * CreateGroupUseCase - Orchestrates group creation.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Create domain group object\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass CreateGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateGroupRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createGroupCreateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new GroupValidationError(zodError.message, zodError.data!.invalidFields)\n            );\n        }\n        const data = validationResult.data;\n\n        // Create domain group object\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const id = data.id || mdbid();\n        const group: CmsGroup = {\n            ...data,\n            id,\n            tenant: tenant.id,\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            }\n        };\n\n        // Access control check on created group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group, rwd: \"w\" });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(new GroupBeforeCreateEventEvent({ group }));\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupCreateErrorEvent({\n                        input,\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(\n                new GroupAfterCreateEvent({\n                    group: result.value\n                })\n            );\n\n            return Result.ok(result.value);\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupCreateErrorEvent({\n                    input,\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const CreateGroupUseCase = createImplementation({\n    abstraction: UseCaseAbstraction,\n    implementation: CreateGroupUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        CreateGroupRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext\n    ]\n});\n"],"names":["CreateGroupUseCaseImpl","eventPublisher","repository","accessControl","tenantContext","identityContext","input","canAccess","Result","GroupNotAuthorizedError","validationResult","createGroupCreateValidation","zodError","createZodError","GroupValidationError","data","identity","tenant","id","mdbid","group","Date","canAccessGroup","GroupBeforeCreateEventEvent","result","GroupCreateErrorEvent","GroupAfterCreateEvent","error","CreateGroupUseCase","createImplementation","UseCaseAbstraction","EventPublisher","CreateGroupRepository","AccessControl","TenantContext","IdentityContext"],"mappings":";;;;;;;;;;AAgCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,CACpD;aALUJ,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QAAQC,KAA0B,EAAuD;QAE3F,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmB,MAAMC,8BAA8B,cAAc,CAACL;QAC5E,IAAI,CAACI,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOF,OAAO,IAAI,CACd,IAAIM,qBAAqBF,SAAS,OAAO,EAAEA,SAAS,IAAI,CAAE,aAAa;QAE/E;QACA,MAAMG,OAAOL,iBAAiB,IAAI;QAGlC,MAAMM,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,KAAKH,KAAK,EAAE,IAAII;QACtB,MAAMC,QAAkB;YACpB,GAAGL,IAAI;YACPG;YACA,QAAQD,OAAO,EAAE;YACjB,WAAW,IAAII,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,WAAW;gBACP,IAAIL,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;QACJ;QAGA,MAAMM,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEF;YAAO,KAAK;QAAI;QACjF,IAAI,CAACE,gBACD,OAAOd,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIc,4BAA4B;gBAAEH;YAAM;YAG1E,MAAMI,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACJ;YAC7C,IAAII,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBnB;oBACAc;oBACA,OAAOI,OAAO,KAAK;gBACvB;gBAEJ,OAAOhB,OAAO,IAAI,CAACgB,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;gBACtB,OAAOF,OAAO,KAAK;YACvB;YAGJ,OAAOhB,OAAO,EAAE,CAACgB,OAAO,KAAK;QACjC,EAAE,OAAOG,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBnB;gBACAc;gBACA,OAAOO;YACX;YAEJ,OAAOnB,OAAO,IAAI,CAACmB;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgB9B;IAChB,cAAc;QACV+B;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateGroupRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeCreateEventEvent } from \"./events.js\";\nimport { GroupAfterCreateEvent } from \"./events.js\";\nimport { GroupCreateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport {\n    GroupNotAuthorizedError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { mdbid } from \"@webiny/utils\";\nimport { createGroupCreateValidation } from \"~/domain/contentModelGroup/validation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport type { CmsGroupCreateInput } from \"~/types/index.js\";\n\n/**\n * CreateGroupUseCase - Orchestrates group creation.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Create domain group object\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass CreateGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateGroupRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface,\n        private cmsContext: CmsContext.Interface\n    ) {}\n\n    async execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createGroupCreateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new GroupValidationError(zodError.message, zodError.data!.invalidFields)\n            );\n        }\n        const data = validationResult.data;\n\n        // Create domain group object\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const id = data.id || mdbid();\n        const group: CmsGroup = {\n            ...data,\n            id,\n            tenant: tenant.id,\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            }\n        };\n\n        // Access control check on created group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group, rwd: \"w\" });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(new GroupBeforeCreateEventEvent({ group }));\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupCreateErrorEvent({\n                        input,\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(new GroupAfterCreateEvent({ group }));\n\n            return Result.ok(group);\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupCreateErrorEvent({\n                    input,\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const CreateGroupUseCase = UseCaseAbstraction.createImplementation({\n    implementation: CreateGroupUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        CreateGroupRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext,\n        CmsContext\n    ]\n});\n"],"names":["CreateGroupUseCaseImpl","eventPublisher","repository","accessControl","tenantContext","identityContext","cmsContext","input","canAccess","Result","GroupNotAuthorizedError","validationResult","createGroupCreateValidation","zodError","createZodError","GroupValidationError","data","identity","tenant","id","mdbid","group","Date","canAccessGroup","GroupBeforeCreateEventEvent","result","GroupCreateErrorEvent","GroupAfterCreateEvent","error","CreateGroupUseCase","UseCaseAbstraction","EventPublisher","CreateGroupRepository","AccessControl","TenantContext","IdentityContext","CmsContext"],"mappings":";;;;;;;;;;AAgCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,EAC1CC,UAAgC,CAC1C;aANUL,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,KAA0B,EAAuD;QAE3F,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmB,MAAMC,8BAA8B,cAAc,CAACL;QAC5E,IAAI,CAACI,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOF,OAAO,IAAI,CACd,IAAIM,qBAAqBF,SAAS,OAAO,EAAEA,SAAS,IAAI,CAAE,aAAa;QAE/E;QACA,MAAMG,OAAOL,iBAAiB,IAAI;QAGlC,MAAMM,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,KAAKH,KAAK,EAAE,IAAII;QACtB,MAAMC,QAAkB;YACpB,GAAGL,IAAI;YACPG;YACA,QAAQD,OAAO,EAAE;YACjB,WAAW,IAAII,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,WAAW;gBACP,IAAIL,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;QACJ;QAGA,MAAMM,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEF;YAAO,KAAK;QAAI;QACjF,IAAI,CAACE,gBACD,OAAOd,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIc,4BAA4B;gBAAEH;YAAM;YAG1E,MAAMI,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACJ;YAC7C,IAAII,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBnB;oBACAc;oBACA,OAAOI,OAAO,KAAK;gBACvB;gBAEJ,OAAOhB,OAAO,IAAI,CAACgB,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIE,sBAAsB;gBAAEN;YAAM;YAEpE,OAAOZ,OAAO,EAAE,CAACY;QACrB,EAAE,OAAOO,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBnB;gBACAc;gBACA,OAAOO;YACX;YAEJ,OAAOnB,OAAO,IAAI,CAACmB;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,mBAAAA,oBAAuC,CAAC;IACtE,gBAAgB9B;IAChB,cAAc;QACV+B;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/CreateGroup/abstractions.d.ts

@@ -26,7 +26,7 @@ export declare namespace CreateGroupUseCase {
  * CreateGroupRepository - Persists a new group to storage.
  */
 export interface ICreateGroupRepository {
-    execute(group: CmsGroup): Promise<Result<CmsGroup, RepositoryError>>;
+    execute(group: CmsGroup): Promise<Result<void, RepositoryError>>;
 }
 export interface ICreateGroupRepositoryErrors {
     alreadyExists: GroupSlugTakenError;

package/features/contentModelGroup/CreateGroup/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/CreateGroup/abstractions.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsGroup, CmsGroupCreateInput } from \"~/types/index.js\";\nimport type {\n    GroupPersistenceError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport {\n    GroupNotAuthorizedError,\n    type GroupSlugTakenError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateGroup Use Case\n */\nexport interface ICreateGroupUseCase {\n    execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseError>>;\n}\n\nexport interface ICreateGroupUseCaseErrors {\n    notAuthorized: GroupNotAuthorizedError;\n    validation: GroupValidationError;\n    repository: RepositoryError;\n}\n\ntype UseCaseError = ICreateGroupUseCaseErrors[keyof ICreateGroupUseCaseErrors];\n\n/** Create a new content model group. */\nexport const CreateGroupUseCase = createAbstraction<ICreateGroupUseCase>(\"CreateGroupUseCase\");\n\nexport namespace CreateGroupUseCase {\n    export type Interface = ICreateGroupUseCase;\n    export type Input = CmsGroupCreateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsGroup, UseCaseError>>;\n}\n\n/**\n * CreateGroupRepository - Persists a new group to storage.\n */\nexport interface ICreateGroupRepository {\n    execute(group: CmsGroup): Promise<Result<CmsGroup, RepositoryError>>;\n}\n\nexport interface ICreateGroupRepositoryErrors {\n    alreadyExists: GroupSlugTakenError;\n    storage: GroupPersistenceError;\n}\n\ntype RepositoryError = ICreateGroupRepositoryErrors[keyof ICreateGroupRepositoryErrors];\n\nexport const CreateGroupRepository =\n    createAbstraction<ICreateGroupRepository>(\"CreateGroupRepository\");\n\nexport namespace CreateGroupRepository {\n    export type Interface = ICreateGroupRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateGroupUseCase","createAbstraction","CreateGroupRepository"],"mappings":";AA2BO,MAAMA,qBAAqBC,kBAAuC;AAwBlE,MAAMC,wBACTD,kBAA0C"}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/abstractions.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsGroup, CmsGroupCreateInput } from \"~/types/index.js\";\nimport type {\n    GroupPersistenceError,\n    GroupValidationError\n} from \"~/domain/contentModelGroup/errors.js\";\nimport {\n    GroupNotAuthorizedError,\n    type GroupSlugTakenError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateGroup Use Case\n */\nexport interface ICreateGroupUseCase {\n    execute(input: CmsGroupCreateInput): Promise<Result<CmsGroup, UseCaseError>>;\n}\n\nexport interface ICreateGroupUseCaseErrors {\n    notAuthorized: GroupNotAuthorizedError;\n    validation: GroupValidationError;\n    repository: RepositoryError;\n}\n\ntype UseCaseError = ICreateGroupUseCaseErrors[keyof ICreateGroupUseCaseErrors];\n\n/** Create a new content model group. */\nexport const CreateGroupUseCase = createAbstraction<ICreateGroupUseCase>(\"CreateGroupUseCase\");\n\nexport namespace CreateGroupUseCase {\n    export type Interface = ICreateGroupUseCase;\n    export type Input = CmsGroupCreateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsGroup, UseCaseError>>;\n}\n\n/**\n * CreateGroupRepository - Persists a new group to storage.\n */\nexport interface ICreateGroupRepository {\n    execute(group: CmsGroup): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface ICreateGroupRepositoryErrors {\n    alreadyExists: GroupSlugTakenError;\n    storage: GroupPersistenceError;\n}\n\ntype RepositoryError = ICreateGroupRepositoryErrors[keyof ICreateGroupRepositoryErrors];\n\nexport const CreateGroupRepository =\n    createAbstraction<ICreateGroupRepository>(\"CreateGroupRepository\");\n\nexport namespace CreateGroupRepository {\n    export type Interface = ICreateGroupRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateGroupUseCase","createAbstraction","CreateGroupRepository"],"mappings":";AA2BO,MAAMA,qBAAqBC,kBAAuC;AAwBlE,MAAMC,wBACTD,kBAA0C"}

package/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.d.ts

@@ -2,9 +2,9 @@ import { Result } from "@webiny/feature/api";
 import { DeleteGroupRepository as RepositoryAbstraction } from "./abstractions.js";
 import { GroupCache } from "../../../features/contentModelGroup/shared/abstractions.js";
 import { PluginGroupsProvider } from "../../../features/contentModelGroup/shared/abstractions.js";
-import { StorageOperations } from "../../../features/shared/abstractions.js";
+import { DeleteGroupStorageOperation } from "../../../features/shared/storageOperations/group/DeleteGroupStorageOperation.js";
+import { ListModelsStorageOperation } from "../../../features/shared/storageOperations/model/ListModelsStorageOperation.js";
 import type { CmsGroup } from "../../../types/index.js";
-import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 /**
  * DeleteGroupRepository - Validates and performs group deletion.
  *
@@ -17,10 +17,12 @@ import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 declare class DeleteGroupRepositoryImpl implements RepositoryAbstraction.Interface {
     private groupCache;
     private pluginGroupsProvider;
-    private storageOperations;
-    private runtimeTenant;
-    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, storageOperations: StorageOperations.Interface, runtimeTenant: RuntimeTenant.Interface);
-    execute(initialGroup: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>>;
+    private deleteGroup;
+    private listModels;
+    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, deleteGroup: DeleteGroupStorageOperation.Interface, listModels: ListModelsStorageOperation.Interface);
+    execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
-export declare const DeleteGroupRepository: import("@webiny/di").Implementation<typeof DeleteGroupRepositoryImpl>;
+export declare const DeleteGroupRepository: typeof DeleteGroupRepositoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IDeleteGroupRepository>;
+};
 export {};

package/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js

@@ -1,30 +1,29 @@
-import { Result, createImplementation } from "@webiny/feature/api";
+import { Result } from "@webiny/feature/api";
 import { DeleteGroupRepository } from "./abstractions.js";
 import { GroupCache, PluginGroupsProvider } from "../shared/abstractions.js";
 import { GroupCannotDeleteCodeDefinedError, GroupHasModelsError, GroupPersistenceError } from "../../../domain/contentModelGroup/errors.js";
-import { StorageOperations } from "../../shared/abstractions.js";
-import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
+import { DeleteGroupStorageOperation } from "../../shared/storageOperations/group/DeleteGroupStorageOperation.js";
+import { ListModelsStorageOperation } from "../../shared/storageOperations/model/ListModelsStorageOperation.js";
 class DeleteGroupRepositoryImpl {
-    constructor(groupCache, pluginGroupsProvider, storageOperations, runtimeTenant){
+    constructor(groupCache, pluginGroupsProvider, deleteGroup, listModels){
         this.groupCache = groupCache;
         this.pluginGroupsProvider = pluginGroupsProvider;
-        this.storageOperations = storageOperations;
-        this.runtimeTenant = runtimeTenant;
+        this.deleteGroup = deleteGroup;
+        this.listModels = listModels;
     }
-    async execute(initialGroup) {
-        const group = this.runtimeTenant.assign(initialGroup);
+    async execute(group) {
         try {
             const pluginGroups = await this.pluginGroupsProvider.getGroups();
             const isPluginGroup = pluginGroups.some((pg)=>pg.slug === group.slug);
             if (isPluginGroup) return Result.fail(new GroupCannotDeleteCodeDefinedError(group.id));
-            const models = await this.storageOperations.models.list({
+            const models = await this.listModels.execute({
                 where: {
                     tenant: group.tenant
                 }
             });
             const items = models.filter((model)=>model.group === group.slug);
             if (items.length > 0) return Result.fail(new GroupHasModelsError());
-            await this.storageOperations.groups.delete({
+            await this.deleteGroup.execute({
                 group
             });
             this.groupCache.clear();
@@ -34,14 +33,13 @@ class DeleteGroupRepositoryImpl {
         }
     }
 }
-const DeleteGroupRepository_DeleteGroupRepository = createImplementation({
-    abstraction: DeleteGroupRepository,
+const DeleteGroupRepository_DeleteGroupRepository = DeleteGroupRepository.createImplementation({
     implementation: DeleteGroupRepositoryImpl,
     dependencies: [
         GroupCache,
         PluginGroupsProvider,
-        StorageOperations,
-        RuntimeTenant
+        DeleteGroupStorageOperation,
+        ListModelsStorageOperation
     ]
 });
 export { DeleteGroupRepository_DeleteGroupRepository as DeleteGroupRepository };

package/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js","sources":["../../../../src/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { DeleteGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupCannotDeleteCodeDefinedError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupHasModelsError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * DeleteGroupRepository - Validates and performs group deletion.\n *\n * Responsibilities:\n * - Check if group is plugin-based (cannot delete)\n * - Check if models reference this group (cannot delete)\n * - Persist deletion to storage\n * - Clear GroupCache after successful deletion\n */\nclass DeleteGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialGroup: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        const group = this.runtimeTenant.assign(initialGroup);\n        try {\n            // Check if this is a plugin-based group (cannot be deleted)\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const isPluginGroup = pluginGroups.some(pg => pg.slug === group.slug);\n\n            if (isPluginGroup) {\n                return Result.fail(new GroupCannotDeleteCodeDefinedError(group.id));\n            }\n\n            // Check if any models reference this group\n            const models = await this.storageOperations.models.list({\n                where: {\n                    tenant: group.tenant\n                }\n            });\n\n            const items = models.filter(model => model.group === group.slug);\n            if (items.length > 0) {\n                return Result.fail(new GroupHasModelsError());\n            }\n\n            // Perform deletion\n            await this.storageOperations.groups.delete({ group });\n\n            // Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const DeleteGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: DeleteGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, RuntimeTenant]\n});\n"],"names":["DeleteGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","runtimeTenant","initialGroup","group","pluginGroups","isPluginGroup","pg","Result","GroupCannotDeleteCodeDefinedError","models","items","model","GroupHasModelsError","error","GroupPersistenceError","DeleteGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","RuntimeTenant"],"mappings":";;;;;;AAqBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,CAChD;aAJUH,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,YAAsB,EAAsD;QACtF,MAAMC,QAAQ,IAAI,CAAC,aAAa,CAAC,MAAM,CAACD;QACxC,IAAI;YAEA,MAAME,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,gBAAgBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKH,MAAM,IAAI;YAEpE,IAAIE,eACA,OAAOE,OAAO,IAAI,CAAC,IAAIC,kCAAkCL,MAAM,EAAE;YAIrE,MAAMM,SAAS,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBACpD,OAAO;oBACH,QAAQN,MAAM,MAAM;gBACxB;YACJ;YAEA,MAAMO,QAAQD,OAAO,MAAM,CAACE,CAAAA,QAASA,MAAM,KAAK,KAAKR,MAAM,IAAI;YAC/D,IAAIO,MAAM,MAAM,GAAG,GACf,OAAOH,OAAO,IAAI,CAAC,IAAIK;YAI3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAET;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOI,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;AACJ;AAEO,MAAME,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBpB;IAChB,cAAc;QAACqB;QAAYC;QAAsBC;QAAmBC;KAAc;AACtF"}
+{"version":3,"file":"features/contentModelGroup/DeleteGroup/DeleteGroupRepository.js","sources":["../../../../src/features/contentModelGroup/DeleteGroup/DeleteGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupCannotDeleteCodeDefinedError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupHasModelsError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { DeleteGroupStorageOperation } from \"~/features/shared/storageOperations/group/DeleteGroupStorageOperation.js\";\nimport { ListModelsStorageOperation } from \"~/features/shared/storageOperations/model/ListModelsStorageOperation.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * DeleteGroupRepository - Validates and performs group deletion.\n *\n * Responsibilities:\n * - Check if group is plugin-based (cannot delete)\n * - Check if models reference this group (cannot delete)\n * - Persist deletion to storage\n * - Clear GroupCache after successful deletion\n */\nclass DeleteGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private deleteGroup: DeleteGroupStorageOperation.Interface,\n        private listModels: ListModelsStorageOperation.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if this is a plugin-based group (cannot be deleted)\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const isPluginGroup = pluginGroups.some(pg => pg.slug === group.slug);\n\n            if (isPluginGroup) {\n                return Result.fail(new GroupCannotDeleteCodeDefinedError(group.id));\n            }\n\n            // Check if any models reference this group\n            const models = await this.listModels.execute({\n                where: {\n                    tenant: group.tenant\n                }\n            });\n\n            const items = models.filter(model => model.group === group.slug);\n            if (items.length > 0) {\n                return Result.fail(new GroupHasModelsError());\n            }\n\n            // Perform deletion\n            await this.deleteGroup.execute({ group });\n\n            // Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const DeleteGroupRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteGroupRepositoryImpl,\n    dependencies: [\n        GroupCache,\n        PluginGroupsProvider,\n        DeleteGroupStorageOperation,\n        ListModelsStorageOperation\n    ]\n});\n"],"names":["DeleteGroupRepositoryImpl","groupCache","pluginGroupsProvider","deleteGroup","listModels","group","pluginGroups","isPluginGroup","pg","Result","GroupCannotDeleteCodeDefinedError","models","items","model","GroupHasModelsError","error","GroupPersistenceError","DeleteGroupRepository","RepositoryAbstraction","GroupCache","PluginGroupsProvider","DeleteGroupStorageOperation","ListModelsStorageOperation"],"mappings":";;;;;;AAoBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,WAAkD,EAClDC,UAAgD,CAC1D;aAJUH,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,WAAW,GAAXA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YAEA,MAAMC,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,gBAAgBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKH,MAAM,IAAI;YAEpE,IAAIE,eACA,OAAOE,OAAO,IAAI,CAAC,IAAIC,kCAAkCL,MAAM,EAAE;YAIrE,MAAMM,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACzC,OAAO;oBACH,QAAQN,MAAM,MAAM;gBACxB;YACJ;YAEA,MAAMO,QAAQD,OAAO,MAAM,CAACE,CAAAA,QAASA,MAAM,KAAK,KAAKR,MAAM,IAAI;YAC/D,IAAIO,MAAM,MAAM,GAAG,GACf,OAAOH,OAAO,IAAI,CAAC,IAAIK;YAI3B,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBAAET;YAAM;YAGvC,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOI,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;AACJ;AAEO,MAAME,8CAAwBC,sBAAAA,oBAA0C,CAAC;IAC5E,gBAAgBlB;IAChB,cAAc;QACVmB;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.d.ts

@@ -22,5 +22,7 @@ declare class DeleteGroupUseCaseImpl implements UseCaseAbstraction.Interface {
     constructor(eventPublisher: EventPublisher.Interface, repository: DeleteGroupRepository.Interface, getGroupUseCase: GetGroupUseCase.Interface, accessControl: AccessControl.Interface);
     execute(groupId: string): Promise<Result<void, UseCaseAbstraction.Error>>;
 }
-export declare const DeleteGroupUseCase: import("@webiny/di").Implementation<typeof DeleteGroupUseCaseImpl>;
+export declare const DeleteGroupUseCase: typeof DeleteGroupUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IDeleteGroupUseCase>;
+};
 export {};

package/features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.js

@@ -1,4 +1,4 @@
-import { Result, createImplementation } from "@webiny/feature/api";
+import { Result } from "@webiny/feature/api";
 import { DeleteGroupRepository, DeleteGroupUseCase } from "./abstractions.js";
 import { GetGroupUseCase } from "../GetGroup/abstractions.js";
 import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
@@ -49,8 +49,7 @@ class DeleteGroupUseCaseImpl {
         }
     }
 }
-const DeleteGroupUseCase_DeleteGroupUseCase = createImplementation({
-    abstraction: DeleteGroupUseCase,
+const DeleteGroupUseCase_DeleteGroupUseCase = DeleteGroupUseCase.createImplementation({
     implementation: DeleteGroupUseCaseImpl,
     dependencies: [
         EventPublisher,

package/features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { DeleteGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { DeleteGroupRepository } from \"./abstractions.js\";\nimport { GetGroupUseCase } from \"~/features/contentModelGroup/GetGroup/abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeDeleteEvent } from \"./events.js\";\nimport { GroupAfterDeleteEvent } from \"./events.js\";\nimport { GroupDeleteErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { GroupNotAuthorizedError } from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * DeleteGroupUseCase - Orchestrates group deletion.\n *\n * Responsibilities:\n * - Fetch original group\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass DeleteGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: DeleteGroupRepository.Interface,\n        private getGroupUseCase: GetGroupUseCase.Interface,\n        private accessControl: AccessControl.Interface\n    ) {}\n\n    async execute(groupId: string): Promise<Result<void, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"d\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Fetch original group\n        const getResult = await this.getGroupUseCase.execute(groupId);\n        if (getResult.isFail()) {\n            return Result.fail(getResult.error);\n        }\n        const group = getResult.value;\n\n        // Access control check on group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(\n                new GroupBeforeDeleteEvent({\n                    group\n                })\n            );\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupDeleteErrorEvent({\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(\n                new GroupAfterDeleteEvent({\n                    group\n                })\n            );\n\n            return Result.ok();\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupDeleteErrorEvent({\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const DeleteGroupUseCase = createImplementation({\n    abstraction: UseCaseAbstraction,\n    implementation: DeleteGroupUseCaseImpl,\n    dependencies: [EventPublisher, DeleteGroupRepository, GetGroupUseCase, AccessControl]\n});\n"],"names":["DeleteGroupUseCaseImpl","eventPublisher","repository","getGroupUseCase","accessControl","groupId","canAccess","Result","GroupNotAuthorizedError","getResult","group","canAccessGroup","GroupBeforeDeleteEvent","result","GroupDeleteErrorEvent","GroupAfterDeleteEvent","error","DeleteGroupUseCase","createImplementation","UseCaseAbstraction","EventPublisher","DeleteGroupRepository","GetGroupUseCase","AccessControl"],"mappings":";;;;;;;AAsBA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,eAA0C,EAC1CC,aAAsC,CAChD;aAJUH,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,OAAe,EAAmD;QAE5E,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACJ;QACrD,IAAII,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAEtC,MAAMC,QAAQD,UAAU,KAAK;QAG7B,MAAME,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAED;QAAM;QACvE,IAAI,CAACC,gBACD,OAAOJ,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAII,uBAAuB;gBACvBF;YACJ;YAIJ,MAAMG,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACH;YAC7C,IAAIG,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBJ;oBACA,OAAOG,OAAO,KAAK;gBACvB;gBAEJ,OAAON,OAAO,IAAI,CAACM,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;gBACtBL;YACJ;YAGJ,OAAOH,OAAO,EAAE;QACpB,EAAE,OAAOS,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBJ;gBACA,OAAOM;YACX;YAEJ,OAAOT,OAAO,IAAI,CAACS;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgBnB;IAChB,cAAc;QAACoB;QAAgBC;QAAuBC;QAAiBC;KAAc;AACzF"}
+{"version":3,"file":"features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.js","sources":["../../../../src/features/contentModelGroup/DeleteGroup/DeleteGroupUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteGroupUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { DeleteGroupRepository } from \"./abstractions.js\";\nimport { GetGroupUseCase } from \"~/features/contentModelGroup/GetGroup/abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { GroupBeforeDeleteEvent } from \"./events.js\";\nimport { GroupAfterDeleteEvent } from \"./events.js\";\nimport { GroupDeleteErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { GroupNotAuthorizedError } from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * DeleteGroupUseCase - Orchestrates group deletion.\n *\n * Responsibilities:\n * - Fetch original group\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n */\nclass DeleteGroupUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: DeleteGroupRepository.Interface,\n        private getGroupUseCase: GetGroupUseCase.Interface,\n        private accessControl: AccessControl.Interface\n    ) {}\n\n    async execute(groupId: string): Promise<Result<void, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessGroup({ rwd: \"d\" });\n        if (!canAccess) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        // Fetch original group\n        const getResult = await this.getGroupUseCase.execute(groupId);\n        if (getResult.isFail()) {\n            return Result.fail(getResult.error);\n        }\n        const group = getResult.value;\n\n        // Access control check on group\n        const canAccessGroup = await this.accessControl.canAccessGroup({ group });\n        if (!canAccessGroup) {\n            return Result.fail(new GroupNotAuthorizedError());\n        }\n\n        try {\n            // Publish before event\n            await this.eventPublisher.publish(\n                new GroupBeforeDeleteEvent({\n                    group\n                })\n            );\n\n            // Persist via repository\n            const result = await this.repository.execute(group);\n            if (result.isFail()) {\n                // Publish error event\n                await this.eventPublisher.publish(\n                    new GroupDeleteErrorEvent({\n                        group,\n                        error: result.error\n                    })\n                );\n                return Result.fail(result.error);\n            }\n\n            // Publish after event\n            await this.eventPublisher.publish(\n                new GroupAfterDeleteEvent({\n                    group\n                })\n            );\n\n            return Result.ok();\n        } catch (error) {\n            // Publish error event for unexpected errors\n            await this.eventPublisher.publish(\n                new GroupDeleteErrorEvent({\n                    group,\n                    error: error as Error\n                })\n            );\n            return Result.fail(error as UseCaseAbstraction.Error);\n        }\n    }\n}\n\nexport const DeleteGroupUseCase = UseCaseAbstraction.createImplementation({\n    implementation: DeleteGroupUseCaseImpl,\n    dependencies: [EventPublisher, DeleteGroupRepository, GetGroupUseCase, AccessControl]\n});\n"],"names":["DeleteGroupUseCaseImpl","eventPublisher","repository","getGroupUseCase","accessControl","groupId","canAccess","Result","GroupNotAuthorizedError","getResult","group","canAccessGroup","GroupBeforeDeleteEvent","result","GroupDeleteErrorEvent","GroupAfterDeleteEvent","error","DeleteGroupUseCase","UseCaseAbstraction","EventPublisher","DeleteGroupRepository","GetGroupUseCase","AccessControl"],"mappings":";;;;;;;AAqBA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,eAA0C,EAC1CC,aAAsC,CAChD;aAJUH,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,OAAe,EAAmD;QAE5E,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACJ;QACrD,IAAII,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAEtC,MAAMC,QAAQD,UAAU,KAAK;QAG7B,MAAME,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAED;QAAM;QACvE,IAAI,CAACC,gBACD,OAAOJ,OAAO,IAAI,CAAC,IAAIC;QAG3B,IAAI;YAEA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAII,uBAAuB;gBACvBF;YACJ;YAIJ,MAAMG,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACH;YAC7C,IAAIG,OAAO,MAAM,IAAI;gBAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;oBACtBJ;oBACA,OAAOG,OAAO,KAAK;gBACvB;gBAEJ,OAAON,OAAO,IAAI,CAACM,OAAO,KAAK;YACnC;YAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;gBACtBL;YACJ;YAGJ,OAAOH,OAAO,EAAE;QACpB,EAAE,OAAOS,OAAO;YAEZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIF,sBAAsB;gBACtBJ;gBACA,OAAOM;YACX;YAEJ,OAAOT,OAAO,IAAI,CAACS;QACvB;IACJ;AACJ;AAEO,MAAMC,wCAAqBC,mBAAAA,oBAAuC,CAAC;IACtE,gBAAgBlB;IAChB,cAAc;QAACmB;QAAgBC;QAAuBC;QAAiBC;KAAc;AACzF"}

package/features/contentModelGroup/GetGroup/GetGroupRepository.d.ts

@@ -4,7 +4,7 @@ import { Result } from "@webiny/feature/api";
 import { GetGroupRepository as RepositoryAbstraction } from "./abstractions.js";
 import { GroupCache } from "../../../features/contentModelGroup/shared/abstractions.js";
 import { PluginGroupsProvider } from "../../../features/contentModelGroup/shared/abstractions.js";
-import { StorageOperations } from "../../../features/shared/abstractions.js";
+import { ListGroupsStorageOperation } from "../../../features/shared/storageOperations/group/ListGroupsStorageOperation.js";
 import { AccessControl } from "../../../features/shared/abstractions.js";
 import { CmsContext } from "../../../features/shared/abstractions.js";
 import type { CmsGroup } from "../../../types/index.js";
@@ -21,14 +21,16 @@ import type { CmsGroup } from "../../../types/index.js";
 declare class GetGroupRepositoryImpl implements RepositoryAbstraction.Interface {
     private groupCache;
     private pluginGroupsProvider;
-    private storageOperations;
+    private listGroups;
     private accessControl;
     private tenantContext;
     private identityContext;
     private cmsContext;
-    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, storageOperations: StorageOperations.Interface, accessControl: AccessControl.Interface, tenantContext: TenantContext.Interface, identityContext: IdentityContext.Interface, cmsContext: CmsContext.Interface);
+    constructor(groupCache: GroupCache.Interface, pluginGroupsProvider: PluginGroupsProvider.Interface, listGroups: ListGroupsStorageOperation.Interface, accessControl: AccessControl.Interface, tenantContext: TenantContext.Interface, identityContext: IdentityContext.Interface, cmsContext: CmsContext.Interface);
     execute(groupId: string): Promise<Result<CmsGroup, RepositoryAbstraction.Error>>;
     private fetchAllGroups;
 }
-export declare const GetGroupRepository: import("@webiny/di").Implementation<typeof GetGroupRepositoryImpl>;
+export declare const GetGroupRepository: typeof GetGroupRepositoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IGetGroupRepository>;
+};
 export {};

package/features/contentModelGroup/GetGroup/GetGroupRepository.js

@@ -1,17 +1,18 @@
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import { Result, createImplementation } from "@webiny/feature/api";
+import { Result } from "@webiny/feature/api";
 import { GetGroupRepository } from "./abstractions.js";
 import { GroupCache, PluginGroupsProvider } from "../shared/abstractions.js";
 import { GroupNotFoundError, GroupPersistenceError } from "../../../domain/contentModelGroup/errors.js";
-import { AccessControl, CmsContext, StorageOperations } from "../../shared/abstractions.js";
+import { ListGroupsStorageOperation } from "../../shared/storageOperations/group/ListGroupsStorageOperation.js";
+import { AccessControl, CmsContext } from "../../shared/abstractions.js";
 import { filterAsync } from "../../../utils/filterAsync.js";
 import { createCacheKey } from "../../../utils/index.js";
 class GetGroupRepositoryImpl {
-    constructor(groupCache, pluginGroupsProvider, storageOperations, accessControl, tenantContext, identityContext, cmsContext){
+    constructor(groupCache, pluginGroupsProvider, listGroups, accessControl, tenantContext, identityContext, cmsContext){
         this.groupCache = groupCache;
         this.pluginGroupsProvider = pluginGroupsProvider;
-        this.storageOperations = storageOperations;
+        this.listGroups = listGroups;
         this.accessControl = accessControl;
         this.tenantContext = tenantContext;
         this.identityContext = identityContext;
@@ -33,14 +34,14 @@ class GetGroupRepositoryImpl {
         const dbCacheKey = createCacheKey({
             tenant
         });
-        const databaseGroups = await this.groupCache.getOrSet(dbCacheKey, async ()=>await this.storageOperations.groups.list({
+        const databaseGroups = await this.groupCache.getOrSet(dbCacheKey, async ()=>await this.listGroups.execute({
                 where: {
                     tenant
                 }
             }));
         const filteredCacheKey = createCacheKey({
             dbCacheKey: dbCacheKey.get(),
-            identity: this.cmsContext.security.isAuthorizationEnabled() ? this.identityContext.getIdentity()?.id : void 0
+            identity: this.identityContext.isAuthorizationEnabled() ? this.identityContext.getIdentity()?.id : void 0
         });
         const filteredDatabaseGroups = await this.groupCache.getOrSet(filteredCacheKey, async ()=>filterAsync(databaseGroups, async (group)=>{
                 if (!group) return false;
@@ -54,13 +55,12 @@ class GetGroupRepositoryImpl {
         ];
     }
 }
-const GetGroupRepository_GetGroupRepository = createImplementation({
-    abstraction: GetGroupRepository,
+const GetGroupRepository_GetGroupRepository = GetGroupRepository.createImplementation({
     implementation: GetGroupRepositoryImpl,
     dependencies: [
         GroupCache,
         PluginGroupsProvider,
-        StorageOperations,
+        ListGroupsStorageOperation,
         AccessControl,
         TenantContext,
         IdentityContext,

package/features/contentModelGroup/GetGroup/GetGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModelGroup/GetGroup/GetGroupRepository.js","sources":["../../../../src/features/contentModelGroup/GetGroup/GetGroupRepository.ts"],"sourcesContent":["import { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { GetGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupNotFoundError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { filterAsync } from \"~/utils/filterAsync.js\";\nimport { createCacheKey } from \"~/utils/index.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * GetGroupRepository - Fetches a single group by ID.\n *\n * Responsibilities:\n * - Create cache keys based on tenant + identity\n * - Provide data loader functions to GroupCache\n * - Fetch from plugin groups + database groups\n * - Apply access control filtering\n * - Return the group or NotFoundError\n */\nclass GetGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface,\n        private cmsContext: CmsContext.Interface\n    ) {}\n\n    async execute(groupId: string): Promise<Result<CmsGroup, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Fetch all groups (plugin + database) with access control filtering\n            const groups = await this.fetchAllGroups(tenant.id);\n\n            const group = groups.find(g => g.id === groupId);\n\n            if (!group) {\n                return Result.fail(new GroupNotFoundError(groupId));\n            }\n\n            return Result.ok(group);\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async fetchAllGroups(tenant: string): Promise<CmsGroup[]> {\n        // 1. Fetch plugin groups (with caching and access control)\n        const pluginGroups = await this.pluginGroupsProvider.getGroups();\n\n        // 2. Fetch database groups (with caching)\n        const dbCacheKey = createCacheKey({ tenant });\n        const databaseGroups = await this.groupCache.getOrSet(dbCacheKey, async () => {\n            return await this.storageOperations.groups.list({\n                where: { tenant }\n            });\n        });\n\n        // 3. Apply access control to database groups (with caching)\n        const filteredCacheKey = createCacheKey({\n            dbCacheKey: dbCacheKey.get(),\n            identity: this.cmsContext.security.isAuthorizationEnabled()\n                ? this.identityContext.getIdentity()?.id\n                : undefined\n        });\n\n        const filteredDatabaseGroups = await this.groupCache.getOrSet(\n            filteredCacheKey,\n            async () => {\n                return filterAsync(databaseGroups, async (group?: CmsGroup) => {\n                    if (!group) {\n                        return false;\n                    }\n                    return this.accessControl.canAccessGroup({ group });\n                });\n            }\n        );\n\n        // 4. Merge plugin + database groups\n        return [...pluginGroups, ...filteredDatabaseGroups];\n    }\n}\n\nexport const GetGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: GetGroupRepositoryImpl,\n    dependencies: [\n        GroupCache,\n        PluginGroupsProvider,\n        StorageOperations,\n        AccessControl,\n        TenantContext,\n        IdentityContext,\n        CmsContext\n    ]\n});\n"],"names":["GetGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","accessControl","tenantContext","identityContext","cmsContext","groupId","tenant","groups","group","g","Result","GroupNotFoundError","error","GroupPersistenceError","pluginGroups","dbCacheKey","createCacheKey","databaseGroups","filteredCacheKey","undefined","filteredDatabaseGroups","filterAsync","GetGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","AccessControl","TenantContext","IdentityContext","CmsContext"],"mappings":";;;;;;;;;AA0BA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,EAC1CC,UAAgC,CAC1C;aAPUN,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,OAAe,EAA0D;QACnF,IAAI;YACA,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,MAAMC,SAAS,MAAM,IAAI,CAAC,cAAc,CAACD,OAAO,EAAE;YAElD,MAAME,QAAQD,OAAO,IAAI,CAACE,CAAAA,IAAKA,EAAE,EAAE,KAAKJ;YAExC,IAAI,CAACG,OACD,OAAOE,OAAO,IAAI,CAAC,IAAIC,mBAAmBN;YAG9C,OAAOK,OAAO,EAAE,CAACF;QACrB,EAAE,OAAOI,OAAO;YACZ,OAAOF,OAAO,IAAI,CAAC,IAAIG,sBAAsBD;QACjD;IACJ;IAEA,MAAc,eAAeN,MAAc,EAAuB;QAE9D,MAAMQ,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;QAG9D,MAAMC,aAAaC,eAAe;YAAEV;QAAO;QAC3C,MAAMW,iBAAiB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAACF,YAAY,UACvD,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5C,OAAO;oBAAET;gBAAO;YACpB;QAIJ,MAAMY,mBAAmBF,eAAe;YACpC,YAAYD,WAAW,GAAG;YAC1B,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,sBAAsB,KACnD,IAAI,CAAC,eAAe,CAAC,WAAW,IAAI,KACpCI;QACV;QAEA,MAAMC,yBAAyB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CACzDF,kBACA,UACWG,YAAYJ,gBAAgB,OAAOT;gBACtC,IAAI,CAACA,OACD,OAAO;gBAEX,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;oBAAEA;gBAAM;YACrD;QAKR,OAAO;eAAIM;eAAiBM;SAAuB;IACvD;AACJ;AAEO,MAAME,wCAAqBC,qBAAqB;IACnD,aAAaC;IACb,gBAAgB3B;IAChB,cAAc;QACV4B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModelGroup/GetGroup/GetGroupRepository.js","sources":["../../../../src/features/contentModelGroup/GetGroup/GetGroupRepository.ts"],"sourcesContent":["import { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { GetGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupNotFoundError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { ListGroupsStorageOperation } from \"~/features/shared/storageOperations/group/ListGroupsStorageOperation.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { filterAsync } from \"~/utils/filterAsync.js\";\nimport { createCacheKey } from \"~/utils/index.js\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * GetGroupRepository - Fetches a single group by ID.\n *\n * Responsibilities:\n * - Create cache keys based on tenant + identity\n * - Provide data loader functions to GroupCache\n * - Fetch from plugin groups + database groups\n * - Apply access control filtering\n * - Return the group or NotFoundError\n */\nclass GetGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private listGroups: ListGroupsStorageOperation.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface,\n        private cmsContext: CmsContext.Interface\n    ) {}\n\n    async execute(groupId: string): Promise<Result<CmsGroup, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Fetch all groups (plugin + database) with access control filtering\n            const groups = await this.fetchAllGroups(tenant.id);\n\n            const group = groups.find(g => g.id === groupId);\n\n            if (!group) {\n                return Result.fail(new GroupNotFoundError(groupId));\n            }\n\n            return Result.ok(group);\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async fetchAllGroups(tenant: string): Promise<CmsGroup[]> {\n        // 1. Fetch plugin groups (with caching and access control)\n        const pluginGroups = await this.pluginGroupsProvider.getGroups();\n\n        // 2. Fetch database groups (with caching)\n        const dbCacheKey = createCacheKey({ tenant });\n        const databaseGroups = await this.groupCache.getOrSet(dbCacheKey, async () => {\n            return await this.listGroups.execute({\n                where: { tenant }\n            });\n        });\n\n        // 3. Apply access control to database groups (with caching)\n        const filteredCacheKey = createCacheKey({\n            dbCacheKey: dbCacheKey.get(),\n            identity: this.identityContext.isAuthorizationEnabled()\n                ? this.identityContext.getIdentity()?.id\n                : undefined\n        });\n\n        const filteredDatabaseGroups = await this.groupCache.getOrSet(\n            filteredCacheKey,\n            async () => {\n                return filterAsync(databaseGroups, async (group?: CmsGroup) => {\n                    if (!group) {\n                        return false;\n                    }\n                    return this.accessControl.canAccessGroup({ group });\n                });\n            }\n        );\n\n        // 4. Merge plugin + database groups\n        return [...pluginGroups, ...filteredDatabaseGroups];\n    }\n}\n\nexport const GetGroupRepository = RepositoryAbstraction.createImplementation({\n    implementation: GetGroupRepositoryImpl,\n    dependencies: [\n        GroupCache,\n        PluginGroupsProvider,\n        ListGroupsStorageOperation,\n        AccessControl,\n        TenantContext,\n        IdentityContext,\n        CmsContext\n    ]\n});\n"],"names":["GetGroupRepositoryImpl","groupCache","pluginGroupsProvider","listGroups","accessControl","tenantContext","identityContext","cmsContext","groupId","tenant","groups","group","g","Result","GroupNotFoundError","error","GroupPersistenceError","pluginGroups","dbCacheKey","createCacheKey","databaseGroups","filteredCacheKey","undefined","filteredDatabaseGroups","filterAsync","GetGroupRepository","RepositoryAbstraction","GroupCache","PluginGroupsProvider","ListGroupsStorageOperation","AccessControl","TenantContext","IdentityContext","CmsContext"],"mappings":";;;;;;;;;;AAyBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,UAAgD,EAChDC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,EAC1CC,UAAgC,CAC1C;aAPUN,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,UAAU,GAAVA;IACT;IAEH,MAAM,QAAQC,OAAe,EAA0D;QACnF,IAAI;YACA,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,MAAMC,SAAS,MAAM,IAAI,CAAC,cAAc,CAACD,OAAO,EAAE;YAElD,MAAME,QAAQD,OAAO,IAAI,CAACE,CAAAA,IAAKA,EAAE,EAAE,KAAKJ;YAExC,IAAI,CAACG,OACD,OAAOE,OAAO,IAAI,CAAC,IAAIC,mBAAmBN;YAG9C,OAAOK,OAAO,EAAE,CAACF;QACrB,EAAE,OAAOI,OAAO;YACZ,OAAOF,OAAO,IAAI,CAAC,IAAIG,sBAAsBD;QACjD;IACJ;IAEA,MAAc,eAAeN,MAAc,EAAuB;QAE9D,MAAMQ,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;QAG9D,MAAMC,aAAaC,eAAe;YAAEV;QAAO;QAC3C,MAAMW,iBAAiB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAACF,YAAY,UACvD,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACjC,OAAO;oBAAET;gBAAO;YACpB;QAIJ,MAAMY,mBAAmBF,eAAe;YACpC,YAAYD,WAAW,GAAG;YAC1B,UAAU,IAAI,CAAC,eAAe,CAAC,sBAAsB,KAC/C,IAAI,CAAC,eAAe,CAAC,WAAW,IAAI,KACpCI;QACV;QAEA,MAAMC,yBAAyB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CACzDF,kBACA,UACWG,YAAYJ,gBAAgB,OAAOT;gBACtC,IAAI,CAACA,OACD,OAAO;gBAEX,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;oBAAEA;gBAAM;YACrD;QAKR,OAAO;eAAIM;eAAiBM;SAAuB;IACvD;AACJ;AAEO,MAAME,wCAAqBC,mBAAAA,oBAA0C,CAAC;IACzE,gBAAgB1B;IAChB,cAAc;QACV2B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModelGroup/GetGroup/GetGroupUseCase.d.ts

@@ -17,5 +17,7 @@ declare class GetGroupUseCaseImpl implements UseCaseAbstraction.Interface {
     constructor(repository: GetGroupRepository.Interface, accessControl: AccessControl.Interface);
     execute(groupId: string): Promise<Result<CmsGroup, UseCaseAbstraction.Error>>;
 }
-export declare const GetGroupUseCase: import("@webiny/di").Implementation<typeof GetGroupUseCaseImpl>;
+export declare const GetGroupUseCase: typeof GetGroupUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IGetGroupUseCase>;
+};
 export {};

package/features/contentModelGroup/GetGroup/GetGroupUseCase.js

@@ -1,4 +1,4 @@
-import { Result, createImplementation } from "@webiny/feature/api";
+import { Result } from "@webiny/feature/api";
 import { GetGroupRepository, GetGroupUseCase } from "./abstractions.js";
 import { AccessControl } from "../../shared/abstractions.js";
 import { GroupNotAuthorizedError } from "../../../domain/contentModelGroup/errors.js";
@@ -15,8 +15,7 @@ class GetGroupUseCaseImpl {
         return Result.ok(result.value);
     }
 }
-const GetGroupUseCase_GetGroupUseCase = createImplementation({
-    abstraction: GetGroupUseCase,
+const GetGroupUseCase_GetGroupUseCase = GetGroupUseCase.createImplementation({
     implementation: GetGroupUseCaseImpl,
     dependencies: [
         GetGroupRepository,