ish_models 0.0.33.166 → 0.0.33.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2c393a3ae573621c06610661cda6a73bf8173aeaeea1ee126256c31d0848a4
-  data.tar.gz: ff72185a3f761ddd7dd5efdb8bbf99428763ab763319c6da3b3ad2d35216d575
+  metadata.gz: 1c0e3408ce26fe3d97602564c99955fa11a05c6584c2cf435a55edbbe2865c63
+  data.tar.gz: f984f36ddfc7d046a819d9966306d6e31192e008af037c77fad9bf2975557b42
 SHA512:
-  metadata.gz: f3bc3cb6150bcc21a7f60ee41b66f694f6290677d5908e698d47d879a76298a3307e2871d54fde5fcdc911906b3a64052e6e2d4d94f98b481617386e0851653d
-  data.tar.gz: c16e81ddfbb6051e2b2907e6685fb8dd77b7b9304ef9741191a3619b72c69317ddff2b78b84a0a665d0b3afe4016929e9efbd5664c87d4c733bdf4fd62914fb8
+  metadata.gz: 27f95caf60f39ce446b0b103be69cafc729a41dbd108833aefe5bcd3814ec1bba4499a5ad1943b4f7f4e5f728c798467c52fa60c43b3f37cf87675c61a149eae
+  data.tar.gz: 5a73b3adfe1953e2a3d84171880472dcfd6fe4bb0dfd615e000b0b7b53aec52eaba17383c6f6aaa73d36e4ba91df652e4d9b36524088eccaf070da893d0b75a5

data/lib/gameui/asset3d.rb

@@ -0,0 +1,29 @@
+
+require 'aws-sdk'
+
+class ::Gameui::Asset3d
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paperclip
+  include Ish::Utils
+
+  belongs_to :marker,       class_name: 'Gameui::Marker', optional: true
+
+  has_mongoid_attached_file :object,
+                            :storage => :s3,
+                            :s3_credentials => ::S3_CREDENTIALS,
+                            :path => "assets3d/:id/:filename",
+                            :s3_protocol => 'https',
+                            :validate_media_type => false,
+                            s3_region: ::S3_CREDENTIALS[:region]
+
+  do_not_validate_attachment_file_type :object
+
+  def export_fields
+    %w|
+      marker_id
+      asset3d_file_name asset3d_content_type asset3d_file_size asset3d_updated_at asset3d_fingerprint
+    |;
+  end
+
+end

data/lib/gameui/marker.rb

@@ -30,6 +30,7 @@ class ::Gameui::Marker
 
   has_one :image,       class_name: '::Ish::ImageAsset', inverse_of: :marker
   has_one :title_image, class_name: '::Ish::ImageAsset', inverse_of: :marker_title
+  has_one :asset3d,     class_name: '::Gameui::Asset3d'
 
   field :deleted_at, type: Time, default: nil # @TODO: replace with paranoia
 

data/lib/ish/email_context.rb

@@ -0,0 +1,15 @@
+
+##
+## This shouldn't really be in Ish namespace... but oh well
+##
+
+class Ish::EmailContext
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :to_email
+  field :subject
+  field :template_name
+
+end
+EmailContext = Ish::EmailContext

data/lib/ish/meeting.rb

@@ -0,0 +1,31 @@
+
+class Ish::Meeting
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :datetime, type: DateTime
+  field :invitee_email, type: String
+  field :invitee_name, type: String
+  field :timezone, type: String, default: 'Central Time (US & Canada)'
+  field :template_name
+
+  field :send_reminder_morning, type: Boolean, default: false
+  field :send_reminder_15min,  type: Boolean, default: false
+
+  def self.template_name_options
+    [
+      [ '', '' ],
+      ['calendly_meeting_v1', 'calendly_meeting_v1'],
+      ['calendly_meeting_v2', 'calendly_meeting_v2'],
+    ]
+  end
+
+  def host_name
+    'Victor Puudeyev'
+  end
+
+  def host_email
+    'piousbox@gmail.com'
+  end
+
+end

