Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 00a1e954e4 | |||
| 63fb07be30 | |||
| 5bed026e6d | |||
| a641a8b9cd | |||
| 8781fa1047 | |||
| 0da147694d | |||
| 7695ad623d | |||
| bc04ac144e | |||
| 0f06c4fcf4 | |||
| c202e207c9 | |||
| af530ed2e5 | |||
| 9569033dc1 | |||
| fbfeff2b27 |
+70
-4
@@ -238,6 +238,47 @@ function buildSyncManifest(featureCode, mappedFiles) {
|
|||||||
return JSON.stringify(manifest, null, 2);
|
return JSON.stringify(manifest, null, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function checkGiteaPullRequestExists(baseBranch, headBranch) {
|
||||||
|
const config = getSyncConfig();
|
||||||
|
const path = '/repos/' + config.owner + '/' + config.repo + '/pulls?state=open';
|
||||||
|
const res = giteaSyncRequest('GET', path, null);
|
||||||
|
if (res.ok && res.data && Array.isArray(res.data)) {
|
||||||
|
const existing = res.data.find(function(pr) {
|
||||||
|
return pr.base && pr.head && pr.base.ref === baseBranch && pr.head.ref === headBranch;
|
||||||
|
});
|
||||||
|
if (existing) {
|
||||||
|
return { ok: true, existed: true, data: existing };
|
||||||
|
}
|
||||||
|
return { ok: true, existed: false };
|
||||||
|
}
|
||||||
|
return { ok: false, existed: false, message: res.message || 'Failed to check existing PRs' };
|
||||||
|
}
|
||||||
|
|
||||||
|
function createGiteaPullRequest(title, body, baseBranch, headBranch) {
|
||||||
|
const config = getSyncConfig();
|
||||||
|
|
||||||
|
const checkRes = checkGiteaPullRequestExists(baseBranch, headBranch);
|
||||||
|
if (checkRes.existed) {
|
||||||
|
return { ok: true, existed: true, data: checkRes.data, message: 'Pull request already exists' };
|
||||||
|
}
|
||||||
|
if (!checkRes.ok) {
|
||||||
|
return checkRes;
|
||||||
|
}
|
||||||
|
|
||||||
|
const path = '/repos/' + config.owner + '/' + config.repo + '/pulls';
|
||||||
|
const payload = {
|
||||||
|
title: title,
|
||||||
|
body: body,
|
||||||
|
base: baseBranch,
|
||||||
|
head: headBranch
|
||||||
|
};
|
||||||
|
const res = giteaSyncRequest('POST', path, payload);
|
||||||
|
if (res.ok) {
|
||||||
|
res.existed = false;
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
function ensureGiteaBranch(baseBranch, newBranch) {
|
function ensureGiteaBranch(baseBranch, newBranch) {
|
||||||
const config = getSyncConfig();
|
const config = getSyncConfig();
|
||||||
const checkRes = giteaSyncRequest('GET', '/repos/' + config.owner + '/' + config.repo + '/branches/' + newBranch, null);
|
const checkRes = giteaSyncRequest('GET', '/repos/' + config.owner + '/' + config.repo + '/branches/' + newBranch, null);
|
||||||
@@ -303,16 +344,41 @@ function syncAppsScriptToGiteaBranch(featureCode) {
|
|||||||
results.errors++;
|
results.errors++;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Sync Summary: " + results.created + " created, " + results.updated + " updated, " + results.errors + " errors.");
|
const prTitle = 'Sync Feature: ' + featureCode;
|
||||||
|
const prBody = 'Automated sync from Google Apps Script for feature: ' + featureCode + '.\n\nFiles synced:\n' + payload.files.map(function(f) { return '- ' + f.repoPath; }).join('\n');
|
||||||
|
const prRes = createGiteaPullRequest(prTitle, prBody, payload.baseBranch, payload.syncBranch);
|
||||||
|
|
||||||
return { ok: true, branch: payload.syncBranch, summary: results };
|
let prInfo = null;
|
||||||
|
if (prRes.ok) {
|
||||||
|
prInfo = {
|
||||||
|
url: prRes.data.html_url || '',
|
||||||
|
existed: prRes.existed,
|
||||||
|
number: prRes.data.number
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("Sync Summary: " + results.created + " created, " + results.updated + " updated, " + results.errors + " errors.");
|
||||||
|
if (prInfo) {
|
||||||
|
console.log("Pull Request: " + prInfo.url + (prInfo.existed ? " (Existed)" : " (Created)"));
|
||||||
|
} else {
|
||||||
|
console.log("Pull Request Failed: " + prRes.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return { ok: true, branch: payload.syncBranch, summary: results, pullRequest: prInfo };
|
||||||
}
|
}
|
||||||
|
|
||||||
function runManualSyncToGitea() {
|
function runManualSyncToGitea() {
|
||||||
const res = syncAppsScriptToGiteaBranch('manual');
|
const res = syncAppsScriptToGiteaBranch('manual');
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
console.log('Sync successful to branch: ' + res.branch);
|
console.log('=== Sync Summary ===');
|
||||||
console.log(JSON.stringify(res.summary, null, 2));
|
console.log('Branch Sync: ' + res.branch);
|
||||||
|
console.log('Files: ' + res.summary.created + ' created, ' + res.summary.updated + ' updated, ' + res.summary.errors + ' errors.');
|
||||||
|
if (res.pullRequest) {
|
||||||
|
console.log('Pull Request Status: ' + (res.pullRequest.existed ? 'Existing' : 'Created'));
|
||||||
|
console.log('Pull Request URL: ' + res.pullRequest.url);
|
||||||
|
} else {
|
||||||
|
console.log('Pull Request Status: Not available');
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
console.error('Sync failed: ' + res.message);
|
console.error('Sync failed: ' + res.message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -623,6 +623,18 @@ function testSyncSummaryFormat() {
|
|||||||
assertTrue_('Summary has errors count', mockResults.errors === 0);
|
assertTrue_('Summary has errors count', mockResults.errors === 0);
|
||||||
assertEqual_('Summary details length is correct', mockResults.details.length, 3);
|
assertEqual_('Summary details length is correct', mockResults.details.length, 3);
|
||||||
|
|
||||||
|
const mockFinalResult = {
|
||||||
|
ok: true,
|
||||||
|
branch: 'sync/manual',
|
||||||
|
summary: mockResults,
|
||||||
|
pullRequest: { url: 'https://gitea.example.com/pr/1', existed: true }
|
||||||
|
};
|
||||||
|
|
||||||
|
assertTrue_('Final result has branch info', !!mockFinalResult.branch);
|
||||||
|
assertTrue_('Final result has pullRequest info', !!mockFinalResult.pullRequest);
|
||||||
|
assertTrue_('Final result pullRequest has url', !!mockFinalResult.pullRequest.url);
|
||||||
|
assertEqual_('Final result pullRequest existed flag is true', mockFinalResult.pullRequest.existed, true);
|
||||||
|
|
||||||
console.log('--- Test Passed: Sync Summary Format ---');
|
console.log('--- Test Passed: Sync Summary Format ---');
|
||||||
}
|
}
|
||||||
function testGetAppsScriptProjectContentErrorFormat() {
|
function testGetAppsScriptProjectContentErrorFormat() {
|
||||||
@@ -668,6 +680,50 @@ function testScriptIdFallback() {
|
|||||||
console.log('--- Test Passed: Script ID Fallback ---');
|
console.log('--- Test Passed: Script ID Fallback ---');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testGiteaPullRequestPayload() {
|
||||||
|
console.log('--- Starting Test: Gitea Pull Request Payload ---');
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
title: 'Sync Feature: test-feat',
|
||||||
|
body: 'Auto sync',
|
||||||
|
base: 'main',
|
||||||
|
head: 'sync/test-feat'
|
||||||
|
};
|
||||||
|
|
||||||
|
assertEqual_('PR title is set', payload.title, 'Sync Feature: test-feat');
|
||||||
|
assertEqual_('PR base is main', payload.base, 'main');
|
||||||
|
assertEqual_('PR head is correct', payload.head, 'sync/test-feat');
|
||||||
|
|
||||||
|
console.log('--- Test Passed: Gitea Pull Request Payload ---');
|
||||||
|
}
|
||||||
|
|
||||||
|
function testCheckGiteaPullRequestExistsLogic() {
|
||||||
|
console.log('--- Starting Test: Check Gitea PR Exists Logic ---');
|
||||||
|
|
||||||
|
const mockPrs = [
|
||||||
|
{ base: { ref: 'main' }, head: { ref: 'sync/feat-1' } },
|
||||||
|
{ base: { ref: 'main' }, head: { ref: 'sync/feat-2' } }
|
||||||
|
];
|
||||||
|
|
||||||
|
const baseBranch = 'main';
|
||||||
|
const headBranch = 'sync/feat-2';
|
||||||
|
|
||||||
|
const existing = mockPrs.find(function(pr) {
|
||||||
|
return pr.base && pr.head && pr.base.ref === baseBranch && pr.head.ref === headBranch;
|
||||||
|
});
|
||||||
|
|
||||||
|
assertTrue_('Finds existing PR', !!existing);
|
||||||
|
assertEqual_('Matches correct head', existing.head.ref, 'sync/feat-2');
|
||||||
|
|
||||||
|
const notExisting = mockPrs.find(function(pr) {
|
||||||
|
return pr.base && pr.head && pr.base.ref === baseBranch && pr.head.ref === 'sync/feat-3';
|
||||||
|
});
|
||||||
|
|
||||||
|
assertTrue_('Does not find missing PR', !notExisting);
|
||||||
|
|
||||||
|
console.log('--- Test Passed: Check Gitea PR Exists Logic ---');
|
||||||
|
}
|
||||||
|
|
||||||
function testEmptyRepoErrorDetection() {
|
function testEmptyRepoErrorDetection() {
|
||||||
console.log('--- Starting Test: Empty Repo Error Detection ---');
|
console.log('--- Starting Test: Empty Repo Error Detection ---');
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"featureCode": "manual",
|
"featureCode": "manual",
|
||||||
"syncDate": "2026-04-24T17:41:52.985Z",
|
"syncDate": "2026-04-24T22:40:04.295Z",
|
||||||
"filesSynced": 12
|
"filesSynced": 12
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user