ish_models 0.0.33.229 → 0.0.33.231

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a2776eca852c5a7e11aa0a03e7d9032e54ff2b3d0d7f8a6b4364df63029d8f
-  data.tar.gz: 9ad2d817b825868f4e299c99eb8c915a0436df006c43499d5ea834b0072487a4
+  metadata.gz: f7a90237b3ffeec198b9d6732898d879fbc4b1958f66caa722bdb4902222f408
+  data.tar.gz: 72ee5abe32d9966fb5a82d5bfc3c147a0ca20e5892a8c412eee838c1e8aefaf1
 SHA512:
-  metadata.gz: d8441aa5354f28cbeaf28273b1a896066d7416e46258bbf5245d041f4a53ae6fe6f2613456a80c4e4568f49c9a6df3feeb7c29090bca50c5e12138ee41b389fe
-  data.tar.gz: be17d74a00957011492cdf197f17c2666bb187bcdbf9bd55c2d0d18db83846e743c5071c2d1afadd176a4e85472caad6917daa553b38ee083aadce65bf38dfb5
+  metadata.gz: 6ecc759ec798a3e34e7d422b601059012cf9291418fe049925fb86c9bd23cf2e1362f4278853173361608aacc54f201c41270ae4516988e81f0791de35a7b140
+  data.tar.gz: f0b6519444a7eca6208dd5d31bdb266737a3223a7f57ba3643318d3285e02b074bd1334c08e076469df03f13c821ae9b40c1885602be51819650c15a79422b71

data/lib/office/scheduled_email_action.rb

@@ -28,6 +28,33 @@ class Office::ScheduledEmailAction
 
   field :perform_at, type: :time
 
+  def send_and_roll
+    sch = self
+    sch.update_attributes({ state: Sch::STATE_INACTIVE })
+
+    # send now
+    ctx = Ctx.create!({
+      email_template_id: sch.act.tmpl.id,
+      lead_id: sch.lead.id,
+      send_at: Time.now,
+      subject: sch.act.tmpl.subject,
+      from_email: sch.act.tmpl.from_email,
+      scheduled_email_action_id: sch.act.id,
+    })
+
+    # schedule next actions & update the action
+    sch.act.ties.each do |tie|
+      next_act = tie.next_email_action
+      next_at  = eval(tie.next_at_exe)
+      next_sch = Sch.find_or_initialize_by({
+        lead_id: sch.lead_id,
+        email_action_id: next_act.id,
+      })
+      next_sch.perform_at = next_at
+      next_sch.state      = Sch::STATE_ACTIVE
+      next_sch.save!
+    end
+  end
 
 end
 ::Sch = Office::ScheduledEmailAction

data/lib/photo.rb

@@ -15,7 +15,6 @@ class Photo
   belongs_to :user_profile,  :class_name => 'Ish::UserProfile',  :inverse_of => :profile_photo, :optional => true
 
   belongs_to :report,   :optional => true
-  belongs_to :feature,  :optional => true
   belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true
 
@@ -36,7 +35,7 @@ class Photo
 
   field :is_public, :type => Boolean, :default => true
   field :is_trash,  :type => Boolean, :default => false # @TODO: nuke this boolean _vp_ 20170515
-  default_scope ->{ where({ :is_trash => false }) } # @TODO: nuke default scopes
+  default_scope ->{ where({ :is_trash => false }) }
 
   has_mongoid_attached_file :photo,
                             :styles => {

data/lib/report.rb

@@ -6,7 +6,6 @@ class Report
 
   field :name, :type => String
   validates :name, :presence => true
-  # index({ :name => 1 }, { :unique => true })
   index({ :name => 1, :is_trash => 1 })
 
   field :slug
@@ -14,6 +13,8 @@ class Report
   index({ :slug => 1 }, { :unique => true })
   before_validation :set_slug, :on => :create
 
+  field :subhead
+
   ## Can be one of: default (nil), longscroll,
   ##   wordpress e.g. https://piousbox.com/wp-json/wp/v2/posts?slug=intro
   # ITEM_TYPES = %w| longscroll wordpress |
@@ -23,47 +24,23 @@ class Report
   field :raw_json
 
   field :is_trash, :type => Boolean, :default => false
-  index({ :is_trash => 1, :is_public => 1 }, { name: 'default_index' })
+  index({ :is_trash => 1, :is_public => 1 })
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
-  scope :public, ->{
-    where({ is_public: true })
-  }
-
-  field :is_feature, :type => Boolean, :default => false
-  index({ :is_feature => 1 })
-
-  field :is_done, :type => Boolean, :default => true
-  index({ :is_done => 1 })
+  scope :public, ->{ where({ is_public: true }) }
 
   field :x, :type => Float
   field :y, :type => Float
-
-  field :lang, :type => String, :default => 'en'
-  index({ :lang => 1 })
+  field :z, :type => Float
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile'
 
-  # validates :user, :presence => true, :allow_nil => false
-  field :username, :type => String, :default => 'anonymous'
-  validates :username, :presence => true, :allow_nil => false
-  index({ :username => 1 })
-
-  field :issue
-  field :subhead
-
   has_one :photo
 
-  field :n_upvotes, :default => 0
-  field :n_spamvotes, :default => 0
-
-  default_scope ->{
-    where({ is_public: true, is_trash: false }).order_by({ created_at: :desc })
-  }
-
   has_many :newsitems
 
+  ## @TODO: trash, remove
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions ).order_by( :name => :asc ).limit( 100 )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
@@ -74,10 +51,6 @@ class Report
     self::PER_PAGE
   end
 
-  def self.all
-    self.where( :is_public => true, :is_trash => false ).order_by( :created_at => :desc )
-  end
-
   def self.clear
     if Rails.env.test?
       self.unscoped.each { |r| r.remove }

metadata

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