ish_models 0.0.33.194 → 0.0.33.195

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d1d504900c0b683dc0d876ac2c7a00552a0baed0e364f8ca53d40a20607a9d
-  data.tar.gz: 0dc8f5df4aba00affe8c276647c76155ab07495ad8fb25ac2524af1b4096aa13
+  metadata.gz: b70a61ff2f74f6f8660cd7b745fafb8ee48107d58e1657fbaa4cbafede5dc5cc
+  data.tar.gz: 3830845cb028c10381b18c1d9ed2088d62363193ec87f0b3935a5765c40067ba
 SHA512:
-  metadata.gz: 0feae87ac0aeb2d409ac578e604d8b574a86b72668001bda1b7f3fa4e5f821c283e2d1a97ecdd387b4dc0099c6599c63bda6c0c5771b4dbf6a57aa4140fdb4d5
-  data.tar.gz: b0eca2407e7950188a0b5525261f4fda5d37e3e42413781d71e4001079d996c2f89809dba4a9f3e60defdfac51ae15e92a4b4e46c8e874b6cc97e5fbb6877114
+  metadata.gz: 5386670c8bde4fab552ce911b51bdc8e2afcbfce9f70acf8a14d411d64fd9a546d5fb1c6e506e4d279be2b07f35e36a3ab9c20812a899cded954411ffcf61cb2
+  data.tar.gz: d868d099370aa28c5b082ea6a1235732f281220ac197ef8cd994e73f7e87eac7dea2c6e6bad405d9be369b441a9e15e7478b35959f4acbda44e94c66a39062a1

data/lib/ish/email_campaign.rb

@@ -44,18 +44,18 @@ class Ish::EmailCampaign
   end
 
 
-  ##
-  ## 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
+  # ##
+  # ## 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
 
   #
   # For tracking

data/lib/ish/email_context.rb

@@ -10,15 +10,15 @@ class Ish::EmailContext
   ## @TODO: probably rename it to slug
   field :slug
   validates_uniqueness_of :slug, allow_nil: true
-  def title
-    slug
-  end
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
-  FROM_EMAILS = %w| hello@infiniteshelter.com no-reply@infiniteshelter.com
-    piousbox@gmail.com victor@piousbox.com no-reply@piousbox.com
-    admin@wasya.co hello@wasya.co no-reply@wasya.co victor@wasya.co |
+  FROM_EMAILS = %w|
+    hello@infiniteshelter.com no-reply@infiniteshelter.com
+    piousbox@gmail.com
+    victor@piousbox.com no-reply@piousbox.com
+    admin@wasya.co hello@wasya.co no-reply@wasya.co victor@wasya.co
+  |;
   field :from_email
   validates_presence_of :from_email
   def self.from_email_list
@@ -29,9 +29,9 @@ class Ish::EmailContext
   validates_presence_of :subject
 
   field :body
-  # validates_presence_of :body ## With plain type, there is no body but there are variables for templating.
 
   belongs_to :email_template
+  belongs_to :scheduled_email_action, class_name: '::Office::ScheduledEmailAction', optional: true
 
   field :rendered_str
 
@@ -46,34 +46,31 @@ class Ish::EmailContext
     Ish::EmailContext.where( sent_at: nil )
   end
 
-  def self.current
-    new.current
+  def self.scheduled
+    new.scheduled
   end
-  def current
+  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
 
+  ## @deprecated: use self.lead
+  # field :to_email
+  # validates_presence_of :to_email
 
-  ##
-  ## 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
+  field :lead_id
+  def lead
+    Lead.find lead_id
   end
 
-  field :to_email
-  validates_presence_of :to_email
-
-  #
-  # For tracking
-  #
+  ##
+  ## For tracking / utm
+  ##
   attr_reader :tid
 
+  def get_binding
+    @lead = lead()
+    binding()
+  end
+
 end

data/lib/ish/email_template.rb

@@ -4,20 +4,30 @@ class ::Ish::EmailTemplate
   include Mongoid::Timestamps
 
   field :slug
-  validates_uniqueness_of :slug, scope: [ :version ]
+  validates_uniqueness_of :slug
   validates_presence_of :slug
 