data/lib/ish/unsubscribe.rb

@@ -4,8 +4,16 @@ class Ish::Unsubscribe
   include Mongoid::Timestamps
 
   field :email
-  field :unsubscribed_at
+  validates_presence_of :email
+  validates_uniqueness_of :email
+
+  field :mailer_type
+
   field :reason
 
+  field :unsubscribed_at
+
+
+
 end
 

data/lib/ish/user_profile.rb

@@ -1,10 +1,12 @@
 
 require 'ish/utils'
+require 'mongoid/votable'
 
 ## @TODO: rename to Ish::Profile
 class Ish::UserProfile
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Mongoid::Voter
   include Ish::Utils
 
   store_in collection: 'ish_user_profiles'
@@ -30,15 +32,17 @@ class Ish::UserProfile
 
   field :lang, default: 'en'
 
-  ROLES = [ :admin, :manager, :guy ]
-  ROLE_ADMIN   = :admin
-  ROLE_MANAGER = :manager
+  ROLES = [ :guy, :manager, :admin ]
   ROLE_GUY     = :guy
-  field :role_name, :type => Symbol
+  ROLE_MANAGER = :manager
+  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
 

data/lib/ish_models.rb

@@ -4,11 +4,13 @@ require 'ish/configuration'
 
 ::S3_CREDENTIALS ||= {}
 
-module CoTailors; end
 class Gameui; end
+
 module Ish; end
-# I need this thing for permissions#
+
+# I need this thing for permissions???
 class Manager; end
+
 module Warbler; end
 
 module IshModels
@@ -26,6 +28,13 @@ module IshModels
   end
 end
 
+## Needs to be before gameui/asset3d
+require 'ish/utils'
+
+require 'mongoid/votable'
+require 'mongoid/voter'
+
+require 'gameui/asset3d'
 require 'gameui/map'
 require 'gameui/map_bookmark'
 require 'gameui/marker'
@@ -34,16 +43,17 @@ require 'gameui/premium_purchase'
 require 'ish/cache_key'
 require 'ish/campaign'
 require 'ish/crawler'
+require 'ish/email_context'
 require 'ish/gallery_name'
 require 'ish/image_asset'
 require 'ish/input_error'
 require 'ish/invoice'
 require 'ish/issue'
 require 'ish/lead'
+require 'ish/meeting'
 require 'ish/payment'
 require 'ish/premium_item'
 require 'ish/unsubscribe'
-require 'ish/utils'
 require 'ish/user_profile'
 
 require 'city'
@@ -62,3 +72,4 @@ require 'video'
 
 
 
+

data/lib/mongoid/votable.rb

@@ -0,0 +1,246 @@
+module Mongoid
+  module Votable
+    extend ActiveSupport::Concern
+
+    # How many points should be assigned for each up or down vote.
+    # This array should be manipulated using Votable.vote_point method
+    VOTE_POINT = {}
+
+    included do
+      field :votable, type: Hash
+
+      index({ "votable.votes_count" => 1 })
+      index({ "votable.votes_point" => 1 })
+
+      scope :most_voted, -> { order_by(["votable.votes_count", :desc]) }
+      scope :best_voted, -> { order_by(["votable.votes_point", :desc]) }
+
+      # Set vote point for each up (down) vote on an object of this class
+      def self.vote_point(klass = self, options = nil)
+        VOTE_POINT[self.name] ||= {}
+        VOTE_POINT[self.name][klass.name] ||= options
+      end
+
+      #
+      # We usually need to show current_user his voting value on votable object
+      # voting value can be nil (not voted yet), :up or :down
+      # from voting value, we can decide it should be new vote or revote with :up or :down
+      # In this case, validation can be skip to maximize performance
+      #
+      # Make a vote on an object of this class
+      #
+      # @param [Hash] options a hash containings:
+      #   - :votee_id: the votee document id
+      #   - :voter_id: the voter document id
+      #   - :value: :up or :down
+      #   - :revote: change from vote up to vote down
+      #   - :unvote: unvote the vote value (:up or :down)
+      #
+      def self.vote(options)
+        options.symbolize_keys!
+        value = options[:value]
+        votee_id = options[:votee_id]
+        voter_id = options[:voter_id]
+
+        klass = options[:class]
+        klass ||= VOTE_POINT.keys.include?(name) ? name : collection.name.classify
+        value_point = VOTE_POINT[klass][klass]
+
+        if options[:revote]
+          if value == :up
+            positive_field = :up_voter_ids
+            negative_field = :down_voter_ids
+            point_delta = value_point[:up] - value_point[:down]
+          else
+            positive_field = :down_voter_ids
+            negative_field = :up_voter_ids
+            point_delta = -value_point[:up] + value_point[:down]
+          end
+
+          update_result = collection.update_one({
+            # Validate voter_id did a vote with value for votee_id
+            :_id => votee_id,
+            "votable.#{positive_field.to_s}" => { '$ne' => voter_id },
+            "votable.#{negative_field.to_s}" => voter_id
+          }, {
+            # then update
+            '$pull' => { "votable.#{negative_field.to_s}" => voter_id },
+            '$push' => { "votable.#{positive_field.to_s}" => voter_id },
+            '$inc' => {
+              "votable.votes_point" => point_delta
+            }
+          }, {
+            :safe => true
+          })
+
+        elsif options[:unvote]
+          if value == :down
+            positive_field = :down_voter_ids
+            negative_field = :up_voter_ids
+          else
+            positive_field = :up_voter_ids
+            negative_field = :down_voter_ids
+          end
+
+          # Check if voter_id did a vote with value for votee_id
+          update_result = collection.update_one({
+            # Validate voter_id did a vote with value for votee_id
+            :_id => votee_id,
+            "votable.#{negative_field.to_s}" => { '$ne' => voter_id },
+            "votable.#{positive_field.to_s}" => voter_id
+          }, {
+            # then update
+            '$pull' => { "votable.#{positive_field.to_s}" => voter_id },
+            '$inc' => {
+              "votable.votes_count" => -1,
+              "votable.votes_point" => -value_point[value]
+            }
+          }, {
+            :safe => true
+          })
+
+        else # new vote
+          if value == :up
+            positive_field = :up_voter_ids
+          else
+            positive_field = :down_voter_ids
+          end
+
+          update_result = collection.update_one({
+            # Validate voter_id did not vote for votee_id yet
+            :_id => votee_id,
+            "votable.up_voter_ids" => { '$ne' => voter_id },
+            "votable.down_voter_ids" => { '$ne' => voter_id }
+          }, {
+            # then update
+            '$push' => { "votable.#{positive_field.to_s}" => voter_id },
+            '$inc' => {
+              "votable.votes_count" => +1,
+              "votable.votes_point" => value_point[value] }
+          }, {
+            :safe => true
+          })
+        end
+
+        # Only update parent class if votee is updated successfully
+        success = ( update_result.documents[0]['err'] == nil and
+          update_result.documents[0]['nModified'] == 1 and
+          update_result.documents[0]['n'] == 1 )
+
+        if success
+          VOTE_POINT[klass].each do |class_name, value_point|
+            # For other class in VOTE_POINT options, if is parent of current class
+            next unless relation_metadata = relations[class_name.underscore]
+            votee ||= options[:votee] || find(options[:votee_id])
+            # If can find current votee foreign_key value for that class
+            next unless foreign_key_value = votee.read_attribute(relation_metadata.foreign_key.to_sym)
+
+            # Update that class / collection
+            inc_options = if options[:revote]
+              {
+                "votable.votes_point" => ( value == :up ?
+                   value_point[:up] - value_point[:down] :
+                  -value_point[:up] + value_point[:down] )
+              }
+            elsif options[:unvote]
+              {
+                "votable.votes_count" => value_point[:not_increase_votes_count] ? 0 : -1,
+                "votable.votes_point" => -value_point[value]
+              }
+            else
+              {
+                "votable.votes_count" => value_point[:not_increase_votes_count] ? 0 : 1,
+                "votable.votes_point" => value_point[value]
+              }
+            end
+
+            class_name.constantize.collection.update_one(
+              { :_id => foreign_key_value },
+              { '$inc' =>  inc_options }
+            )
+          end
+        end
+
+        success
+      end
+
+    end
+
+    # Make a vote on this votee
+    #
+    # @param [Hash] options a hash containings:
+    #   - :voter_id: the voter document id
+    #   - :value: vote :up or vote :down
+    def vote(options)
+      options[:votee_id] ||= _id
+      options[:votee] ||= self
+
+      if options[:unvote]
+        options[:value] ||= vote_value(options[:voter_id])
+      else
+        options[:revote] ||= !vote_value(options[:voter_id]).nil?
+      end
+
+      self.class.vote(options)
+    end
+
+    # Get a voted value on this votee
+    #
+    # Let's NOT CONVERT bson::objectid's to strings. _vp_ 2022-08-31
+    #
+    # @param [Mongoid Object, BSON::ObjectId] voter is Mongoid object the id of the voter who made the vote
+    def vote_value(voter)
+      voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.is_a?(String) ? voter : voter.id
+
+      return :up if up_voter_ids.try(:include?, voter_id)
+      return :down if down_voter_ids.try(:include?, voter_id)
+    end
+
+    # Get the number of up votes
+    def up_votes_count
+      up_voter_ids.length
+    end
+
+    # Get the number of down votes
+    def down_votes_count
+      down_voter_ids.length
+    end
+
+    # Get the number of votes count
+    def votes_count
+      if self.has_attribute?(:votable)
+        self["votable"]["votes_count"]
+      else
+        0
+      end
+    end
+
+    # Get the votes point
+    def votes_point
+      if self.has_attribute?(:votable)
+        self["votable"]["votes_point"]
+      else
+        0
+      end
+    end
+    alias :votes_score :votes_point
+
+    # Array of up voter ids
+    def up_voter_ids
+      if self.has_attribute?(:votable)
+        self['votable']["up_voter_ids"]
+      else
+        []
+      end
+    end
+
+    # Array of down voter ids
+    def down_voter_ids
+      if self.has_attribute?(:votable)
+        self["votable"]["down_voter_ids"]
+      else
+        []
+      end
+    end
+  end
+end

