Merge pull request #47 from Purple-Stock/staging

Staging

Author: Pauloparakleto

app/jobs/order_items_job.rb

@@ -0,0 +1,31 @@
+class OrderItemsJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, attempts: 5, wait: :exponentially_longer
+
+  def perform(record)
+    return unless record.items.empty?
+
+    account_id = record.account_id
+    items_attributes = []
+    order = Services::Bling::FindOrder.call(id: record.bling_order_id, order_command: 'find_order', tenant: account_id)
+    raise StandardError if order['error'].present?
+
+    order['data']['itens'].each do |item|
+      items_attributes << {
+        sku: item['codigo'],
+        unity: item['unidade'],
+        quantity: item['quantidade'],
+        discount: item['desconto'],
+        value: item['valor'],
+        ipi_tax: item['aliquotaIPI'],
+        description: item['descricao'],
+        long_description: item['descricaoDetalhada'],
+        product_id: item['produto']['id'],
+        account_id:
+      }
+    end
+
+    record.items.build(items_attributes)
+    record.save!
+  end
+end

app/models/bling_order_item.rb

@@ -33,8 +33,13 @@ class BlingOrderItem < ApplicationRecord
   # TODO, refactor me separating the tables
   # There are features hard to implement without this separation.
 
+  has_many :items, dependent: :destroy
   belongs_to :account, optional: true
 
+  accepts_nested_attributes_for :items
+
+  after_create :synchronize_items
+
   STORE_ID_NAME_KEY_VALUE = {
     '204219105' => 'Shein',
     '203737982' => 'Shopee',
@@ -93,7 +98,6 @@ class Status
     where(store_id: '204061683')
   }
 
