Big Sam Improvements

.github/workflows/test.yml

@@ -13,9 +13,9 @@ jobs:
 
     services:
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.13.4
         env:
-          STACK_VERSION: 7.17.1
+          STACK_VERSION: 8.13.4
           xpack.security.enabled: false
           cluster.name: beckett-elasticsearch
           http.port: 9200
@@ -29,7 +29,7 @@ jobs:
           - 9200:9200
 
       postgres:
-        image: postgres:10
+        image: postgres:16
         env:
           POSTGRES_PASSWORD: password
           POSTGRES_USER: user

Gemfile

@@ -14,7 +14,7 @@ gem 'csv'
 gem 'pg', '~> 1.1'
 
 # Elasticseach for search
-gem 'elasticsearch', '~> 7.17.1'
+gem 'elasticsearch', '~> 8'
 gem 'searchkick'
 
 # Use the Puma web server [https://github.com/puma/puma]
@@ -95,3 +95,7 @@ gem 'addressable', '~> 2.8'
 gem 'importmap-rails', '~> 2.0'
 
 gem 'sidekiq-cron', '~>2.4.0'
+
+# SES delivery for ActionMailer, authenticating via the instance/task IAM role
+gem 'aws-sdk-rails', '~> 5.0'
+gem 'aws-sdk-ses', '~> 1.0'

Gemfile.lock

@@ -99,6 +99,24 @@ GEM
       administrate
       rails (>= 5.0)
     ast (2.4.2)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1278.0)
+    aws-sdk-core (3.254.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-rails (5.1.0)
+      aws-sdk-core (~> 3)
+      railties (>= 7.1.0)
+    aws-sdk-ses (1.102.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     bootsnap (1.18.4)
@@ -117,14 +135,14 @@ GEM
       reline (>= 0.3.8)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    elasticsearch (7.17.11)
-      elasticsearch-api (= 7.17.11)
-      elasticsearch-transport (= 7.17.11)
-    elasticsearch-api (7.17.11)
+    elastic-transport (8.5.2)
+      faraday (< 3)
       multi_json
-    elasticsearch-transport (7.17.11)
-      base64
-      faraday (>= 1, < 3)
+    elasticsearch (8.19.3)
+      elastic-transport (~> 8.3)
+      elasticsearch-api (= 8.19.3)
+      ostruct
+    elasticsearch-api (8.19.3)
       multi_json
     erubi (1.13.0)
     et-orbi (1.4.0)
@@ -136,11 +154,12 @@ GEM
       railties (>= 5.0.0)
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.11.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    faraday (2.14.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
       logger
-    faraday-net_http (3.3.0)
-      net-http
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-aarch64-linux-musl)
     ffi (1.17.0-arm-linux-gnu)
@@ -176,6 +195,7 @@ GEM
     jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
+    jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -213,14 +233,14 @@ GEM
     mini_mime (1.1.5)
     minitest (5.25.1)
     msgpack (1.7.2)
-    multi_json (1.15.0)
+    multi_json (1.21.1)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     mustache (1.1.1)
     namae (1.2.0)
       racc (~> 1.7)
-    net-http (0.4.1)
-      uri
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     net-imap (0.4.14)
       date
       net-protocol
@@ -243,6 +263,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
+    ostruct (0.6.3)
     parallel (1.26.3)
     parser (3.3.4.2)
       ast (~> 2.4.1)
@@ -410,7 +431,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode (0.4.4.5)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (1.1.1)
     useragent (0.16.10)
     uuid (2.3.9)
       macaddr (~> 1.0)
@@ -444,10 +465,12 @@ DEPENDENCIES
   administrate-field-acts_as_taggable
   administrate-field-jsonb
   administrate-field-list (~> 0.0.6)
+  aws-sdk-rails (~> 5.0)
+  aws-sdk-ses (~> 1.0)
   bootsnap
   csv
   debug
-  elasticsearch (~> 7.17.1)
+  elasticsearch (~> 8)
   factory_bot_rails
   faker
   httparty (~> 0.20.0)

README.md

@@ -10,43 +10,41 @@
 
 ## System dependencies
 
-* Elasticsearch
-* PostgreSQL
+- Elasticsearch
+- PostgreSQL
 
 ## Database creation
 
-~~~bash
+```bash
 rake db:create && rake db:migrate
-~~~
+```
 
 ## Update Elasticsearch Indices
 
-~~~bash
+```bash
 rake searchkick:reindex:all
-~~~
+```
 
 ## Run the test suite
 
-~~~bash
+```bash
 bundle exec rspec spec/
-~~~
+```
 
 ## Build Documentation
 
-~~~bash
+```bash
 rake docs:generate
-~~~
+```
 
 ## Background Jobs
 
 Restart Active Jobs for indexing and Big Sam update.
 
-~~~bash
+```bash
 sudo service sidekiq-1 restart && sudo service sidekiq-2 restart
-~~~
+```
 
 ## Deployment Instructions
 
-~~~bash
-bundle exec cap production deploy
-~~~
+Handled via GitHub Actions.

app/controllers/letters_controller.rb

@@ -78,7 +78,7 @@ def facets
       date: {
         date_histogram: {
           field: :date,
-          interval: :year
+          calendar_interval: :year
         }
       },
       languages: {},