fixes

Author: markusressel

keel_telegram_bot/bot/__init__.py

@@ -18,7 +18,7 @@
 from keel_telegram_bot.client.approval import Approval
 from keel_telegram_bot.client.resource import Resource
 from keel_telegram_bot.client.tracked_image import TrackedImage
-from keel_telegram_bot.client.types import SemverPolicyType, Provider, Policy, PollSchedule
+from keel_telegram_bot.client.types import SemverPolicy, Provider, Policy, PollSchedule, SemverPolicyType
 from keel_telegram_bot.config import Config
 from keel_telegram_bot.stats import *
 from keel_telegram_bot.util import send_message, approval_to_str, resource_to_str, tracked_image_to_str
@@ -178,7 +178,7 @@ def filter_resources_by(resources: List[Resource], glob: str or None, tracked: b
                         list(map(lambda y: re.search(glob, y), x.images))), resources))
 
             if tracked:
-                result = list(filter(lambda x: x.policy != SemverPolicyType.NNone, result))
+                result = list(filter(lambda x: x.policy != SemverPolicy(SemverPolicyType.NNone), result))
 
             # apply limit
             result = result[:limit]

keel_telegram_bot/client/types.py

@@ -105,14 +105,18 @@ def from_value(value: str):
         elif value.startswith("regexp:"):
             return RegexPolicy(re.compile(value[7:], re.IGNORECASE))
         else:
-            return SemverPolicyType.from_value(value)
+            return SemverPolicy.from_value(value)
+
+    @property
+    def value(self):
+        return self.__str__()
 
     @abc.abstractmethod
     def __str__(self):
         raise NotImplementedError()
 
 
-class SemverPolicyType(Policy):
+class SemverPolicyType(enum.Enum):
     """
     Enum for semver policy types
     """
@@ -123,16 +127,14 @@ class SemverPolicyType(Policy):
     Patch = "patch"
     Force = "force"
 
-    @staticmethod
-    def values() -> ["SemverPolicyType"]:
-        return [
-            SemverPolicyType.NNone,
-            SemverPolicyType.All,
-            SemverPolicyType.Major,
-            SemverPolicyType.Minor,
-            SemverPolicyType.Patch,
-            SemverPolicyType.Force
-        ]
+
+class SemverPolicy(Policy):
+    """
+    Enum for semver policy types
+    """
+
+    def __init__(self, policy_type: SemverPolicyType):
+        self._policy_type = policy_type
 
     @staticmethod
     def from_value(value: str):
@@ -141,13 +143,13 @@ def from_value(value: str):
         :param value: the value to convert
         :return: the enum
         """
-        for policy in SemverPolicyType.values():
+        for policy in SemverPolicyType:
             if policy.value.lower() == value.lower():
                 return policy
-        return SemverPolicyType.NNone
+        return SemverPolicy(SemverPolicyType.NNone)
 
     def __str__(self):
-        return self.value
+        return self._policy_type.__str__()
 
 
 class GlobPolicy(Policy):