From 135d45ad458eaac4296b8d2297b6929c75716177 Mon Sep 17 00:00:00 2001 From: olivermrbl Date: Fri, 19 Feb 2021 08:41:34 +0100 Subject: [PATCH] clean up --- .../draft-orders/get-shipping-options.js | 21 ---------- .../api/routes/admin/orders/list-orders.js | 12 ++++++ .../src/services/__tests__/draft-order.js | 3 ++ packages/medusa/src/services/draft-order.js | 38 +++---------------- 4 files changed, 21 insertions(+), 53 deletions(-) delete mode 100644 packages/medusa/src/api/routes/admin/draft-orders/get-shipping-options.js diff --git a/packages/medusa/src/api/routes/admin/draft-orders/get-shipping-options.js b/packages/medusa/src/api/routes/admin/draft-orders/get-shipping-options.js deleted file mode 100644 index bf8a410021..0000000000 --- a/packages/medusa/src/api/routes/admin/draft-orders/get-shipping-options.js +++ /dev/null @@ -1,21 +0,0 @@ -import { Validator, MedusaError } from "medusa-core-utils" - -export default async (req, res) => { - const { id } = req.params - - try { - const draftOrderService = req.scope.resolve("draftOrderService") - const shippingProfileService = req.scope.resolve("shippingProfileService") - - const draftOrder = await cartService.retrieve(value.cart_id, { - select: ["subtotal"], - relations: ["region", "items", "items.variant", "items.variant.product"], - }) - - const options = await shippingProfileService.fetchCartOptions(cart) - - res.status(200).json({ shipping_options: options }) - } catch (err) { - throw err - } -} diff --git a/packages/medusa/src/api/routes/admin/orders/list-orders.js b/packages/medusa/src/api/routes/admin/orders/list-orders.js index d76b9fb2e0..5b9b826db2 100644 --- a/packages/medusa/src/api/routes/admin/orders/list-orders.js +++ b/packages/medusa/src/api/routes/admin/orders/list-orders.js @@ -15,6 +15,18 @@ export default async (req, res) => { selector.q = req.query.q } + if ("payment_status" in req.query) { + selector.payment_status = req.query.payment_status + } + + if ("status" in req.query) { + selector.status = req.query.status + } + + if ("fulfillment_status" in req.query) { + selector.fulfillment_status = req.query.fulfillment_status + } + let includeFields = [] if ("fields" in req.query) { includeFields = req.query.fields.split(",") diff --git a/packages/medusa/src/services/__tests__/draft-order.js b/packages/medusa/src/services/__tests__/draft-order.js index 3972e8b17c..ba2b9f7f92 100644 --- a/packages/medusa/src/services/__tests__/draft-order.js +++ b/packages/medusa/src/services/__tests__/draft-order.js @@ -153,6 +153,7 @@ describe("DraftOrderService", () => { shipping_address_id: "test-shipping", billing_address_id: "test-billing", customer_id: "test-customer", + type: "draft_order", }) expect(shippingOptionService.createShippingMethod).toHaveBeenCalledTimes( @@ -168,6 +169,7 @@ describe("DraftOrderService", () => { shipping_address_id: "test-shipping", billing_address_id: "test-billing", customer_id: "test-customer", + type: "draft_order", }, } ) @@ -328,6 +330,7 @@ describe("DraftOrderService", () => { expect(draftOrderRepository.save).toHaveBeenCalledWith({ id: "test-draft-order", cart_id: "test-cart", + order_id: "test-order", status: "completed", }) }) diff --git a/packages/medusa/src/services/draft-order.js b/packages/medusa/src/services/draft-order.js index 0325479071..261112df48 100644 --- a/packages/medusa/src/services/draft-order.js +++ b/packages/medusa/src/services/draft-order.js @@ -18,15 +18,10 @@ class DraftOrderService extends BaseService { paymentRepository, orderRepository, eventBusService, - addressRepository, cartService, - customerService, - totalsService, lineItemService, - paymentProviderService, productVariantService, shippingOptionService, - regionService, }) { super() @@ -42,27 +37,12 @@ class DraftOrderService extends BaseService { /** @private @const {OrderRepository} */ this.orderRepository_ = orderRepository - /** @private @const {TotalsService} */ - this.totalsService_ = totalsService - - /** @private @const {AddressRepository} */ - this.addressRepository_ = addressRepository - /** @private @const {LineItemService} */ this.lineItemService_ = lineItemService /** @private @const {CartService} */ this.cartService_ = cartService - /** @private @const {CustomerService} */ - this.customerService_ = customerService - - /** @private @const {RegionService} */ - this.regionService_ = regionService - - /** @private @const {PaymentProviderService} */ - this.paymentProviderService_ = paymentProviderService - /** @private @const {ProductVariantService} */ this.productVariantService_ = productVariantService @@ -83,13 +63,8 @@ class DraftOrderService extends BaseService { draftOrderRepository: this.draftOrderRepository_, paymentRepository: this.paymentRepository_, orderRepository: this.orderRepository_, - totalsService: this.totalsService_, - addressRepository: this.addressRepository_, lineItemService: this.lineItemService_, cartService: this.cartService_, - customerService: this.customerService_, - regionService: this.regionService_, - paymentProviderService: this.paymentProviderService_, productVariantService: this.productVariantService_, shippingOptionService: this.shippingOptionService_, eventBusService: this.eventBus_, @@ -103,6 +78,7 @@ class DraftOrderService extends BaseService { /** * Retrieves a draft order with the given id. * @param {string} id - id of the draft order to retrieve + * @param {object} config - query object for findOne * @return {Promise} the draft order */ async retrieve(id, config = {}) { @@ -129,19 +105,17 @@ class DraftOrderService extends BaseService { /** * Retrieves a draft order based on its associated cart id * @param {string} cartId - cart id that the draft orders's cart has + * * @param {object} config - query object for findOne * @return {Promise} the draft order */ - async retrieveByCartId(cartId, relations = []) { + async retrieveByCartId(cartId, config = {}) { const draftOrderRepo = this.manager_.getCustomRepository( this.draftOrderRepository_ ) - const draftOrder = await draftOrderRepo.findOne({ - where: { - cart_id: cartId, - }, - relations, - }) + const query = this.buildQuery_({ cart_id: cartId }, config) + + const draftOrder = await draftOrderRepo.findOne(query) if (!draftOrder) { throw new MedusaError(