usman 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b2e520285740b41f20c57681b4357182364607d
-  data.tar.gz: 25507803354fa92ce9ce85a9c9a530706a207765
+  metadata.gz: 33ba753caf08121272839720af4e449f7d672b7b
+  data.tar.gz: 9d05d3a4c1c588675cd87041e5ae1ed1577fddfe
 SHA512:
-  metadata.gz: 51c9c1cf72c2306a166c99ac2c977d3d5c342978afa4cd366568702a61d561598bdfac82902927847f61596461b6066684c594b6a0a71b90b3aeb2f1c2017be2
-  data.tar.gz: e0cb5a986e3f53755fdf03fcf49ffab57b31d3d449905a7b071be861c58030c63074876c126309959843db2c5a84d5c18e433b0652656e70460b6cfa53def193
+  metadata.gz: e1f7936558d730092101c40def1efd7feb96cad43de7138b605a9fc718c5706aeb6b358b0c1535f66f698be19dcad836ad08100523dd3e9fdc6a8aca115c4242
+  data.tar.gz: d335fb1843c90755b61013b37ddd356c47efe691a7fef30dd1e905225bd05e5e3be8a0cceef64a1e95a69bdc54d8735202b5383f8e741e98ec7b5d48985c5d6d

data/app/services/usman/mobile_registration_service.rb

@@ -17,7 +17,6 @@ module Usman
       @country = Country.find_by_id(params[:country_id])
       @city = City.find_by_id(params[:city_id])
 
-      # FIXME
       # Edge case to catch city selected that of a different country
       @city = nil unless @city.country == @country if @city
       
@@ -43,16 +42,16 @@ module Usman
       @device.valid?
 
       # Create a dummy user
-      create_a_dummy_user if @registration.user.blank?
-
-      @registration.devices.each do |d|
-        d.user = @registration.user
-        d.save
+      if @registration.user_id.blank?
+        create_a_dummy_user 
       end
 
       if @registration.errors.any? or @device.errors.any?
         errors = @registration.errors.to_hash.merge(@device.errors.to_hash)
         set_error("api.register.invalid_inputs", errors)
+      else
+        @registration.save
+        @device.save
       end
     end
 
@@ -63,7 +62,7 @@ module Usman
     end
 
     def register_new_device
-      
+
       if @device && @device.blocked?
         set_error("api.register.device_blocked")
         return
@@ -97,6 +96,7 @@ module Usman
 
         if @registration.errors.blank? && @device.errors.blank?
           @registration.save
+          # Saving User to device table
           @device.save
           generate_new_otp
         else
@@ -115,10 +115,11 @@ module Usman
     end
 
     def create_a_dummy_user
-      return unless @registration.persisted?
-      @registration.user = User.new
-      @registration.user.generate_dummy_data(@registration)
-      @registration.user.save
+      @user = User.new
+      @user.generate_dummy_data(@registration)
+      @user.save
+      @registration.user = @user
+      @device.user = @user if @device
     end
 
     def set_error(key, hsh={})

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.22'
+  VERSION = '0.3.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - kpvarma