Fixed a bug where any class with one pending layer was ignored

Author: RehanSaeed

Source/Schema.NET/core/Course.cs

@@ -0,0 +1,133 @@
+namespace Schema.NET
+{
+    using System;
+    using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// A description of an educational course which may be offered as distinct instances at which take place at different times or take place at different locations, or be offered through different media or modes of study. An educational course is a sequence of one or more educational events and/or creative works which aims to build knowledge, competence or ability of learners.
+    /// </summary>
+    public partial interface ICourse : ICreativeWork
+    {
+        /// <summary>
+        /// The identifier for the &lt;a class="localLink" href="https://schema.org/Course"&gt;Course&lt;/a&gt; used by the course &lt;a class="localLink" href="https://schema.org/provider"&gt;provider&lt;/a&gt; (e.g. CS101 or 6.001).
+        /// </summary>
+        OneOrMany<string> CourseCode { get; set; }
+
+        /// <summary>
+        /// Requirements for taking the Course. May be completion of another &lt;a class="localLink" href="https://schema.org/Course"&gt;Course&lt;/a&gt; or a textual description like "permission of instructor". Requirements may be a pre-requisite competency, referenced using &lt;a class="localLink" href="https://schema.org/AlignmentObject"&gt;AlignmentObject&lt;/a&gt;.
+        /// </summary>
+        Values<IAlignmentObject, ICourse, string> CoursePrerequisites { get; set; }
+
+        /// <summary>
+        /// A description of the qualification, award, certificate, diploma or other educational credential awarded as a consequence of successful completion of this course or program.
+        /// </summary>
+        Values<string, Uri> EducationalCredentialAwarded { get; set; }
+
+        /// <summary>
+        /// An offering of the course at a specific time and place or through specific media or mode of study or to a specific section of students.
+        /// </summary>
+        OneOrMany<ICourseInstance> HasCourseInstance { get; set; }
+
+        /// <summary>
+        /// The number of credits or units awarded by a Course or required to complete an EducationalOccupationalProgram.
+        /// </summary>
+        Values<int?, IStructuredValue> NumberOfCredits { get; set; }
+
+        /// <summary>
+        /// A description of the qualification, award, certificate, diploma or other occupational credential awarded as a consequence of successful completion of this course or program.
+        /// </summary>
+        Values<string, Uri> OccupationalCredentialAwarded { get; set; }
+    }
+
+    /// <summary>
+    /// A description of an educational course which may be offered as distinct instances at which take place at different times or take place at different locations, or be offered through different media or modes of study. An educational course is a sequence of one or more educational events and/or creative works which aims to build knowledge, competence or ability of learners.
+    /// </summary>
+    [DataContract]
+    public partial class Course : CreativeWork, ICourse, IEquatable<Course>
+    {
+        /// <summary>
+        /// Gets the name of the type as specified by schema.org.
+        /// </summary>
+        [DataMember(Name = "@type", Order = 1)]
+        public override string Type => "Course";
+
+        /// <summary>
+        /// The identifier for the &lt;a class="localLink" href="https://schema.org/Course"&gt;Course&lt;/a&gt; used by the course &lt;a class="localLink" href="https://schema.org/provider"&gt;provider&lt;/a&gt; (e.g. CS101 or 6.001).
+        /// </summary>
+        [DataMember(Name = "courseCode", Order = 206)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public OneOrMany<string> CourseCode { get; set; }
+
+        /// <summary>
+        /// Requirements for taking the Course. May be completion of another &lt;a class="localLink" href="https://schema.org/Course"&gt;Course&lt;/a&gt; or a textual description like "permission of instructor". Requirements may be a pre-requisite competency, referenced using &lt;a class="localLink" href="https://schema.org/AlignmentObject"&gt;AlignmentObject&lt;/a&gt;.
+        /// </summary>
+        [DataMember(Name = "coursePrerequisites", Order = 207)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public Values<IAlignmentObject, ICourse, string> CoursePrerequisites { get; set; }
+
+        /// <summary>
+        /// A description of the qualification, award, certificate, diploma or other educational credential awarded as a consequence of successful completion of this course or program.
+        /// </summary>
+        [DataMember(Name = "educationalCredentialAwarded", Order = 208)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public Values<string, Uri> EducationalCredentialAwarded { get; set; }
+
+        /// <summary>
+        /// An offering of the course at a specific time and place or through specific media or mode of study or to a specific section of students.
+        /// </summary>
+        [DataMember(Name = "hasCourseInstance", Order = 209)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public OneOrMany<ICourseInstance> HasCourseInstance { get; set; }
+
+        /// <summary>
+        /// The number of credits or units awarded by a Course or required to complete an EducationalOccupationalProgram.
+        /// </summary>
+        [DataMember(Name = "numberOfCredits", Order = 210)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public Values<int?, IStructuredValue> NumberOfCredits { get; set; }
+
+        /// <summary>
+        /// A description of the qualification, award, certificate, diploma or other occupational credential awarded as a consequence of successful completion of this course or program.
+        /// </summary>
+        [DataMember(Name = "occupationalCredentialAwarded", Order = 211)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public Values<string, Uri> OccupationalCredentialAwarded { get; set; }
+
+        /// <inheritdoc/>
+        public bool Equals(Course other)
+        {
+            if (other is null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, other))
+            {
+                return true;
+            }
+
+            return this.Type == other.Type &&
+                this.CourseCode == other.CourseCode &&
+                this.CoursePrerequisites == other.CoursePrerequisites &&
+                this.EducationalCredentialAwarded == other.EducationalCredentialAwarded &&
+                this.HasCourseInstance == other.HasCourseInstance &&
+                this.NumberOfCredits == other.NumberOfCredits &&
+                this.OccupationalCredentialAwarded == other.OccupationalCredentialAwarded &&
+                base.Equals(other);
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object obj) => this.Equals(obj as Course);
+
+        /// <inheritdoc/>
+        public override int GetHashCode() => HashCode.Of(this.Type)
+            .And(this.CourseCode)
+            .And(this.CoursePrerequisites)
+            .And(this.EducationalCredentialAwarded)
+            .And(this.HasCourseInstance)
+            .And(this.NumberOfCredits)
+            .And(this.OccupationalCredentialAwarded)
+            .And(base.GetHashCode());
+    }
+}

Source/Schema.NET/core/MedicalCode.cs

@@ -0,0 +1,77 @@
+namespace Schema.NET
+{
+    using System;
+    using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// A code for a medical entity.
+    /// </summary>
+    public partial interface IMedicalCode : IMedicalIntangible
+    {
+        /// <summary>
+        /// A short textual code that uniquely identifies the value.
+        /// </summary>
+        OneOrMany<string> CodeValue { get; set; }
+
+        /// <summary>
+        /// The coding system, e.g. 'ICD-10'.
+        /// </summary>
+        OneOrMany<string> CodingSystem { get; set; }
+    }
+
+    /// <summary>
+    /// A code for a medical entity.
+    /// </summary>
+    [DataContract]
+    public partial class MedicalCode : MedicalIntangible, IMedicalCode, IEquatable<MedicalCode>
+    {
+        /// <summary>
+        /// Gets the name of the type as specified by schema.org.
+        /// </summary>
+        [DataMember(Name = "@type", Order = 1)]
+        public override string Type => "MedicalCode";
+
+        /// <summary>
+        /// A short textual code that uniquely identifies the value.
+        /// </summary>
+        [DataMember(Name = "codeValue", Order = 306)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public OneOrMany<string> CodeValue { get; set; }
+
+        /// <summary>
+        /// The coding system, e.g. 'ICD-10'.
+        /// </summary>
+        [DataMember(Name = "codingSystem", Order = 307)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public OneOrMany<string> CodingSystem { get; set; }
+
+        /// <inheritdoc/>
+        public bool Equals(MedicalCode other)
+        {
+            if (other is null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, other))
+            {
+                return true;
+            }
+
+            return this.Type == other.Type &&
+                this.CodeValue == other.CodeValue &&
+                this.CodingSystem == other.CodingSystem &&
+                base.Equals(other);
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object obj) => this.Equals(obj as MedicalCode);
+
+        /// <inheritdoc/>
+        public override int GetHashCode() => HashCode.Of(this.Type)
+            .And(this.CodeValue)
+            .And(this.CodingSystem)
+            .And(base.GetHashCode());
+    }
+}

Source/Schema.NET/core/MedicalEntity.cs

@@ -9,6 +9,11 @@
     /// </summary>
     public partial interface IMedicalEntity : IThing
     {
+        /// <summary>
+        /// A medical code for the entity, taken from a controlled vocabulary or ontology such as ICD-9, DiseasesDB, MeSH, SNOMED-CT, RxNorm, etc.
+        /// </summary>
+        OneOrMany<IMedicalCode> Code { get; set; }
+
         /// <summary>
         /// A medical guideline related to this entity.
         /// </summary>
@@ -52,45 +57,52 @@ public partial class MedicalEntity : Thing, IMedicalEntity, IEquatable<MedicalEn
         [DataMember(Name = "@type", Order = 1)]
         public override string Type => "MedicalEntity";
 
+        /// <summary>
+        /// A medical code for the entity, taken from a controlled vocabulary or ontology such as ICD-9, DiseasesDB, MeSH, SNOMED-CT, RxNorm, etc.
+        /// </summary>
+        [DataMember(Name = "code", Order = 106)]
+        [JsonConverter(typeof(ValuesJsonConverter))]
+        public OneOrMany<IMedicalCode> Code { get; set; }
+
         /// <summary>
         /// A medical guideline related to this entity.
         /// </summary>
-        [DataMember(Name = "guideline", Order = 106)]
+        [DataMember(Name = "guideline", Order = 107)]
         [JsonConverter(typeof(ValuesJsonConverter))]
         public OneOrMany<IMedicalGuideline> Guideline { get; set; }
 
         /// <summary>
         /// The drug or supplement's legal status, including any controlled substance schedules that apply.
         /// </summary>
-        [DataMember(Name = "legalStatus", Order = 107)]
+        [DataMember(Name = "legalStatus", Order = 108)]
         [JsonConverter(typeof(ValuesJsonConverter))]
         public virtual Values<IDrugLegalStatus, MedicalEnumeration?, string> LegalStatus { get; set; }
 
         /// <summary>
         /// The system of medicine that includes this MedicalEntity, for example 'evidence-based', 'homeopathic', 'chiropractic', etc.
         /// </summary>
-        [DataMember(Name = "medicineSystem", Order = 108)]
+        [DataMember(Name = "medicineSystem", Order = 109)]
         [JsonConverter(typeof(ValuesJsonConverter))]
         public OneOrMany<MedicineSystem?> MedicineSystem { get; set; }
 
         /// <summary>
         /// If applicable, the organization that officially recognizes this entity as part of its endorsed system of medicine.
         /// </summary>
-        [DataMember(Name = "recognizingAuthority", Order = 109)]
+        [DataMember(Name = "recognizingAuthority", Order = 110)]
         [JsonConverter(typeof(ValuesJsonConverter))]
         public OneOrMany<IOrganization> RecognizingAuthority { get; set; }
 
         /// <summary>
         /// If applicable, a medical specialty in which this entity is relevant.
         /// </summary>
-        [DataMember(Name = "relevantSpecialty", Order = 110)]
+        [DataMember(Name = "relevantSpecialty", Order = 111)]
         [JsonConverter(typeof(ValuesJsonConverter))]
         public OneOrMany<MedicalSpecialty?> RelevantSpecialty { get; set; }
 
         /// <summary>
         /// A medical study or trial related to this entity.
         /// </summary>
-        [DataMember(Name = "study", Order = 111)]
+        [DataMember(Name = "study", Order = 112)]
         [JsonConverter(typeof(ValuesJsonConverter))]
         public OneOrMany<IMedicalStudy> Study { get; set; }
 
@@ -108,6 +120,7 @@ public bool Equals(MedicalEntity other)
             }
 
             return this.Type == other.Type &&
+                this.Code == other.Code &&
                 this.Guideline == other.Guideline &&
                 this.LegalStatus == other.LegalStatus &&
                 this.MedicineSystem == other.MedicineSystem &&
@@ -122,6 +135,7 @@ public bool Equals(MedicalEntity other)
 
         /// <inheritdoc/>
         public override int GetHashCode() => HashCode.Of(this.Type)
+            .And(this.Code)
             .And(this.Guideline)
             .And(this.LegalStatus)
             .And(this.MedicineSystem)

Tools/Schema.NET.Tool/Models/SchemaClass.cs

@@ -43,9 +43,7 @@ public class SchemaClass : SchemaObject
             .Traverse(this, x => x.SubClassOf)
             .Any(x => string.Equals(x.Layer, LayerName.Meta, StringComparison.OrdinalIgnoreCase));
 
-        public bool IsPending => EnumerableExtensions
-            .Traverse(this, x => x.SubClassOf)
-            .Any(x => string.Equals(x.Layer, LayerName.Pending, StringComparison.OrdinalIgnoreCase));
+        public bool IsPending => string.Equals(this.Layer, LayerName.Pending, StringComparison.OrdinalIgnoreCase);
 
         public bool IsPrimitive => PrimitiveTypes.Contains(this.Label);