django country admin customization

- [x] tender admin view add columns contract id, contract title, country, contract date
- [x] hide: buyer, suppplier, temp data
- [x] last_contract_date added in country api

country/admin.py

@@ -7,7 +7,6 @@
 from content.models import CountryPartner, DataImport
 
 from .models import (
-    Buyer,
     Country,
     DataProvider,
     EquityCategory,
@@ -16,8 +15,6 @@
     ImportBatch,
     Language,
     RedFlag,
-    Supplier,
-    TempDataImportTable,
     Tender,
     Topic,
 )
@@ -35,8 +32,8 @@ class EquityAdmin(admin.ModelAdmin):
 
 admin.site.register(Language)
 admin.site.register(Topic)
-admin.site.register(Buyer)
-admin.site.register(Supplier)
+# admin.site.register(Buyer)
+# admin.site.register(Supplier)
 admin.site.register(EquityCategory, EquityAdmin)
 
 
@@ -165,7 +162,7 @@ class DataProviderAdmin(admin.ModelAdmin):
     list_display = ("name", "country", "website")
 
 
-@admin.register(TempDataImportTable)
+# @admin.register(TempDataImportTable)
 class TempDataImportTableAdmin(admin.ModelAdmin):
     list_editable = (
         "contract_date",
@@ -274,7 +271,7 @@ class Meta:
 class TenderAdmin(admin.ModelAdmin):
     readonly_fields = ("contract_value_usd",)
     form = TenderForm
-    list_display = ("id", "contract_id", "contract_title")
+    list_display = ("contract_id", "contract_title", "country", "contract_date", "contract_value_usd")
     search_fields = ("id", "contract_id", "contract_title")
     inlines = [
         GoodsAndServicesInline,

country/serializers.py

@@ -1,4 +1,4 @@
-from django.db.models import Count, Sum
+from django.db.models import Count, Max, Sum
 from rest_framework import serializers
 from rest_framework_serializer_extensions.serializers import SerializerExtensionsMixin
 
@@ -28,6 +28,7 @@ class CountrySerializer(serializers.HyperlinkedModelSerializer, SerializerExtens
     amount_usd = serializers.SerializerMethodField()
     amount_local = serializers.SerializerMethodField()
     tender_count = serializers.SerializerMethodField()
+    last_contract_date = serializers.SerializerMethodField()
 
     class Meta:
         model = Country
@@ -76,6 +77,16 @@ def get_tender_count(self, obj):
         except Exception:
             return obj.tenders.all().aggregate(tender_count=Count("id"))["tender_count"]
 
+    def get_last_contract_date(self, obj):
+        try:
+            if obj.last_contract_date:
+                return obj.last_contract_date
+            else:
+                return None
+
+        except Exception:
+            return obj.tenders.all().aggregate(contract_last_date=Max("contract_date"))["contract_last_date"]
+
 
 class LanguageSerializer(serializers.ModelSerializer, SerializerExtensionsMixin):
     class Meta: