dscf-core 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411df39f071d6148439e3e9b6ad6e9b67bf6f41a303f822d37becb0fa7f6b709
-  data.tar.gz: e8140291f06f4e6221ad9ab86920cfee9c2c978bb83deced1c32c7cae6a269c5
+  metadata.gz: c79b0bd46b44ace100520a0a873e5a6dce32e9f13caf6c72c5ea7a729e1db870
+  data.tar.gz: 6715fc56d379b5600c71a4a78cccd4991a381f9a9a5d8ab0a80d5bc78b4c468d
 SHA512:
-  metadata.gz: 4377884adbc0f72a0055e8bba6507c37ebf576c113b2193a4cc7eae59fb900406b7ac28ebf6edb624d18fb8efdda8208ecad86aae59f17c58cf0881461ba7ff1
-  data.tar.gz: a4269a8c6f9aaf0bd08d256b171d23d7639a3fbd1e6a2dff4b0da254fa88b48b8bbe475f88a2e66ddf929fd252ea8b3962bd573778fa8fd97feccfe3527cfceb
+  metadata.gz: a8b2df9c292d42b1331e30f05af007a2e45d416b4af9863fba943e329130a8705951cbf407c96fe014d0d2d4c9112abcafca38be10a47d8b24ac9e48ccdcce7e
+  data.tar.gz: 8268c64be459eacf7f1afa2c0f80b6b5370fcaad0d2f95f9744fde90c7e7e70add2a5f345fd70b53bf5eb1f1852f01f7261576ea623dee23308f2230c61623bc

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

@@ -0,0 +1,15 @@
+module Dscf
+  module Core
+    module RoleAssignable
+      extend ActiveSupport::Concern
+
+      def assign_default_role(user)
+        role = Role.find_or_create_by!(code: "USER") do |r|
+          r.name = "User"
+        end
+
+        UserRole.find_or_create_by!(user: user, role: role)
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 module Dscf
   module Core
     class AuthController < ApplicationController
+      include Dscf::Core::RoleAssignable
+
       skip_before_action :authenticate_user, only: %i[login signup refresh]
       skip_before_action :validate_token_expiry, only: %i[login signup refresh]
       skip_before_action :validate_device_consistency, only: %i[login signup refresh]
@@ -46,6 +48,11 @@ module Dscf
         ActiveRecord::Base.transaction do
           if user.save
             assign_default_role(user)
+
+            # 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?
+
             user_with_includes = User.includes(roles: :permissions, user_profile: {}).find(user.id)
             render_success(
               "auth.success.signup",
@@ -123,12 +130,36 @@ module Dscf
         params.permit(:refresh_token)
       end
 
-      def assign_default_role(user)
-        role = Role.find_or_create_by!(code: "USER") do |r|
-          r.name = "User"
-        end
+      # Creates an Agent record when included in signup request (mobile onboarding)
+      def create_agent_from_signup!
+        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]
+        )
+      end
+
+      # Creates a Retailer record when included in signup request (mobile onboarding)
+      def create_retailer_from_signup!
+        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]
+        )
+      end
+
+      def agent_signup_params
+        params.fetch(:agent, {}).permit(:name, :phone, :service_area, :fayda_number)
+      end
 
-        UserRole.find_or_create_by!(user: user, role: role)
+      def retailer_signup_params
+        params.fetch(:retailer, {}).permit(:name, :phone, :tin_number, :location)
       end
     end
   end

data/lib/dscf/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Asrat
@@ -434,6 +434,7 @@ files:
 - app/controllers/concerns/dscf/core/json_response.rb
 - app/controllers/concerns/dscf/core/pagination.rb
 - app/controllers/concerns/dscf/core/reviewable_controller.rb
+- app/controllers/concerns/dscf/core/role_assignable.rb
 - app/controllers/concerns/dscf/core/token_authenticatable.rb
 - app/controllers/dscf/core/account_management_controller.rb
 - app/controllers/dscf/core/addresses_controller.rb