From 86dfb7f496fdb8571a8204cecb47ba3e21780ca2 Mon Sep 17 00:00:00 2001 From: Peter Lauck Date: Mon, 11 Jan 2021 12:46:40 -0500 Subject: [PATCH] feat(order): add typename to driver response models (#1229) __typename must be grabbed in order to properly match fragments `addTypename: true` with the cache forces flushed responses to match the query (which includes __typename) flushed responses that do not have __typename will cause invariant errors adding __typename on the response models makes it easier to stub out response objects in tests --- .../src/models/responses/order-address.ts | 1 + .../src/models/responses/order-invoice.ts | 1 + .../2.4.0/src/models/responses/order-item.ts | 1 + .../src/models/responses/order-payment.ts | 1 + .../models/responses/order-shipment-item.ts | 1 + .../responses/order-shipment-tracking.ts | 1 + .../src/models/responses/order-shipment.ts | 1 + .../2.4.0/src/models/responses/order.ts | 1 + .../src/queries/responses/get-guest-orders.ts | 3 +- .../2.4.1/src/helpers/test-data.service.ts | 56 +++++++++++++++++-- .../2.4.1/src/models/responses/discount.ts | 1 + .../src/models/responses/order-address.ts | 1 + .../src/models/responses/order-credit-item.ts | 1 + .../src/models/responses/order-credit.ts | 1 + .../models/responses/order-invoice-item.ts | 7 +++ .../src/models/responses/order-invoice.ts | 1 + .../2.4.1/src/models/responses/order-item.ts | 12 +++- .../src/models/responses/order-payment.ts | 2 + .../models/responses/order-shipment-item.ts | 8 ++- .../responses/order-shipment-tracking.ts | 1 + .../src/models/responses/order-shipment.ts | 1 + .../2.4.1/src/models/responses/order-total.ts | 1 + .../2.4.1/src/models/responses/order.ts | 1 + .../src/queries/fragments/order-address.ts | 1 - .../queries/fragments/order-credit-item.ts | 2 - .../queries/fragments/order-credit-total.ts | 1 - .../src/queries/fragments/order-credit.ts | 2 - .../queries/fragments/order-invoice-item.ts | 2 - .../queries/fragments/order-invoice-total.ts | 1 - .../src/queries/fragments/order-invoice.ts | 2 - .../2.4.1/src/queries/fragments/order-item.ts | 6 -- .../src/queries/fragments/order-payment.ts | 1 - .../queries/fragments/order-shipment-item.ts | 2 - .../fragments/order-shipment-tracking.ts | 1 - .../src/queries/fragments/order-shipment.ts | 2 - .../src/queries/fragments/order-total.ts | 1 - .../2.4.1/src/queries/fragments/order.ts | 1 - .../src/queries/responses/get-guest-orders.ts | 3 +- 38 files changed, 96 insertions(+), 37 deletions(-) diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-address.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-address.ts index d2e4fac830..d4b7e14cd4 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-address.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-address.ts @@ -1,4 +1,5 @@ export interface MagentoGraycoreOrderAddress { + __typename?: 'GraycoreOrderAddress'; order_id: number; prefix: string; suffix: string; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-invoice.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-invoice.ts index 19d5f51d5c..39365f4ca6 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-invoice.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-invoice.ts @@ -3,6 +3,7 @@ import { MagentoGraycoreOrderAddress } from './order-address'; import { MagentoGraycoreOrderPayment } from './order-payment'; export interface MagentoGraycoreOrderInvoice { + __typename?: 'GraycoreOrderInvoice'; items: MagentoGraycoreOrderShipmentItem[]; grand_total: number; subtotal: number; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-item.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-item.ts index ef3975b3cb..38d248d41a 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-item.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-item.ts @@ -1,4 +1,5 @@ export interface MagentoGraycoreOrderItem { + __typename?: 'GraycoreOrderItem'; qty_ordered: number; qty_canceled: number; qty_fulfilled: number; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-payment.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-payment.ts index 3aae44f95b..bfe9ec445f 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-payment.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-payment.ts @@ -1,4 +1,5 @@ export interface MagentoGraycoreOrderPayment { + __typename?: 'GraycoreOrderPayment'; payment_id: number; order_id: number; method: string; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-item.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-item.ts index bc3b60a958..7d17aa22dd 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-item.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-item.ts @@ -1,6 +1,7 @@ import { MagentoGraycoreOrderItem } from './order-item'; export interface MagentoGraycoreOrderShipmentItem { + __typename?: 'GraycoreOrderShipmentItem'; item: MagentoGraycoreOrderItem; qty: number; }; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-tracking.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-tracking.ts index e43b518af4..0c50154f3b 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-tracking.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment-tracking.ts @@ -1,4 +1,5 @@ export interface MagentoGraycoreOrderShipmentTracking { + __typename?: 'GraycoreOrderShipmentTracking'; tracking_number: string; carrier: string; title: string; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment.ts index d87c943b3f..a6f3b992b1 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order-shipment.ts @@ -2,6 +2,7 @@ import { MagentoGraycoreOrderShipmentItem } from './order-shipment-item'; import { MagentoGraycoreOrderShipmentTracking } from './order-shipment-tracking'; export interface MagentoGraycoreOrderShipment { + __typename?: 'GraycoreOrderShipment'; tracking: MagentoGraycoreOrderShipmentTracking[]; items: MagentoGraycoreOrderShipmentItem[]; }; diff --git a/libs/order/driver/magento/2.4.0/src/models/responses/order.ts b/libs/order/driver/magento/2.4.0/src/models/responses/order.ts index 606ab9b936..9203ffe36b 100644 --- a/libs/order/driver/magento/2.4.0/src/models/responses/order.ts +++ b/libs/order/driver/magento/2.4.0/src/models/responses/order.ts @@ -5,6 +5,7 @@ import { MagentoGraycoreOrderPayment } from './order-payment'; import { MagentoGraycoreOrderInvoice } from './order-invoice'; export interface MagentoGraycoreOrder { + __typename?: 'GraycoreOrder'; id: number; order_number: string | number; customer_id: number; diff --git a/libs/order/driver/magento/2.4.0/src/queries/responses/get-guest-orders.ts b/libs/order/driver/magento/2.4.0/src/queries/responses/get-guest-orders.ts index 47489845ea..35d1be7a2e 100644 --- a/libs/order/driver/magento/2.4.0/src/queries/responses/get-guest-orders.ts +++ b/libs/order/driver/magento/2.4.0/src/queries/responses/get-guest-orders.ts @@ -2,6 +2,7 @@ import { MagentoGraycoreOrder } from '../../models/responses/order'; export interface MagentoGetGuestOrdersResponse { graycoreGuestOrders: { - orders: MagentoGraycoreOrder[]; + __typename?: string; + orders: MagentoGraycoreOrder[] | null; } } diff --git a/libs/order/driver/magento/2.4.1/src/helpers/test-data.service.ts b/libs/order/driver/magento/2.4.1/src/helpers/test-data.service.ts index d515bd1f1d..fcb98b19ae 100644 --- a/libs/order/driver/magento/2.4.1/src/helpers/test-data.service.ts +++ b/libs/order/driver/magento/2.4.1/src/helpers/test-data.service.ts @@ -254,7 +254,7 @@ export class MagentoOrderTestDataFactory { mockDaffOrderConfigurableItem.order_id = mockDaffOrder.id; mockMagentoOrderSimpleItem = { - id: null, + __typename: 'OrderItem', selected_options: [], entered_options: [], status: null, @@ -269,11 +269,14 @@ export class MagentoOrderTestDataFactory { product_sku: mockDaffOrderItem.sku, product_name: mockDaffOrderItem.name, product_sale_price: { + __typename: 'Money', value: mockDaffOrderItem.price, currency: 'USD' }, discounts: [{ + __typename: 'Discount', amount: { + __typename: 'Money', value: mockDaffOrderItem.discount_amount, currency: 'USD' }, @@ -281,14 +284,14 @@ export class MagentoOrderTestDataFactory { }], }; mockMagentoOrderBundleItem = { - id: null, + __typename: 'BundleOrderItem', selected_options: [], entered_options: [], bundle_options: mockDaffOrderCompositeItem.options.map(a => ({ - id: null, + __typename: 'ItemSelectedBundleOption', label: a.option_label, values: [{ - id: null, + __typename: 'ItemSelectedBundleOptionValue', price: { value: null, currency: 'USD' @@ -310,11 +313,14 @@ export class MagentoOrderTestDataFactory { product_sku: mockDaffOrderCompositeItem.sku, product_name: mockDaffOrderCompositeItem.name, product_sale_price: { + __typename: 'Money', value: mockDaffOrderCompositeItem.price, currency: 'USD' }, discounts: [{ + __typename: 'Discount', amount: { + __typename: 'Money', value: mockDaffOrderCompositeItem.discount_amount, currency: 'USD' }, @@ -322,8 +328,9 @@ export class MagentoOrderTestDataFactory { }], }; mockMagentoOrderConfigurableItem = { - id: null, + __typename: 'OrderItem', selected_options: mockDaffOrderConfigurableItem.attributes.map(a => ({ + __typename: 'OrderItemOption', label: a.attribute_label, value: a.value_label })), @@ -340,11 +347,14 @@ export class MagentoOrderTestDataFactory { product_sku: mockDaffOrderConfigurableItem.sku, product_name: mockDaffOrderConfigurableItem.name, product_sale_price: { + __typename: 'Money', value: mockDaffOrderConfigurableItem.price, currency: 'USD' }, discounts: [{ + __typename: 'Discount', amount: { + __typename: 'Money', value: mockDaffOrderConfigurableItem.discount_amount, currency: 'USD' }, @@ -352,6 +362,7 @@ export class MagentoOrderTestDataFactory { }], }; mockMagentoOrderAddress = { + __typename: 'OrderAddress', prefix: mockDaffOrderAddress.prefix, suffix: mockDaffOrderAddress.suffix, firstname: mockDaffOrderAddress.firstname, @@ -368,69 +379,87 @@ export class MagentoOrderTestDataFactory { fax: null }; mockMagentoOrderShipmentTracking = { + __typename: 'ShipmentTracking', number: mockDaffOrderShipmentTracking.tracking_number, carrier: mockDaffOrderShipmentTracking.carrier, title: mockDaffOrderShipmentTracking.title, }; mockMagentoOrderShipmentItem = { + __typename: 'ShipmentItem', order_item: mockMagentoOrderSimpleItem, quantity_shipped: mockDaffOrderShipmentItem.qty }; mockMagentoOrderShipment = { + __typename: 'OrderShipment', tracking: [mockMagentoOrderShipmentTracking], items: [mockMagentoOrderShipmentItem] }; mockMagentoOrderPayment = { + __typename: 'OrderPaymentMethod', name: String(mockDaffOrderPayment.payment_id), type: mockDaffOrderPayment.method, additional_data: [ { + __typename: 'KeyValue', name: 'cc_type', value: mockDaffOrderPayment.cc_type }, { + __typename: 'KeyValue', name: 'cc_last4', value: mockDaffOrderPayment.cc_last4 }, { + __typename: 'KeyValue', name: 'cc_owner', value: mockDaffOrderPayment.cc_owner }, { + __typename: 'KeyValue', name: 'cc_exp_month', value: mockDaffOrderPayment.cc_exp_month }, { + __typename: 'KeyValue', name: 'cc_exp_year', value: mockDaffOrderPayment.cc_exp_year }, ] }; mockMagentoOrderInvoiceItem = { + __typename: 'InvoiceItem', order_item: mockMagentoOrderSimpleItem, quantity_invoiced: mockDaffOrderShipmentItem.qty }; mockMagentoOrderInvoice = { + __typename: 'Invoice', items: [mockMagentoOrderInvoiceItem], total: { + __typename: 'InvoiceTotal', grand_total: { + __typename: 'Money', value: mockDaffOrderGrandTotal.value, currency: 'USD' }, subtotal: { + __typename: 'Money', value: mockDaffOrderSubTotal.value, currency: 'USD' }, total_shipping: { + __typename: 'Money', value: mockDaffOrderShippingTotal.value, currency: 'USD' }, total_tax: { + __typename: 'Money', value: mockDaffOrderTax.value, currency: 'USD' }, discounts: [{ + __typename: 'Discount', amount: { + __typename: 'Money', value: mockDaffOrderDiscount.value, currency: 'USD' }, @@ -439,30 +468,39 @@ export class MagentoOrderTestDataFactory { }, }; mockMagentoOrderCreditItem = { + __typename: 'CreditMemoItem', order_item: mockMagentoOrderSimpleItem, quantity_refunded: mockDaffOrderShipmentItem.qty }; mockMagentoOrderCredit = { + __typename: 'CreditMemo', items: [mockMagentoOrderCreditItem], total: { + __typename: 'CreditMemoTotal', grand_total: { + __typename: 'Money', value: mockDaffOrderGrandTotal.value, currency: 'USD' }, subtotal: { + __typename: 'Money', value: mockDaffOrderSubTotal.value, currency: 'USD' }, total_shipping: { + __typename: 'Money', value: mockDaffOrderShippingTotal.value, currency: 'USD' }, total_tax: { + __typename: 'Money', value: mockDaffOrderTax.value, currency: 'USD' }, discounts: [{ + __typename: 'Discount', amount: { + __typename: 'Money', value: mockDaffOrderDiscount.value, currency: 'USD' }, @@ -471,30 +509,38 @@ export class MagentoOrderTestDataFactory { } }; mockMagentoOrder = { + __typename: 'GraycoreGuestOrder', id: String(mockDaffOrder.id), number: String(mockDaffOrder.id), order_date: mockDaffOrder.created_at, carrier: mockDaffOrderShipment.carrier, shipping_method: mockDaffOrderShipment.method, total: { + __typename: 'OrderTotal', grand_total: { + __typename: 'Money', value: mockDaffOrderGrandTotal.value, currency: 'USD' }, subtotal: { + __typename: 'Money', value: mockDaffOrderSubTotal.value, currency: 'USD' }, total_shipping: { + __typename: 'Money', value: mockDaffOrderShippingTotal.value, currency: 'USD' }, total_tax: { + __typename: 'Money', value: mockDaffOrderTax.value, currency: 'USD' }, discounts: [{ + __typename: 'Discount', amount: { + __typename: 'Money', value: mockDaffOrderDiscount.value, currency: 'USD' }, diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/discount.ts b/libs/order/driver/magento/2.4.1/src/models/responses/discount.ts index bd5ea5f2b3..e55bf389c2 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/discount.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/discount.ts @@ -1,6 +1,7 @@ import { MagentoMoney } from '@daffodil/driver/magento'; export interface MagentoDiscount { + __typename?: 'Discount'; amount: MagentoMoney; label: string; } diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-address.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-address.ts index 53f2925111..88de4fb433 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-address.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-address.ts @@ -1,4 +1,5 @@ export interface MagentoOrderAddress { + __typename?: 'OrderAddress'; city: string; company: string; country_code: string; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-credit-item.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-credit-item.ts index 3d988ccc80..8425752f44 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-credit-item.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-credit-item.ts @@ -1,6 +1,7 @@ import { MagentoOrderItem } from './order-item' export interface MagentoOrderCreditItem { + __typename?: 'CreditMemoItem'; order_item: MagentoOrderItem; quantity_refunded: number; }; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-credit.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-credit.ts index 9edf9b9b79..defea49bff 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-credit.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-credit.ts @@ -2,6 +2,7 @@ import { MagentoOrderCreditItem } from './order-credit-item'; import { MagentoOrderTotal } from './order-total'; export interface MagentoOrderCredit { + __typename?: 'CreditMemo'; items: MagentoOrderCreditItem[]; total: MagentoOrderTotal; } diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice-item.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice-item.ts index 2e4855c4da..3179bf0cb0 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice-item.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice-item.ts @@ -1,6 +1,13 @@ import { MagentoOrderBundleItemSelectedOption, MagentoOrderItem } from './order-item' +export type MagentoOrderInvoiceItemTypenames = + 'InvoiceItem' | + 'BundleInvoiceItem' | + 'GiftCardInvoiceItem' | + 'DownloadableInvoiceItem'; + export interface MagentoOrderInvoiceItem { + __typename?: MagentoOrderInvoiceItemTypenames; order_item: MagentoOrderItem; quantity_invoiced: number; }; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice.ts index 7982acbd56..9d68b35ce9 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-invoice.ts @@ -2,6 +2,7 @@ import { MagentoOrderInvoiceItem } from './order-invoice-item'; import { MagentoOrderTotal } from './order-total'; export interface MagentoOrderInvoice { + __typename?: 'Invoice'; items: MagentoOrderInvoiceItem[]; total: MagentoOrderTotal; }; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-item.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-item.ts index fd0dc5ef56..932e7f42b2 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-item.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-item.ts @@ -8,13 +8,20 @@ export enum MagentoOrderItemType { Bundle = 'bundle' }; +export type MagentoOrderItemTypenames = + 'OrderItem' | + 'BundleOrderItem' | + 'GiftCardOrderItem' | + 'DownloadableOrderItem'; + export interface MagentoOrderItemOption { + __typename?: string; label: string; value: string; }; export interface MagentoOrderItem { - id: string; + __typename?: MagentoOrderItemTypenames; discounts: MagentoDiscount[]; product_name: string; product_sale_price: MagentoMoney; @@ -33,13 +40,12 @@ export interface MagentoOrderItem { } export interface MagentoOrderBundleItemSelectedOption { - id: string; + __typename?: string; label: string; values: MagentoOrderBundleItemSelectedOptionValue[]; }; export interface MagentoOrderBundleItemSelectedOptionValue { - id: string; price: MagentoMoney; product_name: string; product_sku: string; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-payment.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-payment.ts index 9c64dbe5fe..b73d1438cd 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-payment.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-payment.ts @@ -1,10 +1,12 @@ export interface MagentoOrderPayment { + __typename?: 'OrderPaymentMethod'; name: string; type: string; additional_data: KeyValue[]; }; export interface KeyValue { + __typename?: 'KeyValue'; name: string; value: string; }; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-item.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-item.ts index a367e20675..651c9cf990 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-item.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-item.ts @@ -1,8 +1,12 @@ -import { MagentoMoney } from '@daffodil/driver/magento'; - import { MagentoOrderBundleItemSelectedOption, MagentoOrderItem } from './order-item'; +export type MagentoOrderShipmentItemTypenames = + 'ShipmentItem' | + 'BundleShipmentItem' | + 'GiftCardShipmentItem'; + export interface MagentoOrderShipmentItem { + __typename?: MagentoOrderShipmentItemTypenames; order_item: MagentoOrderItem; quantity_shipped: number; }; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-tracking.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-tracking.ts index 89a57a072f..99945e3d4a 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-tracking.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment-tracking.ts @@ -1,4 +1,5 @@ export interface MagentoOrderShipmentTracking { + __typename?: 'ShipmentTracking'; carrier: string; number: string; title: string; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment.ts index 4fb983702a..e552170dab 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-shipment.ts @@ -2,6 +2,7 @@ import { MagentoOrderShipmentItem } from './order-shipment-item'; import { MagentoOrderShipmentTracking } from './order-shipment-tracking'; export interface MagentoOrderShipment { + __typename?: 'OrderShipment'; tracking: MagentoOrderShipmentTracking[]; items: MagentoOrderShipmentItem[]; }; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order-total.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order-total.ts index 30b75bd452..45666441c9 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order-total.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order-total.ts @@ -3,6 +3,7 @@ import { MagentoMoney } from '@daffodil/driver/magento'; import { MagentoDiscount } from './discount'; export interface MagentoOrderTotal { + __typename?: string; discounts: MagentoDiscount[]; grand_total: MagentoMoney; subtotal: MagentoMoney; diff --git a/libs/order/driver/magento/2.4.1/src/models/responses/order.ts b/libs/order/driver/magento/2.4.1/src/models/responses/order.ts index 501d5a00cc..ea542de72f 100644 --- a/libs/order/driver/magento/2.4.1/src/models/responses/order.ts +++ b/libs/order/driver/magento/2.4.1/src/models/responses/order.ts @@ -7,6 +7,7 @@ import { MagentoOrderTotal } from './order-total'; import { MagentoOrderCredit } from './order-credit'; export interface MagentoOrder { + __typename?: 'GraycoreGuestOrder'; id: string; order_date: string; status: string; diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-address.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-address.ts index 092127b542..f7f6339821 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-address.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-address.ts @@ -3,7 +3,6 @@ import {gql} from 'apollo-angular'; export const orderAddressFragment = gql` fragment orderAddress on OrderAddress { - __typename city company country_code diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-item.ts index 91a97a48be..be23ca60f8 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-item.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-item.ts @@ -4,8 +4,6 @@ import { orderItemFragment } from './order-item'; export const orderCreditItemFragment = gql` fragment orderCreditItem on CreditMemoItemInterface { - __typename - id quantity_refunded order_item { ...orderItem diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-total.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-total.ts index 58d3e28194..9a3bb1d2f9 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-total.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-total.ts @@ -3,7 +3,6 @@ import {gql} from 'apollo-angular'; export const orderCreditTotalFragment = gql` fragment orderCreditTotal on CreditMemoTotal { - __typename discounts { amount { value diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit.ts index 6277180625..7e258d2893 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit.ts @@ -5,8 +5,6 @@ import { orderCreditTotalFragment } from './order-credit-total'; export const orderCreditFragment = gql` fragment orderCredit on CreditMemo { - __typename - id items { ...orderCreditItem } diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-item.ts index 3477a70c92..1bec37e0f8 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-item.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-item.ts @@ -4,8 +4,6 @@ import { orderItemFragment } from './order-item'; export const orderInvoiceItemFragment = gql` fragment orderInvoiceItem on InvoiceItemInterface { - __typename - id quantity_invoiced order_item { ...orderItem diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-total.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-total.ts index 9aa04d6e4a..ac139a5d3d 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-total.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-total.ts @@ -3,7 +3,6 @@ import {gql} from 'apollo-angular'; export const orderInvoiceTotalFragment = gql` fragment orderInvoiceTotal on InvoiceTotal { - __typename discounts { amount { value diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice.ts index ea46172242..2521e77dee 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice.ts @@ -5,8 +5,6 @@ import { orderInvoiceTotalFragment } from './order-invoice-total'; export const orderInvoiceFragment = gql` fragment orderInvoice on Invoice { - __typename - id items { ...orderInvoiceItem } diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-item.ts index 03219f9c37..029871c61f 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-item.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-item.ts @@ -2,12 +2,8 @@ import {gql} from 'apollo-angular'; export const orderBundleItemSelectedOptionFragment = gql` fragment orderBundleItemSelectedOption on ItemSelectedBundleOption { - __typename - id label values { - __typename - id product_name } } @@ -15,8 +11,6 @@ export const orderBundleItemSelectedOptionFragment = gql` export const orderItemFragment = gql` fragment orderItem on OrderItemInterface { - __typename - id quantity_ordered quantity_canceled quantity_shipped diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-payment.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-payment.ts index 9fe78a612c..a0b0e4e46d 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-payment.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-payment.ts @@ -3,7 +3,6 @@ import {gql} from 'apollo-angular'; export const orderPaymentFragment = gql` fragment orderPayment on OrderPaymentMethod { - __typename name type additional_data { diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-item.ts index fc14406c8a..70d542dbb5 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-item.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-item.ts @@ -4,8 +4,6 @@ import { orderItemFragment } from './order-item'; export const orderShipmentItemFragment = gql` fragment orderShipmentItem on ShipmentItemInterface { - __typename - id quantity_shipped order_item { ...orderItem diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-tracking.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-tracking.ts index 7365dedce7..ae56b3f81d 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-tracking.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-tracking.ts @@ -3,7 +3,6 @@ import {gql} from 'apollo-angular'; export const orderShipmentTrackingFragment = gql` fragment orderShipmentTracking on ShipmentTracking { - __typename number carrier title diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment.ts index 9767dba2c8..9cab42f3e8 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment.ts @@ -5,8 +5,6 @@ import { orderShipmentTrackingFragment } from './order-shipment-tracking'; export const orderShipmentFragment = gql` fragment orderShipment on OrderShipment { - __typename - id tracking { ...orderShipmentTracking } diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-total.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-total.ts index 2ed09ee71f..941df94312 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-total.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-total.ts @@ -3,7 +3,6 @@ import {gql} from 'apollo-angular'; export const orderTotalFragment = gql` fragment orderTotal on OrderTotal { - __typename discounts { amount { value diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order.ts index b7b73563f2..30b87ddf81 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/fragments/order.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/fragments/order.ts @@ -10,7 +10,6 @@ import { orderTotalFragment } from './order-total'; export const orderFragment = gql` fragment order on GraycoreGuestOrder { - __typename id order_date status diff --git a/libs/order/driver/magento/2.4.1/src/queries/responses/get-guest-orders.ts b/libs/order/driver/magento/2.4.1/src/queries/responses/get-guest-orders.ts index b7479df2ba..bf11dfa199 100644 --- a/libs/order/driver/magento/2.4.1/src/queries/responses/get-guest-orders.ts +++ b/libs/order/driver/magento/2.4.1/src/queries/responses/get-guest-orders.ts @@ -2,6 +2,7 @@ import { MagentoOrder } from '../../models/responses/order'; export interface MagentoGetGuestOrdersResponse { graycoreGuestOrders: { - items: MagentoOrder[]; + __typename?: string; + items: MagentoOrder[] | null; } }