Merge pull request #132 from CodeHive-Solutions/dev

Some bug fix
CodeHive-Solutions · Sep 10, 2024 · d181efe · d181efe
2 parents 3532a29 + 06e255d
commit d181efe
Show file tree

Hide file tree

Showing 14 changed files with 233 additions and 185 deletions.
diff --git a/INSIGHTSAPI/INSIGHTSAPI/celery.py b/INSIGHTSAPI/INSIGHTSAPI/celery.py
@@ -10,3 +10,5 @@
 app.config_from_object("django.conf:settings", namespace="CELERY")
 
 app.autodiscover_tasks(["INSIGHTSAPI"])
+
+app.log.setup()
diff --git a/INSIGHTSAPI/INSIGHTSAPI/settings.py b/INSIGHTSAPI/INSIGHTSAPI/settings.py
@@ -392,7 +392,7 @@ def str_to_bool(value: str) -> bool:
 # LDAP configuration
 AUTH_LDAP_SERVER_URI = "ldap://CYC-SERVICES.COM.CO:389"
 AUTH_LDAP_BIND_DN = "CN=StaffNet,OU=TECNOLOGÍA,OU=BOGOTA,DC=CYC-SERVICES,DC=COM,DC=CO"
-AUTH_LDAP_BIND_PASSWORD = os.getenv("AdminLDAPPassword")
+AUTH_LDAP_BIND_PASSWORD = os.environ["AdminLDAPPassword"]
 
 # AUTH_LDAP_USER_SEARCH = LDAPSearch(
 #     "OU=BOGOTA,DC=CYC-SERVICES,DC=COM,DC=CO",  # Search base

diff --git a/INSIGHTSAPI/services/tests.py b/INSIGHTSAPI/services/tests.py
@@ -9,6 +9,7 @@
 from django.test import TestCase, Client, override_settings
 from django.urls import reverse
 from django.conf import settings
+from django.core.cache import cache
 from users.models import User
 from services.models import Answer
 from hierarchy.models import Area, JobPosition
@@ -140,6 +141,9 @@ def test_send_report_ethical_line_with_contact(self):
 class HolidayTest(TestCase):
     """Test for holidays."""
 
+    def setUp(self):
+        cache.clear()
+
     def test_holiday(self):
         """Test that the holiday is a holiday."""
         self.assertTrue(holidays.Colombia().get("2022-01-01"))
@@ -152,7 +156,7 @@ def test_get_holidays(self):
         """Test that the holidays are retrieved."""
         response = self.client.get("/services/holidays/2024/")
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(response.data, holidays.CO(years=range(2024, 2026)).items())
+        self.assertEqual(response.data, list(holidays.CO(years=range(2024, 2026)).items()))
 
 
 class QuestionTest(BaseTestCase):

diff --git a/INSIGHTSAPI/services/views.py b/INSIGHTSAPI/services/views.py
@@ -4,6 +4,7 @@
 import os
 import holidays
 from rest_framework.response import Response
+from django.http import JsonResponse
 from django.views.decorators.cache import cache_page, cache_control
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import AllowAny
@@ -88,7 +89,7 @@ def get_holidays(request, year):
     except ValueError:
         return Response({"error": "El año debe ser un número"}, status=400)
     # Get the holidays of the year and the next year
-    holidays_year = holidays.CO(years=range(year, year + 2)).items()
+    holidays_year = list(holidays.CO(years=range(year, year + 2)).items())
     return Response(holidays_year, status=200)
 
 

diff --git a/INSIGHTSAPI/vacation/serializers.py b/INSIGHTSAPI/vacation/serializers.py
@@ -128,6 +128,16 @@ def validate(self, attrs):
                 raise serializers.ValidationError(
                     "No puedes crear una solicitud para este usuario."
                 )
+        else:
+            # Update
+            if (
+                self.instance.manager_approbation
+                and "status" in attrs
+                and attrs["status"] == "CANCELADA"
+            ):
+                raise serializers.ValidationError(
+                    "No puedes cancelar una solicitud que ya ha sido aprobada por tu jefe."
+                )
         return attrs
 
     def create(self, validated_data):

diff --git a/INSIGHTSAPI/vacation/templates/vacation_request.html b/INSIGHTSAPI/vacation/templates/vacation_request.html
@@ -9,14 +9,13 @@
         html,
         body {
             height: 100%;
-            margin: 0;
-            padding: 0;
+            margin: -100px 10px 0px 10px;
             font-family: 'Helvetica Neue', Arial, sans-serif;
             color: #333;
             line-height: 1.6;
-            background: linear-gradient(rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.9)),
-                url('https://insights-api.cyc-bpo.com/static/images/just_logo.png') no-repeat center center;
-            background-size: cover;
+            text-align: center;
+            align-items: center;
+            font-size: 20px;
             display: flex;
             justify-content: center;
         }
@@ -26,7 +25,6 @@
         }
 
         .header {
-            text-align: center;
             margin-top: 80px;
             margin-bottom: 40px;
         }
