Merge branch 'develop' into feature/GM-176_standard_user

apps/main/methods.py

@@ -1,8 +1,10 @@
 """Main app methods."""
 import logging
+from typing import Tuple, Optional
 
 from django.conf import settings
 from django.contrib.gis.geoip2 import GeoIP2, GeoIP2Exception
+from geoip2.models import City
 
 from main import models
 
@@ -39,17 +41,16 @@ def determine_country_code(ip_addr):
     return country_code
 
 
-def determine_coordinates(ip_addr):
+def determine_coordinates(ip_addr: str) -> Tuple[Optional[float], Optional[float]]:
-    longitude, latitude = None, None
     if ip_addr:
         try:
             geoip = GeoIP2()
-            longitude, latitude = geoip.coords(ip_addr)
+            return geoip.coords(ip_addr)
         except GeoIP2Exception as ex:
-            logger.info(f'GEOIP Exception: {ex}. ip: {ip_addr}')
+            logger.warning(f'GEOIP Exception: {ex}. ip: {ip_addr}')
         except Exception as ex:
-            logger.error(f'GEOIP Base exception: {ex}')
+            logger.warning(f'GEOIP Base exception: {ex}')
-    return longitude, latitude
+    return None, None
 
 
 def determine_user_site_url(country_code):
@@ -73,3 +74,12 @@ def determine_user_site_url(country_code):
         return site.site_url
 
 
+def determine_user_city(ip_addr: str) -> Optional[City]:
+    try:
+        geoip = GeoIP2()
+        return geoip.city(ip_addr)
+    except GeoIP2Exception as ex:
+        logger.warning(f'GEOIP Exception: {ex}. ip: {ip_addr}')
+    except Exception as ex:
+        logger.warning(f'GEOIP Base exception: {ex}')
+    return None

apps/main/urls.py

@@ -6,6 +6,7 @@ app = 'main'
 
 urlpatterns = [
     path('determine-site/', views.DetermineSiteView.as_view(), name='determine-site'),
+    path('determine-location/', views.DetermineLocation.as_view(), name='determine-location'),
     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'),

apps/main/views.py

@@ -3,6 +3,7 @@ from rest_framework import generics, permissions
 from rest_framework.response import Response
 from main import methods, models, serializers
 from utils.serializers import EmptySerializer
+from django.http import Http404
 
 
 class DetermineSiteView(generics.GenericAPIView):
@@ -18,6 +19,22 @@ class DetermineSiteView(generics.GenericAPIView):
         return Response(data={'url': url})
 
 
+class DetermineLocation(generics.GenericAPIView):
+    """Determine user's location."""
+
+    permission_classes = (permissions.AllowAny,)
+    serializer_class = EmptySerializer
+
+    def get(self, request, *args, **kwargs):
+        user_ip = methods.get_user_ip(request)
+        longitude, latitude = methods.determine_coordinates(user_ip)
+        city = methods.determine_user_city(user_ip)
+        if longitude and latitude and city:
+            return Response(data={'latitude': latitude, 'longitude': longitude, 'city': city})
+        else:
+            raise Http404
+
+
 class SiteSettingsView(generics.RetrieveAPIView):
     """Site settings View."""
 
@@ -34,6 +51,8 @@ class SiteListView(generics.ListAPIView):
     permission_classes = (permissions.AllowAny,)
     queryset = models.SiteSettings.objects.with_country()
     serializer_class = serializers.SiteSerializer
+
+
 #
 # class FeatureViewMixin:
 #     """Feature view mixin."""

docker-compose.yml

@@ -14,6 +14,7 @@ services:
       - "5436:5432"
     volumes:
       - gm-db:/var/lib/postgresql/data/
+
   elasticsearch:
     image: elasticsearch:7.3.1
     volumes:
@@ -27,11 +28,18 @@ services:
       - discovery.type=single-node
       - xpack.security.enabled=false
 
-  # RabbitMQ
+  # Redis
-  rabbitmq:
+  redis:
-    image: rabbitmq:latest
+    image: redis:2.8.23
     ports:
-      - "5672:5672"
+      - "6379:6379"
+
+  # RabbitMQ
+  #rabbitmq:
+  #  image: rabbitmq:latest
+  #  ports:
+  #    - "5672:5672"
+
   # Celery
   worker:
     build: .
@@ -47,7 +55,9 @@ services:
       - .:/code
     links:
       - db
-      - rabbitmq
+#      - rabbitmq
+      - redis
+
   worker_beat:
     build: .
     command: ./run_celery_beat.sh
@@ -62,7 +72,8 @@ services:
       - .:/code
     links:
       - db
-      - rabbitmq
+#      - rabbitmq
+      - redis
   # App: G&M
   gm_app:
     build: .
@@ -76,7 +87,8 @@ services:
       - DB_PASSWORD=postgres
     depends_on:
       - db
-      - rabbitmq
+#      - rabbitmq
+      - redis
       - worker
       - worker_beat
       - elasticsearch

project/settings/base.py

@@ -317,7 +317,10 @@ REDOC_SETTINGS = {
 }
 
 # CELERY
-BROKER_URL = 'amqp://rabbitmq:5672'
+# RabbitMQ
+# BROKER_URL = 'amqp://rabbitmq:5672'
+# Redis
+BROKER_URL = 'redis://localhost:6379/1'
 CELERY_RESULT_BACKEND = BROKER_URL
 CELERY_BROKER_URL = BROKER_URL
 CELERY_ACCEPT_CONTENT = ['application/json']

project/settings/local.py

@@ -6,7 +6,7 @@ ALLOWED_HOSTS = ['*', ]
 
 SEND_SMS = False
 SMS_CODE_SHOW = True
-USE_CELERY = False
+USE_CELERY = True
 
 SCHEMA_URI = 'http'
 DEFAULT_SUBDOMAIN = 'www'
@@ -14,7 +14,10 @@ SITE_DOMAIN_URI = 'testserver.com:8000'
 DOMAIN_URI = '0.0.0.0:8000'
 
 # CELERY
-BROKER_URL = 'amqp://rabbitmq:5672'
+# RabbitMQ
+# BROKER_URL = 'amqp://rabbitmq:5672'
+# Redis
+BROKER_URL = 'redis://redis:6379/1'
 CELERY_RESULT_BACKEND = BROKER_URL
 CELERY_BROKER_URL = BROKER_URL
 

requirements/base.txt

@@ -15,8 +15,6 @@ djangorestframework==3.9.4
 markdown
 django-filter==2.1.0
 djangorestframework-xml
-celery
-amqp>=2.4.0
 geoip2==2.9.0
 django-phonenumber-field[phonenumbers]==2.1.0
 
@@ -34,3 +32,8 @@ djangorestframework-simplejwt==4.3.0
 django-elasticsearch-dsl>=7.0.0,<8.0.0
 django-elasticsearch-dsl-drf==0.20.2
 sentry-sdk==0.11.2
+
+# temp solution
+redis==3.2.0
+amqp>=2.4.0
+celery==4.3.0rc2