API fixes

- [x] Country code fixes in Total Contracts View
- [x] Response data type from [] to ""

CP-236 Country dataset delete functionality

- [x] Deleted temp table data, tender, goodsservices, red-flag, equity
- [x] Added confirmation box while deleting the dataset.
- [x] Contract api and contract-status fixes

country/serializers.py

@@ -1,6 +1,7 @@
 from django.db.models import Sum
 from rest_framework import serializers
 from rest_framework_serializer_extensions.serializers import SerializerExtensionsMixin
+
 from .models import Buyer, Country, Language, OverallSummary, RedFlag, Supplier, Tender
 
 
@@ -434,6 +435,7 @@ def get_buyer_code(self, obj):
     def get_goods_services(self, obj):
         a = obj.goods_services.all().values(
             "goods_services_category__category_name",
+            "contract_desc",
             "contract_value_usd",
             "quantity_units",
             "ppu_including_vat",

vizualization/views.py

@@ -519,7 +519,7 @@ def get(self, request):
                     "amount_local": i["local"] if i["local"] else 0,
                     "amount_usd": i["usd"] if i["usd"] else 0,
                     "tender_count": i["count"],
-                    "local_currency_code": i["country__currency"] if "country__currency" in i else [],
+                    "local_currency_code": i["country__currency"] if "country__currency" in i else "",
                     "procedure": "direct",
                 }
         else:
@@ -537,7 +537,7 @@ def get(self, request):
                     "amount_local": i["local"] if i["local"] else 0,
                     "amount_usd": i["usd"] if i["usd"] else 0,
                     "tender_count": i["count"],
-                    "local_currency_code": i["country__currency"] if "country__currency" in i else [],
+                    "local_currency_code": i["country__currency"] if "country__currency" in i else "",
                     "procedure": "open",
                 }
         else:
@@ -589,7 +589,7 @@ def get(self, request):
 
         if country:
             try:
-                country_res = Country.objects.get(name=country)
+                country_res = Country.objects.get(country_code_alpha_2=country)
                 currency_code = country_res.currency
             except Exception as e:
                 print(e)
@@ -2001,7 +2001,7 @@ def get(self, request):
                 Tender.objects.filter(**filter_args)
                 .annotate(month=TruncMonth("contract_date"))
                 .values(
-                    "country__country_code",
+                    "country__country_code_alpha_2",
                     "country__currency",
                     "month",
                     "goods_services__goods_services_category__id",
@@ -2016,7 +2016,7 @@ def get(self, request):
                 Tender.objects.filter(**filter_args)
                 .annotate(month=TruncMonth("contract_date"))
                 .values(
-                    "country__country_code",
+                    "country__country_code_alpha_2",
                     "country__currency",
                     "month",
                     "goods_services__goods_services_category__id",
@@ -2029,7 +2029,7 @@ def get(self, request):
                 {
                     "amount_local": i["local"],
                     "amount_usd": i["usd"],
-                    "country_code": i["country__country_code"],
+                    "country_code": i["country__country_code_alpha_2"],
                     "currency": i["country__currency"],
                     "month": i["month"].strftime("%Y-%m"),
                     "product_id": i["goods_services__goods_services_category__id"],
@@ -2044,7 +2044,7 @@ def get(self, request):
             amount_usd_local = (
                 Tender.objects.annotate(month=TruncMonth("contract_date"))
                 .values(
-                    "country__country_code",
+                    "country__country_code_alpha_2",
                     "country__currency",
                     "month",
                     "goods_services__goods_services_category__id",
@@ -2058,7 +2058,7 @@ def get(self, request):
             count = (
                 Tender.objects.annotate(month=TruncMonth("contract_date"))
                 .values(
-                    "country__country_code",
+                    "country__country_code_alpha_2",
                     "country__currency",
                     "month",
                     "goods_services__goods_services_category__id",
@@ -2071,7 +2071,7 @@ def get(self, request):
                 {
                     "amount_local": i["local"],
                     "amount_usd": i["usd"],
-                    "country_code": i["country__country_code"],
+                    "country_code": i["country__country_code_alpha_2"],
                     "currency": i["country__currency"],
                     "month": i["month"].strftime("%Y-%m"),
                     "product_id": i["goods_services__goods_services_category__id"],