comee_core 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b8f42b3900f864a1225399177186948e42ae9e67c48fe9b3248eb45675ad71
-  data.tar.gz: c487c5e62ef7c83ba1442773f7a19dae1a32fb40fe966e41bcce7b21c7eb80ca
+  metadata.gz: 89be0ab79ac6789639448aaafa19ca5845e08e132d0d99c34eef619b97ece546
+  data.tar.gz: f62cdbb0af85b33c2322d17d9289cdd12c2021cd28b1fa06332cc63c39847a01
 SHA512:
-  metadata.gz: a7079cd5b10f8b9cf68fd7ba3c764f875fd09fc827b1f67b006f91dc52b78bee029616a335664becb6f30c1b9305cf9660fafcf5e3dc493b59175f666034b539
-  data.tar.gz: 48ab1f0e3bb54c08830e73f3ce76e472f85afe5f2683d967b8c726197083b7c9a3856faedcdca5ed65edf9fa98dade94b5e78ee355e003811b1062bac5f736c4
+  metadata.gz: 5fca168ac18ac7ceef8614bdb8792f4395e21107cb62adfc9b9ac1d7b4301f8b418e3bdb5968f9b8fd4c4ebcebaf3517cb13fcda854ef1c36bb059943ac42b59
+  data.tar.gz: 6369177eb65524a12f58c1f2469b9fc3114a587edc0bdc7b6b64dc98e1655433910325fa4d3864fce8f861dbb866694f3079171e91f18d9a5d48c9d1c01a9e16

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

@@ -3,6 +3,13 @@ module Comee
     class ProductsController < ApplicationController
       include Common
 
+      def index
+        super do
+          products = Comee::Core::Product.all
+          products.then(&paginate)
+        end
+      end
+
       private
 
       def model_params

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

@@ -9,6 +9,7 @@ module Comee
       validates :product_id, uniqueness: {scope: %i[supplier_id previous_price_id]}
       validate :validate_primary_price
 
+      scope :current_primary, -> { where(primary: true).current }
       scope :unapplied, -> { where(propagated_to_client: false).current_primary }
 
       def validate_primary_price
@@ -20,38 +21,6 @@ module Comee
         errors.add(:base, "There is already a primary price entry for item '#{product.code}'")
       end
 
-      # def update_price(new_price, from, to, margin = nil)
-      #   raise(StandardError, "Future prices cannot be updated.") if Price.statuses[status] == Price.statuses[:future]
-
-      #   margin ||= self.margin
-      #   raise(StandardError, "No changes detected. Update failed!") if purchase_price == new_price && self.margin == margin
-
-      #   period = Period.new(from, to)
-      #   raise(StandardError, "Validity date range is not correct.") unless period.valid?
-
-      #   old_period = Period.new(valid_from, valid_to)
-      #   new_period = Period.compute_next_valid_period(old_period, period)
-      #   raise(StandardError, "No valid validity period could be computed for the given validity date range.") unless new_period
-
-      #   price = dup
-      #   price.assign_attributes(
-      #     purchase_price: new_price,
-      #     valid_from: new_period.start,
-      #     valid_to: new_period.finish,
-      #     margin: margin,
-      #     previous_price: self,
-      #     selling_price: (new_price * (1 + margin / 100.0)).round(2)
-      #   )
-
-      #   ActiveRecord::Base.transaction do
-      #     price.previous_price.save!
-      #     price.save!
-      #   end
-      #   price
-      # rescue StandardError
-      #   raise
-      # end
-
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           valid_from

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

@@ -4,11 +4,10 @@ module Comee
       self.abstract_class = true
       before_save :compute_status
 
-      enum :status, {old: 0, current: 1, future: 2}
+      enum :status, {past: 0, current: 1, future: 2}
 
       scope :current, -> { where(status: Price.statuses[:current]) }
       scope :future, -> { where(status: Price.statuses[:future]) }
-      scope :current_primary, -> { where(primary: true).current }
 
       belongs_to :product
       belongs_to :unit
@@ -25,8 +24,8 @@ module Comee
 
       def compute_status
         period = Period.new(valid_from, valid_to)
-        if period.old?
-          self.status = Price.statuses[:old]
+        if period.past?
+          self.status = Price.statuses[:past]
         elsif period.current?
           self.status = Price.statuses[:current]
         elsif period.future?

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class User < ApplicationRecord
-      enum :user_type, {supplier: 0, admin: 1}
+      enum :user_type, {supplier: 0, admin: 1, client: 2, worker: 3}
 
       has_secure_password
       has_many :notifications, as: :recipient, dependent: :destroy

data/app/serializers/comee/core/supplier_serializer.rb

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class SupplierSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale
+      attributes :id, :code, :name, :address, :locale, :user_id
     end
   end
 end

data/app/utils/comee/core/period.rb

@@ -24,16 +24,16 @@ module Comee
         finish > start
       end
 
-      def current?
+      def past?
         raise(StandardError, "Period must be valid.") unless valid?
 
-        start <= Date.current && finish > Date.current
+        finish < Date.current
       end
 
-      def old?
+      def current?
         raise(StandardError, "Period must be valid.") unless valid?
 
-        finish < Date.current
+        start <= Date.current && finish > Date.current
       end
 
       def future?

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.32".freeze
+    VERSION = "0.1.33".freeze
   end
 end

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

@@ -9,5 +9,15 @@ FactoryBot.define do
     unit
     discount { 0 }
     previous_price { nil }
+
+    trait :past do
+      valid_from { Date.current.advance(months: -2) }
+      valid_to { Date.current.advance(months: -1) }
+    end
+
+    trait :future do
+      valid_from { Date.current.advance(months: 1) }
+      valid_to { Date.current.advance(months: 2) }
+    end
   end
 end

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

@@ -12,7 +12,7 @@ FactoryBot.define do
     previous_price { nil }
     propagated_to_client { false }
 
-    trait :old do
+    trait :past do
       valid_from { Date.current.advance(months: -2) }
       valid_to { Date.current.advance(months: -1) }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers