From ef08c53f6b8096dbc8666ee4a9e7bf3f9140a3df Mon Sep 17 00:00:00 2001 From: Jonas Embach Date: Wed, 10 Aug 2022 13:30:51 +0200 Subject: [PATCH] fix(shopware5): adjust to latest interface version --- .../src/providers/cart.ts | 16 ++++++++++++---- .../src/providers/checkout.ts | 4 ++-- .../src/providers/review.ts | 12 ++++++++++-- .../src/providers/user.ts | 13 +++++++++---- .../src/providers/wishlist.ts | 6 +++--- .../src/types.ts | 18 +++++++++--------- 6 files changed, 45 insertions(+), 24 deletions(-) diff --git a/packages/storefront-shop-adapter-shopware5/src/providers/cart.ts b/packages/storefront-shop-adapter-shopware5/src/providers/cart.ts index 35b8ac8..cf42082 100755 --- a/packages/storefront-shop-adapter-shopware5/src/providers/cart.ts +++ b/packages/storefront-shop-adapter-shopware5/src/providers/cart.ts @@ -66,7 +66,7 @@ export class StorefrontShopAdapterShopware5Cart return { data: { items }, raw: { getCart: response }, error: undefined } } catch (e) { - return { data: undefined, error: e as Error } + return { data: undefined, raw: { getCart: undefined }, error: e as Error } } } @@ -118,7 +118,7 @@ export class StorefrontShopAdapterShopware5Cart return { data, raw, error: undefined } } catch (e) { - return { data: undefined, error: e as Error } + return { data: undefined, raw: { addItem: undefined }, error: e as Error } } } @@ -166,7 +166,11 @@ export class StorefrontShopAdapterShopware5Cart return { data, raw, error: undefined } } catch (e) { - return { data: undefined, error: e as Error } + return { + data: undefined, + raw: { removeItem: undefined }, + error: e as Error, + } } } @@ -217,7 +221,11 @@ export class StorefrontShopAdapterShopware5Cart return { data, raw, error: undefined } } catch (e) { - return { data: undefined, error: e as Error } + return { + data: undefined, + raw: { updateItem: undefined }, + error: e as Error, + } } } } diff --git a/packages/storefront-shop-adapter-shopware5/src/providers/checkout.ts b/packages/storefront-shop-adapter-shopware5/src/providers/checkout.ts index c1a960f..2a5f3a4 100755 --- a/packages/storefront-shop-adapter-shopware5/src/providers/checkout.ts +++ b/packages/storefront-shop-adapter-shopware5/src/providers/checkout.ts @@ -12,10 +12,10 @@ export class StorefrontShopAdapterShopware5Checkout constructor(private mainAdapter: StorefrontShopAdapterShopware5) {} getCheckout: MakairaGetCheckout = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } submit: MakairaSubmitCheckout = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } } diff --git a/packages/storefront-shop-adapter-shopware5/src/providers/review.ts b/packages/storefront-shop-adapter-shopware5/src/providers/review.ts index 746df04..cd66b87 100755 --- a/packages/storefront-shop-adapter-shopware5/src/providers/review.ts +++ b/packages/storefront-shop-adapter-shopware5/src/providers/review.ts @@ -59,7 +59,11 @@ export class StorefrontShopAdapterShopware5Review error: undefined, } } catch (e) { - return { data: undefined, error: e as Error } + return { + data: undefined, + raw: { getReviews: undefined }, + error: e as Error, + } } } @@ -113,7 +117,11 @@ export class StorefrontShopAdapterShopware5Review return { data, raw, error: undefined } } catch (e) { - return { data: undefined, error: e as Error } + return { + data: undefined, + raw: { createReview: undefined }, + error: e as Error, + } } } } diff --git a/packages/storefront-shop-adapter-shopware5/src/providers/user.ts b/packages/storefront-shop-adapter-shopware5/src/providers/user.ts index 1b77715..814c86d 100755 --- a/packages/storefront-shop-adapter-shopware5/src/providers/user.ts +++ b/packages/storefront-shop-adapter-shopware5/src/providers/user.ts @@ -88,7 +88,11 @@ export class StorefrontShopAdapterShopware5User return { data: undefined, raw, error: errorGetUser } } catch (e) { - return { data: undefined, error: e as Error } + return { + data: undefined, + raw: { getUser: undefined, login: undefined }, + error: e as Error, + } } } @@ -116,13 +120,14 @@ export class StorefrontShopAdapterShopware5User } catch (e) { return { data: undefined, + raw: { logout: undefined }, error: e as Error, } } } signup: MakairaSignup = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } getUser: MakairaGetUser = async () => { @@ -165,12 +170,12 @@ export class StorefrontShopAdapterShopware5User error: undefined, } } catch (e) { - return { data: undefined, error: e as Error } + return { data: undefined, raw: { getUser: undefined }, error: e as Error } } } forgotPassword: MakairaForgotPassword = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } } diff --git a/packages/storefront-shop-adapter-shopware5/src/providers/wishlist.ts b/packages/storefront-shop-adapter-shopware5/src/providers/wishlist.ts index f5285de..3ca54b4 100755 --- a/packages/storefront-shop-adapter-shopware5/src/providers/wishlist.ts +++ b/packages/storefront-shop-adapter-shopware5/src/providers/wishlist.ts @@ -14,15 +14,15 @@ export class StorefrontShopAdapterShopware5Wishlist constructor(private mainAdapter: StorefrontShopAdapterShopware5) {} getWishlist: MakairaGetWishlist = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } addItem: MakairaAddItemToWishlist = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } removeItem: MakairaRemoveItemFromWishlist = async () => { - return { error: new NotImplementedError() } + return { error: new NotImplementedError(), raw: undefined } } } diff --git a/packages/storefront-shop-adapter-shopware5/src/types.ts b/packages/storefront-shop-adapter-shopware5/src/types.ts index af74c5f..d48a870 100755 --- a/packages/storefront-shop-adapter-shopware5/src/types.ts +++ b/packages/storefront-shop-adapter-shopware5/src/types.ts @@ -30,7 +30,7 @@ export type ShopwareReview = { export type ShopwareGetCartRes = ShopwareProduct[] -export type ShopwareGetCartRaw = { getCart: ShopwareGetCartRes } +export type ShopwareGetCartRaw = { getCart?: ShopwareGetCartRes } //#endregion @@ -41,7 +41,7 @@ export type ShopwareAddItemRes = | { ok: false; message: string } export type ShopwareAddItemRaw = { - addItem: ShopwareAddItemRes + addItem?: ShopwareAddItemRes } //#endregion @@ -53,7 +53,7 @@ export type ShopwareRemoveItemRes = | { ok: false; message: string } export type ShopwareRemoveItemRaw = { - removeItem: ShopwareRemoveItemRes + removeItem?: ShopwareRemoveItemRes } //#endregion @@ -65,7 +65,7 @@ export type ShopwareUpdateItemRes = | { ok: false; message: string } export type ShopwareUpdateItemRaw = { - updateItem: ShopwareUpdateItemRes + updateItem?: ShopwareUpdateItemRes } //#endregion @@ -80,7 +80,7 @@ export type ShopwareGetUserRes = | ShopwareUser | { ok: false; message?: 'Forbidden' | string } -export type ShopwareGetUserRaw = { getUser: ShopwareGetUserRes } +export type ShopwareGetUserRaw = { getUser?: ShopwareGetUserRes } //#endregion @@ -89,7 +89,7 @@ export type ShopwareGetUserRaw = { getUser: ShopwareGetUserRes } export type ShopwareLogoutRes = { ok: true } export type ShopwareLogoutRaw = { - logout: ShopwareLoginRes + logout?: ShopwareLoginRes } //#endregion @@ -102,7 +102,7 @@ export type ShopwareLoginRes = | { ok: false; errors: any } export type ShopwareLoginRaw = { - login: ShopwareLoginRes + login?: ShopwareLoginRes getUser?: ShopwareGetUserRaw['getUser'] } @@ -120,7 +120,7 @@ export type ShopwareGetReviewsRes = | ShopwareReview[] | { ok: false; message: string } -export type ShopwareGetReviewsRaw = { getReviews: ShopwareGetReviewsRes } +export type ShopwareGetReviewsRaw = { getReviews?: ShopwareGetReviewsRes } //#endregion @@ -137,7 +137,7 @@ export type ShopwareCreateReviewRes = | { ok: false; message: string } export type ShopwareCreateReviewRaw = { - createReview: ShopwareCreateReviewRes + createReview?: ShopwareCreateReviewRes } //#endregion