snf_core 0.2.95 → 0.2.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ca8bd2392a69ff49850fa101f216f512c1b9f02ebca883ed26ca979ee4b1849
-  data.tar.gz: 18480de028a99981ee91e8888d28323ce631abdf25ec99bf1d97d3fffc226790
+  metadata.gz: fd314fc21e427da9d504f8db415fff1d4d66e3b3ad00e675778180b596ca9b1d
+  data.tar.gz: 8f6c6e6c7d54ca74bb588461dda607b973a6ac07c6b3b609918681d6af753ea6
 SHA512:
-  metadata.gz: b1de2c64f43d2fe35478de2f507b9b6ea887c980fb41f72dbddded1db7e7c2e5a4d252a848625dc9a450b826183c372ac8913357f71459407ed999cf5662c71d
-  data.tar.gz: a1952a64ba5b261f4e97629e4028c6417f2983a84cf8e7de5e60809d8eaa0d794302489bbb63187e8336939fc7f5a4813d8c80e88c0bf20657f801314e96f17a
+  metadata.gz: 4397affa157cbadfccad676c739dca187953acb090b1e3d77c93dfe3c729cdf2631c700565b4f6bd38691c1e36a4387261a1dace0786245d6250a8bb6ce36789
+  data.tar.gz: 470a2d192ebabec579dd38bbe92daf77935b4761d7968a6247339b24c18cf8c4f96511fbc12910e86d930eec256c1c2402f48f5a18fb01740aa5b47c0216686a

data/app/controllers/snf_core/auth_controller.rb

@@ -40,48 +40,6 @@ module SnfCore
       render json: { success: true, token: token }
     end
 
-    def reset_password_request
-      user = User.find_by(phone_number: auth_params[:phone_number])
-      return render json: { success: false, error: "User doesn't exist" }, status: :unauthorized unless user
-      user.reset_password_token = SecureRandom.hex
-      user.save!
-      AuthMailer.with(
-        user: user,
-        reset_url: params[:reset_url] || "http://localhost:3000/reset-password"
-      ).reset_password.deliver_now
-      render json: { success: true, message: "Reset password token sent to your email" }
-    end
-
-    def reset_password
-      user = User.find_by(reset_password_token: auth_params[:reset_password_token])
-      return render json: { success: false, error: "Token has expired please try again!" }, status: :unauthorized unless user
-      if user.reset_password_token == auth_params[:reset_password_token]
-        return render json: { success: false, error: "You can't use the same password as your current password" }, status: :unprocessable_entity if BCrypt::Password.new(user.password_digest) == auth_params[:password]
-        user.password = auth_params[:password]
-        user.reset_password_token = nil
-        user.password_changed = true
-        user.save!
-        render json: { success: true, message: "Password reset successfully" }
-      else
-        user.reset_password_token = nil
-        user.save!
-        render json: { success: false, error: "Reset password token doesn't match try again" }, status: :unprocessable_entity
-      end
-    end
-
-    def change_password
-      user = current_user
-      if user && user.authenticate(auth_params[:password])
-        return render json: { success: false, error: "Can't use the same password as your current password" }, status: :unprocessable_entity if BCrypt::Password.new(user.password_digest) ==  auth_params[:new_password]
-        user.password = auth_params[:new_password]
-        user.password_changed = true
-        user.save!
-        render json: { success: true, message: "Password changed successfully" }
-      else
-        render json: { success: false, error: "Invalid password" }
-      end
-    end
-
     private
 
     def token_service

data/app/models/snf_core/quotation.rb

@@ -0,0 +1,41 @@
+module SnfCore
+  class Quotation < ApplicationRecord
+    belongs_to :item_request
+
+    validates :price, presence: true, numericality: { greater_than: 0 }
+    validates :valid_until, presence: true
+    validates :delivery_date, presence: true
+    validates :status, presence: true
+    validate :valid_until_cannot_be_in_past
+    validate :delivery_date_cannot_be_in_past
+    
+    before_validation :check_expiration
+
+    enum :status, {
+      pending: 0,
+      accepted: 1,
+      rejected: 2,
+      expired: 3
+    }
+
+    private
+    
+    def check_expiration
+      if valid_until.present? && valid_until < DateTime.current && !expired?
+        self.status = :expired
+      end
+    end
+
+    def valid_until_cannot_be_in_past
+      if valid_until.present? && valid_until < DateTime.current && new_record?
+        errors.add(:valid_until, "can't be in the past")
+      end
+    end
+
+    def delivery_date_cannot_be_in_past
+      if delivery_date.present? && delivery_date < Date.current
+        errors.add(:delivery_date, "can't be in the past")
+      end
+    end
+  end
+end

data/app/models/snf_core/user.rb

@@ -1,19 +1,18 @@
-module SnfCore
-  class User < ApplicationRecord
-    has_secure_password
-
-    belongs_to :verified_by, class_name: 'SnfCore::User', optional: true
-    belongs_to :address
-
-    has_one :wallet, dependent: :destroy
-
-    validates :first_name, :middle_name, :last_name, :phone_number, :date_of_birth, :nationality, presence: true
-    validates :phone_number, :email, uniqueness: true
-
-    enum :kyc_status, { pending: 0, approved: 1, rejected: 2 }
-    enum :gender, { male: 0, female: 1}
-
-    has_one :virtual_account, dependent: :destroy
-
-  end
-end
+module SnfCore
+  class User < ApplicationRecord
+    has_secure_password
+
+    belongs_to :verified_by, class_name: "SnfCore::User", optional: true
+    belongs_to :address
+
+    has_one :wallet, dependent: :destroy
+
+    validates :first_name, :middle_name, :last_name, :phone_number, :date_of_birth, :nationality, presence: true
+    validates :phone_number, :email, uniqueness: true
+
+    enum :kyc_status, { pending: 0, approved: 1, rejected: 2 }
+    enum :gender, { male: 0, female: 1 }
+
+    has_one :virtual_account, dependent: :destroy
+  end
+end

data/app/models/snf_core/virtual_account.rb

@@ -9,7 +9,7 @@ module SnfCore
       custom: 3            # Negotiated rates for specific cases
     }
 
-    validates :account_number, presence: true, uniqueness: {case_sensitive: true}
+    validates :account_number, presence: true, uniqueness: { case_sensitive: true }
     validates :cbs_account_number, presence: true, uniqueness: true
     validates :balance, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :interest_rate, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1 }
@@ -17,7 +17,7 @@ module SnfCore
     validates :branch_code, presence: true, length: { is: 3 }
     validates :product_scheme, presence: true, length: { is: 1 }
     validates :voucher_type, presence: true, length: { is: 1 }
-    validates :active, presence:true, inclusion: { in: [true, false] }
+    validates :active, presence: true, inclusion: { in: [ true, false ] }
 
     before_validation :generate_account_number, on: :create
     validate :validate_interest_free_rate
@@ -26,7 +26,7 @@ module SnfCore
 
     def validate_interest_free_rate
       if interest_free? && !interest_rate.zero?
-        errors.add(:interest_rate, 'must be 0 for interest-free accounts')
+        errors.add(:interest_rate, "must be 0 for interest-free accounts")
       end
     end
 
@@ -34,7 +34,7 @@ module SnfCore
       return if account_number.present?
 
       last_seq = self.class.maximum(:account_number).to_s[-6..-1].to_i
-      seq = (last_seq + 1).to_s.rjust(6, '0')
+      seq = (last_seq + 1).to_s.rjust(6, "0")
       self.account_number = "#{branch_code}#{product_scheme}#{voucher_type}#{seq}"
     end
   end

data/app/models/snf_core/virtual_account_transaction.rb

@@ -1,7 +1,7 @@
 module SnfCore
   class VirtualAccountTransaction < ApplicationRecord
