ish_models 0.0.33.222 → 0.0.33.225

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b562a6867b92d564d8d4df8f8179a58e6892e56854a7de8d8958a80a7c1c1bed
-  data.tar.gz: 1cdd3a6792562f562809b22cf24b681da0c56cb8fa9fca1482bdf20c571b98d4
+  metadata.gz: dcf6779d3d2bafd20719969eb3a2c13681784ce9a6486e444fd8407299b68b10
+  data.tar.gz: 5a0de640fd761b5af8709aae17be40572284c3462fb214849b26dfb440595d7e
 SHA512:
-  metadata.gz: 63d0c5e0238065956ed91e7e16ee7579d38e9aa77e5dfe2615495b47bcee5a4295ff18f90345dcc264b7ef0d8cc343aeb08abf46fb37f0790e891e308f13b614
-  data.tar.gz: c5c9244893ebf49c9614b76e685e0dcd7c03da8ea62d4daa4103a3baf0cf8b2f3fe685db597da0be0a45ffba17258732aa85f72be744f22b6a60544c401f155b
+  metadata.gz: bb445008b52c1d966e8b190241ff6621e3799d0a242221c0b618d1cbd24a75a6f8ddfac7f3f3f39e0815b0dbc849c02d8f107bb16ce915786afd18f3adbaa129
+  data.tar.gz: a6d9882e974666522ec2358b443f0c4deac2fda3b20ac0a8b68f9adabf606fcc02264b5876003f803129a69a609c1cd758d644dfb83e2050eca6f959a8d13014

data/lib/gallery.rb

@@ -2,6 +2,7 @@
 class Gallery
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
+  include Ish::PremiumItem
   include Ish::Utils
 
   PER_PAGE = 6
@@ -17,13 +18,6 @@ class Gallery
   field :is_trash,   type: Boolean, default: false
   field :is_done,    type: Boolean, default: false
 
-  field :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
-  def is_premium
-    premium_tier > 0
-  end
-  def premium?; is_premium; end
-  has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
-
   default_scope ->{ where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc }) }
 
   field :x,       :type => Float

data/lib/ish/payment.rb

@@ -1,11 +1,11 @@
 
-
 class Ish::Payment
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :invoice, :class_name => 'Ish::Invoice', optional: true
-  belongs_to :profile, :class_name => 'Ish::UserProfile' # , :optional => true
+  belongs_to :invoice, class_name: 'Ish::Invoice', optional: true
+  belongs_to :profile, class_name: 'Ish::UserProfile'
+  belongs_to :item,    polymorphic: true
 
   field :amount, :type => Integer # in cents
   field :charge, :type => Hash
@@ -14,16 +14,15 @@ class Ish::Payment
   field :client_secret
   field :payment_intent_id
 
-  field :status, type: Symbol
+  STATUS_CONFIRMED = 'confirmed'
+  STATUS_PENDING = 'pending'
+  STATUSES = %w| active pending |
+  field :status, type: Symbol, default: STATUS_PENDING
+  scope :confirmed, ->{ where( status: STATUS_CONFIRMED ) }
 
   after_create :compute_paid_invoice_amount
-
-  protected
-
   def compute_paid_invoice_amount
-    if self.invoice
-      self.invoice.update_attributes :paid_amount => self.invoice.paid_amount + self.amount
-    end
+    self.invoice&.update_attributes({ paid_amount: self.invoice.paid_amount + self.amount })
   end
 
 end

data/lib/ish/premium_item.rb

@@ -2,13 +2,12 @@
 module Ish::PremiumItem
 
   def self.included base
-    base.send :field, :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
-    base.send :has_many, :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
+    base.send :field, :premium_tier, type: Integer, default: 0 # how many unlocks are need, to get access? 0 = free
+    base.send :has_many, :premium_purchases, class_name: '::Ish::Payment', as: :item
   end
 
   def is_premium
     premium_tier > 0
   end
-  def premium?; is_premium; end
 
 end

data/lib/ish/user_profile.rb

@@ -2,7 +2,9 @@
 require 'ish/utils'
 require 'mongoid/votable'
 
