ish_models 0.0.33.274 → 0.0.33.276

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90de218899ddf4fc0764c1f548417c53fcd398e1c3a1a31560ca796e411832bc
-  data.tar.gz: d0b1ec1ada583d9ac93b924a2a1701c2df0ba62c57c1243c80fcdaddeb00f3dc
+  metadata.gz: f8f21dc5065dc143e68133892d902db7b86c4dfe1645bbb91531c1cec0f03b8e
+  data.tar.gz: 6afb50d094d4c13a9fc2ed02c05fab69a222613403cc210118d011541579fb81
 SHA512:
-  metadata.gz: eb4f60187c093f0661b90d0c064eb6ba4e294455f2b5287cc22f876041144a48fa9052162980dd8599986015fa89ed45b6a1ab809c0f8943b3bcc188ce14cd59
-  data.tar.gz: cd94a83ea12c95bd829385f26277c6fe730982d88c9078153a58065fdb8ec171c1b5436d286da506a34605c8aea2070b5108c99952a4c8e251b84476c7aea3d9
+  metadata.gz: 67ee371dd91174041af92982d116dfb074cd5acd4ed13426553421b5858eaefe11487ecbc46d3b2f6d431429c6209a96b4edc834c86a3baaec7bb4db32dd5f76
+  data.tar.gz: d87df64042cb3f27ef9d87dd270988e713454c4389922ce5cdab2889676304ce2c9267eb4f687d57cc665151993be9c69dc0cd20a52cbb3e0d851b6946aa1b14

data/lib/ish_models.rb

@@ -69,6 +69,8 @@ require 'office/admin_message'
 require 'office/email_action'
 require 'office/email_action_tie'
 require 'office/email_conversation'
+require 'office/email_conversation_lead'
+require 'office/email_conversation_tag'
 require 'office/email_filter'
 require 'office/email_message'
 require 'office/email_message_stub'

data/lib/office/email_conversation.rb

@@ -5,13 +5,18 @@ class Office::EmailConversation
   include Mongoid::Paranoia
 
   STATE_UNREAD = 'state_unread'
-  STATE_READ = 'state_read'
-  STATES = [ STATE_UNREAD, STATE_READ ]
+  STATE_READ   = 'state_read'
+  STATES       = [ STATE_UNREAD, STATE_READ ]
   field :state
 
   field :subject
   field :latest_at
+  index({ latest_at: -1 })
 
+  has_many :email_conversation_leads, class_name: 'Office::EmailConversationLead'
+  # def lead_ids
+  #   email_conversation_leads.map( &:lead_id )
+  # end
   field :lead_ids, type: :array, default: []
   def leads
     Lead.find( lead_ids.compact )
@@ -22,69 +27,101 @@ class Office::EmailConversation
     Office::EmailMessage.where( email_conversation_id: self.id )
   end
 
-  def tags
-    WpTag.find( wp_term_ids )
+  ##
+  ## A `tags` concern
+  ##
+
+  has_many :email_conversation_tags, class_name: 'Office::EmailConversationTag'
+
+  def wp_term_ids ## @TODO: remove _vp_ 2023-09-23
+    email_conversation_tags.map( &:wp_term_id )
   end
 
-  ## Copied from email_message
-  field :wp_term_ids, type: Array, default: []
+  def tags
+    WpTag.find( email_conversation_tags.map( &:wp_term_id ) )
+  end
 
   ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
-  def add_tag tag
-    case tag.class.name
-    when 'Integer'
-      tag = WpTag.find( tag )
-    when 'WpTag'
-      ; # tag is WpTag
-    when 'String'
-      tag = WpTag.emailtag(tag)
-    else
-      throw "#add_tag expects a WpTag or string (eg WpTag::INBOX) or id as the only parameter."
-    end
-    self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
-    self.save!
+  def add_tag which
+    tag = WpTag.iso_get which
+    # puts!( tag.slug, "Adding tag" ) if DEBUG
+    Office::EmailConversationTag.find_or_create_by!({
+      email_conversation_id: id,
+      wp_term_id:            tag.id,
+    })
   end
 
