sites endpoint

apps/establishment/serializers.py

@@ -27,6 +27,8 @@ class ContactEmailsSerializer(serializers.ModelSerializer):
 
 
 class PlateSerializer(serializers.ModelSerializer):
+
+    name_translated = serializers.CharField(allow_null=True)
     currency = CurrencySerializer(read_only=True)
 
     class Meta:

apps/location/migrations/0010_auto_20190904_0711.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2019-09-04 07:11
+
+from django.db import migrations
+import utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0009_auto_20190901_0831'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='country',
+            name='name',
+            field=utils.models.TJSONField(blank=True, default=None, help_text='{"en-GB":"some text"}', null=True, verbose_name='Name'),
+        ),
+    ]

apps/location/models.py

@@ -1,38 +1,30 @@
 """Location app models."""
 from django.conf import settings
 from django.contrib.gis.db import models
-from django.contrib.postgres.fields import JSONField
 from django.db.models.signals import post_save
 from django.db.transaction import on_commit
 from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
-from utils.models import ProjectBaseMixin, LocaleManagerMixin, SVGImageMixin
+from utils.models import ProjectBaseMixin, SVGImageMixin, TranslatedFieldsMixin, TJSONField
 
 
-class CountryManager(LocaleManagerMixin):
-    """Extended manager for Country model."""
-
-
-class Country(SVGImageMixin, ProjectBaseMixin):
+class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin):
     """Country model."""
 
-    name = JSONField(null=True, blank=True, default=None,
-                     verbose_name=_('Name'), help_text='{"en-GB":"some text"}')
+    STR_FIELD_NAME = 'name'
+
+    name = TJSONField(null=True, blank=True, default=None,
+                      verbose_name=_('Name'), help_text='{"en-GB":"some text"}')
     code = models.CharField(max_length=255, unique=True, verbose_name=_('Code'))
     low_price = models.IntegerField(default=25, verbose_name=_('Low price'))
     high_price = models.IntegerField(default=50, verbose_name=_('High price'))
 
-    objects = CountryManager()
-
     class Meta:
         """Meta class."""
 
         verbose_name_plural = _('Countries')
         verbose_name = _('Country')
 
-    def __str__(self):
-        return self.code or str(self.id)
-
 
 class Region(models.Model):
     """Region model."""

apps/main/models.py

@@ -96,6 +96,13 @@ from configuration.models import TranslationSettings
 #
 
 
+class SiteSettingsQuerySet(models.QuerySet):
+    """Extended queryset for SiteSettings model."""
+
+    def with_country(self):
+        return self.filter(country__isnull=False)
+
+
 class SiteSettings(ProjectBaseMixin):
 
     subdomain = models.CharField(max_length=255, db_index=True, unique=True,
@@ -120,6 +127,8 @@ class SiteSettings(ProjectBaseMixin):
     ad_config = models.TextField(blank=True, null=True, default=None,
                                  verbose_name=_('AD config'))
 
+    objects = SiteSettingsQuerySet.as_manager()
+
     class Meta:
         """Meta class."""
 

apps/main/serializers.py

@@ -56,6 +56,17 @@ class SiteSettingsSerializer(serializers.ModelSerializer):
         )
 
 
+class SiteSerializer(serializers.ModelSerializer):
+
+    country_name = serializers.CharField(source='country.name_translated', allow_null=True)
+
+    class Meta:
+        """Meta class."""
+
+        model = models.SiteSettings
+        fields = ('subdomain', 'site_url', 'country_name', )
+
+
 # class SiteFeatureSerializer(serializers.ModelSerializer):
 #     """Site feature serializer."""
 #

apps/main/urls.py

@@ -6,6 +6,7 @@ app = 'main'
 
 urlpatterns = [
     path('determine-site/', views.DetermineSiteView.as_view(), name='determine-site'),
+    path('sites/', views.SiteListView.as_view(), name='site-list'),
     path('site-settings/<subdomain>/', views.SiteSettingsView.as_view(), name='site-settings'),
     path('awards/', views.AwardView.as_view(), name='awards_list'),
     path('awards/<int:pk>/', views.AwardRetrieveView.as_view(), name='awards_retrieve'),

apps/main/views.py

@@ -25,7 +25,15 @@ class SiteSettingsView(generics.RetrieveAPIView):
     permission_classes = (permissions.AllowAny,)
     queryset = models.SiteSettings.objects.all()
     serializer_class = serializers.SiteSettingsSerializer
-#
+
+
+class SiteListView(generics.ListAPIView):
+    """Site settings View."""
+
+    pagination_class = None
+    permission_classes = (permissions.AllowAny,)
+    queryset = models.SiteSettings.objects.with_country()
+    serializer_class = serializers.SiteSerializer
 #
 # class FeatureViewMixin:
 #     """Feature view mixin."""