feat(core): Expose retry data on Job type in Admin API

vendure-ecommerce · Oct 5, 2021 · 4b15ef4 · 4b15ef4
1 parent 9fda858
commit 4b15ef4
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 1 deletion.
diff --git a/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts b/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
@@ -1611,6 +1611,8 @@ export type Job = Node & {
     error?: Maybe<Scalars['JSON']>;
     isSettled: Scalars['Boolean'];
     duration: Scalars['Int'];
+    retries: Scalars['Int'];
+    attempts: Scalars['Int'];
 };
 
 export type JobFilterParameter = {
@@ -1622,6 +1624,8 @@ export type JobFilterParameter = {
     progress?: Maybe<NumberOperators>;
     isSettled?: Maybe<BooleanOperators>;
     duration?: Maybe<NumberOperators>;
+    retries?: Maybe<NumberOperators>;
+    attempts?: Maybe<NumberOperators>;
 };
 
 export type JobList = PaginatedList & {
@@ -1649,6 +1653,8 @@ export type JobSortParameter = {
     queueName?: Maybe<SortOrder>;
     progress?: Maybe<SortOrder>;
     duration?: Maybe<SortOrder>;
+    retries?: Maybe<SortOrder>;
+    attempts?: Maybe<SortOrder>;
 };
 
 /**
@@ -3351,14 +3357,21 @@ export type Product = Node & {
     description: Scalars['String'];
     featuredAsset?: Maybe<Asset>;
     assets: Array<Asset>;
+    /** Returns all ProductVariants */
     variants: Array<ProductVariant>;
+    /** Returns a paginated, sortable, filterable list of ProductVariants */
+    variantList: ProductVariantList;
     optionGroups: Array<ProductOptionGroup>;
     facetValues: Array<FacetValue>;
     translations: Array<ProductTranslation>;
     collections: Array<Collection>;
     customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type ProductVariantListArgs = {
+    options?: Maybe<ProductVariantListOptions>;
+};
+
 export type ProductFilterParameter = {
     enabled?: Maybe<BooleanOperators>;
     createdAt?: Maybe<DateOperators>;

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
@@ -2303,14 +2303,21 @@ export type Product = Node & {
     description: Scalars['String'];
     featuredAsset?: Maybe<Asset>;
     assets: Array<Asset>;
+    /** Returns all ProductVariants */
     variants: Array<ProductVariant>;
+    /** Returns a paginated, sortable, filterable list of ProductVariants */
+    variantList: ProductVariantList;
     optionGroups: Array<ProductOptionGroup>;
     facetValues: Array<FacetValue>;
     translations: Array<ProductTranslation>;
     collections: Array<Collection>;
     customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type ProductVariantListArgs = {
+    options?: Maybe<ProductVariantListOptions>;
+};
+
 export type ProductFilterParameter = {
     createdAt?: Maybe<DateOperators>;
     updatedAt?: Maybe<DateOperators>;

diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -1654,6 +1654,8 @@ export type Job = Node & {
   error?: Maybe<Scalars['JSON']>;
   isSettled: Scalars['Boolean'];
   duration: Scalars['Int'];
+  retries: Scalars['Int'];
+  attempts: Scalars['Int'];
 };
 
 export type JobFilterParameter = {
@@ -1665,6 +1667,8 @@ export type JobFilterParameter = {
   progress?: Maybe<NumberOperators>;
   isSettled?: Maybe<BooleanOperators>;
   duration?: Maybe<NumberOperators>;
+  retries?: Maybe<NumberOperators>;
+  attempts?: Maybe<NumberOperators>;
 };
 
 export type JobList = PaginatedList & {
@@ -1694,6 +1698,8 @@ export type JobSortParameter = {
   queueName?: Maybe<SortOrder>;
   progress?: Maybe<SortOrder>;
   duration?: Maybe<SortOrder>;
+  retries?: Maybe<SortOrder>;
+  attempts?: Maybe<SortOrder>;
 };
 
 /**

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -1611,6 +1611,8 @@ export type Job = Node & {
     error?: Maybe<Scalars['JSON']>;
     isSettled: Scalars['Boolean'];
     duration: Scalars['Int'];
+    retries: Scalars['Int'];
+    attempts: Scalars['Int'];
 };
 
 export type JobFilterParameter = {
@@ -1622,6 +1624,8 @@ export type JobFilterParameter = {
     progress?: Maybe<NumberOperators>;
     isSettled?: Maybe<BooleanOperators>;
     duration?: Maybe<NumberOperators>;
+    retries?: Maybe<NumberOperators>;
+    attempts?: Maybe<NumberOperators>;
 };
 
 export type JobList = PaginatedList & {
@@ -1649,6 +1653,8 @@ export type JobSortParameter = {
     queueName?: Maybe<SortOrder>;
     progress?: Maybe<SortOrder>;
     duration?: Maybe<SortOrder>;
+    retries?: Maybe<SortOrder>;
+    attempts?: Maybe<SortOrder>;
 };
 
 /**
@@ -3351,14 +3357,21 @@ export type Product = Node & {
     description: Scalars['String'];
     featuredAsset?: Maybe<Asset>;
     assets: Array<Asset>;
+    /** Returns all ProductVariants */
     variants: Array<ProductVariant>;
+    /** Returns a paginated, sortable, filterable list of ProductVariants */
+    variantList: ProductVariantList;
     optionGroups: Array<ProductOptionGroup>;
     facetValues: Array<FacetValue>;
     translations: Array<ProductTranslation>;
     collections: Array<Collection>;
     customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type ProductVariantListArgs = {
+    options?: Maybe<ProductVariantListOptions>;
+};
+
 export type ProductFilterParameter = {
     enabled?: Maybe<BooleanOperators>;
     createdAt?: Maybe<DateOperators>;
@@ -6502,6 +6515,19 @@ export type GetProductVariantListQuery = {
     };
 };
 
+export type GetProductWithVariantListQueryVariables = Exact<{
+    id?: Maybe<Scalars['ID']>;
+    variantListOptions?: Maybe<ProductVariantListOptions>;
+}>;
+
+export type GetProductWithVariantListQuery = {
+    product?: Maybe<
+        Pick<Product, 'id'> & {
+            variantList: Pick<ProductVariantList, 'totalItems'> & { items: Array<ProductVariantFragment> };
+        }
+    >;
+};
+
 export type DeletePromotionMutationVariables = Exact<{
     id: Scalars['ID'];
 }>;
@@ -8824,6 +8850,20 @@ export namespace GetProductVariantList {
     >;
 }
 
+export namespace GetProductWithVariantList {
+    export type Variables = GetProductWithVariantListQueryVariables;
+    export type Query = GetProductWithVariantListQuery;
+    export type Product = NonNullable<GetProductWithVariantListQuery['product']>;
+    export type VariantList = NonNullable<
+        NonNullable<GetProductWithVariantListQuery['product']>['variantList']
+    >;
+    export type Items = NonNullable<
+        NonNullable<
+            NonNullable<NonNullable<GetProductWithVariantListQuery['product']>['variantList']>['items']
+        >[number]
+    >;
+}
+
 export namespace DeletePromotion {
     export type Variables = DeletePromotionMutationVariables;
     export type Mutation = DeletePromotionMutation;

diff --git a/packages/core/e2e/graphql/generated-e2e-shop-types.ts b/packages/core/e2e/graphql/generated-e2e-shop-types.ts
@@ -2226,14 +2226,21 @@ export type Product = Node & {
     description: Scalars['String'];
     featuredAsset?: Maybe<Asset>;
     assets: Array<Asset>;
+    /** Returns all ProductVariants */
     variants: Array<ProductVariant>;
+    /** Returns a paginated, sortable, filterable list of ProductVariants */
+    variantList: ProductVariantList;
     optionGroups: Array<ProductOptionGroup>;
     facetValues: Array<FacetValue>;
     translations: Array<ProductTranslation>;
     collections: Array<Collection>;
     customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type ProductVariantListArgs = {
+    options?: Maybe<ProductVariantListOptions>;
+};
+
 export type ProductFilterParameter = {
     createdAt?: Maybe<DateOperators>;
     updatedAt?: Maybe<DateOperators>;

diff --git a/packages/core/src/api/schema/admin-api/job.api.graphql b/packages/core/src/api/schema/admin-api/job.api.graphql
@@ -46,6 +46,8 @@ type Job implements Node {
     error: JSON
     isSettled: Boolean!
     duration: Int!
+    retries: Int!
+    attempts: Int!
 }
 
 type JobQueue {

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
@@ -1611,6 +1611,8 @@ export type Job = Node & {
     error?: Maybe<Scalars['JSON']>;
     isSettled: Scalars['Boolean'];
     duration: Scalars['Int'];
+    retries: Scalars['Int'];
+    attempts: Scalars['Int'];
 };
 
 export type JobFilterParameter = {
@@ -1622,6 +1624,8 @@ export type JobFilterParameter = {
     progress?: Maybe<NumberOperators>;
     isSettled?: Maybe<BooleanOperators>;
     duration?: Maybe<NumberOperators>;
+    retries?: Maybe<NumberOperators>;
+    attempts?: Maybe<NumberOperators>;
 };
 
 export type JobList = PaginatedList & {
@@ -1649,6 +1653,8 @@ export type JobSortParameter = {
     queueName?: Maybe<SortOrder>;
     progress?: Maybe<SortOrder>;
     duration?: Maybe<SortOrder>;
+    retries?: Maybe<SortOrder>;
+    attempts?: Maybe<SortOrder>;
 };
 
 /**
@@ -3351,14 +3357,21 @@ export type Product = Node & {
     description: Scalars['String'];
     featuredAsset?: Maybe<Asset>;
     assets: Array<Asset>;
+    /** Returns all ProductVariants */
     variants: Array<ProductVariant>;
+    /** Returns a paginated, sortable, filterable list of ProductVariants */
+    variantList: ProductVariantList;
     optionGroups: Array<ProductOptionGroup>;
     facetValues: Array<FacetValue>;
     translations: Array<ProductTranslation>;
     collections: Array<Collection>;
     customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type ProductVariantListArgs = {
+    options?: Maybe<ProductVariantListOptions>;
+};
+
 export type ProductFilterParameter = {
     enabled?: Maybe<BooleanOperators>;
     createdAt?: Maybe<DateOperators>;

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