testit-js-commons 4.1.1 → 4.1.2

package/lib/helpers/config/config.helper.js

@@ -168,7 +168,8 @@ class ConfigComposer {
         }
         if (config.adapterMode == 2) {
             if (config.testRunId.match('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$') !== null) {
-                logger_1.default.error(`Adapter works in mode 2. Config should not contains test run id.`);
+                logger_1.default.warn(`Adapter works in mode 2. Config should not contains test run id.`);
+                config.testRunId = "";
             }
         }
         else if (config.adapterMode == 1) {

package/lib/services/autotests/autotests.handler.d.ts

@@ -1 +1,2 @@
+export declare function isConflictError(err: unknown): boolean;
 export declare function handleHttpError(err: any, message?: string): void;

package/lib/services/autotests/autotests.handler.js

@@ -3,8 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isConflictError = isConflictError;
 exports.handleHttpError = handleHttpError;
+const utils_1 = require("../../common/utils");
 const logger_1 = __importDefault(require("../../logger"));
+function isConflictError(err) {
+    var _a;
+    const e = (0, utils_1.unwrapHttpError)(err);
+    const body = (_a = err === null || err === void 0 ? void 0 : err.body) !== null && _a !== void 0 ? _a : e === null || e === void 0 ? void 0 : e.body;
+    return (body === null || body === void 0 ? void 0 : body.type) === "ConflictException" || (0, utils_1.getHttpStatus)(e !== null && e !== void 0 ? e : {}) === 409;
+}
 function handleHttpError(err, message = "") {
     logger_1.default.error(`HttpError ${err.statusCode}: ${message}. Error body: \n`, err.body);
 }

package/lib/services/autotests/autotests.service.js

@@ -64,11 +64,22 @@ class AutotestsService extends common_1.BaseService {
             const autotestPost = this._converter.toOriginAutotest(autotest);
             (0, common_1.escapeHtmlInObject)(autotestPost);
             logger_1.default.debug("[autotests] createAutoTest", { externalId: autotest.externalId, name: autotest.name });
-            return yield (0, common_1.withHttpRetry)(() => this._client
-                .createAutoTest({ autoTestCreateApiModel: autotestPost }), { label: "createAutoTest" })
-                .then(() => logger_1.default.log(`Create autotest "${autotest.name}".`))
+            try {
+                yield (0, common_1.withHttpRetry)(() => this._client.createAutoTest({ autoTestCreateApiModel: autotestPost }), { label: "createAutoTest" });
+                logger_1.default.log(`Create autotest "${autotest.name}".`);
+            }
+            catch (err) {
+                if ((0, autotests_handler_1.isConflictError)(err)) {
+                    logger_1.default.debug("[autotests] createAutoTest skipped: already exists", {
+                        externalId: autotest.externalId,
+                        name: autotest.name,
+                    });
+                    return;
+                }
                 // @ts-ignore
-                .catch((err) => (0, autotests_handler_1.handleHttpError)(err, `Failed create autotest "${autotestPost.name}"`));
+                (0, autotests_handler_1.handleHttpError)(err, `Failed create autotest "${autotestPost.name}"`);
+                throw err;
+            }
         });
     }
     updateAutotest(autotest) {
@@ -87,13 +98,19 @@ class AutotestsService extends common_1.BaseService {
     loadAutotest(autotest, status) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const originAutotest = yield this.getAutotestByExternalId(autotest.externalId);
+            let originAutotest = yield this.getAutotestByExternalId(autotest.externalId);
             if (!originAutotest) {
                 logger_1.default.debug("[autotests] loadAutotest → create", { externalId: autotest.externalId, status });
                 yield this.createAutotest(autotest);
-                return;
+                originAutotest = yield this.getAutotestByExternalId(autotest.externalId);
+                if (!originAutotest) {
+                    logger_1.default.log(`Cannot load autotest "${autotest.name}": not found after create`);
+                    return;
+                }
+            }
+            else {
+                logger_1.default.debug("[autotests] loadAutotest → update path", { externalId: autotest.externalId, status });
             }
-            logger_1.default.debug("[autotests] loadAutotest → update path", { externalId: autotest.externalId, status });
             const mergedAutotest = Object.assign(Object.assign({}, autotest), { namespace: (_a = autotest.namespace) !== null && _a !== void 0 ? _a : originAutotest.namespace, classname: (_b = autotest.classname) !== null && _b !== void 0 ? _b : originAutotest.classname });
             // fix the issue with lowercase status
             const currentStatus = status.toLowerCase();
@@ -163,6 +180,7 @@ class AutotestsService extends common_1.BaseService {
     }
     getAutotestByExternalId(externalId) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const filterModel = {
                 externalIds: [externalId],
                 projectIds: [this.config.projectId],
@@ -177,20 +195,21 @@ class AutotestsService extends common_1.BaseService {
                 filter: filterModel,
                 includes: includesModel,
             };
-            return yield this._client
-                .apiV2AutoTestsSearchPost({ autoTestSearchApiModel: requestModel })
+            try {
+                const response = yield (0, common_1.withHttpRetry)(() => this._client.apiV2AutoTestsSearchPost({ autoTestSearchApiModel: requestModel }), { label: `searchAutoTest:${externalId}` });
                 // @ts-ignore
-                .then((response) => {
                 const data = response.body || response;
-                return data ? data[0] : null;
-            })
-                .then((autotest) => {
+                const autotest = data ? data[0] : null;
                 return autotest ? this._converter.toLocalAutotest(autotest) : null;
-            })
-                .catch((reason) => {
-                logger_1.default.error(reason);
+            }
+            catch (reason) {
+                logger_1.default.error("[autotests] getAutotestByExternalId failed", {
+                    externalId,
+                    code: reason === null || reason === void 0 ? void 0 : reason.code,
+                    status: (_a = reason === null || reason === void 0 ? void 0 : reason.status) !== null && _a !== void 0 ? _a : reason === null || reason === void 0 ? void 0 : reason.statusCode,
+                });
                 return null;
-            });
+            }
         });
     }
 }

