Develop

backend/applications/errors/application_messages.py

@@ -10,4 +10,4 @@
 NOT_VALID_APPLICATION_STATE = "La postulación no está en estado pendiente."
 INVALID_APPLICATION_RELATIONSHIPS = "Relaciones de postulación no válidas."
 
-ALREADY_APPLIED_SHIFTS = "Ya te postulaste a los turnos: {shifts}"
+ALREADY_APPLIED_SHIFTS = "Ya te postulaste a uno o todos los turnos asociados."

backend/applications/errors/attendance_messages.py

@@ -8,4 +8,7 @@
 SHIFT_NOT_QR_ENABLED = "El turno no tiene el check-in por QR habilitado."
 EMPLOYEE_DOES_NOT_MATCH_TOKEN = "El empleado no coincide con el token."
 TOKEN_MISSING_REQUIRED_FIELDS = "Token missing required fields."
-INVALID_TOKEN = "Token inválido o expirado."
+INVALID_TOKEN = "Token inválido o expirado."
+
+NOT_OFFER_ID = "El ID de la oferta es requerido."
+NOT_OFFER_OWNER = "No sos el dueño de esta oferta."

backend/applications/models/__init__.py

@@ -3,5 +3,7 @@
 from .applications import Application
 
 __all__ = [
-    'Application'
+    'Application',
+    'Offer',
+    'OfferState'
 ]

backend/applications/serializers/applications.py

@@ -4,6 +4,9 @@
 from eventos.formatters.date_time import CustomDateField, CustomTimeField
 from notifications.constants import NotificationTypes
 from notifications.services.send_notification import send_notification
+from rating.utils import get_user_average_rating, get_user_rating_count
+from user_auth.serializers.employee import ViewEmployeeEducationSerializer, ViewEmployeeWorkExperienceSerializer
+from user_auth.serializers.language import EmployeeLanguageSerializer
 from user_auth.utils import get_city_locality, calculate_age
 from vacancies.constants import VacancyStates
 from applications.errors.application_messages import ALREADY_APPLIED_SHIFTS, EMPLOYEE_PROFILE_NOT_FOUND, NOT_PERMISSION_APPLICATION, NOT_PERMISSION_APPLICATION
@@ -69,7 +72,7 @@ def validate(self, data):
 
         if already_applied_shifts:
             raise serializers.ValidationError(
-                ALREADY_APPLIED_SHIFTS.format(shifts=", ".join(map(str, already_applied_shifts)))
+                ALREADY_APPLIED_SHIFTS
             )
 
         return data
@@ -90,31 +93,48 @@ def save(self, **kwargs):
                 Application(employee=employee, shift_id=shift_id, state=pending_state)
                 for shift_id in shifts_ids
             ])
+
+        application = Application.objects.filter(
+            employee=employee,
+            shift_id__in=shifts_ids
+        ).first()
 
         send_notification(
             user=employer,
-            title="Nueva postulación",
-            message="POSTULADO nomas",
-            notification_type_name=NotificationTypes.APPLICATION.value
+            title="Postulacion",
+            message="Has recibido una nueva postulacion.",
+            notification_type_name=NotificationTypes.APPLICATION.value,
+            data={
+                "application_id": application.id,
+                "vacancy_id": vacancy.id,
+                "employee_id": employee.id,
+                "shifts": shifts_ids
+            }
         )
 
         return True
 
 
 
 class ApplicationDetailSerializer(serializers.ModelSerializer):
+    employee_id = serializers.IntegerField(source="employee.id")
     current_shift = ShiftForApplicationSerializer(source='shift', read_only=True)
     shifts = serializers.SerializerMethodField()
     profile_image = serializers.SerializerMethodField()
     name = serializers.SerializerMethodField()
     description = serializers.CharField(source='employee.description')
     age = serializers.SerializerMethodField()
     approximate_location = serializers.SerializerMethodField()
+    average_rating = serializers.SerializerMethodField()
+    rating_count = serializers.SerializerMethodField()
+    work_experiences = ViewEmployeeWorkExperienceSerializer(source='employee.work_experiences', many=True)
+    educations = ViewEmployeeEducationSerializer(source='employee.educations', many=True)
+    languages = EmployeeLanguageSerializer(source='employee.languages', many=True)
 
     class Meta:
         model = Application
-        fields = ["current_shift", "shifts", "profile_image", "name", "description", "age", "approximate_location"]
-
+        fields = ["employee_id", "current_shift", "shifts", "profile_image", "name", "description", "age", "approximate_location", "average_rating", "rating_count", "work_experiences", "educations", "languages"]
+    
     def get_profile_image(self, obj):
         return obj.employee.user.profile_image.url if obj.employee.user.profile_image else None
 
@@ -136,6 +156,12 @@ def get_shifts(self, obj):
         vacancy_shifts = getattr(obj.shift.vacancy, "_prefetched_objects_cache", {}).get("shifts", obj.shift.vacancy.shifts.all())
         other_shifts = [s for s in vacancy_shifts if s.id != current_shift_id]
         return ShiftForApplicationSerializer(other_shifts, many=True).data
