Feature/1133: interoperability (#1210)

* Add more field to Observation Serializer

* Add pagination to site list

* Fix tests

* Fix another test

* Add test settings

Author: zamuzakki

Makefile

@@ -38,14 +38,14 @@ test:
 	@echo "------------------------------------------------------------------"
 	@echo "Running test"
 	@echo "------------------------------------------------------------------"7
-	@docker compose exec django bash -c "python manage.py test"
+	@docker compose exec django bash -c "python manage.py test --settings=minisass.settings.test"
 
 dev:
 	@echo
 	@echo "------------------------------------------------------------------"
 	@echo "Running in dev mode"
 	@echo "------------------------------------------------------------------"
-	@docker compose ${ARGS} --profile dev up -d
+	@docker compose ${ARGS} --profile dev --env-file .env up -d
 
 frontend-dev:
 	@echo

django_project/manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "minisass.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "minisass.settings.default")
 
     from django.core.management import execute_from_command_line
 

django_project/minisass/settings/__init__.py

@@ -151,7 +151,7 @@
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
             os.path.join(FRONTEND_PATH, 'templates'),
-            os.path.join(PROJECT_PATH, 'templates'),
+            os.path.join(PROJECT_PATH, '../templates'),
             os.path.join(PROJECT_PATH.replace('/minisass', '/minisass_authentication'), 'templates', 'registration'),
             os.path.join(PROJECT_PATH, 'monitor' , 'templates' , 'monitor')
         ],
@@ -287,3 +287,5 @@
 MINIO_SECRET_KEY = os.getenv("MINIO_SECRET_KEY") or os.getenv("AWS_SECRET_ACCESS_KEY")
 MINIO_AI_BUCKET = os.getenv("MINIO_BUCKET")
 MINIO_ENDPOINT = os.getenv("MINIO_URL")
+
+ENABLE_GEOCODING = True

django_project/minisass/settings.py …ngo_project/minisass/settings/default.pydjango_project/minisass/settings.py renamed to django_project/minisass/settings/default.py django_project/minisass/settings.py renamed to django_project/minisass/settings/default.py

@@ -0,0 +1,3 @@
+from minisass.settings.default import *
+
+ENABLE_GEOCODING = False

django_project/minisass/settings/test.py

@@ -20,7 +20,7 @@
 # sys.path.append("/home/django/sites/miniSASS/miniSASS")
 # sys.path.append("/home/web/django_project")
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "minisass.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "minisass.settings.default")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION

django_project/minisass/wsgi.py

@@ -26,6 +26,7 @@ def create(self, validated_data):
 
 
 class UserUpdateSerializer(serializers.ModelSerializer):
+    user_id = serializers.CharField(required=False, source='id')
     username = serializers.CharField(required=False)
     email = serializers.EmailField(required=True)
     name = serializers.CharField(source='first_name')
@@ -36,7 +37,6 @@ class UserUpdateSerializer(serializers.ModelSerializer):
     is_expert = serializers.SerializerMethodField()
     upload_preference = serializers.CharField(source='userprofile.upload_preference', required=True, allow_null=False)
 
-
     def get_is_expert(self, obj):
         try:
             return obj.userprofile.is_expert
@@ -88,7 +88,7 @@ def save(self, old_user):
     class Meta:
         model = User
         fields = (
-            'username', 'email', 'name', 'surname',
+            'user_id', 'username', 'email', 'name', 'surname',
             'organisation_type', 'organisation_name', 'country', 'is_expert', 'upload_preference'
         )
 

django_project/minisass_authentication/serializers.py

@@ -186,6 +186,7 @@ def test_update_works(self):
         self.assertEquals(response.status_code, 200)
         expected_response = self.base_payload
         expected_response['is_expert'] = False
+        expected_response['user_id'] = str(self.user.id)
         self.assertEquals(
             response.json(),
             expected_response

django_project/minisass_authentication/tests/test_views.py

@@ -9,7 +9,7 @@
     activate_account,
     CheckAuthenticationStatus,
     check_registration_status,
-    user_login, 
+    UserLoginView,
     register,
     request_password_reset,
     verify_password_reset,
@@ -35,7 +35,7 @@
     path('api/reset/done/', auth_views.PasswordResetCompleteView.as_view(), name='password_reset_complete'),
     path('api/token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
     path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
-    path('api/login/', user_login, name='user_login'),
+    path('api/login/', UserLoginView.as_view(), name='user_login'),
     path('api/register/', register, name='register'),
     path('api/logout/', UserLogout.as_view(), name='user-logout'),
     path('api/user/update/', UpdateUser.as_view(), name='profile-update'),

django_project/minisass_authentication/urls.py

@@ -1,5 +1,6 @@
 from datetime import timedelta
 from django.conf import settings
+from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth import (
 	authenticate,
 	login,
@@ -123,7 +124,7 @@ def contact_us(request):
 	domain = Site.objects.get_current().domain
 
 	mail_subject = 'Contact Us'
-	message = render_to_string('contact_us.html', {
+	message = render_to_string('registration/contact_us.html', {
 		'from': email,
 		'name': name,
 		'contact': phone,
@@ -329,7 +330,7 @@ def register(request):
 					)
 
 					mail_subject = 'Activate account on miniSASS'
-					message = render_to_string('activate_account.html', {
+					message = render_to_string('registration/activate_account.html', {
 						'domain': domain,
 						'activation_link': activation_link,
 						'name': username
@@ -455,19 +456,23 @@ def create_long_lived_refresh_token(user, days=90):
 	return refresh
 
 
-@api_view(['POST'])
-def user_login(request):
-	if request.method == 'POST':
+from django.utils.decorators import method_decorator
 
+
+class UserLoginView(APIView):
+	permission_classes = [AllowAny]
+	authentication_classes = []  # No authentication required for login
+
+	def post(self, request):
 		email = request.data.get('email')
 		password = request.data.get('password')
 		app = request.GET.get('app', 'web')
-		
+
 		user = authenticate(request, email=email, password=password)
-		
+
 		if user:
 			login(request, user)
-			
+
 			access_token = RefreshToken.for_user(user).access_token
 
 			# Check if first name is "Anonymous"
@@ -477,6 +482,7 @@ def user_login(request):
 			else:
 				is_profile_updated = get_is_user_password_enforced(user, password)
 				has_consented = get_user_privacy_consent(user)
+
 			priv_pol = PrivacyPolicy.objects.order_by("-published_at").first()
 			priv_pol_ver = priv_pol.version if priv_pol else None