wordjelly-auth 1.2.3 → 1.2.4

data/app/models/auth/concerns/work/good_concern.rb

@@ -6,7 +6,6 @@ module Auth::Concerns::Work::GoodConcern
 	
 	included do 	
 		embeds_many :parameters, :class_name => "Auth::Work::Parameter"
-		embeds_many :instructions, :class_name => "Auth::Work::Instruction"
 		embeds_many :actors, :class_name => "Auth::Work::Actor"
 		embeds_many :variables, :class_name => "Auth::Work::Variable"	
 

data/app/models/auth/shopping/cart_item.rb

@@ -1,6 +1,3 @@
 class Auth::Shopping::CartItem
 	include Auth::Concerns::Shopping::CartItemConcern
-
-
-
 end

data/app/models/auth/work/communication.rb

@@ -1,13 +1,5 @@
 class Auth::Work::Communication
 	include Auth::Concerns::ChiefModelConcern
-		
-	## 1. it has been embedded, now let me create the ui to edit the communication, for email fields, and then we proceed to email, for this we will need routes and forms.
-	## so i need to see how the communications were made.
-	## 2. finish the surveys
-	## 3. finish two tradegenie tests
-	## 4. finish booking cycle.
-
-
 	###################################################################
 	##
 	##
@@ -16,9 +8,18 @@ class Auth::Work::Communication
 	##
 	###################################################################
 
-	attr_accessor :cycle_id
-	attr_accessor :instruction_id
+	## since we already find the cart item, instruction, cycle or product at the beginning, will store these as attr accessors, not naming as instruction/cycle/cart_item/product because i don't want to interfere with mongoid, which ideally should be setting these , but is not.
+	attr_accessor :_instruction
+	attr_accessor :_instruction_index
+	attr_accessor :_cart_item
 
+	## the communications own index in the instruction, or whatever is its parent.
+	attr_accessor :_index
+	attr_accessor :_product
+	attr_accessor :_cycle
+	attr_accessor :_cycle_index
+
+	
 	###################################################################
 	##
 	##
@@ -28,11 +29,31 @@ class Auth::Work::Communication
 	###################################################################
 	
 	## now give the view to show this 
-	embedded_in :cycles, :class_name => "Auth::Work::Cycle", :polymorphic => true
+	embedded_in :cycle, :class_name => "Auth::Work::Cycle", :polymorphic => true
 
 	## add embedded in products.
-	embedded_in :instructions, :class_name => "Auth::Work::Instruction", :polymorphic => true
+	embedded_in :instruction, :class_name => "Auth::Work::Instruction", :polymorphic => true
 
+	###################################################################
+	##
+	##
+	## METHODS FOR DEFER JOB.
+	##
+	##
+	###################################################################
+
+	field :method_to_determine_defer_job, type: String
+
+	###################################################################
+	##
+	##
+	## BASIC DESCRIPTION
+	##
+	##
+	###################################################################
+	field :name, type: String
+
+	field :description, type: String
 	###################################################################
 	##
 	##
@@ -41,7 +62,7 @@ class Auth::Work::Communication
 	##
 	###################################################################
 
-	field :send_email, type: Boolean
+	field :send_email, type: String
 
 	field :email_template_path, type: String
 
@@ -60,6 +81,13 @@ class Auth::Work::Communication
 
 	## this is got by calling the above method.
 	## this is not a permitted parameter.
+	## so this consists of what exactly ?
+	## the hash is checked for the existence of two keys.
+	## 
+	## how to configure notification repeats ?
+	## for eg someone books a 3 times a year diabetes plan.
+	## when should the notifications be set ?
+	## how to configure that ?
 	field :recipients, type: Hash
 
 	###################################################################
@@ -74,7 +102,7 @@ class Auth::Work::Communication
 	field :repeat, type: String
 
 	## how many times to repeat it.
-	field :repeat_times, type: Integer
+	field :repeat_times, type: Integer, default: 1
 
 	## this is called to determine when to send this communication.
 	field :method_to_determine_communication_timing, type: String
@@ -83,12 +111,38 @@ class Auth::Work::Communication
 	## this is not a permitted parameters.
 	field :enqueue_at_time, type: Time
 
+	## how many times was this notification repeated till now?
+	field :repeated_times, type: Integer, default: 0
+
 	def set_recipients
