fix tests, better docker

Author: xdamman

Dockerfile

@@ -1,33 +1,15 @@
 # Stage 1: Dependencies
-FROM node:20-alpine AS deps
+FROM node:22-alpine AS deps
 WORKDIR /app
 
 # Install dependencies based on the preferred package manager
 COPY package.json package-lock.json* ./
 RUN npm ci --only=production && npm cache clean --force
 
 # Stage 2: Build
-FROM node:20-alpine AS builder
+FROM node:22-alpine AS builder
 WORKDIR /app
 
-# Declare build arguments for environment variables
-ARG DISCORD_BOT_TOKEN
-ARG LUMA_API_KEY
-ARG STRIPE_SECRET_KEY
-ARG ETHERSCAN_API_KEY
-ARG MONERIUM_CLIENT_ID
-ARG MONERIUM_CLIENT_SECRET
-ARG RESEND_API_KEY
-
-# Set environment variables from build args
-ENV DISCORD_BOT_TOKEN=$DISCORD_BOT_TOKEN
-ENV LUMA_API_KEY=$LUMA_API_KEY
-ENV STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY
-ENV ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY
-ENV MONERIUM_CLIENT_ID=$MONERIUM_CLIENT_ID
-ENV MONERIUM_CLIENT_SECRET=$MONERIUM_CLIENT_SECRET
-ENV RESEND_API_KEY=$RESEND_API_KEY
-
 # Copy dependencies from deps stage
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
@@ -42,7 +24,7 @@ ENV NEXT_TELEMETRY_DISABLED=1
 RUN npm run build
 
 # Stage 3: Production runner
-FROM node:20-alpine AS runner
+FROM node:22-alpine AS runner
 WORKDIR /app
 
 ENV NODE_ENV=production
@@ -55,11 +37,18 @@ RUN adduser --system --uid 1001 nextjs
 # Copy necessary files
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/package-lock.json ./package-lock.json
 
 # Copy built application
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
+# Copy scripts and node_modules for data fetching
+COPY --from=builder --chown=nextjs:nodejs /app/scripts ./scripts
+COPY --from=builder --chown=nextjs:nodejs /app/src ./src
+COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules
+COPY --from=builder --chown=nextjs:nodejs /app/tsconfig.json ./tsconfig.json
+
 # Create data directory with proper permissions
 RUN mkdir -p /app/data && chown nextjs:nodejs /app/data
 

jest.config.js

