Jelajahi Sumber

chore(core): Deprecate Channel.currencyCode

Michael Bromley 2 tahun lalu
induk
melakukan
b103a9cb9c

+ 5 - 1
packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts

@@ -686,8 +686,10 @@ export type CreateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code: Scalars['String'];
-  currencyCode: CurrencyCode;
+  /** @deprecated Use defaultCurrencyCode instead */
+  currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode: LanguageCode;
   defaultShippingZoneId: Scalars['ID'];
   defaultTaxZoneId: Scalars['ID'];
@@ -5938,8 +5940,10 @@ export type UpdateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code?: InputMaybe<Scalars['String']>;
+  /** @deprecated Use defaultCurrencyCode instead */
   currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode?: InputMaybe<LanguageCode>;
   defaultShippingZoneId?: InputMaybe<Scalars['ID']>;
   defaultTaxZoneId?: InputMaybe<Scalars['ID']>;

+ 5 - 1
packages/common/src/generated-types.ts

@@ -716,8 +716,10 @@ export type CreateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code: Scalars['String'];
-  currencyCode: CurrencyCode;
+  /** @deprecated Use defaultCurrencyCode instead */
+  currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode: LanguageCode;
   defaultShippingZoneId: Scalars['ID'];
   defaultTaxZoneId: Scalars['ID'];
@@ -6111,8 +6113,10 @@ export type UpdateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code?: InputMaybe<Scalars['String']>;
+  /** @deprecated Use defaultCurrencyCode instead */
   currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode?: InputMaybe<LanguageCode>;
   defaultShippingZoneId?: InputMaybe<Scalars['ID']>;
   defaultTaxZoneId?: InputMaybe<Scalars['ID']>;

+ 5 - 1
packages/core/e2e/graphql/generated-e2e-admin-types.ts

@@ -686,8 +686,10 @@ export type CreateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code: Scalars['String'];
-  currencyCode: CurrencyCode;
+  /** @deprecated Use defaultCurrencyCode instead */
+  currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode: LanguageCode;
   defaultShippingZoneId: Scalars['ID'];
   defaultTaxZoneId: Scalars['ID'];
@@ -5938,8 +5940,10 @@ export type UpdateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code?: InputMaybe<Scalars['String']>;
+  /** @deprecated Use defaultCurrencyCode instead */
   currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode?: InputMaybe<LanguageCode>;
   defaultShippingZoneId?: InputMaybe<Scalars['ID']>;
   defaultTaxZoneId?: InputMaybe<Scalars['ID']>;

+ 4 - 2
packages/core/src/api/schema/admin-api/channel.api.graphql

