wco_models 3.1.0.174 → 3.1.0.176

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3123e82f0b6b6c73467f25b805938849fec0eb0cdc83fabff9d0d4eb7636759e
-  data.tar.gz: 3f00797cf55c973a2fbc67d44c62d5b1fe9d2a8794b2a12f8c20b9a3674e681f
+  metadata.gz: 17d234b960f5061db8dd3236d041580aec9252b78a97dd7a27e6c07e57a9cc53
+  data.tar.gz: 3aba8e65bd0e8797b6d34dfb64e5ec6f76a05265c4dc4b24474129758a3d5c80
 SHA512:
-  metadata.gz: 9291087081326216d314e00878343ec5b27e5aa45d4de1029ceadd02681926db68ce20188ccd91e107b9b247b1f58e47bc4c63ff17fb350a3bdf66ecdeb8bc93
-  data.tar.gz: e49aac91b44d0560f79f2bd9e402c2a833b8885eed54c9881d464396168ec68a9a4d93fd7ee0d2db5d8127b0605ba34614ff39e3f6919e1ae15bb93e593d0a3a
+  metadata.gz: 2117c701ac79832bee70a447f850f6828a9926ecb0d1dd4adcc4e9453de87b56f105ebc2cd1d0ae30bc73ab1dd99bafbc0e068e9d7da0fe39a5aa75ed2b585bd
+  data.tar.gz: d983e4bf6ebcb148233487d52cea7d58b0c532342099a4c20212f93190439ead3ad036a06570ec12e7947de98740145d3971cc38024b1f464f930726aa816ffc

data/app/models/wco_email/conversation.rb

@@ -33,6 +33,48 @@ class WcoEmail::Conversation
 
   belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
 
+  def self.load_conversations_messages_tag_by_params_and_profile params, current_profile
+    @conversations = WcoEmail::Conversation.all
+
+    if params[:tagname]
+      @tag = Wco::Tag.find_by slug: params[:tagname]
+      @conversations = @conversations.where( :tag_ids.in => [ @tag.id ] )
+    end
+    if params[:tagname_not]
+      @tag_not = Wco::Tag.find_by slug: params[:tagname_not]
+      @conversations = @conversations.where( :tag_ids.nin => [ @tag_not.id ] )
+    end
+
+    if params[:subject].present?
+      @conversations = @conversations.where({ subject: /.*#{params[:subject]}.*/i })
+    end
+
+    if params[:from_email].present?
+      @conversations = @conversations.where({ from_emails: /.*#{params[:from_email]}.*/i })
+    end
+
+    if params[:lead_id].present?
+      @conversations = @conversations.where( lead_ids: params[:lead_id] )
+    end
+
+    @conversations = @conversations.where(
+      ).includes( :leads, :messages, :tags
+      ).order_by( latest_at: :desc
+      ).page( params[:conv_page] ).per( current_profile.per_page )
+
+    conversation_ids = @conversations.map &:id
+    messages = WcoEmail::Message.where(
+      :conversation_id.in => conversation_ids,
+      read_at: nil,
+    )
+    @messages_hash = {}
+    messages.map do |msg|
+      @messages_hash[msg.id.to_s] = msg
+    end
+
+    return [ @conversations, @messages_hash, @tag ]
+  end
+
   def cache_key
     "#{self.class.name} #{id.to_s} #{updated_at}"
   end

data/app/models/wco_email/message_stub.rb

@@ -23,7 +23,7 @@ class WcoEmail::MessageStub
   field :status, default: STATUS_PENDING
   scope :pending, ->{ where( status: STATUS_PENDING ) }
 
-  field     :bucket # 'ish-ses', 'ish-ses-2024'
+  field     :bucket # 'ish-ses' (current), 'ish-ses-2024'
 
   field     :object_key
   validates :object_key, presence: true, uniqueness: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.174
+  version: 3.1.0.176
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey