Merge branch 'feature/collect' into 'develop'

Feature/collect

See merge request gm/gm-backend!90

apps/collection/management/commands/import_collection.py

@@ -89,8 +89,8 @@ class Command(BaseCommand):
         queryset = [vars(query) for query in raw_qs]
         for obj in queryset:
             # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first()
-            lang = Language.objects.filter(locale=obj['country_code'])
-            country = Country.objects.filter(languages__in=lang).first()
+            # lang = Language.objects.filter(locale=obj['country_code'])
+            country = Country.objects.filter(code=obj['country_code']).first()
             if country:
                 objects.append(
                     Collection(name={"en-GB": obj['title']}, collection_type=Collection.ORDINARY,

apps/collection/tests.py

@@ -1,112 +0,0 @@
-import json
-import pytz
-from datetime import datetime
-from http.cookies import SimpleCookie
-
-from rest_framework import status
-from rest_framework.test import APITestCase
-
-from account.models import User
-from collection.models import Collection, Guide
-from establishment.models import Establishment, EstablishmentType
-from location.models import Country
-
-
-class BaseTestCase(APITestCase):
-
-    def setUp(self):
-        self.username = 'sedragurda'
-        self.password = 'sedragurdaredips19'
-        self.email = 'sedragurda@desoz.com'
-        self.newsletter = True
-        self.user = User.objects.create_user(
-            username=self.username, email=self.email, password=self.password)
-        # get tokens
-        tokens = User.create_jwt_tokens(self.user)
-        self.client.cookies = SimpleCookie(
-            {'access_token': tokens.get('access_token'),
-             'refresh_token': tokens.get('refresh_token'),
-             'country_code': 'en'})
-
-
-class CollectionListTests(BaseTestCase):
-    def test_collection_list_Read(self):
-        response = self.client.get('/api/web/collections/', format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-
-class CollectionDetailTests(BaseTestCase):
-
-    def setUp(self):
-        super().setUp()
-
-        # country = Country.objects.first()
-        # if not country:
-        country = Country.objects.create(
-            name=json.dumps({"en-GB": "Test country"}),
-            code="en"
-        )
-        country.save()
-
-        self.collection = Collection.objects.create(
-            name='Test collection',
-            is_publish=True,
-            start=datetime.now(pytz.utc),
-            end=datetime.now(pytz.utc),
-            country=country,
-            slug='test-collection-slug',
-        )
-
-        self.collection.save()
-
-    def test_collection_detail_Read(self):
-        response = self.client.get(f'/api/web/collections/{self.collection.slug}/establishments/?country_code=en',
-                                   format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-
-class CollectionGuideTests(CollectionDetailTests):
-
-    def test_guide_list_Read(self):
-        response = self.client.get('/api/web/collections/guides/', format='json')
-        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
-
-
-class CollectionGuideDetailTests(CollectionDetailTests):
-
-    def setUp(self):
-        super().setUp()
-        self.guide = Guide.objects.create(
-            collection=self.collection,
-            start=datetime.now(pytz.utc),
-            end=datetime.now(pytz.utc)
-        )
-        self.guide.save()
-
-    def test_guide_detail_Read(self):
-        response = self.client.get(f'/api/web/collections/guides/{self.guide.id}/', format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-
-class CollectionWebHomeTests(CollectionDetailTests):
-    def setUp(self):
-        super().setUp()
-        self.establishment_type = EstablishmentType.objects.create(name="Test establishment type")
-
-        for i in range(1, 5):
-            setattr(self, f"establishment{i}",
-                    Establishment.objects.create(
-                        name=f"Test establishment {i}",
-                        establishment_type_id=self.establishment_type.id,
-                        is_publish=True,
-                        slug=f"test-establishment-{i}"
-                    )
-                )
-
-            getattr(self, f"establishment{i}").collections.add(self.collection)
-
-    def test_collection_list_filter(self):
-        response = self.client.get('/api/web/collections/?country_code=en', format='json')
-        data = response.json()
-        self.assertIn('count', data)
-        self.assertGreater(data['count'], 0)

apps/collection/transfer.py

@@ -1,33 +0,0 @@
-"""
-Структура fields:
-key - поле в таблице postgres
-value - поле или группа полей в таблице legacy
-
-В случае передачи группы полей каждое поле представляет собой кортеж, где:
-field[0] - название аргумента
-field[1] - название поля в таблице legacy
-Опционально: field[2] - тип данных для преобразования
-
-"""
-card = {
-    "Collection": {
-        "data_type": "objects",
-        "dependencies": ("Country", ),
-        "fields": {
-            "Collections": {
-                # нету аналогов для полей description, start и end
-                "name": "title",
-                "slug": "slug",
-                "block_size": ("geometries", "django.db.models.JSONField"),
-                "is_publish": ("active", "django.db.models.BooleanField"),
-                "image_url": ("attachment_file_name", "django.db.models.URLField")
-            }
-        },
-        "relations": {
-            # "country": "Country",
-        }
-    },
-
-}
-
-used_apps = ("location", )