Rename GeorouterProvider[Port] to Georouter[Port]
This commit is contained in:
parent
357746e843
commit
579415c300
|
@ -40,7 +40,7 @@ import {
|
||||||
} from '@songkeys/nestjs-redis';
|
} from '@songkeys/nestjs-redis';
|
||||||
import { ConfigurationRepository } from '@mobicoop/configuration-module';
|
import { ConfigurationRepository } from '@mobicoop/configuration-module';
|
||||||
import { PublishMessageWhenMatcherAdIsCreatedDomainEventHandler } from './core/application/event-handlers/publish-message-when-matcher-ad-is-created.domain-event-handler';
|
import { PublishMessageWhenMatcherAdIsCreatedDomainEventHandler } from './core/application/event-handlers/publish-message-when-matcher-ad-is-created.domain-event-handler';
|
||||||
import { GeorouterProvider } from './infrastructure/georouter-provider';
|
import { Georouter } from './infrastructure/georouter';
|
||||||
import { ClientsModule, Transport } from '@nestjs/microservices';
|
import { ClientsModule, Transport } from '@nestjs/microservices';
|
||||||
import { GRPC_GEOGRAPHY_PACKAGE_NAME } from '@src/app.constants';
|
import { GRPC_GEOGRAPHY_PACKAGE_NAME } from '@src/app.constants';
|
||||||
import { join } from 'path';
|
import { join } from 'path';
|
||||||
|
@ -139,7 +139,7 @@ const adapters: Provider[] = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
provide: AD_ROUTE_PROVIDER,
|
provide: AD_ROUTE_PROVIDER,
|
||||||
useClass: GeorouterProvider,
|
useClass: Georouter,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
provide: TIMEZONE_FINDER,
|
provide: TIMEZONE_FINDER,
|
||||||
|
|
|
@ -26,7 +26,7 @@ import { Point as PointValueObject } from '@modules/ad/core/domain/value-objects
|
||||||
import { Point } from '@modules/geography/core/domain/route.types';
|
import { Point } from '@modules/geography/core/domain/route.types';
|
||||||
import { MatcherAdCreationFailedIntegrationEvent } from '../../events/matcher-ad-creation-failed.integration-event';
|
import { MatcherAdCreationFailedIntegrationEvent } from '../../events/matcher-ad-creation-failed.integration-event';
|
||||||
import { MATCHER_AD_CREATION_FAILED_ROUTING_KEY } from '@src/app.constants';
|
import { MATCHER_AD_CREATION_FAILED_ROUTING_KEY } from '@src/app.constants';
|
||||||
import { GeorouterProviderPort } from '../../ports/georouter-provider.port';
|
import { GeorouterPort } from '../../ports/georouter.port';
|
||||||
|
|
||||||
@CommandHandler(CreateAdCommand)
|
@CommandHandler(CreateAdCommand)
|
||||||
export class CreateAdService implements ICommandHandler {
|
export class CreateAdService implements ICommandHandler {
|
||||||
|
@ -36,7 +36,7 @@ export class CreateAdService implements ICommandHandler {
|
||||||
@Inject(AD_REPOSITORY)
|
@Inject(AD_REPOSITORY)
|
||||||
private readonly repository: AdRepositoryPort,
|
private readonly repository: AdRepositoryPort,
|
||||||
@Inject(AD_ROUTE_PROVIDER)
|
@Inject(AD_ROUTE_PROVIDER)
|
||||||
private readonly routeProvider: GeorouterProviderPort,
|
private readonly routeProvider: GeorouterPort,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async execute(command: CreateAdCommand): Promise<AggregateID> {
|
async execute(command: CreateAdCommand): Promise<AggregateID> {
|
||||||
|
|
|
@ -26,6 +26,6 @@ export type RouteResponse = {
|
||||||
};
|
};
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export abstract class GeorouterProviderPort {
|
export abstract class GeorouterPort {
|
||||||
abstract getRoute(request: RouteRequest): Promise<RouteResponse>;
|
abstract getRoute(request: RouteRequest): Promise<RouteResponse>;
|
||||||
}
|
}
|
|
@ -3,7 +3,7 @@ import { Completer } from './completer.abstract';
|
||||||
import { MatchQuery } from '../match.query';
|
import { MatchQuery } from '../match.query';
|
||||||
import { Step } from '../../../types/step.type';
|
import { Step } from '../../../types/step.type';
|
||||||
import { CarpoolPathItem } from '@modules/ad/core/domain/value-objects/carpool-path-item.value-object';
|
import { CarpoolPathItem } from '@modules/ad/core/domain/value-objects/carpool-path-item.value-object';
|
||||||
import { RouteResponse } from '../../../ports/georouter-provider.port';
|
import { RouteResponse } from '../../../ports/georouter.port';
|
||||||
|
|
||||||
export class RouteCompleter extends Completer {
|
export class RouteCompleter extends Completer {
|
||||||
protected readonly type: RouteCompleterType;
|
protected readonly type: RouteCompleterType;
|
||||||
|
|
|
@ -12,7 +12,7 @@ import {
|
||||||
} from '@modules/ad/core/domain/path-creator.service';
|
} from '@modules/ad/core/domain/path-creator.service';
|
||||||
import { Point } from '@modules/ad/core/domain/value-objects/point.value-object';
|
import { Point } from '@modules/ad/core/domain/value-objects/point.value-object';
|
||||||
import { Route } from '../../types/route.type';
|
import { Route } from '../../types/route.type';
|
||||||
import { GeorouterProviderPort } from '../../ports/georouter-provider.port';
|
import { GeorouterPort } from '../../ports/georouter.port';
|
||||||
|
|
||||||
export class MatchQuery extends QueryBase {
|
export class MatchQuery extends QueryBase {
|
||||||
id?: string;
|
id?: string;
|
||||||
|
@ -40,10 +40,10 @@ export class MatchQuery extends QueryBase {
|
||||||
passengerRoute?: Route;
|
passengerRoute?: Route;
|
||||||
backAzimuth?: number;
|
backAzimuth?: number;
|
||||||
private readonly originWaypoint: Waypoint;
|
private readonly originWaypoint: Waypoint;
|
||||||
routeProvider: GeorouterProviderPort;
|
routeProvider: GeorouterPort;
|
||||||
|
|
||||||
// TODO: remove MatchRequestDto depency (here core domain depends on interface /!\)
|
// TODO: remove MatchRequestDto depency (here core domain depends on interface /!\)
|
||||||
constructor(props: MatchRequestDto, routeProvider: GeorouterProviderPort) {
|
constructor(props: MatchRequestDto, routeProvider: GeorouterPort) {
|
||||||
super();
|
super();
|
||||||
this.id = props.id;
|
this.id = props.id;
|
||||||
this.driver = props.driver;
|
this.driver = props.driver;
|
||||||
|
|
|
@ -3,10 +3,10 @@ import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
|
||||||
import { ClientGrpc } from '@nestjs/microservices';
|
import { ClientGrpc } from '@nestjs/microservices';
|
||||||
import { GRPC_GEOROUTER_SERVICE_NAME } from '@src/app.constants';
|
import { GRPC_GEOROUTER_SERVICE_NAME } from '@src/app.constants';
|
||||||
import {
|
import {
|
||||||
GeorouterProviderPort,
|
GeorouterPort,
|
||||||
RouteRequest,
|
RouteRequest,
|
||||||
RouteResponse,
|
RouteResponse,
|
||||||
} from '../core/application/ports/georouter-provider.port';
|
} from '../core/application/ports/georouter.port';
|
||||||
import { GEOGRAPHY_PACKAGE } from '../ad.di-tokens';
|
import { GEOGRAPHY_PACKAGE } from '../ad.di-tokens';
|
||||||
|
|
||||||
interface GeorouterService {
|
interface GeorouterService {
|
||||||
|
@ -14,7 +14,7 @@ interface GeorouterService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class GeorouterProvider implements GeorouterProviderPort, OnModuleInit {
|
export class Georouter implements GeorouterPort, OnModuleInit {
|
||||||
private georouterService: GeorouterService;
|
private georouterService: GeorouterService;
|
||||||
|
|
||||||
constructor(@Inject(GEOGRAPHY_PACKAGE) private readonly client: ClientGrpc) {}
|
constructor(@Inject(GEOGRAPHY_PACKAGE) private readonly client: ClientGrpc) {}
|
|
@ -11,7 +11,7 @@ import { AD_ROUTE_PROVIDER } from '@modules/ad/ad.di-tokens';
|
||||||
import { MatchMapper } from '@modules/ad/match.mapper';
|
import { MatchMapper } from '@modules/ad/match.mapper';
|
||||||
import { MatchingResult } from '@modules/ad/core/application/queries/match/match.query-handler';
|
import { MatchingResult } from '@modules/ad/core/application/queries/match/match.query-handler';
|
||||||
import { CacheInterceptor, CacheKey } from '@nestjs/cache-manager';
|
import { CacheInterceptor, CacheKey } from '@nestjs/cache-manager';
|
||||||
import { GeorouterProviderPort } from '@modules/ad/core/application/ports/georouter-provider.port';
|
import { GeorouterPort } from '@modules/ad/core/application/ports/georouter.port';
|
||||||
|
|
||||||
@UsePipes(
|
@UsePipes(
|
||||||
new RpcValidationPipe({
|
new RpcValidationPipe({
|
||||||
|
@ -24,7 +24,7 @@ export class MatchGrpcController {
|
||||||
constructor(
|
constructor(
|
||||||
private readonly queryBus: QueryBus,
|
private readonly queryBus: QueryBus,
|
||||||
@Inject(AD_ROUTE_PROVIDER)
|
@Inject(AD_ROUTE_PROVIDER)
|
||||||
private readonly routeProvider: GeorouterProviderPort,
|
private readonly routeProvider: GeorouterPort,
|
||||||
private readonly matchMapper: MatchMapper,
|
private readonly matchMapper: MatchMapper,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ import { CreateAdService } from '@modules/ad/core/application/commands/create-ad
|
||||||
import { CreateAdCommand } from '@modules/ad/core/application/commands/create-ad/create-ad.command';
|
import { CreateAdCommand } from '@modules/ad/core/application/commands/create-ad/create-ad.command';
|
||||||
import { AdAlreadyExistsException } from '@modules/ad/core/domain/ad.errors';
|
import { AdAlreadyExistsException } from '@modules/ad/core/domain/ad.errors';
|
||||||
import { PointProps } from '@modules/ad/core/domain/value-objects/point.value-object';
|
import { PointProps } from '@modules/ad/core/domain/value-objects/point.value-object';
|
||||||
import { GeorouterProviderPort } from '@modules/ad/core/application/ports/georouter-provider.port';
|
import { GeorouterPort } from '@modules/ad/core/application/ports/georouter.port';
|
||||||
|
|
||||||
const originWaypoint: PointProps = {
|
const originWaypoint: PointProps = {
|
||||||
lat: 48.689445,
|
lat: 48.689445,
|
||||||
|
@ -62,7 +62,7 @@ const mockAdRepository = {
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockRouteProvider: GeorouterProviderPort = {
|
const mockRouteProvider: GeorouterPort = {
|
||||||
getRoute: jest
|
getRoute: jest
|
||||||
.fn()
|
.fn()
|
||||||
.mockImplementationOnce(() => {
|
.mockImplementationOnce(() => {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { DateTimeTransformerPort } from '@modules/ad/core/application/ports/datetime-transformer.port';
|
import { DateTimeTransformerPort } from '@modules/ad/core/application/ports/datetime-transformer.port';
|
||||||
import { GeorouterProviderPort } from '@modules/ad/core/application/ports/georouter-provider.port';
|
import { GeorouterPort } from '@modules/ad/core/application/ports/georouter.port';
|
||||||
import { MatchQuery } from '@modules/ad/core/application/queries/match/match.query';
|
import { MatchQuery } from '@modules/ad/core/application/queries/match/match.query';
|
||||||
import { AlgorithmType } from '@modules/ad/core/application/types/algorithm.types';
|
import { AlgorithmType } from '@modules/ad/core/application/types/algorithm.types';
|
||||||
import { Waypoint } from '@modules/ad/core/application/types/waypoint.type';
|
import { Waypoint } from '@modules/ad/core/application/types/waypoint.type';
|
||||||
|
@ -58,7 +58,7 @@ const mockInputDateTimeTransformer: DateTimeTransformerPort = {
|
||||||
time: jest.fn().mockImplementation(() => '23:05'),
|
time: jest.fn().mockImplementation(() => '23:05'),
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockRouteProvider: GeorouterProviderPort = {
|
const mockRouteProvider: GeorouterPort = {
|
||||||
getRoute: jest
|
getRoute: jest
|
||||||
.fn()
|
.fn()
|
||||||
.mockImplementationOnce(simpleMockGeorouter.getRoute)
|
.mockImplementationOnce(simpleMockGeorouter.getRoute)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import {
|
import {
|
||||||
RouteRequest,
|
RouteRequest,
|
||||||
RouteResponse,
|
RouteResponse,
|
||||||
} from '@modules/ad/core/application/ports/georouter-provider.port';
|
} from '@modules/ad/core/application/ports/georouter.port';
|
||||||
import {
|
import {
|
||||||
RouteCompleter,
|
RouteCompleter,
|
||||||
RouteCompleterType,
|
RouteCompleterType,
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
import { GeorouterProviderPort } from '@modules/ad/core/application/ports/georouter-provider.port';
|
import { GeorouterPort } from '@modules/ad/core/application/ports/georouter.port';
|
||||||
|
|
||||||
export const bareMockGeorouter: GeorouterProviderPort = {
|
export const bareMockGeorouter: GeorouterPort = {
|
||||||
getRoute: jest.fn(),
|
getRoute: jest.fn(),
|
||||||
};
|
};
|
||||||
|
|
||||||
export const simpleMockGeorouter: GeorouterProviderPort = {
|
export const simpleMockGeorouter: GeorouterPort = {
|
||||||
getRoute: jest.fn().mockImplementation(() => ({
|
getRoute: jest.fn().mockImplementation(() => ({
|
||||||
distance: 350101,
|
distance: 350101,
|
||||||
duration: 14422,
|
duration: 14422,
|
||||||
|
|
Loading…
Reference in New Issue