Cherry pick

api/serializers.py

@@ -5,10 +5,13 @@
 from rest_framework_json_api import serializers
 
 from share import models
-from share.models import ProviderRegistration, SiteBanner, CeleryTaskResult, HarvestLogs
 
-from api import fields
+from share.models import ProviderRegistration, SiteBanner, CeleryTaskResult, HarvestLog
+
 
+from share.models import ProviderRegistration, SiteBanner, CeleryTaskResult, logs
+
+from api import fields
 
 class BaseShareSerializer(serializers.ModelSerializer):
 
@@ -147,6 +150,7 @@ class Meta:
         model = models.SourceConfig
         fields = '__all__'
 
+
 class SiteBannerSerializer(ShareModelSerializer):
     color = serializers.SerializerMethodField()
 

api/views/__init__.py

@@ -5,5 +5,5 @@
 from .registration import *  # noqa
 from .schema import *  # noqa
 from .banner import *  # noqa
-from .harvestlogs import *  # noqa
+from .harvestlog import *  # noqa
 from .sourceConfig import * # noqa

api/views/sourceConfig.py

@@ -1,10 +1,33 @@
 from rest_framework import viewsets
-# trying to fix shit
+from api.views import ShareObjectViewSet
+from rest_framework import filters
 from api.serializers import SourceConfigSerializer
 from share.models import SourceConfig
+from api.pagination import FuzzyPageNumberPagination
+from django.db.models import Count
+from django.db.models import Aggregate
+from share.models import HarvestLog
+from django.db.models import OuterRef, Subquery
+from django.db.models import IntegerField
 
-class SourceConfigViewSet(viewsets.ReadOnlyModelViewSet):
+class SourceConfigViewSet(ShareObjectViewSet):
     serializer_class = SourceConfigSerializer
+    pagination_class = FuzzyPageNumberPagination
+    queryset = SourceConfig.objects.all()
 
-    def get_queryset(self):
-        return SourceConfig.objects.all()
+    # def get_queryset(self):
+    #     recent_harvests = HarvestLog.objects.filter(
+    #         source_config_id = OuterRef(OuterRef('id')),
+    #         status__in = [HarvestLog.STATUS.failed, HarvestLog.STATUS.succeeded]
+    #         ).order_by('-date_started')[:10]
+    #     recent_fails = HarvestLog.objects.filter(
+    #         status = HarvestLog.STATUS.failed,
+    #         id__in = Subquery(recent_harvests.values('id')),
+    #         # output_field = models.IntegerField())
+    #         )
+    #     queryset = SourceConfig.objects.all().annotate(
+    #         fails=Count(Subquery(recent_fails.values('id')),
+    #         # output_field = models.IntegerField()))
+    #         )
+    #     queryset = queryset.order_by('fails')
+    #     return queryset

api/views/workflow.py

@@ -56,6 +56,7 @@ class SourceViewSet(viewsets.ReadOnlyModelViewSet):
     def get_queryset(self):
         return Source.objects.exclude(icon='').exclude(is_deleted=True)
 
+
     def create(self, request, *args, **kwargs):
         try:
             long_title = request.data['long_title']
@@ -129,6 +130,7 @@ def create(self, request, *args, **kwargs):
         )
 
 
+
 class NormalizedDataViewSet(viewsets.ModelViewSet):
     """View showing all normalized data in the SHARE Dataset.