notion_ruby_mapping 0.6.6 → 0.6.8

data/lib/notion_ruby_mapping/properties/date_base_property.rb

@@ -34,7 +34,7 @@ module NotionRubyMapping
     def self.start_end_time(date)
       ds = date.iso8601
       tz = Time.now.strftime "%:z"
-      %w[00:00:00 23:59:59].map {|t| [ds, "T", t, tz].join("") }
+      %w[00:00:00 23:59:59].map { |t| [ds, "T", t, tz].join("") }
     end
 
     # @param [Date, Time, DateTime, String, nil] obj
@@ -44,119 +44,121 @@ module NotionRubyMapping
       Date.parse str if str
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#5f07c4ebc4744986bfc99a43827349fc
-    def filter_equals(date, rollup = nil, rollup_type = nil)
+    def filter_equals(date, condition: nil, another_type: nil)
       if date.is_a? Date
         start_date, end_date = self.class.start_end_time date
-        if rollup
-          filter_after(start_date, rollup, rollup_type)
-            .and(filter_before(end_date, rollup, rollup_type))
+        if condition
+          filter_after(start_date, condition: condition, another_type: another_type)
+            .and(filter_before(end_date, condition: condition, another_type: another_type))
         else
-          filter_after(start_date).and(filter_before end_date)
+          filter_after(start_date, another_type: another_type)
+            .and(filter_before(end_date, another_type: another_type))
         end
       else
-        make_filter_query "equals", value_str(date), rollup, rollup_type
+        make_filter_query "equals", value_str(date), condition: condition, another_type: another_type
       end
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_does_not_equal(date, rollup = nil, rollup_type = nil)
+    def filter_does_not_equal(date, condition: nil, another_type: nil)
       if date.is_a? Date
         start_date, end_date = self.class.start_end_time date
-        if rollup
-          filter_before(start_date, rollup, rollup_type)
-            .or(filter_after(end_date, rollup, rollup_type))
+        if condition
+          filter_before(start_date, condition: condition, another_type: another_type)
+            .or(filter_after(end_date, condition: condition, another_type: another_type))
         else
-          filter_before(start_date).or(filter_after(end_date))
+          filter_before(start_date, another_type: another_type)
+            .or(filter_after(end_date, another_type: another_type))
         end
       else
