ci: fixes

Signed-off-by: riccardoperra <riccardo.perra@icloud.com>

Author: riccardoperra

.github/workflows/main.yml

@@ -102,7 +102,7 @@ jobs:
   typecheck-packages:
     if: ${{ needs.install.outputs.libs-change == 'true' }}
     name: Type-checking
-    needs: [install, build-packages]
+    needs: [install, build-packages, build-api]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PR
@@ -118,6 +118,12 @@ jobs:
           path: packages
           key: packages-dist-${{ github.run_id }}-${{ github.run_number }}
 
+      - name: Restore api bundle
+        uses: actions/cache@v5
+        with:
+          path: packages
+          key: rest-api-bundle-${{ github.run_id }}-${{ github.run_number }}
+
       - name: Typecheck packages
         run: |
           pnpm --filter='./packages/**' --recursive typecheck:ci

apps/api/package.json

@@ -34,10 +34,10 @@
     "build:ts": "tsdown",
     "build:types": "tsc -p tsconfig.schema.json",
     "prisma:migrate:dev": "prisma migrate dev",
-    "prisma:migrate:test": "dotenv -e .env.testing -- prisma migrate dev",
+    "prisma:migrate:test": "dotenv -e .env.test -- prisma migrate dev",
     "prisma:migrate:deploy": "prisma migrate deploy",
-    "prisma:migrate:deploy-test": "dotenv -e .env.testing -- prisma migrate deploy",
-    "prisma:migrate:reset-test": "dotenv -e .env.testing -- prisma migrate reset --force",
+    "prisma:migrate:deploy-test": "dotenv -e .env.test -- prisma migrate deploy",
+    "prisma:migrate:reset-test": "dotenv -e .env.test -- prisma migrate reset --force",
     "prisma:generate": "prisma generate dev && pnpm --filter=@codeimage/prisma-models build",
     "docker:dev": "docker compose -f docker-compose.dev.yml up"
   },
@@ -70,7 +70,7 @@
     "@prisma/adapter-pg": "7.5.0",
     "@types/node": "catalog:next",
     "@types/sinon": "^21.0.0",
-    "@vitest/ui": "^4.1.1",
+    "@vitest/ui": "^4.1.2",
     "concurrently": "^9.2.1",
     "fastify-tsconfig": "^3.0.0",
     "oxfmt": "catalog:next",

apps/api/test/common/domainFunctions/builder.test.ts

@@ -1,9 +1,8 @@
-import * as sinon from 'sinon';
-import {assert, test} from 'vitest';
+import {expect, test, vi} from 'vitest';
 import {HandlerBuilder} from '../../../src/common/domainFunctions/builder.js';
 
 test('create handler', async () => {
-  const fn = sinon.fake();
+  const fn = vi.fn();
 
   const handler = HandlerBuilder.withDependencies<string>()
     .withName('name')
@@ -14,5 +13,5 @@ test('create handler', async () => {
   // oxlint-disable-next-line typescript/no-explicit-any
   handler('test-deps', {} as any)(1);
 
-  assert(fn.calledWith(1, 'test-deps'));
+  expect(fn).toHaveBeenCalledWith(1, 'test-deps');
 });

apps/api/test/modules/preset/handlers/create.test.ts

@@ -1,7 +1,6 @@
 import type {DomainHandlerMap, ResolvedDomainHandlerMap} from '@api/domain';
 import type {Preset} from '@codeimage/prisma-models';
-import * as sinon from 'sinon';
-import {assert, beforeEach, expect, test} from 'vitest';
+import {assert, beforeEach, expect, test, vi} from 'vitest';
 import {create} from '../../../../src/modules/preset/handlers/create.js';
 import type {PresetHandlerDependencies} from '../../../../src/modules/preset/handlers/index.js';
 import type {PresetCreateDto} from '../../../../src/modules/preset/schema/preset-create-dto.schema.js';
@@ -11,7 +10,7 @@ import {dependencies} from './dependencies.js';
 
 const handlersStub = {} as ResolvedDomainHandlerMap<DomainHandlerMap>;
 
-beforeEach(() => sinon.restore());
+beforeEach(() => vi.restoreAllMocks());
 
 test('when findById and found result', async () => {
   const id = 'preset-1';
@@ -41,16 +40,16 @@ test('when findById and found result', async () => {
     data: testPresetUtils.buildPresetData(),
   };
 
-  sinon.stub(dependencies.config, 'PRESETS_LIMIT').value(10);
-  sinon.stub(dependencies.repository, 'countByOwnerId').resolves(0);
+  vi.spyOn(dependencies.config, 'PRESETS_LIMIT', 'get').mockReturnValue(10);
+  vi.spyOn(dependencies.repository, 'countByOwnerId').mockResolvedValue(0);
 
-  const createStub = sinon
-    .stub(dependencies.repository, 'create')
-    .resolves(savedPreset);
+  const createStub = vi
+    .spyOn(dependencies.repository, 'create')
+    .mockResolvedValue(savedPreset);
 
-  const fromEntityToDtoStub = sinon
-    .stub(dependencies.mapper, 'fromEntityToDto')
-    .resolves(expected);
+  const fromEntityToDtoStub = vi
+    .spyOn(dependencies.mapper, 'fromEntityToDto')
+    .mockResolvedValue(expected);
 
   const result = await create(
     dependencies as unknown as PresetHandlerDependencies,
@@ -59,10 +58,14 @@ test('when findById and found result', async () => {
     },
   )(ownerId, request);
 
-  assert.ok(
-    createStub.calledOnceWithExactly({...request, version: BigInt(1), ownerId}),
-  );
-  assert.ok(fromEntityToDtoStub.calledOnceWithExactly(savedPreset));
+  expect(createStub).toHaveBeenCalledTimes(1);
+  expect(createStub).toHaveBeenCalledWith({
+    ...request,
+    version: BigInt(1),
+    ownerId,
+  });
+  expect(fromEntityToDtoStub).toHaveBeenCalledTimes(1);
+  expect(fromEntityToDtoStub).toHaveBeenCalledWith(savedPreset);
 
   assert.equal(result, expected);
 });
@@ -86,24 +89,21 @@ test('throw error when exceed limit', async () => {
     ownerId,
   };
 
-  sinon.stub(dependencies.config, 'PRESETS_LIMIT').value(1);
-  sinon.stub(dependencies.repository, 'countByOwnerId').resolves(10);
+  vi.spyOn(dependencies.config, 'PRESETS_LIMIT', 'get').mockReturnValue(1);
+  vi.spyOn(dependencies.repository, 'countByOwnerId').mockResolvedValue(10);
 
-  const createStub = sinon
-    .stub(dependencies.repository, 'create')
-    .resolves(savedPreset);
+  const createStub = vi
+    .spyOn(dependencies.repository, 'create')
+    .mockResolvedValue(savedPreset);
 
-  const fromEntityToDtoStub = sinon.stub(
-    dependencies.mapper,
-    'fromEntityToDto',
-  );
+  const fromEntityToDtoStub = vi.spyOn(dependencies.mapper, 'fromEntityToDto');
 
   await expect(
     create(dependencies as unknown as PresetHandlerDependencies, {
       handlers: handlersStub,
     })(ownerId, request),
   ).rejects.toThrow();
 
-  assert.ok(createStub.notCalled);
-  assert.ok(fromEntityToDtoStub.notCalled);
+  expect(createStub).not.toHaveBeenCalled();
+  expect(fromEntityToDtoStub).not.toHaveBeenCalled();
 });

apps/api/test/modules/preset/handlers/findById.test.ts

@@ -1,6 +1,5 @@
 import type {DomainHandlerMap, ResolvedDomainHandlerMap} from '@api/domain';
 import type {Preset} from '@codeimage/prisma-models';
-import * as sinon from 'sinon';
 import {assert, beforeEach, expect, test, vi} from 'vitest';
 import {findById} from '../../../../src/modules/preset/handlers/findById.js';
 import type {PresetHandlerDependencies} from '../../../../src/modules/preset/handlers/index.js';
@@ -10,7 +9,7 @@ import {dependencies} from './dependencies.js';
 
 const handlersStub = {} as ResolvedDomainHandlerMap<DomainHandlerMap>;
 
-beforeEach(() => sinon.restore());
+beforeEach(() => vi.restoreAllMocks());
 
 test('when findById and found result', async () => {
   const id = 'preset-1';
@@ -52,14 +51,15 @@ test('when findById and return 0 result', async () => {
   const ownerId = 'owner-1';
   const id = 'preset-1';
 
-  sinon
-    .stub(dependencies.repository, 'findByIdAndOwnerId')
-    .withArgs(id, ownerId)
-    .returns(Promise.resolve(null));
+  const findByIdStub = vi
+    .spyOn(dependencies.repository, 'findByIdAndOwnerId')
+    .mockResolvedValue(null);
 
   await expect(
     findById(dependencies as unknown as PresetHandlerDependencies, {
       handlers: handlersStub,
-    })('ownerId', id),
+    })(ownerId, id),
   ).rejects.toThrow();
+
+  expect(findByIdStub).toHaveBeenCalledWith(id, ownerId);
 });

apps/api/test/modules/preset/handlers/getAll.test.ts

@@ -1,6 +1,5 @@
 import type {DomainHandlerMap, ResolvedDomainHandlerMap} from '@api/domain';
-import * as sinon from 'sinon';
-import {assert, beforeEach, test} from 'vitest';
+import {assert, beforeEach, expect, test, vi} from 'vitest';
 import {findAll} from '../../../../src/modules/preset/handlers/findAll.js';
 import type {PresetHandlerDependencies} from '../../../../src/modules/preset/handlers/index.js';
 import type {PresetDto} from '../../../../src/modules/preset/schema/preset-dto.schema.js';
@@ -9,16 +8,16 @@ import {dependencies} from './dependencies.js';
 
 const handlersStub = {} as ResolvedDomainHandlerMap<DomainHandlerMap>;
 
-beforeEach(() => sinon.restore());
+beforeEach(() => vi.restoreAllMocks());
 
 test('when findAll', async () => {
   const ownerId = 'owner-1';
   const preset1 = PresetTestDataUtils.buildPreset('id1', 'preset', ownerId);
   const preset2 = PresetTestDataUtils.buildPreset('id2', 'preset2', ownerId);
 
-  const findAllByOwnerIdStub = sinon
-    .stub(dependencies.repository, 'findAllByOwnerId')
-    .resolves([preset1, preset2]);
+  const findAllByOwnerIdStub = vi
+    .spyOn(dependencies.repository, 'findAllByOwnerId')
+    .mockResolvedValue([preset1, preset2]);
 
   const expected1 = {
     id: preset1.id,
@@ -29,9 +28,9 @@ test('when findAll', async () => {
     data: {},
   } as PresetDto;
 
-  const fromEntityToDtoStub = sinon
-    .stub(dependencies.mapper, 'fromEntityToDto')
-    .resolves(expected1);
+  const fromEntityToDtoStub = vi
+    .spyOn(dependencies.mapper, 'fromEntityToDto')
+    .mockResolvedValue(expected1);
 
   const result = await findAll(
     dependencies as unknown as PresetHandlerDependencies,
@@ -40,7 +39,8 @@ test('when findAll', async () => {
     },
   )(ownerId);
 
-  assert.ok(findAllByOwnerIdStub.calledOnceWithExactly(ownerId));
-  assert.ok(fromEntityToDtoStub.calledTwice);
+  expect(findAllByOwnerIdStub).toHaveBeenCalledTimes(1);
+  expect(findAllByOwnerIdStub).toHaveBeenCalledWith(ownerId);
+  expect(fromEntityToDtoStub).toHaveBeenCalledTimes(2);
   assert.equal(result.length, 2);
 });