-		self.recipients = self.send("#{self.method_to_determine_recipients}",self.id.to_s)
+		self.recipients = {:users => [],:topics => []}
+		if self.method_to_determine_recipients.nil?
+			puts "no method to determine recipients."
+			if self._instruction 
+				if self._cart_item
+					resource_id = self._cart_item.resource_id
+					resource_class = self._cart_item.resource_class
+					self.recipients[:users] << resource_class.constantize.find(resource_id)
+				elsif self.product_id
+					resource_id = self._product.resource_id
+					resource_class = self._product.resource_class
+					self.recipients[:users] << resource_class.constantize.find(resource_id)
+				end
+			else
+				puts "no instruction found."
+			end		
+		else
+			self.recipients = self.send("#{self.method_to_determine_recipients}",self.id.to_s)
+		end
 	end
 
-	def set_enqueue_at_time
-		self.enqueue_at_time = self.send("#{self.method_to_determine_communication_timing}",self.id.to_s)
+	def set_enqueue_at
+		if self.method_to_determine_communication_timing.nil?
+			self.enqueue_at_time = Time.now 
+		else
+			self.enqueue_at_time = self.send("#{self.method_to_determine_communication_timing}",self.id.to_s)
+		end
+		self.enqueue_at_time
 	end
 
 	def repeat_options
@@ -106,4 +160,224 @@ class Auth::Work::Communication
 		]
 	end
 
