From d6b8c6191db3b956d1a416f5f6340e8b9cf3e07e Mon Sep 17 00:00:00 2001
From: alex <birukov.system@gmail.com>
Date: Thu, 30 Jan 2020 14:07:28 +0300
Subject: [PATCH] country name for csv users

---
 apps/account/models.py           | 6 ++++++
 apps/account/serializers/back.py | 4 +++-
 apps/account/views/back.py       | 2 --
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/account/models.py b/apps/account/models.py
index c43f7e19..78e1d8ad 100644
--- a/apps/account/models.py
+++ b/apps/account/models.py
@@ -475,6 +475,12 @@ class User(AbstractUser):
         self.roles.set(Role.objects.filter(id__in=ids))
         return self
 
+    @property
+    def country_name(self):
+        if self.last_country:
+            return self.last_country.country.name_translated
+        return None
+
 
 class UserRoleQueryset(models.QuerySet):
     """QuerySet for model UserRole."""
diff --git a/apps/account/serializers/back.py b/apps/account/serializers/back.py
index 6f99a03d..4081a829 100644
--- a/apps/account/serializers/back.py
+++ b/apps/account/serializers/back.py
@@ -154,6 +154,7 @@ class UserRoleSerializer(serializers.ModelSerializer):
 class UserCSVSerializer(serializers.ModelSerializer):
     created_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='date_joined')
     last_seen_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='last_login')
+    country = serializers.CharField(allow_blank=True, allow_null=True, source='country_name')
 
     class Meta:
         model = models.User
@@ -162,7 +163,8 @@ class UserCSVSerializer(serializers.ModelSerializer):
             'username',
             'email',
             'locale',
-            'last_country',
+            'country',
+            # 'last_country',
             'created_at',
             'last_seen_at',
             'last_ip',
diff --git a/apps/account/views/back.py b/apps/account/views/back.py
index 9348f9f2..49e4b81d 100644
--- a/apps/account/views/back.py
+++ b/apps/account/views/back.py
@@ -181,8 +181,6 @@ class UserCSVViewSet(ModelViewSet):
         ))
 
         for item in serializer.data:
-            print(item)
             writer.writerow(item.values())
 
         return response
-        # return Response(serializer.data)