yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-11 07:39:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix code for tests

Browse Source
This commit is contained in:
Ben Irvin 2022-11-15 20:58:50 +01:00
parent 7f68db7fe7
commit 1a98345a9a
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/data-transfer/lib/engine/__tests__/engine.test.ts
View File

@ -66,8 +66,6 @@ describe('Transfer engine', () => {
const engine = createTransferEngine(mockedSource, mockedDestination, defaultOptions); const engine = createTransferEngine(mockedSource, mockedDestination, defaultOptions);
await engine.transfer(); await engine.transfer();
expect(mockedSource.bootstrap).toHaveBeenCalledTimes(1);
expect(mockedDestination.bootstrap).toHaveBeenCalledTimes(1);
}); });
test('bootstraps all providers with a bootstrap', async () => { test('bootstraps all providers with a bootstrap', async () => {
const source = { const source = {
@ -82,8 +80,8 @@ describe('Transfer engine', () => {
await engine.transfer(); await engine.transfer();
expect(mockedSource.bootstrap).toHaveBeenCalledTimes(1); expect(source.bootstrap).toHaveBeenCalledTimes(1);
expect(mockedDestination.bootstrap).toHaveBeenCalledTimes(1); expect(destination.bootstrap).toHaveBeenCalledTimes(1);
}); });
}); });

50
packages/core/data-transfer/lib/engine/index.ts
View File

@ -27,6 +27,8 @@ type TransferEngineProgress = {
stream: PassThrough; stream: PassThrough;
}; };
export const VALID_STRATEGIES = ['restore', 'merge'];
class TransferEngine< class TransferEngine<
S extends ISourceProvider = ISourceProvider, S extends ISourceProvider = ISourceProvider,
D extends IDestinationProvider = IDestinationProvider D extends IDestinationProvider = IDestinationProvider
@ -173,8 +175,16 @@ class TransferEngine<
} }
} }
validateTransferOptions() {
if (!VALID_STRATEGIES.includes(this.options.strategy)) {
throw new Error('Invalid stategy ' + this.options.strategy);
}
}
async transfer(): Promise<ITransferResults<S, D>> { async transfer(): Promise<ITransferResults<S, D>> {
try { try {
this.validateTransferOptions();
await this.bootstrap(); await this.bootstrap();
const isValidTransfer = await this.integrityCheck(); const isValidTransfer = await this.integrityCheck();
@ -205,15 +215,17 @@ class TransferEngine<
async transferSchemas(): Promise<void> { async transferSchemas(): Promise<void> {
const stageName: TransferStage = 'schemas'; const stageName: TransferStage = 'schemas';
const inStream = await this.sourceProvider.streamSchemas?.();
const outStream = await this.destinationProvider.getSchemasStream?.();
const inStream = await this.sourceProvider.streamSchemas?.();
if (!inStream) { if (!inStream) {
throw new Error('Unable to transfer schemas, source stream is missing'); console.log('SourceProvider did not return a schemas stream');
return;
} }
const outStream = await this.destinationProvider.getSchemasStream?.();
if (!outStream) { if (!outStream) {
throw new Error('Unable to transfer schemas, destination stream is missing'); console.log('DestinationProvider did not return a schemas stream');
return;
} }
this.#updateStage('start', stageName); this.#updateStage('start', stageName);
@ -237,15 +249,17 @@ class TransferEngine<
async transferEntities(): Promise<void> { async transferEntities(): Promise<void> {
const stageName: TransferStage = 'entities'; const stageName: TransferStage = 'entities';
const inStream = await this.sourceProvider.streamEntities?.();
const outStream = await this.destinationProvider.getEntitiesStream?.();
const inStream = await this.sourceProvider.streamEntities?.();
if (!inStream) { if (!inStream) {
throw new Error('Unable to transfer entities, source stream is missing'); console.log('SourceProvider did not return entities stream');
return;
} }
const outStream = await this.destinationProvider.getEntitiesStream?.();
if (!outStream) { if (!outStream) {
throw new Error('Unable to transfer entities, destination stream is missing'); console.log('DestinationProvider did not return entities stream');
return;
} }
this.#updateStage('start', stageName); this.#updateStage('start', stageName);
@ -274,15 +288,17 @@ class TransferEngine<
async transferLinks(): Promise<void> { async transferLinks(): Promise<void> {
const stageName: TransferStage = 'links'; const stageName: TransferStage = 'links';
const inStream = await this.sourceProvider.streamLinks?.();
const outStream = await this.destinationProvider.getLinksStream?.();
const inStream = await this.sourceProvider.streamLinks?.();
if (!inStream) { if (!inStream) {
throw new Error('Unable to transfer links, source stream is missing'); console.log('SourceProvider did not return a stream');
return;
} }
const outStream = await this.destinationProvider.getLinksStream?.();
if (!outStream) { if (!outStream) {
throw new Error('Unable to transfer links, destination stream is missing'); console.log('DestinationProvider did not return a stream');
return;
} }
this.#updateStage('start', 'links'); this.#updateStage('start', 'links');
@ -319,15 +335,17 @@ class TransferEngine<
async transferConfiguration(): Promise<void> { async transferConfiguration(): Promise<void> {
const stageName: TransferStage = 'configuration'; const stageName: TransferStage = 'configuration';
const inStream = await this.sourceProvider.streamConfiguration?.();
const outStream = await this.destinationProvider.getConfigurationStream?.();
const inStream = await this.sourceProvider.streamConfiguration?.();
if (!inStream) { if (!inStream) {
throw new Error('Unable to transfer configuration, source stream is missing'); console.log('SourceProvider did not return configuration stream');
return;
} }
const outStream = await this.destinationProvider.getConfigurationStream?.();
if (!outStream) { if (!outStream) {
throw new Error('Unable to transfer configuration, destination stream is missing'); console.log('DestinationProvider did not return configuration stream');
return;
} }
this.#updateStage('start', stageName); this.#updateStage('start', stageName);