-## @TODO: rename to Ish::Profile
+##
+## It explicitly doesn't have a relation to user! Use email as key.
+##
 class Ish::UserProfile
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -38,48 +40,18 @@ class Ish::UserProfile
   ROLE_ADMIN   = :admin
   field :role_name, :type => Symbol, default: :guy
 
-  has_one :profile_photo, :class_name => 'Photo', :inverse_of => :profile_city
-
-  # belongs_to :user
-  # validates_presence_of :user
-
-  belongs_to :current_city, :class_name => 'City', :inverse_of => :current_users, :optional => true
-  belongs_to :guide_city,   :class_name => 'City', :inverse_of => :guide,         :optional => true
-
-  has_many :galleries, :inverse_of => :user_profile
-  has_and_belongs_to_many :shared_galleries, :inverse_of => :shared_profiles, class_name: 'Gallery'
-  has_and_belongs_to_many :shared_markers,   :inverse_of => :shared_profiles, class_name: 'Gameui::Marker'
-  has_many :my_markers,   :inverse_of => :creator_profile, class_name: 'Gameui::Marker'
-  has_and_belongs_to_many :shared_locations, :inverse_of => :shared_profiles, class_name: 'Gameui::Map'
-  has_many :my_maps, :inverse_of => :creator_profile, class_name: 'Gameui::Map'
-
-  has_many :invoices,                             :class_name => '::Ish::Invoice'
+  has_one :profile_photo,                    inverse_of: :profile_city,    class_name: 'Photo'
+  has_many :galleries,                       inverse_of: :user_profile
+  has_and_belongs_to_many :shared_galleries, inverse_of: :shared_profiles, class_name: 'Gallery'
+  has_and_belongs_to_many :shared_markers,   inverse_of: :shared_profiles, class_name: 'Gameui::Marker'
+  has_and_belongs_to_many :shared_locations, inverse_of: :shared_profiles, class_name: 'Gameui::Map'
+  has_many :my_markers,                      inverse_of: :creator_profile, class_name: 'Gameui::Marker'
+  has_many :my_locations,                    inverse_of: :creator_profile, class_name: 'Gameui::Map'
+  has_many :invoices,                                                      class_name: '::Ish::Invoice'
   has_many :photos
-  has_many :reports,   inverse_of: :user_profile
-
-  ## @TODO: do something about this.
-  # has_many :stock_watches,  class_name: 'IronWarbler::StockWatch'
-  # has_many :option_watches, class_name: 'IronWarbler::OptionWatch'
-
+  has_many :reports,                         inverse_of: :user_profile
   has_many :videos,    inverse_of: :user_profile
-  has_many :newsitems, inverse_of: :profile # @TODO: remove? denorm handle over here?
-
-  has_and_belongs_to_many :bookmarked_locations, class_name: '::Gameui::Map', inverse_of: :bookmarked_profile
-  def bookmarks
-    bookmarked_locations
-  end
-
-  has_and_belongs_to_many :friends,   :class_name => '::Ish::UserProfile', :inverse_of => :friendeds
-  has_and_belongs_to_many :friendeds, :class_name => '::Ish::UserProfile', :inverse_of => :friends
-
-  field :n_unlocks, type: Integer, default: 0
-  def n_coins # @deprecated, do not use
-    n_unlocks
-  end
-
-  ## preferences
-  ## @TODO: better naming convention, or remove this
-  field :videos_embed, :type => Boolean, :default => false
+  has_many :newsitems, inverse_of: :profile
 
   def sudoer?
     %w( piousbox@gmail.com victor@wasya.co ).include?( self.email )
@@ -89,22 +61,22 @@ class Ish::UserProfile
   ## @TODO: check this, this is shit. _vp_ 20170527
   def self.list
     out = self.all.order_by( :domain => :asc, :lang => :asc )
-    [['', nil]] + out.map { |item| [ item.name, item.id ] }
+    [['', nil]] + out.map { |item| [ "#{item.email} :: #{item.name}", item.id ] }
   end
 