-    belongs_to :from_account, class_name: 'SnfCore::VirtualAccount', optional: true
-    belongs_to :to_account, class_name: 'SnfCore::VirtualAccount', optional: true
+    belongs_to :from_account, class_name: "SnfCore::VirtualAccount", optional: true
+    belongs_to :to_account, class_name: "SnfCore::VirtualAccount", optional: true
 
     enum :transaction_type, {
       transfer: 0,
@@ -30,18 +30,18 @@ module SnfCore
       return unless from_account
       return if from_account.balance >= amount
 
-      errors.add(:amount, 'Insufficient balance')
+      errors.add(:amount, "Insufficient balance")
     end
 
     def validate_accounts
       case transaction_type.to_s
-      when 'transfer'
-        errors.add(:base, 'Transfer requires both from and to accounts') unless from_account && to_account
-        errors.add(:base, 'Cannot transfer to same account') if from_account == to_account
-      when 'deposit'
-        errors.add(:base, 'Deposit requires to_account') unless to_account
-      when 'withdrawal'
-        errors.add(:base, 'Withdrawal requires from_account') unless from_account
+      when "transfer"
+        errors.add(:base, "Transfer requires both from and to accounts") unless from_account && to_account
+        errors.add(:base, "Cannot transfer to same account") if from_account == to_account
+      when "deposit"
+        errors.add(:base, "Deposit requires to_account") unless to_account
+      when "withdrawal"
+        errors.add(:base, "Withdrawal requires from_account") unless from_account
       end
     end
 

data/config/routes.rb

@@ -1,7 +1,4 @@
 SnfCore::Engine.routes.draw do
   post "auth/login"
-  post "auth/reset_password_request"
-  post "auth/reset_password"
-  post "auth/change_password"
   post "auth/signup"
 end

data/db/migrate/20250310122954_create_snf_core_virtual_accounts.rb

@@ -16,7 +16,7 @@ class CreateSnfCoreVirtualAccounts < ActiveRecord::Migration[8.0]
 
       t.index :account_number, unique: true
       t.index :cbs_account_number, unique: true
-      t.index [:branch_code, :product_scheme, :voucher_type]
+      t.index [ :branch_code, :product_scheme, :voucher_type ]
     end
   end
 end

data/db/migrate/20250310143604_create_snf_core_item_requests.rb

@@ -1,12 +1,12 @@
 class CreateSnfCoreItemRequests < ActiveRecord::Migration[8.0]
   def change
     create_table :snf_core_item_requests do |t|
-      t.references :user, null: false, foreign_key: { to_table: :snf_core_users}
-      t.references :product, null: false, foreign_key: {to_table: :snf_core_products}
-      t.integer :quantity, null:false
-      t.date :requested_delivery_date, null:false
+      t.references :user, null: false, foreign_key: { to_table: :snf_core_users }
+      t.references :product, null: false, foreign_key: { to_table: :snf_core_products }
+      t.integer :quantity, null: false
+      t.date :requested_delivery_date, null: false
       t.text :notes
-      t.integer :status, null:false, default: 0
+      t.integer :status, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/20250312043359_create_snf_core_quotations.rb

@@ -0,0 +1,14 @@
+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.date :delivery_date, null: false
+      t.datetime :valid_until, null: false
+      t.integer :status, null: false, default: 0
+      t.text :notes
+
+      t.timestamps
+    end
+  end
+end

data/lib/snf_core/version.rb

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

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_03_11_000000) do
+ActiveRecord::Schema[8.0].define(version: 2025_03_12_043359) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -192,6 +192,18 @@ ActiveRecord::Schema[8.0].define(version: 2025_03_11_000000) do
     t.index ["category_id"], name: "index_snf_core_products_on_category_id"
   end
 
+  create_table "snf_core_quotations", force: :cascade do |t|
+    t.bigint "item_request_id", null: false
+    t.decimal "price", null: false
+    t.date "delivery_date", null: false
+    t.datetime "valid_until", null: false
+    t.integer "status", default: 0, null: false
+    t.text "notes"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["item_request_id"], name: "index_snf_core_quotations_on_item_request_id"
+  end
+
   create_table "snf_core_roles", force: :cascade do |t|
     t.string "name", null: false
     t.datetime "created_at", null: false
@@ -317,6 +329,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_03_11_000000) do
   add_foreign_key "snf_core_orders", "snf_core_stores", column: "store_id"
   add_foreign_key "snf_core_orders", "snf_core_users", column: "user_id"
   add_foreign_key "snf_core_products", "snf_core_categories", column: "category_id"
+  add_foreign_key "snf_core_quotations", "snf_core_item_requests", column: "item_request_id"
   add_foreign_key "snf_core_store_inventories", "snf_core_products", column: "product_id"
   add_foreign_key "snf_core_store_inventories", "snf_core_stores", column: "store_id"
   add_foreign_key "snf_core_stores", "snf_core_addresses", column: "address_id"