wordjelly-auth 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2049e36e29dddee7774021ee9332e67a553b133
-  data.tar.gz: 64c04b25b55f5db3c2c2a0804816e5c233064ee3
+  metadata.gz: c7ab725ad999f3946bd4ab7ba2cee07eb9b8cbd5
+  data.tar.gz: 76ba5387d53e18539441f2b3514988b4bb4adb6c
 SHA512:
-  metadata.gz: 72c0bbc7998837181644d6a9b5c481e08cb44c350ebff3d28d22056cab595c24c411ec7908d05313c296afafe7d902dba004431663783b080745907896bf2e22
-  data.tar.gz: 23ab350e94d744fe82603a14634e59b91d5a0306afcdaa2858f96299c5f87e3c8298d69ab420415a182ebf0b0364a80ecf447dfa6bf54afa2d5dd27c177a1445
+  metadata.gz: f2e71a5be7e81f2d8ad4006973f2d94306cce5bc5b3d69d42d6c8dfb97a8be775deb68fc177357496c83d92335c13b6963c9ef72fe3a136a4b592f9959d318ce
+  data.tar.gz: b363954188740ee6731b712e443950cf6e8e67f1a60e9af94c1ea8ed27d293db0c6ff1cea7da522a85c892e038b9aa9a39e2176899ed97b2c1fedcfc8256386c

data/app/assets/javascripts/auth/application.js

@@ -9,7 +9,7 @@
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
-//
+
 
 //= require jquery
 //= require jquery_ujs

data/app/controllers/auth/application_controller.rb

@@ -12,6 +12,10 @@ module Auth
 	    end
   	end  
 
+  	rescue_from ActionController::UnknownFormat do |e|
+  		render status: 404, text: "Not Found"
+  	end
+
 
   	######################################################################
   	##
@@ -39,6 +43,7 @@ module Auth
 
 		not_found("could not determine class name") unless class_name
 		
+		puts "class name: #{class_name}"
 		
 
 		return class_name
@@ -63,6 +68,7 @@ module Auth
 
 
 	def build_model_from_params
+		puts "params are: #{params.to_s}"
       	pp = permitted_params
       	puts "the permitted_params are:"
       	puts permitted_params.to_s

data/app/controllers/auth/concerns/devise_concern.rb

@@ -125,7 +125,7 @@ module Auth::Concerns::DeviseConcern
 	   	##should block any put action on the user
 	   	##and should render an error saying please do this on the server.
 	    if is_json_request? 
-            #puts "it is a json request."
+            
 	    	if action_name == "otp_verification_result"
 	    		##we let this action pass because, we make json ajax requests 
 	    		##from the web ui to this endpoint, and anyway it does

data/app/controllers/auth/concerns/work/communication_controller_concern.rb

@@ -0,0 +1,82 @@
+module Auth::Concerns::Work::InstructionControllerConcern
+
+  	extend ActiveSupport::Concern
+
+  	included do
+    	include Auth::Work::Instructions::InstructionsHelper
+  	end
+
+  	## at this stage all we will have is instantiations .
+  	def get_parent_object(parent_object_class,parent_object_id)
+
+      parent_object = nil
+
+      begin
+        parent_object = parent_object_class.constantize.find(parent_object_id)
+        if params[:id]
+          @auth_work_communication = parent_object.communications.select{|c|
+                c.id.to_s == params[:id]
+          }
+          @auth_work_communication = @auth_work_communication.size > 0 ? @auth_work_communication[0] : Auth::Work::Communication.new(@auth_work_communication_params)
+        else
+
+        end
+      rescue Mongoid::Errors::DocumentNotFound
+        parent_object = parent_object_class.constantize.new
+        @auth_work_communication = Auth::Work::Communication.new(@auth_work_communication_params)
+      end
+
+      parent_object
+
+  	end
+
+  	def initialize_vars
+
+      instantiate_work_classes
+      
+      @auth_work_communication_params = permitted_params.fetch(:communication,{})
+
+      @auth_work_cycle = nil
+
+      @auth_work_instruction = nil
+
+      if @auth_work_communication_params[:cycle_id]
+          @auth_work_cycle = get_parent_object(@auth_work_cycle_class,@auth_work_communication_params[:cycle_id])
+      elsif @auth_work_communication_params[:instruction_id]
+          @auth_work_instruction = get_parent_object(@auth_work_instruction_class,@auth_work_communication_params[:instruction_id])
+      else
+          not_found("please provide a cycle id or an instruction id")
+      end      
+
+    end
+
+    def create
+
+    end
+
+    def new
+      ## now new has to render this form.
+      ## and it has to determine the url and the 
+    end
+
+    def index
+
+    end
+
+    def update
+
+    end
+
+    def show
+
+    end
+
+    def destroy
+
+    end
+
+	  def permitted_params
+	  	pr = params.permit({:communication => [:send_email,:email_template_path,:method_to_determine_recipients,:repeat,:repeat_times,:method_to_determine_communication_timing,:enqueue_at_time]}, :id, :instruction_id,:cycle_id)
+	  end
+
+end

