snf_core 0.2.98 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd314fc21e427da9d504f8db415fff1d4d66e3b3ad00e675778180b596ca9b1d
-  data.tar.gz: 8f6c6e6c7d54ca74bb588461dda607b973a6ac07c6b3b609918681d6af753ea6
+  metadata.gz: f22dd66f3a5b0d74ae9e2861c4e700fbe07526eec275c51943eb701451d92e1f
+  data.tar.gz: 33c322e0e4c72983d9ce4ff027861b74299a9cd13a8b6e2ac80a2cb034441bde
 SHA512:
-  metadata.gz: 4397affa157cbadfccad676c739dca187953acb090b1e3d77c93dfe3c729cdf2631c700565b4f6bd38691c1e36a4387261a1dace0786245d6250a8bb6ce36789
-  data.tar.gz: 470a2d192ebabec579dd38bbe92daf77935b4761d7968a6247339b24c18cf8c4f96511fbc12910e86d930eec256c1c2402f48f5a18fb01740aa5b47c0216686a
+  metadata.gz: b4c0d27b9b9f687699e1ae64e6fbf469ca351b75d632399ad3ea9cdc316ba8cf7b07206bde77d997a1e800320cd018a928a7768b4bf3adb817836ba2baa16bd3
+  data.tar.gz: 4e45106323c448eb148cb21affb9f81f7bd88d2909bfb2c38a035f092c490842515d510486806c4458090c3d100f570ee258571278e954adf8960cc2ba5daf60

data/app/controllers/snf_core/auth_controller.rb

@@ -4,24 +4,39 @@ module SnfCore
 
     def signup
       ActiveRecord::Base.transaction do
-        @user = User.new(user_params)
+        @address = Address.new(address_params)
 
-        if @user.save
-          @business = Business.new(
-            user: @user,
-            business_name: signup_params[:business_name],
-            tin_number: signup_params[:tin_number],
-            business_type: signup_params[:business_type],
-          )
+        if @address.save
+          @user = User.new(user_params)
+          @user.address = @address
 
-          if @business.save
-            render json: { success: true }, status: :created
+          if @user.save
+            @business = Business.new(
+              user: @user,
+              business_name: signup_params[:business_name],
+              tin_number: signup_params[:tin_number],
+              business_type: signup_params[:business_type]
+            )
+
+            if @business.save
+              render json: {
+                success: true,
+                user: @user.as_json(except: [ :password_digest ]),
+                business: @business,
+                address: @address
+              }, status: :created
+              return
+            else
+              render json: { errors: @business.errors.full_messages }, status: :unprocessable_entity
+              raise ActiveRecord::Rollback
+            end
           else
+            render json: { errors: @user.errors.full_messages }, status: :unprocessable_entity
             raise ActiveRecord::Rollback
-            render json: { errors: @business.errors.full_messages }, status: :unprocessable_entity
           end
         else
-          render json: { errors: @user.errors.full_messages }, status: :unprocessable_entity
+          render json: { errors: @address.errors.full_messages }, status: :unprocessable_entity
+          raise ActiveRecord::Rollback
         end
       end
     end
@@ -55,7 +70,7 @@ module SnfCore
         :first_name, :middle_name, :last_name, :password,
         :phone_number, :business_name, :tin_number, :business_type,
         :date_of_birth, :nationality, :occupation, :source_of_funds, :kyc_status,
-        :gender, :verified_at, :verified_by_id, :address_id
+        :gender, :verified_at, :verified_by_id, :email
       )
     end
 
@@ -64,8 +79,19 @@ module SnfCore
         :first_name, :middle_name, :last_name, :password,
         :phone_number, :date_of_birth, :nationality,
         :occupation, :source_of_funds, :kyc_status,
-        :gender, :verified_at, :verified_by_id, :address_id
+        :gender, :verified_at, :verified_by_id, :email
       )
     end
+
+    def address_params
+        params.require(:address).permit(
+            :address_type,
+            :city,
+            :sub_city,
+            :woreda,
+            :latitude,
+            :longitude
+        )
+    end
   end
 end

data/app/models/snf_core/quotation.rb

@@ -8,7 +8,7 @@ module SnfCore
     validates :status, presence: true
     validate :valid_until_cannot_be_in_past
     validate :delivery_date_cannot_be_in_past
-    
+
     before_validation :check_expiration
 
     enum :status, {
@@ -19,7 +19,7 @@ module SnfCore
     }
 
     private
-    
+
     def check_expiration
       if valid_until.present? && valid_until < DateTime.current && !expired?
         self.status = :expired

data/db/migrate/20250226110217_create_snf_core_addresses.rb

@@ -5,8 +5,8 @@ class CreateSnfCoreAddresses < ActiveRecord::Migration[8.0]
       t.string :city, null: false
       t.string :sub_city, null: false
       t.string :woreda
-      t.decimal :latitude, null: false
-      t.decimal :longitude, null: false
+      t.decimal :latitude
+      t.decimal :longitude
 
       t.timestamps
     end

data/db/migrate/20250312043359_create_snf_core_quotations.rb

@@ -1,8 +1,8 @@
 class CreateSnfCoreQuotations < ActiveRecord::Migration[8.0]
   def change
     create_table :snf_core_quotations do |t|
-      t.references :item_request, null: false, foreign_key: {to_table: :snf_core_item_requests}
-      t.decimal :price , null: false
+      t.references :item_request, null: false, foreign_key: { to_table: :snf_core_item_requests }
+      t.decimal :price, null: false
       t.date :delivery_date, null: false
       t.datetime :valid_until, null: false
       t.integer :status, null: false, default: 0

data/lib/snf_core/version.rb

@@ -1,3 +1,3 @@
 module SnfCore
-  VERSION = "0.2.98"
+  VERSION = "0.3.0"
 end