@@ -38,26 +36,14 @@
             letter-spacing: 1px;
         }
 
-        .content p {
-            margin-bottom: 15px;
-            font-size: 18px;
-            text-align: justify;
-        }
-
         .signature {
-            margin-top: 30px;
+            margin-top: 200px;
             text-align: center;
         }
 
         .signature p {
             margin: 5px 0;
-        }
-
-        .signature-line {
-            margin: 150px 0 10px 0;
-            padding-top: 10px;
-            font-size: 18px;
-            font-style: italic;
+            text-align: left;
         }
 
         .footer {
@@ -66,23 +52,6 @@
             text-align: center;
             color: #777;
         }
-
-        @media print {
-            body {
-                padding: 0;
-                margin: 0;
-                height: auto;
-                background: none;
-            }
-
-            .card {
-                margin: 0;
-                padding: 20px;
-                box-shadow: none;
-                width: 100%;
-                height: auto;
-            }
-        }
     </style>
 </head>
 
@@ -93,10 +62,11 @@
             <br>
             <p>Estimado (a) Gestión Humana</p>
             <p>CYC SERVICES S.A.S.</p>
+            <p>Ref. Solicitud de vacaciones disfrutadas</p>
             <br>
             <p>
                 Por la presente le solicito se me conceda {{ vacation.duration }} días de mi periodo vacacional
-                comprendido para el año {{ vacation.start_date|date:"Y" }},
+                comprendido para el año {{ vacation.start_date|date:"Y" }}.
             </p>
             <p>
                 Los días tomados serán a partir del {{ vacation.start_date }} hasta el día {{ vacation.end_date }}, para

diff --git a/INSIGHTSAPI/vacation/tests.py b/INSIGHTSAPI/vacation/tests.py
@@ -170,7 +170,7 @@ def test_vacation_list_manager(self):
                 Q(user__job_position__rank__lt=self.user.job_position.rank)
                 & Q(user__area=self.user.area)
             )
-        )
+        ).order_by("-created_at")
         serializer = VacationRequestSerializer(vacation_requests, many=True)
         self.assertEqual(response.data, serializer.data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -289,10 +289,12 @@ def test_vacation_owner_cancel_approved(self):
             reverse("vacation-detail", kwargs={"pk": vacation_object.pk}),
             {"status": "CANCELADA"},
         )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST, response.data)
         self.assertEqual(
-            response.data["non_field_errors"][0],
-            "No puedes cancelar una solicitud aprobada.",
+            response.status_code, status.HTTP_400_BAD_REQUEST, response.data
+        )
+        self.assertEqual(
+            str(response.data["non_field_errors"][0]),
+            "No puedes cancelar una solicitud que ya ha sido aprobada por tu jefe.",
         )
 
     def test_vacation_cancel_no_owner(self):

diff --git a/INSIGHTSAPI/vacation/views.py b/INSIGHTSAPI/vacation/views.py
@@ -19,7 +19,7 @@
 
 
 class VacationRequestViewSet(viewsets.ModelViewSet):
-    queryset = VacationRequest.objects.all().select_related("user", "uploaded_by")
+    queryset = VacationRequest.objects.all().select_related("user", "uploaded_by").order_by("-created_at")
     serializer_class = VacationRequestSerializer
     permission_classes = [IsAuthenticated]
 
@@ -291,15 +291,7 @@ def partial_update(self, request, *args, **kwargs):
             and request.user == self.get_object().user
             and request.data["status"] == "CANCELADA"
         ):
-            if self.get_object().manager_approbation:
-                return Response(
-                    {
-                        "detail": "No puedes cancelar una solicitud de vacaciones aprobada."
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            else:
-                return super().partial_update(request, *args, **kwargs)
+            return super().partial_update(request, *args, **kwargs)
 
         return Response(
             {"detail": "You do not have permission to perform this action."},

diff --git a/package.json b/package.json
@@ -16,10 +16,11 @@
         "@mui/lab": "5.0.0-alpha.173",
         "@mui/material": "^5.16.7",
         "@mui/x-data-grid": "^7.16.0",
-        "@sentry/react": "^8.29.0",
+        "@sentry/react": "^8.30.0",
         "@sentry/vite-plugin": "^2.22.4",
         "cally": "^0.7.1",
         "depcheck": "^1.4.7",
+        "embla-carousel-autoplay": "^8.2.1",
         "formik": "^2.4.6",
         "lodash": "^4.17.21",
         "node-fetch": "^3.3.2",
@@ -36,6 +37,7 @@
     "devDependencies": {
         "@types/react": "^18.3.5",
         "@vitejs/plugin-react": "^4.3.1",
+        "rollup-plugin-visualizer": "^5.12.0",
         "vite": "^5.4.3"
     }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,5 @@
		app.config_from_object("django.conf:settings", namespace="CELERY")

		app.autodiscover_tasks(["INSIGHTSAPI"])

		app.log.setup()