Clean up after data migration (#1690)

somleng · Jan 8, 2025 · 8156700 · 8156700
1 parent ab53653
commit 8156700
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 104 deletions.
diff --git a/app/workflows/handle_phone_call_event.rb b/app/workflows/handle_phone_call_event.rb
@@ -78,7 +78,8 @@ def create_or_find_contact!(platform_account_sid, msisdn)
     Contact.find_or_create_by!(
       account: account,
       msisdn: PhonyRails.normalize_number(msisdn),
-      iso_country_code: ACCOUNT_COUNTRY_CODES.fetch(account.id, "KH")
-    )
+    ) do |record|
+        record.iso_country_code = ACCOUNT_COUNTRY_CODES.fetch(account.id, "KH")
+    end
   end
 end
diff --git a/db/migrate/20250108072200_change_iso_country_code_not_null_on_beneficiaries.rb b/db/migrate/20250108072200_change_iso_country_code_not_null_on_beneficiaries.rb
@@ -0,0 +1,5 @@
+class ChangeIsoCountryCodeNotNullOnBeneficiaries < ActiveRecord::Migration[8.0]
+  def change
+    change_column_null :contacts, :iso_country_code, false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_01_07_072933) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_08_072200) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
   enable_extension "pg_catalog.plpgsql"
@@ -138,7 +138,7 @@
     t.string "language_code"
     t.string "gender"
     t.date "date_of_birth"
-    t.citext "iso_country_code"
+    t.citext "iso_country_code", null: false
     t.index ["account_id", "date_of_birth"], name: "index_contacts_on_account_id_and_date_of_birth"
     t.index ["account_id", "gender"], name: "index_contacts_on_account_id_and_gender"
     t.index ["account_id", "iso_country_code"], name: "index_contacts_on_account_id_and_iso_country_code"

diff --git a/lib/tasks/data_migrations/migrate_contact_metadata_to_native_fields.rake b/lib/tasks/data_migrations/migrate_contact_metadata_to_native_fields.rake
diff --git a/spec/factories.rb b/spec/factories.rb
@@ -78,6 +78,7 @@
 
   factory :contact, aliases: [ :beneficiary ] do
     account
+    iso_country_code { "SO" }
     msisdn { generate(:somali_msisdn) }
 
     trait :disabled do
@@ -219,7 +220,7 @@
 
   factory :beneficiary_address do
     beneficiary
-    iso_country_code { "KH" }
-    iso_region_code { "KH-1" }
+    iso_country_code { beneficiary.iso_country_code }
+    iso_region_code { "SO-AW" }
   end
 end