comee_core 0.1.43 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4614aa569251964bb6f680e1aaaf6cba4f2ce8a64f45d54751e18ad62378b871
-  data.tar.gz: 0f8f41bf2828f2292ee6e65906bb47c8888ebae8ed79e8e978bd7e6cdc432878
+  metadata.gz: f696cebf98304e61d0188deac70ea559b73e9d55cf256486cfeb0526f4f6c305
+  data.tar.gz: 2c044422308efb79ff83835533d663d18aa9e23b3245a4ac063dc65ddc5332c0
 SHA512:
-  metadata.gz: 743afdd1aac35780b96ace42f00eb9cf14fd29cfb4cff61412121288846f8574ce1f7c61b955038b0cb6a31a900267e90bb29d11cf880403d107bca0d45e06ba
-  data.tar.gz: 1d3d427ef671fa0cf13bdb50424c6f4bd93edbc2822090dcc0dcb428e710a84547a14e5231815f892b05b2aa2886446053dd455ff5a36a11d3842488b41e8f6e
+  metadata.gz: 89872d2c3e16b303abf9fd3d559b12db2f8f8e62ac592fba18ce61b3b4653f13ec676e03c664116e351f7ae73181ac4bd30811640f706e1f3bdec5f6e32b5b11
+  data.tar.gz: 547c0a49ecaa14fef846ef42e8d18cb282c4b821d06dd0f6e64bb221a505b16f04cd6d0b49181dc23efe67c494192afe7e37952696191a8e8b1eea3a22bc5a3e

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

@@ -10,10 +10,17 @@ module Comee
         end
       end
 
+      def show
+        super do
+          product = Comee::Core::Product.with_attached_images.find(params[:id])
+          product
+        end
+      end
+
       private
 
       def model_params
-        params.required(:payload).permit(:code, :name, :description, :parent_id)
+        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, images: [])
       end
     end
   end

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

@@ -1,9 +1,12 @@
 module Comee
   module Core
     class Product < ApplicationRecord
-      has_ancestry
       after_save :update_parent, if: proc { |product| product.parent && product.parent.leaf? }
 
+      has_ancestry
+      has_one_attached :thumbnail_image
+      has_many_attached :images
+
       validates :code, presence: true, uniqueness: true
       validates :name, presence: true
 
@@ -14,6 +17,14 @@ module Comee
         obj.leaf = false
         obj.save!
       end
+
+      def thumbnail_image_url
+        thumbnail_image.attached? ? Rails.application.routes.url_helpers.rails_blob_url(thumbnail_image, only_path: false) : nil
+      end
+
+      def images_url
+        images.attached? ? images.map { |image| Rails.application.routes.url_helpers.rails_blob_url(image, only_path: false) } : []
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ProductSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :description
+      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url
     end
   end
 end

data/app/services/comee/core/customer_order_service.rb

@@ -33,8 +33,13 @@ module Comee
         order = CustomerOrder.find_by(id: id)
         raise(StandardError, "Customer order with id `#{id}` not found.") unless order
 
-        unless CustomerOrder.statuses[order.status] == CustomerOrder.statuses[:submitted]
-          raise(StandardError, "Customer order should be in submitted state.")
+        if CustomerOrder.statuses[order.status] == CustomerOrder.statuses[:accepted]
+          raise(StandardError, "Customer order is already in accepted state.")
+        end
+
+        allowed_statuses = [CustomerOrder.statuses[:submitted], CustomerOrder.statuses[:awaiting_confirmation]]
+        unless allowed_statuses.include?(CustomerOrder.statuses[order.status])
+          raise(StandardError, "Customer order should be in submitted or awaiting confirmation state.")
         end
 
         raise(StandardError, "Customer order does not have any items.") if order.customer_order_items.count.zero?

data/config/routes.rb

@@ -42,16 +42,6 @@ Comee::Core::Engine.routes.draw do
       post "cancel"
     end
   end
-  resources :customer_orders, only: [] do
-    member do
-      get "order", controller: :customer_orders, action: :order
-      patch "cancel", controller: :customer_orders, action: :cancel
-      patch "seek_confirmation", controller: :customer_orders, action: :seek_confirmation
-      patch "submit", controller: :customer_orders, action: :submit
-      patch "accept", controller: :customer_orders, action: :accept
-      patch "bulk_cancel_items", controller: :customer_orders, action: :bulk_cancel_items
-    end
-  end
   resources :currencies
   resources :units
   resources :users

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.43".freeze
+    VERSION = "0.1.44".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.44
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement