dscf-core 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79b0bd46b44ace100520a0a873e5a6dce32e9f13caf6c72c5ea7a729e1db870
-  data.tar.gz: 6715fc56d379b5600c71a4a78cccd4991a381f9a9a5d8ab0a80d5bc78b4c468d
+  metadata.gz: 140fe172991cc8a918430e1dfe062b715d930c0a6914820d16eec4bc4c7a9a9f
+  data.tar.gz: b6bd385bde47d38da59639170d16843c6000db6fc59410a086eb885c7b5e11b1
 SHA512:
-  metadata.gz: a8b2df9c292d42b1331e30f05af007a2e45d416b4af9863fba943e329130a8705951cbf407c96fe014d0d2d4c9112abcafca38be10a47d8b24ac9e48ccdcce7e
-  data.tar.gz: 8268c64be459eacf7f1afa2c0f80b6b5370fcaad0d2f95f9744fde90c7e7e70add2a5f345fd70b53bf5eb1f1852f01f7261576ea623dee23308f2230c61623bc
+  metadata.gz: f2f6606363b0d92186f267d703e29cc608f08f9be092500d94435e83b9ca2b44cc129d8898ceab3cea2933323b8c5a534542d1c75ecbab55ccf16ae3a34dd05e
+  data.tar.gz: e26442c83f27198db1e1eb2967838ef518e799d1926e76bb286030da06215e68fde220bd3d3f841bf38be2705a4061639be3b7e1b9faaf88ff8f29c56cbd3fc2

data/app/controllers/concerns/dscf/core/role_assignable.rb

@@ -3,13 +3,29 @@ module Dscf
     module RoleAssignable
       extend ActiveSupport::Concern
 
-      def assign_default_role(user)
-        role = Role.find_or_create_by!(code: "USER") do |r|
-          r.name = "User"
+      def assign_default_role(user, role_code = "USER")
+        role = Role.find_or_create_by!(code: role_code) do |r|
+          r.name = role_code.titleize
+          r.active = true
         end
 
+        copy_user_role_permissions(role) unless role_code == "USER"
+
         UserRole.find_or_create_by!(user: user, role: role)
       end
+
+      private
+
+      def copy_user_role_permissions(role)
+        return if role.permissions.any?
+
+        user_role = Role.find_by(code: "USER")
+        return unless user_role
+
+        user_role.permissions.each do |permission|
+          RolePermission.find_or_create_by!(role: role, permission: permission)
+        end
+      end
     end
   end
 end

data/app/controllers/dscf/core/auth_controller.rb

@@ -47,11 +47,18 @@ module Dscf
 
         ActiveRecord::Base.transaction do
           if user.save
-            assign_default_role(user)
+            role_code = if params[:agent].present?
+                          "AGENT"
+                        elsif params[:retailer].present?
+                          "RETAILER"
+                        else
+                          "USER"
+                        end
+            assign_default_role(user, role_code)
 
             # Optionally create marketplace records when onboarding via mobile app
-            create_agent_from_signup! if params[:agent].present?
-            create_retailer_from_signup! if params[:retailer].present?
+            create_agent_from_signup!(user) if params[:agent].present?
+            create_retailer_from_signup!(user) if params[:retailer].present?
 
             user_with_includes = User.includes(roles: :permissions, user_profile: {}).find(user.id)
             render_success(
@@ -131,26 +138,28 @@ module Dscf
       end
 
       # Creates an Agent record when included in signup request (mobile onboarding)
-      def create_agent_from_signup!
+      def create_agent_from_signup!(user)
         return unless defined?(Dscf::Marketplace::Agent)
 
         Dscf::Marketplace::Agent.create!(
           name: agent_signup_params[:name],
           phone: agent_signup_params[:phone],
           service_area: agent_signup_params[:service_area],
-          fayda_number: agent_signup_params[:fayda_number]
+          fayda_number: agent_signup_params[:fayda_number],
+          user: user
         )
       end
 
       # Creates a Retailer record when included in signup request (mobile onboarding)
-      def create_retailer_from_signup!
+      def create_retailer_from_signup!(user)
         return unless defined?(Dscf::Marketplace::Retailer)
 
         Dscf::Marketplace::Retailer.create!(
           name: retailer_signup_params[:name],
           phone: retailer_signup_params[:phone],
           tin_number: retailer_signup_params[:tin_number],
-          location: retailer_signup_params[:location]
+          location: retailer_signup_params[:location],
+          user: user
         )
       end
 

data/app/serializers/dscf/core/user_auth_serializer.rb

@@ -1,7 +1,7 @@
 module Dscf
   module Core
     class UserAuthSerializer < ActiveModel::Serializer
-      attributes :id, :email, :phone, :verified_at, :permissions
+      attributes :id, :email, :phone, :verified_at, :permissions, :review_status
 
       has_one :user_profile, serializer: Dscf::Core::UserProfileSerializer
       has_many :roles, serializer: Dscf::Core::RoleLightSerializer
@@ -9,6 +9,29 @@ module Dscf
       def permissions
         object.active_permissions.to_a
       end
+
+      def review_status
+        return @review_status if defined?(@review_status)
+
+        @review_status = if defined?(Dscf::Marketplace::Agent) && (agent = Dscf::Marketplace::Agent.find_by(user_id: object.id))
+                           { type: "agent", entity_id: agent.id, status: agent.verification_status }
+                         elsif defined?(Dscf::Marketplace::Supplier) && (supplier = supplier_for_user)
+                           { type: "supplier", entity_id: supplier.id, status: supplier.current_status_for(:default) }
+                         elsif defined?(Dscf::Marketplace::Retailer) && (retailer = Dscf::Marketplace::Retailer.find_by(user_id: object.id))
+                           { type: "retailer", entity_id: retailer.id, status: "pending" }
+                         else
+                           nil
+                         end
+      end
+
+      private
+
+      def supplier_for_user
+        business = Dscf::Core::Business.find_by(user_id: object.id)
+        return nil unless business && defined?(Dscf::Marketplace::Supplier)
+
+        Dscf::Marketplace::Supplier.find_by(business_id: business.id)
+      end
     end
   end
 end

data/lib/dscf/core/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Core
-    VERSION = "0.3.6".freeze
+    VERSION = "0.3.7".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Asrat