Skip to content

Fix DatabasePropertyFilter.select #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rock88 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix DatabasePropertyFilter.select #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Sources/NotionSwift/Models/Request/Filter/DatabasePropertyFilter+Encodable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,25 @@ extension DatabasePropertyFilter.StatusCondition: Encodable {
}
}

extension DatabasePropertyFilter.SelectCondition: Encodable {
enum CodingKeys: String, CodingKey {
case equals
case doesNotEqual = "does_not_equal"
case isEmpty = "is_empty"
case isNotEmpty = "is_not_empty"
}

public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
switch self {
case .equals(let value):
try container.encode(value, forKey: .equals)
case .doesNotEqual(let value):
try container.encode(value, forKey: .doesNotEqual)
case .isEmpty:
try container.encode(true, forKey: .isEmpty)
case .isNotEmpty:
try container.encode(true, forKey: .isNotEmpty)
}
}
}
11 changes: 10 additions & 1 deletion Sources/NotionSwift/Models/Request/Filter/DatabasePropertyFilter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extension DatabasePropertyFilter {
case phoneNumber(TextCondition)
case number(NumberCondition)
case checkbox(CheckboxCondition)
case select(SimpleGenericCondition<String>)
case select(SelectCondition)
case multiSelect(SimpleGenericCondition<String>)
case date(DateCondition)
case createdTime(DateCondition)
Expand Down Expand Up @@ -118,3 +118,12 @@ extension DatabasePropertyFilter {
case isNotEmpty
}
}

extension DatabasePropertyFilter {
public enum SelectCondition {
case equals(String)
case doesNotEqual(String)
case isEmpty
case isNotEmpty
}
}