@acms-subir/core 0.3.43 → 0.3.44

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @acms-subir/core
 
+## 0.3.44
+
+### Patch Changes
+
+- b011cee: Moving one date of a repeating event on the admin Schedule now keeps what belongs to that date. Dragging a single date still splits it off into a one-off copy, but the copy now keeps the series' hosts, room hold, translations and SEO title and description. Before, all of these were left behind, so the room looked free at the new time, the date dropped off the hosts' My events, and the Spanish title was gone. That date's RSVPs, including places in line, move to the copy at the new time. Everyone with a seat gets the "new time" email with the updated calendar file, while places in line move quietly. **Undo** moves the RSVPs back to the series' date (with the email again) before the copy is deleted, so undoing never cancels anyone. Undo now refuses with "This event has unpublished changes" before anything changes, instead of deleting the copy first.
+
+  Dates moved before this release keep their copies as they are: staff can still add the hosts and room on those by hand. `repo.createEvent` now stores `translations` (it ignored them before), and the repository has a new `moveOccurrenceRsvps(eventId, start, { eventId?, start, end })`.
+
 ## 0.3.43
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.43",
+  "version": "0.3.44",
   "publishConfig": {
     "access": "public"
   },

package/src/lib/calendar/schedule.ts

@@ -121,7 +121,9 @@ export async function moveSeries(repo: ContentRepository, id: string, days: numb
 
 // Move one occurrence of a repeating event: skip that date in the series and
 // add a one-off copy on the new date. No schema change, and the copy is a
-// normal event the editor can open.
+// normal event the editor can open. The copy keeps the series' hosts, room
+// hold and translations, and that date's RSVPs move to it (people get the
+// "new time" email).
 export async function moveOccurrence(repo: ContentRepository, id: string, occurrence: string, days: number, hooks: SaveHooks): Promise<{ event: CalEvent; undo: MoveUndo }> {
   const e = await repo.getEvent(id);
   if (!e) throw new ApiError(404, 'Event not found.');
@@ -139,16 +141,22 @@ export async function moveOccurrence(repo: ContentRepository, id: string, occurr
   const endDay = `${t.getUTCFullYear()}-${pad(t.getUTCMonth() + 1)}-${pad(t.getUTCDate())}`;
   const endStr = e.allDay ? endDay : `${endDay}T${pad(t.getUTCHours())}:${pad(t.getUTCMinutes())}`;
 
+  const settings = await repo.getSettings();
+  const was = findOccurrence(e, occurrence, settings);
   await saveNow(repo, e, { exdates: [...e.exdates, occurrence] }, hooks);
   const copy = await repo.createEvent({
     title: e.title, slug: await uniqueSlug(repo, e.title), start: formatWall(newStart), end: endStr, allDay: e.allDay,
     timezone: e.timezone, status: 'draft', excerpt: e.excerpt, bodyJson: e.bodyJson, bodyHtml: e.bodyHtml, cover: e.cover, coverAlt: e.coverAlt,
-    location: e.location, cta: e.cta, calendarIds: e.calendarIds, fields: e.fields, tags: e.tags,
+    seoTitle: e.seoTitle, seoDesc: e.seoDesc, location: e.location, cta: e.cta, calendarIds: e.calendarIds, fields: e.fields, tags: e.tags,
     // a cancelled date stays cancelled on its new day
     cancelled: e.cancelled || e.cancelledDates.includes(occurrence), rsvp: e.rsvp,
-    template: e.template, featured: false,
+    template: e.template, featured: false, roomHold: e.roomHold, hostIds: e.hostIds, translations: e.translations,
   });
   const event = live(e.status) ? await saveEvent(repo, copy.id, { status: 'published' }, hooks) : copy;
+  const now = findOccurrence(event, event.start, settings);
+  if (was && now && await repo.moveOccurrenceRsvps(e.id, was.start, { eventId: event.id, start: now.start, end: now.end })) {
+    await kickEmail(repo, hooks.locals, waitUntilFrom(hooks.locals));
+  }
   return { event, undo: { kind: 'split', id: copy.id, seriesId: e.id, occurrence } };
 }
 
@@ -157,13 +165,20 @@ export async function undoMove(repo: ContentRepository, undo: MoveUndo, hooks: S
     await moveSeries(repo, undo.id, undo.days, hooks);
     return;
   }
-  const series = await repo.getEvent(undo.seriesId);
+  let series = await repo.getEvent(undo.seriesId);
   const copy = await repo.getEvent(undo.id);
+  if (series) series = await saveNow(repo, series, { exdates: series.exdates.filter((x) => x !== undo.occurrence) }, hooks);
   if (copy) {
+    // the RSVPs go back to the series' date before the copy (and its RSVPs) goes
+    const settings = await repo.getSettings();
+    const back = series && findOccurrence(series, undo.occurrence, settings);
+    const from = findOccurrence(copy, copy.start, settings);
+    if (back && from && await repo.moveOccurrenceRsvps(copy.id, from.start, { eventId: series!.id, start: back.start, end: back.end })) {
+      await kickEmail(repo, hooks.locals, waitUntilFrom(hooks.locals));
+    }
     await repo.deleteEvent(copy.id);
     await eventDeleted(repo, copy, { waitUntil: waitUntilFrom(hooks.locals) });
   }
-  if (series) await saveNow(repo, series, { exdates: series.exdates.filter((x) => x !== undo.occurrence) }, hooks);
 }
 
 // ---- cancel one date ----------------------------------------------------------

package/src/lib/repo/sql.ts

@@ -847,8 +847,8 @@ export class SqlRepository implements ContentRepository {
     await this.driver.run(
       `INSERT INTO events (id, slug, title, body_json, body_html, excerpt, cover, cover_alt, seo_title, seo_desc, status, featured, tags, template,
         starts, ends, all_day, timezone, rrule, exdates, cancelled, location, cta, calendar_ids, fields, source_uid, start_at, end_at,
-        published_at, scheduled_at, created_at, updated_at, rsvp, room_hold, cancelled_dates, host_ids, request)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        published_at, scheduled_at, created_at, updated_at, rsvp, room_hold, cancelled_dates, host_ids, request, translations)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [
         id, data.slug, data.title, data.bodyJson ?? '', data.bodyHtml ?? '', data.excerpt ?? '', data.cover ?? '', data.coverAlt ?? '',
         data.seoTitle ?? '', data.seoDesc ?? '', data.status ?? 'draft', data.featured ? 1 : 0, JSON.stringify(data.tags ?? []), data.template ?? '',
@@ -857,7 +857,7 @@ export class SqlRepository implements ContentRepository {
         JSON.stringify(data.fields ?? {}), data.sourceUid ?? '', startAt, endAt,
         data.publishedAt ?? (data.status === 'published' ? now : null), data.scheduledAt ?? null, now, now,
         JSON.stringify(data.rsvp ?? {}), JSON.stringify(data.roomHold ?? {}), JSON.stringify(data.cancelledDates ?? []),
-        JSON.stringify(data.hostIds ?? []), data.request ? JSON.stringify(data.request) : null,
+        JSON.stringify(data.hostIds ?? []), data.request ? JSON.stringify(data.request) : null, JSON.stringify(data.translations ?? {}),
       ]
     );
     await this.syncEventIndex(id);
@@ -965,6 +965,19 @@ export class SqlRepository implements ContentRepository {
     ]);
     return Number((await this.first("SELECT COUNT(*) AS n FROM bookings WHERE event_id=? AND kind='rsvp' AND email_mutation=?", [id, mutation]))?.n ?? 0);
   }
+  async moveOccurrenceRsvps(id: string, start: number, to: { eventId?: string; start: number; end: number }) {
+    await this.ready;
+    const target = to.eventId || id;
+    // one mutation id marks every moved row; only the seated ones are emailed
+    const mutation = crypto.randomUUID();
+    const notifications = bookingJobs(target,'rescheduled',undefined,false,mutation).map(s=>({...s,sql:s.sql.replace('b.id = ?',"b.event_id = ? AND b.kind='rsvp' AND b.status IN ('pending','confirmed')")}));
+    await this.driver.batch([
+      {sql:`UPDATE bookings SET event_id=?,start_at=?,end_at=?,hold_start=?,hold_end=?,notification_version=notification_version+1,email_mutation=?,reminder_sent_at=NULL,updated_at=?
+        WHERE event_id=? AND kind='rsvp' AND start_at=? AND status IN ${RSVP_ACTIVE}`,args:[target,to.start,to.end,to.start,to.end,mutation,Date.now(),id,start]},
+      ...notifications,
+    ]);
+    return Number((await this.first("SELECT COUNT(*) AS n FROM bookings WHERE event_id=? AND kind='rsvp' AND email_mutation=?", [target, mutation]))?.n ?? 0);
+  }
   async discardEventDraft(id: string) {
     await this.ready;
     await this.driver.run('UPDATE events SET draft = NULL WHERE id = ?', [id]);

package/src/lib/repo/types.ts

@@ -155,6 +155,13 @@ export interface ContentRepository {
   setEventCancelledDates(id: string, dates: string[]): Promise<void>;
   /** Cancels the RSVPs for one date of an event (they get the "cancelled" email). Returns how many. */
   cancelOccurrenceRsvps(id: string, start: number): Promise<number>;
+  /**
+   * Moves the RSVPs for one date of an event (those starting at `start`) to a
+   * new time, and to another event when `to.eventId` is set. Pending and
+   * confirmed ones get the "new time" email; places in line move quietly.
+   * Returns how many moved.
+   */
+  moveOccurrenceRsvps(id: string, start: number, to: { eventId?: string; start: number; end: number }): Promise<number>;
   deleteEvent(id: string): Promise<void>;
   // saved-place sync (lib/maps/places.ts): rewrite just the location of the
   // live row and/or the staged draft, leaving every other field — and the