Merge branch 'main' into N21-2096-force-migration

apps/server/src/infra/preview-generator/preview.producer.spec.ts

@@ -12,9 +12,10 @@ import { PreviewProducer } from './preview.producer';
 describe('PreviewProducer', () => {
 	let module: TestingModule;
 	let service: PreviewProducer;
-	let configService: DeepMocked<ConfigService>;
 	let amqpConnection: DeepMocked<AmqpConnection>;
 
+	const timeout = 10000;
+
 	beforeAll(async () => {
 		await setupEntities();
 		module = await Test.createTestingModule({
@@ -30,14 +31,20 @@ describe('PreviewProducer', () => {
 				},
 				{
 					provide: ConfigService,
-					useValue: createMock<ConfigService>(),
+					useValue: createMock<ConfigService>({
+						get: jest.fn().mockImplementation((key: string) => {
+							if (key === 'INCOMING_REQUEST_TIMEOUT') {
+								return timeout;
+							}
+							throw new Error('Config key not found');
+						}),
+					}),
 				},
 			],
 		}).compile();
 
 		service = module.get(PreviewProducer);
 		amqpConnection = module.get(AmqpConnection);
-		configService = module.get(ConfigService);
 	});
 
 	afterAll(async () => {
@@ -47,15 +54,14 @@ describe('PreviewProducer', () => {
 	afterEach(() => {
 		jest.resetAllMocks();
 	});
+
 	it('should be defined', () => {
 		expect(service).toBeDefined();
 	});
 
 	describe('generate', () => {
 		describe('when valid params are passed and amqp connection return with a message', () => {
 			const setup = () => {
-				const timeout = 10000;
-
 				const params: PreviewFileOptions = {
 					originFilePath: 'file/test.jpeg',
 					previewFilePath: 'preview/text.webp',
@@ -67,13 +73,13 @@ describe('PreviewProducer', () => {
 
 				const message = [];
 				amqpConnection.request.mockResolvedValueOnce({ message });
-				configService.get.mockReturnValue(timeout);
 
 				const expectedParams = {
 					exchange: FilesPreviewExchange,
 					routingKey: FilesPreviewEvents.GENERATE_PREVIEW,
 					payload: params,
 					timeout,
+					expiration: timeout * 1.5,
 				};
 
 				return { params, expectedParams, message };

apps/server/src/infra/rabbitmq/rpc-message-producer.spec.ts

@@ -59,6 +59,7 @@ describe('RpcMessageProducer', () => {
 					routingKey: TestEvent,
 					payload: params,
 					timeout,
+					expiration: timeout * 1.5,
 				};
 
 				return { params, expectedParams, message };

apps/server/src/infra/rabbitmq/rpc-message-producer.ts

@@ -27,11 +27,15 @@ export abstract class RpcMessageProducer {
 	}
 
 	protected createRequest(event: string, payload: unknown) {
+		// expiration should be greater than timeout
+		const expiration = this.timeout > 0 ? this.timeout * 1.5 : undefined;
+
 		return {
 			exchange: this.exchange,
 			routingKey: event,
 			payload,
 			timeout: this.timeout,
+			expiration,
 		};
 	}
 }

apps/server/src/modules/files-storage-client/service/files-storage.producer.spec.ts

@@ -12,7 +12,6 @@ import { FilesStorageProducer } from './files-storage.producer';
 describe('FilesStorageProducer', () => {
 	let module: TestingModule;
 	let service: FilesStorageProducer;
-	let configService: DeepMocked<ConfigService>;
 	let amqpConnection: DeepMocked<AmqpConnection>;
 
 	const timeout = 10000;
@@ -32,21 +31,30 @@ describe('FilesStorageProducer', () => {
 				},
 				{
 					provide: ConfigService,
-					useValue: createMock<ConfigService>(),
+					useValue: createMock<ConfigService>({
+						get: jest.fn().mockImplementation((key: string) => {
+							if (key === 'INCOMING_REQUEST_TIMEOUT_COPY_API') {
+								return timeout;
+							}
+							throw new Error('Config key not found');
+						}),
+					}),
 				},
 			],
 		}).compile();
 
 		service = module.get(FilesStorageProducer);
 		amqpConnection = module.get(AmqpConnection);
-		configService = module.get(ConfigService);
-		configService.get.mockReturnValue(timeout);
 	});
 
 	afterAll(async () => {
 		await module.close();
 	});
 
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
 	describe('copyFilesOfParent', () => {
 		describe('when amqpConnection return with error in response', () => {
 			const setup = () => {
@@ -111,6 +119,7 @@ describe('FilesStorageProducer', () => {
 					routingKey: FilesStorageEvents.COPY_FILES_OF_PARENT,
 					payload: params,
 					timeout,
+					expiration: timeout * 1.5,
 				};
 
 				return { params, expectedParams, message };
@@ -163,6 +172,7 @@ describe('FilesStorageProducer', () => {
 					routingKey: FilesStorageEvents.LIST_FILES_OF_PARENT,
 					payload: parentId,
 					timeout,
+					expiration: timeout * 1.5,
 				};
 
 				const message = [];
@@ -221,6 +231,7 @@ describe('FilesStorageProducer', () => {
 					routingKey: FilesStorageEvents.DELETE_FILES_OF_PARENT,
 					payload: parentId,
 					timeout,
+					expiration: timeout * 1.5,
 				};
 
 				return { parentId, message, expectedParams };
@@ -275,6 +286,7 @@ describe('FilesStorageProducer', () => {
 					routingKey: FilesStorageEvents.DELETE_FILES,
 					payload: [recordId],
 					timeout,
+					expiration: timeout * 1.5,
 				};
 				return { recordId, message, expectedParams };
 			};
@@ -329,6 +341,7 @@ describe('FilesStorageProducer', () => {
 					routingKey: FilesStorageEvents.REMOVE_CREATORID_OF_FILES,
 					payload: creatorId,
 					timeout,
+					expiration: timeout * 1.5,
 				};
 
 				return { creatorId, message, expectedParams };

package.json

@@ -207,7 +207,7 @@
 		"ioredis": "^5.3.2",
 		"jose": "^5.6.3",
 		"jsdom": "^23.2.0",
-		"jsonwebtoken": "^9.0.0",
+		"jsonwebtoken": "^9.0.2",
 		"jwks-rsa": "^2.0.5",
 		"ldapjs": "git://github.com/hpi-schul-cloud/node-ldapjs.git",
 		"lodash": "^4.17.19",
@@ -320,7 +320,7 @@
 		"mocha": "^9.1.3",
 		"mockery": "^2.0.0",
 		"nock": "^13.0.0",
-		"nodemon": "^2.0.2",
+		"nodemon": "^3.1.4",
 		"nyc": "^15.0.1",
 		"prettier": "^2.8.1",
 		"prettier-eslint": "^12.0.0",