Merge pull request #2067 from SFDigitalServices/release-01-30-2024

Release 01-30-2024
SFDigitalServices · Feb 5, 2024 · 2a70ee4 · 2a70ee4
2 parents 2f8804f + d854261
commit 2a70ee4
Show file tree

Hide file tree

Showing 33 changed files with 412 additions and 393 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', '~> 6.1.7.3'
+gem 'rails', '~> 7.0.0'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
@@ -17,11 +17,13 @@ gem 'slim-rails'
 gem 'uglifier', '~> 3.2'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails'
+# As of Rails 7.0, sprocket-rails is no longer a dependency of rails itself
+gem "sprockets-rails"
 # Add ability to generate source maps in Sprockets
 gem 'sprockets_uglifier_with_source_maps'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby
-gem 'puma', '~> 4.3.12'
+gem 'puma', '~> 5.6.8'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.8.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,70 +14,76 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
     actionmailer-text (0.1.1)
       actionmailer
       htmlentities
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     angular-rails-templates (1.2.0)
@@ -248,7 +254,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     newrelic_rpm (9.0.0)
-    nio4r (2.5.8)
+    nio4r (2.7.0)
     nokogiri (1.14.2-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.2-x86_64-darwin)
@@ -280,7 +286,7 @@ GEM
       pry (>= 0.10.4)
     psych (3.3.4)
     public_suffix (5.0.1)
-    puma (4.3.12)
+    puma (5.6.8)
       nio4r (~> 2.0)
     racc (1.6.2)
     rack (2.2.6.4)
@@ -293,21 +299,20 @@ GEM
     rack-rewrite (1.5.1)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -326,12 +331,13 @@ GEM
       json
       require_all (~> 3.0)
       ruby-progressbar
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
@@ -463,7 +469,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.8.1)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.6.7)
@@ -515,11 +521,11 @@ DEPENDENCIES
   pry-byebug
   pry-rails
   psych (< 4)
-  puma (~> 4.3.12)
+  puma (~> 5.6.8)
   rack (>= 2.2.3)
   rack-cors (~> 1.0.5)
   rack-rewrite (~> 1.5.0)
-  rails (~> 6.1.7.3)
+  rails (~> 7.0.0)
   rails-controller-testing
   rails_autoscale_agent
   rails_best_practices
@@ -537,6 +543,7 @@ DEPENDENCIES
   sitemap_generator!
   slim-rails
   spring
+  sprockets-rails
   sprockets_uglifier_with_source_maps
   uglifier (~> 3.2)
   vcr

diff --git a/app/assets/json/translations/locale-es.json b/app/assets/json/translations/locale-es.json
@@ -670,7 +670,15 @@
             "done_with_this_address": "Ya he finalizado con esta dirección",
             "dont_want_preference": "No deseo esta preferencia para el sorteo",
             "download_application": "Descargar solicitud en {{lang}}",
+            "edit_alternate_contact": "Editar \"Información de contacto alternativa\"",
             "edit_eligibility": "Modifique la elegibilidad",
+            "edit_household_details": "Editar \"Detalles del hogar\"",
+            "edit_household_members": "Editar \"Integrantes del hogar\"",
+            "edit_income": "Editar \"Ingresos\"",
+            "edit_more_about_you": "Editar \"Más información sobre usted\"",
+            "edit_preferences": "Editar \"Preferencias\"",
+            "edit_qualifications": "Editar \"Calificaciones\"",
+            "edit_you": "Editar \"Su información\"",
             "edited": "Editado",
             "email_address": "Correo electrónico",
             "family_member": "Integrante de la familia",

diff --git a/app/assets/json/translations/locale-tl.json b/app/assets/json/translations/locale-tl.json
@@ -670,7 +670,15 @@
             "done_with_this_address": "Tapos na sa address na ito",
             "dont_want_preference": "Hindi ko gusto ang preperensiyang ito para sa lottery",
             "download_application": "I-download ang {{lang}} na Aplikasyon ",
+            "edit_alternate_contact": "I-edit ang \"Alternatibong impormasyon sa pakikipag-ugnayan\"",
             "edit_eligibility": "I-edit ang Pagiging Kuwalipikado",
