ish_models 0.0.33.201 → 0.0.33.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f7b84c12b393ec05bb90bf8b5f0cbebf9f56b4a03cc7109024721da40267834
-  data.tar.gz: 9e9f21da6318f174be8e1ad53d6d04ae39554bc7b0fcb4f158930deda6387e77
+  metadata.gz: d743720d7da4d999732d7d28b69fe0697eaa73423d8fbb8f00866409eb857ed6
+  data.tar.gz: da958d68e0f40daedef7356725afba4a063713315e5ef756396355700f49f710
 SHA512:
-  metadata.gz: 87be8ad0b221c7ead2a100b14e752bc67c32a6fe7b941d1153f92aa857050e3ebd3e775d74a8708ebec523585f791797d19f9a5fe0f479cad2df810fd025810a
-  data.tar.gz: 063d5e1a5d5fe71c7c3545768869d01c9c1461aa4bc14c2b958526c5be8232ae013a37ae8952b716d5f3c5ac6c7a36de8fc938df7e51d17f23ca16ac61b7923f
+  metadata.gz: 210e40b9e0033207fb621b7d999227b638187f62937836885691b96206b4950ef01c5818d67fbef9fa5b456d5cf41a83b0f9974beda2e677662677315ba46b71
+  data.tar.gz: 6e0519979624398d04c9406f8ade0df6be50fa062f6dc8aafdf1cec5cd4a278efa4a57b7101f0b9023e849f51268da2274d1a188ddff61ad26752dfaadceed2f

data/lib/ish/email_context.rb

@@ -73,18 +73,12 @@ class ::Ish::EmailContext
   end
 
 
-  field :lead_id
+  field :lead_id, type: :integer
   def lead
     Lead.find lead_id
   end
-  ## @deprecated: use self.lead
-  field :to_email
   def to_email
-    if self[:lead_id]
-      return lead[:email]
-    else
-      return self[:to_email]
-    end
+    return lead[:email]
   end
 
 
@@ -99,3 +93,5 @@ class ::Ish::EmailContext
   end
 
 end
+Ctx = ::Ish::EmailContext
+

data/lib/office/email_conversation.rb

@@ -33,12 +33,17 @@ class Office::EmailConversation
 
   ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
   def add_tag tag
-    if WpTag == tag.class
-      self[:wp_term_ids] = self[:wp_term_ids].push(tag.id).uniq
-      self.save!
+    case tag.class.name
+    when 'WpTag'
+      ;
+    when 'String'
+      tag = WpTag.emailtag(tag)
     else
-      throw "#add_tag expects a WpTag as the only parameter."
+      throw "#add_tag expects a WpTag or string (eg WpTag::EMAILTAG_INBOX) as the only parameter."
     end
+    puts! tag, 'tag'
+    self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
+    self.save!
   end
 
   def remove_tag tag
@@ -54,6 +59,11 @@ class Office::EmailConversation
     ::Office::EmailConversation.where( :wp_term_ids => WpTag.email_inbox_tag.id ).order_by( latest_at: :desc )
   end
 
+  def self.in_no_trash
+    trash_id = WpTag.emailtag('trash').id
+    return ::Office::EmailConversation.where( :wp_term_ids.ne => trash_id ).order_by( latest_at: :desc )
+  end
+
   def self.in_emailtag which
     case which.class.name
     when 'String'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.201
+  version: 0.0.33.203
 platform: ruby
 authors:
 - piousbox