bscf-core 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be072a51d0509a498f9683b71b886449e71b1e8299dcc24fa59cce90e6c86b39
-  data.tar.gz: 36289d1c7adc36848678a1349db0c38b75b46ef46af12bdee7f41d58972d6682
+  metadata.gz: 4ee1e49157229f6ffa55b4398736e7ec0991cc5db23790e73a037325e6b160ac
+  data.tar.gz: a51afde1e6f6c2c6ac07c89344ca4727afbea861c9bc4c2b8949df77558aa524
 SHA512:
-  metadata.gz: adca5ae63efc6ac469bbdb57c0f968e6ec755bec13b75a3e0a42fda6b810da733515139438258c23f47f3f9a9384e0c294039339273a78f21b2c4283f302d2bf
-  data.tar.gz: 5f08a90a84b77d1dff75ac489a7c3ebe08063aa63fdb6c18bbe3d402320488883eb9e43b39f8fafd49b8b7fed2c964b050095aad4d54dabfd0008c69491751c3
+  metadata.gz: 34a9ed632852bbc6601208876c65ad129e0b9db2bac39742a6fdd25c793f020f0fdcd48ec418a51bfe88d394c987a05634dd875a7ea26c3e7306a030db08bf78
+  data.tar.gz: 62f85d3fb562f30b6031e6e36b9029bf3bc1b8139461d33122241f6bb91fbb68810a1eb8d37258ede93ca912d245cfc924602224bc735388ae66ce0e59b4130b

data/app/models/bscf/core/user.rb

@@ -7,16 +7,29 @@ module Bscf
       has_one :user_role
       has_many :user_roles
       has_many :roles, through: :user_roles
-
       has_many :orders_placed, class_name: "Bscf::Core::Order", foreign_key: "ordered_by_id"
       has_many :orders_received, class_name: "Bscf::Core::Order", foreign_key: "ordered_to_id"
 
       validates :first_name, presence: true
       validates :middle_name, presence: true
       validates :last_name, presence: true
-      validates :password, presence: true
-      validates :phone_number, presence: true, uniqueness: true
-      validates :email, presence: true, uniqueness: true
+      validates :phone_number, presence: true
+      validates :phone_number, uniqueness: true
+      validates :email, uniqueness: true, allow_nil: true
+      validates :password,
+                presence: true,
+                length: { is: 6 },
+                format: {
+                  with: /\A\d{6}\z/,
+                  message: "must be exactly 6 digits"
+                },
+                if: :password_required?
+
+      private
+
+      def password_required?
+        new_record? || password.present?
+      end
     end
   end
 end

data/db/migrate/20250410181146_modify_user_email_and_password.rb

@@ -0,0 +1,6 @@
+class ModifyUserEmailAndPassword < ActiveRecord::Migration[8.0]
+  def change
+    change_column_null :bscf_core_users, :email, true
+    change_column :bscf_core_users, :password_digest, :string, limit: 60, null: false
+  end
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.3.8"
+    VERSION = "0.3.9"
   end
 end

data/spec/factories/bscf/core/users.rb

@@ -3,8 +3,8 @@ FactoryBot.define do
     first_name { Faker::Name.first_name }
     middle_name { Faker::Name.middle_name }
     last_name { Faker::Name.last_name }
-    password { Faker::Internet.password }
     email { Faker::Internet.email }
-    phone_number { Faker::Alphanumeric.alpha(number: 10) }
+    phone_number { Faker::PhoneNumber.cell_phone }
+    password { rand(100000..999999).to_s }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-04-11 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -337,6 +337,7 @@ files:
 - db/migrate/20250410115524_create_bscf_core_vehicles.rb
 - db/migrate/20250410181144_add_delivery_details_to_delivery_orders.rb
 - db/migrate/20250410181145_add_actual_delivery_time_to_delivery_orders.rb
+- db/migrate/20250410181146_modify_user_email_and_password.rb
 - lib/bscf/core.rb
 - lib/bscf/core/engine.rb
 - lib/bscf/core/version.rb