From c681fdbdb6d7bdb4a348f307e25fb00bf39afb81 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Fri, 16 May 2025 21:29:07 +0200
Subject: [PATCH] Update visited_countries column type to jsonb

---
 db/migrate/20250513164521_add_visited_countries_to_trips.rb | 6 +++++-
 db/schema.rb                                                | 2 +-
 docker/Dockerfile.dev                                       | 2 +-
 docker/Dockerfile.prod                                      | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/db/migrate/20250513164521_add_visited_countries_to_trips.rb b/db/migrate/20250513164521_add_visited_countries_to_trips.rb
index 27072d3e..fd9d7a4e 100644
--- a/db/migrate/20250513164521_add_visited_countries_to_trips.rb
+++ b/db/migrate/20250513164521_add_visited_countries_to_trips.rb
@@ -2,6 +2,10 @@
 
 class AddVisitedCountriesToTrips < ActiveRecord::Migration[8.0]
   def change
-    add_column :trips, :visited_countries, :jsonb, default: []
+    safety_assured do
+      execute <<-SQL
+        ALTER TABLE trips ADD COLUMN visited_countries JSONB DEFAULT '{}'::jsonb NOT NULL;
+      SQL
+    end
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index ef080118..d574fa28 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -224,7 +224,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_05_15_192211) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.geometry "path", limit: {srid: 3857, type: "line_string"}
-    t.jsonb "visited_countries", default: []
+    t.jsonb "visited_countries", default: {}, null: false
     t.index ["user_id"], name: "index_trips_on_user_id"
   end
 
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 6c61a30a..a4fe1039 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -25,7 +25,7 @@ RUN apk -U add --no-cache \
     less \
     yaml-dev \
     gcompat \
-    libgeos-dev \
+    geos \
     && mkdir -p $APP_PATH
 
 # Update gem system and install bundler
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
index e0879ee2..56f323e3 100644
--- a/docker/Dockerfile.prod
+++ b/docker/Dockerfile.prod
@@ -22,7 +22,7 @@ RUN apk -U add --no-cache \
     less \
     yaml-dev \
     gcompat \
-    libgeos-dev \
+    geos \
     && mkdir -p $APP_PATH
 
 # Update gem system and install bundler