+
+    def get_average_rating(self, obj):
+        return get_user_average_rating(obj.employee.user)
+
+    def get_rating_count(self, obj):
+        return get_user_rating_count(obj.employee.user)
 
     def validate(self, attrs):
         user = self.context.get("user")
@@ -151,6 +177,8 @@ class ApplicationByShiftSerializer(serializers.ModelSerializer):
     employee_id = serializers.IntegerField(source="employee.user_id")
     full_name = serializers.SerializerMethodField()
     profile_image = serializers.SerializerMethodField()
+    average_rating = serializers.SerializerMethodField()
+    rating_count = serializers.SerializerMethodField()
 
     class Meta:
         model = Application
@@ -160,6 +188,8 @@ class Meta:
             "employee_id",
             "full_name",
             "profile_image",
+            "average_rating",
+            "rating_count",
         ]
 
     def get_full_name(self, obj):
@@ -168,6 +198,12 @@ def get_full_name(self, obj):
 
     def get_profile_image(self, obj):
         return obj.employee.user.profile_image.url if obj.employee.user.profile_image else None
+
+    def get_average_rating(self, obj):
+        return get_user_average_rating(obj.employee.user)
+
+    def get_rating_count(self, obj):
+        return get_user_rating_count(obj.employee.user)
 
 
 class ShiftWithApplicationsSerializer(serializers.ModelSerializer):

backend/applications/serializers/attendance.py

@@ -104,8 +104,6 @@ def get_offer(self):
         """
         offer_id = self.validated_data['offer_id']
         return Offer.objects.get(pk=offer_id)
-
-
 
 class OfferByEventSerializer(serializers.ModelSerializer):
     employee_id = serializers.IntegerField(source="employee.user.id", read_only=True)

backend/applications/serializers/jobs.py

@@ -4,6 +4,9 @@
 from applications.utils import get_job_type_display
 from eventos.formatters.date_time import CustomDateField, CustomTimeField
 from eventos.models.event import Event
+from payments.constants import PaymentStates
+from payments.models.payments import Payment
+from rating.models.rating import Rating
 from vacancies.models.shifts import Shift
 
 
@@ -58,4 +61,93 @@ def get_shift(self, obj):
 class EmployeeAcceptedEventsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Event
-        fields = ["id", "name"]
+        fields = ["id", "name"]
+
+class EmployeeJobsHistorySerializer(serializers.ModelSerializer):
+    event_id = serializers.IntegerField(source="selected_shift.vacancy.event.id")
+    event_name = serializers.CharField(source="selected_shift.vacancy.event.name")
+    event_image_url = serializers.SerializerMethodField()
+
+    start_date = CustomDateField(source="selected_shift.start_date")
+    start_time = CustomTimeField(source="selected_shift.start_time")
+    payment_amount = serializers.FloatField(source="selected_shift.payment")
+    payment_mp_id = serializers.SerializerMethodField()
+
+    company_name = serializers.CharField(source="employer.company_name")
+
+    employer_image_url = serializers.SerializerMethodField()
+    job_type = serializers.SerializerMethodField()
+    payment_date = serializers.SerializerMethodField()
+    stars = serializers.SerializerMethodField()
+    comment = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Offer
+        fields = [
+            "event_id",
+            "event_name",
+            "event_image_url",
+            "start_date",
+            "start_time",
+            "job_type",
+            "payment_amount",
+            "payment_mp_id",
+            "payment_date",
+            "company_name",
+            "employer_image_url",
+            "stars",
+            "comment",
+        ]
+
+    def get_job_type(self, obj):
+        vacancy = obj.selected_shift.vacancy
+        return get_job_type_display(vacancy)
+
+    def get_payment_date(self, obj):
+        payment = Payment.objects.filter(
+            offer=obj,
+            employee_id=obj.employee.user.id,
+            state__name=PaymentStates.APPROVED.value
+        ).order_by('-updated_at').first()
+
+        if not payment:
+            return None
+
+        return payment.updated_at.strftime("%d/%m/%Y")
+
+    def get_payment_mp_id(self, obj):
+        payment = Payment.objects.filter(
+            offer=obj,
+            employee_id=obj.employee.user.id,
+            state__name=PaymentStates.APPROVED.value
+        ).order_by('-updated_at').first()
+
+        if not payment:
+            return "El pago no está completo"
+
+        return payment.mp_payment_id
+
+
+
+    def get_stars(self, obj):
+        rating = Rating.objects.filter(
+            rater=obj.employee.user,
+            event=obj.selected_shift.vacancy.event
+        ).first()
+        return rating.rating if rating else None
+
+    def get_comment(self, obj):
+        rating = Rating.objects.filter(
+            rater=obj.employee.user,
+            event=obj.selected_shift.vacancy.event
+        ).first()
+        return rating.comments if rating else None
+
+    def get_event_image_url(self, obj):
+        if obj.selected_shift.vacancy.event.event_image:
+            return obj.selected_shift.vacancy.event.event_image.url
+        return None
+
+    def get_employer_image_url(self, obj):
+        owner = obj.selected_shift.vacancy.event.owner
+        return owner.profile_image.url if owner.profile_image else None