wordjelly-auth 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20929f09d0f7a0830bb7e97cb1224a10b2f46563
-  data.tar.gz: f53281e15c0b96f77f8c9676967d64cbf898509f
+  metadata.gz: a718a6cf6f3777261fd7e238201e3136394bd580
+  data.tar.gz: 85aa506e330312e5b1bfe0ed8d2e5e501e97685e
 SHA512:
-  metadata.gz: 463f324b0c192697443e0bfb8d543ea2d01856cafaf879b7b92b74b6a232f9ee288c4171843f2c285929b8d1289c963ed930f735df4d97f48f5f94c990a657de
-  data.tar.gz: 256bce6e180cf74349769083eccec13e0e264a59a5bcf2050a9b57c205b7ec10e24b60f27137080cd605d50ba7a687d61378cdf284297348da55e9e722510a13
+  metadata.gz: 59aca114451a99d6ea926a7fa4765fc73c2b7208471845d3fb4e57dbf8bb8848d57a7c85ee3f00931304dc668913081df3be92d21c19358d9def6aa398142613
+  data.tar.gz: 583172d9e331b87c85addebb0cc2f943ad776494776423c2c3f320cad3d70ef112307adbd34664767c806eb537d71b57913a698dff833595fc52b45e588441ec

data/app/jobs/otp_job.rb

@@ -5,7 +5,7 @@ class OtpJob < ActiveJob::Base
   include Auth::JobExceptionHandler
 
   queue_as :default
-  #self.queue_adapter = Auth.configuration.queue_adapter.to_sym
+  self.queue_adapter = :delayed_job
 
   ##we currently log all exceptions to redis.
   rescue_from(StandardError) do |exception|

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

@@ -126,18 +126,27 @@ module Auth::Concerns::Shopping::ProductConcern
 
 
 			minutes.keys.each do |minute|
-				## what should be added here ?
-				## we will also have to add at those additional minutes.
+				#puts "doing minute: #{minute}"
 				products.each do |product|
+					#puts "doing product: #{product}"
 					all_cycles_valid = true
 					product.cycles.each do |cycle|
-						all_cycles_valid = cycle.requirements_satisfied(minute + cycle.time_since_prev_cycle.minutes*60,location_id)				
+						#puts "doing cycle : #{cycle}"
+						all_cycles_valid = cycle.requirements_satisfied(minute + cycle.time_since_prev_cycle.minutes*60,location_id)
+						#puts "all cycles valid becomes ------------------------------------------------------------- #{all_cycles_valid.to_s}"				
 					end
 					if all_cycles_valid == true
 						product.cycles.each do |cycle|
 							minute_at_which_to_add = minute + cycle.time_since_prev_cycle.minutes*60
+							#puts "minute at which to add is: #{minute_at_which_to_add}"
+							#puts minutes.keys.to_s
 							if minutes[minute_at_which_to_add]
+
 								minutes[minute_at_which_to_add].cycles << cycle
+
+								#puts "these are the cycles---------"
+								#puts minutes[minute_at_which_to_add].cycles.to_s
+
 							else
 								raise "necessary minute not in range."
 							end
@@ -146,7 +155,7 @@ module Auth::Concerns::Shopping::ProductConcern
 				end
 			end
 
-			puts minutes.to_s
+			#puts minutes.to_s
 			
 			minutes
 

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

@@ -69,30 +69,79 @@ class Auth::Work::Cycle
 		end
 	end
 
-	def requirements_satisfied(minute,location_id)
-		begin
-			
+	def requirements_satisfied(epoch,location_id)
+		#begin
+			#puts "came to requirements satisfied"
+			Auth.configuration.location_class.constantize.all.each do |l|
+				puts l.attributes.to_s
+			end
 			location = Auth.configuration.location_class.constantize.find(location_id)
 			
-			applicable_schedules = Auth::Work::Schedule.where({:minute => minute, :location_id => location_id})
+			#puts "location found :#{location}"
+			#puts "epoch : #{epoch}, and location id: #{location_id}"
+			time_for_query = Time.at(epoch)
+			applicable_schedules = Auth::Work::Schedule.collection.find({
+				"$and" => [
+					{
+						"location_id" => location_id
+					},
+					{
+						"start_time" => {
+							"$lte" => time_for_query
+						}
+					},
+					{
+						"end_time" => {
+							"$gte" => time_for_query
+						}
+					}
+				]
+			})
 			
+
+
+			#puts "applicable schedules:"
+			#puts applicable_schedules.to_s
+
+			applicable_schedules = applicable_schedules.to_a
+
 			return false if (applicable_schedules.blank? || applicable_schedules.size == 0)
 			
+			#puts "there are applicable schedules"
+
 			req = self.requirements.deep_dup
+			#puts "req are:"
+			#puts req.to_s
 			
+			applicable_schedules.map!{|c| c = Mongoid::Factory.from_db(Auth::Work::Schedule,c)}
+
 			applicable_schedules.each do |schedule|
+				
 				schedule_for_object = schedule.for_object_class.constantize.find(schedule.for_object_id)
-				req[schedule_for_object.cycle_type] = req[schedule_for_object.cycle_type] - 1 if req[schedule_for_object.cycle_type]
+				
+				#puts "schedule for object is: #{schedule_for_object}"
+
+				## so here the thing is that it can have many cycle types.
+
+				schedule_for_object.cycle_types.keys.each do |type|
+					req[type] = req[type] - 1 if req[type]
+				end
+					
+				#puts "req is: #{req}"
+
 			end
-			
-			true if req.values.uniq[0] == 0
-			false
+				
+			k = req.values.uniq
 
-		rescue
 
-			raise "location id provided to cycle does not exist"
+			return true if ((k[0] == 0) && (k.size == 1))
+			return false
+
+		#rescue
+
+		#	raise "location id provided to cycle does not exist"
 		
-		end
+		#end
 
 	end
 

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/wordjelly-auth.rb

@@ -9,8 +9,9 @@ require "typhoeus"
 require "typhoeus/adapters/faraday"
 require "elasticsearch"
 require "mongoid-elasticsearch"
+require "delayed_job_mongoid"
+require "daemons"
 require "simple_token_authentication"
-#require "thin"
 require "mongoid_versioned_atomic"
 require "jquery-rails"
 require "turbolinks"