ish_models 0.0.33.184 → 0.0.33.186

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e6eff98102df0e1c876a6efbead562210b0d6863d9a75574aef191c778a011b
-  data.tar.gz: 5a5b1eaab82f0ccb24304b8ee61821504c3940e8cca6e54ef4ec161c5394dc7d
+  metadata.gz: d027fcc8d0c98d5575e517250768051102853dc5615027fe2c9179d040c77d6f
+  data.tar.gz: b4de385ed7e98ba1903726b618d5de6ce5c4c0f032f8d0364ae3b306790f36f9
 SHA512:
-  metadata.gz: d35fb3fc9226c8720e083090b86bca77399bfa62a99cc4c1e3650688a25a4f9f9ab1dc59c825f258f6e25016cf7c5fafb6b223d1b16553555858783b9b7c11f2
-  data.tar.gz: af86d30206881902dc9654d38a903f6b1a7fbd41f81c1719b959478ddcf2ab691ae03d83edbec538098137bc4812427ab3d08326052fc4da4821f426ef878025
+  metadata.gz: 202b110ebedc34cc0ae916459fe309f6641674d92c3230585f0d1d68fdeb2aa490820c8be1537f872811c87bd74ea47d1a3a089cede0bc2b1d634a397a22f743
+  data.tar.gz: afc8efc356d678c9f5bce359bca29327df0070a4969a920168cdc1f348c39c5e8fbec35f99758005b88e4bc8835d53b1a881cc7d7f9c00c556d9d62bfc180b0c

data/lib/ish/email_context.rb

@@ -8,6 +8,9 @@ class Ish::EmailContext
   include Mongoid::Timestamps
 
   field :title
+  def slug
+    title
+  end
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
@@ -39,17 +42,33 @@ class Ish::EmailContext
   field :sent_at, type: DateTime
   field :scheduled_at, type: DateTime
 
-  def leads
+  def self.all_campaigns
+    Ish::EmailContext.where( type: TYPE_CAMPAIGN )
+  end
+
+  def campaign_leads
     if self.type == TYPE_CAMPAIGN
-      return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead ).map { |p| p.lead }
+      return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead )
     end
   end
 
+  def leads
+    campaign_leads&.map { |p| p.lead }
+  end
 
-  #
-  # For templating:
-  #
-  field :tmpl_name
+
+  ##
+  ## For templating:
+  ##
+  ## commonly: name, companyName
+  field :tmpl, type: Hash, default: {}
+  def body_templated
+    out = email_template.body
+    tmpl.each do |k, v|
+      out.gsub!("{#{k}}", v)
+    end
+    out
+  end
 
   field :to_email
   validates_presence_of :to_email, if: -> { type == TYPE_SINGLE }
@@ -60,4 +79,4 @@ class Ish::EmailContext
   attr_reader :tid
 
 end
-EmailContext = Ish::EmailContext
+EmailCampaign = Ish::EmailContext

data/lib/ish/user_profile.rb

@@ -54,7 +54,6 @@ class Ish::UserProfile
   has_many :my_maps, :inverse_of => :creator_profile, class_name: 'Gameui::Map'
 
   has_many :invoices,                             :class_name => '::Ish::Invoice'
-  has_many :leads,                                :class_name => '::Ish::Lead'
   has_many :photos
   has_many :reports,   inverse_of: :user_profile
 

data/lib/ish_models.rb

@@ -44,7 +44,6 @@ require 'gameui/premium_purchase'
 
 require 'ish/cache_key'
 require 'ish/crawler'
-# require 'ish/email_campaign' ## context + leadset is a campaign.
 require 'ish/email_context'
 require 'ish/email_template'
 require 'ish/email_unsubscribe'
@@ -52,8 +51,6 @@ require 'ish/gallery_name'
 require 'ish/image_asset'
 require 'ish/input_error'
 require 'ish/invoice'
-require 'ish/issue'
-require 'ish/lead'
 require 'ish/lorem_ipsum'
 require 'ish/meeting'
 require 'ish/payment'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.184
+  version: 0.0.33.186
 platform: ruby
 authors:
 - piousbox
@@ -132,15 +132,14 @@ files:
 - lib/ish/image_asset.rb
 - lib/ish/input_error.rb
 - lib/ish/invoice.rb
-- lib/ish/issue.rb
-- lib/ish/lead.rb
-- lib/ish/lead.rb-bk
 - lib/ish/lorem_ipsum.rb
 - lib/ish/meeting.rb
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb
 - lib/ish/trash/email_campaign.rb
+- lib/ish/trash/lead.rb
+- lib/ish/trash/lead.rb-bk
 - lib/ish/user_profile.rb
 - lib/ish/utils.rb
 - lib/ish_models.rb

data/lib/ish/issue.rb

@@ -1,14 +0,0 @@
-
-#
-# Issue
-# _vp_ 20171204
-#
-class Ish::Issue
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  store_in :collection => 'ish_issue'
-
-  field :name
-
-end