more fixes

care/users/admin.py

@@ -37,7 +37,24 @@ class UserAdmin(auth_admin.UserAdmin, ExportCsvMixin):
     form = UserChangeForm
     add_form = UserCreationForm
     actions = ["export_as_csv"]
-    fieldsets = (("User", {"fields": ("user_type", "local_body", "district", "state", "phone_number", "alt_phone_number", "gender", "verified")}), *auth_admin.UserAdmin.fieldsets)
+    fieldsets = (
+        (
+            "User",
+            {
+                "fields": (
+                    "user_type",
+                    "local_body",
+                    "district",
+                    "state",
+                    "phone_number",
+                    "alt_phone_number",
+                    "gender",
+                    "verified",
+                )
+            },
+        ),
+        *auth_admin.UserAdmin.fieldsets,
+    )
     list_display = ["username", "is_superuser"]
     search_fields = ["first_name", "last_name"]
 
@@ -73,7 +90,10 @@ class UserFlagForm(forms.ModelForm):
         )
 
         class Meta:
-            fields = "__all__"
+            fields = (
+                "user",
+                "flag",
+            )
             model = UserFlag
 
     form = UserFlagForm

care/users/api/serializers/user.py

@@ -87,7 +87,10 @@ def validate(self, attrs):
 
         return validated
 
+
 MIN_USER_AGE = 16
+
+
 class UserCreateSerializer(SignUpSerializer):
     password = serializers.CharField(required=False)
     facilities = serializers.ListSerializer(
@@ -127,16 +130,17 @@ def validate_date_of_birth(self, value):
         return value
 
     def validate_facilities(self, facility_ids):
-        if facility_ids and len(facility_ids) != Facility.objects.filter(external_id__in=facility_ids).count():
-
+        if (
+            facility_ids
+            and len(facility_ids)
+            != Facility.objects.filter(external_id__in=facility_ids).count()
+        ):
             available_facility_ids = Facility.objects.filter(
                 external_id__in=facility_ids,
             ).values_list("external_id", flat=True)
             not_found_ids = list(set(facility_ids) - set(available_facility_ids))
             error = f"Some facilities are not available - {', '.join([str(_id) for _id in not_found_ids])}"
-            raise serializers.ValidationError(
-                error
-            )
+            raise serializers.ValidationError(error)
         return facility_ids
 
     def validate_ward(self, value):
@@ -196,7 +200,10 @@ def validate(self, attrs):
                     },
                 )
 
-        if self.context["created_by"].user_type in User.READ_ONLY_TYPES and validated["user_type"] not in User.READ_ONLY_TYPES:
+        if (
+            self.context["created_by"].user_type in User.READ_ONLY_TYPES
+            and validated["user_type"] not in User.READ_ONLY_TYPES
+        ):
             raise exceptions.ValidationError(
                 {
                     "user_type": [

care/users/migrations/0010_rename_skills.py

@@ -27,7 +27,6 @@ def fix_skill_name(apps, schema_editor):
         Skill.objects.filter(name=old).update(name=new)
 
 
-
 class Migration(migrations.Migration):
     dependencies = [
         ("users", "0009_userfacilityallocation"),

care/users/migrations/0017_userflag.py

@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0016_upgrade_user_skills"),
     ]

care/users/migrations/0018_user_profile_picture_url.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("users", "0017_userflag"),
     ]

care/users/tests/test_api.py

@@ -159,7 +159,7 @@ def test_user_can_read_all_users_within_accessible_facility(self):
 
     def test_user_can_modify_themselves(self):
         """Test user can modify the attributes for themselves"""
-        password = "new_password" # noqa S105
+        password = "new_password"  # noqa S105
         username = self.user.username
         response = self.client.patch(
             f"/api/v1/users/{username}/",

care/users/tests/test_models.py

@@ -29,7 +29,6 @@ def setUpTestData(cls):
         """
         cls.state = State.objects.create(name="kerala")
 
-
     def test_object_name(self):
         """Test that the correct format is returned while printing the object"""
         state = self.state
@@ -45,7 +44,6 @@ def setUpTestData(cls):
         state = State.objects.create(name="uttar pradesh")
         cls.district = District.objects.create(state=state, name="name")
 
-
     def test_object_name(self):
         """Test that the correct format is returned while printing the object"""
         district = self.district
@@ -67,7 +65,6 @@ def setUpTestData(cls):
             district=district, name="blabla", body_type=1
         )
 
-
     def test_object_name(self):
         """Test that the correct format is returned while printing the object"""
         local_body = self.local_body
@@ -93,4 +90,3 @@ def setUpTestData(cls):
             gender=1,
             date_of_birth=date(2005, 1, 1),
         )
-

config/caches.py

@@ -3,14 +3,14 @@
 
 
 class DummyCache(dummy.DummyCache):
-    def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None, nx=None):  # noqa: ARG002
+    def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None, nx=None):
         super().set(key, value, timeout, version)
         # mimic the behavior of django_redis with setnx, for tests
         return True
 
 
 class LocMemCache(locmem.LocMemCache):
-    def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None, nx=None):  # noqa: ARG002
+    def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None, nx=None):
         super().set(key, value, timeout, version)
         # mimic the behavior of django_redis with setnx, for tests
         return True

config/settings/local.py

@@ -14,7 +14,7 @@
 # WhiteNoise
 # ------------------------------------------------------------------------------
 # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development
-INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS
+INSTALLED_APPS = ["whitenoise.runserver_nostatic", *INSTALLED_APPS]
 
 # django-silk
 # ------------------------------------------------------------------------------