Merge branch 'cleaning' into 'main'

Cleaning

See merge request v3/service/ad!26
This commit is contained in:
Sylvain Briat 2023-10-19 07:13:27 +00:00
commit b700a43115
6 changed files with 10 additions and 8 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@mobicoop/ad", "name": "@mobicoop/ad",
"version": "2.2.2", "version": "2.2.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@mobicoop/ad", "name": "@mobicoop/ad",
"version": "2.2.2", "version": "2.2.3",
"license": "AGPL", "license": "AGPL",
"dependencies": { "dependencies": {
"@grpc/grpc-js": "^1.9.5", "@grpc/grpc-js": "^1.9.5",

View File

@ -1,6 +1,6 @@
{ {
"name": "@mobicoop/ad", "name": "@mobicoop/ad",
"version": "2.2.2", "version": "2.2.3",
"description": "Mobicoop V3 Ad", "description": "Mobicoop V3 Ad",
"author": "sbriat", "author": "sbriat",
"private": true, "private": true,

View File

@ -5,6 +5,9 @@ export const SERVICE_NAME = 'ad';
export const GRPC_PACKAGE_NAME = 'ad'; export const GRPC_PACKAGE_NAME = 'ad';
export const GRPC_SERVICE_NAME = 'AdService'; export const GRPC_SERVICE_NAME = 'AdService';
// messaging
export const AD_CREATED_ROUTING_KEY = 'ad.created';
// configuration // configuration
export const SERVICE_CONFIGURATION_SET_QUEUE = 'ad-configuration-set'; export const SERVICE_CONFIGURATION_SET_QUEUE = 'ad-configuration-set';
export const SERVICE_CONFIGURATION_DELETE_QUEUE = 'ad-configuration-delete'; export const SERVICE_CONFIGURATION_DELETE_QUEUE = 'ad-configuration-delete';

View File

@ -1 +0,0 @@
export const MESSAGER_AD_CREATED_ROUTING_KEY = 'ad.created';

View File

@ -3,7 +3,7 @@ import { OnEvent } from '@nestjs/event-emitter';
import { AdCreatedDomainEvent } from '../../domain/events/ad-created.domain-events'; import { AdCreatedDomainEvent } from '../../domain/events/ad-created.domain-events';
import { MessagePublisherPort } from '@mobicoop/ddd-library'; import { MessagePublisherPort } from '@mobicoop/ddd-library';
import { AD_MESSAGE_PUBLISHER } from '@modules/ad/ad.di-tokens'; import { AD_MESSAGE_PUBLISHER } from '@modules/ad/ad.di-tokens';
import { MESSAGER_AD_CREATED_ROUTING_KEY } from '@modules/ad/ad.constants'; import { AD_CREATED_ROUTING_KEY } from '@src/app.constants';
@Injectable() @Injectable()
export class PublishMessageWhenAdIsCreatedDomainEventHandler { export class PublishMessageWhenAdIsCreatedDomainEventHandler {
@ -15,7 +15,7 @@ export class PublishMessageWhenAdIsCreatedDomainEventHandler {
@OnEvent(AdCreatedDomainEvent.name, { async: true, promisify: true }) @OnEvent(AdCreatedDomainEvent.name, { async: true, promisify: true })
async handle(event: AdCreatedDomainEvent): Promise<any> { async handle(event: AdCreatedDomainEvent): Promise<any> {
this.messagePublisher.publish( this.messagePublisher.publish(
MESSAGER_AD_CREATED_ROUTING_KEY, AD_CREATED_ROUTING_KEY,
JSON.stringify(event), JSON.stringify(event),
); );
} }

View File

@ -3,7 +3,7 @@ import { PublishMessageWhenAdIsCreatedDomainEventHandler } from '@modules/ad/cor
import { AdCreatedDomainEvent } from '@modules/ad/core/domain/events/ad-created.domain-events'; import { AdCreatedDomainEvent } from '@modules/ad/core/domain/events/ad-created.domain-events';
import { Test, TestingModule } from '@nestjs/testing'; import { Test, TestingModule } from '@nestjs/testing';
import { AD_MESSAGE_PUBLISHER } from '@modules/ad/ad.di-tokens'; import { AD_MESSAGE_PUBLISHER } from '@modules/ad/ad.di-tokens';
import { MESSAGER_AD_CREATED_ROUTING_KEY } from '@modules/ad/ad.constants'; import { AD_CREATED_ROUTING_KEY } from '@src/app.constants';
const mockMessagePublisher = { const mockMessagePublisher = {
publish: jest.fn().mockImplementation(), publish: jest.fn().mockImplementation(),
@ -81,7 +81,7 @@ describe('Publish message when ad is created domain event handler', () => {
expect(publishMessageWhenAdIsCreatedDomainEventHandler).toBeDefined(); expect(publishMessageWhenAdIsCreatedDomainEventHandler).toBeDefined();
expect(mockMessagePublisher.publish).toHaveBeenCalledTimes(1); expect(mockMessagePublisher.publish).toHaveBeenCalledTimes(1);
expect(mockMessagePublisher.publish).toHaveBeenCalledWith( expect(mockMessagePublisher.publish).toHaveBeenCalledWith(
MESSAGER_AD_CREATED_ROUTING_KEY, AD_CREATED_ROUTING_KEY,
'{"id":"some-domain-event-id","aggregateId":"some-aggregate-id","userId":"some-user-id","driver":false,"passenger":true,"frequency":"PUNCTUAL","fromDate":"2023-06-28","toDate":"2023-06-28","schedule":[{"day":3,"time":"07:15","margin":900}],"seatsProposed":3,"seatsRequested":1,"strict":false,"waypoints":[{"position":0,"houseNumber":"5","street":"Avenue Foch","locality":"Nancy","postalCode":"54000","country":"France","lat":48.689445,"lon":6.1765102},{"position":1,"locality":"Paris","postalCode":"75000","country":"France","lat":48.8566,"lon":2.3522}],"metadata":{"timestamp":1687928400000,"correlationId":"some-correlation-id"}}', '{"id":"some-domain-event-id","aggregateId":"some-aggregate-id","userId":"some-user-id","driver":false,"passenger":true,"frequency":"PUNCTUAL","fromDate":"2023-06-28","toDate":"2023-06-28","schedule":[{"day":3,"time":"07:15","margin":900}],"seatsProposed":3,"seatsRequested":1,"strict":false,"waypoints":[{"position":0,"houseNumber":"5","street":"Avenue Foch","locality":"Nancy","postalCode":"54000","country":"France","lat":48.689445,"lon":6.1765102},{"position":1,"locality":"Paris","postalCode":"75000","country":"France","lat":48.8566,"lon":2.3522}],"metadata":{"timestamp":1687928400000,"correlationId":"some-correlation-id"}}',
); );
}); });