DEV: Adding specs and refactors

app/services/discourse_rewind/action/most_viewed_categories.rb

@@ -20,9 +20,13 @@ def call
           TopicViewItem
             .joins(:topic)
             .joins("INNER JOIN categories ON categories.id = topics.category_id")
-            .where(user: user)
-            .where(viewed_at: date)
-            .where(categories: { id: user.guardian.allowed_category_ids })
+            .where(
+              user: user,
+              viewed_at: date,
+              categories: {
+                id: user.guardian.allowed_category_ids,
+              },
+            )
             .group("categories.id, categories.name")
             .order("COUNT(*) DESC")
             .limit(4)

app/services/discourse_rewind/action/most_viewed_tags.rb

@@ -22,9 +22,7 @@ def call
             .joins(:topic)
             .joins("INNER JOIN topic_tags ON topic_tags.topic_id = topics.id")
             .joins("INNER JOIN tags ON tags.id = topic_tags.tag_id")
-            .where(user: user)
-            .where(viewed_at: date)
-            .where(tags: { id: Tag.visible(user.guardian).pluck(:id) })
+            .where(user: user, viewed_at: date, tags: { id: Tag.visible(user.guardian).pluck(:id) })
             .group("tags.id, tags.name")
             .order("COUNT(DISTINCT topic_views.topic_id) DESC")
             .limit(4)

app/services/discourse_rewind/action/reactions.rb

@@ -85,7 +85,7 @@ def enabled?
       end
 
       def sort_and_limit(reactions)
-        reactions.sort_by { |_, v| -v }.first(5).reverse.to_h
+        reactions.sort_by { |_, value| -value }.take(5).reverse.to_h
       end
     end
   end

app/services/discourse_rewind/action/reading_time.rb

@@ -5,6 +5,144 @@
 module DiscourseRewind
   module Action
     class ReadingTime < BaseReport