package/lib/services/testresults/testresults.converter.d.ts

@@ -2,8 +2,11 @@ import { TestResultsFilterApiModel } from "testit-api-client";
 import { AdapterConfig, BaseConverter } from "../../common";
 export interface ITestResultsConverter {
     getTestResultsFilterApiModel(): TestResultsFilterApiModel;
+    getTestResultsFilterForRun(): TestResultsFilterApiModel;
 }
 export declare class TestResultsConverter extends BaseConverter implements ITestResultsConverter {
     constructor(config: AdapterConfig);
+    private buildRunFilter;
     getTestResultsFilterApiModel(): TestResultsFilterApiModel;
+    getTestResultsFilterForRun(): TestResultsFilterApiModel;
 }

package/lib/services/testresults/testresults.converter.js

@@ -6,11 +6,11 @@ class TestResultsConverter extends common_1.BaseConverter {
     constructor(config) {
         super(config);
     }
-    getTestResultsFilterApiModel() {
-        const model = {
+    buildRunFilter(statusTypes) {
+        return {
             testRunIds: [this.config.testRunId],
             configurationIds: [this.config.configurationId],
-            statusTypes: ["InProgress"],
+            statusTypes,
             statusCodes: undefined,
             outcomes: undefined,
             failureCategories: undefined,
@@ -25,9 +25,14 @@ class TestResultsConverter extends common_1.BaseConverter {
             duration: undefined,
             resultReasons: undefined,
             autoTestTags: undefined,
-            excludeAutoTestTags: undefined
+            excludeAutoTestTags: undefined,
         };
-        return model;
+    }
+    getTestResultsFilterApiModel() {
+        return this.buildRunFilter(["InProgress"]);
+    }
+    getTestResultsFilterForRun() {
+        return this.buildRunFilter(undefined);
     }
 }
 exports.TestResultsConverter = TestResultsConverter;

package/lib/services/testresults/testresults.service.d.ts

@@ -9,5 +9,7 @@ export declare class TestResultsService extends BaseService implements ITestResu
     protected _testsLimit: number;
     constructor(config: AdapterConfig);
     getExternalIdsForRun(): Promise<string[]>;
+    findTestResultIdByExternalId(externalId: string): Promise<string | undefined>;
+    updateTestResult(testResultId: string, model: unknown): Promise<void>;
     private getTestResults;
 }

package/lib/services/testresults/testresults.service.js

@@ -46,6 +46,7 @@ exports.TestResultsService = void 0;
 // @ts-ignore
 const TestitApiClient = __importStar(require("testit-api-client"));
 const common_1 = require("../../common");
+const utils_1 = require("../../common/utils");
 const testresults_handler_1 = require("./testresults.handler");
 const testresults_converter_1 = require("./testresults.converter");
 class TestResultsService extends common_1.BaseService {
@@ -65,7 +66,7 @@ class TestResultsService extends common_1.BaseService {
                 const testResults = yield this.getTestResults(skip, model);
                 if (testResults.length != 0) {
                     externalIds = externalIds.concat(testResults.map((// @ts-ignore
-                    result) => result.autotestExternalId).filter((id) => id !== undefined));
+                    result) => { var _a, _b; return (_a = result.autotestExternalId) !== null && _a !== void 0 ? _a : (_b = result.autoTest) === null || _b === void 0 ? void 0 : _b.externalId; }).filter((id) => id !== undefined));
                     skip += this._testsLimit;
                     continue;
                 }
@@ -73,6 +74,36 @@ class TestResultsService extends common_1.BaseService {
             }
         });
     }
