Skip to content

Commit fe87fd5

Browse files
committed
fix(storage): optional fields
1 parent bcf2230 commit fe87fd5

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

Sources/Storage/Bucket.swift

+13-8
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@ import Foundation
33
public struct Bucket: Identifiable, Hashable, Codable, Sendable {
44
public var id: String
55
public var name: String
6-
public var owner: String
7-
public var isPublic: Bool
8-
public var createdAt: Date
9-
public var updatedAt: Date
6+
public var owner: String?
7+
public var isPublic: Bool?
8+
public var createdAt: Date?
9+
public var updatedAt: Date?
1010
public var allowedMimeTypes: [String]?
11-
public var fileSizeLimit: Int?
11+
public var fileSizeLimit: Int64?
1212

1313
public init(
14-
id: String, name: String, owner: String, isPublic: Bool, createdAt: Date, updatedAt: Date,
15-
allowedMimeTypes: [String]?,
16-
fileSizeLimit: Int?
14+
id: String,
15+
name: String,
16+
owner: String? = nil,
17+
isPublic: Bool? = nil,
18+
createdAt: Date? = nil,
19+
updatedAt: Date? = nil,
20+
allowedMimeTypes: [String]? = nil,
21+
fileSizeLimit: Int64? = nil
1722
) {
1823
self.id = id
1924
self.name = name

Sources/Storage/FileObject.swift

+8-12
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@ import Foundation
22
import Helpers
33

44
public struct FileObject: Identifiable, Hashable, Codable, Sendable {
5-
public var name: String
5+
public var name: String?
66
public var bucketId: String?
77
public var owner: String?
8-
public var id: String?
8+
public var id: UUID
99
public var updatedAt: Date?
1010
public var createdAt: Date?
1111
public var lastAccessedAt: Date?
1212
public var metadata: [String: AnyJSON]?
13-
public var buckets: Bucket?
1413

1514
public init(
16-
name: String,
15+
name: String? = nil,
1716
bucketId: String? = nil,
1817
owner: String? = nil,
19-
id: String,
20-
updatedAt: Date,
21-
createdAt: Date,
22-
lastAccessedAt: Date,
23-
metadata: [String: AnyJSON],
24-
buckets: Bucket? = nil
18+
id: UUID,
19+
updatedAt: Date? = nil,
20+
createdAt: Date? = nil,
21+
lastAccessedAt: Date? = nil,
22+
metadata: [String: AnyJSON]? = nil
2523
) {
2624
self.name = name
2725
self.bucketId = bucketId
@@ -31,7 +29,6 @@ public struct FileObject: Identifiable, Hashable, Codable, Sendable {
3129
self.createdAt = createdAt
3230
self.lastAccessedAt = lastAccessedAt
3331
self.metadata = metadata
34-
self.buckets = buckets
3532
}
3633

3734
enum CodingKeys: String, CodingKey {
@@ -43,6 +40,5 @@ public struct FileObject: Identifiable, Hashable, Codable, Sendable {
4340
case createdAt = "created_at"
4441
case lastAccessedAt = "last_accessed_at"
4542
case metadata
46-
case buckets
4743
}
4844
}

0 commit comments

Comments
 (0)