+      POPULAR_BOOKS = {
+        "The Metamorphosis" => {
+          reading_time: 3120,
+          isbn: "978-0553213690",
+          series: false,
+        },
+        "The Little Prince" => {
+          reading_time: 5400,
+          isbn: "978-0156012195",
+          series: false,
+        },
+        "Animal Farm" => {
+          reading_time: 7200,
+          isbn: "978-0451526342",
+          series: false,
+        },
+        "The Alchemist" => {
+          reading_time: 10_800,
+          isbn: "978-0061122415",
+          series: false,
+        },
+        "The Great Gatsby" => {
+          reading_time: 12_600,
+          isbn: "978-0743273565",
+          series: false,
+        },
+        "The Hitchhiker's Guide to the Galaxy" => {
+          reading_time: 12_600,
+          isbn: "978-0345391803",
+          series: false,
+        },
+        "Fahrenheit 451" => {
+          reading_time: 15_000,
+          isbn: "978-1451673319",
+          series: false,
+        },
+        "And Then There Were None" => {
+          reading_time: 16_200,
+          isbn: "978-0062073488",
+          series: false,
+        },
+        "1984" => {
+          reading_time: 16_800,
+          isbn: "978-0451524935",
+          series: false,
+        },
+        "The Catcher in the Rye" => {
+          reading_time: 18_000,
+          isbn: "978-0316769488",
+          series: false,
+        },
+        "The Hunger Games" => {
+          reading_time: 19_740,
+          isbn: "978-0439023481",
+          series: false,
+        },
+        "To Kill a Mockingbird" => {
+          reading_time: 22_800,
+          isbn: "978-0061120084",
+          series: false,
+        },
+        "Harry Potter and the Sorcerer's Stone" => {
+          reading_time: 24_600,
+          isbn: "978-0590353427",
+          series: true,
+        },
+        "Pride and Prejudice" => {
+          reading_time: 25_200,
+          isbn: "978-1503290563",
+          series: false,
+        },
+        "The Hobbit" => {
+          reading_time: 27_000,
+          isbn: "978-0547928227",
+          series: false,
+        },
+        "Little Women" => {
+          reading_time: 30_000,
+          isbn: "978-0147514011",
+          series: false,
+        },
+        "Jane Eyre" => {
+          reading_time: 34_200,
+          isbn: "978-0141441146",
+          series: false,
+        },
+        "The Da Vinci Code" => {
+          reading_time: 37_800,
+          isbn: "978-0307474278",
+          series: false,
+        },
+        "One Hundred Years of Solitude" => {
+          reading_time: 46_800,
+          isbn: "978-0060883287",
+          series: false,
+        },
+        "The Lord of the Rings" => {
+          reading_time: 108_000,
+          isbn: "978-0544003415",
+          series: true,
+        },
+        "The Complete works of Shakespeare" => {
+          reading_time: 180_000,
+          isbn: "978-1853268953",
+          series: true,
+        },
+        "The Game of Thrones Series" => {
+          reading_time: 360_000,
+          isbn: "978-0007477159",
+          series: true,
+        },
+        "Malazan Book of the Fallen" => {
+          reading_time: 720_000,
+          isbn: "978-0765348821",
+          series: true,
+        },
+        "Terry Pratchett's Discworld series" => {
+          reading_time: 1_440_000,
+          isbn: "978-9123684458",
+          series: true,
+        },
+        "The Wandering Inn web series" => {
+          reading_time: 2_160_000,
+          isbn: "the-wandering-inn",
+          series: true,
+        },
+        "The Combined Cosmere works + Wheel of Time" => {
+          reading_time: 2_880_000,
+          isbn: "978-0812511819",
+          series: true,
+        },
+        "The Star Trek novels" => {
+          reading_time: 3_600_000,
+          isbn: "978-1852860691",
+          series: true,
+        },
+      }.symbolize_keys
+
       FakeData = {
         data: {
           reading_time: 2_880_000,
@@ -26,176 +164,23 @@ def call
         {
           data: {
             reading_time: reading_time,
-            book: book[:title],
+            book: book[:title].to_s,
             isbn: book[:isbn],
             series: book[:series],
           },
           identifier: "reading-time",
         }
       end
 
-      def popular_books
-        {
-          "The Hunger Games" => {
-            reading_time: 19_740,
-            isbn: "978-0439023481",
-            series: false,
-          },
-          "The Metamorphosis" => {
-            reading_time: 3120,
-            isbn: "978-0553213690",
-            series: false,
-          },
-          "To Kill a Mockingbird" => {
-            reading_time: 22_800,
-            isbn: "978-0061120084",
-            series: false,
-          },
-          "Pride and Prejudice" => {
-            reading_time: 25_200,
-            isbn: "978-1503290563",
-            series: false,
-          },
-          "1984" => {
-            reading_time: 16_800,
-            isbn: "978-0451524935",
-            series: false,
-          },
-          "The Lord of the Rings" => {
-            reading_time: 108_000,
-            isbn: "978-0544003415",
-            series: true,
-          },
-          "Harry Potter and the Sorcerer's Stone" => {
-            reading_time: 24_600,
-            isbn: "978-0590353427",
-            series: true,
-          },
-          "The Great Gatsby" => {
-            reading_time: 12_600,
-            isbn: "978-0743273565",
-            series: false,
-          },
-          "The Little Prince" => {
-            reading_time: 5400,
-            isbn: "978-0156012195",
-            series: false,
-          },
-          "Animal Farm" => {
-            reading_time: 7200,
-            isbn: "978-0451526342",
-            series: false,
-          },
-          "The Catcher in the Rye" => {
-            reading_time: 18_000,
-            isbn: "978-0316769488",
-            series: false,
-          },
-          "Jane Eyre" => {
-            reading_time: 34_200,
-            isbn: "978-0141441146",
-            series: false,
-          },
-          "Fahrenheit 451" => {
-            reading_time: 15_000,
-            isbn: "978-1451673319",
-            series: false,
-          },
-          "The Hobbit" => {
-            reading_time: 27_000,
-            isbn: "978-0547928227",
-            series: false,
-          },
-          "The Da Vinci Code" => {
-            reading_time: 37_800,
-            isbn: "978-0307474278",
-            series: false,
-          },
-          "Little Women" => {
-            reading_time: 30_000,
-            isbn: "978-0147514011",
-            series: false,
-          },
-          "One Hundred Years of Solitude" => {
-            reading_time: 46_800,
-            isbn: "978-0060883287",
-            series: false,
-          },
-          "And Then There Were None" => {
-            reading_time: 16_200,
-            isbn: "978-0062073488",
-            series: false,
-          },
-          "The Alchemist" => {
-            reading_time: 10_800,
-            isbn: "978-0061122415",
-            series: false,
-          },
-          "The Hitchhiker's Guide to the Galaxy" => {
-            reading_time: 12_600,
-            isbn: "978-0345391803",
-            series: false,
-          },
-          "The Complete works of Shakespeare" => {
-            reading_time: 180_000,
-            isbn: "978-1853268953",
-            series: true,
-          },
-          "The Game of Thrones Series" => {
-            reading_time: 360_000,
-            isbn: "978-0007477159",
-            series: true,
-          },
-          "Malazan Book of the Fallen" => {
-            reading_time: 720_000,
-            isbn: "978-0765348821",
-            series: true,
-          },
-          "Terry Pratchett’s Discworld series" => {
-            reading_time: 1_440_000,
-            isbn: "978-9123684458",
-            series: true,
-          },
-          "The Wandering Inn web series" => {
-            reading_time: 2_160_000,
-            isbn: "the-wandering-inn",
-            series: true,
-          },
-          "The Combined Cosmere works + Wheel of Time" => {
-            reading_time: 2_880_000,
-            isbn: "978-0812511819",
-            series: true,
-          },
-          "The Star Trek novels" => {
-            reading_time: 3_600_000,
-            isbn: "978-1852860691",
-            series: true,
-          },
-        }.symbolize_keys
-      end
-
       def best_book_fit(reading_time)
-        reading_time_rest = reading_time
-        books = []
-
-        while reading_time_rest > 0
-          best_fit = popular_books.min_by { |_, v| (v[:reading_time] - reading_time_rest).abs }
-          break if best_fit.nil?
+        best_fit =
+          POPULAR_BOOKS
+            .select { |_, v| v[:reading_time] > reading_time }
+            .min_by { |_, v| v[:reading_time] }
 
-          books << best_fit.first
-          reading_time_rest -= best_fit.last[:reading_time]
-        end
+        return if best_fit.nil?
 
-        return if books.empty?
-
-        book_title =
-          books.group_by { |book| book }.transform_values(&:count).max_by { |_, count| count }.first
-
-        {
-          title: book_title,
-          isbn: popular_books[book_title][:isbn],
-          series: popular_books[book_title][:series],
-        }
+        { title: best_fit.first, isbn: best_fit.last[:isbn], series: best_fit.last[:series] }
       end
     end
   end

app/services/discourse_rewind/action/top_words.rb

@@ -10,7 +10,6 @@ class TopWords < BaseReport
           { word: "you", score: 80 },
           { word: "overachieved", score: 70 },
           { word: "assume", score: 60 },
-          { word: "week", score: 50 },
         ],
         identifier: "top-words",
       }
@@ -79,7 +78,13 @@ def call
         LIMIT 100
       SQL
 
-        word_score = words.map { { word: _1.original_word, score: _1.ndoc + _1.nentry } }
+        word_score =
+          words
+            .map do |word_data|
+              { word: word_data.original_word, score: word_data.ndoc + word_data.nentry }
+            end
+            .sort_by! { |w| -w[:score] }
+            .take(5)
 
         { data: word_score, identifier: "top-words" }
       end

app/services/discourse_rewind/fetch_reports.rb

@@ -5,7 +5,8 @@ module DiscourseRewind
   #
   # @example
   #  ::DiscourseRewind::Rewind::Fetch.call(
-  #    guardian: guardian
+  #    guardian: guardian,
+  #    params: { year: 2023, username: 'codinghorror' }
   #  )
   #
   class FetchReports