#19 Tests

* refactors sharing user setting by introducing share_with(user) and share_with_list(user_list) for BaseObject for a more self-explanatory sharing

compensation/forms/forms.py

@@ -380,7 +380,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                 legal=legal
             )
             acc.fundings.set(fundings)
-            acc.users.add(user)
+            acc.share_with(user)
 
             # Add the log entry to the main objects log list
             acc.log.add(action)

compensation/models.py

@@ -235,12 +235,13 @@ class Compensation(AbstractCompensation):
         Checks whether a given user has access to this object
 
         Args:
-            user ():
+            user (User): The user to be checked
 
         Returns:
 
         """
-        return self.intervention.users.filter(id=user.id)
+        # Compensations inherit their shared state from the interventions
+        return self.intervention.is_shared_with(user)
 
     def get_LANIS_link(self) -> str:
         """ Generates a link for LANIS depending on the geometry

compensation/tests/test_views.py

@@ -88,7 +88,7 @@ class CompensationViewTestCase(BaseViewTestCase):
         client = Client()
         client.login(username=self.superuser.username, password=self.superuser_pw)
         self.superuser.groups.set([])
-        self.intervention.users.set([self.superuser])
+        self.intervention.share_with_list([self.superuser])
 
         # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
         # to a user without access, since the important permissions are missing
@@ -126,7 +126,7 @@ class CompensationViewTestCase(BaseViewTestCase):
         client.login(username=self.superuser.username, password=self.superuser_pw)
         self.superuser.groups.set([])
         # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.intervention.users.set([])
+        self.intervention.share_with_list([])
 
         # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
         # to a user having shared access, since all important permissions are missing
@@ -166,7 +166,7 @@ class CompensationViewTestCase(BaseViewTestCase):
         group = self.groups.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([group])
         # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.intervention.users.set([self.superuser])
+        self.intervention.share_with_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -200,7 +200,7 @@ class CompensationViewTestCase(BaseViewTestCase):
         group = self.groups.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([group])
         # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.intervention.users.set([])
+        self.intervention.share_with_list([])
 
         success_urls = [
             self.index_url,
@@ -271,7 +271,7 @@ class EcoAccountViewTestCase(CompensationViewTestCase):
         client = Client()
         client.login(username=self.superuser.username, password=self.superuser_pw)
         self.superuser.groups.set([])
-        self.eco_account.users.set([self.superuser])
+        self.eco_account.share_with_list([self.superuser])
 
         # Since the user has no groups, it does not matter that data has been shared. There SHOULD not be any difference
         # to a user without access, since the important permissions are missing
@@ -308,7 +308,7 @@ class EcoAccountViewTestCase(CompensationViewTestCase):
         client = Client()
         client.login(username=self.superuser.username, password=self.superuser_pw)
         self.superuser.groups.set([])
-        self.eco_account.users.set([])
+        self.eco_account.share_with_list([])
 
         # Since the user has no groups, it does not matter that data is unshared. There SHOULD not be any difference
         # to a user having shared access, since all important permissions are missing
@@ -348,7 +348,7 @@ class EcoAccountViewTestCase(CompensationViewTestCase):
         group = self.groups.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([group])
         # Sharing is inherited by base intervention for compensation. Therefore configure the interventions share state
-        self.eco_account.users.set([self.superuser])
+        self.eco_account.share_with_list([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -381,7 +381,7 @@ class EcoAccountViewTestCase(CompensationViewTestCase):
         client.login(username=self.superuser.username, password=self.superuser_pw)
         group = self.groups.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([group])
-        self.eco_account.users.set([])
+        self.eco_account.share_with_list([])
 
         success_urls = [
             self.index_url,

compensation/tests/test_workflow.py

@@ -21,7 +21,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         super().setUpTestData()
 
         # Give the user shared access to the dummy intervention -> inherits the access to the compensation
-        cls.intervention.users.add(cls.superuser)
+        cls.intervention.share_with(cls.superuser)
 
         # Make sure the intervention itself would be fine with valid data
         cls.intervention = cls.fill_out_intervention(cls.intervention)
@@ -142,7 +142,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         # Add user to conservation office group and give shared access to the account
         cls.superuser.groups.add(cls.groups.get(name=ETS_GROUP))
-        cls.eco_account.users.set([cls.superuser])
+        cls.eco_account.share_with_list([cls.superuser])
 
     def test_deductability(self):
         """
@@ -154,7 +154,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         """
         # Give user shared access to the dummy intervention, which will be needed here
-        self.intervention.users.add(self.superuser)
+        self.intervention.share_with(self.superuser)
 
         # Prepare data for deduction creation
         deduct_url = reverse("compensation:acc-new-deduction", args=(self.eco_account.id,))

compensation/views/eco_account_views.py

@@ -616,7 +616,7 @@ def share_view(request: HttpRequest, id: str, token: str):
                 request,
                 _("{} has been shared with you").format(obj.identifier)
             )
-            obj.users.add(user)
+            obj.share_with(user)
         return redirect("compensation:acc-detail", id=id)
     else:
         messages.error(