-  field :version, default: '0.0.0'
-
-  TYPES = %w| partial plain |
-  field :type
-  def self.type_list
-    [ [nil,nil] ] + TYPES.map { |i| [i, i] }
-  end
+  field :layout, type: :string, default: 'plain'
+  LAYOUTS = %w| plain
+    m20221201react m20221222merryxmas
+    marketing_react_1
+    marketing_ror_1 marketing_ror_2
+    marketing_wordpres_1 marketing_wordpress_2
+    piousbox_roundborders
+    plain
+    wasyaco_roundborders |
 
   field :subject
   field :body
   field :from_email
 
+  ## 2023-03-04 _vp_ This works!
+  def get_binding
+    @lead = Lead.where( email: 'stub@wasya.co' ).first
+    binding()
+  end
+
+  has_many :email_actions
+
 end
-EmailTemplate = ::Ish::EmailTemplate
+::Tmpl = ::Ish::EmailTemplate

data/lib/ish_models.rb

@@ -67,8 +67,12 @@ require 'photo'
 require 'report'
 require 'video'
 
-require 'office/action'
+require 'office/email_action'
+require 'office/email_conversation'
+require 'office/email_filter'
 require 'office/email_message'
+require 'office/email_message_stub'
+require 'office/scheduled_email_action'
 
 
 

data/lib/office/email_action.rb

@@ -0,0 +1,23 @@
+
+##
+## 2023-03-04 _vp_ When I receive one.
+## 2023-03-04 _vp_ Also when I send one, forever.
+##
+class Office::EmailAction
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :slug, type: :string
+  validates :slug, uniqueness: true, allow_nil: true
+
+  belongs_to :email_template, class_name: '::Ish::EmailTemplate'
+
+  field :next_in_days, type: :string
+  field :next_at_time, 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'
+end
+

data/lib/office/email_conversation.rb

@@ -0,0 +1,52 @@
+
+class Office::EmailConversation
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+
+  STATE_UNREAD = 'state_unread'
+  STATE_READ = 'state_read'
+  STATES = [ STATE_UNREAD, STATE_READ ]
+  field :state
+
+  field :subject
+  field :latest_at
+
+  field :lead_ids, type: :array, default: []
+  def leads
+    Lead.find( lead_ids )
+  end
+
+  field :term_ids, type: :array, default: []
+  def tags
+    WpTag.find( term_ids )
+  end
+
+  has_many :email_messages
+  def email_messages
+    Office::EmailMessage.where( email_conversation_id: self.id )
+  end
+
+  ## Copied from email_message
+  field :wp_term_ids, type: Array, default: []
+  ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
+  def add_tag tag
+    if WpTag == tag.class
+      self[:wp_term_ids] = self[:wp_term_ids].push(tag.id).uniq
+      self.save!
+    else
+      throw "#add_tag expects a WpTag as the only parameter."
+    end
+  end
+  def remove_tag tag
+    if WpTag == tag.class
+      self[:wp_term_ids].delete( tag.id )
+      self.save!
+    else
+      throw "#remove_tag expects a WpTag as the only parameter."
+    end
+  end
+
+end
+# EmailConversation = Office::EmailConversation
+Conv = Office::EmailConversation

data/lib/office/email_filter.rb

@@ -0,0 +1,24 @@
+
+##
+## 2023-03-04 _vp_ When I receive one.
+##
+class Office::EmailFilter
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :from_regex
+  field :body_regex
+
+  KIND_SKIP_INBOX = 'skip-inbox'
+  KIND_AUTORESPOND = 'autorespond'
+  KINDS = [ nil, KIND_SKIP_INBOX, KIND_AUTORESPOND ]
+  field :kind
+
+  STATE_ACTIVE = 'active'
+  STATE_INACTIVE = 'inactive'
+  STATES = [ STATE_ACTIVE, STATE_INACTIVE ]
+  field :state, type: :string, default: STATE_ACTIVE
+  scope :active, ->{ where( state: STATE_ACTIVE ) }
+
+end
+

data/lib/office/email_message.rb

