diff --git a/src/output/__tests__/indexer-deduplication.test.ts b/src/output/__tests__/indexer-deduplication.test.ts index 1167701..3fe252b 100644 --- a/src/output/__tests__/indexer-deduplication.test.ts +++ b/src/output/__tests__/indexer-deduplication.test.ts @@ -1,14 +1,14 @@ import * as TE from "fp-ts/TaskEither"; import { constVoid, pipe } from "fp-ts/lib/function"; import { IOutputDocument } from "../elasticsearch/elasticsearch"; -import { IOutputDeduplicationService } from "../elasticsearch/service"; +import { IOutputService } from "../elasticsearch/service"; import { indexerDeduplication } from "../indexer-deduplication"; const mockGet = jest.fn(); const mockInsert = jest.fn(); const mockUpdate = jest.fn(); -const mockService: IOutputDeduplicationService = { +const mockService: IOutputService = { get: mockGet, insert: mockInsert, update: mockUpdate diff --git a/src/output/__tests__/tablestorage-deduplication.test.ts b/src/output/__tests__/tablestorage-deduplication.test.ts index 87bb835..adbcf69 100644 --- a/src/output/__tests__/tablestorage-deduplication.test.ts +++ b/src/output/__tests__/tablestorage-deduplication.test.ts @@ -5,7 +5,7 @@ import * as tableUtils from "../../utils/tableStorage"; import { pipe } from "fp-ts/lib/function"; import { IOutputDocument } from "../elasticsearch/elasticsearch"; -import { IOutputDeduplicationService } from "../elasticsearch/service"; +import { IOutputService } from "../elasticsearch/service"; import { tableStorageDeduplication } from "../tablestorage-deduplication"; import { NonEmptyString } from "@pagopa/ts-commons/lib/strings"; @@ -19,7 +19,7 @@ const mockGet = jest.fn(); const mockInsert = jest.fn().mockImplementation(() => TE.right(void 0)); const mockUpdate = jest.fn().mockImplementation(() => TE.right(void 0)); -const mockService: IOutputDeduplicationService = { +const mockService: IOutputService = { get: mockGet, insert: mockInsert, update: mockUpdate diff --git a/src/output/elasticsearch/service.ts b/src/output/elasticsearch/service.ts index 495fa38..5c4ba42 100644 --- a/src/output/elasticsearch/service.ts +++ b/src/output/elasticsearch/service.ts @@ -15,7 +15,7 @@ import { export type OutputClient = EL.Client; export type OutputDataRead = GetResponse; export type OutputDataWrite = EL.estypes.Result; -export interface IOutputDeduplicationService { +export interface IOutputService { readonly get: ( indexName: string, document: IOutputDocument @@ -32,7 +32,7 @@ export interface IOutputDeduplicationService { export const getElasticSearchService = ( connectionString: string -): E.Either => +): E.Either => pipe( getElasticClient(connectionString), E.map(client => ({ diff --git a/src/output/indexer-deduplication.ts b/src/output/indexer-deduplication.ts index 7d5b219..d86328c 100644 --- a/src/output/indexer-deduplication.ts +++ b/src/output/indexer-deduplication.ts @@ -4,12 +4,12 @@ import * as O from "fp-ts/Option"; import * as TE from "fp-ts/TaskEither"; import { flow, pipe } from "fp-ts/lib/function"; import { IOutputDocument } from "./elasticsearch/elasticsearch"; -import { IOutputDeduplicationService } from "./elasticsearch/service"; +import { IOutputService } from "./elasticsearch/service"; export const indexerDeduplication = ( indexName: string, document: IOutputDocument -) => (service: IOutputDeduplicationService): TE.TaskEither => +) => (service: IOutputService): TE.TaskEither => pipe( service.get(indexName, document), TE.map(O.some), diff --git a/src/output/service.ts b/src/output/service.ts index 3a0801e..fd527d1 100644 --- a/src/output/service.ts +++ b/src/output/service.ts @@ -1,7 +1,7 @@ import * as TE from "fp-ts/TaskEither"; import { NonEmptyString } from "@pagopa/ts-commons/lib/strings"; import { IOutputDocument } from "./elasticsearch/elasticsearch"; -import { IOutputDeduplicationService } from "./elasticsearch/service"; +import { IOutputService } from "./elasticsearch/service"; import { indexerDeduplication } from "./indexer-deduplication"; import { tableStorageDeduplication } from "./tablestorage-deduplication"; @@ -9,7 +9,7 @@ export interface IDeduplicationStrategy { readonly execute: ( indexName: string, document: IOutputDocument - ) => (service: IOutputDeduplicationService) => TE.TaskEither; + ) => (service: IOutputService) => TE.TaskEither; } export const indexerDeduplicationStrategy: IDeduplicationStrategy = { diff --git a/src/output/tablestorage-deduplication.ts b/src/output/tablestorage-deduplication.ts index ec2eb43..7715831 100644 --- a/src/output/tablestorage-deduplication.ts +++ b/src/output/tablestorage-deduplication.ts @@ -10,12 +10,12 @@ import { upsertTableDocument } from "../utils/tableStorage"; import { IOutputDocument } from "./elasticsearch/elasticsearch"; -import { IOutputDeduplicationService } from "./elasticsearch/service"; +import { IOutputService } from "./elasticsearch/service"; export const tableStorageDeduplication = ( tableStorageConnectionString: NonEmptyString ) => (indexName: string, document: IOutputDocument) => ( - service: IOutputDeduplicationService + service: IOutputService ): TE.TaskEither => pipe( TE.Do,