ish_models 0.0.33.202 → 0.0.33.204

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d55a1db780f3a656dc89b8f42080058fbf3fe63cf68a078e15ded503b1fc3f
-  data.tar.gz: c3b8b68584d144d8eb0afd391fd1c85a4f43f9f8b891377512bc82fca349abbb
+  metadata.gz: fd65ff58860ac2afaa7c51f64095d05122b0138add7df7cbffe64d905d64aefb
+  data.tar.gz: 938f54cc4d112e4e205dac23db42f2621fcf560f4cb7febd8c9f61b083ff4538
 SHA512:
-  metadata.gz: 27fa2bf8d18914900c1671f39c8cbaf04c1dd6d1f047d0fe435a7ef64ea70bd56fb5ac0e85e007d74a4859b4d9362d390d97c83ea56003f17b7534be9ef8e564
-  data.tar.gz: 8e4a9af7e7ace39f488c46c35175b60e6c85f7ae509a5d8ff281e1aae67d931907d5d24a8533a0f90d25079e974d3491ddb5e760b5e53cf17a548a09f4d899b4
+  metadata.gz: 3b20cdde2c6766f46c27bcee6385083ebdda9e4569101ef06f4f20dd394e6e2ee201070c4d2f59caa2d4c09f7be4565f94d4952c68ed30c7543232cc0161cfb1
+  data.tar.gz: 243bcc4f5c75ff33cf238552fce90b38c6e5d3fa251fb5ab018dbe1d9ca6be37927b568d574668a3966407e85e26cb3aaff98dd2204d51430769ed9fd0f5597a

data/lib/ish/email_context.rb

@@ -1,13 +1,11 @@
-
-#
-# Sends a single email
-#
+##
+## Send a single email
+##
 
 class ::Ish::EmailContext
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  ## @TODO: probably rename it to slug
   field :slug
   validates_uniqueness_of :slug, allow_nil: true
 
@@ -22,34 +20,19 @@ class ::Ish::EmailContext
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
-  FROM_EMAILS = [
-    'Infinite Shelter <hello@infiniteshelter.com>',
-    'Infinite Shelter <no-reply@infiniteshelter.com>',
-    'Victor Piousbox <piousbox@gmail.com>',
-    'Victor Piousbox <victor@piousbox.com>',
-    'Victor Piousbox <no-reply@piousbox.com>',
-    'Victor Piousbox <admin@wasya.co>',
-    'WasyaCo Consulting <hello@wasya.co>',
-    'WasyaCo Consulting <no-reply@wasya.co>',
-    'Victor Piousbox <victor@wasya.co>',
-  ];
   field :from_email
-  validates_presence_of :from_email
-  def self.from_email_list
-    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
-  end
+  # validates_presence_of :from_email
 
   field :subject
-  validates_presence_of :subject
+  # validates_presence_of :subject
 
   field :body
 
   belongs_to :email_template
-  def tmpl
-    email_template
-  end
+  def tmpl; email_template; end
 
   belongs_to :scheduled_email_action, class_name: '::Office::ScheduledEmailAction', optional: true
+  def sch; scheduled_email_action; end
 
   field :rendered_str
 
@@ -57,35 +40,19 @@ class ::Ish::EmailContext
   field :send_at, type: DateTime
 
 
-  def self.unsent
-    new.unsent
-  end
-  def unsent
-    Ish::EmailContext.where( sent_at: nil )
-  end
+  def self.unsent; new.unsent; end
+  def unsent; Ish::EmailContext.where( sent_at: nil ); end
 
-  def self.scheduled
-    new.scheduled
-  end
+  def self.scheduled; new.scheduled; end
   def scheduled
     # or({ :send_at.lte => Time.now }, { :send_at => nil }) ## This won't work b/c I need draft state!
     Ish::EmailContext.where({ :send_at.lte => Time.now  })
   end
 
 
-  field :lead_id
-  def lead
-    Lead.find lead_id
-  end
-  ## @deprecated: use self.lead
-  field :to_email
-  def to_email
-    if self[:lead_id]
-      return lead[:email]
-    else
-      return self[:to_email]
-    end
-  end
+  field :lead_id, type: :integer
+  def lead; Lead.find( lead_id ); end
+  def to_email; lead[:email]; end
 
 
   ##
@@ -99,3 +66,5 @@ class ::Ish::EmailContext
   end
 
 end
+Ctx = ::Ish::EmailContext
+

data/lib/ish/email_template.rb

@@ -21,7 +21,22 @@ class ::Ish::EmailTemplate
 
   field :subject
   field :body
+
+  FROM_EMAILS = [
+    'Infinite Shelter <hello@infiniteshelter.com>',
+    'Infinite Shelter <no-reply@infiniteshelter.com>',
+    'Victor Piousbox <piousbox@gmail.com>',
+    'Victor Piousbox <victor@piousbox.com>',
+    'Victor Piousbox <no-reply@piousbox.com>',
+    'Victor Piousbox <admin@wasya.co>',
+    'WasyaCo Consulting <hello@wasya.co>',
+    'WasyaCo Consulting <no-reply@wasya.co>',
+    'Victor Piousbox <victor@wasya.co>',
+  ];
   field :from_email
+  def self.from_email_list
+    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
+  end
 
   ## 2023-03-04 _vp_ This works!
   def get_binding

data/lib/office/email_action.rb

@@ -13,13 +13,17 @@ class Office::EmailAction
   field :descr, type: :string
 
   belongs_to :email_template, class_name: '::Ish::EmailTemplate'
+  def tmpl; email_template; end
 
-  field :next_in_days, type: :string
-  field :next_at_time, type: :string
+  # field :next_in_days, type: :string
+  # field :next_at_time, type: :string
+  field :next_at_exe, type: :string
 
   belongs_to :prev_email_action, class_name: '::Office::EmailAction', optional: true, inverse_of: :next_email_actions
   has_many :next_email_actions, class_name: '::Office::EmailAction', inverse_of: :prev_email_action
 
   has_many :scheduled_email_actions, class_name: '::Office::ScheduledEmailAction'
+  def schs; scheduled_email_actions; end
+
 end
 

data/lib/office/scheduled_email_action.rb

@@ -19,9 +19,13 @@ class Office::ScheduledEmailAction
   scope :active, ->{ where( state: STATE_ACTIVE ) }
 
   belongs_to :email_action, class_name: '::Office::EmailAction'
+  def act; email_action; end
+
   has_many :email_contexts, class_name: '::Ish::EmailContext'
+  def ctxs; email_contexts; end
+
+  field :perform_at, type: :time
 
-  field :perform_at, type: :timestamp
 
 end
 ::Sch = Office::ScheduledEmailAction

metadata

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