From feebbffab29a917d6048dfc0d0d6329f3de9b84c Mon Sep 17 00:00:00 2001
From: yoldas <ay6@sanger.ac.uk>
Date: Thu, 1 Feb 2024 18:23:02 +0000
Subject: [PATCH 1/3] Loaded jsonapi from a fork branch that excludes the
 module that blocks Rails 6.1 update

---
 Gemfile      | 12 +++++++++++-
 Gemfile.lock | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0edb747cf5..4dc69901b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,17 @@ group :default do
   # https://github.com/JamesGlover/sequencescape/tree/depfu/update/jsonapi-resources-0.9.5
   # but not only is there a failing test, but performance was tanking in a few places
   # due to not correctly eager loading dependencies on nested resources.
-  gem 'jsonapi-resources', '0.9.0'
+
+  # Versions above 0.9.0 are incompatible and it is too much work to upgrade at
+  # this time. Implementing new patches for updates is not a long term solution
+  # as the internals keep changing. However, version 0.9.0 is blocking us from
+  # updating rails to version 6.1 . The following steps show the process for an
+  # alternative solution:
+  # - Fork jsonpi-resources repository
+  # - Create a branch off version 0.9.0
+  # - Remove the ActionController::ForceSSL module
+  # - Load the gem from the branch
+  gem 'jsonapi-resources', github: 'yoldas/jsonapi-resources', branch: 'develop'
 
   # Wraps bunny with connection pooling ad consumer process handling
   gem 'sanger_warren'
diff --git a/Gemfile.lock b/Gemfile.lock
index 20ac60957e..a9a0706ecc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,6 +20,16 @@ GIT
   specs:
     sanger_barcode_format (0.2.0)
 
+GIT
+  remote: https://github.com/yoldas/jsonapi-resources.git
+  revision: db2c5cd3f0d6bdddf990eee705b3d9efe79de2bb
+  branch: develop
+  specs:
+    jsonapi-resources (0.9.0)
+      activerecord (>= 4.1)
+      concurrent-ruby
+      railties (>= 4.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -227,10 +237,6 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     json (2.6.3)
-    jsonapi-resources (0.9.0)
-      activerecord (>= 4.1)
-      concurrent-ruby
-      railties (>= 4.1)
     jsonapi-resources-matchers (1.0.0)
       jsonapi-resources (>= 0.9.0)
     knapsack_pro (5.7.0)
@@ -555,7 +561,7 @@ DEPENDENCIES
   flipper-ui (~> 0.25.0)
   formtastic
   json
-  jsonapi-resources (= 0.9.0)
+  jsonapi-resources!
   jsonapi-resources-matchers
   knapsack_pro
   launchy

From f9afa010568265bc055ddd01dabbab840b84d161 Mon Sep 17 00:00:00 2001
From: Dasun Pubudumal <pubudumald@gmail.com>
Date: Fri, 16 Feb 2024 17:28:04 +0000
Subject: [PATCH 2/3] Update Gemfile to match jsonapi-resources from sanger

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 4dc69901b1..dec770b479 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,7 +72,7 @@ group :default do
   # - Create a branch off version 0.9.0
   # - Remove the ActionController::ForceSSL module
   # - Load the gem from the branch
-  gem 'jsonapi-resources', github: 'yoldas/jsonapi-resources', branch: 'develop'
+  gem 'jsonapi-resources', github: 'sanger/jsonapi-resources', branch: 'develop'
 
   # Wraps bunny with connection pooling ad consumer process handling
   gem 'sanger_warren'

From a2d8379da5dc3a3594026df2414c2bdb007a8de7 Mon Sep 17 00:00:00 2001
From: Dasun Pubudumal <pubudumald@gmail.com>
Date: Mon, 19 Feb 2024 12:20:15 +0000
Subject: [PATCH 3/3] Adding gemfile lock update

---
 Gemfile.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a9a0706ecc..c524fbabcf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,16 @@ GIT
       activemodel
       activerecord (>= 4.0.0)
 
+GIT
+  remote: https://github.com/sanger/jsonapi-resources.git
+  revision: be2fb43f5f8da2e632fb5f48200928b2dd3d8bf9
+  branch: develop
+  specs:
+    jsonapi-resources (0.9.0)
+      activerecord (>= 4.1)
+      concurrent-ruby
+      railties (>= 4.1)
+
 GIT
   remote: https://github.com/sanger/record_loader
   revision: 9e7481f4d2342f042ab13465962e5d6689863198
@@ -20,16 +30,6 @@ GIT
   specs:
     sanger_barcode_format (0.2.0)
 
-GIT
-  remote: https://github.com/yoldas/jsonapi-resources.git
-  revision: db2c5cd3f0d6bdddf990eee705b3d9efe79de2bb
-  branch: develop
-  specs:
-    jsonapi-resources (0.9.0)
-      activerecord (>= 4.1)
-      concurrent-ruby
-      railties (>= 4.1)
-
 GEM
   remote: https://rubygems.org/
   specs: