From 62d704d7190d1586fae17f25216cc965c3459aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oriol=20L=C3=B3pez-Doriga?= <oriol@Oriols-MacBook-Pro.local>
Date: Fri, 16 Jun 2023 10:19:50 +0200
Subject: [PATCH 1/3] complexValue required type fixed

---
 models/json/beacon-v2-default-model/common/complexValue.json | 5 +----
 models/src/beacon-v2-default-model/common/complexValue.yaml  | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/models/json/beacon-v2-default-model/common/complexValue.json b/models/json/beacon-v2-default-model/common/complexValue.json
index 866070ad7..9d1c4a4b4 100644
--- a/models/json/beacon-v2-default-model/common/complexValue.json
+++ b/models/json/beacon-v2-default-model/common/complexValue.json
@@ -24,10 +24,7 @@
                     }
                 }
             },
-            "required": [
-                "quantityType",
-                "quantity"
-            ]
+            "required": [ "typedQuantities" ]
         }
     },
     "description": "Definition of a complex value class. Provenance: GA4GH Phenopackets v2 `TypedQuantity`",
diff --git a/models/src/beacon-v2-default-model/common/complexValue.yaml b/models/src/beacon-v2-default-model/common/complexValue.yaml
index 45048920f..a31ddf779 100644
--- a/models/src/beacon-v2-default-model/common/complexValue.yaml
+++ b/models/src/beacon-v2-default-model/common/complexValue.yaml
@@ -28,5 +28,4 @@ definitions:
               id: NCIT:C49670
               label: Millimeter of Mercury
     required:
-      - quantityType
-      - quantity
+      - typedQuantities

From cfec4965678333e1749a79b3ac6096ddf4968a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oriol=20L=C3=B3pez-Doriga?= <oriol@Oriols-MacBook-Pro.local>
Date: Fri, 16 Jun 2023 12:28:04 +0200
Subject: [PATCH 2/3] fixed position of required

---
 .../json/beacon-v2-default-model/common/complexValue.json  | 6 +++---
 .../src/beacon-v2-default-model/common/complexValue.yaml   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/models/json/beacon-v2-default-model/common/complexValue.json b/models/json/beacon-v2-default-model/common/complexValue.json
index 9d1c4a4b4..5c23cfd38 100644
--- a/models/json/beacon-v2-default-model/common/complexValue.json
+++ b/models/json/beacon-v2-default-model/common/complexValue.json
@@ -23,8 +23,7 @@
                         "label": "Systolic Blood Pressure"
                     }
                 }
-            },
-            "required": [ "typedQuantities" ]
+            }
         }
     },
     "description": "Definition of a complex value class. Provenance: GA4GH Phenopackets v2 `TypedQuantity`",
@@ -35,7 +34,8 @@
                 "$ref": "#/definitions/TypedQuantity"
             },
             "type": "array"
-        }
+        },
+        "required": [ "typedQuantities" ]
     },
     "title": "Complex Value",
     "type": "object"
diff --git a/models/src/beacon-v2-default-model/common/complexValue.yaml b/models/src/beacon-v2-default-model/common/complexValue.yaml
index a31ddf779..a50522490 100644
--- a/models/src/beacon-v2-default-model/common/complexValue.yaml
+++ b/models/src/beacon-v2-default-model/common/complexValue.yaml
@@ -9,6 +9,9 @@ properties:
     type: array
     items:
       $ref: '#/definitions/TypedQuantity'
+  required:
+    - typedQuantities
+
 definitions:
   TypedQuantity:
     properties:
@@ -26,6 +29,4 @@ definitions:
           quentity:
             unit:
               id: NCIT:C49670
-              label: Millimeter of Mercury
-    required:
-      - typedQuantities
+              label: Millimeter of Mercury
\ No newline at end of file

From be4ff293c7b99d7b7e12ceb17d2df2756655dcee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oriol=20L=C3=B3pez-Doriga?= <oriol@Oriols-MacBook-Pro.local>
Date: Fri, 16 Jun 2023 13:29:07 +0200
Subject: [PATCH 3/3] added required again for quantityType

---
 .../json/beacon-v2-default-model/common/complexValue.json   | 6 +++++-
 models/src/beacon-v2-default-model/common/complexValue.yaml | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/models/json/beacon-v2-default-model/common/complexValue.json b/models/json/beacon-v2-default-model/common/complexValue.json
index 5c23cfd38..aba373e2f 100644
--- a/models/json/beacon-v2-default-model/common/complexValue.json
+++ b/models/json/beacon-v2-default-model/common/complexValue.json
@@ -23,7 +23,11 @@
                         "label": "Systolic Blood Pressure"
                     }
                 }
-            }
+            },
+            "required": [
+                "quantityType",
+                "quantity"
+            ]
         }
     },
     "description": "Definition of a complex value class. Provenance: GA4GH Phenopackets v2 `TypedQuantity`",
diff --git a/models/src/beacon-v2-default-model/common/complexValue.yaml b/models/src/beacon-v2-default-model/common/complexValue.yaml
index a50522490..98207b12b 100644
--- a/models/src/beacon-v2-default-model/common/complexValue.yaml
+++ b/models/src/beacon-v2-default-model/common/complexValue.yaml
@@ -29,4 +29,7 @@ definitions:
           quentity:
             unit:
               id: NCIT:C49670
-              label: Millimeter of Mercury
\ No newline at end of file
+              label: Millimeter of Mercury
+    required:
+      - quantityType
+      - quantity
\ No newline at end of file