Skip to content

Commit

Permalink
fix(migrations): tests using old get es entry methods
Browse files Browse the repository at this point in the history
  • Loading branch information
brunozoric committed Aug 28, 2023
1 parent 304765e commit c8a3e1f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ interface ModifiedEntryValues {
interface TransformerResult {
transformEntryKeys: () => TransformedKeysEntry;
transformToIndex: () => CmsIndexEntry;
getElasticsearchLatestEntryData: () => Promise<string>;
getElasticsearchPublishedEntryData: () => Promise<string>;
getElasticsearchLatestEntryData: () => Promise<Record<string, any>>;
getElasticsearchPublishedEntryData: () => Promise<Record<string, any>>;
}

export const createTransformer = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import { ArticleCmsEntry, DynamoDbRecord } from "./types";
import {
getESLatestEntryData,
getESPublishedEntryData
} from "@webiny/api-headless-cms-ddb-es/operations/entry";
import { PluginsContainer } from "@webiny/plugins";
import { StorageOperationsCmsModel } from "@webiny/api-headless-cms/types";
import { entryToStorageTransform } from "@webiny/api-headless-cms";
import { prepareEntryToIndex } from "@webiny/api-headless-cms-ddb-es/helpers";
import { getRecordIndexName } from "~tests/migrations/5.37.0/002/ddb-es/helpers";
import { createTransformer } from "@webiny/api-headless-cms-ddb-es/operations/entry/transformations";

interface ElasticsearchRecord {
index: string;
Expand Down Expand Up @@ -108,23 +104,11 @@ export const createDynamoDbElasticsearchRecords = async (params: CreateRecordsPa
);
const { entryId, tenant, locale, modelId } = entry;

const esEntry = prepareEntryToIndex({
plugins,
const transformer = createTransformer({
model,
entry: {
...entry,
values: model.convertValueKeyToStorage({
fields: model.fields,
values: entry.values
})
},
storageEntry: {
...storageEntry,
values: model.convertValueKeyToStorage({
fields: model.fields,
values: storageEntry.values
})
}
plugins,
entry,
storageEntry
});
/**
* Elasticsearch Data
Expand All @@ -134,8 +118,8 @@ export const createDynamoDbElasticsearchRecords = async (params: CreateRecordsPa
locale,
modelId
});
const latestData = await getESLatestEntryData(plugins, esEntry);
const publishedData = await getESPublishedEntryData(plugins, esEntry);
const latestData = await transformer.getElasticsearchLatestEntryData();
const publishedData = await transformer.getElasticsearchPublishedEntryData();
records.push({
PK: `T#${tenant}#L#${locale}#CMS#CME#${entryId}`,
SK: `L`,
Expand Down

0 comments on commit c8a3e1f

Please sign in to comment.