@@ -7,6 +7,13 @@ class Office::EmailMessage
   include Mongoid::Timestamps
 
   field :raw,         type: :string
+
+  field :message_id,  type: :string # MESSAGE-ID
+  validates_uniqueness_of :message_id
+  index({ message_id: 1 }, { unique: true, name: "message_id_idx" })
+
+  field :in_reply_to_id, type: :string
+
   field :object_key,  type: :string ## aka 'filename', use with bucket name + prefix
   # validates_presence_of :object_key
   field :object_path, type: :string ## A routable s3 url
@@ -16,19 +23,47 @@ class Office::EmailMessage
   field :part_html
   # attachments ?
 
-  field :from, type: Array, default: []
-  def from_str
-    from.join(", ")
+  def lead
+    Lead.find_by email: from
   end
 
-  field :to,   type: Array, default: []
-  field :cc,   type: Array, default: []
-  field :bcc,  type: Array, default: []
+  field :from,  type: :string
+  field :froms, type: Array, default: []
+  field :to,    type: :string
+  field :tos,   type: Array, default: []
+  field :ccs,   type: Array, default: []
+  field :bccs,  type: Array, default: []
+
   field :date, type: DateTime
   def received_at
     date
   end
 
+  ## Copied to email_conversation
+  field :wp_term_ids, type: Array, default: []
+  ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
+  def add_tag tag
+    if WpTag == tag.class
+      self[:wp_term_ids] = self[:wp_term_ids].push(tag.id).uniq
+      self.save!
+    else
+      throw "#add_tag expects a WpTag as the only parameter."
+    end
+  end
+  def remove_tag tag
+    if WpTag == tag.class
+      self[:wp_term_ids].delete( tag.id )
+      self.save!
+    else
+      throw "#remove_tag expects a WpTag as the only parameter."
+    end
+  end
+
+  belongs_to :email_conversation
+  def conv
+    email_conversation
+  end
+
   ## @TODO: reimplement, look at footer instead.
   def name
     return 'associate'
@@ -39,39 +74,53 @@ class Office::EmailMessage
     from[0].split('@')[1]
   end
 
