Merge pull request #680 from j5ik2o/fix/build-errors-2025-02-13

fix: build errors

Author: j5ik2o

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
     branches: [ "main" ]
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: "Run lint"
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
           pnpm prisma:generate
           pnpm run lint
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: lint
     env:
       TEST_TIME_FACTOR: 10.0
@@ -46,7 +46,7 @@ jobs:
           pnpm prisma:generate
           pnpm run test
   e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: test
     env:
       TEST_TIME_FACTOR: 10.0

.github/workflows/openai-review.yml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: ${{ github.event_name != 'pull_request_review_comment' }}
 jobs:
   review:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 15
     if: "!contains(github.event.pull_request.labels.*.name, 'renovate')"
     steps:

Dockerfile

@@ -1,17 +1,26 @@
 FROM node:20-alpine AS base
 
+RUN apk add --no-cache libc6-compat openssl3
+
+RUN corepack disable
+RUN rm -f /usr/local/bin/pnpm /usr/local/bin/yarn /usr/local/bin/pnpm.js /usr/local/bin/yarn.js
+RUN npm install -g --force pnpm@8
+RUN which pnpm && pnpm --version
+
 FROM base AS builder
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
 
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 
 COPY . /app
 
-RUN pnpm install -g turbo && pnpm install && pnpm prisma:generate && pnpm build
+RUN pnpm install -g turbo
+RUN pnpm install
+RUN pnpm prisma:generate
+RUN pnpm build
 
 FROM base AS runner
 WORKDIR /app/packages/bootstrap

packages/bootstrap/src/local-rmu-main.ts

@@ -15,6 +15,7 @@ import type {
 } from "aws-lambda";
 import { GroupChatDao, ReadModelUpdater } from "cqrs-es-example-js-rmu";
 import { logger } from "./index";
+import type { PrismaQueryEvent } from "./types";
 
 async function localRmuMain() {
   logger.info("Starting local read model updater");
@@ -92,7 +93,7 @@ async function localRmuMain() {
     },
     log: [{ level: "query", emit: "event" }],
   });
-  prisma.$on("query", async (e) => {
+  prisma.$on("query", async (e: PrismaQueryEvent) => {
     logger.info(`Query: ${e.query}`);
     logger.info(`Params: ${e.params}`);
     logger.info(`Duration: ${e.duration}ms`);

packages/bootstrap/src/read-api-main.ts

@@ -4,6 +4,7 @@ import { PrismaClient } from "@prisma/client";
 import { createQuerySchema } from "cqrs-es-example-js-query-interface-adaptor";
 import type { QueryContext } from "cqrs-es-example-js-query-interface-adaptor";
 import { logger } from "./index";
+import type { PrismaQueryEvent } from "./types";
 
 interface MyContext {
   prisma: PrismaClient;
@@ -34,7 +35,7 @@ async function readApiMain() {
     },
     log: [{ level: "query", emit: "event" }],
   });
-  prisma.$on("query", async (e) => {
+  prisma.$on("query", async (e: PrismaQueryEvent) => {
     logger.info(`Query: ${e.query}`);
     logger.info(`Params: ${e.params}`);
     logger.info(`Duration: ${e.duration}ms`);

packages/bootstrap/src/types.ts

@@ -0,0 +1,7 @@
+export type PrismaQueryEvent = {
+  timestamp: Date;
+  query: string;
+  params: string;
+  duration: number;
+  target?: string;
+};

packages/rmu/src/group-chat-dao.ts

@@ -1,4 +1,5 @@
 import type { PrismaClient } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 import {
   type GroupChatId,
   type GroupChatName,
@@ -18,28 +19,30 @@ class GroupChatDao {
     administratorId: UserAccountId,
     createdAt: Date,
   ) {
-    return await this.prismaClient.$transaction(async (_prismaClient) => {
-      await _prismaClient.groupChats.create({
-        data: {
-          id: aggregateId.asString(),
-          disabled: false,
-          name: name.asString(),
-          ownerId: administratorId.asString(),
-          createdAt: createdAt,
-          updatedAt: createdAt,
-        },
-      });
-      await _prismaClient.members.create({
-        data: {
-          id: MemberId.generate().asString(),
-          groupChatId: aggregateId.asString(),
-          userAccountId: administratorId.asString(),
-          role: "administrator",
-          createdAt: createdAt,
-          updatedAt: createdAt,
-        },
-      });
-    });
+    return await this.prismaClient.$transaction(
+      async (_prismaClient: Prisma.TransactionClient) => {
+        await _prismaClient.groupChats.create({
+          data: {
+            id: aggregateId.asString(),
+            disabled: false,
+            name: name.asString(),
+            ownerId: administratorId.asString(),
+            createdAt: createdAt,
+            updatedAt: createdAt,
+          },
+        });
+        await _prismaClient.members.create({
+          data: {
+            id: MemberId.generate().asString(),
+            groupChatId: aggregateId.asString(),
+            userAccountId: administratorId.asString(),
+            role: "administrator",
+            createdAt: createdAt,
+            updatedAt: createdAt,
+          },
+        });
+      },
+    );
   }
 
   async deleteGroupChat(aggregateId: GroupChatId, createdAt: Date) {