fix: fix issues that popped up due to cleanParameters change

ScaleLeap · Jul 3, 2020 · 5fe2987 · 5fe2987
1 parent ec895a2
commit 5fe2987
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 12 deletions.
diff --git a/src/http.ts b/src/http.ts
@@ -61,10 +61,9 @@ export type HttpMethod = 'GET' | 'POST'
 export type ParameterTypes =
   | string
   | number
-  | (number | string)[]
+  | (number | string | object)[]
   | boolean
   | { [key: string]: ParameterTypes }
-  | { [key: string]: ParameterTypes }[]
   | undefined
 
 export type Parameters = Record<string, ParameterTypes>
@@ -205,7 +204,7 @@ export const cleanParameters = (
     .filter(([, parameter]) => parameter !== undefined)
 
     // Loop through each key
-    .reduce((result, [key, parameter]) => {
+    .reduce((_, [key, parameter]) => {
       const trueKey = outerKey ? `${outerKey}.${key}` : key
       /**
        * If parameter is type string, number, boolean assign it to result
@@ -220,7 +219,7 @@ export const cleanParameters = (
         /**
          * If parameter is type array reduce it to dotnotation
          */
-        parameter.forEach((parameterChild: ParameterTypes, index: number) => {
+        parameter.forEach((parameterChild: object | string | number | boolean, index: number) => {
           if (
             typeof parameterChild === 'string' ||
             !Number.isNaN(Number(parameterChild)) ||

diff --git a/src/sections/merchant-fulfillment/type.ts b/src/sections/merchant-fulfillment/type.ts
@@ -1,10 +1,28 @@
-interface CanonicalizedAddtionalSellerInput
-  extends Omit<AdditionalSellerInput, 'ValueAsTimestamp'> {
+interface CanonicalizedAddtionalSellerInput {
+  ValueAsString?: string
+  ValueAsBoolean?: boolean
+  ValueAsInteger?: number
+  ValueAsAddress?: Address
+  ValueAsWeight?: Weight
+  ValueAsDimension?: PackageDimensions
+  ValueAsCurrency?: CurrencyAmount
   ValueAsTimestamp?: string
+  DataType: SellerInputDataType
+  [key: string]:
+    | string
+    | boolean
+    | number
+    | Address
+    | Weight
+    | PackageDimensions
+    | CurrencyAmount
+    | string
+    | undefined
 }
 interface CanonicalizedSellerInputs {
   AdditionalInputFieldName: string
   AdditionalSellerInput: CanonicalizedAddtionalSellerInput
+  [key: string]: string | CanonicalizedAddtionalSellerInput
 }
 
 export const canonicalizeAdditionalSellerInputs = (
@@ -41,10 +59,42 @@ export const canonicalizeAdditionalSellerInputs = (
   })
 }
 
+interface CanonicalizedItem {
+  OrderItemId: string
+  Quantity: number
+  ItemWeight?: Weight
+  ItemDescription?: string
+  TransparencyCodeList?: string[]
+  ItemLevelSellerInputsList?: CanonicalizedSellerInputs[]
+  [key: string]: string | number | Weight | string[] | CanonicalizedSellerInputs[] | undefined
+}
+
+interface CanonicalizedShipmentRequestDetails {
+  AmazonOrderId: string
+  SellerOrderId?: string
+  'ItemList.Item': CanonicalizedItem[]
+  ShipFromAddress: Address
+  PackageDimensions: PackageDimensions
+  Weight: Weight
+  MustArriveByDate?: string
+  ShipDate?: string
+  ShippingServiceOptions: ShippingServiceOptions
+  LabelCustomization?: LabelCustomization
+  [key: string]:
+    | string
+    | CanonicalizedItem[]
+    | Address
+    | PackageDimensions
+    | Weight
+    | ShippingServiceOptions
+    | LabelCustomization
+    | undefined
+}
+
 // @todo unit test both of these
 export const canonicalizeShipmentRequestDetails = (
   shipmentRequestDetails: ShipmentRequestDetails,
-) => {
+): CanonicalizedShipmentRequestDetails => {
   const {
     AmazonOrderId,
     SellerOrderId,
@@ -221,7 +271,6 @@ export interface Item {
   ItemDescription?: string
   TransparencyCodeList?: string[]
   ItemLevelSellerInputsList?: AdditionalSellerInputs[]
-  [key: string]: string | Weight | AdditionalSellerInputs[] | number | undefined | string[]
 }
 
 export type DeliveryExperience =
@@ -307,8 +356,25 @@ export interface CreateShipmentParameters {
   ShipmentLevelSellerInputsList?: AdditionalSellerInputs[]
 }
 
-// @todo unit test
-export const canonicalizeCreateShipmentParameters = (parameters: CreateShipmentParameters) => {
+interface CanonicalizedCreateShipmentParameters {
+  ShipmentRequestDetails: CanonicalizedShipmentRequestDetails
+  ShippingServiceId: string
+  ShippingServiceOfferId?: string
+  HazmatType?: HazmatType
+  LabelFormatOption?: LabelFormatOption
+  'ShipmentLevelSellerInputsList.member'?: CanonicalizedSellerInputs[]
+  [key: string]:
+    | CanonicalizedShipmentRequestDetails
+    | string
+    | HazmatType
+    | LabelFormatOption
+    | CanonicalizedSellerInputs[]
+    | undefined
+}
+
+export const canonicalizeCreateShipmentParameters = (
+  parameters: CreateShipmentParameters,
+): CanonicalizedCreateShipmentParameters => {
   const {
     ShipmentRequestDetails,
     ShippingServiceId,

diff --git a/src/sections/products/products.ts b/src/sections/products/products.ts
@@ -82,7 +82,9 @@ export class Products {
       resource: Resource.Products,
       version: PRODUCTS_API_VERSION,
       action: 'GetMyFeesEstimate',
-      parameters,
+      parameters: {
+        'FeesEstimateRequestList.FeesEstimateRequest': parameters.FeesEstimateRequestList,
+      },
     })
 
     return GetMyFeesEstimateResponse.decode(response).caseOf({

diff --git a/src/sections/products/type.ts b/src/sections/products/type.ts
@@ -60,7 +60,6 @@ export interface FeesEstimateRequest {
 
 export interface GetMyFeesEstimateParameters {
   FeesEstimateRequestList: FeesEstimateRequest[]
-  [key: string]: FeesEstimateRequest[]
 }
 
 export interface ListMatchingProductsRequestParameters {