@waron97/prbot 3.1.1 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@waron97/prbot",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "description": "",
     "main": "index.js",
     "scripts": {

package/src/commands/autopr.js

@@ -8,10 +8,12 @@ import { fuzzyMatch } from '../lib/fuzzy.js';
 import { execGit } from '../lib/git.js';
 import {
     appendPrToLine,
+    appendRefsToLine,
     buildRefString,
     detectIndentation,
     extractSections,
     findDuplicateLine,
+    findLineByPrNumber,
     findSectionEndLine,
 } from './changelog.js';
 
@@ -70,6 +72,28 @@ function buildPrDescription(taskIds, jiras) {
     return lines.join('\n');
 }
 
+async function fetchActivePr(branch) {
+    const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO } = process.env;
+    const apiUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_apis/git/repositories/${DEVOPS_REPO}/pullrequests?searchCriteria.sourceRefName=refs/heads/${branch}&searchCriteria.status=active&api-version=7.0`;
+    const res = await fetch(apiUrl, { headers: devopsHeaders() });
+    const data = await res.json();
+    if (!res.ok) throw new Error(`DevOps PR fetch failed: ${JSON.stringify(data)}`);
+    if (!data.value || data.value.length === 0) throw new Error(`No active PR found for branch: ${branch}`);
+    return data.value[0];
+}
+
+async function patchDevopsPrDescription(prId, description) {
+    const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO } = process.env;
+    const apiUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_apis/git/repositories/${DEVOPS_REPO}/pullrequests/${prId}?api-version=7.0`;
+    const res = await fetch(apiUrl, {
+        method: 'PATCH',
+        headers: devopsHeaders(),
+        body: JSON.stringify({ description }),
+    });
+    const data = await res.json();
+    if (!res.ok) throw new Error(`DevOps PR patch failed: ${JSON.stringify(data)}`);
+}
+
 async function createDevopsPR(branch, title, description) {
     const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO, AUTOPR_TARGET_BRANCH } = process.env;
     const apiUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_apis/git/repositories/${DEVOPS_REPO}/pullrequests?api-version=7.0`;
@@ -190,7 +214,60 @@ async function selectSection(sections, candidates) {
     return sections.find((s) => s.heading === selected);
 }
 
+async function autoprAmend(options) {
+    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+    const changelogPath = `${ADDONS_PATH}/CHANGELOG.md`;
+    const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO } = process.env;
+
+    const branch = (await execGit(['rev-parse', '--abbrev-ref', 'HEAD'], ADDONS_PATH)).trim();
+    const pr = await fetchActivePr(branch);
+    const prNumber = pr.pullRequestId;
+    const prUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_git/${DEVOPS_REPO}/pullrequest/${prNumber}`;
+    console.log(`Found PR #${prNumber}: ${prUrl}`);
+
+    const ids = options.trident ?? [];
+    const jiras = options.jira ?? [];
+
+    const tasks = ids.length > 0 ? await Promise.all(ids.map(fetchTask)) : [];
+    tasks.forEach((t) => console.log(`Task: ${t.name}`));
+
+    const newLinks = [
+        ...ids.map((id) => `${process.env.TRIDENT_URL}/odoo/my-tasks/${id}`),
+        ...jiras.map((j) => `https://sorgenia.atlassian.net/browse/${j}`),
+    ];
+    if (newLinks.length > 0) {
+        const updatedDescription = pr.description
+            ? `${pr.description}\n${newLinks.join('\n')}`
+            : newLinks.join('\n');
+        await patchDevopsPrDescription(prNumber, updatedDescription);
+        console.log('PR description updated');
+    }
+
+    for (let i = 0; i < ids.length; i++) {
+        await appendChecklistPrLink(ids[i], tasks[i].x_release_checklist, prUrl, prNumber);
+    }
+    if (ids.length > 0) console.log('Checklist updated');
+
+    const content = readFileSync(changelogPath, 'utf-8');
+    const existing = findLineByPrNumber(content, prNumber);
+    if (!existing) {
+        console.log(`Warning: no changelog line found for PR #${prNumber} — skipping changelog update`);
+        return;
+    }
+    const lines = content.split('\n');
+    lines[existing.lineNumber] = appendRefsToLine(existing.line, ids, jiras);
+    await fs.writeFile(changelogPath, lines.join('\n'));
+
+    await execGit(['add', 'CHANGELOG.md'], ADDONS_PATH);
+    await execGit(['commit', '-m', '[DOC][CHANGELOG] Changelog'], ADDONS_PATH);
+    await execGit(['push'], ADDONS_PATH);
+    console.log('Changelog updated and pushed');
+    console.log('\nReminder: squash the two changelog commits before merging the PR.');
+}
+
 async function autopr(options) {
+    if (options.amend) return autoprAmend(options);
+
     const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
     const changelogPath = `${ADDONS_PATH}/CHANGELOG.md`;
 

package/src/commands/changelog.js

@@ -179,6 +179,54 @@ async function changelog(prNumber, options) {
     console.log('Changelog entry added');
 }
 
+function findLineByPrNumber(content, prNumber) {
+    const lines = content.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].includes(`#${prNumber}ADO`)) {
+            return { lineNumber: i, line: lines[i] };
+        }
+    }
+    return null;
+}
+
+function appendRefsToLine(line, tridentIds, jiras) {
+    let result = line;
+
+    if (tridentIds && tridentIds.length > 0) {
+        const suffix = tridentIds.map((id) => `#${id}`).join(', ');
+        const tridentMatch = result.match(/Trident (#[\d, #]+)/);
+        if (tridentMatch) {
+            result = result.replace(/Trident (#[\d, #]+)/, `Trident ${tridentMatch[1]}, ${suffix}`);
+        } else {
+            const parenMatch = result.match(/\(([^)]*)\)\s*$/);
+            if (parenMatch) {
+                result = result.replace(/\(([^)]*)\)\s*$/, `(Trident ${suffix}, ${parenMatch[1]})`);
+            } else {
+                result = `${result.trimEnd()} (Trident ${suffix})`;
+            }
+        }
+    }
+
+    if (jiras && jiras.length > 0) {
+        const suffix = jiras.join(', ');
+        const jiraMatch = result.match(/JIRA ([^,)]+)/);
+        if (jiraMatch) {
+            result = result.replace(/JIRA ([^,)]+)/, `JIRA ${jiraMatch[1].trimEnd()}, ${suffix}`);
+        } else if (result.includes('PR sorgenia_addons')) {
+            result = result.replace(/(PR sorgenia_addons)/, `JIRA ${suffix}, $1`);
+        } else {
+            const parenMatch = result.match(/\(([^)]*)\)\s*$/);
+            if (parenMatch) {
+                result = result.replace(/\(([^)]*)\)\s*$/, `(${parenMatch[1]}, JIRA ${suffix})`);
+            } else {
+                result = `${result.trimEnd()} (JIRA ${suffix})`;
+            }
+        }
+    }
+
+    return result;
+}
+
 export {
     changelog,
     extractSections,
@@ -187,4 +235,6 @@ export {
     buildRefString,
     findDuplicateLine,
     appendPrToLine,
+    findLineByPrNumber,
+    appendRefsToLine,
 };

package/src/commands/exportEmailTemplates.js

@@ -169,7 +169,7 @@ async function exportEmailTemplates(opts) {
     log(`Written: ${outPath}`);
 
     const newMappings = await readEmailTemplateMappings(dataDir);
-    const renamedCodes = detectEmailRenames(oldMappings, newMappings);
+    const renames = detectEmailRenames(oldMappings, newMappings);
 
     let bumpLevel = opts.bump;
     if (!bumpLevel) {
@@ -186,13 +186,13 @@ async function exportEmailTemplates(opts) {
 
     let preMigratePath = null;
 
-    if (renamedCodes.length > 0) {
-        log(`Renamed template_codes (${renamedCodes.length}): ${renamedCodes.join(', ')}`);
+    if (renames.length > 0) {
+        log(`Renamed XML IDs (${renames.length}): ${renames.map((r) => `${r.oldXmlId} → ${r.newXmlId}`).join(', ')}`);
 
         let shouldGenerate = opts.autoPremigrate;
         if (!shouldGenerate && !isSilent()) {
             shouldGenerate = await confirm({
-                message: `Detected ${renamedCodes.length} renamed template_code(s). Generate pre-migrate script?`,
+                message: `Detected ${renames.length} renamed template_code(s). Generate pre-migrate script?`,
                 default: true,
             });
         }
@@ -206,7 +206,7 @@ async function exportEmailTemplates(opts) {
                 const migrationDir = path.join(ADDONS_PATH, 'config', module, 'migrations', version);
                 preMigratePath = path.join(migrationDir, 'pre-migrate.py');
                 await fs.mkdir(migrationDir, { recursive: true });
-                await fs.writeFile(preMigratePath, generateEmailPreMigrateScript(renamedCodes));
+                await fs.writeFile(preMigratePath, generateEmailPreMigrateScript(renames));
                 log(`Wrote pre-migrate: ${preMigratePath}`);
             }
         }

package/src/index.js

@@ -77,6 +77,7 @@ program
     .option('-m, --message <text>', 'Changelog entry message')
     .option('-b, --branch <name>', 'Branch name (default: autopr_<taskId>)')
     .option('-n, --name <text>', 'PR title (default: task name from Odoo)')
+    .option('--amend', 'Amend existing PR on current branch with new trident/jira refs')
     .action((opts) => {
         autopr(opts).catch((err) => {
             throw err;

package/src/lib/premigrate.js

@@ -167,15 +167,15 @@ async function readEmailTemplateMappings(dataDir) {
 }
 
 function detectEmailRenames(oldMap, newMap) {
-    const templateCodes = [];
+    const renames = [];
     for (const [code, oldXmlId] of oldMap) {
         const newXmlId = newMap.get(code);
-        if (newXmlId && newXmlId !== oldXmlId) templateCodes.push(code);
+        if (newXmlId && newXmlId !== oldXmlId) renames.push({ oldXmlId, newXmlId });
     }
-    return templateCodes;
+    return renames;
 }
 
-function generateEmailPreMigrateScript(templateCodes) {
+function generateEmailPreMigrateScript(renames) {
     const lines = [
         '# Copyright 2025-TODAY Symphonie Prime S.r.l. (www.symphonieprime.com)',
         '# All rights reserved.',
@@ -185,28 +185,20 @@ function generateEmailPreMigrateScript(templateCodes) {
         '',
         '@openupgrade.migrate()',
         'def migrate(env, version):',
-        '    env.cr.execute(',
-        '        "SELECT 1 FROM information_schema.tables WHERE table_name = %s",',
-        '        ("mail_template",),',
-        '    )',
-        '    if not env.cr.fetchone():',
-        '        return',
-        '',
+        '    renames = [',
     ];
 
-    if (templateCodes.length === 1) {
-        lines.push(`    template_codes = ("${templateCodes[0]}",)`);
-    } else {
-        lines.push('    template_codes = (');
-        for (const code of templateCodes) lines.push(`        "${code}",`);
-        lines.push('    )');
+    for (const { oldXmlId, newXmlId } of renames) {
+        lines.push(`        ("${oldXmlId}", "${newXmlId}"),`);
     }
 
     lines.push(
-        '    env.cr.execute(',
-        '        "DELETE FROM mail_template WHERE template_code IN %s",',
-        '        (template_codes,),',
-        '    )',
+        '    ]',
+        '    for old_name, new_name in renames:',
+        '        env.cr.execute(',
+        '            "UPDATE ir_model_data SET name = %s WHERE name = %s AND model = %s",',
+        '            (new_name, old_name, "mail.template"),',
+        '        )',
     );
 
     return lines.join('\n') + '\n';