ish_models 0.0.33.230 → 0.0.33.232

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6e8cdb5d6318f3571949e0b6bd148bf3bfba895c0f7c53f2744caf060876e0
-  data.tar.gz: 4c8ff28513a7c4deb978a39ac728729b6b5a10a43ea2e7e13553905655bdf423
+  metadata.gz: 7779f5792082964493be63e188d2d488abfed178cdecb64b1f0e288643b6af60
+  data.tar.gz: 47b175252e94a3b59c947ebd09b363fc62178f37f29a837a3ed75d95a6233943
 SHA512:
-  metadata.gz: 2f6c720885cd4e0b322ee54862fefba63a9d7af7e993c455dd942ec0b1f8aabfcbd9599362e5887bb0e325fd18cfad0c47f193ee7db8f31f7a5f1dae98ba6afd
-  data.tar.gz: 3e906a2d06e5b4ba91f7cf194cec788c8161d36930bab21fc516a6a47a100e142011ab6609f2fefbd1d17ffdfaa388845793e28ebee3b88e67af8131dd096e1b
+  metadata.gz: 5dc4593e03760dea3a5ba96805ba7143c4c7fe6881a59b7e5498ebb1e1e3d00ddf09e6111d2103f703902bd38f7466710b1e24c8dbf7922cd5ff8c31c73332aa
+  data.tar.gz: 0c289c198d33ac678dfdc2ea3b5a4ec1d9fefb2f79ac69d123a02577b4c9d6bce4221578b097714e5d3ffb4981d6f5a3f1e503e6acae13b06d54bcb827589093

data/lib/ish/email_campaign.rb

@@ -7,30 +7,27 @@
 class Ish::EmailCampaign
   include Mongoid::Document
   include Mongoid::Timestamps
+  store_in collection: 'ish_email_campaigns'
 
-  field :title
-  def slug
-    title
-  end
+  field :slug
+  validates_uniqueness_of :slug, allow_nil: true
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
-  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 |
+  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 |
   field :from_email
   validates_presence_of :from_email
   def self.from_email_list
     [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
   end
 
-  field :subject
-  validates_presence_of :subject
+  belongs_to :email_template
+  def tmpl; email_template; end
 
+  field :subject
   field :body
-  # validates_presence_of :body
-
-  belongs_to :email_template
 
   field :sent_at, type: DateTime
   field :send_at, type: DateTime

data/lib/ish/email_context.rb

@@ -43,6 +43,8 @@ class ::Ish::EmailContext
   belongs_to :scheduled_email_action, class_name: '::Office::ScheduledEmailAction', optional: true
   def sch; scheduled_email_action; end
 
+  belongs_to :email_campaign, class_name: 'Ish::EmailCampaign', optional: true
+
   field :rendered_str
 
   field :sent_at, type: DateTime

data/lib/photo.rb

@@ -15,7 +15,6 @@ class Photo
   belongs_to :user_profile,  :class_name => 'Ish::UserProfile',  :inverse_of => :profile_photo, :optional => true
 
   belongs_to :report,   :optional => true
-  belongs_to :feature,  :optional => true
   belongs_to :gallery,  :optional => true
   belongs_to :newsitem, :optional => true
 
@@ -36,7 +35,7 @@ class Photo
 
   field :is_public, :type => Boolean, :default => true
   field :is_trash,  :type => Boolean, :default => false # @TODO: nuke this boolean _vp_ 20170515
-  default_scope ->{ where({ :is_trash => false }) } # @TODO: nuke default scopes
+  default_scope ->{ where({ :is_trash => false }) }
 
   has_mongoid_attached_file :photo,
                             :styles => {

data/lib/report.rb

@@ -6,7 +6,6 @@ class Report
 
   field :name, :type => String
   validates :name, :presence => true
-  # index({ :name => 1 }, { :unique => true })
   index({ :name => 1, :is_trash => 1 })
 
   field :slug
@@ -14,6 +13,8 @@ class Report
   index({ :slug => 1 }, { :unique => true })
   before_validation :set_slug, :on => :create
 
+  field :subhead
+
   ## Can be one of: default (nil), longscroll,
   ##   wordpress e.g. https://piousbox.com/wp-json/wp/v2/posts?slug=intro
   # ITEM_TYPES = %w| longscroll wordpress |
@@ -23,41 +24,23 @@ class Report
   field :raw_json
 
   field :is_trash, :type => Boolean, :default => false
-  index({ :is_trash => 1, :is_public => 1 }, { name: 'default_index' })
+  index({ :is_trash => 1, :is_public => 1 })
 
   field :is_public, :type => Boolean, :default => true
   index({ :is_public => 1 })
   scope :public, ->{ where({ is_public: true }) }
 
-  field :is_feature, :type => Boolean, :default => false
-  index({ :is_feature => 1 })
-
-  field :is_done, :type => Boolean, :default => true
-  index({ :is_done => 1 })
-
   field :x, :type => Float
   field :y, :type => Float
-
-  field :lang, :type => String, :default => 'en'
-  index({ :lang => 1 })
+  field :z, :type => Float
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile'
 
-  # validates :user, :presence => true, :allow_nil => false
-  field :username, :type => String, :default => 'anonymous'
-  validates :username, :presence => true, :allow_nil => false
-  index({ :username => 1 })
-
-  field :issue
-  field :subhead
-
   has_one :photo
 
-  field :n_upvotes, :default => 0
-  field :n_spamvotes, :default => 0
-
   has_many :newsitems
 
+  ## @TODO: trash, remove
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions ).order_by( :name => :asc ).limit( 100 )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }

metadata

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