fix: fixes issues with v0.6.0

* Corrects the description of the sample metadata
  `tumor_tissue_morphology` to be specified as a struct. Additionally,
  add the `icd_o_3` code as a named struct field so that it will be
  named in the wiki.
* Adds the `age_at_vital_status` subject metadata to
  `get_field_descriptions()` so that it will be included in the wiki
  page generation.

packages/ccdi-cde/src/v1/sample/tumor_tissue_morphology.rs

@@ -16,21 +16,21 @@ use crate::CDE;
 /// <https://cadsr.cancer.gov/onedata/dmdirect/NIH/NCI/CO/CDEDD?filter=CDEDD.ITEM_ID=11326261%20and%20ver_nr=1>
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize, ToSchema, Introspect)]
 #[schema(as = cde::v1::sample::TumorTissueMorphology)]
-pub struct TumorTissueMorphology(
+pub struct TumorTissueMorphology {
     /// The ICD-O-3 code.
-    String,
-);
+    icd_o_3: String,
+}
 
 impl From<String> for TumorTissueMorphology {
     fn from(value: String) -> Self {
-        TumorTissueMorphology(value)
+        TumorTissueMorphology { icd_o_3: value }
     }
 }
 
 impl CDE for TumorTissueMorphology {}
 
 impl std::fmt::Display for TumorTissueMorphology {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
+        write!(f, "{}", self.icd_o_3)
     }
 }

packages/ccdi-models/src/metadata/field/description/harmonized/sample.rs

@@ -105,7 +105,7 @@ impl description::r#trait::Description for cde::v1::sample::TumorTissueMorpholog
         let members = Self::members().unwrap();
 
         description::Description::Harmonized(Harmonized::new(
-            Kind::Enum,
+            Kind::Struct,
             String::from("tumor_tissue_morphology"),
             entity.description().to_string(),
             Url::try_from("https://github.com/CBIIT/ccdi-federation-api/wiki/Sample-Metadata-Fields#tumor_tissue_morphology").unwrap(),

packages/ccdi-models/src/metadata/field/description/harmonized/subject.rs

@@ -22,6 +22,7 @@ pub fn get_field_descriptions() -> Vec<description::Description> {
         cde::v2::subject::Ethnicity::description(),
         cde::v1::subject::Identifier::description(),
         cde::v1::subject::VitalStatus::description(),
+        crate::subject::metadata::AgeAtVitalStatus::description(),
     ]
 }
 

packages/ccdi-spec/src/utils/markdown.rs

@@ -111,7 +111,7 @@ fn write_variant_members(
             // member in the `members` list is a [`Member::Variant`]. If the
             // first element is a [`Member::Variant`], then all of them should
             // be.
-            _ => unreachable!(),
+            v => unreachable!("{:?}", v),
         };
 
         // Write the row.