From 7d83ca5870243968ccad0d208c932c145d4264c0 Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Mon, 12 Aug 2024 17:30:40 +0300 Subject: [PATCH 1/4] Revert "Revert "DEVDOCS-6015: [Update] upc, mpn, gtin (#401)" (#422)" This reverts commit dacca299c7c4820a9fa3797a6de1e08aefb29c3e. --- .../catalog/product-variants_catalog.v3.yml | 28 +++++++++++++++---- reference/catalog/products_catalog.v3.yml | 26 ++++++++++++++--- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/reference/catalog/product-variants_catalog.v3.yml b/reference/catalog/product-variants_catalog.v3.yml index 7627a6dab..93d2a925e 100644 --- a/reference/catalog/product-variants_catalog.v3.yml +++ b/reference/catalog/product-variants_catalog.v3.yml @@ -1132,7 +1132,9 @@ paths: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - x-nullable: true + nullable: false + maxLength: 13 + minLength: 0 inventory_level: type: integer description: |- @@ -1347,7 +1349,9 @@ paths: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - x-nullable: true + nullable: false + maxLength: 13 + minLength: 0 example: "1234" inventory_level: type: integer @@ -1472,7 +1476,9 @@ paths: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - x-nullable: true + nullable: false + maxLength: 13 + minLength: 0 inventory_level: type: integer description: |- @@ -1989,7 +1995,9 @@ components: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: true + nullable: false + maxLength: 13 + minLength: 0 image_url: type: string description: Publicly available image url @@ -2019,9 +2027,13 @@ components: mpn: type: string description: The Manufacturer Part Number (MPN) for the variant. + nullable: false gtin: type: string example: '012345678905' + nullable: false + maxLength: 13 + minLength: 0 description: Common Variant properties. x-internal: false x-examples: @@ -2186,7 +2198,9 @@ components: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: true + nullable: false + maxLength: 13 + minLength: 0 inventory_level: type: integer description: |- @@ -2217,10 +2231,14 @@ components: type: string description: Global Trade Item Number example: '012345678905' + nullable: false + maxLength: 13 + minLength: 0 mpn: type: string description: Manufacturer Part Number example: HV-HM02 + nullable: false description: Common Variant properties. - type: object properties: diff --git a/reference/catalog/products_catalog.v3.yml b/reference/catalog/products_catalog.v3.yml index 81b37efda..fe99a3141 100644 --- a/reference/catalog/products_catalog.v3.yml +++ b/reference/catalog/products_catalog.v3.yml @@ -5374,7 +5374,9 @@ components: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: true + nullable: false + maxLength: 13 + minLength: 0 inventory_level: type: integer description: |- @@ -5401,9 +5403,13 @@ components: mpn: type: string description: The Manufacturer Part Number (MPN) for the variant. + nullable: false gtin: type: string example: '012345678905' + nullable: false + maxLength: 13 + minLength: 0 description: Common Variant properties. x-internal: false x-examples: @@ -5569,7 +5575,9 @@ components: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: true + nullable: false + maxLength: 13 + minLength: 0 inventory_level: type: integer description: |- @@ -7132,8 +7140,9 @@ components: The layout template file used to render this product category. This field is writable only for stores with a Blueprint theme applied. For stores with a Stencil theme applied, see [Custom Template Associations](/docs/rest-content/custom-template-associations). upc: type: string - maxLength: 32 + maxLength: 13 minLength: 0 + nullable: false description: | The product UPC code, which is used in feeds for shopping comparison sites and external channel integrations. search_keywords: @@ -7298,9 +7307,13 @@ components: gtin: type: string description: Global Trade Item Number + nullable: false + maxLength: 13 + minLength: 0 mpn: type: string description: Manufacturer Part Number + nullable: false date_last_imported: type: string description: the date when the Product had been imported @@ -7624,8 +7637,9 @@ components: The layout template file used to render this product category. This field is writable only for stores with a Blueprint theme applied. For stores with a Stencil theme applied, see [Custom Template Associations](/docs/rest-content/custom-template-associations). upc: type: string - maxLength: 32 + maxLength: 13 minLength: 0 + nullable: false description: | The product UPC code, which is used in feeds for shopping comparison sites and external channel integrations. search_keywords: @@ -7790,9 +7804,13 @@ components: gtin: type: string description: Global Trade Item Number + nullable: false + maxLength: 13 + minLength: 0 mpn: type: string description: Manufacturer Part Number + nullable: false date_last_imported: type: string description: the date when the Product had been imported From f0049fbe048e21942b6aba45194dd6f33d96f520 Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Mon, 12 Aug 2024 17:41:58 +0300 Subject: [PATCH 2/4] change length of string to 14 --- reference/catalog/product-variants_catalog.v3.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/reference/catalog/product-variants_catalog.v3.yml b/reference/catalog/product-variants_catalog.v3.yml index 93d2a925e..fbb77fd06 100644 --- a/reference/catalog/product-variants_catalog.v3.yml +++ b/reference/catalog/product-variants_catalog.v3.yml @@ -1133,7 +1133,7 @@ paths: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 inventory_level: type: integer @@ -1350,7 +1350,7 @@ paths: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 example: "1234" inventory_level: @@ -1477,7 +1477,7 @@ paths: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 inventory_level: type: integer @@ -1996,7 +1996,7 @@ components: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 image_url: type: string @@ -2032,7 +2032,7 @@ components: type: string example: '012345678905' nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 description: Common Variant properties. x-internal: false @@ -2199,7 +2199,7 @@ components: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 inventory_level: type: integer @@ -2232,7 +2232,7 @@ components: description: Global Trade Item Number example: '012345678905' nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 mpn: type: string From 23aab7a9f1d94e8a6da59e89243f15cff9f6f362 Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Mon, 12 Aug 2024 19:09:05 +0300 Subject: [PATCH 3/4] Update product-variants_catalog to nullable true --- .../catalog/product-variants_catalog.v3.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/reference/catalog/product-variants_catalog.v3.yml b/reference/catalog/product-variants_catalog.v3.yml index fbb77fd06..401a9090a 100644 --- a/reference/catalog/product-variants_catalog.v3.yml +++ b/reference/catalog/product-variants_catalog.v3.yml @@ -1132,7 +1132,7 @@ paths: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: false + nullable: true maxLength: 14 minLength: 0 inventory_level: @@ -1349,7 +1349,7 @@ paths: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: false + nullable: true maxLength: 14 minLength: 0 example: "1234" @@ -1476,7 +1476,7 @@ paths: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: false + nullable: true maxLength: 14 minLength: 0 inventory_level: @@ -1995,7 +1995,7 @@ components: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: false + nullable: true maxLength: 14 minLength: 0 image_url: @@ -2027,11 +2027,11 @@ components: mpn: type: string description: The Manufacturer Part Number (MPN) for the variant. - nullable: false + nullable: true gtin: type: string example: '012345678905' - nullable: false + nullable: true maxLength: 14 minLength: 0 description: Common Variant properties. @@ -2198,7 +2198,7 @@ components: upc: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. - nullable: false + nullable: true maxLength: 14 minLength: 0 inventory_level: @@ -2231,14 +2231,14 @@ components: type: string description: Global Trade Item Number example: '012345678905' - nullable: false + nullable: true maxLength: 14 minLength: 0 mpn: type: string description: Manufacturer Part Number example: HV-HM02 - nullable: false + nullable: true description: Common Variant properties. - type: object properties: From 7e3a94f74b461d33de304e24c678ce4904e2e54b Mon Sep 17 00:00:00 2001 From: Traci Porter Date: Mon, 12 Aug 2024 19:13:40 +0300 Subject: [PATCH 4/4] Update products_catalog.v3.yml [max length to 14] --- reference/catalog/products_catalog.v3.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/reference/catalog/products_catalog.v3.yml b/reference/catalog/products_catalog.v3.yml index fe99a3141..3716ab67a 100644 --- a/reference/catalog/products_catalog.v3.yml +++ b/reference/catalog/products_catalog.v3.yml @@ -5375,7 +5375,7 @@ components: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 inventory_level: type: integer @@ -5408,7 +5408,7 @@ components: type: string example: '012345678905' nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 description: Common Variant properties. x-internal: false @@ -5576,7 +5576,7 @@ components: type: string description: The UPC code used in feeds for shopping comparison sites and external channel integrations. nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 inventory_level: type: integer @@ -7140,7 +7140,7 @@ components: The layout template file used to render this product category. This field is writable only for stores with a Blueprint theme applied. For stores with a Stencil theme applied, see [Custom Template Associations](/docs/rest-content/custom-template-associations). upc: type: string - maxLength: 13 + maxLength: 14 minLength: 0 nullable: false description: | @@ -7308,7 +7308,7 @@ components: type: string description: Global Trade Item Number nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 mpn: type: string @@ -7637,7 +7637,7 @@ components: The layout template file used to render this product category. This field is writable only for stores with a Blueprint theme applied. For stores with a Stencil theme applied, see [Custom Template Associations](/docs/rest-content/custom-template-associations). upc: type: string - maxLength: 13 + maxLength: 14 minLength: 0 nullable: false description: | @@ -7805,7 +7805,7 @@ components: type: string description: Global Trade Item Number nullable: false - maxLength: 13 + maxLength: 14 minLength: 0 mpn: type: string