From 0bd651c08be7ba1f88a54a9513c8716d8e095226 Mon Sep 17 00:00:00 2001
From: Earlopain <14981592+Earlopain@users.noreply.github.com>
Date: Sat, 16 Sep 2023 15:52:05 +0200
Subject: [PATCH] [Elasticsearch] Remove elasticsearch-model gem

This should be the bulk of the work to integrate with opensearch-ruby
---
 Gemfile                              |  2 +-
 Gemfile.lock                         |  7 +------
 app/indexes/indexable.rb             | 12 ------------
 app/models/post.rb                   |  2 +-
 app/models/post_version.rb           |  2 +-
 config/initializers/elasticsearch.rb |  1 -
 6 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 app/indexes/indexable.rb
 delete mode 100644 config/initializers/elasticsearch.rb

diff --git a/Gemfile b/Gemfile
index 2394b71a4..58a5932b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'sidekiq-unique-jobs'
 gem 'redis'
 gem 'request_store'
 
-gem 'elasticsearch-model'
+gem 'elasticsearch'
 
 gem 'mailgun-ruby'
 gem 'resolv'
diff --git a/Gemfile.lock b/Gemfile.lock
index 736d90418..706e67d59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,10 +130,6 @@ GEM
       elasticsearch-transport (= 7.17.7)
     elasticsearch-api (7.17.7)
       multi_json
-    elasticsearch-model (7.2.1)
-      activesupport (> 3)
-      elasticsearch (~> 7)
-      hashie
     elasticsearch-transport (7.17.7)
       faraday (~> 1)
       multi_json
@@ -172,7 +168,6 @@ GEM
     globalid (1.1.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
-    hashie (5.0.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
@@ -406,7 +401,7 @@ DEPENDENCIES
   dotenv-rails
   draper
   dtext_rb!
-  elasticsearch-model
+  elasticsearch
   factory_bot_rails
   httparty
   listen
diff --git a/app/indexes/indexable.rb b/app/indexes/indexable.rb
deleted file mode 100644
index f28a15f93..000000000
--- a/app/indexes/indexable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-# Base Elasticsearch indexing definitions
-#
-# Make sure to include your custom index file
-# in your model alongside Indexable.
-module Indexable
-  def self.included(base)
-    base.include Elasticsearch::Model
-    base.include DocumentStore::Model
-  end
-end
diff --git a/app/models/post.rb b/app/models/post.rb
index a71b0a28b..1d7c69e03 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1644,7 +1644,7 @@ class Post < ApplicationRecord
   include ValidationMethods
   include PostEventMethods
   include Danbooru::HasBitFlags
-  include Indexable
+  include DocumentStore::Model
   include PostIndex
 
   BOOLEAN_ATTRIBUTES = %w(
diff --git a/app/models/post_version.rb b/app/models/post_version.rb
index 5fa3f3437..51e5d25eb 100644
--- a/app/models/post_version.rb
+++ b/app/models/post_version.rb
@@ -119,7 +119,7 @@ class PostVersion < ApplicationRecord
   end
 
   extend SearchMethods
-  include Indexable
+  include DocumentStore::Model
   include PostVersionIndex
 
   def self.queue(post)
diff --git a/config/initializers/elasticsearch.rb b/config/initializers/elasticsearch.rb
deleted file mode 100644
index 93ba1e9fe..000000000
--- a/config/initializers/elasticsearch.rb
+++ /dev/null
@@ -1 +0,0 @@
-Elasticsearch::Model.client = Elasticsearch::Client.new host: Danbooru.config.elasticsearch_host