ish_models 0.0.33.270 → 0.0.33.272

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d127d11648710572a0ccfd485e9b83c6c9f86d751c5d017ddc0cc49318276a4
-  data.tar.gz: ef1bec175600344e71e4fc7965f35e3a5ffd053e0f046f20676a2983c79a8d6f
+  metadata.gz: 569fd681a6098f88e39d36996bc031e4094d57d4250efdf5d76961857b8b5987
+  data.tar.gz: 5737743c665eb8998829713413e0f5c70273596c0d749c6ab2a1ef366498fa1d
 SHA512:
-  metadata.gz: 6c19cf76354a8913e5427928a76d3b7bbc5bd288d13964d76753e3bf1836909d376666ea9c7ad66a1ee4b2bd3133e17bef4cc74dea1556b6711de495e56f0397
-  data.tar.gz: add6b003c34a83b1f0ef27248c7f0645506dd378f7d9daf3a2883fdb949a4aa6c6dd985f8ceaa4413090b91284d0160bfd3e7fa7c827807d2cab2e18ffb03b1e
+  metadata.gz: 6c97854130e7399943406ac285198bbd101d4d3f06a9daa478f6266079b70efc4f62e287e1b1660f51c7187f41241b1b8c62cae8b4a5a6e8eb061d65ebb0030f
+  data.tar.gz: 8912dcb2e23c9da38481c5af234b66bfdab701ffc4ca016f3747b5ff81e0c59bb63c307c4fab62c145dcdfe74ad7b78f2d49daac301098c7216796060a81830e

data/lib/gallery.rb

@@ -14,13 +14,15 @@ class Gallery
   field :subhead
   field :descr,   :as => :description
 
-  field :is_public,  type: Boolean, default: false
+  field :is_public, type: Boolean, default: false
   has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_galleries
 
   field :is_trash,   type: Boolean, default: false
   field :is_done,    type: Boolean, default: false
 
-  default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
+  def public
+    where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc })
+  end
 
   field :x,       :type => Float
   field :y,       :type => Float

data/lib/ish/email_campaign.rb

@@ -15,15 +15,6 @@ class Ish::EmailCampaign
 
   field :from_email
   validates_presence_of :from_email
-  FROM_EMAILS = %w|        hello@infiniteshelter.com no-reply@infiniteshelter.com
-    piousbox@gmail.com
-                           hello@piousbox.com        no-reply@piousbox.com        victor@piousbox.com
-    admin@wasya.co         hello@wasya.co            no-reply@wasya.co            victor@wasya.co
-    admin@mail.wasyaco.com hello@mail.wasyaco.com    no-reply@mail.wasyaco.com    victor@mail.wasyaco.com
-  |;
-  def self.from_email_list
-    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
-  end
 
   belongs_to :email_template
   def tmpl; email_template; end
@@ -34,6 +25,8 @@ class Ish::EmailCampaign
   field :sent_at, type: DateTime
   field :send_at, type: DateTime
 
+  has_many :unsubscribes, class_name: '::Ish::EmailUnsubscribe', inverse_of: :campaign
+
   def campaign_leads
     return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead )
   end

data/lib/ish/email_context.rb

@@ -37,7 +37,6 @@ class ::Ish::EmailContext
       return tmpl.from_email
     end
   end
-  # validates_presence_of :from_email
 
   field :subject
   def subject
@@ -71,10 +70,6 @@ class ::Ish::EmailContext
   def self.scheduled; new.scheduled; end
 
 
-  def self.from_email_list
-    Ish::EmailCampaign.from_email_list
-  end
-
   ## like belongs_to to_lead , but Lead is SQL to just the lead_id
   field :lead_id, type: :integer
   def lead; Lead.find( lead_id ); end
@@ -94,6 +89,7 @@ class ::Ish::EmailContext
       'utm_medium'   => 'email',
       'utm_source'   => tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
+    eval( tmpl.config_exe )
     binding()
   end
 

data/lib/ish/email_template.rb

@@ -12,6 +12,8 @@ class ::Ish::EmailTemplate
   field :layout, type: :string, default: 'plain'
   LAYOUTS = %w| plain
     m20221201react m20221222merryxmas
+    m202309_feedback
+    m202309_ror4
     marketing_node_1
     marketing_react_1 marketing_react_2 marketing_react_3
     marketing_ror_1 marketing_ror_2
@@ -23,6 +25,9 @@ class ::Ish::EmailTemplate
 
   field :subject
   field :body
+  field :can_unsubscribe, type: :boolean, default: true
+  field :config_exe,                      default: ""      ## used a lot.
+  field :config_json,     type: Object,   default: '{}'
 
   FROM_EMAILS = [
     'Annesque Studio <hello@annesque.studio>',
@@ -61,6 +66,8 @@ class ::Ish::EmailTemplate
     'WasyaCo Consulting <hello@wasyaco.com>',
     'WasyaCo Consulting <no-reply@wasyaco.com>',
     'Victor <victor@wasyaco.com>',
+
+    'Wasya Co Mailer <no-reply@wco.com.de>',
   ];
   field :from_email
   def self.from_email_list
@@ -75,7 +82,8 @@ class ::Ish::EmailTemplate
 
   has_many :email_actions,  class_name: '::Office::EmailAction'
   has_many :email_contexts, class_name: '::Ish::EmailContext'
-  has_many :email_filters,  class_name: '::Office::EmailFilter', inverse_of: :email_template
+  has_many :email_filters,  class_name: '::Office::EmailFilter',   inverse_of: :email_template
+  has_many :unsubscribes,   class_name: '::Ish::EmailUnsubscribe', inverse_of: :template
 
   SLUG_BLANK = 'blank'
   def self.blank_template

data/lib/ish/email_unsubscribe.rb

@@ -4,15 +4,15 @@ class Ish::EmailUnsubscribe
   include Mongoid::Timestamps
 
   field :email
-  validates_presence_of :email
-  validates_uniqueness_of :email
-
-  field :mailer_type
+  # validates_presence_of :email
+  # validates_uniqueness_of :email
 
+  field :lead_id
   field :reason
-
   field :unsubscribed_at
 
+  belongs_to :campaign, class_name: '::Ish::EmailCampaign', inverse_of: :unsubscribes
+  belongs_to :template, class_name: '::Ish::EmailTemplate', inverse_of: :unsubscribes
 
 
 end

data/lib/ish_models.rb

@@ -49,7 +49,6 @@ require 'ish/email_context'
 require 'ish/email_template'
 require 'ish/email_unsubscribe'
 require 'ish/event'
-require 'ish/gallery_name'
 require 'ish/image_asset'
 require 'ish/invoice'
 require 'ish/lorem_ipsum'
@@ -66,12 +65,16 @@ require 'video'
 
 require 'office/action'
 require 'office/action_tie'
+require 'office/admin_message'
 require 'office/email_action'
 require 'office/email_action_tie'
 require 'office/email_conversation'
 require 'office/email_filter'
 require 'office/email_message'
 require 'office/email_message_stub'
+require 'office/lead_action'
+require 'office/lead_action_template'
+require 'office/obfuscated_redirect'
 require 'office/scheduled_email_action'
 
 require 'wco/appliance'

data/lib/newsitem.rb

@@ -16,7 +16,7 @@ class Newsitem
     self.gallery_id ? Gallery.unscoped.find( self.gallery_id ) : nil
   end
   belongs_to :map,     optional: true, class_name: '::Gameui::Map'
-  belongs_to :profile, optional: true, class_name: 'Ish::UserProfile'
+  belongs_to :profile, optional: true, class_name: '::Ish::UserProfile'
   belongs_to :photo,   optional: true
   belongs_to :report,  optional: true
   belongs_to :video,   optional: true

data/lib/office/admin_message.rb

@@ -0,0 +1,11 @@
+
+
+class Office::AdminMessage
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :message
+
+end
+
+

data/lib/office/lead_action.rb

@@ -0,0 +1,21 @@
+
+##
+## The obfuscated action
+##
+class Office::LeadAction
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  belongs_to :lead_action_template, class_name: '::Office::LeadActionTemplate', inverse_of: :lead_actions, foreign_key: :tmpl_id
+
+  field     :lead_id, type: :integer
+  validates :lead_id, presence: true
+  def lead
+    Lead.find( lead_id )
+  end
+
+  field :params, type: Object
+
+
+end
+

data/lib/office/lead_action_template.rb

@@ -0,0 +1,40 @@
+
+##
+##
+class Office::LeadActionTemplate
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  has_many :lead_actions, class_name: '::Office::LeadAction', inverse_of: :lead_action_templates
+
+  field     :slug
+  validates :slug, presence: true
+
+  field     :action_exe, type: :string
+  # validates :action_exe, presence: true
+
+  field     :config_json, type: Object, default: '{}'
+
+  field     :kind, type: :string
+  KIND_UNSUBSCRIBE_TEMPLATE = 'kind-unsubscribe-template'
+  KIND_UNSUBSCRIBE_CAMPAIGN = 'kind-unsubscribe-campaign'
+  KINDS                     = [ KIND_UNSUBSCRIBE_TEMPLATE, KIND_UNSUBSCRIBE_CAMPAIGN ]
+
+
+  def unsubscribe_from_campaign
+  end
+
+  def unsubscribe_from_template
+    template = EmailTemplate.find( ctx[:template_id] )
+    subject  = "Lead #{lead.full_name} unsubscribed from template #{template.slug}"
+    out      = Mailer.notify( 'poxlovi@gmail.com', subject )
+    Rails.env.production? ? out.deliver_later : out.deliver_now
+    Office::Unsubscribe.create({
+      lead_id: lead_id,
+      template_id: config_json['template_id'],
+    })
+  end
+
+
+end
+

data/lib/office/obfuscated_redirect.rb

@@ -0,0 +1,12 @@
+
+class Office::ObfuscatedRedirect
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :to,     type: :string
+  validates :to, presence: true
+
+  field :visited_at, type: DateTime
+  field :visits, type: :array, default: []
+
+end

data/lib/office/scheduled_email_action.rb

@@ -13,10 +13,11 @@ class Office::ScheduledEmailAction
     Lead.find( lead_id )
   end
 
-  STATE_ACTIVE   = 'active'
-  STATE_INACTIVE = 'inactive'
-  STATE_TRASH    = 'trash'
-  STATES         = [ STATE_ACTIVE, STATE_INACTIVE, STATE_TRASH ]
+  STATE_ACTIVE       = 'active'
+  STATE_INACTIVE     = 'inactive'
+  STATE_TRASH        = 'trash'
+  STATE_UNSUBSCRIBED = 'unsubscribed'
+  STATES             = [ STATE_ACTIVE, STATE_INACTIVE, STATE_UNSUBSCRIBED, STATE_TRASH ]
   field :state, type: :string
   scope :active, ->{ where( state: STATE_ACTIVE ) }
 
@@ -32,27 +33,25 @@ class Office::ScheduledEmailAction
 
   def send_and_roll
     sch = self
-    sch.update_attributes({ state: Sch::STATE_INACTIVE })
+    sch.update({ 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,
+      email_template_id:         sch.act.tmpl.id,
+      from_email:                sch.act.tmpl.from_email,
+      lead_id:                   sch.lead.id,
       scheduled_email_action_id: sch.act.id,
+      send_at:                   Time.now,
+      subject:                   sch.act.tmpl.subject,
     })
 
     # 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,
+        lead_id:         sch.lead_id,
+        email_action_id: tie.next_email_action.id,
       })
-      next_sch.perform_at = next_at
+      next_sch.perform_at = eval(tie.next_at_exe)
       next_sch.state      = Sch::STATE_ACTIVE
       next_sch.save!
     end

data/lib/video.rb

@@ -29,6 +29,9 @@ class Video
   end
 
   field :is_public, :type => Boolean, :default => false
+  def public
+    where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc })
+  end
 
   field :lead_id, type: :integer
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.270
+  version: 0.0.33.272
 platform: ruby
 authors:
 - piousbox
@@ -158,7 +158,6 @@ files:
 - lib/ish/email_template.rb
 - lib/ish/email_unsubscribe.rb
 - lib/ish/event.rb
-- lib/ish/gallery_name.rb
 - lib/ish/image_asset.rb
 - lib/ish/invoice.rb
 - lib/ish/lorem_ipsum.rb
@@ -172,15 +171,18 @@ files:
 - lib/mongoid/votable.rb
 - lib/mongoid/voter.rb
 - lib/newsitem.rb
-- lib/newsitem.rb-trash
 - lib/office/action.rb
 - lib/office/action_tie.rb
+- lib/office/admin_message.rb
 - lib/office/email_action.rb
 - lib/office/email_action_tie.rb
 - lib/office/email_conversation.rb
 - lib/office/email_filter.rb
 - lib/office/email_message.rb
 - lib/office/email_message_stub.rb
+- lib/office/lead_action.rb
+- lib/office/lead_action_template.rb
+- lib/office/obfuscated_redirect.rb
 - lib/office/scheduled_email_action.rb
 - lib/photo.rb
 - lib/report.rb

data/lib/ish/gallery_name.rb

@@ -1,10 +0,0 @@
-
-# @TODO: completely rework this
-module Ish
-  class GalleryName
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    field :text
-    embedded_in :gallery
-  end
-end

data/lib/newsitem.rb-trash

@@ -1,11 +0,0 @@
-
-
-
-  field :username
-  field :partial_name
-  field :is_feature,       :type => Boolean, :default => false
-
-
-
-  PER_PAGE = 6
-