From a5bb1db5714b0f9240c6f44f7ec4d0dcf75e3039 Mon Sep 17 00:00:00 2001
From: Bahar-Sayoldin <109090211+Bahar-Sayoldin@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:11:22 -0400
Subject: [PATCH 1/6] Update c3dc-model.yml

Added Survival node and delete event
---
 model-desc/c3dc-model.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/model-desc/c3dc-model.yml b/model-desc/c3dc-model.yml
index a8b8f61..c81feae 100644
--- a/model-desc/c3dc-model.yml
+++ b/model-desc/c3dc-model.yml
@@ -14,12 +14,6 @@ Nodes:
       - tumor_stage_clinical_t
       - tumor_stage_clinical_n
       - tumor_stage_clinical_m
-  event:
-    Props:
-      - event_id
-      - event_category
-      - event_detail
-      - age_at_event
   participant:
     Props:
       - participant_id
@@ -58,6 +52,14 @@ Nodes:
       - consent
       - consent_number
       - external_url
+  survival:
+    Props:
+      - survival_id
+      - last_known_survival_status
+      - age_at_last_known_survival_status
+      - event_free_survival_status
+      - age_at_event_free_survival_status
+      - first_event
   reference_file: 
     Props:
       - reference_file_id

From 1c8895f8ef1a1f94bd13b167ffde97113bb1750b Mon Sep 17 00:00:00 2001
From: Bahar-Sayoldin <109090211+Bahar-Sayoldin@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:18:49 -0400
Subject: [PATCH 2/6] Update c3dc-model-props.yml

---
 model-desc/c3dc-model-props.yml | 52 ---------------------------------
 1 file changed, 52 deletions(-)

diff --git a/model-desc/c3dc-model-props.yml b/model-desc/c3dc-model-props.yml
index 6b4f3e0..d8f4e6d 100644
--- a/model-desc/c3dc-model-props.yml
+++ b/model-desc/c3dc-model-props.yml
@@ -1332,58 +1332,6 @@ PropDefinitions:
     Type: integer
     Req: false
     Private: false  
-  #event
-  event_id:
-    Desc: A unique identifier for an event
-    Term:
-      - Origin: caDSR
-        Code: '2534569'
-        Value: Additional Finding Identifier
-    Type: string
-    Req: true
-    Private: false
-    Key: true
-  #event
-  event_category:
-    Desc: Event category
-    Term:
-      - Origin: caDSR
-        Code: '7197400'
-        Value: A grouping of topic-variable values based on sponsor defined characteristics.
-    Type:
-      value_type: list
-      Enum:
-        - "Adverse Event"
-        - "Last Known Disease Status"
-        - "Comorbidity"
-        - "Disease Event"
-        - "Disease Response"
-        - "Other"
-    Req: true
-    Private: false
-    Key: false
-  #event
-  event_detail:
-    Desc: Event details or values or results
-    Term:
-      - Origin: caDSR
-        Code: '6642370'
-        Value: Result or Finding Original Result
-    Type: string
-    Req: true
-    Private: false
-    Key: false
-  #event
-  age_at_event:
-    Desc: Participant age at event
-    Term:
-      - Origin: caDSR
-        Code: '6412753'
-        Value: Age
-    Type: string
-    Req: true
-    Private: false
-    Key: false
   #reference_file
   reference_file_id: 
     Desc: A unique identifier for a clinical measure file.

From 658954308ad9c00fa8f7c4ea862db8558cfec1c2 Mon Sep 17 00:00:00 2001
From: Bahar-Sayoldin <109090211+Bahar-Sayoldin@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:41:33 -0400
Subject: [PATCH 3/6] Update c3dc-model-props.yml

---
 model-desc/c3dc-model-props.yml | 75 +++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/model-desc/c3dc-model-props.yml b/model-desc/c3dc-model-props.yml
index d8f4e6d..5895b38 100644
--- a/model-desc/c3dc-model-props.yml
+++ b/model-desc/c3dc-model-props.yml
@@ -2259,3 +2259,78 @@ PropDefinitions:
     Type: string
     Req: true
     Private: false