-  def remove_tag tag
-    case tag.class.name
-    when 'Integer'
-      tag = WpTag.find( tag )
-    when 'String'
-      tag = WpTag.emailtag( tag )
-    when 'WpTag'
-      ; # tag is WpTag
-    else
-      throw "#remove_tag expects a WpTag or string (eg WpTag::INBOX) or id as the only parameter."
-    end
-    self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
-    out = self.save!
-    out
+  def remove_tag which
+    tag = WpTag.iso_get which
+    # puts!( tag.slug, "Removing tag" ) if DEBUG
+    Office::EmailConversationTag.where({
+      email_conversation_id: id,
+      wp_term_id:            tag.id,
+    }).first&.delete
   end
-  def rmtag tag; remove_tag tag; end
+  def rmtag which; remove_tag which; end
 
-  def self.not_in_emailtag which
-    case which.class.name
-    when 'String'
-      tag_id = WpTag.emailtag(which).id
-    when 'WpTag'
-      tag_id = which.id
-    else
-      throw "unsupported in #not_in_emailtag: #{which}"
-    end
-    return ::Office::EmailConversation.where( :wp_term_ids.ne => tag_id ).order_by( latest_at: :desc )
+  def in_emailtag? which
+    tag = WpTag.iso_get( which )
+    email_conversation_tags.where({ wp_term_id: tag.id }).present?
   end
 
   def self.in_emailtag which
-    case which.class.name
-    when 'String'
-      tag_id = WpTag.emailtag(which).id
-    when 'WpTag'
-      tag_id = which.id
+    tag = WpTag.iso_get( which )
+    email_conversation_tags = Office::EmailConversationTag.where({ wp_term_id: tag.id })
+    where({ :id.in => email_conversation_tags.map(&:email_conversation_id) })
+  end
+
+  def self.not_in_emailtag which
+    tag = WpTag.iso_get( which )
+    email_conversation_tags = Office::EmailConversationTag.where({ wp_term_id: tag.id })
+    where({ :id.nin => email_conversation_tags.map(&:email_conversation_id) })
+  end
+
+
+  def apply_filter filter
+    case filter.kind
+
+    when ::Office::EmailFilter::KIND_DESTROY_SCHS
+      add_tag    ::WpTag::TRASH
+      remove_tag ::WpTag::INBOX
+      tmp_lead = ::Lead.where( email: self.part_txt.split("\n")[1] ).first
+      if tmp_lead
+        tmp_lead.schs.each do |sch|
+          sch.update_attributes({ state: ::Sch::STATE_TRASH })
+        end
+      end
+
+    when ::Office::EmailFilter::KIND_ADD_TAG
+      add_tag filter.wp_term_id
+      if ::WpTag::TRASH == ::WpTag.find( filter.wp_term_id ).slug
+        remove_tag ::WpTag::INBOX
+      end
+
+    when ::Office::EmailFilter::KIND_REMOVE_TAG
+      remove_tag filter.wp_term_id
+
+    when ::Office::EmailFilter::KIND_AUTORESPOND_TMPL
+      Ish::EmailContext.create({
+        email_template: filter.email_template,
+        lead_id:        lead.id,
+        send_at:        Time.now + 22.minutes,
+      })
+
+    when ::Office::EmailFilter::KIND_AUTORESPOND_EACT
+      ::Sch.create({
+        email_action: filter.email_action,
+        state:        ::Sch::STATE_ACTIVE,
+        lead_id:      lead.id,
+        perform_at:   Time.now + 22.minutes,
+      })
+
     else
-      throw "unsupported in #in_emailtag: #{which}"
+      raise "unknown filter kind: #{filter.kind}"
     end
-    return ::Office::EmailConversation.where( :wp_term_ids => tag_id ).order_by( latest_at: :desc )
   end
 
+
+
 end
 Conv = Office::EmailConversation

data/lib/office/email_conversation_lead.rb

@@ -0,0 +1,11 @@
+
+class Office::EmailConversationLead
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :email_conversation, class_name: 'Office::EmailConversation'
+
+  field :lead_id, type: :integer
+  validates :lead_id, uniqueness: { scope: :email_conversation_id }, presence: true
+
+end

data/lib/office/email_conversation_tag.rb

@@ -0,0 +1,11 @@
+
+class Office::EmailConversationTag
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :email_conversation, class_name: 'Office::EmailConversation'
+
+  field :wp_term_id, type: :integer
+  validates :wp_term_id, uniqueness: { scope: :email_conversation_id }, presence: true
+
+end

data/lib/office/email_message.rb

@@ -44,93 +44,11 @@ class Office::EmailMessage
     date
   end
 