data/app/controllers/auth/concerns/work/instruction_controller_concern.rb

@@ -6,6 +6,7 @@ module Auth::Concerns::Work::InstructionControllerConcern
     include Auth::Work::Instructions::InstructionsHelper
   end
 
+
   def initialize_vars
     instantiate_work_classes
     not_found("no product id provided") unless params[:product_id]
@@ -19,13 +20,16 @@ module Auth::Concerns::Work::InstructionControllerConcern
         if params[:id]
           @auth_work_instruction = @auth_shopping_product.instructions.select{|c|
             c.id.to_s == params[:id]
-          }[0]
+          }
+          not_found("no such object") if @auth_work_instruction.empty?
+          @auth_work_instruction = @auth_work_instruction[0]
         else
           @auth_work_instruction = @auth_work_instruction_class.new(@auth_work_instruction_params)
         end
       end
     rescue Mongoid::Errors::DocumentNotFound
        @auth_shopping_product = @auth_shopping_product_class.new
+       @auth_work_instruction = @auth_work_instruction_class.new(@auth_work_instruction_params)
     end
 
   end
@@ -75,6 +79,7 @@ module Auth::Concerns::Work::InstructionControllerConcern
 
   def show
     instantiate_work_classes
+    ## so i will have to pass the product id as well.
     @auth_shopping_product = @auth_shopping_product_class.find(params[:product_id])
     @auth_work_instruction = @auth_shopping_product.instructions.select{|c| c.id.to_s == params[:id]}[0]
   end

data/app/controllers/auth/endpoints_controller.rb

@@ -2,6 +2,7 @@ class Auth::EndpointsController < Auth::ApplicationController
 
 	## responds only to json.
 	## got to add the thing to subscribe them to a topic as well.
+	respond_to :json
 
 	include Auth::Concerns::DeviseConcern
 	
@@ -12,43 +13,59 @@ class Auth::EndpointsController < Auth::ApplicationController
 	before_filter :build_model_from_params 
 	before_filter(:only => [:create]){|c| check_for_create(@model)}		
 
-	## all i have to do now is set the routes
-	## and this should start saving endpoints automatically as needed.
-	## so now lets try to make a new endpoint.
-	## question is that what if that token already exists ?
-	## so i will do a find_one_and_update.
-
 	def create
+
+		
 		or_clause = []
 		
 		or_clause << {
-			"android_token" => self.android_token
-		} if self.android_token
+			"android_token" => @model.android_token
+		} if @model.android_token
 		
 		or_clause << {
-			"ios_token" => self.ios_token
-		} if self.ios_token
+			"ios_token" => @model.ios_token
+		} if @model.ios_token
+
+		if or_clause.empty?
+			returned_document = nil
+		else
+			returned_document = @model.class.where({
+				"$or" => or_clause
+			}).find_one_and_update(
+				{
+					"$setOnInsert" => @model.attributes,
+
+				},
+				{
+					:upsert => true,
+	 				:return_document => :after
+				}
+			)
 
-		returned_document = @model.class.where({
-			"$or" => or_clause
-		}).find_one_and_update(
-			{
-				"$set" => self.attributes,
+			if returned_document
+				returned_document.set_android_endpoint
+				returned_document.set_ios_endpoint
+			end
 
-			},
-			{
-				:return_document => :after
-			}
-		)
+		end
 
-		#respond_to do |format|
-	    #   format.json {render json: returned_document.to_json, status: returned_document}
-	    #end
+		respond_to do |format|
+			if returned_document
+				format.json do 
+					render json: returned_document.to_json, status: 201
+				end
+			else
+				format.json do 
+					render json: {
+		            }.to_json, status: 422
+	        	end
+			end
+		end
 
 	end
 
 	def permitted_params
-		params.require(:endpoint).permit(:android_token,:ios_token)
+		params.permit({:endpoint => [:android_token,:ios_token]},:api_key,:current_app_id)
 	end
 
 end

