dorsale 3.16.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c07aa163d58442697fc7cbbd50008cff4128218f6c28a567ec693fa028112a8
-  data.tar.gz: 137b46a639e3e82c637e001e6bcdf06e307f357fd07c4bc69fbcce69e7600bf5
+  metadata.gz: edb8363b4a987b737cfba9c432a65fd5c64fbb72690c51f6ea5da99c195430a6
+  data.tar.gz: 9b88ffbea03b8971f2a853c5dfcbe6387670ec7b69d8601d68ab295ba425364c
 SHA512:
-  metadata.gz: 3cc2d98f933b68bb02d421f3f8ba132fa70d54c910292db9539b3c7e2bd8027692cf4d8e30ba333a0abfe6825bd34fee362a0f5d699c91a542ff7fcf0dac59ce
-  data.tar.gz: 00cc8a3a2a6ac15cdd523871ed2b8ea3ffeb7832006c6b643fe3e0c801aa17579de20e22d525f36a273bcf93fcb13142f0257bda5dcef56b0b5758e40bdccf04
+  metadata.gz: c84800985f5243887825313437907d6a40d2ab5398e7c78de903d404a9c3d5e1d01e6bed9c7cee4fe57f15af26d0aa0c1950ede73946dd3d3f8c14a7ce20a6e1
+  data.tar.gz: 373d7d5e133bcb61443e8defed065177fb6e82fc56bc7424abbb110f3632d51a07a24df569f96d2b336206339a2774d26c206d5b1ff6e6862f6d5b63baa061fb

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next version
 
+## 3.17.0
+- Refactor CV models using stores
+- Fix redirect after task comment create
+- Add missing unique indexes on invoices and quotations
+
 ## 3.16.0
 - Allow to reorder BM lines (require Sorting.js + reimport migrations)
 - Remove unused url.js

data/app/controllers/dorsale/flyboy/task_comments_controller.rb

@@ -19,9 +19,9 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
 
   def back_url
     task_path = flyboy_task_path(@task)
-    back_url  = super
+    back_url  = super.to_s
 
-    if back_url.to_s.start_with?(task_path)
+    if back_url == task_path || back_url.start_with?(task_path + "?")
       back_url
     else
       task_path

data/app/models/dorsale/customer_vault/corporation.rb

@@ -1,6 +1,15 @@
 class Dorsale::CustomerVault::Corporation < Dorsale::CustomerVault::Person
-  serialize      :data,  Dorsale::CustomerVault::CorporationData
-  def_delegators :data, *Dorsale::CustomerVault::CorporationData.methods_to_delegate
+  data_attributes = %i(
+    legal_form
+    immatriculation_number
+    naf
+    european_union_vat_number
+    societe_com
+    capital
+    revenue
+    number_of_employees
+  )
+  store :data, accessors: data_attributes, coder: JSON
 
   validates :corporation_name, presence: true
   has_many :individuals, dependent: :nullify

data/app/models/dorsale/customer_vault/individual.rb

@@ -1,6 +1,8 @@
 class Dorsale::CustomerVault::Individual < Dorsale::CustomerVault::Person
-  serialize      :data,  Dorsale::CustomerVault::IndividualData
-  def_delegators :data, *Dorsale::CustomerVault::IndividualData.methods_to_delegate
+  data_attributes = %i(
+    title
+  )
+  store :data, accessors: data_attributes, coder: JSON
 
   validates :first_name, presence: true
   validates :last_name,  presence: true

data/db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb

@@ -0,0 +1,6 @@
+class BillingMachineAddMissingUniqueIndexes < ActiveRecord::Migration[6.0]
+  def change
+    add_index :dorsale_billing_machine_invoices, :unique_index, unique: true
+    add_index :dorsale_billing_machine_quotations, :unique_index, unique: true
+  end
+end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.16.0"
+  VERSION = "3.17.0"
 end

data/spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb

@@ -18,7 +18,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
       expect(assigns(:task_comment).persisted?).to be true
     end
 
-    it "should redirect to referrer if referrer is task" do
+    it "should redirect to referrer if referrer is task show" do
       url = flyboy_task_path(task) + "?sort=xxx"
       request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
@@ -26,7 +26,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
     end
 
     it "should redirect to task if referrer is not task" do
-      url = "/anywhere"
+      url = flyboy_task_path(task) + "/some-action"
       request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
       expect(response).to redirect_to flyboy_task_path(task)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '99'
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -549,14 +535,11 @@ files:
 - app/models/dorsale/customer_vault.rb
 - app/models/dorsale/customer_vault/activity_type.rb
 - app/models/dorsale/customer_vault/corporation.rb
-- app/models/dorsale/customer_vault/corporation_data.rb
 - app/models/dorsale/customer_vault/event.rb
 - app/models/dorsale/customer_vault/individual.rb
-- app/models/dorsale/customer_vault/individual_data.rb
 - app/models/dorsale/customer_vault/link.rb
 - app/models/dorsale/customer_vault/origin.rb
 - app/models/dorsale/customer_vault/person.rb
-- app/models/dorsale/customer_vault/person_data.rb
 - app/models/dorsale/email.rb
 - app/models/dorsale/expense_gun.rb
 - app/models/dorsale/expense_gun/category.rb
@@ -835,6 +818,7 @@ files:
 - db/migrate/20171024075514_customer_vault_contact_type_default_value.rb
 - db/migrate/20171115171425_dorsale_customer_vault_people_add_secondary_emails.rb
 - db/migrate/20210202100529_billing_machine_add_positions.rb
+- db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb
 - features/access.feature
 - features/billing_machine_invoices.feature
 - features/billing_machine_multiple_vat.feature

data/app/models/dorsale/customer_vault/corporation_data.rb

@@ -1,10 +0,0 @@
-class Dorsale::CustomerVault::CorporationData < Dorsale::CustomerVault::PersonData
-  attribute :legal_form,                String
-  attribute :immatriculation_number,    String
-  attribute :naf,                       String
-  attribute :european_union_vat_number, String
-  attribute :societe_com,               String
-  attribute :capital,                   Integer
-  attribute :revenue,                   Integer
-  attribute :number_of_employees,       Integer
-end

data/app/models/dorsale/customer_vault/individual_data.rb

@@ -1,3 +0,0 @@
-class Dorsale::CustomerVault::IndividualData < Dorsale::CustomerVault::PersonData
-  attribute :title, String
-end

data/app/models/dorsale/customer_vault/person_data.rb

@@ -1,17 +0,0 @@
-require "virtus"
-
-class Dorsale::CustomerVault::PersonData
-  include Virtus.model
-
-  def self.dump(obj)
-    JSON.dump(obj.attributes)
-  end
-
-  def self.load(json_string)
-    new JSON.parse(json_string.presence || "{}")
-  end
-
-  def self.methods_to_delegate
-    instance_methods - Dorsale::CustomerVault::PersonData.instance_methods
-  end
-end