mobility_uniqueness 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf962cf510a2222aeed27108d93fbbfd097a51e3f077c83e2d5763b392741c98
-  data.tar.gz: 77132ee3687ab614fabc2c8a962ab0e10677cec70dbb0720b47685f7d5e1797a
+  metadata.gz: 710c0ea5d6e02ee1cda673303e2b30d61993321a3fc3655c84b4a231b9267c36
+  data.tar.gz: '029a9ebe04b453422eb6018d32421ae9ba390cc8ecad29f2e22eb7591f2568b0'
 SHA512:
-  metadata.gz: 4da1178c863c73fb38a99a56e41ef8b522cf88f6c08f5457ca74c6d5e43d78074250294c6fa9cda7bdaf62af8e6f06f540a90118b105fe42aa12c31a1eaff1bc
-  data.tar.gz: 78fa453e34a958965c43006ab2da241245015dbf7ae5ffba4c3e9a6b399502bad2c96f575c6a79abf7942aa8a23bbce536070ce0d68c64db7023d56bbb4cc6bd
+  metadata.gz: 1f53e82506ceada51bd9db3bad9ee12d45621d2ee045103b8bc9d82a7a7a9de497367f165a4eab3cfda81cf453fa071cb86ac2d9385bf2885ff28e07fad6180b
+  data.tar.gz: 0a382359b1bb564e4462f88fbd576ef51c6317bf9e7bc6c28f6221f872060c104c2c10b7d44c06c1d05ae4a1210c7bc2cdd8917f6fcfaaae170fd51f481d56c5

data/lib/mobility_uniqueness/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MobilityUniqueness
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/mobility_uniqueness.rb

@@ -10,29 +10,21 @@ module MobilityUniqueness
       before_validation do
         message = opitons[:message] || 'violates uniqueness constraint'
 
-        Mobility.available_locales.each do |locale|
-          args.each do |attr|
-            passed      = false
-            query_class = self.mobility_query_class(attr)
-
-            next unless query_class
-
-            records = query_class
-                        .where(locale: locale)
-                        .where(translatable_type: self.class.to_s)
-                        .where(key: attr, value: send(:"#{attr}_#{locale}"))
-
-            count = records.count
-
-            passed = if self.persisted?
-                        only_one_record = count <= 1
-                        belongs_to_self = count.zero? || id == records.first.translatable_id
-                        only_one_record && belongs_to_self
-                      else
-                        count.zero?
-                      end
-
-            self.errors.add(:"#{attr}_#{locale}", message) unless passed
+        query_classes = args.group_by { |attr| mobility_query_class(attr) }
+        query_classes.each do |query_class, attributes|
+          values = Mobility.available_locales.map do |locale|
+            attributes.map { |attr| send(:"#{attr}_#{locale}") }
+          end.flatten
+
+          count_by_group = query_class.where(locale: Mobility.available_locales)
+                                      .where(translatable_type: self.class.to_s)
+                                      .where(key: attributes, value: values)
+                                      .where.not(translatable_id: id)
+                                      .group(:key, :locale, :value)
+                                      .count
+
+          count_by_group.each do |(key, locale, _value), count|
+            errors.add(:"#{key}_#{locale}", message) unless count.zero?
           end
         end
       end
@@ -46,7 +38,7 @@ module MobilityUniqueness
       string: Mobility::Backends::ActiveRecord::KeyValue::StringTranslation,
       text: Mobility::Backends::ActiveRecord::KeyValue::TextTranslation
     }
-    
+
     translations[attr_type]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility_uniqueness
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - egemen öztürk