+  survival_id:
+    Desc: A unique sequence of alphanumeric characters used to identify the survival event in the investigation or study.
+    Term:
+      - Origin: caDSR
+        Code: ''
+        Value: ''
+    Type: string
+    Req: true
+    Private: false
+    Key: true
+  last_known_survival_status:
+    Desc: ''
+    Term:
+      - Origin: caDSR
+        Code: ''
+        Value: ''
+    Type:
+      value_type: list
+      Enum:
+        - "Alive"
+        - "Dead"
+        - "Not Reported"
+        - "Unknown"
+    Req: true
+    Private: false
+  age_at_last_known_survival_status:
+    Desc: ''
+    Term:
+      - Origin: caDSR
+        Code: ''
+        Value: ''
+    Type: integer
+    Req: true
+    Private: false
+  event_free_survival_status:
+    Desc: ''
+    Term:
+      - Origin: caDSR
+        Code: ''
+        Value: ''
+    Type:
+      value_type: list
+      Enum:
+        - "Censored"
+        - "Not Censored"
+        - "Not Reported"
+        - "Unknown"
+    Req: true
+    Private: false
+ age_at_event_free_survival_status:
+    Desc: ''
+    Term:
+      - Origin: caDSR
+        Code: ''
+        Value: ''
+    Type: integer
+    Req: false
+    Private: false
+first_event:
+    Desc: ''
+    Term:
+      - Origin: caDSR
+        Code: ''
+        Value: ''
+    Type:
+      value_type: list
+      Enum:
+        - "Progression"
+        - "Relapse"
+        - "Second Malignant Neoplasm"
+        - "Death"
+        - "Not Reported"
+        - "Unknown"
+    Req: true
+    Private: false

From 9bec9872aa129d512cfd7304fb591515c1841582 Mon Sep 17 00:00:00 2001
From: Bahar-Sayoldin <109090211+Bahar-Sayoldin@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:44:43 -0400
Subject: [PATCH 4/6] Update c3dc-model-props.yml

---
 model-desc/c3dc-model-props.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model-desc/c3dc-model-props.yml b/model-desc/c3dc-model-props.yml
index 5895b38..9aa92ff 100644
--- a/model-desc/c3dc-model-props.yml
+++ b/model-desc/c3dc-model-props.yml
@@ -2308,7 +2308,7 @@ PropDefinitions:
         - "Unknown"
     Req: true
     Private: false
- age_at_event_free_survival_status:
+  age_at_event_free_survival_status:
     Desc: ''
     Term:
       - Origin: caDSR
@@ -2317,7 +2317,7 @@ PropDefinitions:
     Type: integer
     Req: false
     Private: false
-first_event:
+  first_event:
     Desc: ''
     Term:
       - Origin: caDSR

From 852b8833752bdcb38795d6c7c1782aa2884f030d Mon Sep 17 00:00:00 2001
From: Bahar-Sayoldin <109090211+Bahar-Sayoldin@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:59:36 -0400
Subject: [PATCH 5/6] Update c3dc-model-props.yml

---
 model-desc/c3dc-model-props.yml | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/model-desc/c3dc-model-props.yml b/model-desc/c3dc-model-props.yml
index 9aa92ff..520b4b6 100644
--- a/model-desc/c3dc-model-props.yml
+++ b/model-desc/c3dc-model-props.yml
@@ -2263,18 +2263,18 @@ PropDefinitions:
     Desc: A unique sequence of alphanumeric characters used to identify the survival event in the investigation or study.
     Term:
       - Origin: caDSR
-        Code: ''
-        Value: ''
+        Code: '14534325'
+        Value: CCDI Accession Number Identifier
     Type: string
     Req: true
     Private: false
     Key: true
   last_known_survival_status:
-    Desc: ''
+    Desc: 'Individual's vital status, indicating whether they are currently alive, deceased, or if their status remains unknown or unspecified.'
     Term:
       - Origin: caDSR
-        Code: ''
-        Value: ''
+        Code: '2847330'
+        Value: Participant Vital Status Type
     Type:
       value_type: list
       Enum:
