comee_core 0.1.28 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4584d0f6f728f6ab957e59500e8a8af4564e0922558df83cb7562e9d9b094603
-  data.tar.gz: 5404312320bbcf4d482e5261a6c960dc1418d1e9051c1cfa810419cd872fef7b
+  metadata.gz: db5eb1e3ada88d6d43262f34c3524023af78b0488327494cb104896c513567b6
+  data.tar.gz: 62809e1252a790952c9940267c0337150f5b70dc485adb697e0d21fc2087939b
 SHA512:
-  metadata.gz: 86745d97fac73d6fc66de542291014f4c1b6b57fb61bac5c8c31f523b7be03728b3109fad94750100ad40c6cbdca0305e448baaa5d399c52208ddb14ff2921a0
-  data.tar.gz: d4013f260e88c21628dc3eb1434718e949f3132e77b77d1daa58554fe6f33339da882772c43e6f6efc45d5d07230b0255b08b4fffa96cf7a91a179b0f6f6ab9c
+  metadata.gz: 10d651c16317a4daa58d15f6cc2acd6f239c23da54c6776ffb202682352b36b287f814bd1c9c469ceaffb3890041e072c63dbd84b45e71f9f652a05526f00c00
+  data.tar.gz: b5b2c66426c595d3d710beeac3a4d72f81152c0f20578525ba2c7c9281f07fbe6623df956cff56d9cb4052d59eafff5f1eeaa22a3196b45cadf531289a7d5f06

data/app/controllers/comee/core/application_controller.rb

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class ApplicationController < ActionController::API
+      include Comee::Core::Pagination
+
       before_action :authenticate
 
       def current_user

data/app/controllers/comee/core/client_prices_controller.rb

@@ -3,6 +3,13 @@ module Comee
     class ClientPricesController < ApplicationController
       include Comee::Core::Common
 
+      def index
+        super do
+          client_prices = Comee::Core::ClientPrice.all
+          client_prices.then(&paginate)
+        end
+      end
+
       def filter
         @client_prices = Comee::Core::ClientPrice.ransack(params[:q]).result
         render json: {success: true, data: serialize(@client_prices)}

data/app/controllers/concerns/comee/core/pagination.rb

@@ -0,0 +1,35 @@
+module Comee
+  module Core
+    module Pagination
+      extend ActiveSupport::Concern
+
+      def default_per_page
+        25
+      end
+
+      def page_no
+        params[:page]&.to_i || 1
+      end
+
+      def per_page
+        params[:per_page]&.to_i || default_per_page
+      end
+
+      def paginate_offset
+        (page_no - 1) * per_page
+      end
+
+      def order_by
+        params.fetch(:order_by, :id)
+      end
+
+      def order_direction
+        params.fetch(:order_direction, :asc)
+      end
+
+      def paginate
+        ->(it) { it.limit(per_page).offset(paginate_offset).order("#{order_by}": order_direction) }
+      end
+    end
+  end
+end

data/app/models/comee/core/back_order_item.rb

@@ -6,7 +6,7 @@ module Comee
       belongs_to :back_order
       belongs_to :product
 
-      validates :item_status, :from, :to, presence: true
+      validates :item_status, :from, :to, :delivery_date, presence: true
       validates :requested_quantity, :requested_unit_price, :supplier_quantity, :supplier_unit_price,
                 presence: true, numericality: {greater_than: 0}
 

data/app/models/comee/core/master_price.rb

@@ -14,8 +14,11 @@ module Comee
       def validate_primary_price
         return unless product && primary
 
-        count = MasterPrice.where(product: product, primary: true, active: true).count
-        errors.add(:base, "There is already a primary supplier for item '#{product.code}'") if count.positive?
+        count = MasterPrice.where(product: product, primary: true, status: MasterPrice.statuses[:current]).count
+        return unless count.positive? && primary && MasterPrice.statuses[status] == MasterPrice.statuses[:current]
+
+        errors.add(:base,
+                   "There is already a primary supplier for item '#{product.code}'")
       end
 
       def validate_purchase_price_validity_dates

data/db/migrate/20230728125723_create_comee_core_back_order_items.rb

@@ -15,6 +15,7 @@ class CreateComeeCoreBackOrderItems < ActiveRecord::Migration[7.0]
       t.float :supplier_unit_price, null: false
       t.date :from, null: false
       t.date :to, null: false
+      t.date :delivery_date, null: false
       t.integer :item_status, null: false, default: 0
       t.string :remark
 

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.28".freeze
+    VERSION = "0.1.30".freeze
   end
 end

data/spec/factories/comee/core/back_order_items.rb

@@ -6,6 +6,7 @@ FactoryBot.define do
     requested_unit_price { 50 }
     supplier_quantity { 5 }
     supplier_unit_price { 55 }
+    delivery_date { Date.current.advance(days: 6) }
     from { Date.current }
     to { Date.current.advance(months: 1) }
     item_status { Comee::Core::BackOrderItem.item_statuses[:available] }

data/spec/factories/comee/core/clients.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :client, class: "Comee::Core::Client" do
     user
-    code { Faker::Alphanumeric.alpha(number: 8) }
+    code { Faker::Alphanumeric.unique.alpha(number: 8) }
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.30
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-28 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +257,7 @@ files:
 - app/controllers/comee/core/units_controller.rb
 - app/controllers/comee/core/users_controller.rb
 - app/controllers/concerns/comee/core/common.rb
+- app/controllers/concerns/comee/core/pagination.rb
 - app/jobs/comee_core/application_job.rb
 - app/mailers/comee/core/application_mailer.rb
 - app/mailers/comee/core/supplier_mailer.rb