updated File model spec

IanKeen · Jul 20, 2016 · 0b5b741 · 0b5b741
1 parent a21d28e
commit 0b5b741
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/Sources/Models/Builders/File+Builder.swift b/Sources/Models/Builders/File+Builder.swift
@@ -10,26 +10,26 @@ extension File: SlackModelType {
     public static func make(with builder: SlackModelBuilder) throws -> File {
         return try tryMake(File(
             id:                     try builder.property("id"),
-            created:                try builder.property("created"),
+            created:                builder.optionalProperty("created"),
             name:                   builder.optionalProperty("name"),
-            title:                  try builder.property("title"),
-            mimetype:               try builder.property("mimetype"),
-            filetype:               try builder.property("filetype"),
-            pretty_type:            try builder.property("pretty_type"),
-            user:                   try builder.slackModel("user"),
-            mode:                   try builder.property("mode"),
+            title:                  builder.optionalProperty("title"),
+            mimetype:               builder.optionalProperty("mimetype"),
+            filetype:               builder.optionalProperty("filetype"),
+            pretty_type:            builder.optionalProperty("pretty_type"),
+            user:                   try builder.optionalSlackModel("user"),
+            mode:                   try builder.optionalProperty("mode"),
             editable:               builder.property("editable"),
             is_external:            builder.property("is_external"),
             is_public:              builder.property("is_public"),
-            external_type:          try builder.property("external_type"),
-            username:               try builder.property("username"),
-            size:                   try builder.property("size"),
+            external_type:          builder.optionalProperty("external_type"),
+            username:               builder.optionalProperty("username"),
+            size:                   builder.optionalProperty("size"),
             updated:                builder.optionalProperty("updated"),
             editor:                 try builder.optionalSlackModel("editor"),
             last_editor:            try builder.optionalSlackModel("last_editor"),
             state:                  builder.optionalProperty("state"),
-            url_private:            try builder.property("url_private"),
-            url_private_download:   try builder.property("url_private_download"),
+            url_private:            builder.optionalProperty("url_private"),
+            url_private_download:   builder.optionalProperty("url_private_download"),
             thumb_64:               builder.optionalProperty("thumb_64"),
             thumb_80:               builder.optionalProperty("thumb_80"),
             thumb_360:              builder.optionalProperty("thumb_360"),
@@ -40,8 +40,8 @@ extension File: SlackModelType {
             thumb_480_w:            builder.optionalProperty("thumb_480_w"),
             thumb_480_h:            builder.optionalProperty("thumb_480_h"),
             thumb_160:              builder.optionalProperty("thumb_160"),
-            permalink:              try builder.property("permalink"),
-            permalink_public:       try builder.property("permalink_public"),
+            permalink:              builder.optionalProperty("permalink"),
+            permalink_public:       builder.optionalProperty("permalink_public"),
             edit_link:              builder.optionalProperty("edit_link"),
             preview:                builder.optionalProperty("preview"),
             preview_highlight:      builder.optionalProperty("preview_highlight"),
@@ -57,7 +57,7 @@ extension File: SlackModelType {
             is_starred:             builder.optionalProperty("is_starred"),
             pinned_to:              try builder.optionalSlackModels("pinned_to"),
             reactions:              try builder.optionalCollection("reactions"),
-            comments_count:         try builder.property("comments_count")
+            comments_count:         builder.optionalProperty("comments_count")
             )
         )
     }

diff --git a/Sources/Models/File.swift b/Sources/Models/File.swift
@@ -8,28 +8,28 @@
 
 public struct File {
     let id: String
-    let created: Int
+    let created: Int?
     let name: String?
-    let title: String
-    let mimetype: String
-    let filetype: String
-    let pretty_type: String
-    let user: User
-    let mode: Mode
+    let title: String?
+    let mimetype: String?
+    let filetype: String?
+    let pretty_type: String?
+    let user: User?
+    let mode: Mode?
     let editable: Bool
     let is_external: Bool
     let is_public: Bool
-    let external_type: String
-    let username: String
-    let size: Int
+    let external_type: String?
+    let username: String?
+    let size: Int?
 
     let updated: Int?
     let editor: User?
     let last_editor: User?
     let state: String?
 
-    let url_private: String
-    let url_private_download: String
+    let url_private: String?
+    let url_private_download: String?
     let thumb_64: String?
     let thumb_80: String?
     let thumb_360: String?
@@ -40,8 +40,8 @@ public struct File {
     let thumb_480_w: Int?
     let thumb_480_h: Int?
     let thumb_160: String?
-    let permalink: String
-    let permalink_public: String
+    let permalink: String?
+    let permalink_public: String?
     let edit_link: String?
 
     let preview: String?
@@ -56,13 +56,13 @@ public struct File {
     let groups: [Group]
     let ims: [IM]
 
-    let initial_comment: AnyObject?
+    let initial_comment: AnyObject? //TODO
     let num_stars: Int?
     let is_starred: Bool?
     let pinned_to: [Target]?
 
     let reactions: [Reaction]?
-    let comments_count: Int
+    let comments_count: Int?
 }
 
 public extension File {