Merge pull request #2186 from bensteinberg/update-es-71716

Update Elasticsearch
harvard-lil · Jan 8, 2024 · 00bb5a8 · 00bb5a8
2 parents e3a6377 + 4c7a358
commit 00bb5a8
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 26 deletions.
diff --git a/capstone/docker-compose.yml b/capstone/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     redis:
         image: redis:6.0.15
     elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.15
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16
         environment:
           - node.name=es01
           - bootstrap.memory_lock=true

diff --git a/capstone/scripts/tests/test_cap_static.py b/capstone/scripts/tests/test_cap_static.py
@@ -33,12 +33,16 @@ def test_export_cap_static(reset_sequences, case_factory, jurisdiction_factory,
     with django_assert_num_queries(select=8):
         summarize_cap_static(str(tmp_path))
 
-    # fix up last_updated timestamps for consistent comparison
+    # fix up last_updated and date_added timestamps for consistent comparison
     for path in tmp_path.rglob('*/*/*/**/*.json'):
         path.write_text(re.sub(
             r'"last_updated": "[^"]+"',
             '"last_updated": "2023-12-01T01:01:01.0000001+00:00"',
             path.read_text()))
+        path.write_text(re.sub(
+            r'"date_added": "[^"]+"',
+            '"date_added": "2023-12-01"',
+            path.read_text()))
 
     # compare temp dir to test_data/cap_static
     cap_static_dir = Path(settings.BASE_DIR, 'test_data/cap_static')

diff --git a/capstone/test_data/cap_static/redacted/us/1/CasesMetadata.json b/capstone/test_data/cap_static/redacted/us/1/CasesMetadata.json
@@ -34,7 +34,7 @@
     "analysis": {},
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -76,7 +76,7 @@
     "analysis": {},
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -118,7 +118,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },

diff --git a/capstone/test_data/cap_static/redacted/us/1/cases/0001-01.json b/capstone/test_data/cap_static/redacted/us/1/cases/0001-01.json
@@ -33,7 +33,7 @@
   "analysis": {},
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/redacted/us/1/cases/0002-01.json b/capstone/test_data/cap_static/redacted/us/1/cases/0002-01.json
@@ -33,7 +33,7 @@
   "analysis": {},
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/redacted/us/1/cases/0002-02.json b/capstone/test_data/cap_static/redacted/us/1/cases/0002-02.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/redacted/us/2/CasesMetadata.json b/capstone/test_data/cap_static/redacted/us/2/CasesMetadata.json
@@ -34,7 +34,7 @@
     "analysis": {},
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -76,7 +76,7 @@
     "analysis": {},
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -118,7 +118,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },

diff --git a/capstone/test_data/cap_static/redacted/us/2/cases/0001-01.json b/capstone/test_data/cap_static/redacted/us/2/cases/0001-01.json
@@ -33,7 +33,7 @@
   "analysis": {},
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/redacted/us/2/cases/0002-01.json b/capstone/test_data/cap_static/redacted/us/2/cases/0002-01.json
@@ -33,7 +33,7 @@
   "analysis": {},
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/redacted/us/2/cases/0002-02.json b/capstone/test_data/cap_static/redacted/us/2/cases/0002-02.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/unredacted/us/1/CasesMetadata.json b/capstone/test_data/cap_static/unredacted/us/1/CasesMetadata.json
@@ -34,7 +34,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -76,7 +76,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -118,7 +118,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },

diff --git a/capstone/test_data/cap_static/unredacted/us/1/cases/0001-01.json b/capstone/test_data/cap_static/unredacted/us/1/cases/0001-01.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/unredacted/us/1/cases/0002-01.json b/capstone/test_data/cap_static/unredacted/us/1/cases/0002-01.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/unredacted/us/1/cases/0002-02.json b/capstone/test_data/cap_static/unredacted/us/1/cases/0002-02.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/unredacted/us/2/CasesMetadata.json b/capstone/test_data/cap_static/unredacted/us/2/CasesMetadata.json
@@ -34,7 +34,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -76,7 +76,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },
@@ -118,7 +118,7 @@
     },
     "last_updated": "2023-12-01T01:01:01.0000001+00:00",
     "provenance": {
-      "date_added": "2023-12-05",
+      "date_added": "2023-12-01",
       "source": "Harvard",
       "batch": "2018"
     },

diff --git a/capstone/test_data/cap_static/unredacted/us/2/cases/0001-01.json b/capstone/test_data/cap_static/unredacted/us/2/cases/0001-01.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/unredacted/us/2/cases/0002-01.json b/capstone/test_data/cap_static/unredacted/us/2/cases/0002-01.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },

diff --git a/capstone/test_data/cap_static/unredacted/us/2/cases/0002-02.json b/capstone/test_data/cap_static/unredacted/us/2/cases/0002-02.json
@@ -33,7 +33,7 @@
   },
   "last_updated": "2023-12-01T01:01:01.0000001+00:00",
   "provenance": {
-    "date_added": "2023-12-05",
+    "date_added": "2023-12-01",
     "source": "Harvard",
     "batch": "2018"
   },