data/lib/mongoid/voter.rb

@@ -0,0 +1,96 @@
+module Mongoid
+  module Voter
+    extend ActiveSupport::Concern
+
+    # Get list of voted votees
+    #
+    # @param [Class] klass the votee class, e.g. `Post` or `Comment`
+    # @return [Array, nil] an array of votable objects voted by this voter
+    def votees(klass)
+      # Is this id, or id.to_s ?
+      # let's not convert to string, lets use bson::objectid.
+      # _vp_ 2022-08-31
+      klass.any_of({ "votable.up_voter_ids" => _id }, { "votable.down_voter_ids" => _id })
+    end
+
+    # Check to see if this voter voted on the votee or not
+    #
+    # @param [Hash, Object] options the hash containing the votee, or the votee itself
+    # @return [true, false] true if voted, false otherwise
+    def voted?(options)
+      unless options.is_a?(Hash)
+        votee_class = options.class
+        votee_id = options._id
+      else
+        votee = options[:votee]
+        if votee
+          votee_class = votee.class
+          votee_id = votee._id
+        else
+          votee_class = options[:votee_type].classify.constantize
+          votee_id = options[:votee_id]
+        end
+      end
+
+      votees(votee_class).where(:_id => votee_id).count == 1
+    end
+
+    # Get the voted value on a votee
+    #
+    # @param (see #voted?)
+    # @return [Symbol, nil] :up or :down or nil if not voted
+    def vote_value(options)
+      votee = unless options.is_a?(Hash)
+        options
+      else
+        options[:votee] || options[:votee_type].classify.constantize.only(:up_vote_ids, :down_vote_ids).where(
+          :_id => options[:votee_id]
+        ).first
+      end
+      votee.vote_value(_id)
+    end
+
+    # Cancel the vote on a votee
+    #
+    # @param [Object] votee the votee to be unvoted
+    def unvote(options)
+      unless options.is_a?(Hash)
+        options = { :votee => options }
+      end
+      options[:unvote] = true
+      options[:revote] = false
+      vote(options)
+    end
+
+    # Vote on a votee
+    #
+    # @param (see #voted?)
+    # @param [:up, :down] vote_value vote up or vote down, nil to unvote
+    def vote(options, value = nil)
+      if options.is_a?(Hash)
+        votee = options[:votee]
+      else
+        votee = options
+        options = { :votee => votee, :value => value }
+      end
+
+      if votee
+        options[:votee_id] = votee._id
+        votee_class = votee.class
+      else
+        votee_class = options[:votee_type].classify.constantize
+      end
+
+      if options[:value].nil?
+        options[:unvote] = true
+        options[:value] = vote_value(options)
+      else
+        options[:revote] = options.has_key?(:revote) ? !options[:revote].blank? : voted?(options)
+      end
+
+      options[:voter_id] = _id
+
+      ( votee || votee_class ).vote(options)
+    end
+  end
+end