@@ -31,7 +31,8 @@ input CreateChannelInput {
     defaultLanguageCode: LanguageCode!
     availableLanguageCodes: [LanguageCode!]
     pricesIncludeTax: Boolean!
-    currencyCode: CurrencyCode!
+    currencyCode: CurrencyCode @deprecated(reason: "Use defaultCurrencyCode instead")
+    defaultCurrencyCode: CurrencyCode
     availableCurrencyCodes: [CurrencyCode!]
     trackInventory: Boolean
     outOfStockThreshold: Int
@@ -47,7 +48,8 @@ input UpdateChannelInput {
     defaultLanguageCode: LanguageCode
     availableLanguageCodes: [LanguageCode!]
     pricesIncludeTax: Boolean
-    currencyCode: CurrencyCode
+    currencyCode: CurrencyCode @deprecated(reason: "Use defaultCurrencyCode instead")
+    defaultCurrencyCode: CurrencyCode
     availableCurrencyCodes: [CurrencyCode!]
     trackInventory: Boolean
     outOfStockThreshold: Int

+ 6 - 0
packages/core/src/api/schema/common/channel.type.graphql

@@ -11,7 +11,13 @@ type Channel implements Node {
     currencyCode: CurrencyCode! @deprecated(reason: "Use defaultCurrencyCode instead")
     defaultCurrencyCode: CurrencyCode!
     availableCurrencyCodes: [CurrencyCode!]!
+    """
+    Not yet used - will be implemented in a future release.
+    """
     trackInventory: Boolean
+    """
+    Not yet used - will be implemented in a future release.
+    """
     outOfStockThreshold: Int
     pricesIncludeTax: Boolean!
     seller: Seller

+ 10 - 1
packages/core/src/service/services/channel.service.ts

@@ -16,7 +16,12 @@ import { FindOneOptions } from 'typeorm';
 import { RelationPaths } from '../../api';
 import { RequestContext } from '../../api/common/request-context';
 import { ErrorResultUnion, isGraphQlErrorResult } from '../../common/error/error-result';
-import { ChannelNotFoundError, EntityNotFoundError, InternalServerError } from '../../common/error/errors';
+import {
+    ChannelNotFoundError,
+    EntityNotFoundError,
+    InternalServerError,
+    UserInputError,
+} from '../../common/error/errors';
 import { LanguageNotAvailableError } from '../../common/error/generated-graphql-admin-errors';
 import { createSelfRefreshingCache, SelfRefreshingCache } from '../../common/self-refreshing-cache';
 import { ChannelAware, ListQueryOptions } from '../../common/types/common-types';
@@ -225,6 +230,10 @@ export class ChannelService {
         ctx: RequestContext,
         input: CreateChannelInput,
     ): Promise<ErrorResultUnion<CreateChannelResult, Channel>> {
+        const defaultCurrencyCode = input.defaultCurrencyCode || input.currencyCode;
+        if (!defaultCurrencyCode) {
+            throw new UserInputError('Either a defaultCurrencyCode or currencyCode must be provided');
+        }
         const channel = new Channel({
             ...input,
             defaultCurrencyCode: input.currencyCode,

+ 5 - 1
packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts

@@ -686,8 +686,10 @@ export type CreateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code: Scalars['String'];
-  currencyCode: CurrencyCode;
+  /** @deprecated Use defaultCurrencyCode instead */
+  currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode: LanguageCode;
   defaultShippingZoneId: Scalars['ID'];
   defaultTaxZoneId: Scalars['ID'];
@@ -5938,8 +5940,10 @@ export type UpdateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code?: InputMaybe<Scalars['String']>;
+  /** @deprecated Use defaultCurrencyCode instead */
   currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode?: InputMaybe<LanguageCode>;
   defaultShippingZoneId?: InputMaybe<Scalars['ID']>;
   defaultTaxZoneId?: InputMaybe<Scalars['ID']>;

+ 5 - 1
packages/payments-plugin/e2e/graphql/generated-admin-types.ts

@@ -686,8 +686,10 @@ export type CreateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code: Scalars['String'];
-  currencyCode: CurrencyCode;
+  /** @deprecated Use defaultCurrencyCode instead */
+  currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode: LanguageCode;
   defaultShippingZoneId: Scalars['ID'];
   defaultTaxZoneId: Scalars['ID'];
@@ -5938,8 +5940,10 @@ export type UpdateChannelInput = {
   availableCurrencyCodes?: InputMaybe<Array<CurrencyCode>>;
   availableLanguageCodes?: InputMaybe<Array<LanguageCode>>;
   code?: InputMaybe<Scalars['String']>;
+  /** @deprecated Use defaultCurrencyCode instead */
   currencyCode?: InputMaybe<CurrencyCode>;
   customFields?: InputMaybe<Scalars['JSON']>;
+  defaultCurrencyCode?: InputMaybe<CurrencyCode>;
   defaultLanguageCode?: InputMaybe<LanguageCode>;
   defaultShippingZoneId?: InputMaybe<Scalars['ID']>;
   defaultTaxZoneId?: InputMaybe<Scalars['ID']>;

File diff ditekan karena terlalu besar
+ 0 - 0
schema-admin.json


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini