utg-base 1.20.3__tar.gz → 1.21.0__tar.gz

{utg_base-1.20.3 → utg_base-1.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.20.3
+Version: 1.21.0
 Summary: UTG Base Package
 Author: Olimboy
 Author-email: shavkatov.olimboy@mail.ru

{utg_base-1.20.3 → utg_base-1.21.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.20.3"
+version = "1.21.0"
 description = "UTG Base Package"
 authors = ["Olimboy <shavkatov.olimboy@mail.ru>", "Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"

{utg_base-1.20.3 → utg_base-1.21.0}/src/utg_base/utils/date.py

@@ -1,6 +1,9 @@
 from calendar import monthrange
 from datetime import date, datetime, timedelta
 
+from dateutil.relativedelta import relativedelta
+from django.utils.timezone import make_aware as dj_make_aware
+
 DEFAULT_DATE_FORMAT = '%Y-%m-%d'
 DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
 
@@ -23,6 +26,18 @@ class UDate(date):
     def yesterday(self):
         return to_udate(self.datetime() - timedelta(days=1))
 
+    def month_ago(self):
+        return self - relativedelta(months=1)
+
+    def month_later(self):
+        return self + relativedelta(months=1)
+
+    def year_ago(self):
+        return self - relativedelta(years=1)
+
+    def year_later(self):
+        return self + relativedelta(years=1)
+
     def first_day_of_month(self):
         return self.replace(day=1)
 
@@ -78,7 +93,7 @@ class UDateTime(datetime):
     def last_second_of_day(self):
         return self.last_second_of_hour().replace(hour=23)
 
-    def one_hour_later(self):
+    def hour_later(self):
         return self + timedelta(hours=1)
 
     def hour_ago(self):
@@ -90,6 +105,18 @@ class UDateTime(datetime):
     def yesterday(self):
         return self - timedelta(days=1)
 
+    def month_ago(self):
+        return self - relativedelta(months=1)
+
+    def month_later(self):
+        return self + relativedelta(months=1)
+
+    def year_ago(self):
+        return self - relativedelta(years=1)
+
+    def year_later(self):
+        return self + relativedelta(years=1)
+
     def first_day_of_month(self):
         return self.replace(day=1)
 
@@ -118,6 +145,9 @@ class UDateTime(datetime):
     def strftime(self, __format=DEFAULT_DATETIME_FORMAT):
         return super().strftime(__format)
 
+    def make_aware(self) -> UDateTime:
+        return dj_make_aware(self)
+
     @staticmethod
     def strptime(__date_string: str, __format=DEFAULT_DATETIME_FORMAT):
         return to_udatetime(datetime.strptime(__date_string, __format))