Removed time_diff_words method and replaced with rails distance_of_time_in_words

Author: A-Wheeto

app/services/cms/models/collections/email_template.rb

@@ -2,6 +2,8 @@ module Cms
   module Models
     module Collections
       class EmailTemplate
+        include ActionView::Helpers::DateHelper
+
         attr_accessor :slug, :email_content, :programme, :completed_programme_activity_groups, :activity_state, :enrolled
 
         def initialize(slug:, subject:, email_content:, programme_slug:, completed_programme_activity_group_slugs:, activity_state:, enrolled:)
@@ -47,8 +49,10 @@ def merge_content(text, user)
           achievements = user.sorted_completed_cpd_achievements_by(programme: @programme)
           if achievements.any?
             achievement = achievements.last
+            last_cpd_completed_ago = distance_of_time_in_words(achievement.updated_at, DateTime.now)
+
             merges += [
-              ["{last_cpd_completed_ago}", time_diff_words(achievement.updated_at)],
+              ["{last_cpd_completed_ago}", last_cpd_completed_ago],
               ["{last_cpd_completed_year}", "in #{achievement.updated_at.year}"],
               ["{last_cpd_title}", achievement.activity.title]
             ]
@@ -57,21 +61,6 @@ def merge_content(text, user)
           merges.each { new_text.gsub!(_1[0], _1[1]) }
           new_text
         end
-
-        def time_diff_words(date)
-          from_time = date.to_time
-          to_time = DateTime.now.to_time
-
-          months = (to_time.year * 12 + to_time.month) - (from_time.year * 12 + from_time.month)
-          months = 1 if months == 0
-
-          if months >= 12
-            years = months / 12
-            "#{years} #{"year".pluralize(years)}"
-          else
-            "#{months} #{"month".pluralize(months)}"
-          end
-        end
       end
     end
   end

spec/services/cms/models/collections/email_template_spec.rb

@@ -35,6 +35,15 @@
             type: "text"
           }
         ]
+      },
+      {
+        type: "paragraph",
+        children: [
+          {
+            text: "You completed {last_cpd_title} {last_cpd_completed_ago} ago.",
+            type: "text"
+          }
+        ]
       }
     ]
   }
@@ -67,21 +76,26 @@
     expect(text).to eq("Frodo should click this link")
   end
 
-  context "time_diff_words" do
-    it "should return months" do
-      expect(@model.time_diff_words(3.months.ago)).to eq("3 months")
-    end
+  context "with achievement" do
+    let(:activity) { create(:activity, title: "Past activity") }
+    let!(:achievement) { create(:completed_achievement, activity:, user:) }
+    let(:updated_at) { DateTime.parse("2025-04-01") }
+
+    before do
+      allow(achievement).to receive(:updated_at).and_return(updated_at)
+      allow(user).to receive(:sorted_completed_cpd_achievements_by).and_return([achievement])
 
-    it "should return month when only one" do
-      expect(@model.time_diff_words(1.months.ago)).to eq("1 month")
+      travel_to DateTime.parse("2025-05-01")
     end
 
-    it "should return year when over 12 months" do
-      expect(@model.time_diff_words(12.months.ago)).to eq("1 year")
+    after do
+      travel_back
     end
 
-    it "should return years when over 24 months" do
-      expect(@model.time_diff_words(25.months.ago)).to eq("2 years")
+    it "should replace achievement placeholders using distance_of_time_in_words" do
+      content = @model.process_blocks(text_content, user)
+      text = content.dig(2, :children, 0, :text)
+      expect(text).to eq("You completed Past activity about 1 month ago.")
     end
   end