🎨 Support database date field relative to today's filtering #10451

siyuan-note · Mar 1, 2024 · 066d180 · 066d180
1 parent 10e0061
commit 066d180
Show file tree

Hide file tree

Showing 2 changed files with 223 additions and 164 deletions.
diff --git a/kernel/av/filter.go b/kernel/av/filter.go
@@ -26,30 +26,46 @@ type Filterable interface {
 }
 
 type ViewFilter struct {
-	Column   string         `json:"column"`
-	Operator FilterOperator `json:"operator"`
-	Value    *Value         `json:"value"`
+	Column        string         `json:"column"`
+	Operator      FilterOperator `json:"operator"`
+	Value         *Value         `json:"value"`
+	RelativeDate  *RelativeDate  `json:"relativeDate"`
+	RelativeDate2 *RelativeDate  `json:"relativeDate2"`
+}
+
+type RelativeDateUnit int
+
+const (
+	RelativeDateUnitDay = iota
+	RelativeDateUnitWeek
+	RelativeDateUnitMonth
+	RelativeDateUnitYear
+)
+
+type RelativeDate struct {
+	Count     int              // 数量
+	Unit      RelativeDateUnit // 单位：天、周、月、年
+	Direction int              // 方向：前、现在、后
 }
 
 type FilterOperator string
 
 const (
-	FilterOperatorIsEqual           FilterOperator = "="
-	FilterOperatorIsNotEqual        FilterOperator = "!="
-	FilterOperatorIsGreater         FilterOperator = ">"
-	FilterOperatorIsGreaterOrEqual  FilterOperator = ">="
-	FilterOperatorIsLess            FilterOperator = "<"
-	FilterOperatorIsLessOrEqual     FilterOperator = "<="
-	FilterOperatorContains          FilterOperator = "Contains"
-	FilterOperatorDoesNotContain    FilterOperator = "Does not contains"
-	FilterOperatorIsEmpty           FilterOperator = "Is empty"
-	FilterOperatorIsNotEmpty        FilterOperator = "Is not empty"
-	FilterOperatorStartsWith        FilterOperator = "Starts with"
-	FilterOperatorEndsWith          FilterOperator = "Ends with"
-	FilterOperatorIsBetween         FilterOperator = "Is between"
-	FilterOperatorIsRelativeToToday FilterOperator = "Is relative to today"
-	FilterOperatorIsTrue            FilterOperator = "Is true"
-	FilterOperatorIsFalse           FilterOperator = "Is false"
+	FilterOperatorIsEqual          FilterOperator = "="
+	FilterOperatorIsNotEqual       FilterOperator = "!="
+	FilterOperatorIsGreater        FilterOperator = ">"
+	FilterOperatorIsGreaterOrEqual FilterOperator = ">="
+	FilterOperatorIsLess           FilterOperator = "<"
+	FilterOperatorIsLessOrEqual    FilterOperator = "<="
+	FilterOperatorContains         FilterOperator = "Contains"
+	FilterOperatorDoesNotContain   FilterOperator = "Does not contains"
+	FilterOperatorIsEmpty          FilterOperator = "Is empty"
+	FilterOperatorIsNotEmpty       FilterOperator = "Is not empty"
+	FilterOperatorStartsWith       FilterOperator = "Starts with"
+	FilterOperatorEndsWith         FilterOperator = "Ends with"
+	FilterOperatorIsBetween        FilterOperator = "Is between"
+	FilterOperatorIsTrue           FilterOperator = "Is true"
+	FilterOperatorIsFalse          FilterOperator = "Is false"
 )
 
 func (filter *ViewFilter) GetAffectValue(key *Key) (ret *Value) {