From c84ef13d33c6ef322aee415011876f4e47215d06 Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Fri, 24 Feb 2023 15:33:07 -0600 Subject: [PATCH] Antes de actualizar despues actualizar index Timbres y Clientes Q queryset --- Admin/settings.py | 2 +- Clientes/migrations/0015_alter_timbres_rfcc.py | 18 ++++++++++++++++++ Clientes/models.py | 15 +++++++++++---- Clientes/views.py | 4 ++-- .../0013_alter_bitacoraerrores_options.py | 17 +++++++++++++++++ 5 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 Clientes/migrations/0015_alter_timbres_rfcc.py create mode 100644 Sistemas/migrations/0013_alter_bitacoraerrores_options.py diff --git a/Admin/settings.py b/Admin/settings.py index 0d4670d..0b89c4d 100644 --- a/Admin/settings.py +++ b/Admin/settings.py @@ -15,7 +15,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = os.getenv("adminAS_KEY") # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = ['*'] # Application definition diff --git a/Clientes/migrations/0015_alter_timbres_rfcc.py b/Clientes/migrations/0015_alter_timbres_rfcc.py new file mode 100644 index 0000000..3dc29b4 --- /dev/null +++ b/Clientes/migrations/0015_alter_timbres_rfcc.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.3 on 2023-02-24 21:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('Clientes', '0014_alter_clientes_options'), + ] + + operations = [ + migrations.AlterField( + model_name='timbres', + name='rfcc', + field=models.CharField(db_index=True, max_length=13), + ), + ] diff --git a/Clientes/models.py b/Clientes/models.py index 4fc9b87..b995b32 100644 --- a/Clientes/models.py +++ b/Clientes/models.py @@ -1,14 +1,16 @@ from django.db import models import datetime + from django.db.models import Q + class saldoModel(models.Model): saldo = models.IntegerField() class Timbres(models.Model): uuid = models.CharField(max_length=36, unique=True) - rfcc = models.CharField(max_length=13) + rfcc = models.CharField(max_length=13,db_index=True) rfcp = models.CharField(max_length=13) fecha = models.CharField(max_length=55) folio = models.CharField(max_length=55) @@ -57,10 +59,15 @@ class Clientes(models.Model): else:#28 or 29 findate = dat + datetime.timedelta(days=28) findate += datetime.timedelta(days=1) + + filter_q = Q(rfcc=self.RFC) & Q(created_at__range=[dat,findate]) if PAC: - cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate], rfcp=PAC).count() - else: - cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate]).count() + filter_q &=Q(rfcp=PAC) + cou = Timbres.objects.filter(filter_q).count() + # if PAC: + # cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate], rfcp=PAC).count() + # else: + # cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate]).count() self.conteo_mes =cou self.save() diff --git a/Clientes/views.py b/Clientes/views.py index 116d837..83f49b4 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -447,9 +447,9 @@ class saldo_funct2(APIView): return Response(content) class check_host(APIView): - permission_classes = (IsAuthenticated,ItsAdminToken,) + permission_classes = (IsAuthenticated,ItsAdminToken,) def post(self,request, format=None): - data = request.data + data = request.data return Response(data) #---------------------------CLASS BASED VIEWS #-------------------------------------------- diff --git a/Sistemas/migrations/0013_alter_bitacoraerrores_options.py b/Sistemas/migrations/0013_alter_bitacoraerrores_options.py new file mode 100644 index 0000000..ad78f1d --- /dev/null +++ b/Sistemas/migrations/0013_alter_bitacoraerrores_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.3 on 2023-02-24 21:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('Sistemas', '0012_bitacoraerrores_view'), + ] + + operations = [ + migrations.AlterModelOptions( + name='bitacoraerrores', + options={'ordering': ('-timestamp',)}, + ), + ]