data/lib/newsitem.rb

@@ -1,11 +1,15 @@
 
 require 'ish/utils'
+# require_relative './mongoid/votable.rb'
 
 class Newsitem
   include Mongoid::Document
   include Mongoid::Timestamps
   include Ish::Utils
 
+  include Mongoid::Votable
+  vote_point self, :up => +1, :down => -1
+
   belongs_to :city,    optional: true
   belongs_to :gallery, optional: true  # seems correct. _vp_ 2022-03-21
   def gallery

data/lib/video.rb

@@ -1,4 +1,5 @@
 require 'mongoid/paranoia'
+require_relative './mongoid/votable.rb'
 
 class Video
   include Mongoid::Document
@@ -7,6 +8,9 @@ class Video
   include Mongoid::Paranoia
   include Ish::Utils
 
+  include Mongoid::Votable
+  vote_point self, :up => +1, :down => -1
+
   PER_PAGE = 6
 
   field :name, :type => String
@@ -101,4 +105,6 @@ class Video
     %w| name descr |
   end
 
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.166
+  version: 0.0.33.169
 platform: ruby
 authors:
 - piousbox
@@ -121,6 +121,7 @@ files:
 - lib/event.rb
 - lib/feature.rb
 - lib/gallery.rb
+- lib/gameui/asset3d.rb
 - lib/gameui/map.rb
 - lib/gameui/map_bookmark.rb
 - lib/gameui/marker.rb
@@ -130,12 +131,14 @@ files:
 - lib/ish/campaign.rb
 - lib/ish/configuration.rb
 - lib/ish/crawler.rb
+- lib/ish/email_context.rb
 - lib/ish/gallery_name.rb
 - lib/ish/image_asset.rb
 - lib/ish/input_error.rb
 - lib/ish/invoice.rb
 - lib/ish/issue.rb
 - lib/ish/lead.rb
+- lib/ish/meeting.rb
 - lib/ish/payment.rb
 - lib/ish/premium_item.rb
 - lib/ish/railtie.rb
@@ -143,6 +146,8 @@ files:
 - 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/photo.rb
 - lib/report.rb