-
   scope :date_range, lambda { |initial_date, final_date|
     initial_date = initial_date.try(:to_date).try(:beginning_of_day)
     final_date = final_date.try(:to_date).try(:end_of_day)
@@ -127,4 +131,8 @@ def store_name
   def value
     super || 0.0
   end
+
+  def synchronize_items
+    OrderItemsJob.perform_later(self)
+  end
 end

app/models/item.rb

@@ -0,0 +1,23 @@
+# == Schema Information
+#
+# Table name: items
+#
+#  id                  :bigint           not null, primary key
+#  description         :string
+#  discount            :decimal(, )
+#  ipi_tax             :decimal(, )
+#  long_description    :string
+#  quantity            :integer
+#  sku                 :string
+#  unity               :integer
+#  value               :decimal(, )
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  account_id          :integer
+#  bling_order_item_id :bigint
+#  product_id          :bigint
+#
+class Item < ApplicationRecord
+  belongs_to :account
+  belongs_to :bling_order_item
+end

app/models/stock.rb

@@ -30,7 +30,7 @@ def self.filter_by_total_balance_situation(balance_situation = nil)
   def self.filter_by_status(status_number = nil)
     return all if status_number.blank?
 
-    joins(:product).where(product: { active: status_number })
+    joins(:product).where(products: { active: status_number })
   end
 
   def self.only_positive_price(query = false)

app/views/products/show.html.erb

@@ -1,51 +1,62 @@
-<%- model_class = Product -%>
-<div class="section-header">
-  <div class="page-header">
-    <h1><%= t 'products.two', :default => model_class.model_name.human.titleize %></h1>
-  </div>
-</div>
-
-<div class="section-body">
-  <div class="card">
-    <div class="card-body">
-
-      <dl class="dl-horizontal">
-        <dt><strong><%= model_class.human_attribute_name(:custom_id) %>:</strong></dt>
-        <dd><%= @product.custom_id %></dd>
-        <dt><strong><%= model_class.human_attribute_name(:sku) %>:</strong></dt>
-        <dd><%= @product.sku %></dd>
-        <dt><strong><%= t('products.name') %>:</strong></dt>
-        <dd><%= @product.name %></dd>
-        <dt><strong><%= t('products.price') %>:</strong></dt>
-        <dd><%= @product.price %></dd>
-        <dt><strong><%= t('products.entry') %>:</strong></dt>
-        <dd><%= Services::Product::CountQuantity.call(product: @product, product_command: 'purchase_product') %></dd>
-        <dt><strong><%= t('products.exit') %>:</strong></dt>
-        <dd><%= Services::Product::CountQuantity.call(product: @product, product_command: 'sale_product') %></dd>
-        <dt><strong><%= t('products.balance') %>:</strong></dt>
-        <dd><%= Services::Product::CountQuantity.call(product: @product, product_command: 'balance_product') %></dd>
-        <dt><strong><%= t('products.rq_code') %></strong></dt>
-        <dd><%= image_tag(Services::Product::GenerateQrCode.call(product: @product)) %></dd>
-        <dt><strong><%= t('products.image') %>:</strong></dt>
-        <dd><%= image_tag(@product.image.attached? ? @product.image : "https://purple-stock.s3-sa-east-1.amazonaws.com/images.png", size: "150") %></dd>
-        <dt><strong><%= t('products.highlight') %>:</strong></dt>
-        <dd><%= @product.highlight %></dd>
-        <dt><strong><%= t('products.category') %>:</strong></dt>
-        <dd><%= @product.category.try(:name) %></dd>
-        <dt><strong><%= t('products.active') %>:</strong></dt>
-        <dd><%= @product.active %></dd>
-
-      </dl>
-
-      <%= link_to t('.back', :default => t("helpers.links.back")),
-                  products_path, :class => 'btn btn-default' %>
+<section class="main-content">
+  <div class="row">
+    <div class="col-md-12">
+      <h1 class="display-4"><%= @product.name %></h1>
+      <hr>
+      <table>
+        <!--  What to do with image? <dd class="col-sm-9"><%= image_tag(@product.image.attached? ? @product.image : "https://purple-stock.s3-sa-east-1.amazonaws.com/images.png", size: "150") %></dd> -->
+        <tr class="row">
+          <td><%= image_tag(Services::Product::GenerateQrCode.call(product: @product)) %></td>
+          <td class="mt-md-5">
+            <table>
+              <tr>
+                <th class="col"><%= t('activerecord.attributes.product.custom_id') %></th>
+                <td class="col"><%= @product.custom_id %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('activerecord.attributes.product.sku') %></th>
+                <td class="col"><%= @product.sku %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.price') %></th>
+                <td class="col"><%= @product.price %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.entry') %></th>
+                <td class="col"><%= Services::Product::CountQuantity.call(product: @product, product_command: 'purchase_product') %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.exit') %></th>
+                <td class="col"><%= Services::Product::CountQuantity.call(product: @product, product_command: 'sale_product') %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.balance') %></th>
+                <td class="col"><%= Services::Product::CountQuantity.call(product: @product, product_command: 'balance_product') %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.highlight') %></th>
+                <td class="col"><%= @product.highlight %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.category') %></th>
+                <td class="col"><%= @product.category.try(:name) %></td>
+              </tr>
+              <tr>
+                <th class="col"><%= t('products.active') %>:</th>
+                <td class="col"><%= @product.active %></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+      <%= link_to t('helpers.links.back'), products_path, class: 'btn btn-primary btn-lg' %>
       <%= link_to t('.edit', :default => t("helpers.links.edit")),
-                  edit_product_path(@product), :class => 'btn btn-default' %>
+                  edit_product_path(@product), :class => 'btn btn-dark btn-lg' %>
       <%= link_to t('.destroy', :default => t("helpers.links.destroy")),
-                  product_path(@product), 
-                  title: t('destroy'), class: 'btn btn-danger', 
-                  method: :delete, 
+                  product_path(@product),
+                  title: t('destroy'), class: 'btn btn-danger btn-lg',
+                  method: :delete,
                   data: { toggle: 'tooltip', turbo: true, turbo_method: :delete, turbo_confirm: t('confirm') } %>
     </div>
   </div>
-</div>
+</section>

config/environments/development.rb

@@ -73,7 +73,7 @@
   # config.action_cable.disable_request_forgery_protection = true
   config.good_job.smaller_number_is_higher_priority = true
 
-  config.good_job.enable_cron = false
+  config.good_job.enable_cron = ENV['ENABLE_CRON'] || false
   config.good_job.cron = {
     product_sync_job: {
       cron: "*/10 * * * *",

config/environments/staging.rb

@@ -63,7 +63,6 @@
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "awesome_rails_production"
-  config.active_job.queue_adapter = :async
   # config.action_controller.asset_host = ENV['CLOUDFRONT_URL']
   config.cache_store = :redis_cache_store, { url: ENV['REDISCLOUD_URL'] }
 
@@ -96,7 +95,10 @@
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
-  config.good_job.enable_cron = false
+  config.good_job.smaller_number_is_higher_priority = true
+  config.good_job.execution_mode = :async
+
+  config.good_job.enable_cron = ENV['ENABLE_CRON'] || false
   config.good_job.cron = {
     product_sync_job: {
       cron: "*/10 * * * *",
@@ -119,7 +121,7 @@
       class: "PendingOrderItemsJob",
       args: [1, { dataInicial: (Date.today - 3.weeks).strftime, dataFinal: Date.today.strftime }],
       set: { priority: 1 },
-      description: "Create Order Items with pending status from current week"
+      description: "Create Order Items with pending status considering 3 week ago"
     },
 
     general_pending_order_items_task: {
@@ -145,6 +147,7 @@
                                      set: { priority: 1 }, # additional Active Job properties; can also be a lambda/proc e.g. `-> { { priority: [1,2].sample } }`
                                      description: "Create Order Items statuses are checked and verified" # optional description that appears in Dashboard
     },
+
     general_canceled_order_items_task: { # each recurring job must have a unique key
                                          cron: "@monthly", # cron-style scheduling format by fugit gem
                                          class: "CanceledBlingOrderItemsJob", # name of the job class as a String; must reference an Active Job job class
@@ -174,7 +177,7 @@
       class: "CheckedBlingOrderItemsJob",
       args: [1],
       set: { priority: 3 },
-      description: "Create Order Items statuses are checked"
+      description: "Create Order Items whose statuses are checked"
     },
 
     frequent_checked_order_items_task: {

config/locales/pt-BR.models.products.yml

@@ -23,6 +23,7 @@ pt-BR:
         bling:
           true: Sim
           false: Não
+        custom_id: ID do Cliente
 
   products:
     one: Produto

db/migrate/20240103204520_create_items.rb

@@ -0,0 +1,19 @@
+class CreateItems < ActiveRecord::Migration[7.0]
+  def change
+    create_table :items do |t|
+      t.string :sku
+      t.integer :unity
+      t.integer :quantity
+      t.decimal :discount
+      t.decimal :value
+      t.decimal :ipi_tax
+      t.string :description
+      t.string :long_description
+      t.bigint :product_id
+      t.integer :account_id
+      t.bigint :bling_order_item_id
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_12_21_234141) do
+ActiveRecord::Schema[7.0].define(version: 2024_01_03_204520) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -211,6 +211,22 @@
     t.integer "months", default: 1
   end
 
+  create_table "items", force: :cascade do |t|
+    t.string "sku"
+    t.integer "unity"
+    t.integer "quantity"
+    t.decimal "discount"
+    t.decimal "value"
+    t.decimal "ipi_tax"
+    t.string "description"
+    t.string "long_description"
+    t.bigint "product_id"
+    t.integer "account_id"
+    t.bigint "bling_order_item_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "post_data", force: :cascade do |t|
     t.string "client_name"
     t.string "cep"

spec/factories/items.rb

@@ -0,0 +1,33 @@
+# == Schema Information
+#
+# Table name: items
+#
+#  id                  :bigint           not null, primary key
+#  description         :string
+#  discount            :decimal(, )
+#  ipi_tax             :decimal(, )
+#  long_description    :string
+#  quantity            :integer
+#  sku                 :string
+#  unity               :integer
+#  value               :decimal(, )
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  account_id          :integer
+#  bling_order_item_id :bigint
+#  product_id          :bigint
+#
+FactoryBot.define do
+  factory :item do
+    sku { "MyString" }
+    unity { 1 }
+    quantity { 1 }
+    discount { "9.99" }
+    value { "9.99" }
+    ipi_tax { "9.99" }
+    description { "MyString" }
+    long_description { "MyString" }
+    product_id { 1 }
+    account_id { 1 }
+  end
+end

spec/jobs/bling_order_item_creator_job_spec.rb

@@ -7,6 +7,7 @@
 
   describe '#perform_now' do
     before do
+      allow_any_instance_of(BlingOrderItem).to receive(:synchronize_items).and_return(true)
       FactoryBot.create(:bling_datum, account_id: user.account.id, expires_at: Time.now + 2.day)
       allow(subject).to receive(:list_status_situation).and_return([15])
     end

spec/jobs/canceled_bling_order_item_job_spec.rb

@@ -7,6 +7,7 @@
 
   describe '#perform_now' do
     before do
+      allow_any_instance_of(BlingOrderItem).to receive(:synchronize_items).and_return(true)
       FactoryBot.create(:bling_datum, account_id: user.account.id, expires_at: Time.now + 2.day)
     end
 

spec/jobs/checked_bling_order_items_job_spec.rb

@@ -8,6 +8,7 @@
 
   describe '#perform' do
     before do
+      allow_any_instance_of(BlingOrderItem).to receive(:synchronize_items).and_return(true)
       allow(Date).to receive(:today).and_return Date.new(2023, 11, 15)
       FactoryBot.create(:bling_datum, account_id: user.account.id, expires_at: Time.zone.now + 2.days)
     end

spec/jobs/current_done_bling_order_item_job_spec.rb

@@ -7,6 +7,7 @@
 
   describe '#perform_now' do
     before do
+      allow_any_instance_of(BlingOrderItem).to receive(:synchronize_items).and_return(true)
       allow(Date).to receive(:today).and_return Date.new(2023, 11, 9)
       FactoryBot.create(:bling_datum, account_id: user.account.id, expires_at: Time.now + 2.day)
     end

spec/jobs/daily_canceled_order_job_spec.rb

@@ -11,6 +11,7 @@
 
   describe '#perform' do
     before do
+      allow_any_instance_of(BlingOrderItem).to receive(:synchronize_items).and_return(true)
       allow(Date).to receive(:today).and_return Date.new(2023, 12, 14)
       FactoryBot.create(:bling_datum, account_id: user.account.id, expires_at: Time.zone.now + 2.days)
       FactoryBot.create(:bling_order_item, bling_order_id:, date:, situation_id:)