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

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.20.3"
+version = "1.21.1"
 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.1}/src/utg_base/references_api/utils.py

@@ -7,7 +7,6 @@ from django.db.models import Model, CharField
 from drf_spectacular.utils import extend_schema, extend_schema_serializer
 from rest_framework import filters
 from rest_framework import viewsets, serializers
-
 from utg_base.api.base import BaseAPIView
 from utg_base.permissions.decorators import has_class_perm
 
@@ -20,10 +19,10 @@ def find_model(model_name: str):
             return model_class
 
 
-def get_api_meta_property(model: Model, property_name: str):
+def get_api_meta_property(model: Model, property_name: str, default=None):
     if hasattr(model, 'ApiMeta'):
-        if hasattr(model.ApiMeta, property_name):
-            return getattr(model.ApiMeta, property_name)
+        return getattr(model.ApiMeta, property_name, default)
+    return default
 
 
 def get_model_class_name(model: Model):
@@ -84,11 +83,14 @@ def create_view_set(model: Model):
 
     @extend_schema(tags=[get_url_prefix(model)])
     class ViewSet(viewsets.ModelViewSet, BaseAPIView):
-        http_method_names = get_api_meta_property(model, 'http_method_names') or ['get', 'patch']
+        http_method_names = get_api_meta_property(model, 'http_method_names', ['get', 'patch'])
         manager = model.objects.order_by(*get_ordering(model))
         filter_backends = [filters.SearchFilter]
-        search_fields = (get_api_meta_property(model, 'search_fields') or
-                         [field.name for field in fields_list if isinstance(field, CharField)])
+        search_fields = get_api_meta_property(
+            model=model,
+            property_name='search_fields',
+            default=[field.name for field in fields_list if isinstance(field, CharField)]
+        )
 
         def get_serializer_class(self):
             if self.action == 'create':
@@ -128,7 +130,7 @@ def create_serializer_for_partial_update(model: Model):
             fields = '__all__'
             read_only_fields = list(
                 {
-                    *get_api_meta_property(model, 'readonly_fields'),
+                    *get_api_meta_property(model, 'readonly_fields', tuple()),
                     'created_at',
                     'updated_at',
                     'deleted_at',
@@ -174,7 +176,7 @@ def create_serializer(model: Model, depth=0):
             fields = '__all__'
             read_only_fields = list(
                 {
-                    *get_api_meta_property(model, 'readonly_fields'),
+                    *get_api_meta_property(model, 'readonly_fields', tuple()),
                     'created_at',
                     'updated_at',
                     'deleted_at',

{utg_base-1.20.3 → utg_base-1.21.1}/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))