-end
+	def decrement_repeated_times
+		
+		if self._product
+			Auth.configuration.product_class.constantize.where({
+			"instructions.#{self._instruction_index}.communications.#{self._index}._id" => BSON::ObjectId(self.id.to_s) 
+			}).find_one_and_update(
+				{
+					"$inc" => {
+						"instructions.#{self._instruction_index}.communications.#{self._index}.repeated_times" => 1
+					}
+				},
+				{
+					:return_document => :after
+				}
+			)
+		elsif self._cart_item
+			Auth.configuration.cart_item_class.constantize.where({
+					"instructions.#{self._instruction_index}.communications.#{self._index}._id" => BSON::ObjectId(self.id.to_s) 
+				}).find_one_and_update(
+				{
+					"$inc" => {
+						"instructions.#{self._instruction_index}.communications.#{self._index}.repeated_times" => 1
+					}
+				},
+				{
+					:return_document => :after
+				}
+			)
+		elsif self._cycle
+			#coll = Auth.configuration.cycle_class.constantize.collection
+		end
+		
+	end
+
+	def enqueue_repeat
+		if self.repeated_times  < self.repeat_times
+			if self.repeat
+				if self.decrement_repeated_times
+					puts "repeated times"
+					puts self.repeated_times
+					puts "repeat times."
+					puts self.repeat_times
+				
+				
+					
+					enqueue_repeat_at = nil
+					
+					case self.repeat
+					when "Daily"
+						enqueue_repeat_at = Time.now + 1.day
+					when "Weekly"
+						enqueue_repeat_at = Time.now + 1.week
+					when "Monthly"
+						enqueue_repeat_at = Time.now + 1.month
+					when "Yearly"
+						enqueue_repeat_at = Time.now + 1.year
+					when "Half-Monthly"
+						enqueue_repeat_at = Time.now + 6.months
+					end
+
+					args = {}
+					args[:instruction_id] = self._instruction.id.to_s if self._instruction
+					args[:communication_id] = self.id.to_s
+					args[:cart_item_id] = self._cart_item.id.to_s  if self._cart_item
+					args[:product_id] = self._product.id.to_s  if self._product
+					args[:cycle_id] = self._cycle.id.to_s  if self._cycle
+
+					CommunicationJob.set(wait_until: enqueue_repeat_at).perform_later(args)
+				end
+			end
+		end
+	end
+
+
+	## @return[Boolean] : will return false if there is no method defined which can help to determine if the job should be done or deferred. Will otherwise call that method, and return its result.
+	## that method is expected to return a Time object that will be used by the communicationJob to requeue itself.
+	def defer_job
+	 	return false if self.method_to_determine_defer_job.nil?
+	 	self.send("#{self.method_to_determine_defer_job}",self.id.to_s)
+	end
+
+	## @return[Time] : returns a time object at which this job should be reenqueud. If it does not return a time object, then the job is not to be reenqueud, and basically was done immediately.
+	def deliver_all
+		defer_job_result = defer_job
+		unless defer_job_result == false
+					return defer_job_result
+		end
+		set_recipients
+		deliver_email
+		deliver_sms
+		deliver_mobile_notification
+		enqueue_repeat
+		return nil
+	end	
+
+	def get_parent_object
+		self._instruction || self._cycle
+	end
+
+	def deliver_email
+		return unless self.send_email == "on"
+		self.recipients[:users].each do |recipient|
+			puts "checking email recipient."
+			puts recipient.email.to_s
+			puts recipient.confirmed_at.to_s
+			if recipient.email && recipient.confirmed_at
+				puts "sending email."
+				Auth::SendMail.send_email({to: recipient.email, subject: get_parent_object.get_email_subject, content: get_parent_object.get_email_content, link: get_parent_object.get_link}).deliver
+			end
+		end
+	end
+
+	def deliver_sms	
+		self.recipients[:users].each do |recipient|
+			if recipient.additional_login_param
+				###################################################
+				## SET NUMBER
+				###################################################
+				to_number = recipient.additional_login_param
+					
+				###################################################
+				## SET TEMPLATE NAME
+				###################################################
+				template_name = Auth.configuration.two_factor_otp_transactional_sms_template_name
+				
+				###################################################
+				##
+				##
+				## SET VAR HASH
+				##
+				##
+				###################################################
+				var_hash = {:var2 => get_parent_object.get_link, :var1 => get_parent_object.get_sms_content}
+				
+				########################################################
+				## SET TEMPLATE SENDER ID
+				#######################################################	
+				template_sender_id = Auth.configuration.two_factor_otp_transactional_sms_template_sender_id
+
+				########################################################
+				## ONLY SEND THE SMS IF THE VAR HASH CONTAINS DATA.
+							
+				url = "https://2factor.in/API/R1/?module=TRANS_SMS"
+		
+				params = {
+					apikey: Auth.configuration.third_party_api_keys[:two_factor_sms_api_key],
+					to: to_number,
+					from: template_sender_id,
+					templatename: template_name,
+				}.merge(var_hash)
+				
+				request = Typhoeus::Request.new(
+				  url,
+				  params: params,
+				  timeout: 10
+				)
+
+				response = request.run
+					
+			end
+		end
+	end
+
+
+
+
+	def deliver_mobile_notification
+
+	end
+
+
+
+	#####################################################################
+	##
+	##
+	## CLASS METHODS.
+	##
+	##
+	#####################################################################
+	def self.find_communication(arguments)
+		communication_id = arguments[:communication_id]
+	    instruction_id = arguments[:instruction_id]
+	    cart_item_id = arguments[:cart_item_id]
+	    if communication_id && instruction_id && cart_item_id
+	      	if cart_item = Auth.configuration.cart_item_class.constantize.find(cart_item_id)
+		        instruction = nil
+		        instruction_index = nil
+		        communication = nil
+		        communication_index = nil
+
+		        cart_item.instructions.each_with_index{|value,key|
+		        	if value.id.to_s == instruction_id
+		        		instruction = value
+		        		instruction_index = key
+		        	end
+		        }
+
+		        instruction.communications.each_with_index{|value,key|
+
+		        	if value.id.to_s == communication_id
+		        		communication = value
+		        		communication_index = key
+		        	end
+
+		        }
+
+		        instruction.cart_item_id = cart_item_id
+		        communication._instruction = instruction
+		        communication._cart_item = cart_item
+		        communication._instruction_index = instruction_index
+		        communication._index = communication_index
+
+		        return communication
+	      	end
+	    elsif communication_id && instruction_id && product_id
+
+	    end	
+	end
+
+
+end

data/app/models/auth/work/cycle.rb

@@ -1,7 +1,8 @@
 class Auth::Work::Cycle
 		
 	include Mongoid::Document
-
+	Auth::Concerns::Work::CommunicationFieldsConcern
+	
 	attr_accessor :cycle_index
 
 	## unix epoch.

data/app/models/auth/work/instruction.rb

@@ -1,12 +1,16 @@
 class Auth::Work::Instruction
 	include Mongoid::Document
 	include Auth::Concerns::ChiefModelConcern
