Converts norgesfilm-urls for new format

article-api/src/main/scala/no/ndla/articleapi/db/migration/V65__ConvertNorgesfilmUrls.scala

@@ -0,0 +1,27 @@
+/*
+ * Part of NDLA article-api
+ * Copyright (C) 2025 NDLA
+ *
+ * See LICENSE
+ *
+ */
+
+package no.ndla.articleapi.db.migration
+
+import no.ndla.articleapi.db.HtmlMigration
+import org.jsoup.nodes.Element
+
+class V65__ConvertNorgesfilmUrls extends HtmlMigration {
+  override val convertVisualElement: Boolean                        = true
+  override def convertHtml(doc: Element, language: String): Element = {
+    doc
+      .select("ndlaembed[data-resource='iframe']")
+      .forEach(embed => {
+        val url = embed.attr("data-url")
+        if (url.contains("ndla.filmiundervisning.no/film/ndlafilm.aspx?filmId=")) {
+          embed.attr("data-url", url.replace("ndla.", "ndla2.").replace("/ndlafilm.aspx?filmId=", "/")): Unit
+        }
+      })
+    doc
+  }
+}

article-api/src/test/scala/no/ndla/articleapi/db/migration/V65__ConvertNorgesfilmUrlsTest.scala

@@ -0,0 +1,23 @@
+/*
+ * Part of NDLA article-api
+ * Copyright (C) 2025 NDLA
+ *
+ * See LICENSE
+ *
+ */
+
+package no.ndla.articleapi.db.migration
+
+import no.ndla.articleapi.{TestEnvironment, UnitSuite}
+
+class V65__ConvertNorgesfilmUrlsTest extends UnitSuite with TestEnvironment {
+  test("That norgesfilm urls looses ndlafilm.aspx") {
+    val migration  = new V65__ConvertNorgesfilmUrls
+    val oldArticle =
+      """<section><ndlaembed data-resource="iframe" data-type="iframe" data-url="https://ndla.filmiundervisning.no/film/ndlafilm.aspx?filmId=13074" data-width="700" data-height="300"></ndlaembed></section>"""
+    val newArticle =
+      """<section><ndlaembed data-resource="iframe" data-type="iframe" data-url="https://ndla2.filmiundervisning.no/film/13074" data-width="700" data-height="300"></ndlaembed></section>"""
+
+    migration.convertContent(oldArticle, "nb") should be(newArticle)
+  }
+}

draft-api/src/main/scala/no/ndla/draftapi/db/migration/V79__ConvertNorgesfilmUrls.scala

@@ -0,0 +1,28 @@
+/*
+ * Part of NDLA draft-api
+ * Copyright (C) 2025 NDLA
+ *
+ * See LICENSE
+ *
+ */
+
+package no.ndla.draftapi.db.migration
+
+import no.ndla.draftapi.db.HtmlMigration
+import org.jsoup.nodes.Element
+
+class V79__ConvertNorgesfilmUrls extends HtmlMigration {
+  override val convertVisualElement: Boolean                        = true
+  override def convertHtml(doc: Element, language: String): Element = {
+    doc
+      .select("ndlaembed[data-resource='iframe']")
+      .forEach(embed => {
+        val url = embed.attr("data-url")
+        if (url.contains("ndla.filmiundervisning.no/film/ndlafilm.aspx?filmId=")) {
+          embed.attr("data-url", url.replace("ndla.", "ndla2.").replace("/ndlafilm.aspx?filmId=", "/")): Unit
+        }
+      })
+    doc
+  }
+
+}

draft-api/src/test/scala/no/ndla/draftapi/db/migration/V79__ConvertNorgesfilmUrlsTest.scala

@@ -0,0 +1,23 @@
+/*
+ * Part of NDLA draft-api
+ * Copyright (C) 2025 NDLA
+ *
+ * See LICENSE
+ *
+ */
+
+package no.ndla.draftapi.db.migration
+
+import no.ndla.draftapi.{TestEnvironment, UnitSuite}
+
+class V79__ConvertNorgesfilmUrlsTest extends UnitSuite with TestEnvironment {
+  test("That norgesfilm urls looses ndlafilm.aspx") {
+    val migration  = new V79__ConvertNorgesfilmUrls
+    val oldArticle =
+      """<section><ndlaembed data-resource="iframe" data-type="iframe" data-url="https://ndla.filmiundervisning.no/film/ndlafilm.aspx?filmId=13074" data-width="700" data-height="300"></ndlaembed></section>"""
+    val newArticle =
+      """<section><ndlaembed data-resource="iframe" data-type="iframe" data-url="https://ndla2.filmiundervisning.no/film/13074" data-width="700" data-height="300"></ndlaembed></section>"""
+
+    migration.convertContent(oldArticle, "nb") should be(newArticle)
+  }
+}

validation/src/main/resources/embed-tag-rules.json

@@ -626,6 +626,7 @@
               ".*.ndla.no",
               "vimeo.com",
               "ndla.filmiundervisning.no",
+              "ndla2.filmiundervisning.no",
               "prezi.com",
               "commoncraft.com",
               "embed.kahoot.it",