Merge pull request #201 from ixaxtav/master

add employee count

Author: ixaxtav

api/management/commands/calculate_total_payments.py

@@ -16,6 +16,7 @@ def handle(self, *args, **options):
         payments = PayrollPeriod.objects.annotate(total=Count('payments')).all()
         for payment in payments:
             payment.total_payments = payment.payments.count()
+            payment.total_employees = 
             payment.save()
 
         self.stdout.write(self.style.SUCCESS("Successfully updated all total_payments on every period"))

api/migrations/0115_payrollperiod_total_employees.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.8 on 2021-10-22 16:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0114_employersubscription_stripe_cus'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='payrollperiod',
+            name='total_employees',
+            field=models.IntegerField(blank=True, default=0),
+        ),
+    ]

api/models.py

@@ -5,7 +5,6 @@
 from django.db import models
 from django.db.models import Avg, Count
 from django.utils import timezone
-
 from api.utils.loggers import log_debug
 
 NOW = timezone.now()
@@ -745,6 +744,7 @@ class PayrollPeriod(models.Model):
     ending_at = models.DateTimeField(blank=False)
 
     total_payments = models.IntegerField(blank=True, default=0)
+    total_employees = models.IntegerField(blank=True, default=0)
 
     created_at = models.DateTimeField(auto_now_add=True, editable=False)
     updated_at = models.DateTimeField(auto_now=True, editable=False)

api/serializers/payment_serializer.py

@@ -3,7 +3,7 @@
 import itertools
 import math
 
-from django.db.models import Q, Sum
+from django.db.models import Q, Count, Sum
 from django.utils import timezone
 
 from rest_framework import serializers
@@ -87,12 +87,12 @@ class Meta:
 
 class EmployeeGetSerializer(serializers.ModelSerializer):
     user = UserGetSmallSerializer(read_only=True)
-    badges = BadgeGetSmallSerializer(read_only=True, many=True)
+    # badges = BadgeGetSmallSerializer(read_only=True, many=True)
 
 
     class Meta:
         model = Employee
-        fields = ('user', 'id', 'badges','employment_verification_status')
+        fields = ('user', 'id','employment_verification_status')
 
 
 class ClockinGetSerializer(serializers.ModelSerializer):
@@ -130,12 +130,11 @@ class Meta:
         exclude = ()
 
 class PayrollPeriodPaymentEmployeeSerializer(serializers.ModelSerializer):
-    employee = EmployeeGetSerializer(read_only=True)
+    # employee = EmployeeGetSerializer(read_only=True)
 
     class Meta:
         model = PayrollPeriodPayment
         exclude = ()
-        fields = ('employee', )
 
 class PayrollPeriodGetDateSerializer(serializers.ModelSerializer):
     class Meta:
@@ -146,7 +145,9 @@ class Meta:
             'ending_at',
         )
 class PayrollPeriodGetTinySerializer(serializers.ModelSerializer):
-    payments = PayrollPeriodPaymentEmployeeSerializer(read_only=True, many=True)
+    # payments = PayrollPeriodPaymentEmployeeSerializer(read_only=True, many=True)
+    employee_count = serializers.SerializerMethodField()
+
     class Meta:
         model = PayrollPeriod
         fields = (
@@ -155,9 +156,16 @@ class Meta:
             'starting_at',
             'ending_at',
             'total_payments',
-            'payments'
+            'employee_count'
         )
 
+    def get_employee_count(self, instance):
+        employees = PayrollPeriodPayment.objects.filter(employer__id=instance.employer_id, payroll_period__id = instance.id).order_by('employee_id').values('employee').distinct().count()
+      
+        total_employees = employees
+        
+        return total_employees
+
 class PayrollPeriodGetSmallSerializer(serializers.ModelSerializer):
     class Meta:
         model = PayrollPeriod
@@ -595,7 +603,7 @@ def generate_periods_and_payments(employer, generate_since=None):
     if end_date >= NOW:
         log_debug('hooks','No new periods to generate, now is '+ str(NOW) +' we have to wait until '+str(end_date))
         return []
-
+     
     while end_date < NOW:
 
         start_date = end_date - \
@@ -660,6 +668,7 @@ def generate_periods_and_payments(employer, generate_since=None):
                 payment.save()
                 total_payments = total_payments + 1
 
+            print('el total payment', total_payments)
             period.total_payments = total_payments
             period.save()
             generated_periods.append(period)