Merge pull request #380 from hotosm/feature/user-last-login

Feat : User Last Login

Author: kshitijrajsharma

backend/core/serializers.py

@@ -11,8 +11,6 @@
 # from .tasks import train_model
 
 
-
-
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = OsmUser
@@ -65,9 +63,11 @@ def to_representation(self, instance):
         # get default
         ret = super().to_representation(instance)
         # For GET requests, replace the user field with detailed UserSerializer data
-        if self.context.get('request') and self.context['request'].method == 'GET':
-            ret['user'] = UserSerializer(instance.user).data
+        if self.context.get("request") and self.context["request"].method == "GET":
+            ret["user"] = UserSerializer(instance.user).data
         return ret
+
+
 class ModelSerializer(serializers.ModelSerializer):
     user = UserSerializer(read_only=True)
     accuracy = serializers.SerializerMethodField()
@@ -453,6 +453,7 @@ class Meta:
             "username",
             "email",
             "date_joined",
+            "last_login",
             "img_url",
             "notifications_delivery_methods",
             "newsletter_subscription",

backend/login/views.py

@@ -3,6 +3,7 @@
 from core.serializers import UserStatsSerializer
 from django.conf import settings
 from django.http import JsonResponse
+from django.utils import timezone
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
 from login.authentication import OsmAuthentication
@@ -59,7 +60,11 @@ class GetMyData(APIView):
     permission_classes = [IsOsmAuthenticated]
 
     def get(self, request, format=None):
-        serialized_field = UserStatsSerializer(instance=request.user)
+
+        user = request.user
+        user.last_login = timezone.now()
+        user.save(update_fields=["last_login"])
+        serialized_field = UserStatsSerializer(instance=user)
         return Response(serialized_field.data, status=status.HTTP_201_CREATED)
 
     @swagger_auto_schema(

infra/systemd/Readme.md

@@ -0,0 +1,10 @@
+### Systemd templates
+
+
+Services required to setup fAIr in VM ( Dev env ).
+
+if frontend is hosted with nginx : 
+
+```bash
+sudo systemctl restart gunicorn && sudo systemctl restart workers && sudo nginx -t && sudo systemctl restart nginx && sudo systemctl restart django-q
+```

infra/systemd/django-q.service

@@ -0,0 +1,22 @@
+[Unit]
+Description=Django Q Cluster
+After=network.target
+
+[Service]
+User=root
+Group=www-data
+Environment=PROJ_LIB=/usr/local/envs/fair/share/proj
+Environment=CONDA_PYTHON_EXE=/usr/local/bin/python
+Environment=LD_LIBRARY_PATH=:/usr/local/lib/:/usr/local/envs/fair/lib/
+Environment=LC_CTYPE=C.UTF-8
+Environment=CONDA_DEFAULT_ENV=fair
+Environment=GDAL_DATA=/usr/local/envs/fair/share/gdal
+Environment=RAMP_HOME=/home/fAIr-utilities
+WorkingDirectory=/home/kshitij/fAIr/backend
+ExecStart=/usr/local/envs/fair/bin/python manage.py qcluster
+Restart=always
+RestartSec=5
+
+
+[Install]
+WantedBy=multi-user.target

infra/systemd/django.service

@@ -0,0 +1,33 @@
+[Unit]
+Description=gunicorn daemon
+Requires=gunicorn.socket
+After=network.target
+
+[Service]
+User=root
+Group=www-data
+
+# Environment variables
+EnvironmentFile=/home/kshitij/fAIr/backend/.env
+
+Environment=DEBUG=True
+Environment=PROJ_LIB=/usr/local/envs/fair/share/proj
+Environment=CONDA_PYTHON_EXE=/usr/local/bin/python
+Environment=LD_LIBRARY_PATH=:/usr/local/lib/:/usr/local/envs/fair/lib/
+Environment=LC_CTYPE=C.UTF-8
+Environment=CONDA_DEFAULT_ENV=fair
+Environment=GDAL_DATA=/usr/local/envs/fair/share/gdal
+
+
+# Working directory
+WorkingDirectory=/home/kshitij/fAIr/backend
+
+# Gunicorn startup
+ExecStart=/usr/local/envs/fair/bin/gunicorn \
+          --access-logfile - \
+          --workers 3 \
+          --bind unix:/run/gunicorn.sock \
+          aiproject.wsgi:application --timeout 180 --log-level debug
+
+[Install]
+WantedBy=multi-user.target

infra/systemd/workers.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=Celery Service
+After=network.target
+
+[Service]
+Type=simple
+User=root
+Group=www-data
+EnvironmentFile=/etc/default/workers
+Environment=CONDA_PREFIX=/usr/local/envs/fair
+Environment=PYTHON_HOME=/usr/local/envs/fair/bin/python
+WorkingDirectory=/home/kshitij/fAIr/backend
+ExecStart=/bin/sh -c '${CELERY_BIN} -A ${CELERY_APP} worker --pool=threads --concurrency=1 --hostname=worker@fair-dev -Q ramp_training,yolo_training'
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target