@owox/backend 0.25.0 → 0.26.0-next-20260515073306

package/dist/src/data-marts/data-destination-types/google-sheets/services/google-sheets-report-writer.js

@@ -210,6 +210,7 @@ let GoogleSheetsReportWriter = GoogleSheetsReportWriter_1 = class GoogleSheetsRe
         }
     }
     async initializeService(report) {
+        this.report = report;
         return this.executeWithErrorHandling(async () => {
             if (!(0, data_destination_config_guards_1.isGoogleSheetsConfig)(report.destinationConfig)) {
                 throw new Error('Invalid Google Sheets destination configuration provided');
@@ -241,7 +242,6 @@ let GoogleSheetsReportWriter = GoogleSheetsReportWriter_1 = class GoogleSheetsRe
             this.availableColumnsCount = sheet.properties?.gridProperties?.columnCount ?? 0;
             this.spreadsheetTimeZone = spreadsheet.properties?.timeZone ?? 'UTC';
             this.dataMartTitle = report.dataMart.title;
-            this.report = report;
         }, 'Initializing Google Sheets service and locating target sheet');
     }
     async prepareSheetColumns(columnsCount) {

package/dist/src/data-marts/data-storage-types/interfaces/__fixtures__/blended-query-builder-fixtures.d.ts

@@ -1,5 +1,7 @@
 import { DataMartRelationship } from '../../../entities/data-mart-relationship.entity';
 import { BlendedQueryContext, ResolvedRelationshipChain } from '../blended-query-builder.interface';
 export declare function makeRelationship(overrides?: Partial<DataMartRelationship>): DataMartRelationship;
-export declare function makeChain(partial: Omit<ResolvedRelationshipChain, 'targetDataMartTitle' | 'targetDataMartUrl'>): ResolvedRelationshipChain;
+export declare function makeChain(partial: Omit<ResolvedRelationshipChain, 'targetDataMartTitle' | 'targetDataMartUrl' | 'cteName'> & {
+    cteName?: string;
+}): ResolvedRelationshipChain;
 export declare function createBuildContext(mainTableReference: string): (chains: ResolvedRelationshipChain[], columns: string[]) => BlendedQueryContext;

package/dist/src/data-marts/data-storage-types/interfaces/__fixtures__/blended-query-builder-fixtures.js

@@ -17,8 +17,13 @@ function makeRelationship(overrides = {}) {
     };
 }
 function makeChain(partial) {
+    const cteName = partial.cteName ??
+        (partial.parentAlias === 'main'
+            ? partial.relationship.targetAlias
+            : `${partial.parentAlias}_${partial.relationship.targetAlias}`);
     return {
         ...partial,
+        cteName,
         targetDataMartTitle: 'Test Subsidiary',
         targetDataMartUrl: '/ui/proj/data-marts/sub-1/data-setup',
     };

package/dist/src/data-marts/data-storage-types/interfaces/abstract-blended-query-builder.js

@@ -53,11 +53,11 @@ class AbstractBlendedQueryBuilder {
     buildTree(chains) {
         const nodeMap = new Map();
         for (const chain of chains) {
-            nodeMap.set(chain.relationship.targetAlias, { chain, children: [] });
+            nodeMap.set(chain.cteName, { chain, children: [] });
         }
         const roots = [];
         for (const chain of chains) {
-            const node = nodeMap.get(chain.relationship.targetAlias);
+            const node = nodeMap.get(chain.cteName);
             if (chain.parentAlias === 'main') {
                 roots.push(node);
             }
@@ -75,10 +75,10 @@ class AbstractBlendedQueryBuilder {
         for (const child of node.children) {
             const childResult = this.buildSubtreeCtes(child);
             ctes.push(...childResult.ctes);
-            childPassthroughs.set(child.chain.relationship.targetAlias, childResult.passthroughFields);
+            childPassthroughs.set(child.chain.cteName, childResult.passthroughFields);
         }
         const { chain } = node;
-        const alias = chain.relationship.targetAlias;
+        const alias = chain.cteName;
         const subsidiaryColumns = this.collectSubsidiaryReferences(chain, node.children);
         ctes.push(this.buildRawCte(`${alias}_raw`, chain.targetTableReference, chain.targetDataMartTitle, chain.targetDataMartUrl, subsidiaryColumns));
         const hasChildren = node.children.length > 0;
@@ -110,7 +110,7 @@ class AbstractBlendedQueryBuilder {
     }
     buildJoinedCte(node, childPassthroughs) {
         const { chain } = node;
-        const alias = chain.relationship.targetAlias;
+        const alias = chain.cteName;
         const rawAlias = `${alias}_raw`;
         const joinedAlias = `${alias}_joined`;
         const quotedRawAlias = this.quoteIdentifier(rawAlias);
@@ -129,7 +129,7 @@ class AbstractBlendedQueryBuilder {
         }
         const joinClauses = [];
         for (const child of node.children) {
-            const childAlias = child.chain.relationship.targetAlias;
+            const childAlias = child.chain.cteName;
             const quotedChildAlias = this.quoteIdentifier(childAlias);
             for (const pt of childPassthroughs.get(childAlias) ?? []) {
                 selectParts.push(`${quotedChildAlias}.${this.quoteIdentifier(pt.outputAlias)}`);
@@ -194,11 +194,11 @@ class AbstractBlendedQueryBuilder {
         return Array.from(refs).sort();
     }
     buildAggregationCte(chain, hasChildren, passthroughFields) {
-        const { relationship, blendedFields } = chain;
-        const alias = this.quoteIdentifier(relationship.targetAlias);
+        const { relationship, blendedFields, cteName } = chain;
+        const alias = this.quoteIdentifier(cteName);
         const sourceAlias = hasChildren
-            ? this.quoteIdentifier(`${relationship.targetAlias}_joined`)
-            : this.quoteIdentifier(`${relationship.targetAlias}_raw`);
+            ? this.quoteIdentifier(`${cteName}_joined`)
+            : this.quoteIdentifier(`${cteName}_raw`);
         const parentJoinKeys = relationship.joinConditions.map(jc => this.quoteFieldRef(jc.targetFieldName));
         const groupByKeys = [...parentJoinKeys];
         const aggregatedParts = blendedFields.map(field => {
@@ -222,7 +222,7 @@ class AbstractBlendedQueryBuilder {
         const parts = [];
         const outputAliasToRoot = new Map();
         for (const root of roots) {
-            this.mapOutputAliasesToRoot(root, root.chain.relationship.targetAlias, outputAliasToRoot);
+            this.mapOutputAliasesToRoot(root, root.chain.cteName, outputAliasToRoot);
         }
         for (const col of columnSet) {
             const rootAlias = outputAliasToRoot.get(col);
@@ -246,8 +246,8 @@ class AbstractBlendedQueryBuilder {
     }
     buildJoinParts(roots) {
         return roots.map(root => {
-            const { relationship, parentAlias } = root.chain;
-            const alias = this.quoteIdentifier(relationship.targetAlias);
+            const { relationship, parentAlias, cteName } = root.chain;
+            const alias = this.quoteIdentifier(cteName);
             const parent = this.quoteIdentifier(parentAlias);
             const onParts = relationship.joinConditions.map(jc => `${parent}.${this.quoteFieldRef(jc.sourceFieldName)} = ${alias}.${this.quoteFieldRef(jc.targetFieldName)}`);
             const onClause = onParts.join(' AND ');

package/dist/src/data-marts/data-storage-types/interfaces/blended-query-builder.interface.d.ts

@@ -14,6 +14,7 @@ export interface ResolvedRelationshipChain {
     relationship: DataMartRelationship;
     targetTableReference: string;
     parentAlias: string;
+    cteName: string;
     blendedFields: BlendedFieldConfig[];
     targetDataMartTitle: string;
     targetDataMartUrl: string;

package/dist/src/data-marts/services/blended-report-data.service.js

@@ -56,7 +56,7 @@ let BlendedReportDataService = class BlendedReportDataService {
         const publicOrigin = this.publicOriginService.getPublicOrigin();
         const mainDataMartUrl = (0, data_mart_url_helper_1.buildDataMartUrl)(publicOrigin, dataMart.projectId, dataMart.id, '/data-setup');
         const allRelationships = await this.relationshipService.findBySourceDataMartId(dataMart.id);
-        const chains = await this.buildRelationshipChains(columnConfig, referencedColumns, blendableSchema.blendedFields, blendableSchema.availableSources, allRelationships, dataMart.id, dataMart.projectId, publicOrigin);
+        const chains = await this.buildRelationshipChains(columnConfig, referencedColumns, blendableSchema.blendedFields, blendableSchema.availableSources, allRelationships, dataMart.projectId, publicOrigin);
         const blendedResult = await this.blendedQueryBuilderFacade.buildBlendedQuery(dataMart.storage.type, {
             mainTableReference,
             mainDataMartTitle: dataMart.title,
@@ -88,7 +88,7 @@ let BlendedReportDataService = class BlendedReportDataService {
         }
         return headers;
     }
-    async buildRelationshipChains(columnConfig, referencedColumns, blendedFields, availableSources, directRelationships, rootDataMartId, projectId, publicOrigin) {
+    async buildRelationshipChains(columnConfig, referencedColumns, blendedFields, availableSources, directRelationships, projectId, publicOrigin) {
         const requestedBlendedFields = blendedFields.filter(f => referencedColumns.has(f.name));
         if (requestedBlendedFields.length === 0) {
             return [];
@@ -116,25 +116,25 @@ let BlendedReportDataService = class BlendedReportDataService {
                 relationshipsById.set(rel.id, rel);
             }
         }
-        const fieldsByRelId = new Map();
+        const fieldsByAliasPath = new Map();
         for (const field of requestedBlendedFields) {
-            const bucket = fieldsByRelId.get(field.sourceRelationshipId) ?? [];
+            const bucket = fieldsByAliasPath.get(field.aliasPath) ?? [];
             bucket.push(field);
-            fieldsByRelId.set(field.sourceRelationshipId, bucket);
+            fieldsByAliasPath.set(field.aliasPath, bucket);
         }
         const sortedSources = [...neededSources].sort((a, b) => a.depth - b.depth);
-        const dataMartAliasMap = new Map();
-        dataMartAliasMap.set(rootDataMartId, 'main');
         const columnConfigSet = new Set(columnConfig);
         const chains = [];
         for (const src of sortedSources) {
             const rel = relationshipsById.get(src.relationshipId);
             if (!rel)
                 continue;
-            const parentAlias = src.depth === 1 ? 'main' : (dataMartAliasMap.get(rel.sourceDataMart.id) ?? 'main');
+            const segments = src.aliasPath.split('.');
+            const cteName = segments.join('_');
+            const parentAlias = segments.length === 1 ? 'main' : segments.slice(0, -1).join('_');
             const targetTableReference = await this.tableReferenceService.resolveTableName(rel.targetDataMart.id, projectId);
             const targetDataMartUrl = (0, data_mart_url_helper_1.buildDataMartUrl)(publicOrigin, projectId, rel.targetDataMart.id, '/data-setup');
-            const chainBlendedFields = (fieldsByRelId.get(rel.id) ?? []).map(f => ({
+            const chainBlendedFields = (fieldsByAliasPath.get(src.aliasPath) ?? []).map(f => ({
                 targetFieldName: f.originalFieldName,
                 outputAlias: f.name,
                 isHidden: f.isHidden || !columnConfigSet.has(f.name),
@@ -144,26 +144,28 @@ let BlendedReportDataService = class BlendedReportDataService {
                 relationship: rel,
                 targetTableReference,
                 parentAlias,
+                cteName,
                 blendedFields: chainBlendedFields,
                 targetDataMartTitle: rel.targetDataMart.title,
                 targetDataMartUrl,
             });
-            dataMartAliasMap.set(rel.targetDataMart.id, rel.targetAlias);
         }
         this.assertNoChainCollisions(chains);
         return chains;
     }
     assertNoChainCollisions(chains) {
-        const aliasOwners = new Map();
+        const cteNameOwners = new Map();
         for (const chain of chains) {
-            const owners = aliasOwners.get(chain.relationship.targetAlias) ?? [];
+            const owners = cteNameOwners.get(chain.cteName) ?? [];
             owners.push(chain.relationship.id);
-            aliasOwners.set(chain.relationship.targetAlias, owners);
+            cteNameOwners.set(chain.cteName, owners);
         }
-        for (const [alias, owners] of aliasOwners) {
+        for (const [cteName, owners] of cteNameOwners) {
             if (owners.length > 1) {
-                throw new business_violation_exception_1.BusinessViolationException(`Duplicate CTE name: targetAlias "${alias}" is used by multiple relationships in the join chain. ` +
-                    `Rename the targetAlias on one of these relationships so each chain produces a unique CTE.`, { targetAlias: alias, relationshipIds: owners });
+                throw new business_violation_exception_1.BusinessViolationException(`Duplicate CTE name: cteName "${cteName}" is produced by multiple relationship chains. ` +
+                    `This typically means two relationship targetAlias values flatten to the same identifier ` +
+                    `(e.g. "a_b" at one level vs "a"+"b" at two levels). ` +
+                    `Rename the targetAlias on one of these relationships so each chain produces a unique CTE.`, { cteName, relationshipIds: owners });
             }
         }
         const outputAliasOwners = new Map();

package/dist/src/data-marts/use-cases/copy-report-as-data-mart.service.d.ts

@@ -1,15 +1,17 @@
 import { Repository } from 'typeorm';
-import { Report } from '../entities/report.entity';
-import { DataMart } from '../entities/data-mart.entity';
-import { DataMartService } from '../services/data-mart.service';
-import { ReportSqlComposerService } from '../services/report-sql-composer.service';
 import { CopyReportAsDataMartCommand } from '../dto/domain/copy-report-as-data-mart.command';
+import { DataMartDto } from '../dto/domain/data-mart.dto';
+import { Report } from '../entities/report.entity';
 import { AccessDecisionService } from '../services/access-decision';
+import { ReportSqlComposerService } from '../services/report-sql-composer.service';
+import { CreateDataMartService } from './create-data-mart.service';
+import { UpdateDataMartDefinitionService } from './update-data-mart-definition.service';
 export declare class CopyReportAsDataMartService {
     private readonly reportRepository;
     private readonly reportSqlComposerService;
-    private readonly dataMartService;
+    private readonly createDataMartService;
+    private readonly updateDataMartDefinitionService;
     private readonly accessDecisionService;
-    constructor(reportRepository: Repository<Report>, reportSqlComposerService: ReportSqlComposerService, dataMartService: DataMartService, accessDecisionService: AccessDecisionService);
-    run(command: CopyReportAsDataMartCommand): Promise<DataMart>;
+    constructor(reportRepository: Repository<Report>, reportSqlComposerService: ReportSqlComposerService, createDataMartService: CreateDataMartService, updateDataMartDefinitionService: UpdateDataMartDefinitionService, accessDecisionService: AccessDecisionService);
+    run(command: CopyReportAsDataMartCommand): Promise<DataMartDto>;
 }

package/dist/src/data-marts/use-cases/copy-report-as-data-mart.service.js

@@ -18,22 +18,26 @@ const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const typeorm_transactional_1 = require("typeorm-transactional");
 const business_violation_exception_1 = require("../../common/exceptions/business-violation.exception");
+const copy_report_as_data_mart_command_1 = require("../dto/domain/copy-report-as-data-mart.command");
+const create_data_mart_command_1 = require("../dto/domain/create-data-mart.command");
+const update_data_mart_definition_command_1 = require("../dto/domain/update-data-mart-definition.command");
 const report_entity_1 = require("../entities/report.entity");
 const data_mart_definition_type_enum_1 = require("../enums/data-mart-definition-type.enum");
-const data_mart_status_enum_1 = require("../enums/data-mart-status.enum");
-const data_mart_service_1 = require("../services/data-mart.service");
-const report_sql_composer_service_1 = require("../services/report-sql-composer.service");
-const copy_report_as_data_mart_command_1 = require("../dto/domain/copy-report-as-data-mart.command");
 const access_decision_1 = require("../services/access-decision");
+const report_sql_composer_service_1 = require("../services/report-sql-composer.service");
+const create_data_mart_service_1 = require("./create-data-mart.service");
+const update_data_mart_definition_service_1 = require("./update-data-mart-definition.service");
 let CopyReportAsDataMartService = class CopyReportAsDataMartService {
     reportRepository;
     reportSqlComposerService;
-    dataMartService;
+    createDataMartService;
+    updateDataMartDefinitionService;
     accessDecisionService;
-    constructor(reportRepository, reportSqlComposerService, dataMartService, accessDecisionService) {
+    constructor(reportRepository, reportSqlComposerService, createDataMartService, updateDataMartDefinitionService, accessDecisionService) {
         this.reportRepository = reportRepository;
         this.reportSqlComposerService = reportSqlComposerService;
-        this.dataMartService = dataMartService;
+        this.createDataMartService = createDataMartService;
+        this.updateDataMartDefinitionService = updateDataMartDefinitionService;
         this.accessDecisionService = accessDecisionService;
     }
     async run(command) {
@@ -64,19 +68,8 @@ let CopyReportAsDataMartService = class CopyReportAsDataMartService {
         if (!sql.trim()) {
             throw new business_violation_exception_1.BusinessViolationException('Unable to copy this report: generated SQL is empty. Ensure the report has a valid column configuration.', { reportId: command.reportId });
         }
-        const { dataMart: sourceDataMart } = report;
-        const definition = { sqlQuery: sql };
-        const newDataMart = this.dataMartService.create({
-            title: `Copy of ${report.title}`,
-            projectId: command.projectId,
-            createdById: command.userId,
-            technicalOwnerIds: [command.userId],
-            storage: sourceDataMart.storage,
-            definitionType: data_mart_definition_type_enum_1.DataMartDefinitionType.SQL,
-            definition,
-            status: data_mart_status_enum_1.DataMartStatus.DRAFT,
-        });
-        return this.dataMartService.save(newDataMart);
+        const createdDataMart = await this.createDataMartService.run(new create_data_mart_command_1.CreateDataMartCommand(command.projectId, command.userId, `Copy of ${report.title}`, report.dataMart.storage.id, command.roles));
+        return this.updateDataMartDefinitionService.run(new update_data_mart_definition_command_1.UpdateDataMartDefinitionCommand(createdDataMart.id, command.projectId, data_mart_definition_type_enum_1.DataMartDefinitionType.SQL, { sqlQuery: sql }, undefined, undefined, command.userId, command.roles));
     }
 };
 exports.CopyReportAsDataMartService = CopyReportAsDataMartService;
@@ -91,7 +84,8 @@ exports.CopyReportAsDataMartService = CopyReportAsDataMartService = __decorate([
     __param(0, (0, typeorm_1.InjectRepository)(report_entity_1.Report)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         report_sql_composer_service_1.ReportSqlComposerService,
-        data_mart_service_1.DataMartService,
+        create_data_mart_service_1.CreateDataMartService,
+        update_data_mart_definition_service_1.UpdateDataMartDefinitionService,
         access_decision_1.AccessDecisionService])
 ], CopyReportAsDataMartService);
 //# sourceMappingURL=copy-report-as-data-mart.service.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owox/backend",
-  "version": "0.25.0",
+  "version": "0.26.0-next-20260515073306",
   "description": "OWOX Data Marts Backend - Full-stack data orchestration platform",
   "author": "OWOX",
   "license": "ELv2",
@@ -78,9 +78,9 @@
     "@nestjs/schedule": "^6.0.0",
     "@nestjs/swagger": "^11.2.0",
     "@nestjs/typeorm": "^11.0.0",
-    "@owox/connectors": "0.25.0",
-    "@owox/idp-protocol": "0.25.0",
-    "@owox/internal-helpers": "0.25.0",
+    "@owox/connectors": "0.26.0-next-20260515073306",
+    "@owox/idp-protocol": "0.26.0-next-20260515073306",
+    "@owox/internal-helpers": "0.26.0-next-20260515073306",
     "better-sqlite3": "^12.2.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
@@ -139,7 +139,7 @@
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typeorm-ts-node-commonjs": "^0.3.20",
-    "@owox/test-utils": "*"
+    "@owox/test-utils": "5.0.0-next-20260515073306"
   },
   "jest": {
     "moduleFileExtensions": [