allow returning expanded editors in editgroups and annotations

5 files changed, 101 insertions, 1 deletions

diff --git a/fatcat-openapi2.yml b/fatcat-openapi2.yml
index 61f895fa..c621c39f 100644
--- a/fatcat-openapi2.yml
+++ b/fatcat-openapi2.yml
@@ -465,6 +465,8 @@ definitions:
         <<: *FATCATIDENT
       editor_id:
         <<: *FATCATIDENT
+      editor:
+        $ref: "#/definitions/editor"
       submitted:
         type: string
         format: date-time
@@ -517,6 +519,8 @@ definitions:
         <<: *FATCATIDENT
       editor_id:
         <<: *FATCATIDENT
+      editor:
+        $ref: "#/definitions/editor"
       created:
         type: string
         format: date-time
diff --git a/rust/fatcat-api-spec/README.md b/rust/fatcat-api-spec/README.md
index cb7815d2..d56747df 100644
--- a/rust/fatcat-api-spec/README.md
+++ b/rust/fatcat-api-spec/README.md
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
 - API version: 0.1.0
-- Build date: 2019-01-11T05:35:09.223Z
+- Build date: 2019-01-11T22:05:57.895Z
 
 This autogenerated project defines an API crate `fatcat` which contains:
 * An `Api` trait defining the API in Rust.
diff --git a/rust/fatcat-api-spec/api.yaml b/rust/fatcat-api-spec/api.yaml
index 61f895fa..c621c39f 100644
--- a/rust/fatcat-api-spec/api.yaml
+++ b/rust/fatcat-api-spec/api.yaml
@@ -465,6 +465,8 @@ definitions:
         <<: *FATCATIDENT
       editor_id:
         <<: *FATCATIDENT
+      editor:
+        $ref: "#/definitions/editor"
       submitted:
         type: string
         format: date-time
@@ -517,6 +519,8 @@ definitions:
         <<: *FATCATIDENT
       editor_id:
         <<: *FATCATIDENT
+      editor:
+        $ref: "#/definitions/editor"
       created:
         type: string
         format: date-time
diff --git a/rust/fatcat-api-spec/api/swagger.yaml b/rust/fatcat-api-spec/api/swagger.yaml
index bf6d32dc..1f9e21d6 100644
--- a/rust/fatcat-api-spec/api/swagger.yaml
+++ b/rust/fatcat-api-spec/api/swagger.yaml
@@ -8096,6 +8096,12 @@ definitions:
         $ref: "#/definitions/changelog_entry"
     example:
       editgroup:
+        editor:
+          is_admin: true
+          is_active: true
+          editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+          is_bot: true
+          username: "zerocool93"
         submitted: "2000-01-23T04:56:07.000+00:00"
         extra: "{}"
         edits:
@@ -8208,12 +8214,24 @@ definitions:
         description: "description"
         annotations:
         - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+          editor:
+            is_admin: true
+            is_active: true
+            editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+            is_bot: true
+            username: "zerocool93"
           created: "2000-01-23T04:56:07.000+00:00"
           extra: "{}"
           editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
           editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
           comment_markdown: "comment_markdown"
         - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+          editor:
+            is_admin: true
+            is_active: true
+            editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+            is_bot: true
+            username: "zerocool93"
           created: "2000-01-23T04:56:07.000+00:00"
           extra: "{}"
           editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
@@ -8230,6 +8248,12 @@ definitions:
         revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
       changelog_entry:
         editgroup:
+          editor:
+            is_admin: true
+            is_active: true
+            editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+            is_bot: true
+            username: "zerocool93"
           submitted: "2000-01-23T04:56:07.000+00:00"
           extra: "{}"
           edits:
@@ -8342,12 +8366,24 @@ definitions:
           description: "description"
           annotations:
           - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+            editor:
+              is_admin: true
+              is_active: true
+              editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+              is_bot: true
+              username: "zerocool93"
             created: "2000-01-23T04:56:07.000+00:00"
             extra: "{}"
             editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
             editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
             comment_markdown: "comment_markdown"
           - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+            editor:
+              is_admin: true
+              is_active: true
+              editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+              is_bot: true
+              username: "zerocool93"
             created: "2000-01-23T04:56:07.000+00:00"
             extra: "{}"
             editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
@@ -8463,6 +8499,8 @@ definitions:
         minLength: 26
         maxLength: 26
         pattern: "[a-zA-Z2-7]{26}"
+      editor:
+        $ref: "#/definitions/editor"
       submitted:
         type: "string"
         format: "date-time"
@@ -8477,6 +8515,12 @@ definitions:
       edits:
         $ref: "#/definitions/editgroup_edits"
     example:
+      editor:
+        is_admin: true
+        is_active: true
+        editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+        is_bot: true
+        username: "zerocool93"
       submitted: "2000-01-23T04:56:07.000+00:00"
       extra: "{}"
       edits:
@@ -8589,12 +8633,24 @@ definitions:
       description: "description"
       annotations:
       - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+        editor:
+          is_admin: true
+          is_active: true
+          editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+          is_bot: true
+          username: "zerocool93"
         created: "2000-01-23T04:56:07.000+00:00"
         extra: "{}"
         editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
         editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
         comment_markdown: "comment_markdown"
       - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+        editor:
+          is_admin: true
+          is_active: true
+          editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+          is_bot: true
+          username: "zerocool93"
         created: "2000-01-23T04:56:07.000+00:00"
         extra: "{}"
         editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
@@ -8626,6 +8682,8 @@ definitions:
         minLength: 26
         maxLength: 26
         pattern: "[a-zA-Z2-7]{26}"
+      editor:
+        $ref: "#/definitions/editor"
       created:
         type: "string"
         format: "date-time"
@@ -8635,6 +8693,12 @@ definitions:
         type: "object"
     example:
       annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+      editor:
+        is_admin: true
+        is_active: true
+        editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+        is_bot: true
+        username: "zerocool93"
       created: "2000-01-23T04:56:07.000+00:00"
       extra: "{}"
       editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
@@ -8661,6 +8725,12 @@ definitions:
         $ref: "#/definitions/editgroup"
     example:
       editgroup:
+        editor:
+          is_admin: true
+          is_active: true
+          editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+          is_bot: true
+          username: "zerocool93"
         submitted: "2000-01-23T04:56:07.000+00:00"
         extra: "{}"
         edits:
@@ -8773,12 +8843,24 @@ definitions:
         description: "description"
         annotations:
         - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+          editor:
+            is_admin: true
+            is_active: true
+            editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+            is_bot: true
+            username: "zerocool93"
           created: "2000-01-23T04:56:07.000+00:00"
           extra: "{}"
           editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
           editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
           comment_markdown: "comment_markdown"
         - annotation_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe"
+          editor:
+            is_admin: true
+            is_active: true
+            editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
+            is_bot: true
+            username: "zerocool93"
           created: "2000-01-23T04:56:07.000+00:00"
           extra: "{}"
           editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y"
diff --git a/rust/fatcat-api-spec/src/models.rs b/rust/fatcat-api-spec/src/models.rs
index d07aa320..1738662b 100644
--- a/rust/fatcat-api-spec/src/models.rs
+++ b/rust/fatcat-api-spec/src/models.rs
@@ -234,6 +234,10 @@ pub struct Editgroup {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub editor_id: Option<String>,
 
+    #[serde(rename = "editor")]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub editor: Option<models::Editor>,
+
     #[serde(rename = "submitted")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub submitted: Option<chrono::DateTime<chrono::Utc>>,
@@ -260,6 +264,7 @@ impl Editgroup {
         Editgroup {
             editgroup_id: None,
             editor_id: None,
+            editor: None,
             submitted: None,
             description: None,
             extra: None,
@@ -286,6 +291,10 @@ pub struct EditgroupAnnotation {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub editor_id: Option<String>,
 
+    #[serde(rename = "editor")]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub editor: Option<models::Editor>,
+
     #[serde(rename = "created")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub created: Option<chrono::DateTime<chrono::Utc>>,
@@ -305,6 +314,7 @@ impl EditgroupAnnotation {
             annotation_id: None,
             editgroup_id: None,
             editor_id: None,
+            editor: None,
             created: None,
             comment_markdown: None,
             extra: None,