-  ## Copied to email_conversation
-  field :wp_term_ids, type: Array, default: []
-
-  ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
-  def add_tag tag
-    case tag.class.name
-    when 'WpTag'
-      ;
-    when 'String'
-      tag = WpTag.emailtag(tag)
-    else
-      throw "#add_tag2 expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
-    end
-    self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
-    self.save!
-  end
-  def remove_tag tag
-    case tag.class.name
-    when 'WpTag'
-      ;
-    when 'String'
-      tag = WpTag.emailtag(tag)
-    else
-      throw "#remove_tag2 expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
-    end
-    self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
-    out = self.save!
-    out
-  end
-  def rmtag tag; remove_tag tag; end
-
   belongs_to :email_conversation
   def conv
     email_conversation
   end
 
-  ## @TODO: reimplement
-  def name
-    return 'associate'
-    # from[0].split('@')[0].upcase
-  end
-
-  def company_url
-    from[0].split('@')[1]
-  end
-
-  ## @TODO: move to email_conversation _vp_ 2023-03-24
-  def apply_filter filter
-    case filter.kind
-
-    when ::Office::EmailFilter::KIND_DESTROY_SCHS
-      self.conv.add_tag( ::WpTag::TRASH )
-      self.conv.remove_tag( ::WpTag::INBOX )
-      tmp_lead = ::Lead.where( email: self.part_txt.split("\n")[1] ).first
-      if tmp_lead
-        tmp_lead.schs.each { |sch| sch.update_attributes({ state: ::Sch::STATE_TRASH }) }
-      end
-
-    when ::Office::EmailFilter::KIND_ADD_TAG
-      self.conv.add_tag( filter.wp_term_id )
-      if ::WpTag::TRASH == ::WpTag.find( filter.wp_term_id ).slug
-        self.conv.remove_tag(::WpTag::INBOX )
-      end
-
-    when ::Office::EmailFilter::KIND_REMOVE_TAG
-      self.conv.remove_tag( filter.wp_term_id )
-
-    when ::Office::EmailFilter::KIND_AUTORESPOND_TMPL
-      Ish::EmailContext.create({
-        email_template: filter.email_template,
-        lead_id: lead.id,
-        send_at: Time.now + 22.minutes,
-      })
-
-    when ::Office::EmailFilter::KIND_AUTORESPOND_EACT
-      ::Sch.create({
-        email_action: filter.email_action,
-        state: ::Sch::STATE_ACTIVE,
-        lead_id: lead.id,
-        perform_at: Time.now + 22.minutes,
-      })
-
-    else
-      raise "unknown filter kind: #{filter.kind}"
-    end
-  end
-
   def preview_str
     body = part_html || part_html || 'Neither part_html nor part_txt!'
     body = ::ActionView::Base.full_sanitizer.sanitize( body ).gsub(/\s+/, ' ')
@@ -140,3 +58,7 @@ class Office::EmailMessage
 
 end
 ::Msg = Office::EmailMessage
+
+
+
+

data/lib/office/email_message_stub.rb

@@ -11,12 +11,12 @@ class Office::EmailMessageStub
   STATES          = [ STATE_PENDING, STATE_PROCESSED ]
   field :state, type: :string, default: STATE_PENDING
 
-  field :object_key,  type: :string ## aka 'filename', use with bucket name + prefix
-  validates_presence_of :object_key
+  field :object_key,  type: :string     ## aka 'filename', use with bucket name + prefix
+  validates :object_key, presence: true, uniqueness: true
 
-  field :object_path, type: :string ## A routable s3 url ## @TODO: remove this field. _vp_ 2023-03-07
+  # field :object_path, type: :string ## A routable s3 url ## @TODO: remove this field. _vp_ 2023-03-07
 
-  field :wp_term_ids, type: :array, default: []
+  # field :wp_term_ids, type: :array, default: []
 
 end
 MsgStub = EMS = Office::EmailMessageStub

data/lib/video.rb

@@ -29,7 +29,8 @@ class Video
   end
 
   field :is_public, :type => Boolean, :default => false
-  def public
+
+  def published
     where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc })
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.274
+  version: 0.0.33.276
 platform: ruby
 authors:
 - piousbox
@@ -219,6 +219,8 @@ files:
 - lib/office/email_action.rb
 - lib/office/email_action_tie.rb
 - lib/office/email_conversation.rb
+- lib/office/email_conversation_lead.rb
+- lib/office/email_conversation_tag.rb
 - lib/office/email_filter.rb
 - lib/office/email_message.rb
 - lib/office/email_message_stub.rb