data/app/controllers/auth/images_controller.rb

@@ -2,9 +2,5 @@ class Auth::ImagesController < Auth::AuthenticatedController
     
   include Auth::Images::ImagesHelper
 
-  
-  
-  
-
 
 end

data/app/controllers/auth/profiles_controller.rb

@@ -51,19 +51,8 @@ class Auth::ProfilesController < Auth::ApplicationController
 
 		check_for_update(@profile_resource)
 		
-		#if @resource_params[:admin]
-		#	@profile_resource.admin = @resource_params[:admin]
-		#end
-
-		#if @resource_params[:created_by_admin]
-		#	@profile_resource.created_by_admin = @resource_params[:created_by_admin]
-		#end
-
-		## so not only this but i need a basic endpoint as well
-		## to add endpoints.
-		## okay so will need another endpoint model for that purpose.
-		## so first let me finish this.
-
+		puts "going to assing attributes."
+		puts "resource params are: #{}"
 		@profile_resource.assign_attributes(@resource_params)
 
 		@profile_resource.m_client = self.m_client

data/app/controllers/auth/work/communications_controller.rb

@@ -0,0 +1,18 @@
+class Auth::Work::CommunicationsController < Auth::Work::WorkController
+
+	include Auth::Concerns::Work::CommunicationControllerConcern
+		
+	## only these actions need an authenticated user to be present for them to be executed.
+    CONDITIONS_FOR_TOKEN_AUTH = [:create,:update,:destroy,:edit,:new]
+
+    TCONDITIONS = {:only => CONDITIONS_FOR_TOKEN_AUTH}
+    ##this ensures api access to this controller.
+    include Auth::Concerns::DeviseConcern
+    include Auth::Concerns::TokenConcern
+    before_filter :do_before_request , TCONDITIONS
+    before_filter :initialize_vars , TCONDITIONS
+    before_filter :is_admin_user , :only => [:create,:update,:destroy,:edit]
+    
+    
+
+end

data/app/controllers/auth/work/work_controller.rb

@@ -38,9 +38,52 @@ class Auth::Work::WorkController < Auth::ApplicationController
 
 	end
 
+	def instantiate_communication_class
+		if @auth_work_communication_class = Auth.configuration.communication_class
+	      begin
+	        @auth_work_communication_class = @auth_work_communication_class.constantize
+	      rescue => e
+	      	puts e.to_s
+	        not_found("error instatiating class from communication class")
+	      end
+	    else
+	      not_found("communication class not specified in configuration")
+	    end
+	end
+
+	def instantiate_communication_class
+		if @auth_work_communication_class = Auth.configuration.communication_class
+	      begin
+	        @auth_work_communication_class = @auth_work_communication_class.constantize
+	      rescue => e
+	      	puts e.to_s
+	        not_found("error instatiating class from communication class")
+	      end
+	    else
+	      not_found("communication class not specified in configuration")
+	    end
+	end
+
+	def instantiate_cycle_class
+		if @auth_work_cycle_class = Auth.configuration.cycle_class
+	      begin
+	        @auth_work_cycle_class = @auth_work_cycle_class.constantize
+	      rescue => e
+	      	puts e.to_s
+	        not_found("error instatiating class from cycle class")
+	      end
+	    else
+	      not_found("cycle class not specified in configuration")
+	    end
+	end
+	## do we have a cycle class / controller, obviously are going to need this eventually.
+	## so let me now add that to the engine, add cycle class to engine.
+	
 	def instantiate_work_classes
 		instantiate_instruction_class
 		instantiate_bullet_class
 		instantiate_product_class
+		instantiate_cycle_class
+		instantiate_communication_class
 	end
 end

data/app/jobs/notification_job.rb

@@ -0,0 +1,17 @@
+class NotificationJob < ActiveJob::Base
+
+  queue_as :default
+  self.queue_adapter = :delayed_job
+
+  ##we currently log all exceptions to redis.
+  rescue_from(StandardError) do |exception|
+  	puts exception.message
+   	puts exception.backtrace.join("\n")
+  end
+ 
+  def perform(cart_item,instruction_index,notification_index)
+    notification = cart_item.instructions[instruction_index].notifications[notification_index]
+    notification.deliver_all
+  end
+
+end

data/app/mailers/auth/send_mail.rb

