ish_models 0.0.33.245 → 0.0.33.247

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de7c1387a79b26351435ba9dd4e0820282f36e15464884b650e7f4cf489fd1f4
-  data.tar.gz: d36f19a818f22108ffb56d8f61f7e199816432b809d7c95d13466213342a9a4d
+  metadata.gz: 823be62d6f3e6bf6817ef43ebbcefda4c12049f01aedafb95b9fd01a624c6453
+  data.tar.gz: 9b1db16ef558002d83c109426fb41757a4b4892acc3f81a38dbaf130759b23dd
 SHA512:
-  metadata.gz: ac941bc5a76b278489eb7d187154d8cbae27e04635a63b83c98c0d2e6c0b9c4adf01de26900e73f9ae50b38218aba00a70e29d9cb9dc434e4aafbf6dc4cae1a4
-  data.tar.gz: 8693c6a86dfe3e30de6b42a2a4cc3b27616a6f90b3082f80c72d646acdd98d993ed17084052e3a358a98f8d1509b8cc90564869ca72af8a731bc97d4cba6e062
+  metadata.gz: 2238d1a7cd112636cc58aba0eaaea3534a9cd8bb504b901ebe0b3b2298bb8aba90cba6abd4b5063234063c8d0348290a94e7d8979308c204996929797e991cb3
+  data.tar.gz: b2788efc4ae0447ff65d56aa829164a44ae1e42fa12538a63bcd6802c957568da23763d254cc8b79033eb5d25f358b28c4abf2e485dfe1709f274cb721fdc106

data/lib/ish/user_profile.rb

@@ -41,18 +41,20 @@ class Ish::UserProfile
   ROLE_ADMIN   = :admin
   field :role_name, :type => Symbol, default: :guy
 
-  has_one :profile_photo,                    inverse_of: :profile_city,    class_name: 'Photo'
+  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_and_belongs_to_many :shared_reports,   inverse_of: :shared_profiles, class_name: '::Report'
+  has_and_belongs_to_many :shared_videos,    inverse_of: :shared_profiles, class_name: '::Video'
   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
-  has_many :videos,    inverse_of: :user_profile
-  has_many :newsitems, inverse_of: :profile
+  has_many :videos,                          inverse_of: :user_profile
+  has_many :newsitems,                       inverse_of: :profile
 
   def sudoer?
     %w( piousbox@gmail.com victor@wasya.co ).include?( self.email )

data/lib/ish_models.rb

@@ -4,8 +4,6 @@ require 'ish/configuration'
 require 'aws-sdk-s3'
 require 'kaminari/mongoid'
 
-::S3_CREDENTIALS ||= {}
-
 module Gameui; end
 module Iro; end
 module Ish; end

data/lib/report.rb

@@ -35,6 +35,7 @@ class Report
   field :z, :type => Float
 
   belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile'
+  has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_reports
 
   has_one :photo
 

data/lib/video.rb

@@ -38,7 +38,9 @@ class Video
   validates_uniqueness_of :youtube_id, allow_blank: true, case_sensitive: false
   before_save { youtube_id.present? || youtube_id = nil }
 
-  belongs_to :user_profile, :optional => true, :class_name => 'Ish::UserProfile', :inverse_of => :videos
+  belongs_to :user_profile,                  :class_name => 'Ish::UserProfile', :inverse_of => :videos
+  has_and_belongs_to_many :shared_profiles,  :class_name => 'Ish::UserProfile', :inverse_of => :shared_videos
+
 
   index({ is_trash: 1, user_profile_id: 1, created_at: 1 }, { name: 'idx1' })
 

metadata

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