fixed recursion in letter model

resources/letters/attributes/custom_envelope.yml

@@ -30,10 +30,8 @@ returned:
       type: string
       description: The url of the envelope asset used.
     object:
-      allOf:
-        - $ref: "../../../shared/attributes/object.yml"
-        - type: string
-          enum:
-            - envelope
-          default: envelope
+      type: string
+      enum:
+        - envelope
+      default: envelope
   nullable: true

resources/letters/models/certified.yml

@@ -4,6 +4,7 @@ allOf:
     required:
       - extra_service
       - tracking_events
+      - color
 
     properties:
       extra_service:
@@ -34,5 +35,45 @@ allOf:
       return_address:
         $ref: "../attributes/return_address.yml"
 
-  - $ref: "letter_base.yml"
+
+      description:
+        $ref: "../../../shared/attributes/resource_description.yml"
+
+      metadata:
+        $ref: "../../../shared/models/metadata.yml"
+
+      merge_variables:
+        $ref: "../../../shared/models/merge_variables.yml"
+
+      send_date:
+        $ref: "../../../shared/attributes/send_date.yml"
+
+      mail_type:
+        $ref: "../../../shared/attributes/mail_type.yml"
+
+      color:
+        $ref: "../attributes/color.yml"
+
+      double_sided:
+        $ref: "../attributes/double_sided.yml"
+
+      address_placement:
+        $ref: "../attributes/address_placement.yml"
+
+      return_envelope:
+        $ref: "../attributes/return_envelope.yml#/returned"
+
+      perforated_page:
+        type: integer
+        description: >-
+          Required if `return_envelope` is `true`. The number of the page that should be
+          perforated for use with the return envelope. Must be greater than or equal
+          to `1`. The blank page added by `address_placement=insert_blank_page` will be
+          ignored when considering the perforated page number. To see how
+          perforation will impact your letter design, view our <a href="https://s3-us-west-2.amazonaws.com/public.lob.com/assets/templates/letter_perf_template.pdf" target="_blank">perforation guide</a>.
+        nullable: true
+
+      custom_envelope:
+        $ref: "../attributes/custom_envelope.yml#/returned"
+
   - $ref: "letter_generated_base.yml"

resources/letters/models/letter.yml

@@ -1,9 +1,12 @@
 oneOf:
-  - title: certified
-    $ref: "certified.yml"
+  - allOf:
+    - title: regular
+    - $ref: "no_extra_service.yml"
 
-  - title: registered
-    $ref: "registered.yml"
+  - allOf:
+    - title: registered
+    - $ref: "registered.yml"
 
-  - title: regular
-    $ref: "no_extra_service.yml"
+  - allOf:
+    - title: certified
+    - $ref: "certified.yml"

resources/letters/models/no_extra_service.yml

@@ -1,6 +1,10 @@
 allOf:
   - type: object
 
+    required:
+      - color
+
+
     properties:
       tracking_events:
         description: An array of tracking events ordered by ascending `time`.
@@ -17,6 +21,45 @@ allOf:
 
       return_address:
         $ref: "../attributes/return_address.yml"
+
+      description:
+        $ref: "../../../shared/attributes/resource_description.yml"
+
+      metadata:
+        $ref: "../../../shared/models/metadata.yml"
+
+      merge_variables:
+        $ref: "../../../shared/models/merge_variables.yml"
+
+      send_date:
+        $ref: "../../../shared/attributes/send_date.yml"
+
+      mail_type:
+        $ref: "../../../shared/attributes/mail_type.yml"
+
+      color:
+        $ref: "../attributes/color.yml"
+
+      double_sided:
+        $ref: "../attributes/double_sided.yml"
+
+      address_placement:
+        $ref: "../attributes/address_placement.yml"
+
+      return_envelope:
+        $ref: "../attributes/return_envelope.yml#/returned"
+
+      perforated_page:
+        type: integer
+        description: >-
+          Required if `return_envelope` is `true`. The number of the page that should be
+          perforated for use with the return envelope. Must be greater than or equal
+          to `1`. The blank page added by `address_placement=insert_blank_page` will be
+          ignored when considering the perforated page number. To see how
+          perforation will impact your letter design, view our <a href="https://s3-us-west-2.amazonaws.com/public.lob.com/assets/templates/letter_perf_template.pdf" target="_blank">perforation guide</a>.
+        nullable: true
+
+      custom_envelope:
+        $ref: "../attributes/custom_envelope.yml#/returned"
 
-  - $ref: "letter_base.yml"
   - $ref: "letter_generated_base.yml"

resources/letters/models/registered.yml

@@ -3,6 +3,7 @@ allOf:
 
     required:
       - extra_service
+      - color
 
     properties:
       extra_service:
@@ -31,5 +32,45 @@ allOf:
       return_address:
         $ref: "../attributes/return_address.yml"
 
-  - $ref: "letter_base.yml"
+
+      description:
+        $ref: "../../../shared/attributes/resource_description.yml"
+
+      metadata:
+        $ref: "../../../shared/models/metadata.yml"
+
+      merge_variables:
+        $ref: "../../../shared/models/merge_variables.yml"
+
+      send_date:
+        $ref: "../../../shared/attributes/send_date.yml"
+
+      mail_type:
+        $ref: "../../../shared/attributes/mail_type.yml"
+
+      color:
+        $ref: "../attributes/color.yml"
+
+      double_sided:
+        $ref: "../attributes/double_sided.yml"
+
+      address_placement:
+        $ref: "../attributes/address_placement.yml"
+
+      return_envelope:
+        $ref: "../attributes/return_envelope.yml#/returned"
+
+      perforated_page:
+        type: integer
+        description: >-
+          Required if `return_envelope` is `true`. The number of the page that should be
+          perforated for use with the return envelope. Must be greater than or equal
+          to `1`. The blank page added by `address_placement=insert_blank_page` will be
+          ignored when considering the perforated page number. To see how
+          perforation will impact your letter design, view our <a href="https://s3-us-west-2.amazonaws.com/public.lob.com/assets/templates/letter_perf_template.pdf" target="_blank">perforation guide</a>.
+        nullable: true
+
+      custom_envelope:
+        $ref: "../attributes/custom_envelope.yml#/returned"
+
   - $ref: "letter_generated_base.yml"