wordjelly-auth 1.2.5 → 1.2.6

data/app/models/auth/concerns/shopping/bar_code_concern.rb

@@ -0,0 +1,29 @@
+module Auth::Concerns::Shopping::BarCodeConcern
+
+	extend ActiveSupport::Concern
+
+	included do 	
+		field :bar_code_tag, type: String
+		attr_accessor :remove_bar_code
+
+		## do this before validation so that it provides a way to prevent the document from being saved, in case the bar code collection cannot be updated successfully.
+		before_validation do |document|
+			if document.bar_code_tag_changed? && document.bar_code_tag.nil?
+				
+				
+				
+			end
+		end
+
+		## do this after_save, so that at the minimum this bar_code_tag cannot be used again in this collection.
+		after_save do |document|
+			if document.bar_code_tag_changed? && document.bar_code_tag_was.nil?
+				
+
+
+			end
+		end
+	end
+end
+
+## how will all this finish.?

data/app/models/auth/concerns/shopping/cart_concern.rb

@@ -5,6 +5,8 @@ module Auth::Concerns::Shopping::CartConcern
 	
 	include Auth::Concerns::ChiefModelConcern	
 	include Auth::Concerns::OwnerConcern
+	include Auth::Concerns::EsConcern
+	
 
 	included do 
 		field :name, type: String
@@ -14,7 +16,7 @@ module Auth::Concerns::Shopping::CartConcern
 		field :place_id, type: String
 		## name, age, sex of the user for this cart.
 		field :personality_id, type: String		
-
+		attr_accessor :personality
 
 		## debit is calculated live, by first getting all the items already dispatched and their value, and then getting the total payments made and their value, so it infact becomes something at the validation level of the cart item.
 
@@ -71,8 +73,19 @@ module Auth::Concerns::Shopping::CartConcern
 		validate :add_or_remove_validation
 
 
