Merge pull request #81 from minvws/fix/overwrite-settings-when-cloning

Overwrite settings when cloning

.ci/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       dockerfile: nl-kat-boefjes/Dockerfile.dev
       args:
         - ENVIRONMENT=dev
-    command: sh -c 'python -m pytest -vv boefjes/katalogus/tests/integration'
+    command: sh -c 'python -m pytest -v boefjes/katalogus/tests/integration'
     depends_on:
       - ci_katalogus-db
     env_file:

boefjes/katalogus/dependencies/plugins.py

@@ -110,7 +110,13 @@ def clone_settings_to_organisation(self, from_organisation: str, to_organisation
                 self.update_by_id(repository_id, plugin_id, to_organisation, enabled=False)
 
         for plugin in self.get_all(from_organisation):
+            old_settings = self.get_all_settings(to_organisation, plugin.id)
+
             for key, value in self.get_all_settings(from_organisation, plugin.id).items():
+                if key in old_settings:
+                    self.update_setting_by_key(key, value, to_organisation, plugin.id)
+                    continue
+
                 self.create_setting(key, value, to_organisation, plugin.id)
 
         for repository_id, plugins in self.plugin_enabled_store.get_all_enabled(from_organisation).items():

boefjes/katalogus/tests/integration/test_api.py

@@ -90,9 +90,10 @@ def test_clone_settings(self):
         new_org_id = "org2"
         org2 = Organisation(id=new_org_id, name="Second test Organisation")
         self.client.post("/v1/organisations/", org2.json())
+        self.client.post(f"/v1/organisations/{new_org_id}/{plug}/settings/test_key", json={"value": "second value"})
 
         # Show that the second organisation has no settings and dns-records is not enabled
-        assert self.client.get(f"/v1/organisations/{new_org_id}/{plug}/settings").json() == {}
+        assert self.client.get(f"/v1/organisations/{new_org_id}/{plug}/settings").json() == {"test_key": "second value"}
         assert self.client.get(f"/v1/organisations/{new_org_id}/plugins/{plug}").json()["enabled"] is False
 
         # Enable two boefjes that should get disabled by the cloning