From 1248984f29cda7036fced7309228f45091696cf8 Mon Sep 17 00:00:00 2001
From: DuvCharles <charles.duvigneau@gmail.com>
Date: Fri, 24 Mar 2023 17:39:02 +0100
Subject: [PATCH] refactor: remove unnecessary return in normalizer

---
 .../src/utils/normalize/normalize-customer.ts | 15 ++--
 .../src/utils/normalize/normalize-product.ts  | 77 ++++++++-----------
 .../src/utils/normalize/normalize-site.ts     | 16 ++--
 3 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/packages/sylius/src/utils/normalize/normalize-customer.ts b/packages/sylius/src/utils/normalize/normalize-customer.ts
index 36e25b256..6a380b9f6 100644
--- a/packages/sylius/src/utils/normalize/normalize-customer.ts
+++ b/packages/sylius/src/utils/normalize/normalize-customer.ts
@@ -1,10 +1,11 @@
 import { Customer } from '@vercel/commerce/types/customer'
+import { SyliusCustomer } from 'types/customer'
 
 //customer has no type in commerce - SyliusCustomer type is defined in types/customer.ts
-export const normalizeCustomer = (syliusCustomer: any): Customer => {
-  return {
-    firstName: syliusCustomer.firstName,
-    lastName: syliusCustomer.lastName,
-    email: syliusCustomer.email,
-  }
-}
+export const normalizeCustomer = (
+  syliusCustomer: SyliusCustomer
+): Customer => ({
+  firstName: syliusCustomer.firstName,
+  lastName: syliusCustomer.lastName,
+  email: syliusCustomer.email,
+})
diff --git a/packages/sylius/src/utils/normalize/normalize-product.ts b/packages/sylius/src/utils/normalize/normalize-product.ts
index 944968622..eaebfeff3 100644
--- a/packages/sylius/src/utils/normalize/normalize-product.ts
+++ b/packages/sylius/src/utils/normalize/normalize-product.ts
@@ -14,25 +14,23 @@ import {
   SyliusProductVariant,
 } from '../../types/products'
 
-export const normalizeProduct = (product: SyliusProduct): Product => {
-  return {
-    id: product.id.toString(),
-    name: product.name,
-    description: product.shortDescription,
-    descriptionHtml: product.description,
-    slug: product.slug,
-    path: `/${product.slug}`,
-    images: product.images.map((image) => normalizeProductImage(image)),
-    variants: product.variants.map((variant) =>
-      normalizeProductVariant(variant, product.options)
-    ),
-    price: normalizeProductPrice(
-      product.variants[0].price,
-      product.variants[0].originalPrice
-    ),
-    options: product.options.map((option) => normalizeProductOption(option)),
-  }
-}
+export const normalizeProduct = (product: SyliusProduct): Product => ({
+  id: product.id.toString(),
+  name: product.name,
+  description: product.shortDescription,
+  descriptionHtml: product.description,
+  slug: product.slug,
+  path: `/${product.slug}`,
+  images: product.images.map((image) => normalizeProductImage(image)),
+  variants: product.variants.map((variant) =>
+    normalizeProductVariant(variant, product.options)
+  ),
+  price: normalizeProductPrice(
+    product.variants[0].price,
+    product.variants[0].originalPrice
+  ),
+  options: product.options.map((option) => normalizeProductOption(option)),
+})
 
 const normalizeProductVariant = (
   variant: SyliusProductVariant,
@@ -93,16 +91,15 @@ const normalizeProductVariantOption = (
   }
 }
 
-const normalizeProductOption = (option: SyliusProductOption): ProductOption => {
-  return {
-    __typename: 'MultipleChoiceOption',
-    id: option.id.toString(),
-    displayName: option.name,
-    values: option.values.map((optionValue) =>
-      normalizeProductOptionValue(optionValue)
-    ),
-  }
-}
+const normalizeProductOption = (
+  option: SyliusProductOption
+): ProductOption => ({
+  id: option.id.toString(),
+  displayName: option.name,
+  values: option.values.map((optionValue) =>
+    normalizeProductOptionValue(optionValue)
+  ),
+})
 
 const normalizeProductOptionValue = (
   optionValue: SyliusProductOptionValue
@@ -112,21 +109,15 @@ const normalizeProductOptionValue = (
   }
 }
 
-export const normalizeProductImage = (
-  image: SyliusProductImage
-): ProductImage => {
-  return {
-    url: process.env.NEXT_PUBLIC_SYLIUS_API_URL + image.path,
-  }
-}
+const normalizeProductImage = (image: SyliusProductImage): ProductImage => ({
+  url: process.env.NEXT_PUBLIC_SYLIUS_ALLOWED_IMAGE_URL + image.path,
+})
 
 const normalizeProductPrice = (
   price: number,
   originalPrice: number
-): ProductPrice => {
-  return {
-    value: originalPrice / 100,
-    salePrice: price / 100,
-    currencyCode: 'EUR',
-  }
-}
+): ProductPrice => ({
+  value: originalPrice / 100,
+  salePrice: price / 100,
+  currencyCode: 'EUR',
+})
diff --git a/packages/sylius/src/utils/normalize/normalize-site.ts b/packages/sylius/src/utils/normalize/normalize-site.ts
index a24cc5f58..d3c6190c5 100644
--- a/packages/sylius/src/utils/normalize/normalize-site.ts
+++ b/packages/sylius/src/utils/normalize/normalize-site.ts
@@ -1,11 +1,9 @@
 import { SyliusCategorie } from 'types/site'
 
-export const normalizeCategorie = (categorie: SyliusCategorie) => {
-  return {
-    //We use the code as id because Sylius need the code in the request parameter to filter products
-    id: categorie.code,
-    name: categorie.name,
-    slug: categorie.code,
-    path: `/${categorie.code}`,
-  }
-}
+export const normalizeCategorie = (categorie: SyliusCategorie) => ({
+  //We use the code as id because Sylius need the code in the request parameter to filter products
+  id: categorie.code,
+  name: categorie.name,
+  slug: categorie.code,
+  path: `/${categorie.code}`,
+})