app/models/concerns/thredded/topic_common.rb in thredded-0.2.2 vs app/models/concerns/thredded/topic_common.rb in thredded-0.3.0

@@ -1,18 +1,17 @@
+# frozen_string_literal: true
 module Thredded
   module TopicCommon
     extend ActiveSupport::Concern
     included do
-      paginates_per 50 if self.respond_to?(:paginates_per)
+      paginates_per 50 if respond_to?(:paginates_per)
 
-      belongs_to :user,
-                 class_name: Thredded.user_class
       belongs_to :last_user,
-                 class_name: Thredded.user_class,
+                 class_name:  Thredded.user_class,
                  foreign_key: 'last_user_id'
 
-      scope :order_latest_first, -> { order(updated_at: :desc, id: :desc) }
+      scope :order_recently_updated_first, -> { order(updated_at: :desc, id: :desc) }
       scope :on_page, -> page_num { page(page_num).per(30) }
 
       validates_presence_of :hash_id
       validates_presence_of :last_user_id
       validates_numericality_of :posts_count
@@ -36,12 +35,36 @@
     def private?
       !public?
     end
 
     module ClassMethods
-      def decorate
-        all.map do |topic|
-          TopicDecorator.new(topic)
+      # @param user [Thredded.user_class]
+      # @return [ActiveRecord::Relation]
+      def unread(user)
+        topics      = arel_table
+        reads_class = reflect_on_association(:user_read_states).klass
+        reads       = reads_class.arel_table
+        joins(topics.join(reads, Arel::Nodes::OuterJoin)
+                .on(topics[:id].eq(reads[:postable_id]).and(reads[:user_id].eq(user.id))).join_sources)
+          .merge(reads_class.where(reads[:id].eq(nil).or(reads[:read_at].lt(topics[:updated_at]))))
+      end
+
+      # @param user [Thredded.user_class]
+      # @return [Array<[TopicCommon, UserTopicReadStateCommon]>]
+      def with_read_states(user)
+        null_read_state = Thredded::NullUserTopicReadState.new
+        return current_scope.zip([null_read_state]) if user.thredded_anonymous?
+        read_state_by_topic_id =
+          reflect_on_association(:user_read_states).klass
+            .where(user_id: user.id, postable_id: current_scope.map(&:id))
+            .group_by(&:postable_id)
+        current_scope.map do |topic|
+          read_state = read_state_by_topic_id[topic.id]
+          if read_state
+            read_state = read_state[0]
+            read_state.postable = topic
+          end
+          [topic, read_state || null_read_state]
         end
       end
     end
   end
 end