Bugfix/ogc 3003 fix migrate links

src/onegov/org/management.py

@@ -6,6 +6,7 @@
 
 import transaction
 from aiohttp import ClientTimeout
+from markupsafe import Markup
 from sqlalchemy.orm import object_session
 from urlextract import URLExtract
 
@@ -89,16 +90,19 @@ def repl(matchobj: re.Match[str]) -> str:
             value = getattr(item, field, None)
             if not value:
                 continue
-            new_val = pattern.sub(repl, value)
-            if value != new_val:
-                count += 1
+            new_val, n = pattern.subn(repl, value)
+            if n:
+                count += n
                 id_count = count_by_id.setdefault(
                     group_by,
                     defaultdict(int)
                 )
 
-                id_count[field] += 1
+                id_count[field] += n
                 if not test:
+                    new_val = (
+                        Markup(new_val)  # nosec: B704
+                        if isinstance(value, Markup) else new_val)
                     setattr(
                         item,
                         field,

src/onegov/org/models/page.py

@@ -335,6 +335,9 @@ def page_by_index(self, index: int) -> Self:
             page=index
         )
 
+    def by_title(self, title: str) -> Topic | None:
+        return self.subset().filter(Topic.title == title).first()
+
 
 class NewsCollection(Pagination[News], AdjacencyListCollection[News]):
     """
@@ -497,6 +500,9 @@ def __link_alias__(self) -> str:
             }
         )
 
+    def by_title(self, title: str) -> News | None:
+        return self.subset().filter(News.title == title).first()
+
 
 class AtoZPages(AtoZ[Topic]):
 

src/onegov/org/views/settings.py

@@ -69,13 +69,6 @@ def query_settings() -> Iterator[dict[str, Any]]:
         for action, fn in q(request.app):
             if 'setting' in action.predicates:
                 setting = copy(action.predicates)
-
-                # ogc-3003: for now we don't show the `Migration Links` in
-                # settings as it breaks html. Still directly accessible
-                # via `/migrate-links`
-                if setting['name'] == 'migrate-links':
-                    continue
-
                 # exclude this setting view if it's disabled for the app
                 if (
                     setting['name'] == 'citizen-login-settings'

tests/onegov/town6/test_views_settings.py

@@ -1,16 +1,21 @@
 from __future__ import annotations
 
-from onegov.api.models import ApiKey
 from xml.etree.ElementTree import tostring
 
+import transaction
+from onegov.api.models import ApiKey
+from onegov.core.utils import Bunch
+from onegov.org.models import News
+from onegov.org.models import Topic
+from onegov.org.models.page import TopicCollection, NewsCollection
+
+from typing import TYPE_CHECKING, Any
 
-from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from .conftest import Client
 
 
 def test_gever_settings_only_https_allowed(client: Client) -> None:
-
     client.login_admin()
     settings = client.get('/settings').click('Gever API')
     settings.form['gever_username'] = 'foo'
@@ -30,7 +35,6 @@ def test_gever_settings_only_https_allowed(client: Client) -> None:
 
 
 def test_api_keys_create_and_delete(client: Client) -> None:
-
     client.login_admin()
 
     settings = client.get('/api-keys')
@@ -121,9 +125,7 @@ def test_analytics_settings(client: Client) -> None:
     ) in settings
 
 
-
 def test_firebase_settings(client: Client) -> None:
-
     client.login_admin()
 
     # Pretend this is real data (it's completely random)
@@ -165,3 +167,69 @@ def test_resource_settings(client: Client) -> None:
     assert 'Allgemeine Informationen zu Reservationen' in page
     assert '<h1>foo</h1>' in page
     assert '<p>bar</p>' in page
+
+
+def test_migrate_links(client: Client) -> None:
+    session = client.app.session()
+    request: Any = Bunch(**{
+        'session': session,
+        'identity.role': 'admin'
+    })
+    old_domain = 'foo.ch'
+
+    # create topic
+    topic = Topic(title='Foo Topic', name='foo-topic')
+    topic.text = '<p>Wow, https://foo.ch/abc is a great page!</p>'
+    session.add(topic)
+    topic_text = str(topic.text)
+
+    # add news article (must be under the seeded /news/ root)
+    from onegov.page import PageCollection
+    news_root = PageCollection(session).by_path('/news/', ensure_type='news')
+    assert isinstance(news_root, News)
+    news = News(title='Big News', name='big-news', parent=news_root)
+    news.text = ('<p>Big news https://foo.ch/big-news and bigger news'
+                 'can be found here https://foo.ch/bigger-news</p>')
+    session.add(news)
+    news_text = str(news.text)
+
+    transaction.commit()
+
+    def get_topic_text() -> str:
+        t = TopicCollection(session).by_title('Foo Topic')
+        assert t is not None and t.text is not None
+        return str(t.text)
+
+    def get_news_text() -> str:
+        n = NewsCollection(request).by_title('Big News')
+        assert n is not None and n.text is not None
+        return str(n.text)
+
+    assert old_domain in get_topic_text()
+    assert old_domain in get_news_text()
+
+    # execute migrate links test
+    client.login_admin()
+    migrate_page = client.get('/migrate-links')
+    migrate_page.form['old_domain'] = old_domain
+    migrate_page.form['test'] = True
+    result = migrate_page.form.submit()
+    assert 'Total 3 Links gefunden' in result
+
+    assert old_domain in get_topic_text()
+    assert old_domain in get_news_text()
+
+    # execute migrate links
+    migrate_page = client.get('/migrate-links')
+    migrate_page.form['old_domain'] = old_domain
+    migrate_page.form['test'] = False
+    result = migrate_page.form.submit().follow()
+    assert '3 Links migriert' in result
+
+    topic_text_new = get_topic_text()
+    news_text_new = get_news_text()
+    assert old_domain not in topic_text_new
+    assert old_domain not in news_text_new
+
+    assert topic_text.replace('foo.ch', 'localhost') == topic_text_new
+    assert news_text.replace('foo.ch', 'localhost') == news_text_new