-        make_filter_query "does_not_equal", value_str(date), rollup, rollup_type
+        make_filter_query "does_not_equal", value_str(date), condition: condition, another_type: another_type
       end
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#841815bfaf684964bebf3fa6712ae26c
-    def filter_before(date, rollup = nil, rollup_type = nil)
-      make_filter_query "before", value_str(date, start_time: true), rollup, rollup_type
+    def filter_before(date, condition: nil, another_type: nil)
+      make_filter_query "before", value_str(date, start_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#c0ea140866ea46f9a746b24773dc821c
-    def filter_after(date, rollup = nil, rollup_type = nil)
-      make_filter_query "after", value_str(date, end_time: true), rollup, rollup_type
+    def filter_after(date, condition: nil, another_type: nil)
+      make_filter_query "after", value_str(date, end_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#6a20ade0ee964aad81aae4c08ea29d6b
-    def filter_on_or_before(date, rollup = nil, rollup_type = nil)
-      make_filter_query "on_or_before", value_str(date, end_time: true), rollup, rollup_type
+    def filter_on_or_before(date, condition: nil, another_type: nil)
+      make_filter_query "on_or_before", value_str(date, end_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#1469e3fb3068426a8ea8492d191d1563
-    def filter_on_or_after(date, rollup = nil, rollup_type = nil)
-      make_filter_query "on_or_after", value_str(date, start_time: true), rollup, rollup_type
+    def filter_on_or_after(date, condition: nil, another_type: nil)
+      make_filter_query "on_or_after", value_str(date, start_time: true), condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#707e7e848dc9417998420b65024542db
-    def filter_past_week(rollup = nil, rollup_type = nil)
-      make_filter_query "past_week", {}, rollup, rollup_type
+    def filter_past_week(condition: nil, another_type: nil)
+      make_filter_query "past_week", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#7b2d05c549204c2eb68d95020d7b97c5
-    def filter_past_month(rollup = nil, rollup_type = nil)
-      make_filter_query "past_month", {}, rollup, rollup_type
+    def filter_past_month(condition: nil, another_type: nil)
+      make_filter_query "past_month", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#9c8bf0a2398a41c8a0714a62afca3aa8
-    def filter_past_year(rollup = nil, rollup_type = nil)
-      make_filter_query "past_year", {}, rollup, rollup_type
+    def filter_past_year(condition: nil, another_type: nil)
+      make_filter_query "past_year", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#d9dc189ee8244ba8a6c863259eaa9984
-    def filter_next_week(rollup = nil, rollup_type = nil)
-      make_filter_query "next_week", {}, rollup, rollup_type
+    def filter_next_week(condition: nil, another_type: nil)
+      make_filter_query "next_week", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#0edb4dffbe6b403882255e870cc71066
-    def filter_next_month(rollup = nil, rollup_type = nil)
-      make_filter_query "next_month", {}, rollup, rollup_type
+    def filter_next_month(condition: nil, another_type: nil)
+      make_filter_query "next_month", {}, condition: condition, another_type: another_type
     end
 
-    # @param [String] rollup Rollup name
-    # @param [String] rollup_type Rollup type
+    # @param [String] condition Rollup name
+    # @param [String] another_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#b59c73dd4b1a488f95d3e8cd19853709
-    def filter_next_year(rollup = nil, rollup_type = nil)
-      make_filter_query "next_year", {}, rollup, rollup_type
+    def filter_next_year(condition: nil, another_type: nil)
+      make_filter_query "next_year", {}, condition: condition, another_type: another_type
     end
 
     # @param [Date, Time, DateTime, String, nil] obj

data/lib/notion_ruby_mapping/properties/date_property.rb

@@ -29,8 +29,8 @@ module NotionRubyMapping
     def end_date=(edt)
       assert_page_property __method__
       @will_update = true
-      sdt = start_date
-      edt = nil if sdt.class != edt.class || sdt > edt
+      # sdt = start_date
+      # edt = nil if sdt.class != edt.class || sdt > edt
       @json["end"] = edt
     end
 
@@ -46,8 +46,8 @@ module NotionRubyMapping
     def start_date=(sdt)
       assert_page_property __method__
       @will_update = true
-      edt = end_date
-      @json["end"] = nil if sdt.class != edt.class || sdt > edt
+      # edt = end_date
+      # @json["end"] = nil if sdt.class != edt.class || sdt > edt
       @json["start"] = sdt
     end
 
@@ -75,8 +75,10 @@ module NotionRubyMapping
     # @param [Date, Time, DateTime, String, nil] start_date
     # @param [Date, Time, DateTime, String, nil] end_date
     # @param [String, nil] time_zone
-    def initialize(name, will_update: false, base_type: :page, json: nil, start_date: nil, end_date: nil, time_zone: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, start_date: nil, end_date: nil,
+                   time_zone: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || {}
       return if database?
 

data/lib/notion_ruby_mapping/properties/email_property.rb

@@ -32,8 +32,9 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || {}
     end
 

data/lib/notion_ruby_mapping/properties/files_property.rb

@@ -33,8 +33,10 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] files files value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, files: [], property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, files: [], property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       if database?
         @files = json || {}
       elsif json

data/lib/notion_ruby_mapping/properties/formula_property.rb

@@ -41,8 +41,10 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || {}
       return unless database?
 

data/lib/notion_ruby_mapping/properties/last_edited_by_property.rb

@@ -22,8 +22,10 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = if database?
                 json || {}
               else

data/lib/notion_ruby_mapping/properties/last_edited_time_property.rb

@@ -21,8 +21,9 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] json last_edited_time value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json
       @json ||= {} if database?
     end

data/lib/notion_ruby_mapping/properties/multi_select_property.rb

@@ -61,8 +61,10 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash] json
     # @param [Array<String>, String] multi_select
-    def initialize(name, will_update: false, base_type: :page, json: nil, multi_select: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, multi_select: nil,
+                   property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       if database?
         @json = json || {"options" => []}
       else

data/lib/notion_ruby_mapping/properties/number_property.rb

@@ -12,7 +12,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @return [Numeric, Hash]
+    # @return [Numeric, Hash, nil]
     # @see https://www.notion.so/hkob/NumberProperty-964ebc1948074d7ca8340187aa352d40#571b41dd33ae42039e6b982a502b7ac7
     def number
       @json
@@ -53,8 +53,10 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [Float, Integer, Hash] json Number value or format Hash
-    def initialize(name, will_update: false, base_type: :page, json: nil, format: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, format: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json
       @json ||= {"format" => (format || "number")} if database?
     end

data/lib/notion_ruby_mapping/properties/people_property.rb

@@ -40,14 +40,22 @@ module NotionRubyMapping
     ## Common methods
 
     def self.people_from_json(json)
-      List.new(json: json, property: self).select { true }
+      if json.is_a? Array
+        json.map { |sub_json| UserObject.new json: sub_json }
+      elsif json["object"] == "list"
+        List.new(json: json, type: :property, value: self).select { true }
+      else
+        json["people"].map { |sub_json| UserObject.new json: sub_json }
+      end
     end
 
     # @param [String] name
     # @param [Hash] json
     # @param [Array] people ids for people
-    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil, property_cache: nil, query: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil, property_id: nil,
+                   property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @json = if database?
                 {}
               elsif people

data/lib/notion_ruby_mapping/properties/phone_number_property.rb

@@ -34,8 +34,9 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+            property_cache: property_cache
       @json = database? ? {} : json
     end
 

data/lib/notion_ruby_mapping/properties/property.rb

@@ -76,18 +76,23 @@ module NotionRubyMapping
       elsif type == "property_item"
         tmp = new name, property_id: input_json["property_item"]["id"], base_type: base_type,
                   property_cache: property_cache, query: query
-        objects = List.new(json: input_json, property: tmp, query: query).select { true }
+        objects = List.new(json: input_json, type: :property, value: tmp, query: query).to_a
         case input_json["property_item"]["type"]
         when "people"
-          PeopleProperty.new name, people: objects, base_type: base_type, property_cache: property_cache, query: query
+          PeopleProperty.new name, people: objects, base_type: base_type,
+                             property_cache: property_cache, query: query
         when "relation"
-          RelationProperty.new name, relation: objects, base_type: base_type, property_cache: property_cache, query: query
+          RelationProperty.new name, relation: objects, base_type: base_type,
+                               property_cache: property_cache, query: query
         when "rich_text"
-          RichTextProperty.new name, text_objects: objects, base_type: base_type, property_cache: property_cache, query: query
+          RichTextProperty.new name, text_objects: objects, base_type: base_type,
+                               property_cache: property_cache, query: query
         when "rollup"
-          RollupProperty.new name, json: objects, base_type: base_type, property_cache: property_cache, query: query
+          RollupProperty.new name, json: objects, base_type: base_type,
+                             property_cache: property_cache, query: query
         when "title"
-          TitleProperty.new name, text_objects: objects, base_type: base_type, property_cache: property_cache, query: query
+          TitleProperty.new name, text_objects: objects, base_type: base_type,
+                            property_cache: property_cache, query: query
         end
       else
         klass = {
@@ -114,7 +119,8 @@ module NotionRubyMapping
         }[type]
         raise StandardError, "Irregular property type: #{type}" unless klass
 
-        klass.new name, json: input_json[type], base_type: base_type, property_cache: property_cache
+        klass.new name, property_id: input_json["id"], json: input_json[type], base_type: base_type,
+                  property_cache: property_cache
       end
     end
 
@@ -136,11 +142,13 @@ module NotionRubyMapping
     # @param [String] key query parameter
     # @param [Object] value query value
     # @return [NotionRubyMapping::Query] generated Query object
-    def make_filter_query(key, value, rollup = nil, rollup_type = nil)
-      if rollup
-        Query.new filter: {"property" => @name, rollup => {rollup_type => {key => value}}}
-      elsif rollup_type
-        Query.new filter: {"property" => @name, rollup_type => {key => value}}
+    def make_filter_query(key, value, condition: nil, another_type: nil)
+      if is_a? FormulaProperty
+        Query.new filter: {"property" => @name, "formula" => {another_type => {key => value}}}
+      elsif condition
+        Query.new filter: {"property" => @name, condition => {another_type => {key => value}}}
+      elsif another_type
+        Query.new filter: {"property" => @name, another_type => {key => value}}
       elsif @name == "__timestamp__"
         Query.new filter: {"timestamp" => type, type => {key => value}}
       else
@@ -229,8 +237,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#5f07c4ebc4744986bfc99a43827349fc
-    def filter_equals(value, rollup = nil, rollup_type = nil)
-      make_filter_query "equals", value, rollup, rollup_type
+    def filter_equals(value, condition: nil, another_type: nil)
+      make_filter_query "equals", value, condition: condition, another_type: another_type
     end
 
     # @param [String, Number] value Query value
@@ -238,8 +246,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#a44a1875c3ef49f2b4f817291953a1d4
-    def filter_does_not_equal(value, rollup = nil, rollup_type = nil)
-      make_filter_query "does_not_equal", value, rollup, rollup_type
+    def filter_does_not_equal(value, condition: nil, another_type: nil)
+      make_filter_query "does_not_equal", value, condition: condition, another_type: another_type
     end
   end
 
@@ -252,8 +260,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#271a2ebaa1ec48acae732ca98920feab
-    def filter_contains(value, rollup = nil, rollup_type = nil)
-      make_filter_query "contains", value, rollup, rollup_type
+    def filter_contains(value, condition: nil, another_type: nil)
+      make_filter_query "contains", value, condition: condition, another_type: another_type
     end
 
     # @param [String] value Query value
@@ -261,8 +269,8 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#b0328e3b146f48a4ad4c9c2ee5363486
-    def filter_does_not_contain(value, rollup = nil, rollup_type = nil)
-      make_filter_query "does_not_contain", value, rollup, rollup_type
+    def filter_does_not_contain(value, condition: nil, another_type: nil)
+      make_filter_query "does_not_contain", value, condition: condition, another_type: another_type
     end
   end
 
@@ -275,16 +283,16 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/EmailProperty-39aeb5df56ea4cc1b9380574e4fdeec0#d3e098b2f38c4c8c9d3e815516cfd953
-    def filter_starts_with(value, rollup = nil, rollup_type = nil)
-      make_filter_query "starts_with", value, rollup, rollup_type
+    def filter_starts_with(value, condition: nil, another_type: nil)
+      make_filter_query "starts_with", value, condition: condition, another_type: another_type
     end
 
     # @param [String] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_ends_with(value, rollup = nil, rollup_type = nil)
-      make_filter_query "ends_with", value, rollup, rollup_type
+    def filter_ends_with(value, condition: nil, another_type: nil)
+      make_filter_query "ends_with", value, condition: condition, another_type: another_type
     end
   end
 
@@ -296,16 +304,16 @@ module NotionRubyMapping
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#38749dfae0854c68b4c55095d3efbff1
-    def filter_is_empty(rollup = nil, rollup_type = nil)
-      make_filter_query "is_empty", true, rollup, rollup_type
+    def filter_is_empty(condition: nil, another_type: nil)
+      make_filter_query "is_empty", true, condition: condition, another_type: another_type
     end
 
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedByProperty-945fa6be1c014da2b7e55a2b76e37b57#515659ea52b54fb48c81b813f3b705f6
-    def filter_is_not_empty(rollup = nil, rollup_type = nil)
-      make_filter_query "is_not_empty", true, rollup, rollup_type
+    def filter_is_not_empty(condition: nil, another_type: nil)
+      make_filter_query "is_not_empty", true, condition: condition, another_type: another_type
     end
   end
 
@@ -317,32 +325,32 @@ module NotionRubyMapping
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_greater_than(value, rollup = nil, rollup_type = nil)
-      make_filter_query "greater_than", value, rollup, rollup_type
+    def filter_greater_than(value, condition: nil, another_type: nil)
+      make_filter_query "greater_than", value, condition: condition, another_type: another_type
     end
 
     # @param [Number] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_less_than(value, rollup = nil, rollup_type = nil)
-      make_filter_query "less_than", value, rollup, rollup_type
+    def filter_less_than(value, condition: nil, another_type: nil)
+      make_filter_query "less_than", value, condition: condition, another_type: another_type
     end
 
     # @param [Number] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_greater_than_or_equal_to(value, rollup = nil, rollup_type = nil)
-      make_filter_query "greater_than_or_equal_to", value, rollup, rollup_type
+    def filter_greater_than_or_equal_to(value, condition: nil, another_type: nil)
+      make_filter_query "greater_than_or_equal_to", value, condition: condition, another_type: another_type
     end
 
     # @param [Number] value Query value
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
-    def filter_less_than_or_equal_to(value, rollup = nil, rollup_type = nil)
-      make_filter_query "less_than_or_equal_to", value, rollup, rollup_type
+    def filter_less_than_or_equal_to(value, condition: nil, another_type: nil)
+      make_filter_query "less_than_or_equal_to", value, condition: condition, another_type: another_type
     end
   end
 end

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -9,7 +9,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @return [Hash, Array]
+    # @return [Hash, Array, nil]
     # @see https://www.notion.so/hkob/RelationProperty-f608ab41a1f0476b98456620346fba03#6c14207b2d1340d2bbc08d17eee2cb22
     def relation
       @json
@@ -70,16 +70,16 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash, Array] json
     # @param [String, Array] relation
-    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page, property_cache: nil, query: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page, property_id: nil,
+                   property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @json = if database?
                 json || {}
               elsif relation
                 Array(relation).map { |r| {"id" => r} }
-              elsif json
-                json
               else
-                []
+                json || []
               end
     end
 

data/lib/notion_ruby_mapping/properties/rollup_property.rb

@@ -71,8 +71,10 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, json: nil, base_type: :page, property_cache: nil, query: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+    def initialize(name, will_update: false, json: nil, base_type: :page, property_id: nil,
+                   property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @json = json || {}
     end
 

data/lib/notion_ruby_mapping/properties/select_property.rb

@@ -74,8 +74,10 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [Hash] json
     # @param [String] select String value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = if database?
                 json || {"options" => []}
               else