@@ -7,13 +7,16 @@ const createJestConfig = nextJest({
 const customJestConfig = {
   setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
   testMatch: ["<rootDir>/tests/**/*.test.ts", "<rootDir>/tests/**/*.test.tsx"],
+  testPathIgnorePatterns: ["/node_modules/", "/tests/e2e/"],
   moduleNameMapper: {
     "^@/(.*)$": "<rootDir>/src/$1",
   },
   transformIgnorePatterns: [
     "node_modules/(?!(next-auth)/)",
   ],
-  testEnvironment: "node", // Default to node for API tests
+  // Default to node environment for server-side tests
+  // React component tests (.tsx) should add @jest-environment jsdom at the top
+  testEnvironment: "node",
   testEnvironmentOptions: {
     customExportConditions: ["node"],
   },

scripts/generate-events.ts

@@ -224,6 +224,7 @@ function loadLumaEvents(year: string, month: string): Map<string, LumaEvent> {
     DATA_DIR,
     year,
     month,
+    "calendars",
     "luma",
     `${calendarId}.json`
   );

src/app/api/booking-request/route.ts

@@ -3,8 +3,6 @@ import { NextResponse } from "next/server"
 import { createDiscordThread } from "@/lib/discord"
 import settings from "@/settings/settings.json"
 
-const resend = new Resend(process.env.RESEND_API_KEY)
-
 const roomNames: Record<string, string> = {
   mush: "Mush Room",
   angel: "Angel Room",
@@ -14,6 +12,9 @@ const roomNames: Record<string, string> = {
 
 export async function POST(request: Request) {
   try {
+    // Initialize Resend client at runtime, not at build time
+    const resend = new Resend(process.env.RESEND_API_KEY)
+
     const data = await request.json()
 
     const {

src/app/api/contact/route.ts

@@ -3,8 +3,6 @@ import { NextResponse } from "next/server"
 import { createDiscordThread } from "@/lib/discord"
 import settings from "@/settings/settings.json"
 
-const resend = new Resend(process.env.RESEND_API_KEY)
-
 const reasonLabels: Record<string, string> = {
   "booking-room": "Booking a room",
   "joining-community": "Joining the community",
@@ -16,6 +14,9 @@ const reasonLabels: Record<string, string> = {
 
 export async function POST(request: Request) {
   try {
+    // Initialize Resend client at runtime, not at build time
+    const resend = new Resend(process.env.RESEND_API_KEY)
+
     const data = await request.json()
 
     const { name, email, organisation, reason, message } = data

src/app/api/membership-application/route.ts

@@ -3,10 +3,11 @@ import { Resend } from "resend"
 import { createDiscordThread } from "@/lib/discord"
 import settings from "@/settings/settings.json"
 
-const resend = new Resend(process.env.RESEND_API_KEY)
-
 export async function POST(request: Request) {
   try {
+    // Initialize Resend client at runtime, not at build time
+    const resend = new Resend(process.env.RESEND_API_KEY)
+
     const { name, organisation, email, plan, motivation } = await request.json()
 
     if (!name || !email || !plan || !motivation) {

src/app/api/workshop-booking/route.ts

@@ -3,10 +3,11 @@ import { NextResponse } from "next/server"
 import { createDiscordThread } from "@/lib/discord"
 import settings from "@/settings/settings.json"
 
-const resend = new Resend(process.env.RESEND_API_KEY)
-
 export async function POST(request: Request) {
   try {
+    // Initialize Resend client at runtime, not at build time
+    const resend = new Resend(process.env.RESEND_API_KEY)
+
     const body = await request.json()
     const { name, organisation, numberOfPeople, date, time, place, comment, workshop, email } = body
 

src/auth.ts

@@ -3,6 +3,8 @@ import Discord from "next-auth/providers/discord"
 import settings from "@/settings/settings.json"
 
 export const { handlers, signIn, signOut, auth } = NextAuth({
+  basePath: "/api/auth",
+  trustHost: true,
   providers: [
     Discord({
       clientId: process.env.AUTH_DISCORD_ID!,

src/lib/services/notifications.tsx

@@ -7,7 +7,8 @@ import { Resend } from "resend"
 import settings from "@/settings/settings.json"
 import { createThread, sendMessage, isDiscordConfigured } from "@/lib/discord"
 
-const resend = new Resend(process.env.RESEND_API_KEY)
+const RESEND_API_KEY = process.env.RESEND_API_KEY;
+const resend = RESEND_API_KEY ? new Resend(RESEND_API_KEY) : null;
 
 export interface EmailOptions {
   to: string
@@ -25,10 +26,21 @@ export interface DiscordThreadOptions {
 
 /**
  * Send an email using Resend
+ * If RESEND_API_KEY is not set, logs a warning instead
  */
 export async function sendEmail(options: EmailOptions) {
   const { to, subject, html, cc, replyTo } = options
 
+  if (!resend) {
+    console.warn(`⚠️  Email not sent (RESEND_API_KEY not set): ${subject}`);
+    console.log(`   To: ${to}`);
+    console.log(`   Subject: ${subject}`);
+    return {
+      id: 'mock-email-id',
+      error: null,
+    };
+  }
+
   return resend.emails.send({
     from: `Commons Hub <${settings.email.from}>`,
     to,

src/types/contributors.ts

@@ -0,0 +1,46 @@
+/**
+ * Contributors data types
+ * Generated from data/{year}/{month}/contributors.json
+ */
+
+export interface ContributorProfile {
+  name: string;
+  username: string;
+  description: string | null;
+  avatar_url: string;
+  roles: string[];
+}
+
+export interface ContributorTokens {
+  in: number;
+  out: number;
+}
+
+export interface ContributorDiscord {
+  messages: number;
+  mentions: number;
+}
+
+export interface Contributor {
+  id: string;
+  profile: ContributorProfile;
+  tokens: ContributorTokens;
+  discord: ContributorDiscord;
+  address: string;
+}
+
+export interface ContributorsSummary {
+  totalContributors: number;
+  contributorsWithAddress: number;
+  contributorsWithTokens: number;
+  totalTokensIn: number;
+  totalTokensOut: number;
+  totalMessages: number;
+}
+
+export interface ContributorsFile {
+  year: string;
+  month: string;
+  summary: ContributorsSummary;
+  contributors: Contributor[];
+}