fix(core): Enforce Channels created with a default tax/shipping Zone

Relates to #218
vendure-ecommerce · Dec 2, 2019 · f57fb51 · f57fb51
1 parent 31ef93e
commit f57fb51
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 9 deletions.
diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -425,8 +425,8 @@ export type CreateChannelInput = {
   defaultLanguageCode: LanguageCode,
   pricesIncludeTax: Scalars['Boolean'],
   currencyCode: CurrencyCode,
-  defaultTaxZoneId?: Maybe<Scalars['ID']>,
-  defaultShippingZoneId?: Maybe<Scalars['ID']>,
+  defaultTaxZoneId: Scalars['ID'],
+  defaultShippingZoneId: Scalars['ID'],
 };
 
 export type CreateCollectionInput = {

diff --git a/packages/core/e2e/default-search-plugin.e2e-spec.ts b/packages/core/e2e/default-search-plugin.e2e-spec.ts
@@ -640,6 +640,8 @@ describe('Default search plugin', () => {
                         defaultLanguageCode: LanguageCode.en,
                         currencyCode: CurrencyCode.GBP,
                         pricesIncludeTax: true,
+                        defaultTaxZoneId: 'T_1',
+                        defaultShippingZoneId: 'T_1',
                     },
                 });
                 secondChannel = createChannel;

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -425,8 +425,8 @@ export type CreateChannelInput = {
     defaultLanguageCode: LanguageCode;
     pricesIncludeTax: Scalars['Boolean'];
     currencyCode: CurrencyCode;
-    defaultTaxZoneId?: Maybe<Scalars['ID']>;
-    defaultShippingZoneId?: Maybe<Scalars['ID']>;
+    defaultTaxZoneId: Scalars['ID'];
+    defaultShippingZoneId: Scalars['ID'];
 };
 
 export type CreateCollectionInput = {
@@ -3428,6 +3428,18 @@ export type UpdateAdministratorMutation = { __typename?: 'Mutation' } & {
     updateAdministrator: { __typename?: 'Administrator' } & AdministratorFragment;
 };
 
+export type Q1QueryVariables = {};
+
+export type Q1Query = { __typename?: 'Query' } & {
+    product: Maybe<{ __typename?: 'Product' } & Pick<Product, 'id' | 'name'>>;
+};
+
+export type Q2QueryVariables = {};
+
+export type Q2Query = { __typename?: 'Query' } & {
+    product: Maybe<{ __typename?: 'Product' } & Pick<Product, 'id' | 'name'>>;
+};
+
 export type CanCreateCustomerMutationVariables = {
     input: CreateCustomerInput;
 };
@@ -5129,6 +5141,18 @@ export namespace UpdateAdministrator {
     export type UpdateAdministrator = AdministratorFragment;
 }
 
+export namespace Q1 {
+    export type Variables = Q1QueryVariables;
+    export type Query = Q1Query;
+    export type Product = NonNullable<Q1Query['product']>;
+}
+
+export namespace Q2 {
+    export type Variables = Q2QueryVariables;
+    export type Query = Q2Query;
+    export type Product = NonNullable<Q2Query['product']>;
+}
+
 export namespace CanCreateCustomer {
     export type Variables = CanCreateCustomerMutationVariables;
     export type Mutation = CanCreateCustomerMutation;

diff --git a/packages/core/src/api/schema/admin-api/channel.api.graphql b/packages/core/src/api/schema/admin-api/channel.api.graphql
@@ -21,8 +21,8 @@ input CreateChannelInput {
     defaultLanguageCode: LanguageCode!
     pricesIncludeTax: Boolean!
     currencyCode: CurrencyCode!
-    defaultTaxZoneId: ID
-    defaultShippingZoneId: ID
+    defaultTaxZoneId: ID!
+    defaultShippingZoneId: ID!
 }
 
 input UpdateChannelInput {

diff --git a/packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts b/packages/elasticsearch-plugin/e2e/elasticsearch-plugin.e2e-spec.ts
@@ -651,6 +651,7 @@ describe('Elasticsearch plugin', () => {
                         currencyCode: CurrencyCode.GBP,
                         pricesIncludeTax: true,
                         defaultTaxZoneId: 'T_2',
+                        defaultShippingZoneId: 'T_1',
                     },
                 });
                 secondChannel = createChannel;

diff --git a/packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts b/packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts
@@ -425,8 +425,8 @@ export type CreateChannelInput = {
     defaultLanguageCode: LanguageCode;
     pricesIncludeTax: Scalars['Boolean'];
     currencyCode: CurrencyCode;
-    defaultTaxZoneId?: Maybe<Scalars['ID']>;
-    defaultShippingZoneId?: Maybe<Scalars['ID']>;
+    defaultTaxZoneId: Scalars['ID'];
+    defaultShippingZoneId: Scalars['ID'];
 };
 
 export type CreateCollectionInput = {

diff --git a/schema-admin.json b/schema-admin.json