From 6343aab4116d6f64728101d83966520f631e6186 Mon Sep 17 00:00:00 2001 From: Carlos Lostao Date: Fri, 3 Oct 2025 14:32:38 +0200 Subject: [PATCH 1/4] fix: outdated testing --- apps/backend/__tests__/e2e/objects/nodes.spec.ts | 4 ---- apps/backend/__tests__/e2e/objects/object.spec.ts | 9 --------- .../sqls/20250924123851-update-nodes-constraint-down.sql | 1 - .../src/infrastructure/repositories/objects/nodes.ts | 2 +- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/apps/backend/__tests__/e2e/objects/nodes.spec.ts b/apps/backend/__tests__/e2e/objects/nodes.spec.ts index cbc8266d..a85f137d 100644 --- a/apps/backend/__tests__/e2e/objects/nodes.spec.ts +++ b/apps/backend/__tests__/e2e/objects/nodes.spec.ts @@ -200,14 +200,10 @@ describe('Nodes', () => { }) expect(processArchivalSpy).toHaveBeenCalledTimes(1) - const populateCachesSpy = jest - .spyOn(ObjectUseCases, 'populateCaches') - .mockResolvedValue() // Mock the callback execution of the event above await ObjectUseCases.onObjectArchived(cidToString(cid)) const metadata = await metadataRepository.getMetadata(cidToString(cid)) - expect(populateCachesSpy).toHaveBeenCalledWith(cidToString(cid)) expect(metadata).toBeDefined() expect(metadata?.is_archived).toBe(true) }) diff --git a/apps/backend/__tests__/e2e/objects/object.spec.ts b/apps/backend/__tests__/e2e/objects/object.spec.ts index 03ae83dd..2cff2990 100644 --- a/apps/backend/__tests__/e2e/objects/object.spec.ts +++ b/apps/backend/__tests__/e2e/objects/object.spec.ts @@ -72,14 +72,6 @@ describe('Object', () => { }) it('isArchived should return true for archived object', async () => { - const downloadSpy = jest.spyOn(downloadService, 'download') - downloadSpy.mockResolvedValueOnce( - new Readable({ - read: async function () { - this.push(null) - }, - }), - ) await nodesRepository.saveNode({ cid: fileCid, root_cid: fileCid, @@ -94,7 +86,6 @@ describe('Object', () => { await ObjectUseCases.onObjectArchived(fileCid) const isArchived = await ObjectUseCases.isArchived(fileCid) expect(isArchived).toBe(true) - expect(downloadSpy).toHaveBeenCalledTimes(1) }) it('should get listed in user objects', async () => { diff --git a/apps/backend/migrations/sqls/20250924123851-update-nodes-constraint-down.sql b/apps/backend/migrations/sqls/20250924123851-update-nodes-constraint-down.sql index 36b949cc..e69de29b 100644 --- a/apps/backend/migrations/sqls/20250924123851-update-nodes-constraint-down.sql +++ b/apps/backend/migrations/sqls/20250924123851-update-nodes-constraint-down.sql @@ -1 +0,0 @@ -ALTER TABLE nodes ADD CONSTRAINT nodes_pkey PRIMARY KEY (cid); \ No newline at end of file diff --git a/apps/backend/src/infrastructure/repositories/objects/nodes.ts b/apps/backend/src/infrastructure/repositories/objects/nodes.ts index 0f49588b..caba5312 100644 --- a/apps/backend/src/infrastructure/repositories/objects/nodes.ts +++ b/apps/backend/src/infrastructure/repositories/objects/nodes.ts @@ -42,7 +42,7 @@ const saveNodes = async (nodes: Node[]) => { return db.query({ text: pgFormat( - 'INSERT INTO nodes (cid, root_cid, head_cid, type, encoded_node, piece_index, piece_offset, block_published_on, tx_published_on) VALUES %L ON CONFLICT (cid) DO NOTHING', + 'INSERT INTO nodes (cid, root_cid, head_cid, type, encoded_node, piece_index, piece_offset, block_published_on, tx_published_on) VALUES %L', nodes.map((node) => [ node.cid, node.root_cid, From e0e671c1720551518f250f96da9200c9d94d266b Mon Sep 17 00:00:00 2001 From: Carlos Lostao Date: Fri, 3 Oct 2025 14:35:44 +0200 Subject: [PATCH 2/4] fix: nor running workflow services --- .github/workflows/services.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index 5485fe2e..0ebb89fe 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -5,13 +5,13 @@ on: branches: - main paths: - - "backend/**" # Only trigger on changes within auth or backend - - "auth/**" + - "apps/backend/**" # Only trigger on changes within auth or backend + - "apps/auth/**" - ".github/**" pull_request: paths: - - "backend/**" # Only trigger on changes within auth or backend - - "auth/**" + - "apps/backend/**" # Only trigger on changes within auth or backend + - "apps/auth/**" - ".github/**" workflow_dispatch: From 5ea4f0257e6d5dee952ac89e17097af16442bb01 Mon Sep 17 00:00:00 2001 From: Carlos Lostao Date: Fri, 3 Oct 2025 14:56:35 +0200 Subject: [PATCH 3/4] refactor: remove unused imports in object.spec.ts and api.ts --- apps/backend/__tests__/e2e/objects/object.spec.ts | 2 -- apps/frontend/src/services/api.ts | 1 - 2 files changed, 3 deletions(-) diff --git a/apps/backend/__tests__/e2e/objects/object.spec.ts b/apps/backend/__tests__/e2e/objects/object.spec.ts index 2cff2990..1501ba44 100644 --- a/apps/backend/__tests__/e2e/objects/object.spec.ts +++ b/apps/backend/__tests__/e2e/objects/object.spec.ts @@ -10,8 +10,6 @@ import { import { uploadFile } from '../../utils/uploads.js' import { jest } from '@jest/globals' import { v4 } from 'uuid' -import { downloadService } from '../../../src/infrastructure/services/download/index.js' -import { Readable } from 'stream' import { ForbiddenError } from '../../../src/errors/index.js' import { nodesRepository } from '../../../src/infrastructure/repositories/index.js' diff --git a/apps/frontend/src/services/api.ts b/apps/frontend/src/services/api.ts index b05cb36c..27c87a5a 100644 --- a/apps/frontend/src/services/api.ts +++ b/apps/frontend/src/services/api.ts @@ -4,7 +4,6 @@ import { AccountModel, ObjectInformation, DownloadStatus, - Intent, } from '@auto-drive/models'; import { getAuthSession } from 'utils/auth'; import { uploadFileContent } from 'utils/file'; From 5258316dab633b8b805698d4f7d28cd97a01eabc Mon Sep 17 00:00:00 2001 From: Carlos Lostao Date: Fri, 3 Oct 2025 15:06:54 +0200 Subject: [PATCH 4/4] refactor: remove unused getIntent function from api service --- apps/frontend/src/services/api.ts | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/apps/frontend/src/services/api.ts b/apps/frontend/src/services/api.ts index 27c87a5a..34b4f059 100644 --- a/apps/frontend/src/services/api.ts +++ b/apps/frontend/src/services/api.ts @@ -67,25 +67,6 @@ export const createApiService = ({ throw new Error(`Network response was not ok: ${response.statusText}`); } }, - getIntent: async (intentId: string): Promise => { - const session = await getAuthSession(); - if (!session?.authProvider || !session.accessToken) { - throw new Error('No session'); - } - - const response = await fetch(`${apiBaseUrl}/intents/${intentId}`, { - headers: { - Authorization: `Bearer ${session.accessToken}`, - 'X-Auth-Provider': session.authProvider, - }, - }); - - if (!response.ok) { - throw new Error(`Network response was not ok: ${response.statusText}`); - } - - return response.json() as Promise; - }, getAccount: async (): Promise => { const session = await getAuthSession(); if (!session?.authProvider || !session.accessToken) {