mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2026-11-17 18:20:36 -05:00
Fix duplicate estimates: make QuickBooks ids unique
The customers, employees, estimates and invoices tables were created with t.integer :id, options: 'PRIMARY KEY', which Rails ignores, so the QuickBooks id was never unique. Two syncs of the same record at once (saving an estimate in Redmine, then QuickBooks' webhook) inserted it twice, so it showed twice on the customer page and counted twice on the business report. - Migration 050 keeps one row per id (the most recently updated) and adds a unique index on id. - A sync that collides with another one's insert retries once as an update. - Estimates, customers and employees validate a unique id, like invoices already did. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BiwYMjhoQvL7XsKKfRz4pM
This commit is contained in:
5 files changed
+65
-2
No files matched your search
@@ -18,6 +18,7 @@ class Customer < QboBaseModel
|
|||||||
has_many :estimates
|
has_many :estimates
|
||||||
has_many :payments
|
has_many :payments
|
||||||
validates_presence_of :name
|
validates_presence_of :name
|
||||||
|
validates :id, uniqueness: true, allow_nil: true
|
||||||
before_validation :normalize_phone_numbers
|
before_validation :normalize_phone_numbers
|
||||||
self.primary_key = :id
|
self.primary_key = :id
|
||||||
qbo_sync push: true
|
qbo_sync push: true
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ class Employee < QboBaseModel
|
|||||||
|
|
||||||
has_many :users
|
has_many :users
|
||||||
validates_presence_of :id, :name
|
validates_presence_of :id, :name
|
||||||
|
validates :id, uniqueness: true
|
||||||
self.primary_key = :id
|
self.primary_key = :id
|
||||||
qbo_sync push: false
|
qbo_sync push: false
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class Estimate < QboBaseModel
|
|||||||
has_many :issues
|
has_many :issues
|
||||||
belongs_to :customer
|
belongs_to :customer
|
||||||
validates_presence_of :doc_number, :id
|
validates_presence_of :doc_number, :id
|
||||||
|
validates :id, uniqueness: true
|
||||||
self.primary_key = :id
|
self.primary_key = :id
|
||||||
qbo_sync push: false
|
qbo_sync push: false
|
||||||
|
|
||||||
|
|||||||
@@ -201,8 +201,10 @@ class SyncServiceBase
|
|||||||
Rails.logger.info "[#{@entity.name}SyncService] #{msg}"
|
Rails.logger.info "[#{@entity.name}SyncService] #{msg}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Create or update a local entity record based on the QBO remote data
|
# Create or update a local entity record based on the QBO remote data. If another sync inserts the same
|
||||||
def persist(remote)
|
# record at the same moment (e.g. a save in Redmine and QuickBooks' webhook), the database's unique id
|
||||||
|
# refuses the second insert; it's then retried once as an update of the row the other sync created.
|
||||||
|
def persist(remote, retried: false)
|
||||||
local = @entity.find_or_initialize_by(id: remote.id)
|
local = @entity.find_or_initialize_by(id: remote.id)
|
||||||
|
|
||||||
if destroy_local?(remote)
|
if destroy_local?(remote)
|
||||||
@@ -223,6 +225,12 @@ class SyncServiceBase
|
|||||||
attach_documents(local, remote)
|
attach_documents(local, remote)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid => e
|
||||||
|
if !retried && (e.is_a?(ActiveRecord::RecordNotUnique) || @entity.exists?(id: remote.id))
|
||||||
|
log "#{@entity.name} #{remote.id} was saved by another sync meanwhile; updating it instead"
|
||||||
|
return persist(remote, retried: true)
|
||||||
|
end
|
||||||
|
log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
|
||||||
rescue => e
|
rescue => e
|
||||||
log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
|
log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
#The MIT License (MIT)
|
||||||
|
#
|
||||||
|
#Copyright (c) 2026 rick barrette
|
||||||
|
#
|
||||||
|
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
#
|
||||||
|
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||||
|
#
|
||||||
|
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
|
# The customers, employees, estimates and invoices tables were created with
|
||||||
|
# `t.integer :id, options: 'PRIMARY KEY'`, which Rails ignores, so their id (the QuickBooks id) was never unique.
|
||||||
|
# Two syncs of the same record at once (e.g. saving an estimate in Redmine, then QuickBooks' webhook) could
|
||||||
|
# both insert it, and it showed twice. This keeps one row per id (the most recently updated) and adds a unique
|
||||||
|
# index so the database refuses a second one. Other tables point at these by the same id, so nothing breaks.
|
||||||
|
class UniqueQboIds < ActiveRecord::Migration[7.0]
|
||||||
|
TABLES = %i[customers employees estimates invoices].freeze
|
||||||
|
|
||||||
|
def up
|
||||||
|
TABLES.each do |table|
|
||||||
|
next unless table_exists?(table)
|
||||||
|
|
||||||
|
remove_duplicates(table)
|
||||||
|
add_index table, :id, unique: true, name: "index_#{table}_on_qbo_id" unless index_name_exists?(table, "index_#{table}_on_qbo_id")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
TABLES.each do |table|
|
||||||
|
remove_index table, name: "index_#{table}_on_qbo_id" if table_exists?(table) && index_name_exists?(table, "index_#{table}_on_qbo_id")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def remove_duplicates(table)
|
||||||
|
quoted = quote_table_name(table)
|
||||||
|
ids = select_values("SELECT id FROM #{quoted} WHERE id IS NOT NULL GROUP BY id HAVING COUNT(*) > 1")
|
||||||
|
say "#{table}: #{ids.size} duplicated ids" if ids.any?
|
||||||
|
|
||||||
|
ids.each do |id|
|
||||||
|
rows = select_all("SELECT * FROM #{quoted} WHERE id = #{quote(id)}").to_a
|
||||||
|
keep = rows.max_by { |row| [row['updated_at'].to_s, row.values.compact.size] }
|
||||||
|
columns = keep.keys
|
||||||
|
|
||||||
|
execute "DELETE FROM #{quoted} WHERE id = #{quote(id)}"
|
||||||
|
execute "INSERT INTO #{quoted} (#{columns.map { |c| quote_column_name(c) }.join(', ')}) " \
|
||||||
|
"VALUES (#{columns.map { |c| quote(keep[c]) }.join(', ')})"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Reference in new issue
Block a user