-
+	include Auth::Concerns::Work::CommunicationFieldsConcern
+	
 	attr_accessor :product_id
+	attr_accessor :cart_item_id
 
 	INSTRUCTION_TYPES = ["Before The Test","After The Test","During The Test","Who This Test is For","Who Should Not Take This Test"]
 
-	embedded_in :product, :class_name => Auth.configuration.product_class
+	embedded_in :cart_item, :class_name => Auth.configuration.cart_item_class, :polymorphic => true
+	
+	embedded_in :product, :class_name => Auth.configuration.product_class, :polymorphic => true
 
 	field :summary_icon_class, type: String
 
@@ -24,4 +28,22 @@ class Auth::Work::Instruction
 	embeds_many :bullets, :class_name => "Auth::Work::Bullet"
 	embeds_many :communications, :class_name => "Auth::Work::Communication", :as => :instruction_communications
 
+	########################################################################
+	##
+	##
+	## Overridden methods from communication_fields_concern.rb
+	##
+	##
+	########################################################################
+	def get_link(args={})
+		if self.product_id
+			Rails.application.routes.url_helpers.instruction_url({:product_id => self.product_id, :id => self.id.to_s})
+		elsif self.cart_item_id
+			Rails.application.routes.url_helpers.instruction_url({:cart_item_id => self.cart_item_id, :id => self.id.to_s})
+		end
+	end
+
+	## okay let me test upto this point.
+	## create a 
+
 end

data/app/views/auth/shopping/places/_search.html.erb

@@ -1,6 +1,6 @@
 <div class="row">
 	<div class="input-field col l6 m6 s12 offset-l3 offset-m3">
-        <input placeholder="Search" id="personality_search" type="text" class="validate fs-22 center">
-        <label for="personality_search"></label>
+        <input placeholder="Search" id="place_search" type="text" class="validate fs-22 center">
+        <label for="place_search"></label>
     </div>
 </div>

data/app/views/auth/work/communications/_form.html.erb

@@ -1,14 +1,26 @@
 <%= form_for(@auth_work_communication, as: "communication", url: @auth_work_communication.new_record? ? communications_path : communication_path(:id => @auth_work_communication.id.to_s), method: @auth_work_communication.new_record? ? :post : :put) do |f| %>
 	<div class="form_fields">
+		<div id="basic_options">
+			
+			<%= f.text_field :name %>
+	      	<%= f.label :name %>
+
+	      	<%= f.text_field :description %>
+	      	<%= f.label :description %>			
+
+		</div>
 		<div id="email_options">
 		  	<h5>E-Mail Options</h5>
-		  	<%= f.check_box :send_email,{},true,false %>
-	      	<%= f.label  :send_email %>
+		  	<label>
+		        <input type="checkbox" id="communication_send_email" name="communication[send_email]"/>
+		        <span>Send Email</span>
+		    </label>
+	      	
 
 	      	<%= f.text_field :email_template_path %>
 	      	<%= f.label :email_template_path %>
 	    </div>
-
+	    <!-- give the option to create the instruction -->
 	    <div class="divider"> </div>
 
 	    <div id="repeat_options">
@@ -33,13 +45,25 @@
 
 		    <% if @auth_work_communication.cycle_id %>
 		      	<%= 
-		      		hidden_field_tag :cycle_id, @auth_work_communication.cycle_id.to_s
+		      		f.hidden_field :cycle_id, value: @auth_work_communication.cycle_id.to_s
 		      	%>
 		    <% end %>
 
 	      	<% if @auth_work_communication.instruction_id %>
 		    	<%=
-		      		hidden_field_tag :instruction_id, @auth_work_communication.instruction_id.to_s %> 
+		      		f.hidden_field :instruction_id, value: @auth_work_communication.instruction_id.to_s
+		    	%>
+	      	<% end %>
+
+	      	<% if @auth_work_communication.product_id %>
+	      		<%=
+		      		f.hidden_field :product_id, value: @auth_work_communication.product_id.to_s 
+		    	%>
+	      	<% end %>
+
+	      	<% if @auth_work_communication.cart_item_id %>
+	      		<%=
+		      		f.hidden_field :cart_item_id, value: @auth_work_communication.cart_item_id.to_s 
 		    	%>
 	      	<% end %>