+    findTestResultIdByExternalId(externalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const model = this._converter.getTestResultsFilterForRun();
+            let skip = 0;
+            while (true) {
+                const batch = yield this.getTestResults(skip, model);
+                if (batch.length === 0) {
+                    return undefined;
+                }
+                for (const row of batch) {
+                    const rowExternalId = (_a = row.autotestExternalId) !== null && _a !== void 0 ? _a : (_b = row.autoTest) === null || _b === void 0 ? void 0 : _b.externalId;
+                    if (rowExternalId === externalId && row.id) {
+                        return row.id;
+                    }
+                }
+                skip += this._testsLimit;
+                if (batch.length < this._testsLimit) {
+                    return undefined;
+                }
+            }
+        });
+    }
+    updateTestResult(testResultId, model) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, utils_1.withHttpRetry)(() => this._client.apiV2TestResultsIdPut(testResultId, {
+                testResultUpdateV2Request: model,
+            }), { label: `apiV2TestResultsIdPut:${testResultId}` });
+        });
+    }
     getTestResults(skip, model) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this._client

package/lib/services/testresults/testresults.type.d.ts

@@ -1,3 +1,5 @@
 export interface ITestResultsService {
     getExternalIdsForRun(): Promise<string[]>;
+    findTestResultIdByExternalId(externalId: string): Promise<string | undefined>;
+    updateTestResult(testResultId: string, model: unknown): Promise<void>;
 }

package/lib/services/testruns/testruns.converter.d.ts

@@ -7,6 +7,7 @@ export interface ITestRunConverter {
     toLocalTestRun(testRun: TestRunV2ApiResult): TestRunGet;
     toOriginAutotestResult(autotest: AutotestResult): AutoTestResultsForTestRunModel;
     toOriginAutotestResultInProgress(autotest: AutotestResult): AutoTestResultsForTestRunModel;
+    toOriginTestResultUpdate(autotest: AutotestResult): unknown;
 }
 export declare class TestRunConverter extends BaseConverter implements ITestRunConverter {
     private autotestConverter;
@@ -16,5 +17,6 @@ export declare class TestRunConverter extends BaseConverter implements ITestRunC
     mapToStatusType(status: Outcome): string;
     toOriginAutotestResultInProgress(autotest: AutotestResult): AutoTestResultsForTestRunModel;
     toOriginAutotestResult(autotest: AutotestResult): AutoTestResultsForTestRunModel;
+    toOriginTestResultUpdate(autotest: AutotestResult): unknown;
     toLocalTestRun(testRun: TestRunV2ApiResult): TestRunGet;
 }

package/lib/services/testruns/testruns.converter.js

@@ -62,6 +62,26 @@ class TestRunConverter extends common_1.BaseConverter {
         }
         return model;
     }