-		## how to handle discount exceeds cart balance.
-		## how to handle discount origin cart id, is same as this cart.
+		## INDEX DEFINITION
+
+		INDEX_DEFINITION = {
+			index_options:  {
+			        settings:  {
+			    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
+				    },
+			        mappings: {
+			          Auth::OmniAuth::Path.pathify(Auth.configuration.cart_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
+			    }
+			}
+		}
+
 
 	end
 
@@ -107,7 +120,7 @@ module Auth::Concerns::Shopping::CartConcern
 
 	## set the cart items, [Array] of cart items.
 	def find_cart_items
-		puts "find cart items."
+		#puts "find cart items."
 		conditions = {:resource_id => get_resource.id.to_s, :parent_id => self.id.to_s}
 		self.cart_items = Auth.configuration.cart_item_class.constantize.where(conditions).order(:created_at => 'asc')
 		
@@ -301,11 +314,12 @@ module Auth::Concerns::Shopping::CartConcern
 		      
 		      cart_item.signed_in_resource = self.signed_in_resource
 		      	
-		      puts "Add or remove is: #{add_or_remove}"
+		      #puts "Add or remove is: #{add_or_remove}"
 
+		      ## and personality also has to be set here.
 		      resp = (add_or_remove == 1) ? cart_item.set_cart_and_resource(self) : cart_item.unset_cart
 		      	
-		      puts "unset cart is:#{resp.to_s}"
+		      #puts "unset cart is:#{resp.to_s}"
 		      
 		      
 		      resp

data/app/models/auth/concerns/shopping/cart_item_concern.rb

@@ -6,85 +6,27 @@ module Auth::Concerns::Shopping::CartItemConcern
 	extend ActiveSupport::Concern
 	
 	include Auth::Concerns::Shopping::ProductConcern
-	include Auth::Concerns::OwnerConcern
-	include Auth::Concerns::EsConcern	
 
+	
 
 	included do 
 
-		embeds_many :instructions, :class_name => "Auth::Work::Instruction", :as => :cart_item_instructions
+		embeds_many :instructions, :class_name => "Auth::Work::Instruction", :as => :cart_item_instructions, :cascade_callbacks => true
 			
 
 
 		INDEX_DEFINITION = {
 			index_options:  {
 			        settings:  {
-			    		index: {
-					        analysis:  {
-					            filter:  {
-					                nGram_filter:  {
-					                    type: "nGram",
-					                    min_gram: 2,
-					                    max_gram: 20,
-					                   	token_chars: [
-					                       "letter",
-					                       "digit",
-					                       "punctuation",
-					                       "symbol"
-					                    ]
-					                }
-					            },
-					            analyzer:  {
-					                nGram_analyzer:  {
-					                    type: "custom",
-					                    tokenizer:  "whitespace",
-					                    filter: [
-					                        "lowercase",
-					                        "asciifolding",
-					                        "nGram_filter"
-					                    ]
-					                },
-					                whitespace_analyzer: {
-					                    type: "custom",
-					                    tokenizer: "whitespace",
-					                    filter: [
-					                        "lowercase",
-					                        "asciifolding"
-					                    ]
-					                }
-					            }
-					        }
-				    	}
+			    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
 				    },
 			        mappings: {
-			          Auth::OmniAuth::Path.pathify(Auth.configuration.cart_item_class) => {
-			            properties: {
-			            	_all_fields:  {
-			            		type: "text",
-				            	analyzer: "nGram_analyzer",
-				            	search_analyzer: "whitespace_analyzer"
-				        	},
-			                name: {
-			                	type: "keyword",
-			                	copy_to: "_all_fields"
-			                },
-			                price: {
-			                	type: "double",
-			                	copy_to: "_all_fields"
-			                },
-			                public: {
-			                	type: "keyword"
-			                },
-			                resource_id: {
-			                	type: "keyword",
-			                	copy_to: "_all_fields"
-			                }
-			            }
-			        }
+			          Auth::OmniAuth::Path.pathify(Auth.configuration.cart_item_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
 			    }
 			}
 		}
-	
+
+			
 
 		##PERMITTED
 		##the id of the product to which this cart item refers.
@@ -134,6 +76,9 @@ module Auth::Concerns::Shopping::CartItemConcern
 		#################################################################
 		field :unit_id, type: String
 		
+		field :personality_id, type: String
+
+		field :place_id, type: String
 
 
 		before_destroy do |document|
@@ -159,8 +104,10 @@ module Auth::Concerns::Shopping::CartItemConcern
 		end
 
 
-		before_create do |document|
-			document.assign_product_attributes
+		after_initialize do |document|
+			if document.new_record?
+				document.assign_product_attributes
+			end
 		end
 
 		
@@ -175,16 +122,16 @@ module Auth::Concerns::Shopping::CartItemConcern
 		## that's it, now all the communication instructions are enqueued.
 		## next step, get a simple notification to be sent by email, and also by sms -> as soon as the time comes for it to be done.
 		after_save do |document|
-			puts "came to after_save document #{document.accepted_changed?}"
-			puts "is it true :#{document.accepted == true}"
+			#puts "came to after_save document #{document.accepted_changed?}"
+			#puts "is it true :#{document.accepted == true}"
 			if document.accepted_changed? && document.accepted == true
-				puts "accepted changed."
+				#puts "accepted changed."
 				document.instructions.each do |instruction|
-					puts "doing instruction: #{instruction.id.to_s}"
+					#puts "doing instruction: #{instruction.id.to_s}"
 					instruction.communications.each do |communication|
 						## Test seperately?
 						## =>  fuck that.
-						puts "doing communication: #{communication.id.to_s}"
+						#puts "doing communication: #{communication.id.to_s}"
 						CommunicationJob.set(wait_until: communication.set_enqueue_at).perform_later({:cart_item_id => document.id.to_s, :instruction_id => instruction.id.to_s, :communication_id => communication.id.to_s})
 					end
 				end
@@ -367,6 +314,8 @@ module Auth::Concerns::Shopping::CartItemConcern
 		return true if self.parent_id
 		return false if (owner_matches(cart) == false)
 		self.parent_id = cart.id.to_s
+		self.personality_id = cart.personality_id
+		self.place_id = cart.place_id
 		self.accepted = nil
 		self.accepted_by_payment_id = nil
 		self.save
@@ -425,9 +374,16 @@ module Auth::Concerns::Shopping::CartItemConcern
 		begin
 			if self.product_id
 	 			if product = Auth.configuration.product_class.constantize.find(product_id)
+	 				#puts "product found."
+	 				#puts "product miscellaneous_attributes to assign"
+	 				#puts product_attributes_to_assign.to_s
 	 				product_attributes_to_assign.each do |attr|
+	 					#puts "doing attribute:"
+	 					#puts attr.to_s
 	 					if self.respond_to? attr.to_sym
+	 						#puts "responds"
 		 					if self.send("#{attr}").nil?
+		 						#puts "it is nil"
 		 						self.send("#{attr}=",product.send("#{attr}"))
 		 					elsif (self.send("#{attr}").respond_to? :embedded_in) && (self.send("#{attr}").empty?)
 		 						self.send("#{attr}=",product.send("#{attr}"))
@@ -435,29 +391,45 @@ module Auth::Concerns::Shopping::CartItemConcern
 	 					end
 	 				end
 	 			end
+	 		else
+	 			#puts "no product id."
 	 		end
-	 	rescue
-
+	 	rescue => e
+	 		#puts e.to_s
 	 	end 
+
+	 	self.instructions.each do |instruction|
+ 			instruction.created_at = nil
+ 			instruction.updated_at = nil
+ 			instruction.bullets.each do |bullet|
+ 				bullet.created_at = nil
+ 				bullet.updated_at = nil
+ 			end
+ 			instruction.communications.each do |communication|
+ 				communication.created_at = nil
+ 				communication.updated_at = nil
+ 			end		
+ 			instruction.links.each do |link|
+ 				link.created_at = nil
+ 				link.updated_at = nil
+ 			end
+	 	end
+	 	#puts "attributes assigned are:"
+	 	#puts self.attributes.to_s
 	end
 
 	def product_attributes_to_assign
-		["name","price","bundle_name","instructions"]
+		["name","price","bundle_name","instructions","components"]
 	end
 
 	## this is got by multiplying the price of the cart item by the minimum_acceptable at field.
 	def minimum_price_required_to_accept_cart_item
 		price*accept_order_at_percentage_of_price
 	end
+ 	
+
+	
 
-	def as_indexed_json(options={})
-	 {
-	 	name: name,
-	    price: price,
-	    resource_id: resource_id,
-	    public: public
-	 }
-	end 
 
 =begin
 	## @param[String] req : the requirement from the definition. It consists of "*" wildcard, or a product id, or a definition address + product_id -> which is basically one of the output products of the definition. But here it will have the product id, not the self id.

data/app/models/auth/concerns/shopping/personality_concern.rb

@@ -2,82 +2,102 @@ module Auth::Concerns::Shopping::PersonalityConcern
 
 	extend ActiveSupport::Concern
 	include Auth::Concerns::OwnerConcern
-	include Auth::Concerns::EsConcern	
+	include Auth::Concerns::EsConcern
+	include Mongoid::Autoinc	
+
 
 	included do 
 
 		INDEX_DEFINITION = {
 			index_options:  {
 			        settings:  {
-			    		index: {
-					        analysis:  {
-					            filter:  {
-					                nGram_filter:  {
-					                    type: "nGram",
-					                    min_gram: 2,
-					                    max_gram: 20,
-					                   	token_chars: [
-					                       "letter",
-					                       "digit",
-					                       "punctuation",
-					                       "symbol"
-					                    ]
-					                }
-					            },
-					            analyzer:  {
-					                nGram_analyzer:  {
-					                    type: "custom",
-					                    tokenizer:  "whitespace",
-					                    filter: [
-					                        "lowercase",
-					                        "asciifolding",
-					                        "nGram_filter"
-					                    ]
-					                },
-					                whitespace_analyzer: {
-					                    type: "custom",
-					                    tokenizer: "whitespace",
-					                    filter: [
-					                        "lowercase",
-					                        "asciifolding"
-					                    ]
-					                }
-					            }
-					        }
-				    	}
+			    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
 				    },
 			        mappings: {
-			          Auth::OmniAuth::Path.pathify(Auth.configuration.personality_class) => {
-			            properties: {
-			            	_all_fields:  {
-			            		type: "text",
-				            	analyzer: "nGram_analyzer",
-				            	search_analyzer: "whitespace_analyzer"
-				        	},
-			                fullname: {
-			                	type: "keyword",
-			                	copy_to: "_all_fields"
-			                }
-			            }
-			        }
+			          Auth::OmniAuth::Path.pathify(Auth.configuration.personality_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
 			    }
 			}
 		}
-	
-		before_save do |document|
-			document.public = "no"
-		end
 
 		## this will get stored as an epoch.
-		field :date_of_birth, type: Integer
+		field :date_of_birth, type: String
 		
 		## full name
 		field :fullname, type: String
 
+		## this is a simple field that is set whenever the date of birth is set.
+		field :age, type: Integer
 
 		field :sex, type: String
+
+
+		##################################################################
+		##
+		##
+		## AUTOINCREMENTING AND HASHID
+		##
+		##
+		##################################################################
+
+		field :auto_incrementing_number, type: Integer
+
+		increments :auto_incrementing_number
+
+		field :unique_hash_id, type: String
+
 	end
 
+	###############################################################
+	##
+	##
+	## METHOD OVERRIDDEN BECAUSE MONGOID-AUTOINC, CALLS THIS METHOD TO SET THE VALUE OF THE AUTOINCREMENTING FIELD, AND WE NEEDED TO HOOK INTO THAT TO SET THE HASHID. 
+	##
+	##
+	###############################################################
+
+	def write_attribute(field,value)
+		super(field,value)
+		if field.to_s == "auto_incrementing_number"
+			if self.auto_incrementing_number_changed?
+				unless self.unique_hash_id
+					hashids = Hashids.new(Auth.configuration.hashids_salt,0,Auth.configuration.hashids_alphabet)
+					self.unique_hash_id = hashids.encode(self.auto_incrementing_number)
+				end
+			end
+		end
+	end
+
+	################################################################
+
+	## adds the name, sex, age in years, and the unique hash id for this personality
+	def add_info(tags)
+		tags << self.fullname
+		tags << self.sex
+		tags << ("Age: " + self.age.to_s + " years")
+		tags << self.unique_hash_id
+	end
+
+	## date of birth is going to be a simple string.
+	## format : YYYY-DD-MM, zero padded in case of single digits
+	## so this sets the age, now what.
+	def date_of_birth=(date_of_birth)
+		
+		super(date_of_birth)
+		return unless date_of_birth
+
+		birth_time = Time.parse(date_of_birth)
+		self.age = ((Time.now - birth_time)/1.year).to_i
+	end
+
+
+	######################################################################
+	##
+	##
+	## AUTOCOMPLETE METHODS.
+	##
+	##
+	######################################################################
+
 	## @param[Hash] options : can contain a :resource key. which should be the resource(user) to which all the personalities belong.
 	module ClassMethods
 		def find_personalities(options)