dscf-core 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049d90d63eb4196e4b7d15ae1208485d7d09fe4a29a29ed920010b8ebcc6a312'
-  data.tar.gz: 768e5835fd1172552db3548fd675b2a2a3a8b332c6e3bda211ec253f1e0c27e1
+  metadata.gz: 442564f7e8acce4f8eae9f074f58b03f8f026189660334c5c58cb2f67cce461c
+  data.tar.gz: 1c283579ec50ad95225bf1f6f9fd76d71decedf6387289ce99c314fefdae5d8f
 SHA512:
-  metadata.gz: 3ed7b66f6f68b8d51dec4bf2d74561b7c8f2f793e7724bd9aa578c91b6f4f870fb6818afed28d2f1b3b4c84a23b2309f00a254c96896555c57763018624a9daf
-  data.tar.gz: 26f208c4e989045dc55ad983034742a4768b4659602ef7b646f2e6c192ab26ce09ddb78a734884d7becb75eeb16d30ebe6e282a9396ae27e06c47fd2869c1c24
+  metadata.gz: 8d13fd5bb155bc6b292bcbe46c28e35d5e3be4b070cb95183b30cc7da0abaef0f955b000af3a2282138b5272f98a181569e45ae322c047e695cf229daba194ec
+  data.tar.gz: 56540f927754630b63a813a573e81f7c84cc2d94f462851536dc04b59cf6ecb1c85ee32e3156d43263e0de6256cd986dedc160d7d13da0f123cf8818a3b6df7e

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

@@ -8,7 +8,12 @@ module Dscf
 
       def login
         skip_authorization
-        user = AuthService.authenticate_user(params[:email_or_phone], params[:password])
+        email_or_phone = params[:email_or_phone].presence || params.dig(:auth, :email_or_phone).presence
+        password = params[:password].presence || params.dig(:auth, :password).presence
+
+        return render_error("auth.errors.missing_credentials", status: :bad_request) unless email_or_phone && password
+
+        user = AuthService.authenticate_user(email_or_phone, password)
 
         if user&.valid_for_authentication?
           tokens = sign_in(user, request)

data/app/models/dscf/core/address.rb

@@ -1,11 +1,24 @@
 module Dscf
   module Core
     class Address < ApplicationRecord
-      belongs_to :user, class_name: "Dscf::Core::User"
+      belongs_to :user, class_name: "Dscf::Core::User", optional: true
+      belongs_to :supplier, class_name: "Dscf::Marketplace::Supplier", optional: true
 
-      enum :address_type, {shipping: 0, residence: 1, current: 2, branch: 3}
+      enum :address_type, {
+        shipping: 0,
+        residence: 1,
+        current: 2,
+        branch: 3,
+        warehouse: 4,
+        business_hq: 5,
+        pickup_point: 6
+      }
 
       validates :country, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id user_id supplier_id address_type country city sub_city woreda kebele house_numbers po_box created_at updated_at]
+      end
     end
   end
 end

data/app/models/dscf/core/business.rb

@@ -20,7 +20,7 @@ module Dscf
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[business_type_id contact_email contact_phone created_at description id id_value name tin_number
-           updated_at user_id]
+          updated_at user_id is_system]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -1,7 +1,7 @@
 module Dscf
   module Core
     class BusinessSerializer < ActiveModel::Serializer
-      attributes :id, :name, :description, :contact_email, :contact_phone, :tin_number, :created_at, :updated_at
+      attributes :id, :name, :description, :contact_email, :contact_phone, :tin_number, :created_at, :updated_at, :is_system
 
       belongs_to :user, serializer: Dscf::Core::UserSerializer
       belongs_to :business_type, serializer: Dscf::Core::BusinessTypeSerializer

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

@@ -2,15 +2,12 @@ module Dscf
   module Core
     class DocumentSerializer < ActiveModel::Serializer
       attributes :id, :document_type, :file_urls, :is_verified, :verified_at, :created_at, :updated_at
-      include Rails.application.routes.url_helpers
 
       belongs_to :documentable, polymorphic: true
       belongs_to :verified_by, polymorphic: true, optional: true
 
       def file_urls
-        return [] unless object.files.attached?
-
-        object.files.map { |file| url_for(file) }
+        object.file_urls
       end
     end
   end

data/app/services/dscf/core/auth_service.rb

@@ -52,6 +52,8 @@ module Dscf
         private
 
         def find_user_by_email_or_phone(email_or_phone)
+          return nil if email_or_phone.blank?
+
           if email_or_phone.include?("@")
             User.find_by(email: email_or_phone)
           else

data/db/migrate/20260501000001_add_is_system_to_dscf_core_businesses.rb

@@ -0,0 +1,5 @@
+class AddIsSystemToDscfCoreBusinesses < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_core_businesses, :is_system, :boolean, null: false, default: false
+  end
+end

data/lib/dscf/core/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Core
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.3".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Asrat
@@ -515,6 +515,7 @@ files:
 - db/migrate/20260128000000_create_dscf_core_file_attachments.rb
 - db/migrate/20260304000001_create_dscf_core_permissions.rb
 - db/migrate/20260304000002_create_dscf_core_role_permissions.rb
+- db/migrate/20260501000001_add_is_system_to_dscf_core_businesses.rb
 - lib/dscf/core.rb
 - lib/dscf/core/engine.rb
 - lib/dscf/core/permission_registry.rb