+    toOriginTestResultUpdate(autotest) {
+        var _a, _b, _c, _d, _e;
+        const model = {
+            outcome: this.toOriginOutcome(autotest.outcome),
+            statusType: this.mapToStatusType(autotest.outcome),
+            statusCode: null,
+            links: (_a = autotest.links) === null || _a === void 0 ? void 0 : _a.map((link) => this.toOriginLink(link)),
+            stepResults: (_b = autotest.stepResults) === null || _b === void 0 ? void 0 : _b.map((step) => this.toOriginStep(step)),
+            setupResults: (_c = autotest.setupResults) === null || _c === void 0 ? void 0 : _c.map((step) => this.toOriginStep(step)),
+            teardownResults: (_d = autotest.teardownResults) === null || _d === void 0 ? void 0 : _d.map((step) => this.toOriginStep(step)),
+            attachments: (_e = autotest.attachments) === null || _e === void 0 ? void 0 : _e.map((attachment) => ({ id: attachment.id })),
+            message: autotest.message,
+            trace: autotest.traces,
+        };
+        if (autotest.duration !== undefined) {
+            model.durationInMs = autotest.duration;
+            model.duration = autotest.duration;
+        }
+        return model;
+    }
     toLocalTestRun(testRun) {
         var _a, _b, _c, _d;
         return {

package/lib/services/testruns/testruns.service.d.ts

@@ -6,6 +6,9 @@ export declare class TestRunsService extends BaseService implements ITestRunsSer
     protected readonly config: AdapterConfig;
     protected _client: TestitApiClient.TestRunsApi;
     protected _converter: ITestRunConverter;
+    private readonly _testResults;
+    /** testResultId by autoTestExternalId within current run (InProgress POST + search). */
+    private readonly testResultIdsByExternalId;
     constructor(config: AdapterConfig);
     createTestRun(): Promise<TestRunId>;
     getTestRun(testRunId: TestRunId): Promise<TestRunGet>;
@@ -14,5 +17,8 @@ export declare class TestRunsService extends BaseService implements ITestRunsSer
     completeTestRun(testRunId: TestRunId): Promise<void>;
     postInProgressAutotestResult(testRunId: string, result: AutotestResult): Promise<void>;
     loadAutotests(testRunId: string, results: Array<AutotestResult>): Promise<void>;
+    private resolveExistingTestResultId;
+    private rememberCreatedTestResultId;
     private sendAutotestResultWithRetry;
+    private updateAutotestResultWithRetry;
 }

package/lib/services/testruns/testruns.service.js

@@ -50,6 +50,7 @@ exports.TestRunsService = void 0;
 const TestitApiClient = __importStar(require("testit-api-client"));
 const common_1 = require("../../common");
 const utils_1 = require("../../common/utils");
+const testresults_1 = require("../testresults");
 const testruns_converter_1 = require("./testruns.converter");
 const testruns_handler_1 = require("./testruns.handler");
 const logger_1 = __importDefault(require("../../logger"));
@@ -57,8 +58,11 @@ class TestRunsService extends common_1.BaseService {
     constructor(config) {
         super(config);
         this.config = config;
+        /** testResultId by autoTestExternalId within current run (InProgress POST + search). */
+        this.testResultIdsByExternalId = new Map();
         this._client = new TestitApiClient.TestRunsApi();
         this._converter = new testruns_converter_1.TestRunConverter(config);
+        this._testResults = new testresults_1.TestResultsService(config);
     }
     createTestRun() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -70,7 +74,6 @@ class TestRunsService extends common_1.BaseService {
                 .createEmpty({ createEmptyTestRunApiModel: (0, utils_1.escapeHtmlInObject)(createRequest) })
                 // @ts-ignore
                 .then((response) => {
-                //logger.debug("Full response from createEmpty:", response);
                 const data = response.body || response;
                 if (!data) {
                     throw new Error("API returned undefined response");
@@ -161,16 +164,37 @@ class TestRunsService extends common_1.BaseService {
     }
     loadAutotests(testRunId, results) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const autotestResultsForTestRun = results.map((result) => this._converter.toOriginAutotestResult(result));
-            (0, utils_1.escapeHtmlInObjectArray)(autotestResultsForTestRun);
-            for (const autotestResult of autotestResultsForTestRun) {
+            var _a, _b, _c, _d;
+            for (const result of results) {
+                const externalId = result.autoTestExternalId;
+                const existingId = yield this.resolveExistingTestResultId(externalId);
+                if (existingId) {
+                    (0, utils_1.logTmsLoadTestRun)("PUT updateTestResult (final)", {
+                        testRunId,
+                        autoTestExternalId: externalId,
+                        testResultId: existingId,
+                        stepCount: (_b = (_a = result.stepResults) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0,
+                    });
+                    yield this.updateAutotestResultWithRetry(existingId, result).catch((err) => {
+                        var _a, _b;
+                        const normalized = (_b = (_a = err === null || err === void 0 ? void 0 : err.body) !== null && _a !== void 0 ? _a : err === null || err === void 0 ? void 0 : err.error) !== null && _b !== void 0 ? _b : err;
+                        logger_1.default.error("[testit-js-commons:loadTestRun] FAILED to update final result", {
+                            testRunId,
+                            autoTestExternalId: externalId,
+                            testResultId: existingId,
+                            error: normalized,
+                        });
+                    });
+                    continue;
+                }
+                const autotestResult = this._converter.toOriginAutotestResult(result);
+                (0, utils_1.escapeHtmlInObject)(autotestResult);
                 (0, utils_1.logTmsLoadTestRun)("POST setAutoTestResults (final)", {
                     testRunId,
                     autoTestExternalId: autotestResult.autoTestExternalId,
                     statusType: autotestResult.statusType,
                     statusCode: autotestResult.statusCode,
-                    stepCount: (_b = (_a = autotestResult.stepResults) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0,
+                    stepCount: (_d = (_c = autotestResult.stepResults) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0,
                 });
                 yield this.sendAutotestResultWithRetry(testRunId, autotestResult).catch((err) => {
                     var _a, _b;
@@ -184,19 +208,55 @@ class TestRunsService extends common_1.BaseService {
             }
         });
     }
+    resolveExistingTestResultId(externalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cached = this.testResultIdsByExternalId.get(externalId);
+            if (cached) {
+                return cached;
+            }
+            const found = yield this._testResults.findTestResultIdByExternalId(externalId);
+            if (found) {
+                this.testResultIdsByExternalId.set(externalId, found);
+            }
+            return found;
+        });
+    }
+    rememberCreatedTestResultId(externalId, ids) {
+        if (!externalId) {
+            return;
+        }
+        const list = Array.isArray(ids) ? ids : ids != null ? [ids] : [];
+        const id = list[0];
+        if (typeof id === "string" && id.length > 0) {
+            this.testResultIdsByExternalId.set(externalId, id);
+        }
+    }
     sendAutotestResultWithRetry(testRunId, autotestResult) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            yield (0, utils_1.withHttpRetry)(() => this._client.setAutoTestResultsForTestRun(testRunId, {
+            const ids = yield (0, utils_1.withHttpRetry)(() => this._client.setAutoTestResultsForTestRun(testRunId, {
                 autoTestResultsForTestRunModel: [autotestResult],
             }), {
                 label: `setAutoTestResults:${autotestResult.autoTestExternalId}:${(_a = autotestResult.statusCode) !== null && _a !== void 0 ? _a : autotestResult.statusType}`,
             });
+            this.rememberCreatedTestResultId(autotestResult.autoTestExternalId, ids);
             logger_1.default.debug("[testruns] setAutoTestResults ok", {
                 testRunId,
                 autoTestExternalId: autotestResult.autoTestExternalId,
                 statusCode: autotestResult.statusCode,
                 statusType: autotestResult.statusType,
+                testResultId: this.testResultIdsByExternalId.get(autotestResult.autoTestExternalId),
+            });
+        });
+    }
+    updateAutotestResultWithRetry(testResultId, result) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const model = this._converter.toOriginTestResultUpdate(result);
+            (0, utils_1.escapeHtmlInObject)(model);
+            yield (0, utils_1.withHttpRetry)(() => this._testResults.updateTestResult(testResultId, model), { label: `updateTestResult:${result.autoTestExternalId}` });
+            logger_1.default.debug("[testruns] updateTestResult ok", {
+                testResultId,
+                autoTestExternalId: result.autoTestExternalId,
             });
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testit-js-commons",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "JavaScript commons for Test IT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",