ish_models 0.0.33.184 → 0.0.33.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e6eff98102df0e1c876a6efbead562210b0d6863d9a75574aef191c778a011b
-  data.tar.gz: 5a5b1eaab82f0ccb24304b8ee61821504c3940e8cca6e54ef4ec161c5394dc7d
+  metadata.gz: 85b9a6758d41c84ed2393951c0e8bd9733d92f745859689e64940677205962bf
+  data.tar.gz: 4133474740d173f9eddc0339a2c8fcc2b335a199db36f2f19cc813afe2889594
 SHA512:
-  metadata.gz: d35fb3fc9226c8720e083090b86bca77399bfa62a99cc4c1e3650688a25a4f9f9ab1dc59c825f258f6e25016cf7c5fafb6b223d1b16553555858783b9b7c11f2
-  data.tar.gz: af86d30206881902dc9654d38a903f6b1a7fbd41f81c1719b959478ddcf2ab691ae03d83edbec538098137bc4812427ab3d08326052fc4da4821f426ef878025
+  metadata.gz: 4139e2903f034633a246aa43217b5f7eb64f3a5ec475774633d28b97984da2b35fa5ec4fde1ec4798b6c04f49c855db258df812f9dcb1e18e069326886d58031
+  data.tar.gz: 2ce2bed1e8a34efa83e643de5277561c3bc804503c5f6c293e72025ba639fc3b489eebd6d21296fe8d4598f1401bf9387d7fcfa21c686b30b3ed0e4c54a4d3c1

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,12 +42,20 @@ 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:
@@ -60,4 +71,4 @@ class Ish::EmailContext
   attr_reader :tid
 
 end
-EmailContext = Ish::EmailContext
+EmailCampaign = Ish::EmailContext

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.185
 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