ish_models 0.0.33.207 → 0.0.33.209

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55cb65ec961e228555cc0e988463cad24df9b5a950d648ce46ad44430094543e
-  data.tar.gz: e42adfd217b60685cf391b15277e0bc2d75d712065fd0feade2e530e80410170
+  metadata.gz: a1d881ee26c3ebc1d7ebd70d700f2f2bb48698e1cf0dc3bccaa892f5c66a05d3
+  data.tar.gz: afb800653429e3c29209199d4da42b566b4a1acf5059e2c03c5d8ae174d06ef2
 SHA512:
-  metadata.gz: 1892c58dc3b6cb61cbe52bdb2df0cf5d17114f3e921f9db16952e264b46414153630fb9b793141f8c7269808cd3b86f83cea5be33638e2369661c7b0a254b4a5
-  data.tar.gz: d25fa7fc56d4384233dabf83a6a5ffce31238024dfd6fc997c5aab710cf30f0b34e71f44da650919053f4d67afa362d78970b25eef87dff26a5c46f47456e5c4
+  metadata.gz: ba5ce659689e9efd867bdd423262afcc4f5a70ab19f5cd1f0d4e6a39a30b3ded49eee02973911d882b6156c265282f103b806a4e6068b5231ec0fad28727c573
+  data.tar.gz: 7c6745e4f7a230fea262b2f9f99da14dd36872afe1bd6ac16ac93f98a932648ae34dc719e87fbe13f9d2fa9b0327182c755ae845367efb9d7dde32bb2a418802

data/lib/office/email_conversation.rb

@@ -39,7 +39,7 @@ class Office::EmailConversation
     when 'String'
       tag = WpTag.emailtag(tag)
     else
-      throw "#add_tag expects a WpTag or string (eg WpTag::EMAILTAG_INBOX) as the only parameter."
+      throw "#add_tag 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!
@@ -52,19 +52,24 @@ class Office::EmailConversation
     when 'String'
       tag = WpTag.emailtag(tag)
     else
-      throw "#remove_tag expects a WpTag or string (eg WpTag::EMAILTAG_INBOX) as the only parameter."
+      throw "#remove_tag expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
     end
-    self[:wp_term_ids].delete( tag.id )
-    self.save!
-  end
-
-  def self.in_inbox
-    ::Office::EmailConversation.where( :wp_term_ids => WpTag.email_inbox_tag.id ).order_by( latest_at: :desc )
+    self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
+    out = self.save!
+    out
   end
+  def rmtag tag; remove_tag tag; 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 )
+  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 )
   end
 
   def self.in_emailtag which

data/lib/office/email_message.rb

@@ -10,7 +10,7 @@ class Office::EmailMessage
 
   field :message_id,  type: :string # MESSAGE-ID
   validates_uniqueness_of :message_id
-  index({ message_id: 1 }, { unique: true, name: "message_id_idx" })
+  index({ message_id: 1 }, { unique: true, name: "id_idx" })
 
   field :in_reply_to_id, type: :string
 
@@ -64,7 +64,7 @@ class Office::EmailMessage
     email_conversation
   end
 
-  ## @TODO: reimplement, look at footer instead.
+  ## @TODO: reimplement
   def name
     return 'associate'
     # from[0].split('@')[0].upcase
@@ -77,23 +77,12 @@ class Office::EmailMessage
   def apply_filter filter
     case filter.kind
     when ::Office::EmailFilter::KIND_SKIP_INBOX
-      self.remove_tag( ::WpTag.email_inbox_tag )
+      self.remove_tag( WpTag::INBOX )
     when ::Office::EmailFilter::KIND_AUTORESPOND
       Ish::EmailContext.create({
         email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
         lead: lead,
       })
-    # when 'autorespond-remind'
-    #   Office::EmailAction.create({
-    #     tmpl_slug: 'require-sign-nda',
-    #     next_in_days: -> { rand(1..5) },
-    #     next_at_time: ->{ rand(8..16).hours + rand(1..59).minutes },
-    #     next_action: 're-remind-sign-nda',
-    #   })
-    #   Ish::EmailContext.create({
-    #     email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
-    #     lead: lead,
-    #   })
     else
       raise "unknown filter kind: #{filter.kind}"
     end

data/lib/video.rb

@@ -27,28 +27,23 @@ class Video
   end
 
   field :is_public, :type => Boolean, :default => false
-  field :is_feature, :type => Boolean, :default => false
 
   field :x, type: Float
   field :y, type: Float
   field :z, type: Float
 
-  field :lang, :type => String, :default => 'en'
-
   field :youtube_id
   validates_uniqueness_of :youtube_id, allow_blank: true, case_sensitive: false
   before_save { youtube_id.present? || youtube_id = nil }
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :videos
 
+  index({ is_trash: 1, user_profile_id: 1, created_at: 1 }, { name: 'idx1' })
+
   def self.list
     [['', nil]] + Video.unscoped.order_by( :created_at => :desc ).map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end
 
-
-  field :issue
-  field :subhead
-
   has_mongoid_attached_file :video,
     # styles: { :thumb => { geometry: '192x108', format: 'jpeg' }, },
     # processors: [ :transcoder ],
@@ -94,3 +89,11 @@ class Video
 
 
 end
+
+
+=begin
+  field :issue
+  field :subhead
+  field :is_feature, :type => Boolean, :default => false
+  field :lang, :type => String, :default => 'en'
+=end

metadata

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