comee_core 0.1.86 → 0.1.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65b99689edf889ecb6989545c88f1260ccecdea8f645fc1978fbebc945a8290
-  data.tar.gz: 418de27bfd37fe7a5021aa4984083254e1b74298b665b9d0e43438fb321b0c95
+  metadata.gz: 01c398f40ebb3c1eacff4a3566d4707168d4e121b95442e0f59361c2e5a6520a
+  data.tar.gz: 3059c69cb31e958457aadaf294cf2f9925862d08890633e0d9451240c221614d
 SHA512:
-  metadata.gz: 9500aada926628c911f6d385620e1d65f609e8ef84f1d85aa3797a5e4272d90cc37da473a865d85c235ab3b3215829b75930e20efb471425363a4dfe057cf226
-  data.tar.gz: 10ccb38fd0821b0f9e56c94b27dfef547845593d33d23a8e19fe23cb691341e23c638d6b65cfe9c2185b7b592a4e2877b5c12469725af398ae102f183c503110
+  metadata.gz: fab7383b8a87484ea330c21efe291089625d6c1cf4271200bfff9451e0ab29d8d041332f31575ac2bfa92bb387df97bbf4e6f1512203f8c4ac3f4afb36b89f85
+  data.tar.gz: 613a9df5c11b6f9ad4fae560d8e87fbe9bbc01ff2397741cd79c061235fc060d9571c46a8b78df3b0d613c79d77dfb0ff7b1ab0bac3494086ffb87c9353519c1

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

@@ -21,11 +21,7 @@ module Comee
         else
           data = @clazz.all
         end
-        # data, options = if block_given?
-        #                   yield
-        #                 else
-        #                   [@clazz.all, {}]
-        #                 end
+
         page = params[:page]
         if page
           render json: {success: true, data: serialize(data, options), page: page, total: @clazz.count}

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class PickupSchedule < ApplicationRecord
+      enum :status, {draft: 0, confirmed: 1}
+
+      belongs_to :pod
+      belongs_to :time_slot
+      validates :status, presence: true
+    end
+  end
+end

data/app/models/comee/core/{proof_of_delivery.rb → pod.rb}

@@ -1,6 +1,6 @@
 module Comee
   module Core
-    class ProofOfDelivery < ApplicationRecord
+    class Pod < ApplicationRecord
       enum :status, {draft: 0, confirmed: 1, signed: 2}
 
       validates :reference_no, :status, presence: true

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

@@ -4,6 +4,7 @@ module Comee
       belongs_to :shipment_instruction
       belongs_to :shipment_item
       belongs_to :unit
+      belongs_to :pod, optional: true
 
       validates :delivery_note_no, :pallet_no, :goods_issue_date, presence: true
       validates :length, :width, :height, :weight, :quantity, :price, presence: true, numericality: {greater_than: 0}

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

@@ -1,8 +1,16 @@
 module Comee
   module Core
     class TransportAvailability < ApplicationRecord
+      before_save :compute_weekday
+
+      has_many :time_slots
+
       validates :availability_date, presence: true, uniqueness: true
-      validates :weekday, :weekday_short, presence: true
+
+      def compute_weekday
+        self.weekday = availability_date.strftime("%A")
+        self.weekday_short = availability_date.strftime("%a")
+      end
     end
   end
 end

data/db/migrate/20240103074619_create_comee_core_pods.rb

@@ -0,0 +1,10 @@
+class CreateComeeCorePods < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_pods do |t|
+      t.string :reference_no, null: false
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20240104143246_create_comee_core_shipment_instruction_items.rb

@@ -22,6 +22,10 @@ class CreateComeeCoreShipmentInstructionItems < ActiveRecord::Migration[7.1]
                    index: {name: "unit_on_ccsii_indx"},
                    foreign_key: {to_table: :comee_core_units}
       t.float :price, null: false
+      t.references :pod,
+                   null: true,
+                   index: {name: "pod_on_ccsii_indx"},
+                   foreign_key: {to_table: :comee_core_pods}
 
       t.timestamps
     end

data/db/migrate/20240111112140_create_comee_core_pickup_schedules.rb

@@ -0,0 +1,20 @@
+class CreateComeeCorePickupSchedules < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_pickup_schedules do |t|
+      t.references :pod,
+                   null: false,
+                   index: {name: "pod_on_ccps_indx"},
+                   foreign_key: {to_table: :comee_core_pods}
+      t.references :time_slot,
+                   null: false,
+                   index: {name: "ts_on_ccps_indx"},
+                   foreign_key: {to_table: :comee_core_time_slots}
+      t.integer :status, null: false, default: 0
+      t.string :truck_no
+      t.string :driver_license_no
+      t.string :plate_no
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.86".freeze
+    VERSION = "0.1.88".freeze
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :pickup_schedule, class: "Comee::Core::PickupSchedule" do
+    pod
+    time_slot
+    status { Comee::Core::PickupSchedule.statuses[:draft] }
+    truck_no { Faker::Alphanumeric.alpha(number: 10) }
+    driver_license_no { Faker::Alphanumeric.alpha(number: 10) }
+    plate_no { Faker::Alphanumeric.alpha(number: 10) }
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :pod, class: "Comee::Core::Pod" do
+    reference_no { Faker::Alphanumeric.alpha(number: 10) }
+    status { Comee::Core::Pod.statuses[:draft] }
+  end
+end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :shipment_instruction_item, class: "Comee::Core::ShipmentInstructionItem" do
     shipment_instruction
     shipment_item
+    pod { nil }
     delivery_note_no { Faker::Alphanumeric.alpha(number: 10) }
     pallet_no { Faker::Alphanumeric.alpha(number: 10) }
     goods_issue_date { Date.current.advance(days: 3) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.86
+  version: 0.1.88
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -331,10 +331,11 @@ files:
 - app/models/comee/core/master_price.rb
 - app/models/comee/core/notification.rb
 - app/models/comee/core/order_source.rb
+- app/models/comee/core/pickup_schedule.rb
+- app/models/comee/core/pod.rb
 - app/models/comee/core/price.rb
 - app/models/comee/core/product.rb
 - app/models/comee/core/product_lookup.rb
-- app/models/comee/core/proof_of_delivery.rb
 - app/models/comee/core/purchase_order.rb
 - app/models/comee/core/purchase_order_item.rb
 - app/models/comee/core/quotation_request.rb
@@ -428,11 +429,12 @@ files:
 - db/migrate/20231206082503_create_comee_core_unit_conversions.rb
 - db/migrate/20231207153420_create_comee_core_shipment_items.rb
 - db/migrate/20231207235542_create_comee_core_item_statuses.rb
+- db/migrate/20240103074619_create_comee_core_pods.rb
 - db/migrate/20240104131607_create_comee_core_shipment_instructions.rb
 - db/migrate/20240104143246_create_comee_core_shipment_instruction_items.rb
 - db/migrate/20240109185749_create_comee_core_transport_availability.rb
 - db/migrate/20240109185931_create_comee_core_time_slots.rb
-- db/migrate/20240110074619_create_comee_core_proof_of_deliveries.rb
+- db/migrate/20240111112140_create_comee_core_pickup_schedules.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -458,9 +460,10 @@ files:
 - spec/factories/comee/core/master_prices.rb
 - spec/factories/comee/core/notifications.rb
 - spec/factories/comee/core/order_sources.rb
+- spec/factories/comee/core/pickup_schedules.rb
+- spec/factories/comee/core/pods.rb
 - spec/factories/comee/core/product_lookups.rb
 - spec/factories/comee/core/products.rb
-- spec/factories/comee/core/proof_of_deliveries.rb
 - spec/factories/comee/core/purchase_order_items.rb
 - spec/factories/comee/core/purchase_orders.rb
 - spec/factories/comee/core/quotation_request_items.rb

data/db/migrate/20240110074619_create_comee_core_proof_of_deliveries.rb

@@ -1,13 +0,0 @@
-class CreateComeeCoreProofOfDeliveries < ActiveRecord::Migration[7.1]
-  def change
-    create_table :comee_core_proof_of_deliveries do |t|
-      t.string :reference_no, null: false
-      t.string :status, null: false, default: 0
-      t.string :driver
-      t.string :truck
-      t.string :plate_no
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-FactoryBot.define do
-  factory :proof_of_delivery, class: "Comee::Core::ProofOfDelivery" do
-    reference_no { Faker::Alphanumeric.alpha(number: 10) }
-    status { Comee::Core::ProofOfDelivery.statuses[:draft] }
-    driver { Faker::Name.name }
-    truck { Faker::Alphanumeric.alpha(number: 6) }
-    plate_no { Faker::Alphanumeric.alpha(number: 8) }
-  end
-end