From 98a6baba669f216fa71fded1e7201a3cf00be08e Mon Sep 17 00:00:00 2001
From: Paul McLanahan <pmac@mozilla.com>
Date: Fri, 27 Sep 2024 13:39:25 -0400
Subject: [PATCH 1/2] Ref #15224: Remove use of etags and lastmod data from
 sitemap generation

---
 bedrock/sitemaps/models.py | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/bedrock/sitemaps/models.py b/bedrock/sitemaps/models.py
index 753ffd5a7bb..749783a4884 100644
--- a/bedrock/sitemaps/models.py
+++ b/bedrock/sitemaps/models.py
@@ -12,33 +12,21 @@
 
 
 def load_sitemaps_data():
-    with SITEMAPS_DATA.joinpath("etags.json").open() as fh:
-        etags = json.load(fh)
-
     with SITEMAPS_DATA.joinpath("sitemap.json").open() as fh:
         sitemap = json.load(fh)
 
-    return sitemap, etags
+    return sitemap
 
 
 def get_sitemap_objs():
     objs = []
-    sitemap, etags = load_sitemaps_data()
+    sitemap = load_sitemaps_data()
     for url, locales in sitemap.items():
         if not locales:
             locales = [NO_LOCALE]
 
         for locale in locales:
-            if locale == NO_LOCALE:
-                full_url = f"{settings.CANONICAL_URL}{url}"
-            else:
-                full_url = f"{settings.CANONICAL_URL}/{locale}{url}"
-
-            kwargs = {"path": url, "locale": locale}
-            etag = etags.get(full_url)
-            if etag:
-                kwargs["lastmod"] = etag["date"]
-            objs.append(SitemapURL(**kwargs))
+            objs.append(SitemapURL(path=url, locale=locale))
 
     return objs
 

From 1575c7223a78c85956499ac37dd4ebf08a8297ed Mon Sep 17 00:00:00 2001
From: Paul McLanahan <pmac@mozilla.com>
Date: Fri, 27 Sep 2024 13:53:04 -0400
Subject: [PATCH 2/2] Ref #15224: Remove the rest of lastmod data use and
 remove lastmod field from DB

---
 .../0002_remove_sitemapurl_lastmod.py         | 20 +++++++++++++++++++
 bedrock/sitemaps/models.py                    |  1 -
 bedrock/sitemaps/tests/test_views.py          | 12 ++++-------
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 bedrock/sitemaps/migrations/0002_remove_sitemapurl_lastmod.py

diff --git a/bedrock/sitemaps/migrations/0002_remove_sitemapurl_lastmod.py b/bedrock/sitemaps/migrations/0002_remove_sitemapurl_lastmod.py
new file mode 100644
index 00000000000..48f49c3148f
--- /dev/null
+++ b/bedrock/sitemaps/migrations/0002_remove_sitemapurl_lastmod.py
@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Generated by Django 4.2.16 on 2024-09-27 17:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sitemaps", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="sitemapurl",
+            name="lastmod",
+        ),
+    ]
diff --git a/bedrock/sitemaps/models.py b/bedrock/sitemaps/models.py
index 749783a4884..134e93f33d0 100644
--- a/bedrock/sitemaps/models.py
+++ b/bedrock/sitemaps/models.py
@@ -47,7 +47,6 @@ def all_locales(self):
 class SitemapURL(models.Model):
     path = models.CharField(max_length=200)
     locale = models.CharField(max_length=5)
-    lastmod = models.CharField(max_length=40, blank=True)
 
     objects = SitemapURLManager()
 
diff --git a/bedrock/sitemaps/tests/test_views.py b/bedrock/sitemaps/tests/test_views.py
index 1f65a82d50f..836cc50c79d 100644
--- a/bedrock/sitemaps/tests/test_views.py
+++ b/bedrock/sitemaps/tests/test_views.py
@@ -11,14 +11,14 @@
 class TestSitemapView(TestCase):
     def setUp(self):
         data = [
-            {"path": "/firefox/all/", "locale": "de", "lastmod": "2020-07-01T21:07:08.730133+00:00"},
-            {"path": "/firefox/", "locale": "de", "lastmod": "2020-07-01T21:07:08.730133+00:00"},
+            {"path": "/firefox/all/", "locale": "de"},
+            {"path": "/firefox/", "locale": "de"},
             {
                 "path": "/privacy/",
                 "locale": "fr",
             },
-            {"path": "/firefox/", "locale": "fr", "lastmod": "2020-07-01T21:07:08.730133+00:00"},
-            {"path": "/keymaster/gatekeeper/there.is.only.xul", "locale": NO_LOCALE, "lastmod": "2020-07-01T21:07:08.730133+00:00"},
+            {"path": "/firefox/", "locale": "fr"},
+            {"path": "/keymaster/gatekeeper/there.is.only.xul", "locale": NO_LOCALE},
             {
                 "path": "/locales/",
                 "locale": NO_LOCALE,
@@ -52,7 +52,6 @@ def test_none(self):
             <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
               <url>
                 <loc>https://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul</loc>
-                <lastmod>2020-07-01T21:07:08.730133+00:00</lastmod>
               </url>
               <url>
                 <loc>https://www.mozilla.org/locales/</loc>
@@ -69,11 +68,9 @@ def test_locales(self):
             <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
               <url>
                 <loc>https://www.mozilla.org/de/firefox/</loc>
-                <lastmod>2020-07-01T21:07:08.730133+00:00</lastmod>
               </url>
               <url>
                 <loc>https://www.mozilla.org/de/firefox/all/</loc>
-                <lastmod>2020-07-01T21:07:08.730133+00:00</lastmod>
               </url>
             </urlset>"""
         )
@@ -86,7 +83,6 @@ def test_locales(self):
             <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
               <url>
                 <loc>https://www.mozilla.org/fr/firefox/</loc>
-                <lastmod>2020-07-01T21:07:08.730133+00:00</lastmod>
               </url>
               <url>
                 <loc>https://www.mozilla.org/fr/privacy/</loc>