@@ -2285,20 +2285,20 @@ PropDefinitions:
     Req: true
     Private: false
   age_at_last_known_survival_status:
-    Desc: ''
+    Desc: 'The age (in days) when the last known survival status of the subject was captured.'
     Term:
       - Origin: caDSR
-        Code: ''
-        Value: ''
+        Code: '12305768'
+        Value: Subject Age at Last Known Survival Status Day Count
     Type: integer
     Req: true
     Private: false
   event_free_survival_status:
-    Desc: ''
+    Desc: 'Identify the nature of the event that best characterizes the endpoint of the study.'
     Term:
       - Origin: caDSR
-        Code: ''
-        Value: ''
+        Code: '3070936'
+        Value: Study End Point Event Type
     Type:
       value_type: list
       Enum:
@@ -2309,20 +2309,20 @@ PropDefinitions:
     Req: true
     Private: false
   age_at_event_free_survival_status:
-    Desc: ''
+    Desc: 'Time from diagnosis to first event (or censoring), in days.'
     Term:
       - Origin: caDSR
-        Code: ''
-        Value: ''
+        Code: '3229334'
+        Value: Study End Point Event Occurrence Day Count
     Type: integer
     Req: false
     Private: false
   first_event:
-    Desc: ''
+    Desc: 'Identify the nature of the event that best characterizes the endpoint of the study.'
     Term:
       - Origin: caDSR
-        Code: ''
-        Value: ''
+        Code: '3070936'
+        Value: Study End Point Event Type
     Type:
       value_type: list
       Enum:

From 91c1390905c6242d42e04b2448925c03581e31c4 Mon Sep 17 00:00:00 2001
From: Bahar-Sayoldin <109090211+Bahar-Sayoldin@users.noreply.github.com>
Date: Thu, 19 Oct 2023 14:10:38 -0400
Subject: [PATCH 6/6] Update c3dc-model-props.yml

---
 model-desc/c3dc-model-props.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/model-desc/c3dc-model-props.yml b/model-desc/c3dc-model-props.yml
index 520b4b6..f0bd193 100644
--- a/model-desc/c3dc-model-props.yml
+++ b/model-desc/c3dc-model-props.yml
@@ -2270,7 +2270,7 @@ PropDefinitions:
     Private: false
     Key: true
   last_known_survival_status:
-    Desc: 'Individual's vital status, indicating whether they are currently alive, deceased, or if their status remains unknown or unspecified.'
+    Desc: Individual's vital status, indicating whether they are currently alive, deceased, or if their status remains unknown or unspecified.
     Term:
       - Origin: caDSR
         Code: '2847330'
@@ -2285,7 +2285,7 @@ PropDefinitions:
     Req: true
     Private: false
   age_at_last_known_survival_status:
-    Desc: 'The age (in days) when the last known survival status of the subject was captured.'
+    Desc: The age (in days) when the last known survival status of the subject was captured.
     Term:
       - Origin: caDSR
         Code: '12305768'
@@ -2294,7 +2294,7 @@ PropDefinitions:
     Req: true
     Private: false
   event_free_survival_status:
-    Desc: 'Identify the nature of the event that best characterizes the endpoint of the study.'
+    Desc: Identify the nature of the event that best characterizes the endpoint of the study.
     Term:
       - Origin: caDSR
         Code: '3070936'
@@ -2309,7 +2309,7 @@ PropDefinitions:
     Req: true
     Private: false
   age_at_event_free_survival_status:
-    Desc: 'Time from diagnosis to first event (or censoring), in days.'
+    Desc: Time from diagnosis to first event (or censoring), in days.
     Term:
       - Origin: caDSR
         Code: '3229334'
@@ -2318,7 +2318,7 @@ PropDefinitions:
     Req: false
     Private: false
   first_event:
-    Desc: 'Identify the nature of the event that best characterizes the endpoint of the study.'
+    Desc: Identify the nature of the event that best characterizes the endpoint of the study.
     Term:
       - Origin: caDSR
         Code: '3070936'