+            "edit_household_details": "I-edit ang \"Mga detalye ng sambahayan\"",
+            "edit_household_members": "I-edit ang \"Mga miyembro ng sambahayan\"",
+            "edit_income": "I-edit ang \"Kita\"",
+            "edit_more_about_you": "I-edit ang \"Higit pa tungkol sa iyo\"",
+            "edit_preferences": "I-edit ang \"Mga Kagustuhan\"",
+            "edit_qualifications": "I-edit ang \"Mga Kwalipikasyon\"",
+            "edit_you": "I-edit ang \"Iyong impormasyon\"",
             "edited": "Na-edit na",
             "email_address": "Email",
             "family_member": "Miyembro ng Pamilya",

diff --git a/app/assets/json/translations/locale-zh.json b/app/assets/json/translations/locale-zh.json
@@ -671,7 +671,15 @@
             "done_with_this_address": "此地址已填寫完成",
             "dont_want_preference": "我不想要此抽籤優先權利",
             "download_application": "下載{{lang}}申請",
+            "edit_alternate_contact": "編輯「備用聯絡資訊」",
             "edit_eligibility": "編輯資格",
+            "edit_household_details": "編輯「住戶詳細資料」",
+            "edit_household_members": "編輯「家庭成員」",
+            "edit_income": "編輯「收入」",
+            "edit_more_about_you": "編輯「您的其他相關資訊」",
+            "edit_preferences": "編輯「優先權」",
+            "edit_qualifications": "編輯「資格」",
+            "edit_you": "編輯「您的資訊」",
             "edited": "已編輯",
             "email_address": "電子郵件",
             "family_member": "家庭成員",

diff --git a/app/assets/json/translations/react/es.json b/app/assets/json/translations/react/es.json
@@ -1197,13 +1197,13 @@
   "listingsForSale.getHelp.viewFullListOfPrograms": "Ver la lista completa de programas.",
   "listingsForSale.getHelp.visitMohcdPrograms": "Visite la página Programas para compradores de vivienda asequibles de la MOHCD para obtener más información.",
   "listingsForSale.lotteryPreferences.hasPreferences": "Cualquier persona puede participar en el sorteo de viviendas para este listado. Si las personas que viven con usted tienen una de las siguientes preferencias, se le considerará en el orden que se muestra aquí. Cada poseedor de preferencias será revisado de acuerdo al orden en que haya salido en el sorteo.",
-  "listingsForSale.lotteryPreferences.lotteryPreferencesArePrograms": "Las preferencias de lotería son programas que le ayudan a obtener una clasificación más alta en la lotería. Si califica para una preferencia, tiene más posibilidades en la lotería. Si no califica para una preferencia, se le clasificará por debajo de aquellos que sí lo hacen.",
-  "listingsForSale.lotteryPreferences.moreAboutPriority": "Más sobre la prioridad para los veteranos",
+  "listingsForSale.lotteryPreferences.lotteryPreferencesArePrograms": "Las preferencias de sorteo son programas que le ayudan a obtener una clasificación más alta en el sorteo. Si califica para una preferencia, tiene más posibilidades en el sorteo. Si no califica para una preferencia, quedará clasificado por debajo de los que sí lo hacen.",
+  "listingsForSale.lotteryPreferences.moreAboutPriority": "Más información sobre la prioridad para veteranos",
   "listingsForSale.lotteryPreferences.noPreferences": "Los poseedores de preferencias tendrán la clasificación más alta en el proceso del sorteo.",
-  "listingsForSale.lotteryPreferences.priorityForUsMilitaryVeterans": "Prioridad para los veteranos militares de los EE. UU.",
+  "listingsForSale.lotteryPreferences.priorityForUsMilitaryVeterans": "Prioridad para veteranos militares estadounidenses",
   "listingsForSale.lotteryPreferences.title": "Preferencias del sorteo",
   "listingsForSale.lotteryPreferences.veteransGetPriority": "Los veteranos tienen prioridad dentro de las siguientes categorías de preferencia.",
-  "listingsForSale.lotteryPreferences.weContactApplicants": "Nos comunicamos con los solicitantes en el orden de los resultados de la lotería. Si su hogar califica para una de las siguientes preferencias, se lo considerará en el orden que se muestra aquí.",
+  "listingsForSale.lotteryPreferences.weContactApplicants": "Nos comunicamos con los solicitantes según el orden de los resultados del sorteo. Si su hogar califica para una de las siguientes preferencias, se lo considerará en el orden que se muestra aquí.",
   "listingsForSale.seeTheListings": "Vea los anuncios",
   "lottery": "Sorteo",
   "lottery.anyRemainingUnits": "Todas las unidades restantes",

