refactor(core): Rename order-merge-strategy config dir to order

vendure-ecommerce · May 15, 2020 · 3583089 · 3583089
1 parent 41d2091
commit 3583089
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 6 deletions.
diff --git a/packages/core/src/config/default-config.ts b/packages/core/src/config/default-config.ts
@@ -12,8 +12,8 @@ import { defaultCollectionFilters } from './collection/default-collection-filter
 import { AutoIncrementIdStrategy } from './entity-id-strategy/auto-increment-id-strategy';
 import { DefaultLogger } from './logger/default-logger';
 import { TypeOrmLogger } from './logger/typeorm-logger';
-import { MergeOrdersStrategy } from './order-merge-strategy/merge-orders-strategy';
-import { UseGuestStrategy } from './order-merge-strategy/use-guest-strategy';
+import { MergeOrdersStrategy } from './order/merge-orders-strategy';
+import { UseGuestStrategy } from './order/use-guest-strategy';
 import { defaultPromotionActions } from './promotion/default-promotion-actions';
 import { defaultPromotionConditions } from './promotion/default-promotion-conditions';
 import { defaultShippingCalculator } from './shipping-method/default-shipping-calculator';

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -15,7 +15,7 @@ export * from './logger/default-logger';
 export * from './logger/noop-logger';
 export * from './logger/vendure-logger';
 export * from './merge-config';
-export * from './order-merge-strategy/order-merge-strategy';
+export * from './order/order-merge-strategy';
 export * from './payment-method/example-payment-method-handler';
 export * from './payment-method/payment-method-handler';
 export * from './promotion/default-promotion-actions';

diff --git a/...ge-strategy/merge-orders-strategy.spec.ts → ...onfig/order/merge-orders-strategy.spec.ts b/...ge-strategy/merge-orders-strategy.spec.ts → ...onfig/order/merge-orders-strategy.spec.ts
diff --git a/...r-merge-strategy/merge-orders-strategy.ts → ...src/config/order/merge-orders-strategy.ts b/...r-merge-strategy/merge-orders-strategy.ts → ...src/config/order/merge-orders-strategy.ts
@@ -25,6 +25,6 @@ export class MergeOrdersStrategy implements OrderMergeStrategy {
     }
 
     private findCorrespondingLine(existingOrder: Order, guestLine: OrderLine): OrderLine | undefined {
-        return existingOrder.lines.find(line => line.productVariant.id === guestLine.productVariant.id);
+        return existingOrder.lines.find((line) => line.productVariant.id === guestLine.productVariant.id);
     }
 }
diff --git a/...er-merge-strategy/order-merge-strategy.ts → .../src/config/order/order-merge-strategy.ts b/...er-merge-strategy/order-merge-strategy.ts → .../src/config/order/order-merge-strategy.ts
diff --git a/...ge-strategy/use-existing-strategy.spec.ts → ...onfig/order/use-existing-strategy.spec.ts b/...ge-strategy/use-existing-strategy.spec.ts → ...onfig/order/use-existing-strategy.spec.ts
diff --git a/...r-merge-strategy/use-existing-strategy.ts → ...src/config/order/use-existing-strategy.ts b/...r-merge-strategy/use-existing-strategy.ts → ...src/config/order/use-existing-strategy.ts
diff --git a/...-guest-if-existing-empty-strategy.spec.ts → ...-guest-if-existing-empty-strategy.spec.ts b/...-guest-if-existing-empty-strategy.spec.ts → ...-guest-if-existing-empty-strategy.spec.ts
diff --git a/...y/use-guest-if-existing-empty-strategy.ts → ...r/use-guest-if-existing-empty-strategy.ts b/...y/use-guest-if-existing-empty-strategy.ts → ...r/use-guest-if-existing-empty-strategy.ts
diff --git a/...merge-strategy/use-guest-strategy.spec.ts → ...c/config/order/use-guest-strategy.spec.ts b/...merge-strategy/use-guest-strategy.spec.ts → ...c/config/order/use-guest-strategy.spec.ts
diff --git a/...rder-merge-strategy/use-guest-strategy.ts → ...re/src/config/order/use-guest-strategy.ts b/...rder-merge-strategy/use-guest-strategy.ts → ...re/src/config/order/use-guest-strategy.ts
diff --git a/packages/core/src/config/vendure-config.ts b/packages/core/src/config/vendure-config.ts
@@ -20,7 +20,7 @@ import { CustomFields } from './custom-field/custom-field-types';
 import { EntityIdStrategy } from './entity-id-strategy/entity-id-strategy';
 import { JobQueueStrategy } from './job-queue/job-queue-strategy';
 import { VendureLogger } from './logger/vendure-logger';
-import { OrderMergeStrategy } from './order-merge-strategy/order-merge-strategy';
+import { OrderMergeStrategy } from './order/order-merge-strategy';
 import { PaymentMethodHandler } from './payment-method/payment-method-handler';
 import { PromotionAction } from './promotion/promotion-action';
 import { PromotionCondition } from './promotion/promotion-condition';

diff --git a/packages/core/src/service/helpers/order-merger/order-merger.spec.ts b/packages/core/src/service/helpers/order-merger/order-merger.spec.ts
@@ -2,7 +2,7 @@ import { Test } from '@nestjs/testing';
 
 import { ConfigService } from '../../../config/config.service';
 import { MockConfigService } from '../../../config/config.service.mock';
-import { MergeOrdersStrategy } from '../../../config/order-merge-strategy/merge-orders-strategy';
+import { MergeOrdersStrategy } from '../../../config/order/merge-orders-strategy';
 import { Order } from '../../../entity/order/order.entity';
 import { createOrderFromLines } from '../../../testing/order-test-utils';