-  ##
-  ## GameUI
-  ##
-  field :n_stars, type: Integer, default: 0
-  has_many :premium_purchases, :class_name => '::Gameui::PremiumPurchase'
+  field :n_unlocks, type: Integer, default: 0
+
+  has_many :payments, :class_name => '::Ish::Payment'
+
   def has_premium_purchase item
-    item.premium_purchases.where( user_profile_id: self.id ).exists?
-  end
-  def premium_purchases
-    ::Gameui::PremiumPurchase.where( user_profile_id: self.id )
+    payments.confirmed.where( item: item ).exists?
   end
+
   field :is_purchasing, type: Boolean, default: false
 
+  has_and_belongs_to_many :friends,   :class_name => '::Ish::UserProfile', inverse_of: :friendeds
+  has_and_belongs_to_many :friendeds, :class_name => '::Ish::UserProfile', inverse_of: :friends
+
   # used in rake tasks
   def self.generate delta
     email = delta[:email]
@@ -113,7 +85,6 @@ class Ish::UserProfile
 
     profile = Ish::UserProfile.where( email: email ).first
     if profile
-      puts!( profile, "UserProfile#generate, already exists" ) if !Rails.env.test?
       return
     end
 

data/lib/ish_models.rb

@@ -8,6 +8,9 @@ require 'kaminari/mongoid'
 
 class Gameui; end
 
+class Iro; end
+class Iro::OptionPriceItem; end
+
 module Ish; end
 class Ish::InputError < RuntimeError; end
 
@@ -39,12 +42,11 @@ require 'mongoid/voter'
 
 require 'gameui/asset3d'
 require 'gameui/map'
-require 'gameui/map_bookmark'
 require 'gameui/marker'
-require 'gameui/premium_purchase'
 
 # require 'iro/option_price_item'
 
+
 require 'ish/cache_key'
 require 'ish/crawler'
 require 'ish/email_campaign'

data/lib/office/email_message_stub.rb

@@ -20,4 +20,4 @@ class Office::EmailMessageStub
   field :wp_term_ids, type: :array, default: []
 
 end
-EMS = Office::EmailMessageStub
+MsgStub = EMS = Office::EmailMessageStub

data/lib/report.rb

@@ -1,6 +1,7 @@
 class Report
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
+  include Ish::PremiumItem
   include Ish::Utils
 
   field :name, :type => String
@@ -83,14 +84,6 @@ class Report
     end
   end
 
-  ## copy-paste
-  field :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
-  def is_premium
-    premium_tier > 0
-  end
-  def premium?; is_premium; end
-  has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
-
   def export_fields
     %w| name descr |
   end

data/lib/video.rb

@@ -7,6 +7,7 @@ class Video
   include Mongoid::Timestamps
   include Mongoid::Paperclip
   include Mongoid::Paranoia
+  include Ish::PremiumItem
   include Ish::Utils
 
   include Mongoid::Votable
@@ -75,26 +76,8 @@ class Video
     s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
-  ## copy-paste
-  field :premium_tier, type: Integer, default: 0 # how many stars need to spend, to get access? 0 = free
-  def is_premium
-    premium_tier > 0
-  end
-  def premium?; is_premium; end
-  has_many :premium_purchases, class_name: '::Gameui::PremiumPurchase', as: :item
-
   def export_fields
     %w| name descr |
   end
 
-
-
 end
-
-
-=begin
-  field :issue
-
-  field :is_feature, :type => Boolean, :default => false
-  field :lang, :type => String, :default => 'en'
-=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.222
+  version: 0.0.33.225
 platform: ruby
 authors:
 - piousbox
@@ -135,7 +135,6 @@ files:
 - lib/gameui/map.rb
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
-- lib/gameui/premium_purchase.rb
 - lib/ish/cache_key.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb

data/lib/gameui/premium_purchase.rb

@@ -1,11 +0,0 @@
-
-class ::Gameui::PremiumPurchase
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :user_profile, :class_name => '::Ish::UserProfile'
-  belongs_to :item, polymorphic: true
-
-end
-
-::Purchase = ::Gameui::PremiumPurchase