dscf-core 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04dc0626657988f601694e4e423b72fbc82996d6960178bc52024aa1de41bfe8
-  data.tar.gz: 9270c931ab649cf64b2265e0680ea36cdea14c85cb7d73439e66035a4336bae1
+  metadata.gz: 8d0212cd56d88328433f2976b536c39cdbbe16a240b2ab3ede3a9ed25e07818b
+  data.tar.gz: 16d3d5cfb125698800e11250de6c53d03747962acaa4a63899fb326ae482be62
 SHA512:
-  metadata.gz: 369e0eb673118c48fafb0c41ab308a926cda01ba05348047db3907fa988ca569185c9f5c899f9a5d560ed728271b2bc273baed41abe2a62695eca5171d52ef88
-  data.tar.gz: fa2cc032c4fb2ce73478517a353896dd03dc36717a05839b8fde475308d41215d0b396cde8aa935a1fed48ffe9b5b437909c067a5548434d048fed3ce808fbd0
+  metadata.gz: 95fc979d818ab2875ab6426f224eb06bcd39e4faea8fbf94896ba5236ae82d9d584ee1fb71955c25c9231b02b6f7c31b61f3cf82eacbb78aaa325a1a68efa114
+  data.tar.gz: 824300b9d0ed578d6b600bf150c0bf10992c227c5a20071e4162230f50e263998555d86f9156598ce5402484421712bce41baef28baf510e08c57089b0cfa833

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

@@ -41,6 +41,8 @@ module Dscf
 
       def signup
         skip_authorization
+        return signup_retailer if params[:retailer].present?
+
         user = User.new(user_params)
 
         return render_error("auth.errors.missing_email_or_phone") unless user.email.present? || user.phone.present?
@@ -58,8 +60,6 @@ module Dscf
 
             # Optionally create marketplace records when onboarding via mobile app
             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(
               "auth.success.signup",
@@ -129,7 +129,7 @@ module Dscf
           :password,
           :password_confirmation,
           :temp_password,
-          user_profile_attributes: %i[first_name last_name date_of_birth address]
+          user_profile_attributes: %i[first_name last_name gender date_of_birth]
         )
       end
 
@@ -150,53 +150,46 @@ module Dscf
         )
       end
 
-      # Creates a Retailer record when included in signup request (mobile onboarding)
-      def create_retailer_from_signup!(user)
-        return unless defined?(Dscf::Marketplace::Retailer)
-
-        # `authenticate_user` is skipped for this action so self-service
-        # signup stays public, but `current_user` still resolves whatever
-        # Bearer token was sent — an agent onboarding a retailer on their
-        # behalf attaches their own token, so we derive the onboarding
-        # agent from it rather than trusting a client-supplied agent_id
-        # (there is none in this params shape today, but this keeps the
-        # same trust model as the rest of the agent-assisted flows).
-        # Guard on current_user first: find_by(user_id: nil) matches any
-        # Agent row with a null user_id, silently attributing anonymous
-        # self-signups to a random agent (confirmed live in dscf_marketplace's
-        # equivalent bug — same fix applied here).
-        onboarding_agent = if current_user && defined?(Dscf::Marketplace::Agent)
-          Dscf::Marketplace::Agent.find_by(user_id: current_user.id)
+      def signup_retailer
+        unless defined?(Dscf::Marketplace::Retailer::Registration)
+          return render_error(errors: ["Retailer registration is unavailable"], status: :unprocessable_entity)
         end
 
-        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],
-          user: user,
-          agent: onboarding_agent,
-          onboarded_at: (Time.current if onboarding_agent)
-        )
+        registration = Dscf::Marketplace::Retailer::Registration.new(
+          user_attributes: user_params,
+          retailer_attributes: retailer_signup_params,
+          address_attributes: address_signup_params,
+          actor: current_user,
+          obsolete_profile_address: obsolete_profile_address?
+        ).create!
 
-        if retailer.location.present? && defined?(Dscf::Core::Address)
-          lat_str, lng_str = retailer.location.split(",")
-          lat = lat_str.to_f
-          lng = lng_str.to_f
-
-          if lat != 0.0 && lng != 0.0
-            Dscf::Core::Address.create!(
-              user: user,
-              address_type: :shipping,
-              country: "Ethiopia",
-              city: "Addis Ababa",
-              latitude: lat,
-              longitude: lng
-            )
-          end
-        end
-      rescue => e
-        logger.warn "Failed to auto-create address from retailer onboarding location: #{e.message}"
+        user_with_includes = User.includes(roles: :permissions, user_profile: {}).find(registration.user.id)
+        render_success(
+          "auth.success.signup",
+          data: {
+            user: user_with_includes,
+            retailer: registration.retailer,
+            address: registration.address
+          },
+          status: :created,
+          serializer_options: {
+            user: {
+              serializer: Dscf::Core::UserAuthSerializer,
+              include: [:user_profile, roles: [:permissions]]
+            },
+            retailer: {
+              serializer: Dscf::Marketplace::RetailerSerializer
+            },
+            address: {
+              serializer: Dscf::Core::AddressSerializer
+            }
+          }
+        )
+      rescue Dscf::Marketplace::Retailer::Registration::InvalidInput => e
+        render_error("auth.errors.signup_failed", errors: e.errors, status: :unprocessable_entity)
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+        errors = e.respond_to?(:record) && e.record ? e.record.errors.full_messages : [e.message]
+        render_error("auth.errors.signup_failed", errors: errors, status: :unprocessable_entity)
       end
 
       def agent_signup_params
@@ -204,7 +197,21 @@ module Dscf
       end
 
       def retailer_signup_params
-        params.fetch(:retailer, {}).permit(:name, :phone, :tin_number, :location)
+        params.fetch(:retailer, {}).permit(
+          :name, :phone, :tin_number, :location, :branch_count,
+          preferred_category_ids: []
+        )
+      end
+
+      def address_signup_params
+        params.fetch(:address, {}).permit(
+          :country, :city, :sub_city, :woreda, :kebele,
+          :house_numbers, :po_box, :latitude, :longitude
+        )
+      end
+
+      def obsolete_profile_address?
+        params.dig(:user, :user_profile_attributes)&.key?(:address)
       end
     end
   end

data/lib/dscf/core/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Core
-    VERSION = "0.3.14".freeze
+    VERSION = "0.3.15".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -589,7 +589,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An Engine for Supply Chain Financing
 test_files: []