@@ -0,0 +1,15 @@
+class Auth::SendMail < ActionMailer::Base
+	default from: "bhargav.r.raut@gmail.com"
+	def send_email(opts)
+		@options = opts || {}
+		raise "no recipient address" unless @options[:to]
+		raise "no subject" unless @options[:to]
+		mail(to: @options[:to], subject: @options[:subject]) do |format|
+			format.html { render @options[:template] || "send"  }
+		end	
+	end
+	## okay so for this, we will pass it to otp job only.
+	## with some arguments.
+	## why not use whatever emailer i was using before ?
+	## okay so the next step is to send this whole notification into a delayed job.
+end

data/app/models/auth/concerns/chief_model_concern.rb

@@ -47,6 +47,10 @@ module Auth::Concerns::ChiefModelConcern
 		##and add them to an images array. 
 		def load_images
 			self.images = Auth::Image.where(:parent_id => self.id.to_s) || []
+			self.images.each do |image|
+				puts image.attributes.to_s
+			end
+			
 		end
 
 

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

@@ -14,7 +14,7 @@ module Auth::Concerns::Shopping::ProductConcern
 
 		embeds_many :cycles, :class_name => "Auth::Work::Cycle", :as => :product_cycles
 
-		
+					
 		INDEX_DEFINITION = {
 				index_options:  {
 				    settings:  {
@@ -143,7 +143,9 @@ module Auth::Concerns::Shopping::ProductConcern
 
 		end
 
-		## minutes : {epoch => minute object}
+		## adds the relevant cycles to the minutes, and returns the hash that came in.
+		## does not save the minutes, after adding the cycles to them.
+		##@return[Hash] {epoch => minute object}
 		def schedule_cycles(minutes,location_id,conditions = {})
 
 			products = Auth.configuration.product_class.constantize.all if conditions.blank?
@@ -172,7 +174,7 @@ module Auth::Concerns::Shopping::ProductConcern
 							cycle_to_add.cycle_chain = cycle_chain
 							if minutes[epoch_at_which_to_add]
 								
-								add_to_previous_rolling_n_minutes(minutes,epoch_at_which_to_add,cycle_to_add)
+								#add_to_previous_rolling_n_minutes(minutes,epoch_at_which_to_add,cycle_to_add)
 
 
 								minutes[epoch_at_which_to_add].cycles << cycle_to_add

data/app/models/auth/concerns/user_concern.rb

@@ -821,17 +821,13 @@ module Auth::Concerns::UserConcern
 	###
 	####################################################################
 	def refresh_endpoints
-		puts "called refresh end points."
-		puts self.android_token
+		
 		if self.android_token_changed?
 			endpoint = Auth::Endpoint.new
 			endpoint.android_token = self.android_token
 			self.android_endpoint = endpoint.set_android_endpoint
 		end
-		## now have to make an endpoints controller.
+		
 	end
 
-	## after this we have notification dispatch and scheduling logic based on the instructions and cycles.
-	## this has to also be finished today.
-	
 end

data/app/models/auth/endpoint.rb

@@ -7,15 +7,18 @@ class Auth::Endpoint
 	field :android_token, type: String
 	field :ios_token, type: String
 
-	before_save :set_android_endpoint
-	before_save :set_ios_endpoint
-
 	def set_android_endpoint
+		
 		return unless self.android_token
+		
+		return if self.android_endpoint
+		
 		if response = $sns_client.create_platform_endpoint(platform_application_arn: ENV["ANDROID_ARN"], token: self.android_token, attributes: {})
 			self.android_endpoint = response.endpoint_arn
+		
 			self.android_endpoint
 		else
+		
 			nil
 		end
 	end
@@ -24,5 +27,25 @@ class Auth::Endpoint
 		return unless self.ios_token
 	end
 
+	## so i have to do what first ?
+	## notification objects.
+	## and their editing.
+
+	## so it comes down to a few simple things
+	## 1. the cart_item has a variables hash.
+	## 2. notiications are assigned to each instruction.
+	## 2a. they will carry an array of outlinks, as well as how the notification is to be sent.
+	## 3a. they will check the time in the variables hash before sending the notification
+	## 4a. they will rewire themselves if the time is later than what is in the notification itself.
+	## 5a. cycles can directly update cart items which they pertain to, chaning these notification variables.
+	## 3. when a cart item is created -> notifications are queued.
+	## 4. the time for queueing is defined based on the variables seen in that variables hash.
+	## but assume that a cart item is queued. and it is a part of several cycles.
+	## in that case, the timings can only be got from those cycles
+	## so the cart item has to build its variables from the cycles.
+	## where is the cycle going to update its images and videos ?
+	## to what ?
+	## and i need a place to edit the bullets, instructions, and notifications, and variables.
+	## and i have 2 days for all this :)
 
 end

data/app/models/auth/image.rb

@@ -103,4 +103,9 @@ class Auth::Image
     self.signed_request[:signature].to_s
   end
 
+  def get_url
+    Cloudinary::Utils.cloudinary_url(self.id.to_s)
+  end
+
+
 end

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

@@ -0,0 +1,109 @@
+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.
+
+
+	###################################################################
+	##
+	##
+	## ACCESSORS FOR CYCLE AND PRODUCT IDS.
+	##
+	##
+	###################################################################
+
+	attr_accessor :cycle_id
+	attr_accessor :instruction_id
+
+	###################################################################
+	##
+	##
+	## RELATIONS.
+	##
+	##
+	###################################################################
+	
+	## now give the view to show this 
+	embedded_in :cycles, :class_name => "Auth::Work::Cycle", :polymorphic => true
+
+	## add embedded in products.
+	embedded_in :instructions, :class_name => "Auth::Work::Instruction", :polymorphic => true
+
+	###################################################################
+	##
+	##
+	## EMAIL 
+	##
+	##
+	###################################################################
+
+	field :send_email, type: Boolean
+
+	field :email_template_path, type: String
+
+	###################################################################
+	##
+	##
+	## RECIPIENT DETERMINATION.
+	##
+	##
+	###################################################################
+
+	## this method is called on self.
+	## and the self id is passed as an argument.
+	## eg : self.send("instruction.cart_item.get_recipients",self.id.to_s)
+	field :method_to_determine_recipients, type: String
+
+	## this is got by calling the above method.
+	## this is not a permitted parameter.
+	field :recipients, type: Hash
+
+	###################################################################
+	##
+	## 
+	## communication REPEATS
+	##
+	##
+	###################################################################
+
+	## "daily,weekly,monthly,yearly"
+	field :repeat, type: String
+
+	## how many times to repeat it.
+	field :repeat_times, type: Integer
+
+	## this is called to determine when to send this communication.
+	field :method_to_determine_communication_timing, type: String
+
+	## enqueue_at_time
+	## this is not a permitted parameters.
+	field :enqueue_at_time, type: Time
+
+	def set_recipients
+		self.recipients = self.send("#{self.method_to_determine_recipients}",self.id.to_s)
+	end
+
+	def set_enqueue_at_time
+		self.enqueue_at_time = self.send("#{self.method_to_determine_communication_timing}",self.id.to_s)
+	end
+
+	def repeat_options
+		[
+			["Daily","Daily"],
+			["Weekly","Weekly"],
+			["Monthly","Monthly"],
+			["Yearly","Yearly"],
+			["Half-Monthly","Half-Monthly"],
+			["Saturday","Saturday"],
+			["Sunday","Sunday"],
+			["Monday","Monday"],
+			["Tuesday","Tuesday"],
+			["Wednesday","Wednesday"]
+		]
+	end
+
+end

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

@@ -18,8 +18,11 @@ class Auth::Work::Cycle
 
 	embeds_many :templates, :class_name => "Auth::Work::Template"
 
+	embeds_many :communications, :class_name => "Auth::Work::Communication", :as => :cycle_communications
+
 	## each cycle will have a limit
 	field :capacity, type: Integer, default: 0
+	## so this capacity is what has to be updated.
 
 	## there will have to be another field, saying workers who can do it, and entities who can do it.
 	field :workers_available, type: Array
@@ -62,6 +65,10 @@ class Auth::Work::Cycle
 
 	field :cycle_code, type: String
 
+	## every cycle should have a type.
+	## we search based on this type.
+	field :cycle_type, type: String
+
 	## the ids of the related cycles.
 	field :cycle_chain, type: Array, default: []
 
@@ -209,20 +216,7 @@ class Auth::Work::Cycle
 		after_book
 	end
 
-	
-	## so the search criteria is 
-	## where entity_ids == [n1,n2,n3], or worker_ids= [y1,y2,y3]
-	## range is such that
-	## if (end time or start time) of any cycle is (from this minute -> time of end of this cycle)
-	## or if start time <= this minute, and end time is  >= minute of end of this cycle.  
-	## for any of those cycles -> if priority is applicable, then block, and block all related chains.
-	## how to block the related chains ?
-	## a cycle has to store all its related chain ids, and also its 30 minute references.
-	## so that's it.
-	## this is something to execute tomorrow.
-
-	## so plan for today
-	## 
+
 
 end