-  def process
-    Aws.config[:credentials] = Aws::Credentials.new(
-      ::S3_CREDENTIALS[:access_key_id],
-      ::S3_CREDENTIALS[:secret_access_key]
-    )
-    s3 = Aws::S3::Client.new
-
-    obj = s3.get_object({
-      bucket: 'ish-ses',
-      key: self.object_key
-    })
-    obj2 = obj.body.read
-
-    mail        = Mail.read_from_string( obj2 )
-    self.from    = mail.from
-    self.to      = mail.to
-    self.subject = mail.subject
-    self.date    = mail.date
-    self.raw     = obj2
-
-    self.save
-  end
-
-  ## action.match_from = '@synchrony.com'
-  def apply_actions
-    triggers = Office::Action.active.where({ channel: 'email' })
-    triggers.each do |trigger|
-      if self.from_str.match(/#{trigger.match_from}/i)
-        trigger.actions do |action|
-          Office::Action.call( action[:method], { msg: self }.merge( action[:params] ))
-        end
-      end
+  def apply_filter filter
+    case filter.kind
+    when ::Office::EmailFilter::KIND_SKIP_INBOX
+      self.remove_tag( ::WpTag.email_inbox_tag )
+    when ::Office::EmailFilter::KIND_AUTORESPOND
+      Ish::EmailContext.create({
+        email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
+        lead: lead,
+      })
+    # when 'autorespond-remind'
+    #   Office::EmailAction.create({
+    #     tmpl_slug: 'require-sign-nda',
+    #     next_in_days: -> { rand(1..5) },
+    #     next_at_time: ->{ rand(8..16).hours + rand(1..59).minutes },
+    #     next_action: 're-remind-sign-nda',
+    #   })
+    #   Ish::EmailContext.create({
+    #     email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
+    #     lead: lead,
+    #   })
+    else
+      raise "unknown filter kind: #{filter.kind}"
     end
   end
 
 end
+::Msg = Office::EmailMessage
+
+
+
+  ## trash _vp_ 2023-03-07
+  # def process
+  #   Aws.config[:credentials] = Aws::Credentials.new(
+  #     ::S3_CREDENTIALS[:access_key_id],
+  #     ::S3_CREDENTIALS[:secret_access_key]
+  #   )
+  #   s3 = Aws::S3::Client.new
+  #   obj = s3.get_object({
+  #     bucket: 'ish-ses',
+  #     key: self.object_key
+  #   })
+  #   obj2 = obj.body.read
+  #   mail        = Mail.read_from_string( obj2 )
+  #   self.from    = mail.from
+  #   self.to      = mail.to
+  #   self.subject = mail.subject
+  #   self.date    = mail.date
+  #   self.raw     = obj2
+  #   self.save
+  # end

data/lib/office/email_message_stub.rb

@@ -0,0 +1,23 @@
+
+##
+## Only object_key, object_path, no validations.
+##
+class Office::EmailMessageStub
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  STATE_PENDING   = 'state_pending'
+  STATE_PROCESSED = 'state_processed'
+  STATES          = [ STATE_PENDING, STATE_PROCESSED ]
+  field :state, type: :string, default: STATE_PENDING
+
+  field :object_key,  type: :string ## aka 'filename', use with bucket name + prefix
+  validates_presence_of :object_key
+
+  field :object_path, type: :string ## A routable s3 url ## @TODO: remove this field. _vp_ 2023-03-07
+  # validates_presence_of :object_path ## only need object_key == message_id
+
+  field :term_ids, type: :array, default: []
+
+end
+Stub = EMS = Office::EmailMessageStub

data/lib/office/scheduled_email_action.rb

@@ -0,0 +1,48 @@
+
+##
+## 2023-03-04 _vp_ An instance of an EmailAction.
+##
+class Office::ScheduledEmailAction
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+
+  field :lead_id, type: :integer
+  def lead
+    Lead.find( lead_id )
+  end
+
+  STATE_ACTIVE = 'active'
+  STATE_INACTIVE = 'inactive'
+  STATES = [ STATE_ACTIVE, STATE_INACTIVE ]
+  field :state, type: :string
+  scope :active, ->{ where( state: STATE_ACTIVE ) }
+
+  belongs_to :email_action, class_name: '::Office::EmailAction'
+  has_many :email_contexts, class_name: '::Ish::EmailContext'
+
+  field :perform_at, type: :timestamp
+
+end
+::Sch = Office::ScheduledEmailAction
+
+## @TODO: herehere 2023-03-04 _vp_ Currently Working on this
+=begin
+::Sch.active.where( :perform_at.lte => Time.now ) do |sch|
+  next_a = sch.next_email_action
+
+  if sch.next_actions.present?
+    sch.next_actions.each do |next_a|
+      next_sch_a = ::Office::ScheduledEmailAction.new({
+        email_action: next_a
+
+      next_time = Time.now + eval( sch.next_in_days )
+      next_time.time = eval( sch.next_at_time )
+      sch.update_attribute( :perform_at, next_time )
+    end
+  else
+    sch.update_attribute( state: STATE_INACTIVE )
+  end
+=end
+
+

data/lib/report.rb

@@ -68,7 +68,7 @@ class Report
     [['', nil]] + out.map { |item| [ item.name, item.id ] }
   end
 
-  PER_PAGE = 20
+  PER_PAGE = 10
   def self.paginates_per
     self::PER_PAGE
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.194
+  version: 0.0.33.195
 platform: ruby
 authors:
 - piousbox
@@ -138,25 +138,20 @@ files:
 - 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
 - lib/mongoid/votable.rb
 - lib/mongoid/voter.rb
 - lib/newsitem.rb
-- lib/office/action.rb
+- lib/office/email_action.rb
+- lib/office/email_conversation.rb
+- lib/office/email_filter.rb
 - lib/office/email_message.rb
+- lib/office/email_message_stub.rb
+- lib/office/scheduled_email_action.rb
 - lib/photo.rb
 - lib/report.rb
-- lib/trash/app_model2.rb
-- lib/trash/city.rb-bk
-- lib/trash/event.rb
-- lib/trash/site.rb
-- lib/trash/tag_trash.rb
-- lib/trash/venue.rb
 - lib/video.rb
 homepage: https://wasya.co
 licenses:

data/lib/ish/trash/email_campaign.rb

@@ -1,28 +0,0 @@
-
-class Ish::EmailCampaign
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  store_in :collection => 'ish_campaign'
-
-  belongs_to :profile, :class_name => 'Ish::UserProfile'
-
-  has_and_belongs_to_many :leads,             :class_name => 'Ish::Lead'
-  has_and_belongs_to_many :unsubscribe_leads, :class_name => 'Ish::Lead'
-
-  field :subject
-  field :body
-
-  ## @TODO: tags instead?
-  field :is_done,  :type => Boolean, :default => false
-  field :is_trash, :type => Boolean, :default => false
-  field :tag # 'hired_com_ror', not enumerated for now _vp_ 20180103
-
-  ## @TODO: sent on, scheduled_on, ...
-  field :applied_on, :type => Time
-
-  ## Need tracking!
-
-  ## this looks like an email_context, copy from there.
-
-end

data/lib/ish/trash/lead.rb

@@ -1,52 +0,0 @@
-
-#
-# Lead
-# _vp_ 20171204
-#
-class Ish::Lead
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  store_in :collection => 'ish_leads'
-
-  belongs_to :profile, :class_name => '::Ish::UserProfile'
-
-  has_and_belongs_to_many :campaigns,             :class_name => '::Ish::Campaign', :inverse_of => :leads
-  has_and_belongs_to_many :unsubscribe_campaigns, :class_name => '::Ish::Campaign', :inverse_of => :unsubscribe_leads
-
-  field :email
-  field :job_url
-  field :company_url
-  field :website_html
-  field :yelp_url
-
-  field :company
-  validates_uniqueness_of :company
-  index({ :company => -1 })
-
-  field :description
-
-  STATES = %w( considering applied )
-  field :state, :type => String
-
-  field :is_done,  :type => Boolean, :default => false
-  field :is_trash, :type => Boolean, :default => false
-
-  field :applied_on, :type => Time
-
-  field :tag, :type => String # 'hired_com_ror', not enumerated for now _vp_ 20180103
-  field :location
-
-  field :raw_phone, :type => String
-  def phone= which
-    write_attribute :raw_phone, which
-    write_attribute :phone, which.gsub(/\D/, '').to_i
-  end
-  field :phone, :type => Integer
-  field :address, :type => String
-
-  # If I crawl on 20180724, I add "20180724" here, so I don't crawl in the same way again.
-  field :extra, :type => Array, :default => []
-
-end
-

data/lib/ish/trash/lead.rb-bk

@@ -1,38 +0,0 @@
-
-#
-# Lead
-# _vp_ 20171204
-#
-class Ish::Lead
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  store_in :collection => 'ish_leads'
-
-  # field :email
-  # field :company_url
-  # field :yelp_url
-
-  # # company name
-  # field :company
-  # validates_uniqueness_of :company
-  # index({ :company => -1 })
-
-  # field :description # comment, actually
-
-  field :is_done,  :type => Boolean, :default => false
-  field :is_trash, :type => Boolean, :default => false
-
-  field :tag, :type => String # 'hired_com_ror', not enumerated for now _vp_ 20180103
-  # field :location
-
-  field :raw_phone, :type => String
-  def phone= which
-    write_attribute :raw_phone, which
-    write_attribute :phone, which.gsub(/\D/, '').to_i
-  end
-  field :phone, :type => Integer
-
-end
-
-

data/lib/office/action.rb

@@ -1,44 +0,0 @@
-
-##
-## Such actions as auto-responder.
-##
-class Office::Action
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :status,     type: String, default: 'active'
-  field :channel,    type: String ## eg 'email'
-  field :match_from, type: String ## eg '@synchrony.com', '*@synchrony.com$'
-
-  scope :active, -> { where( status: 'active' ) }
-
-  ## eg [ { 'method': 'create_lead', 'params': {} },
-  ##      { 'method': 'autorespond',  'params': {}, ... ]
-  field :actions, type: Array, default: []
-
-  def self.create_lead params
-    msg = params[:msg]
-    leadset = Leadset.find_or_create_by({ company_url: msg.company_url })
-    lead = Lead.new({
-      email: msg.from_str,
-      name: msg.name,
-      leadset: leadset,
-    })
-    lead.save
-  end
-
-  def self.autorespond params
-    msg = params[:msg]
-    email_template = ::Ish::EmailTemplate.find_by!({ slug: '20230207-autorespond' })
-    email_ctx = ::Ish::EmailContext.new({
-      to_email: '',
-      subject: '',
-      from_email: '',
-      body: '',
-      email_template_id: email_template.id.to_s,
-    })
-    email_ctx.save!
-    IshManager::OfficeMailer.send_context_email( email_ctx ).deliver_later
-  end
-
-end

data/lib/trash/app_model2.rb

@@ -1,21 +0,0 @@
-
-# @deprecated, remove
-class Ish::AppModel2
-  include ::Mongoid::Document
-  include ::Mongoid::Timestamps
-
-  field :is_public,    :type => Boolean, :default => false
-  field :is_trash,     :type => Boolean, :default => false
-
-  default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
-
-  field :x, :type => Float
-  field :y, :type => Float
-
-  def self.list conditions = { :is_trash => false }
-    out = self.where( conditions ).order_by( :created_at => :desc )
-    [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
-  end
-
-
-end

data/lib/trash/city.rb-bk

@@ -1,100 +0,0 @@
-class City
-  include ::Mongoid::Document
-  include ::Mongoid::Timestamps
-
-  field :name, :type => String
-  field :description, :type => String, :default => 'The description of this city'
-
-  field :cityname, :type => String
-  validates :cityname, :uniqueness => true, :allow_nil => false, :presence => true
-  def slug; cityname; end
-  def slug= s; cityname = s; end
-
-  field :x, :type => Float
-  field :y, :type => Float
-
-  field :deleted_at, type: Time
-  def self.all
-    self.where( deleted_at: nil, is_active: true ).order_by( name: :desc )
-  end
-
-  belongs_to :country, :optional => true
-
-  has_many :events
-  has_many :galleries
-  has_many :photos
-  has_many :reports
-  has_many :venues
-  has_many :videos
-  has_and_belongs_to_many :tags
-
-  has_many :current_users, :class_name => '::Ish::UserProfile', :inverse_of => :current_city
-  has_many :newsitems
-
-  has_many :current_users, :class_name => '::Ish::UserProfile', :inverse_of => :current_city
-  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
-  has_one :guide, :class_name => '::Ish::UserProfile', :inverse_of => :guide_city
-
-  has_many :features
-
-  field :calendar_frame, :type => String
-  field :is_active, type: Boolean, default: true
-
-  default_scope ->{ order_by({ :name => :asc }) }
-
-  def self.list
-    out = self.order_by( :name => :asc )
-    # no_city = City.where( :cityname => 'no_city' ).first || City.create( :cityname => 'no_city', :name => 'No City' )
-    [['', nil]] + out.map { |item| [ item.name, item.id ] }
-  end
-
-  def self.list_citynames lang = 'en'
-    out = self.order_by( :name => :asc )
-    [['', nil]] + out.map { |item| [ item['name_'+lang], item.cityname ] }
-  end
-
-  def self.clear
-    if Rails.env.test?
-      City.all.each { |r| r.remove }
-    end
-  end
-
-  def self.n_features
-    4
-  end
-  def n_features
-    4
-  end
-
-
-  def j_reports args = {}
-    out =  []
-    self.reports.each do |r|
-      rr = r.clone
-      rr[:username] = r.user.username
-      rr.created_at = r.created_at # pretty_date( r.created_at )
-      rr[:tag_name] = r.tag.name unless r.tag.blank?
-      rr[:tag_name] ||= ''
-      out << rr
-    end
-    return out
-  end
-
-  def self.for_homepage
-    cities = City.all.order_by( :name => :asc )
-    cities = cities.delete_if do |c|
-      ( false == c.is_feature ) && ( 0 == c.galleries.length ) && ( 0 == c.reports.length )
-    end
-    return cities
-  end
-
-  def self.method_missing name, *args, &block
-    city = City.where( :cityname => name ).first
-    return city if city
-    super
-  end
-
-end
-
-
-

data/lib/trash/event.rb

@@ -1,28 +0,0 @@
-
-class Event
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :name, :type => String
-  validates :name, :presence => true, :uniqueness => true
-
-  field :eventname, :type => String
-  validates :eventname, :presence => true, :uniqueness => true
-
-  field :description, :type => String
-
-  field :date, :type => DateTime
-  validates :date, :presence => true
-  
-  belongs_to :city
-  validates :city, :presence => true
-
-  field :x, :type => Float
-  field :y, :type => Float
-
-  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_event
-  has_many :photos
-
-end
-

data/lib/trash/site.rb

@@ -1,99 +0,0 @@
-class Site
-
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :domain, :type => String
-  validates_presence_of :domain
-
-  field :lang, :type => String, :default => 'en'
-  # validates :lang, { :uniqueness => :true, :scope => :domain }
-
-  field :title
-  field :subhead
-  field :description
-  field :home_redirect_path
-
-  field :n_features,             :type => Integer, :default => 4
-  field :n_newsitems,            :type => Integer, :default => 20
-  field :newsitems_per_page,     :type => Integer, :default => 10 # this is used. _vp_ 20171025
-  field :play_videos_in_preview, :type => Boolean, :default => true
-
-  # denormalized
-  field :n_reports, :type => Integer
-  field :n_galleries, :type => Integer
-
-  field :is_video_enabled, :type => Boolean, :default => false
-  field :is_resume_enabled, :type => Boolean, :default => false
-  field :is_ads_enabled, :type => Boolean, :default => true
-  field :is_trash, :type => Boolean, :default => false
-  field :is_primary, :type => Boolean, :default => false
-  field :is_private, :type => Boolean, :default => false
-  field :private_user_emails, :type => Array, :default => []
-
-  field :homepage_layout, :type => String, :default => 'show'
-  field :layout, :type => String, :default => 'application'
-
-  has_many :reports
-  has_many :galleries
-  has_many :tags
-  has_many :videos
-  has_many :newsitems, :order => :created_at.desc
-  has_many :issues, :class_name => 'Ish::Issue'
-  has_many :features, :order => :created_at.desc
-
-  default_scope ->{ where({ :is_trash => false }).order_by({ :domain => :asc, :lang => :asc }) }
-
-  set_callback :create, :before do |doc|
-    if Site.where( :lang => doc.lang, :domain => doc.domain ).length > 0
-      false
-    end
-  end
-
-  set_callback :update, :before do |doc|
-    possible_duplicate = Site.where( :lang => doc.lang, :domain => doc.domain ).first
-    if possible_duplicate.blank?
-      true
-    elsif doc.id != possible_duplicate.id
-      false
-    end
-  end
-
-  LANGUAGES = [ 'en', 'ru', 'pt' ]
-
-  # manager uses it.
-  def self.list
-    out = self.all.order_by( :domain => :asc, :lang => :asc )
-    [['Select Site', nil]] + out.map { |item| [ "#{item.domain} #{item.lang}", item.id ] }
-  end
-
-  def self.mobi
-    Site.where( :domain => 'travel-guide.mobi', :lang => 'en' ).first
-  end
-
-  def n_reports
-    self.reports.unscoped.where( :is_trash => false ).length
-  end
-
-  def n_private_reports
-    self.reports.unscoped.where( :is_public => false, :is_trash => false ).length
-  end
-
-  def its_locales
-    Site.where( :domain => self.domain ).map { |s| s.lang.to_sym }
-  end
-
-  def self.Tgm
-    Site.find_by( :domain => 'travel-guide.mobi', :lang => :en )
-  end
-  def self.sedux
-    site   = Site.where( :domain => 'sedux.local' ).first
-    site ||= Site.where( :domain => 'sedux.net'   ).first
-    site
-  end
-
-  def name
-    "#{domain}/#{lang}"
-  end
-
-end

data/lib/trash/tag_trash.rb

@@ -1,73 +0,0 @@
-class TagTrash
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Ish::Utils
-
-  field :name, :type => String
-  validates :name, uniqueness: true, presence: true, allow_nil: false # @TODO: tags should only be unique globally, and per-user.
-
-  field :slug
-  validates :slug, uniqueness: true, presence: true, allow_nil: false
-
-  field :descr, :type => String, :default => ''
-
-  field :is_public,  :type => Boolean, :default => true
-  field :is_trash,   :type => Boolean, :default => false
-  field :is_feature, :type => Boolean, :default => false
-
-  field :weight, :type => Integer, :default => 10
-
-  has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
-  belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
-
-  has_many :features
-  has_many :newsitems
-
-  belongs_to :site, :optional => true
-  belongs_to :city, :optional => true
-
-  has_and_belongs_to_many :venues
-  has_and_belongs_to_many :cities
-  has_and_belongs_to_many :galleries
-  has_and_belongs_to_many :reports
-  has_and_belongs_to_many :videos
-  has_and_belongs_to_many :maps, class_name: 'Gameui::Map'
-
-  before_validation :set_slug
-
-  def self.clear
-    if Rails.env.test?
-      Tag.each { |r| r.remove }
-    end
-  end
-
-  def self.no_parent
-    Tag.where( :parent_tag_id => nil )
-  end
-
-  # the first blank used to be disabled, not anymore _vp_ 20180418
-  def self.list
-    out = Tag.unscoped.order_by( :name => :asc )
-    return( [['', nil]] + out.map { |item| [ item.name, item.id ] } )
-  end
-
-  # @deprecated, there will be no reports or galleries in tags. There will be only features and newsitems
-  def self.n_items
-    10
-  end
-  def self.n_reports
-    4
-  end
-  def self.n_galleries
-    4
-  end
-  def self.n_videos
-    4
-  end
-
-  def self.n_features
-    4
-  end
-  field :n_features, type: Integer, default: 4
-
-end

data/lib/trash/venue.rb

@@ -1,77 +0,0 @@
-class Venue
-  include ::Mongoid::Document
-  include ::Mongoid::Timestamps
-  include Ish::Utils
-
-  field :address
-
-  field :name, :type => String
-  validates :name, :uniqueness => true, :allow_nil => false
-
-  field :slug
-  validates :slug, :uniqueness => true, :allow_nil => false
-  before_validation :set_slug
-
-  field :subhead
-  field :descr
-
-  field :is_trash, :type => Boolean, :default => false
-  scope :fresh, ->{ where({ :is_trash => false }) }
-  scope :trash, ->{ where({ :is_trash => true }) }
-
-  field :is_public, :type => Boolean, :default => true
-  scope :public,     ->{ where({ :is_public => true }) }
-  scope :not_public, ->{ where({ :is_public => false }) }
-
-  field :is_feature, :type => Boolean, :default => false
-
-  field :x, :type => Float
-  field :y, :type => Float
-
-  field :lang, :type => String, :default => 'en'
-
-  belongs_to :city
-  # belongs_to :owner, :class_name => 'User', :inverse_of => :owned_venue
-  validates :city, :allow_nil => false, :presence => true
-
-  has_and_belongs_to_many :tags
-
-  has_and_belongs_to_many :users
-
-  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_venue
-
-  has_many :reports
-  has_many :galleries
-  has_many :photos
-  has_many :newsitems
-  has_many :features
-
-  PER_PAGE = 6
-
-  def self.list conditions = { :is_trash => false }
-    out = self.where( conditions).order_by( :name => :asc )
-    [['', nil]] + out.map { |item| [ item.name, item.id ] }
-  end
-
-
-
-  set_callback :save, :before do |doc|
-    if doc.city
-      city.touch
-    end
-  end
-
-  def self.types
-    return []
-#    if 'en' == @locale
-#      [ 'Hotels', 'Restaurants', 'Bars' ]
-#    else
-#      [ 'Hotels', 'Restaurants', 'Bars' ]
-#    end
-  end
-
-  def self.n_features
-    6
-  end
-
-end