test3

lembaga/views.py

@@ -11,14 +11,14 @@ from django_filters.rest_framework import DjangoFilterBackend
 @api_view(["GET"])  # pragma: no cover
 @permission_classes([AllowAny])
 def get_lembaga(request, time):
-    # current_year = 2021
-
-    # if (time == "newer"):
-    #     supervisor_lembaga = Lembaga.objects.filter(last_activity = 0)
-    #     # supervisor_lembaga2 = Lembaga.objects.filter(last_activity = None)
-    #     # supervisor_lembaga = supervisor_lembaga1 | supervisor_lembaga2
-    # elif (time == "older"):
-    supervisor_lembaga = Lembaga.objects.filter(last_insertion = None)
+    current_year = 2021
+
+    if (time == "newer"):
+        supervisor_lembaga1 = Lembaga.objects.filter(last_insertion__range = (current_year - 5, current_year))
+        supervisor_lembaga2 = Lembaga.objects.filter(last_insertion = None)
+        supervisor_lembaga = supervisor_lembaga1 | supervisor_lembaga2
+    elif (time == "older"):
+        supervisor_lembaga = Lembaga.objects.filter(last_insertion__range = (0, current_year - 6))
 
     serializer = LembagaSerializer(supervisor_lembaga, context={'request': request}, many=True)
     response = serializer.data