Almost there, just need to writ this test

Author: cyrillkuettel

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: mixed-line-ending
@@ -15,7 +15,7 @@ repos:
         exclude: .pre-commit-config.yaml
       - id: pt_structure
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.8
+    rev: v0.6.9
     hooks:
       - id: ruff
         args: [ "--fix" ]
@@ -33,7 +33,7 @@ repos:
     - id: sass-lint
       files: '^src/.*\.scss'
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.11.1
+    rev: v9.12.0
     hooks:
     - id: eslint
       files: '^src/.*\.jsx?$'

src/onegov/org/locale/de_CH/LC_MESSAGES/onegov.org.po

@@ -5858,9 +5858,9 @@ msgstr "Total ${number} Links gefunden"
 
 #, python-format
 msgid ""
-"Migrates links from the given domain to the current domain \"${domain}\"."
+"Migrates links from the given domain to the current domain \"${domain}\". The form must be used *after* the DNS changeover to \"${domain}\"."
 msgstr ""
-"Migriert Links von der angegebenen Domain zur aktuellen Domain \"${domain}\"."
+"Migriert Links von der angegebenen Domain zur aktuellen Domain \"${domain}\". Das Formular muss *nach* der DNS-Umstellung auf  \"${domain}\" verwendet werden."
 
 msgid "OneGov API"
 msgstr "OneGov API"

src/onegov/org/locale/fr_CH/LC_MESSAGES/onegov.org.po

@@ -5877,9 +5877,9 @@ msgstr "Total de ${number} liens trouvés"
 
 #, python-format
 msgid ""
-"Migrates links from the given domain to the current domain \"${domain}\"."
+"Migrates links from the given domain to the current domain \"${domain}\". The form must be used *after* the DNS changeover to \"${domain}\"."
 msgstr ""
-"Fait migrer les liens du domaine donné vers le domaine actuel \"${domain}\"."
+"Fait migrer les liens du domaine donné vers le domaine actuel \"${domain}\". Le formulaire doit être utilisé *après* le passage du DNS à  \"${domain}\"."
 
 msgid "OneGov API"
 msgstr "API OneGov"

src/onegov/org/management.py

@@ -5,7 +5,7 @@
 from aiohttp import ClientTimeout
 from sqlalchemy.orm import object_session
 from urlextract import URLExtract
-from sqlalchemy import text, bindparam
+from sqlalchemy import text, bindparam, String
 from onegov.async_http.fetch import async_aiohttp_get_all
 from onegov.core.utils import normalize_for_url
 from onegov.org.models import SiteCollection
@@ -135,8 +135,12 @@ def migrate_site_collection(
         return total, grouped
 
     def migrate_content_mixin(self) -> None:
-        """ Updates the JSON and text columns defined in models using the
-        ContentMixin to replace old URIs with new ones across multiple tables.
+        """ A catch-all function to migrate content not covered by
+        migrate_site_collection.
+
+        This function was added to handle links that were not processed by the
+        migrate_site_collection function.
+
 
         Generates SQL of the following form:
 
@@ -173,17 +177,20 @@ def replace_text(col: str) -> str:
 
             sql = text(
                 f"UPDATE {table} SET {', '.join(sql_parts)}"  # nosec:B608
+            ).bindparams(
+                bindparam('old_uri', type_=String),
+                bindparam('new_uri', type_=String)
             )
 
             self.request.session.execute(
                 sql,
                 {
-                    'old_uri': bindparam('old_uri', self.old_uri),
-                    'new_uri': bindparam('new_uri', self.new_uri)
+                    'old_uri': self.old_uri,
+                    'new_uri': self.new_uri
                 }
             )
 
-        self.request.session.commit()
+        transaction.commit()
 
 
 class PageNameChange(ModelsWithLinksMixin):

src/onegov/org/views/settings.py

@@ -376,7 +376,8 @@ def handle_migrate_links(
         'button_text': button_text,
         'callout': _(
             'Migrates links from the given domain to the current domain '
-            '"${domain}".',
+            '"${domain}". The form must be used *after* the DNS changeover '
+            'to "${domain}".',
             mapping={'domain': domain}
         ),
     }

tests/onegov/org/test_views_settings.py

@@ -1,4 +1,6 @@
 from onegov.api.models import ApiKey
+import pytest
+from onegov.page import Page
 from onegov.org.theme.org_theme import HELVETICA
 from xml.etree.ElementTree import tostring
 from onegov.org.models import SiteCollection
@@ -146,28 +148,51 @@ def test_switch_languages(client):
     assert 'Deutsch' not in page
 
 
+@pytest.mark.skip('wip')
 def test_migrate_links(client):
     session = client.app.session()
 
     sitecollection = SiteCollection(session)
     objects = sitecollection.get()
 
-    # pages = client.app.session().query(Topic).defer(Topic.)
-    # topics = session.query(Topic)
-    #
-    # topics = topics.options(defer(Topic.meta))
-    # topics = topics.options(defer(Topic.content))
-    # topics = topics.options(defer(Topic.order))
+    foo = [page.content for page in objects['topics']]
 
+    # set one of the pages content and set
+    # content.text to something that contains an url.
+
+    # Set up test data
+    old_domain = 'localhost'
+    new_domain = '127.0.0.1'
+
+    # Create test objects with content containing the old domain
+    page = Page(
+        name='page',
+        title='Page',
+        content={'text': f'A link to http://{old_domain}/page'},
+    )
+    # form = Form(meta={'url': f'http://{old_domain}/form'})
+    # event = Event(content={'description': f'Visit us at {old_domain}'})
+    # resource = Resource(meta={'link': f'https://{old_domain}/resource'})
+    # person = Person(picture_url=f'http://{old_domain}/person.jpg')
+    # org = Organisation(logo_url=f'http://{old_domain}/logo.png')
+    # directory = Directory(content={'entries': [f'http://{old_domain}/entry1',
+    # f'http://{old_domain}/entry2']})
+    # ticket = Ticket(snapshot={'url': f'http://{old_domain}/ticket'})
+
+    # external_link = ExternalLink(url=f'http://{old_domain}/external')
+
+    # todo: this is hard to test, need to bypass form validation
+    # Die Domain muss einen Punkt enthalten
+    session.add_all([page])
+    session.flush()
     client.login_admin()
     page = client.get('/migrate-links')
+
     assert (
         'Migriert Links von der angegebenen Domain zur aktuellen Domain '
         '"localhost"' in page
     )
-
-    # migrate from 'localhost' to 127.0.0.1
-    # (pointless but enough for test)
-    page.form['old_domain'] = '127.0.0.1'
-    page.form.submit()
+    page.form['old_domain'] = old_domain
+    page.form['test'] = False
+    page = page.form.submit().maybe_follow()
     page.showbrowser()