Merge pull request #1733 from IFRCGo/feature/loan-dref-validation

Feature/loan dref validation

Author: szabozoltan69

api/drf_views.py

@@ -126,6 +126,8 @@
 
     CountryOfFieldReportToReviewSerializer,
 )
+from api.filter_set import UserFilterSet
+
 from .logger import logger
 
 
@@ -1106,3 +1108,15 @@ class CountryOfFieldReportToReviewViewset(viewsets.ReadOnlyModelViewSet):
     class Meta:
         model = CountryOfFieldReportToReview
         fields = ('country_id')
+
+
+class UsersViewset(viewsets.ReadOnlyModelViewSet):
+    """
+    List all active users
+    """
+    serializer_class = UserSerializer
+    permission_classes = [IsAuthenticated]
+    filterset_class = UserFilterSet
+
+    def get_queryset(self):
+        return User.objects.filter(is_active=True)

api/filter_set.py

@@ -0,0 +1,11 @@
+import django_filters as filters
+
+from django.contrib.auth.models import User
+
+
+class UserFilterSet(filters.FilterSet):
+    name = filters.CharFilter(field_name='username', lookup_expr='icontains')
+
+    class Meta:
+        model = User
+        fields = ()

dref/serializers.py

@@ -870,6 +870,11 @@ def create(self, validated_data):
             validated_data["people_in_need"] = dref_operational_update.people_in_need
             validated_data["ns_respond_date"] = dref_operational_update.ns_respond_date
             validated_data["assessment_report"] = dref_operational_update.assessment_report
+
+            if validated_data["type_of_dref"] == Dref.DrefType.LOAN:
+                raise serializers.ValidationError(
+                    gettext("Can\'t create final report for dref type %s" % Dref.DrefType.LOAN)
+                )
             dref_final_report = super().create(validated_data)
             # XXX: Copy files from DREF (Only nested serialized fields)
             nested_serialized_file_fields = [
@@ -957,6 +962,11 @@ def create(self, validated_data):
             validated_data["people_in_need"] = dref.people_in_need
             validated_data["event_text"] = dref.event_text
             validated_data["ns_respond_date"] = dref.ns_respond_date
+
+            if validated_data["type_of_dref"] == Dref.DrefType.LOAN:
+                raise serializers.ValidationError(
+                    gettext("Can\'t create final report for dref type %s" % Dref.DrefType.LOAN)
+                )
             dref_final_report = super().create(validated_data)
             # XXX: Copy files from DREF (Only nested serialized fields)
             nested_serialized_file_fields = [

dref/test_views.py

@@ -1083,3 +1083,30 @@ def test_concurrent_dref_operational_update(self):
         self.authenticate(user1)
         response = self.client.get(dref_url)
         self.assert_200(response)
+
+    def test_dref_type_loan(self):
+        user1, _ = UserFactory.create_batch(2)
+        dref = DrefFactory.create(
+            title="Test Title",
+            created_by=self.user,
+            is_published=True,
+            type_of_dref=Dref.DrefType.LOAN
+        )
+        dref.users.add(user1)
+        old_count = DrefFinalReport.objects.count()
+        url = "/api/v2/dref-final-report/"
+        data = {
+            "dref": dref.id,
+        }
+        self.authenticate(self.user)
+        response = self.client.post(url, data=data)
+        self.assert_400(response)
+
+        # update the dref type to other
+        dref.type_of_dref = Dref.DrefType.ASSESSMENT
+        dref.save(update_fields=['type_of_dref'])
+
+        self.authenticate(self.user)
+        response = self.client.post(url, data=data)
+        self.assert_201(response)
+        self.assertEqual(DrefFinalReport.objects.count(), old_count + 1)

dref/views.py

@@ -174,16 +174,6 @@ def get(self, request, version=None):
             "national_society_actions": [
                 {"key": action[0], "value": action[1]} for action in NationalSocietyAction.Title.choices
             ],
-            "users": [
-                {
-                    "id": user.id,
-                    "email": user.email,
-                    "username": user.username,
-                    "first_name": user.first_name,
-                    "last_name": user.last_name,
-                }
-                for user in User.objects.filter(is_active=True)
-            ],
             "type_of_dref": [{"key": dref_type.value, "value": dref_type.label} for dref_type in Dref.DrefType]
         }
         return response.Response(options)

main/urls.py

@@ -159,6 +159,7 @@
 router.register(r'donor-group', flash_views.DonorGroupViewSet, basename='donor_group')
 router.register(r'donor', flash_views.DonorsViewSet, basename='donor')
 router.register(r'share-flash-update', flash_views.ShareFlashUpdateViewSet, basename='share_flash_update')
+router.register(r'users', api_views.UsersViewset, basename='users')
 
 # Dref apis
 router.register(r'dref', dref_views.DrefViewSet, basename='dref')