remove compare filds in time condition

Author: Nanguage

executor/engine/job/condition.py

@@ -291,24 +291,12 @@ class AfterTimepoint(TimeCondition):
 
     Attributes:
         timepoint: The timepoint.
-        compare_fields: The fields to compare.
-            Fields: "year", "month", "day", "hour", "minute", "second"
     """
 
     timepoint: datetime
-    compare_fields: T.Optional[T.List[str]] = None
 
     def satisfy(self, _) -> bool:
-        if self.compare_fields is None:
-            return datetime.now() > self.timepoint
-        else:
-            for field in self.compare_fields:
-                if field not in _valid_timepoint_fields:
-                    raise ValueError(f"Invalid field: {field}")
-                if getattr(datetime.now(), field) >= \
-                   getattr(self.timepoint, field):
-                    return False
-            return True
+        return datetime.now() > self.timepoint
 
 
 @dataclass
@@ -317,20 +305,8 @@ class BeforeTimepoint(TimeCondition):
 
     Attributes:
         timepoint: The timepoint.
-        compare_fields: The fields to compare.
-            Fields: "year", "month", "day", "hour", "minute", "second"
     """
     timepoint: datetime
-    compare_fields: T.Optional[T.List[str]] = None
 
     def satisfy(self, _) -> bool:
-        if self.compare_fields is None:
-            return datetime.now() < self.timepoint
-        else:
-            for field in self.compare_fields:
-                if field not in _valid_timepoint_fields:
-                    raise ValueError(f"Invalid field: {field}")
-                if getattr(datetime.now(), field) <= \
-                   getattr(self.timepoint, field):
-                    return False
-            return True
+        return datetime.now() < self.timepoint

tests/test_condition.py

@@ -226,25 +226,6 @@ def test_time_condition():
     assert BeforeClock("23:59:59").satisfy(None)
     assert AfterTimepoint(datetime.now() - timedelta(hours=1)).satisfy(None)
     assert BeforeTimepoint(datetime.now() + timedelta(hours=1)).satisfy(None)
-    assert AfterTimepoint(
-        datetime.now() + timedelta(hours=1), compare_fields=["hour"]
-    ).satisfy(None)
-    assert BeforeTimepoint(
-        datetime.now() - timedelta(hours=1), compare_fields=["hour"]
-    ).satisfy(None)
-    assert not AfterTimepoint(
-        datetime.now() - timedelta(hours=1), compare_fields=["hour"]
-    ).satisfy(None)
-    assert not BeforeTimepoint(
-        datetime.now() + timedelta(hours=1), compare_fields=["hour"]
-    ).satisfy(None)
     assert AfterWeekday("mon").satisfy(None)
     assert BeforeWeekday("sun").satisfy(None)
 
-    with pytest.raises(ValueError):
-        AfterTimepoint(
-            datetime.now(), compare_fields=["not_exist"]).satisfy(None)
-
-    with pytest.raises(ValueError):
-        BeforeTimepoint(
-            datetime.now(), compare_fields=["not_exist"]).satisfy(None)