easyapi-django 0.22__tar.gz → 0.24__tar.gz

{easyapi_django-0.22/easyapi_django.egg-info → easyapi_django-0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyapi_django
-Version: 0.22
+Version: 0.24
 Summary: A simple rest api generator for django based on models
 Author-email: Stamatios Stamou Jr <bushier.outsets.0c@icloud.com>
 Project-URL: Homepage, https://github.com/ssjunior/easyapi-django

{easyapi_django-0.22 → easyapi_django-0.24}/easyapi/base.py

@@ -268,10 +268,10 @@ class BaseResource(View):
                     self.m2m_fields.append(field.name)
                     continue
 
-                if field.concrete and field.many_to_one:
-                    self.fk_fields.append(field.name)
-                    fields.append(f'{field.name}_id')
-                    continue
+                # if field.concrete and field.many_to_one:
+                #     self.fk_fields.append(field.name)
+                #     fields.append(f'{field.name}_id')
+                #     continue
 
                 # if not field.concrete and field.one_to_many:
                 #     self.related_fields.append(field.name)
@@ -529,12 +529,12 @@ class BaseResource(View):
         return response
 
     async def build_filters(self, request):
-        if self.queryset is None or not await self.queryset.aexists():
-            return
-
         if hasattr(self, 'model_filter'):
             self.queryset = self.queryset.filter(**self.model_filter)
 
+        if self.queryset is None or not await self.queryset.aexists():
+            return
+
         if request.GET.get('search'):
             self.search_fields += ['id']
             filters = reduce(
@@ -739,11 +739,12 @@ class BaseResource(View):
         if not conditions:
             return
 
-        queryset = OrmFilter(
+        orm_filter = OrmFilter(
             self.model,
-            self.user.get('timezone', 'UTC') if self.user else 'UTC'
+            self.user.get('timezone', 'UTC') if self.user else 'UTC',
+            base_queryset=self.queryset
         )
-        queryset = queryset.filter_by(conditions)
+        queryset = orm_filter.filter_by(conditions)
 
         if request.GET.get('search'):
             self.search_fields += ['id']
@@ -902,11 +903,11 @@ class BaseResource(View):
 
         if self.edit_related_fields:
             for key in self.edit_related_fields.keys():
-                if key in self.fk_fields:
-                    related.append(key)
-
-                elif key in self.m2m_fields:
+                if key in self.m2m_fields:
                     m2m.append(key)
+                else:
+                    # Adiciona tudo que não é M2M (FKs diretos e encadeados)
+                    related.append(key)
 
             for key in related:
                 for rf in self.edit_related_fields[key]:
@@ -917,8 +918,12 @@ class BaseResource(View):
                     else:
                         related_fields.append(key)
 
-            self.queryset = self.queryset.select_related(*related_fields)
+            try:
+                self.queryset = self.queryset.select_related(*related_fields)
+            except Exception as e:
+                raise HTTPException(500, f'Invalid related field in edit_related_fields: {str(e)}')
 
+        print(related_fields)
         prefetch_fields = self.edit_prefetch_related.keys() if self.edit_prefetch_related else []
         if prefetch_fields:
             self.queryset = self.queryset.prefetch_related(*prefetch_fields)

{easyapi_django-0.22 → easyapi_django-0.24}/easyapi/filters.py

@@ -50,16 +50,14 @@ class Filter(object):
 
     def __init__(self, model, tz='UTC', **kwargs):
         self.db_model = model
-        self.original_model = model.objects
+        base_queryset = kwargs.get('base_queryset')
         extra_filters = kwargs.get('extra_filters')
 
-        # Caso seja o model "Contact", devo ignorar os "excluídos" (ContactStatus.DELETED == 3)
-        # if self.original_model.model._meta.model_name == 'contact':
-        #     self.original_model = self.original_model.exclude(status_id=3)
-
-        # # Case seja o model "Card", devo ignorar os "arquivados"
-        # elif self.original_model.model._meta.model_name == 'card':
-        #     self.original_model = self.original_model.exclude(archived=1)
+        # Usa o queryset base se fornecido, caso contrário usa model.objects
+        if base_queryset is not None:
+            self.original_model = base_queryset.all()
+        else:
+            self.original_model = model.objects
 
         if extra_filters:
             self.original_model = self.original_model.filter(**extra_filters)
@@ -69,7 +67,7 @@ class Filter(object):
         # interaction-with-default-ordering-or-order-by
         self.original_model = self.original_model.order_by()
 
-        self.model = deepcopy(self.original_model)
+        self.model = self.original_model.all()
         self.now = timezone.now().replace(tzinfo=pytz_timezone(tz))
         self.tz = tz
         self.date_start = None
@@ -81,7 +79,7 @@ class Filter(object):
         self.working_model = None
 
     def reset(self):
-        self.model = deepcopy(self.original_model)
+        self.model = self.original_model.all()
 
     def change_timezone(self, tz):
         self.tz = tz
@@ -570,7 +568,7 @@ class Filter(object):
 
     def filter_by(self, filter_by_conditions, queryset=None, apply_dates=True, report=False):
         if not self.working_model:
-            self.working_model = deepcopy(self.model)
+            self.working_model = self.model.all()
             self.overrided = True
 
         if queryset:

{easyapi_django-0.22 → easyapi_django-0.24/easyapi_django.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyapi_django
-Version: 0.22
+Version: 0.24
 Summary: A simple rest api generator for django based on models
 Author-email: Stamatios Stamou Jr <bushier.outsets.0c@icloud.com>
 Project-URL: Homepage, https://github.com/ssjunior/easyapi-django

{easyapi_django-0.22 → easyapi_django-0.24}/pyproject.toml

@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "easyapi_django"
-version = "0.22"
+version = "0.24"
 authors = [
   { name="Stamatios Stamou Jr", email="bushier.outsets.0c@icloud.com" },
 ]