Merge branch 'main' into api-improvements

Author: tugamars

.dockerignore

@@ -1 +1,9 @@
-node_modules
+node_modules
+.git
+*.log
+*.env
+Dockerfile
+.dockerignore
+__tests__/
+coverage/
+dist/

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-builds-typecheck.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v4

Dockerfile

@@ -1,37 +1,35 @@
-FROM node:18 as base
-
-RUN npm install -g pnpm
-
-RUN pnpm config set httpTimeout 1200000
+FROM node:20-slim AS base
 
 WORKDIR /snailycad
 
+# Install pnpm globally and set config in one layer
+RUN npm install -g pnpm && pnpm config set httpTimeout 1200000
+
+# Copy the rest of the source code
 COPY . ./
 
-FROM base as deps
+FROM base AS deps
 
-RUN pnpm install
+RUN pnpm install --frozen-lockfile
 
-FROM deps as api
+FROM deps AS build
 
 ENV NODE_ENV="production"
 
-RUN pnpm turbo run build --filter=@snailycad/api
+# Build all packages (this will also build the API and Client)
+RUN pnpm turbo run build --filter="{packages/*}"
 
-WORKDIR /snailycad/apps/api
 
+FROM build AS api
+ENV NODE_ENV="production"
+WORKDIR /snailycad/apps/api
+RUN pnpm run build
 CMD ["pnpm", "start"]
 
-FROM deps as client
-
+FROM build AS client
 ENV NODE_ENV="production"
-
+WORKDIR /snailycad/apps/client
 RUN rm -rf /snailycad/apps/client/.next
-
 RUN pnpm create-images-domain
-
-RUN pnpm turbo run build --filter=@snailycad/client
-
-WORKDIR /snailycad/apps/client
-
+RUN pnpm run build
 CMD ["pnpm", "start"]

apps/api/package.json

@@ -84,7 +84,7 @@
     "nodemon": "^3.1.3",
     "otplib": "^12.0.1",
     "prisma": "^5.15.0",
-    "puppeteer": "^21.5.2",
+    "puppeteer": "^24.11.1",
     "qrcode": "^1.5.3",
     "reflect-metadata": "^0.2.2",
     "sharp": "^0.33.4",
@@ -93,6 +93,6 @@
     "tslib": "^2.6.3",
     "undici": "^6.18.2",
     "use-intl": "2.22.1",
-    "zod": "^3.23.8"
+    "zod": "3.25.67"
   }
 }

apps/api/src/controllers/admin/values/import-values-controller.ts

@@ -576,15 +576,15 @@ export const typeHandlers = {
       data.map((item) => {
         const data = {
           update: {
-            isDefault: type === ValueType.LICENSE ? item.isDefault ?? false : false,
+            isDefault: type === ValueType.LICENSE ? (item.isDefault ?? false) : false,
             type: type as ValueType,
             value: { set: item.value },
             licenseType:
               type === ValueType.LICENSE ? (item.licenseType as ValueLicenseType) : undefined,
             isDisabled: item.isDisabled ?? false,
           },
           create: {
-            isDefault: type === ValueType.LICENSE ? item.isDefault ?? false : false,
+            isDefault: type === ValueType.LICENSE ? (item.isDefault ?? false) : false,
             type: type as ValueType,
             value: item.value,
             isDisabled: item.isDisabled ?? false,

apps/api/src/controllers/dispatch/911-calls/calls-911-controller.ts

@@ -315,7 +315,7 @@ export class Calls911Controller {
         description: data.descriptionData ? null : data.description,
         name: data.name,
         userId: user.id,
-        positionId: shouldRemovePosition ? null : position?.id ?? call.positionId,
+        positionId: shouldRemovePosition ? null : (position?.id ?? call.positionId),
         descriptionData: data.descriptionData ?? undefined,
         situationCodeId: data.situationCode === null ? null : data.situationCode,
         typeId: data.type,

apps/api/src/controllers/leo/jail-controller.ts

@@ -5,7 +5,7 @@ import { NotFound } from "@tsed/exceptions";
 import { prisma } from "lib/data/prisma";
 import { IsAuth } from "middlewares/auth/is-auth";
 import { leoProperties } from "utils/leo/includes";
-
+import type { z } from "zod";
 import { type MiscCadSettings, ReleaseType, type Prisma, PublishStatus } from "@prisma/client";
 import { validateSchema } from "lib/data/validate-schema";
 import { RELEASE_CITIZEN_SCHEMA } from "@snailycad/schemas";
@@ -123,7 +123,7 @@ export class JailController {
 
   private async handleReleaseCitizen(
     citizenId: string,
-    data: Zod.infer<typeof RELEASE_CITIZEN_SCHEMA> & { force?: true },
+    data: z.infer<typeof RELEASE_CITIZEN_SCHEMA> & { force?: true },
   ) {
     const citizen = await prisma.citizen.findUnique({
       where: { id: citizenId },

apps/api/src/controllers/leo/search/NotesController.ts

@@ -8,6 +8,7 @@ import { NotFound } from "@tsed/exceptions";
 import { UsePermissions, Permissions } from "middlewares/use-permissions";
 import type { Citizen, RegisteredVehicle } from "@prisma/client";
 import type * as APITypes from "@snailycad/types/api";
+import type { z } from "zod";
 
 @Controller("/notes")
 @UseBeforeEach(IsAuth)
@@ -68,7 +69,7 @@ export class NotesController {
     return true;
   }
 
-  private getPrismaName(data: Zod.infer<typeof NOTE_SCHEMA>) {
+  private getPrismaName(data: z.infer<typeof NOTE_SCHEMA>) {
     const prismaNames = {
       CITIZEN: "citizen",
       VEHICLE: "registeredVehicle",
@@ -78,9 +79,7 @@ export class NotesController {
     return name;
   }
 
-  private async findItem<T extends Citizen | RegisteredVehicle>(
-    data: Zod.infer<typeof NOTE_SCHEMA>,
-  ) {
+  private async findItem<T extends Citizen | RegisteredVehicle>(data: z.infer<typeof NOTE_SCHEMA>) {
     const name = this.getPrismaName(data);
     // @ts-expect-error methods have the same properties here.
     const item = await prisma[name].findUnique({

apps/api/src/controllers/record/records-controller.ts

@@ -293,7 +293,7 @@ export class RecordsController {
 
     try {
       const args = process.env.IS_USING_ROOT_USER === "true" ? ["--no-sandbox"] : [];
-      const browser = await puppeteer.launch({ args, headless: "new" });
+      const browser = await puppeteer.launch({ args, headless: true });
       const page = await browser.newPage();
 
       page.setContent(template, { waitUntil: "domcontentloaded" });
@@ -388,7 +388,7 @@ export class RecordsController {
 
     try {
       const args = process.env.IS_USING_ROOT_USER === "true" ? ["--no-sandbox"] : [];
-      const browser = await puppeteer.launch({ args, headless: "new" });
+      const browser = await puppeteer.launch({ args, headless: true });
       const page = await browser.newPage();
 
       page.setContent(template, { waitUntil: "domcontentloaded" });