diff --git a/app/assets/json/translations/react/tl.json b/app/assets/json/translations/react/tl.json
@@ -1197,13 +1197,13 @@
   "listingsForSale.getHelp.viewFullListOfPrograms": "Tingnan ang buong listahan ng mga programa",
   "listingsForSale.getHelp.visitMohcdPrograms": "Bumisita sa page na Mga Abot-kayang Programa para sa Homebuyer ng MOHCD para matuto pa.",
   "listingsForSale.lotteryPreferences.hasPreferences": "Puwedeng sumali ang sinuman sa lottery o palabunutan sa pabahay para sa nakalistang pabahay na ito. Kung mayroong isa sa mga sumusunod na preperensiya ang inyong kabahayan, isasaalang-alang kayo ayon sa pagkakasuod-sunod na ipinapakita rito. Pag-aaralan ang bawat mayroong preperensiya ayon sa pagkakasunod-sunod ng ranggo sa lottery. ",
-  "listingsForSale.lotteryPreferences.lotteryPreferencesArePrograms": "Ang mga kagustuhan sa lottery ay mga programang makakatulong sa iyong mas mataas na ranggo sa lottery. Kung kwalipikado ka para sa isang kagustuhan, mayroon kang isang mas mahusay na pagkakataon sa lottery. Kung hindi ka kuwalipikado para sa isang kagustuhan, ikaw ay iraranggo sa ibaba ng mga gagawa.",
+  "listingsForSale.lotteryPreferences.lotteryPreferencesArePrograms": "Ang mga kagustuhan sa lottery ay mga programang makakatulong sa inyong magkaroon ng mas mataas na ranggo sa lottery. Kung kwalipikado ka para sa kagustuhan, may mas mataas na pagkakataon ka sa lottery. Kung hindi ka kwalipikado para sa kagustuhan, iraranggo ka sa ibaba ng mga kwalipikado.",
   "listingsForSale.lotteryPreferences.moreAboutPriority": "Higit pa tungkol sa priyoridad para sa mga Beterano",
   "listingsForSale.lotteryPreferences.noPreferences": "Bibigyan ang mayroong preperensiya ng pinakamataas na ranggo sa proseso ng lottery o palabunutan.",
-  "listingsForSale.lotteryPreferences.priorityForUsMilitaryVeterans": "Priyoridad para sa US Military Veterans",
+  "listingsForSale.lotteryPreferences.priorityForUsMilitaryVeterans": "Priyoridad para sa mga Beterano ng Militar ng US",
   "listingsForSale.lotteryPreferences.title": "Mga Preperensya sa Loterya o Palabunutan",
-  "listingsForSale.lotteryPreferences.veteransGetPriority": "Ang mga beterano ay nakakakuha ng priyoridad sa loob ng mga kategorya ng kagustuhan sa ibaba.",
-  "listingsForSale.lotteryPreferences.weContactApplicants": "Nakikipag-ugnayan kami sa mga aplikante sa pagkakasunud-sunod ng mga resulta ng lottery. Kung ang iyong sambahayan ay kwalipikado para sa isa sa mga sumusunod na kagustuhan, ikaw ay isasaalang-alang sa pagkakasunud-sunod na ipinapakita dito.",
+  "listingsForSale.lotteryPreferences.veteransGetPriority": "Nakakakuha ng priyoridad ang mga beterano sa mga kategorya ng kagustuhan na nasa ibaba.",
+  "listingsForSale.lotteryPreferences.weContactApplicants": "Nakikipag-ugnayan kami sa mga aplikante ayon sa pagkakasunod-sunod ng mga resulta ng lottery. Kung kwalipikado ang inyong sambahayan para sa isa sa mga sumusunod na kagustuhan, isasaalang-alang kayo ayon sa pagkakasunod-sunod na ipinapakita rito.",
   "listingsForSale.seeTheListings": "Tingnan ang mga nakalistang pabahay",
   "lottery": "Lottery o Palabunutan",
   "lottery.anyRemainingUnits": "Anumang natitira pang unit",

