Merge pull request #745 from quran/QF-3726

Add default_locale_language and qr_default_locale_language

Author: osamasayed

app/controllers/api/qdc/resources_controller.rb

@@ -215,6 +215,8 @@ def build_preference_data(preference)
           ResourceContent.where(id: qr_ids).approved.includes(:translated_name) : [],
         default_tafsir: preference.tafsir&.approved? ? preference.tafsir : nil,
         default_wbw_language: preference.wbw_language,
+        default_locale: preference.default_locale_language,
+        qr_default_locale: preference.qr_default_locale_language,
         default_reciter: preference.audio_recitation,
         ayah_reflections_languages: Language.where(iso_code: preference.ayah_reflections_languages&.split(',') || []),
         qr_reflection_languages: Language.where(iso_code: preference.qr_reflection_languages&.split(',') || []),

app/models/country_language_preference.rb

@@ -34,10 +34,20 @@ class CountryLanguagePreference < ApplicationRecord
   belongs_to :wbw_language, class_name: 'Language', foreign_key: :default_wbw_language, primary_key: :iso_code, optional: true
   belongs_to :mushaf, foreign_key: :default_mushaf_id, optional: true
   belongs_to :tafsir, class_name: 'ResourceContent', foreign_key: :default_tafsir_id, optional: true
+  belongs_to :default_locale_language, class_name: 'Language', foreign_key: :default_locale, primary_key: :iso_code, optional: true
+  belongs_to :qr_default_locale_language, class_name: 'Language', foreign_key: :qr_default_locale, primary_key: :iso_code, optional: true
 
   validates :user_device_language, presence: true
 
   scope :with_includes, -> {
-    includes(:audio_recitation, :language, :wbw_language, :mushaf, :tafsir)
+    includes(
+      :audio_recitation,
+      :language,
+      :wbw_language,
+      :mushaf,
+      :tafsir,
+      :default_locale_language,
+      :qr_default_locale_language
+    )
   }
 end

app/views/api/qdc/resources/country_language_preference.json.streamer

@@ -59,6 +59,10 @@ json.object! do
     json.default_wbw_language nil
   end
 
+  json.default_locale @data[:default_locale]&.iso_code
+
+  json.qr_default_locale @data[:qr_default_locale]&.iso_code
+
   if @data[:default_reciter]
     json.default_reciter do
       json.object! do

db/migrate/20251014122033_add_locale_fields_to_country_language_preferences.rb

@@ -0,0 +1,18 @@
+class AddLocaleFieldsToCountryLanguagePreferences < ActiveRecord::Migration[7.0]
+  def change
+    add_column :country_language_preferences, :default_locale, :string
+    add_column :country_language_preferences, :qr_default_locale, :string
+
+    add_foreign_key :country_language_preferences,
+                    :languages,
+                    column: :default_locale,
+                    primary_key: :iso_code,
+                    on_delete: :cascade
+
+    add_foreign_key :country_language_preferences,
+                    :languages,
+                    column: :qr_default_locale,
+                    primary_key: :iso_code,
+                    on_delete: :cascade
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2025_10_14_122032) do
+ActiveRecord::Schema[7.0].define(version: 2025_10_14_122033) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -357,6 +357,8 @@
     t.string "qr_default_translations_ids"
     t.string "qr_reflection_languages"
     t.string "qr_default_arabic_fonts"
+    t.string "default_locale"
+    t.string "qr_default_locale"
   end
 
   create_table "data_sources", id: :serial, force: :cascade do |t|
@@ -1658,7 +1660,9 @@
   add_foreign_key "chapter_metadata", "languages"
   add_foreign_key "char_type", "char_type", column: "parent_id", primary_key: "char_type_id", name: "char_type_parent_id_fkey", on_update: :cascade, on_delete: :nullify
   add_foreign_key "country_language_preferences", "audio_recitations", column: "default_reciter", on_delete: :cascade
+  add_foreign_key "country_language_preferences", "languages", column: "default_locale", primary_key: "iso_code", on_delete: :cascade
   add_foreign_key "country_language_preferences", "languages", column: "default_wbw_language", primary_key: "iso_code", on_delete: :cascade
+  add_foreign_key "country_language_preferences", "languages", column: "qr_default_locale", primary_key: "iso_code", on_delete: :cascade
   add_foreign_key "country_language_preferences", "languages", column: "user_device_language", primary_key: "iso_code", on_delete: :cascade
   add_foreign_key "country_language_preferences", "mushafs", column: "default_mushaf_id", on_delete: :cascade
   add_foreign_key "country_language_preferences", "resource_contents", column: "default_tafsir_id", on_delete: :cascade

spec/requests/api/qdc/resources_country_language_preference_spec.rb

@@ -73,5 +73,22 @@
       json = JSON.parse(response.body)
       expect(json['qr_default_arabic_fonts']).to eq([1, 2, 3])
     end
+
+    it 'includes default_locale and qr_default_locale when present' do
+      pref_with_locales = CountryLanguagePreference.create!(
+        user_device_language: 'xx',
+        country: 'DE',
+        default_locale: 'xx',
+        qr_default_locale: 'zz'
+      )
+
+      get '/api/qdc/resources/country_language_preference', params: { user_device_language: 'xx', country: 'DE' }
+
+      expect(response).to have_http_status(:ok)
+      json = JSON.parse(response.body)
+
+      expect(json.dig('default_locale', 'iso_code')).to eq('xx')
+      expect(json.dig('qr_default_locale', 'iso_code')).to eq('zz')
+    end
   end
 end