usman 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 076a740cbbeceed3d42f5a97aaded1d79e3c3cf5
-  data.tar.gz: 45f412aac527ee657b4a5275403276c48c2d0131
+  metadata.gz: 6c48cc7bd8d51aa2b31f2bac8cb4469bde5874ed
+  data.tar.gz: eaf3b0f77a1a4372aebbf3335d9ee1109ff42e62
 SHA512:
-  metadata.gz: 92026e5fd7464c56f0c543a35ba43afa8cbe662141de0cce623879312e7645286952651f0bbc1c1533ba38e60e7a272221b1666dcc8ebe162d307c5a86f9b570
-  data.tar.gz: 0456d1af306614d22cc0ca6b4f23ecf5aed14f514ee4a226557a31da4c5936d31ba030c51386caedac657dfa8835365ab01c0dd40b6d5154e3029ead50a16370
+  metadata.gz: ff9b9ebdaf521b43a9c3da93ff6788c81d561dd8e205e38f99ca1366b979c833c7a58d3ac469069e74f22ac11d7dcb5bade6bcf8c7a8254cde45b91070f033bd
+  data.tar.gz: 462bde7386a76c363f42a524af88e796e4246f9b6ea81d21730db14534cb5cad7c62afebdc77f67f4529ec2425a54bf00e278046d78a6853453a8027765f6437

data/app/controllers/usman/api/v1/profile_controller.rb

@@ -30,8 +30,8 @@ module Usman
                   @user.approve!
                   @current_registration.user = @user
                   
-                  @current_registration.country = @country if @country
-                  @current_registration.city = @city if @city
+                  @user.country = @country if @country
+                  @user.city = @city if @city
 
                   @current_registration.save
 
@@ -111,8 +111,8 @@ module Usman
                   @user.dummy = false
                   @user.save
                   
-                  @current_registration.country = @country if @country
-                  @current_registration.city = @city if @city
+                  @user.country = @country if @country
+                  @user.city = @city if @city
 
                   @current_registration.save
 

data/app/models/user.rb

@@ -63,6 +63,8 @@ class User < Usman::ApplicationRecord
   has_many :devices
   has_one :registration
   has_and_belongs_to_many :roles
+  belongs_to :country, optional: true
+  belongs_to :city, optional: true
 
   
   # ------------------

data/app/serializers/profile_serializer.rb

@@ -1,6 +1,6 @@
 class ProfileSerializer < ActiveModel::Serializer
 	include NullAttributeReplacer
-  attributes :id, :name, :gender, :date_of_birth, :username, :email, :phone, :dummy
+  attributes :id, :name, :gender, :date_of_birth, :username, :email, :phone, :dummy, :country_id, :city_id
 
   has_one :profile_picture, class_name: "Image::ProfilePicture", serializer: ProfilePictureSerializer do
     if object.profile_picture

data/app/views/usman/users/_show.html.erb

@@ -120,7 +120,7 @@
 						
 						<tr>
 							<th>Name</th><td><%= @user.name %></td>
-							<th>Username</th><td><%= @user.username %></td>							
+							<th>Username</th><td><%= @user.username %></td>
 						</tr>
 
 						<tr>
@@ -128,6 +128,11 @@
 							<th>Phone</th><td><%= @user.phone %></td>
 						</tr>
 
+						<tr>
+							<th>City</th><td><%= @user.city.try(:display_name) %></td>
+							<th>Country</th><td><%= @user.country.try(:display_name) %></td>
+						</tr>
+
 						<tr>
 							<th>Gender</th><td><%= @user.gender %></td>
 							<th>Date of Birth</th><td><%= @user.date_of_birth.strftime("%m/%d/%Y") if @user.date_of_birth %></td>

data/db/migrate/20170929083236_add_country_city_to_users.rb

@@ -0,0 +1,14 @@
+class AddCountryCityToUsers < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :users, :country_id, :integer
+  	add_column :users, :city_id, :integer
+  	Registration.in_batches.each do |relation|
+		  relation.all.each do |reg|
+		  	user = reg.user
+		  	user.country_id = reg.country_id
+		  	user.city_id = reg.city_id
+		  	user.save
+		  end
+		end
+  end
+end

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.18'
+  VERSION = '0.3.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -576,6 +576,7 @@ files:
 - db/migrate/20170929083233_add_dummy_to_users.rb
 - db/migrate/20170929083234_add_categorisable_to_features.rb
 - db/migrate/20170929083235_change_disabled_to_removed_features.rb
+- db/migrate/20170929083236_add_country_city_to_users.rb
 - lib/tasks/usman/data.rake
 - lib/tasks/usman/master_data.rake
 - lib/temp/features.rake