Refactor Plus Code handling and update related tests for event issue processing

Author: SableRaf

.github/scripts/event-issue-helpers.mjs

@@ -16,6 +16,25 @@ export const VALID_ORG_TYPES = new Set([
 
 export const VALID_EVENT_FORMATS = new Set(['In person', 'Online']);
 
+// Historical aliases in newest-first order (covers retried or edited older issues)
+export const PLUS_CODE_FIELD_ALIASES = [
+  'Plus Code (for map placement)',   // current
+  'Plus Code for map placement',     // transitional (commit 24064d2)
+  'Map placement',                   // original
+];
+
+export const PLUS_CODE_FIELD_LABEL = PLUS_CODE_FIELD_ALIASES[0];
+
+// Like required(), but tries each label in order and returns the first non-empty value.
+export function requiredAny(fields, labels, errors, errorOverride) {
+  for (const label of labels) {
+    const v = fields.get(label)?.trim();
+    if (v) return v;
+  }
+  errors.push(errorOverride ?? { field: labels[0], message: 'This field is required.' });
+  return '';
+}
+
 export function parseIssueSections(body) {
   const normalized = body.replace(/\r/g, '');
   const sections = normalized.split(/^### /m).slice(1);

.github/scripts/process-edit-event-issue.mjs

@@ -7,8 +7,10 @@ import {
   PCD_CONTACT_EMAIL,
   VALID_ORG_TYPES,
   VALID_EVENT_FORMATS,
+  PLUS_CODE_FIELD_ALIASES,
   parseIssueSections,
   required,
+  requiredAny,
   isValidDate,
   isValidTime,
   isValidEmail,
@@ -90,7 +92,7 @@ async function main() {
 
   const canonicalId = required(fields, 'Event canonical ID', errors);
   const eventName = required(fields, 'Event name', errors);
-  const rawPlusCode = required(fields, 'Map placement', errors, {
+  const rawPlusCode = requiredAny(fields, PLUS_CODE_FIELD_ALIASES, errors, {
     field: 'Map placement (Plus Code)',
     message: 'This field is required. A Plus Code looks like `8FW4V75V+8Q`. [Find your Plus Code →](https://plus.codes/)',
   });

.github/scripts/process-edit-event-issue.test.mjs

@@ -77,7 +77,7 @@ function makeValidEditBody({
     '### Forum discussion URL',
     forumThreadUrl,
     '',
-    '### Map placement',
+    '### Plus Code (for map placement)',
     plusCode,
     '',
     '### Event format',
@@ -257,7 +257,7 @@ describe('process-edit-event-issue', () => {
   });
 
   test('missing ### Event canonical ID heading causes valid=skip', async () => {
-    const body = '### Event name\nPCD @ Test\n### Map placement\n8FW4V75V+8Q\n';
+    const body = '### Event name\nPCD @ Test\n### Plus Code (for map placement)\n8FW4V75V+8Q\n';
     const { outputs } = await runScript(body, { tmpDir, number: 15 });
     assert.equal(outputs.valid, 'skip');
   });

.github/scripts/process-new-event-issue.mjs

@@ -7,8 +7,11 @@ import {
   PCD_CONTACT_EMAIL,
   VALID_ORG_TYPES,
   VALID_EVENT_FORMATS,
+  PLUS_CODE_FIELD_LABEL,
+  PLUS_CODE_FIELD_ALIASES,
   parseIssueSections,
   required,
+  requiredAny,
   isValidDate,
   isValidTime,
   isValidEmail,
@@ -79,16 +82,17 @@ function buildPrBody(number, name, submitterLogin, isOnlineEvent, eventDate, sta
 
 console.log(`[process-new-event-issue] issue #${issueNumber}, body length: ${issueBody.length}`);
 
-// Skip if this is an edit-event issue (has ### Event ID heading)
-if (issueBody.includes('### Event ID')) {
-  console.log('[process-new-event-issue] found ### Event ID heading — skipping (this is an edit event issue)');
+// Skip if this is an edit-event issue (has ### Event canonical ID heading)
+if (issueBody.includes('### Event canonical ID')) {
+  console.log('[process-new-event-issue] found ### Event canonical ID heading — skipping (this is an edit event issue)');
   await setOutput('valid', 'skip');
   process.exit(0);
 }
 
-// GitHub strips HTML comments from markdown blocks, so we detect the template
-// by checking for a heading that is unique to the new-event issue form.
-if (!issueBody.includes('### Map placement')) {
+// GitHub strips HTML comments from markdown blocks. The edit-event guard above
+// handles the only other template that uses this heading, so reaching here means
+// we are processing a new-event issue or something unrecognized.
+if (!issueBody.includes(`### ${PLUS_CODE_FIELD_LABEL}`)) {
   console.log('[process-new-event-issue] template headings not found — skipping (not a new event issue)');
   await setOutput('valid', 'skip');
   process.exit(0);
@@ -99,7 +103,7 @@ async function main() {
   const errors = [];
 
   const eventName = required(fields, 'Event name', errors);
-  const rawPlusCode = required(fields, 'Map placement', errors, {
+  const rawPlusCode = requiredAny(fields, PLUS_CODE_FIELD_ALIASES, errors, {
     field: 'Map placement (Plus Code)',
     message: 'This field is required. A Plus Code looks like `8FW4V75V+8Q`. [Find your Plus Code →](https://plus.codes/)',
   });

.github/scripts/process-new-event-issue.test.mjs

@@ -49,7 +49,7 @@ function makeValidBody({
     '### Event name',
     eventName,
     '',
-    '### Map placement',
+    '### Plus Code (for map placement)',
     plusCode,
     '',
     '### Event format',
@@ -251,15 +251,31 @@ describe('process-new-event-issue', () => {
     }
   });
 
-  test('issue body with ### Event ID heading causes valid=skip', async () => {
-    const body = makeValidBody() + '\n### Event ID\npcd-some-event-2026\n';
+  test('issue body with ### Event canonical ID heading causes valid=skip', async () => {
+    const body = makeValidBody() + '\n### Event canonical ID\npcd-some-event-2026-abc1234\n';
     const { outputs } = await runScript(body, { tmpDir, eventsDir, number: 4 });
     assert.equal(outputs.valid, 'skip');
   });
 
-  test('issue body missing ### Map placement heading causes valid=skip', async () => {
+  test('issue body missing ### Plus Code (for map placement) heading causes valid=skip', async () => {
     const body = '### Event name\nPCD @ Nowhere\n### Some other heading\nvalue\n';
     const { outputs } = await runScript(body, { tmpDir, eventsDir, number: 5 });
     assert.equal(outputs.valid, 'skip');
   });
+
+  test('edit-event issue body (with ### Event canonical ID) causes valid=skip on new-event script', async () => {
+    const body = [
+      '### Event canonical ID',
+      'pcd-some-event-2026-abc1234',
+      '',
+      '### Event name',
+      'PCD @ Some City',
+      '',
+      '### Plus Code (for map placement)',
+      '8FW4V75V+8Q',
+      '',
+    ].join('\n');
+    const { outputs } = await runScript(body, { tmpDir, eventsDir, number: 6 });
+    assert.equal(outputs.valid, 'skip');
+  });
 });

TEST.md

@@ -33,8 +33,9 @@ These tests cover the shared pure functions extracted into `event-issue-helpers.
 | Valid new-event issue body | `valid=true`, writes `metadata.json` with all fields including `uid` (7 hex chars) |
 | `Event page URL` field present | Value appears in `metadata.json` as `event_page_url` (regression for the `Event website` field-name bug) |
 | Duplicate event directory | `valid=false`, validation comment mentions the generated id |
-| Issue body contains `### Event ID` heading | `valid=skip` (guard against running on edit-event template) |
-| Issue body missing `### Map placement` and no `### Event ID` | `valid=skip` (unrecognized template) |
+| Issue body contains `### Event canonical ID` heading | `valid=skip` (guard against running on edit-event template) |
+| Edit-event issue body (contains `### Event canonical ID` and `### Plus Code (for map placement)`) | `valid=skip` (regression: edit-event body must not be processed as new event) |
+| Issue body missing `### Plus Code (for map placement)` and no `### Event canonical ID` | `valid=skip` (unrecognized template) |
 
 ---
 
@@ -51,7 +52,7 @@ These tests cover the shared pure functions extracted into `event-issue-helpers.
 | All activities unchecked | Existing `event_activities` preserved (checkbox prefill limitation) |
 | Some activities checked | `event_activities` overwritten with checked values |
 | Event directory does not exist | `valid=false`, validation comment mentions the missing event id |
-| Missing `### Event ID` heading | `valid=skip` (guard against running on new-event template) |
+| Missing `### Event canonical ID` heading | `valid=skip` (guard against running on new-event template) |
 
 ---