diff --git a/app/assets/json/translations/react/zh.json b/app/assets/json/translations/react/zh.json
@@ -1197,13 +1197,13 @@
   "listingsForSale.getHelp.viewFullListOfPrograms": "查閱完整的計畫例表",
   "listingsForSale.getHelp.visitMohcdPrograms": "造訪 MOHCD 可負擔購房者計劃頁面以了解更多資訊。",
   "listingsForSale.lotteryPreferences.hasPreferences": "任何人均可參加該物業的住房抽籤。如果您的家庭享有以下優先權之一，您將按照如下所示次序獲得考慮。每個優先權擁有者均按抽籤排名次序審議。",
-  "listingsForSale.lotteryPreferences.lotteryPreferencesArePrograms": "彩票偏好是幫助您在彩票中獲得更高排名的程序。 如果您符合優先條件，您就有更好的機會參加抽籤。 如果您不符合優先條件，您的排名將低於符合優先條件的人。",
-  "listingsForSale.lotteryPreferences.moreAboutPriority": "有關退伍軍人優先權的更多信息",
+  "listingsForSale.lotteryPreferences.lotteryPreferencesArePrograms": "抽籤優先權計劃可協助您獲得更高的抽籤排名。符合優先權條件者，中籤機率較高。不符合優先權條件者，將會排在符合優先權條件者之後。",
+  "listingsForSale.lotteryPreferences.moreAboutPriority": "進一步瞭解退伍軍人優先權",
   "listingsForSale.lotteryPreferences.noPreferences": "優先權擁有者將在抽籤中獲得最高排名。",
-  "listingsForSale.lotteryPreferences.priorityForUsMilitaryVeterans": "美國退伍軍人優先",
+  "listingsForSale.lotteryPreferences.priorityForUsMilitaryVeterans": "美國退伍軍人優先權",
   "listingsForSale.lotteryPreferences.title": "抽籤優先權",
-  "listingsForSale.lotteryPreferences.veteransGetPriority": "退伍軍人在以下優先類別中享有優先權。",
-  "listingsForSale.lotteryPreferences.weContactApplicants": "我們按照抽籤結果的順序聯絡申請人。 如果您的家庭符合以下偏好之一，我們將按照此處顯示的順序考慮您。",
+  "listingsForSale.lotteryPreferences.veteransGetPriority": "退伍軍人在以下優先權類別中享有優先權。",
+  "listingsForSale.lotteryPreferences.weContactApplicants": "我們將按照抽籤結果，依序聯絡申請人。如果您的家庭符合以下任一優先權資格，我們將按照此處顯示的順序考慮您的申請。",
   "listingsForSale.seeTheListings": "查看物業名單",
   "lottery": "抽籤",
   "lottery.anyRemainingUnits": "任何剩餘單位",

diff --git a/app/controllers/api/v1/account_controller.rb b/app/controllers/api/v1/account_controller.rb
@@ -6,22 +6,14 @@ class Api::V1::AccountController < ApiController
 
   def my_applications
     applications = map_listings_to_applications(current_user_applications)
-    render json: { applications: applications }
+    render json: { applications: }
   end
 
   def update
     contact = account_params
     contact[:contactID] = current_user.salesforce_contact_id
     contact[:webAppID] = current_user.id
-    salesforce_contact = Force::AccountService.create_or_update(
-      webAppID: contact[:id],
-      contactId: contact[:contactID],
-      email: contact[:email],
-      firstName: contact[:firstName],
-      middleName: contact[:middleName],
-      lastName: contact[:lastName],
-      DOB: contact[:DOB],
-    )
+    salesforce_contact = Force::AccountService.create_or_update(contact.as_json)
     Emailer.account_update(current_user).deliver_later
     render json: { contact: salesforce_contact }
   end
@@ -38,6 +30,7 @@ def confirm
     unless Rails.env.development? || ENV['SAUCE_URL']
       return render plain: 'Forbidden', status: 403
     end
+
     user = User.find_by_email(params[:email])
     if user
       user.confirm

diff --git a/app/services/arc_gis_service/base.rb → app/services/arc_g_i_s_service/base.rb b/app/services/arc_gis_service/base.rb → app/services/arc_g_i_s_service/base.rb
diff --git a/...ices/arc_gis_service/geocoding_service.rb → ...es/arc_g_i_s_service/geocoding_service.rb b/...ices/arc_gis_service/geocoding_service.rb → ...es/arc_g_i_s_service/geocoding_service.rb
diff --git a/..._service/neighborhood_boundary_service.rb → ..._service/neighborhood_boundary_service.rb b/..._service/neighborhood_boundary_service.rb → ..._service/neighborhood_boundary_service.rb