diff --git a/.gitignore b/.gitignore index 90e4f23f..ea6151b0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,10 +21,8 @@ logs/ /geoip_db/ # dev -./docker-compose.override.yml +docker-compose.override.yml + celerybeat-schedule local_files celerybeat.pid -/gm_viktor.dump -/docker-compose.dump.yml -/gm_production_20191029.sql diff --git a/apps/product/views/common.py b/apps/product/views/common.py index f984a87b..764a0c97 100644 --- a/apps/product/views/common.py +++ b/apps/product/views/common.py @@ -26,6 +26,8 @@ class ProductListView(ProductBaseView, generics.ListAPIView): filter_class = filters.ProductFilterSet def get_queryset(self): + print(super().get_queryset()) + qs = super().get_queryset().with_extended_related() \ .by_country_code(self.request.country_code) return qs diff --git a/project/settings/local.py b/project/settings/local.py index c56f9042..fe521d92 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -30,31 +30,18 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION) THUMBNAIL_DEBUG = True # ADDED TRANSFER APP -INSTALLED_APPS.append('transfer.apps.TransferConfig') +# INSTALLED_APPS.append('transfer.apps.TransferConfig') # DATABASES -DATABASES = { - 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': os.environ.get('DB_NAME'), - 'USER': os.environ.get('DB_USERNAME'), - 'PASSWORD': os.environ.get('DB_PASSWORD'), - 'HOST': os.environ.get('DB_HOSTNAME'), - 'PORT': os.environ.get('DB_PORT'), - 'OPTIONS': { - 'options': '-c search_path=gm' - }, - }, - 'legacy': { - 'ENGINE': 'django.db.backends.mysql', - # 'HOST': '172.22.0.1', - 'HOST': 'mysql_db', - 'PORT': 3306, - 'NAME': 'dev', - 'USER': 'dev', - 'PASSWORD': 'octosecret123' - }, -} +# DATABASES.update({ +# 'legacy': { +# 'ENGINE': 'django.db.backends.mysql', +# # 'HOST': '172.22.0.1', +# 'HOST': 'mysql_db', +# 'PORT': 3306, +# 'NAME': 'dev', +# 'USER': 'dev', +# 'PASSWORD': 'octosecret123'}}) # LOGGING @@ -113,3 +100,6 @@ TESTING = sys.argv[1:2] == ['test'] if TESTING: ELASTICSEARCH_INDEX_NAMES = {} ELASTICSEARCH_DSL_AUTOSYNC = False + +# INSTALLED APPS +INSTALLED_APPS.append('transfer.apps.TransferConfig') \ No newline at end of file