fix(ci): update backend image build command (#1762)

* fix(ci): update backend image build command

* refactor: cleanup rrule fix

Author: tyler-dane

.github/workflows/publish-docker-images.yml

@@ -10,12 +10,22 @@ on:
         description: 'Semver tag to build, such as v1.2.3'
         required: true
         type: string
+      push_images:
+        description: 'Push built images to Docker Hub'
+        required: false
+        default: true
+        type: boolean
   workflow_dispatch:
     inputs:
       tag:
         description: 'Semver tag to build, such as v1.2.3'
         required: true
         type: string
+      push_images:
+        description: 'Push built images to Docker Hub'
+        required: false
+        default: true
+        type: boolean
 
 permissions:
   contents: read
@@ -60,7 +70,7 @@ jobs:
         with:
           context: .
           file: self-host/Dockerfile.backend
-          push: true
+          push: ${{ github.event_name == 'push' || inputs.push_images }}
           tags: |
             switchbacktech/compass-backend:${{ steps.version.outputs.image_version }}
             switchbacktech/compass-backend:${{ steps.version.outputs.minor_tag }}
@@ -71,7 +81,7 @@ jobs:
         with:
           context: .
           file: self-host/Dockerfile.mongo
-          push: true
+          push: ${{ github.event_name == 'push' || inputs.push_images }}
           tags: |
             switchbacktech/compass-mongo:${{ steps.version.outputs.image_version }}
             switchbacktech/compass-mongo:${{ steps.version.outputs.minor_tag }}
@@ -82,7 +92,7 @@ jobs:
         with:
           context: .
           file: self-host/Dockerfile.web
-          push: true
+          push: ${{ github.event_name == 'push' || inputs.push_images }}
           # backend.apiUrl and google.clientId are baked into the web bundle at build time.
           # The published image ships with localhost defaults, which work for local installs.
           # Users who need a custom API domain or real Google credentials must rebuild

docs/CI-CD/cli-and-maintenance-commands.md

@@ -88,7 +88,7 @@ Seeders use the same migration framework and Mongo-backed execution state.
 Builds usually use direct package scripts:
 
 - `bun run build:web`
-- `bun run build:backend --environment [local|staging|production]`
+- `bun run build:backend`
 
 Use CLI build commands only when you specifically need their legacy packaging
 behavior.

packages/backend/src/event/classes/gcal.event.rrule.test.ts

@@ -61,6 +61,31 @@ describe("GcalEventRRule: ", () => {
     expect(events).toEqual(expect.arrayContaining([startDate.toDate()]));
   });
 
+  it("should not duplicate the base occurrence across timezone offsets", () => {
+    const dates = {
+      start: {
+        dateTime: "2027-03-14T03:42:16-04:00",
+        timeZone: "America/Indiana/Winamac",
+      },
+      end: {
+        dateTime: "2027-03-14T04:42:16-04:00",
+        timeZone: "America/Indiana/Winamac",
+      },
+    };
+    const baseEvent = mockRecurringGcalBaseEvent(dates, false, {
+      count: 3,
+      freq: RRule.YEARLY,
+    });
+    const rrule = new GcalEventRRule(baseEvent);
+    const instances = rrule.instances();
+    const instanceStarts = instances.map(
+      (instance) => instance.start?.dateTime,
+    );
+
+    expect(instances).toHaveLength(3);
+    expect(new Set(instanceStarts).size).toBe(3);
+  });
+
   describe("diffOptions", () => {
     it("should return the differences between two rrule options", () => {
       const until = dayjs();

packages/backend/src/event/classes/gcal.event.rrule.ts

@@ -81,7 +81,21 @@ export class GcalEventRRule extends RRule {
     const includesDtStart = this.#startDate.isSame(firstInstanceStartDate);
     const rDates = includesDtStart ? [] : [this.#startDate.toDate()];
 
-    return rDates.concat(dates);
+    const uniqueDates = this.deduplicateByDate(rDates.concat(dates));
+    return uniqueDates;
+  }
+
+  deduplicateByDate(dates: Date[]): Date[] {
+    const seen = new Set<string>();
+
+    return dates.filter((date) => {
+      const key = dayjs(date).tz(this.#timezone).format(this.#dateFormat);
+
+      if (seen.has(key)) return false;
+
+      seen.add(key);
+      return true;
+    });
   }
 
   /**

packages/scripts/src/commands/build.backend.ts

@@ -7,29 +7,25 @@
  *
  * Usage:
  *   bun run build:backend
- *   bun run build:backend --environment staging
- *   bun run build:backend --environment production
  */
 
 import {
   COMPASS_BUILD_DEV,
   COMPASS_ROOT_DEV,
 } from "@scripts/common/cli.constants";
-import { getEnvironmentAnswer, log } from "@scripts/common/cli.utils";
 import { $ } from "bun";
 import path from "node:path";
+import { styleText } from "node:util";
 
 const BACKEND_BUILD = path.join(COMPASS_BUILD_DEV, "backend");
 
-// Parse --environment flag; prompt if absent
-const envFlagIdx = process.argv.indexOf("--environment");
-let environment: string =
-  envFlagIdx !== -1 ? (process.argv[envFlagIdx + 1] ?? "") : "";
-
-const validEnvs = ["local", "staging", "production"];
-if (!validEnvs.includes(environment)) {
-  environment = await getEnvironmentAnswer();
-}
+const log = {
+  info: (msg: string) => console.log(styleText(["italic", "whiteBright"], msg)),
+  error: (msg: string) => console.log(styleText(["bold", "red"], msg)),
+  warning: (msg: string) => console.log(styleText("yellow", msg)),
+  success: (msg: string) => console.log(styleText("green", msg)),
+  tip: (msg: string) => console.log(styleText("yellowBright", msg)),
+};
 
 // 1. Clean old build
 log.info("Removing old backend build ...");

self-host/Dockerfile.backend

@@ -4,7 +4,7 @@ WORKDIR /app
 COPY . .
 
 RUN bun install --frozen-lockfile
-RUN bun run build:backend --environment local
+RUN bun run build:backend
 
 FROM oven/bun:1.2.18-slim AS runtime
 

self-host/docker-compose.test.ts

@@ -9,6 +9,13 @@ function readRepoFile(path: string): string {
 }
 
 describe("self-host docker compose", () => {
+  it("builds the backend image without build-time Compass config", () => {
+    const dockerfile = readRepoFile("self-host/Dockerfile.backend");
+
+    expect(dockerfile).toContain("RUN bun run build:backend");
+    expect(dockerfile).not.toContain("--environment");
+  });
+
   it("mounts compass.yaml into the backend container", () => {
     const compose = readFileSync(join(import.meta.dir, "compose.yaml"), {
       encoding: "utf8",