ish_models 0.0.33.37 → 0.0.33.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df419d1e60b948cbbae92cd29f604836b056b6fa
-  data.tar.gz: aca537097bceb483a5d067638873a43aa76b3382
+  metadata.gz: a36a759d3c5df00858b7b4a4b156effa6a115b98
+  data.tar.gz: 7743095516d016ee85723704a9359b420eb896f5
 SHA512:
-  metadata.gz: 565a24d11f3980803458ee022bce63f59b79fee75e2c4b39cf6853e80b6f94fdcb0a85a3f82291e462e1e4c119ff8953578716bb06f1860bc7bf2d8bd4ee27fa
-  data.tar.gz: c4a1368e86cce3d3ff050f0228050c355f818dd5d3b59c2cc5f373adc6e2433dc69253130afc728813e5086243df5d5d238027bbfed1d04a91f20351630df5df
+  metadata.gz: 1de9f46e70857aec5db00efc7c8459aecdd111ab954ffcc332d2725df73dcd6fe0c049cec7f3373181eafb84fd1e793a613f5b9276a95442d7cdf37119da563a
+  data.tar.gz: 9d7a4574898eb513da47ae7d71c75afcd09c58b548a8a4d79949e5890b7c4bb92f0796f0edf82d0b77be812220e2696c296805dd282d7699b5c333f1c2575f8a

data/lib/gallery.rb

@@ -19,9 +19,9 @@ class Gallery
   belongs_to :site
   validates :site, :presence => true
 
-  belongs_to :user,         :optional => true
-  belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile'
-  field :username, :type => String
+  belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :galleries
+  field :username, :type => String # denormalization, not used _vp_ 20171203
+  has_and_belongs_to_many :shared_profiles, :class_name => 'IshModels::UserProfile', :inverse_of => :shared_galleries
   
   field :name, :type => String
   validates :name, :uniqueness => true # , :allow_nil => false
@@ -42,6 +42,7 @@ class Gallery
 
   has_many :newsitems
 
+
   set_callback(:create, :before) do |doc|
     if doc.user_profile && doc.user_profile.username
       doc.username = doc.user_profile.username

data/lib/ish/lead.rb

@@ -0,0 +1,25 @@
+
+#
+# Lead
+# _vp_ 20171204
+#
+class Ish::Lead
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  store_in :collection => 'ish_lead'
+
+  belongs_to :profile, :class_name => 'IshModels::UserProfile'
+
+  field :email
+  field :job_url
+  field :company, :default => ''
+  field :description
+
+=begin
+  field :amount, :type => Float
+  has_many :payments, :class_name => 'Ish::Payment'
+  field :description, :type => String
+=end
+
+end

data/lib/ish_models/user_profile.rb

@@ -27,13 +27,18 @@ class IshModels::UserProfile
   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
-  has_many :reports, :inverse_of => :profile
-  has_many :videos
-  has_many :photos
+  has_many :galleries, :inverse_of => :user_profile
+  has_and_belongs_to_many :shared_galleries, :class_name => 'Gallery', :inverse_of => :shared_profiles
 
+  has_many :invoices
+  has_many :leads
+  has_many :photos
+  has_many :reports, :inverse_of => :profile
   has_many :stocks, :class_name => 'Ish::StockWatch'
+  has_many :videos
 
+  has_and_belongs_to_many :friends,   :class_name => 'IshModels::UserProfile', :inverse_of => :friendeds
+  has_and_belongs_to_many :friendeds, :class_name => 'IshModels::UserProfile', :inverse_of => :friends
   #
   # preferences
   #

data/lib/ish_models.rb

@@ -23,6 +23,7 @@ require 'ish/stock_action.rb'
 require 'ish/stock_option.rb'
 require 'ish/stock_watch.rb'
 require 'ish/invoice.rb'
+require 'ish/lead.rb'
 
 # obsolete, use `ish` namespace now
 require 'ish_models/cache_key.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.37
+  version: 0.0.33.38
 platform: ruby
 authors:
 - piousbox
@@ -77,6 +77,7 @@ files:
 - lib/gallery2.rb
 - lib/ish/gallery_name.rb
 - lib/ish/invoice.rb
+- lib/ish/lead.rb
 - lib/ish/payment.rb
 - lib/ish/stock_action.rb
 - lib/ish/stock_option.rb