rails-contact 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48540c1897658b886292f1fafe8157fa2aa7fed817d9b9ebb64213456ac958e3
-  data.tar.gz: 3329ba043c33922528e3736e8a77d739a71151c30d471bc300ef832131ab09fd
+  metadata.gz: 11aea6cb5a1f51337bf1c48e9cb0e3d34ada33d16af8fc5a8476a687d78eb5ba
+  data.tar.gz: 63ce98be235f82c0dfe65a22abe308566d44a72e423e0a2351d8e8d04a5ef0f4
 SHA512:
-  metadata.gz: 34f85c62bf91b52739ad8833e884a44ac142c44b507eda5c1c1044320cda3fba787c1d20afa3d4eb196df81cf02dd806b593ef1b8d06d383790741bd80b055e1
-  data.tar.gz: 4ddb497c06c1fc0fed8ad0b5a636f5ff640afe425e1d1fe0b40c2acc9ab9500bc0b473eab23be1bde9eacfb29c972b63bf3e10095db7ed2f19cd3bdf169d7bbb
+  metadata.gz: 1dc45c5cbcb8d9db9bfa9e8374408e8746c2d0e03fd6bd7bea77acf767df515c74ce7b0334761e31f94ac9fdabb86a19af3d5a8ce4c3c6876b81184336e25704
+  data.tar.gz: 4345e73338be0e56ad00d29d9796fa3ea08e7136f319eb6df79939823f17fe1b898b8ef53d8047f9863142c3ab0751f60b4f00f40bc3b11e177dc6c9c3db95b4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.8
+
+- Contacts index: paginated search (total count, previous/next, page indicator) with Elasticsearch and database backends.
+- `POST /google_sync_unsynced` and **Sync … not yet in Google** button when sync is enabled; `GoogleSyncUnsyncedJob` runs `SyncService#sync_unsynced!` for contacts with no `google_resource_name`.
+
 ## 0.1.7
 
 - Google People API: `updateContact` sends required `updatePersonFields`; update payloads include `resourceName` and `etag`; sync preloads emails, phones, and addresses.

data/app/controllers/rails/contact/contacts_controller.rb

@@ -10,10 +10,30 @@ module Rails
 
       def index
         @query = params[:q].to_s.strip
-        @contacts = Search::Query.new(@query, filters: normalized_filters(filter_params)).call
+        result = Search::Query.new(
+          @query,
+          filters: normalized_filters(filter_params),
+          page: params[:page]
+        ).call
+        @contacts = result.records
+        @total_count = result.total_count
+        @page = result.page
+        @per_page = result.per_page
+        @total_pages = result.total_pages
+        @google_contacts_pending_sync = google_pending_sync_count
         render "rails/contact/index"
       end
 
+      def google_sync_unsynced
+        unless Rails::Contact.configuration.google_sync_enabled
+          redirect_to contacts_path, alert: "Google Contacts sync is disabled."
+          return
+        end
+
+        GoogleSyncUnsyncedJob.perform_later
+        redirect_to contacts_path, notice: "Google sync has been queued for contacts not yet linked."
+      end
+
       def show
         render "rails/contact/show"
       end
@@ -99,6 +119,12 @@ module Rails
         params.permit(:city, :region, :sync_eligible, :starred)
       end
 
+      def google_pending_sync_count
+        return 0 unless Rails::Contact.configuration.google_sync_enabled
+
+        Contact.where("google_resource_name IS NULL OR google_resource_name = ?", "").count
+      end
+
       def enqueue_index(contact_id)
         IndexContactJob.perform_later(contact_id)
       end

data/app/jobs/rails/contact/google_sync_unsynced_job.rb

@@ -0,0 +1,13 @@
+module Rails
+  module Contact
+    class GoogleSyncUnsyncedJob < ApplicationJob
+      queue_as :default
+
+      def perform
+        return unless Rails::Contact.configuration.google_sync_enabled
+
+        Google::SyncService.new.sync_unsynced!
+      end
+    end
+  end
+end

data/app/views/rails/contact/_index_pagination.html.erb

@@ -0,0 +1,25 @@
+<% if defined?(@total_count) && @total_count.to_i > 0 %>
+  <div class="flex flex-col gap-3 border-t border-gray-200 bg-gray-50 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
+    <p class="text-sm text-gray-600">
+      <% start_i = (@page - 1) * @per_page + 1 %>
+      <% end_i = [ @page * @per_page, @total_count ].min %>
+      Showing <span class="font-medium text-gray-900"><%= start_i %>–<%= end_i %></span>
+      of <span class="font-medium text-gray-900"><%= number_with_delimiter(@total_count) %></span>
+      <% if @per_page.present? && @per_page > 0 %>
+        <span class="text-gray-500">(<%= @per_page %> per page)</span>
+      <% end %>
+    </p>
+    <% if defined?(@total_pages) && @total_pages > 1 %>
+      <div class="flex flex-wrap items-center gap-2">
+        <% qp = request.query_parameters.except(:page, :action, :controller) %>
+        <% if @page > 1 %>
+          <%= link_to "Previous", url_for(qp.merge(page: @page - 1)), class: "inline-flex rounded-md border border-gray-300 bg-white px-3 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-50" %>
+        <% end %>
+        <span class="text-sm text-gray-600">Page <%= @page %> / <%= @total_pages %></span>
+        <% if @page < @total_pages %>
+          <%= link_to "Next", url_for(qp.merge(page: @page + 1)), class: "inline-flex rounded-md border border-gray-300 bg-white px-3 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-50" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/rails/contact/index.html.erb

@@ -26,6 +26,22 @@
     <% end %>
   </div>
 
+  <% if Rails::Contact.configuration.google_sync_enabled %>
+    <div class="rounded-xl border border-gray-200 bg-white p-4 shadow-sm">
+      <h2 class="mb-2 text-sm font-semibold text-gray-900">Google Contacts</h2>
+      <% if @google_contacts_pending_sync.to_i.positive? %>
+        <%= form_with url: google_sync_unsynced_contacts_path, method: :post, local: true, class: "flex flex-wrap items-center gap-3" do %>
+          <%= submit_tag "Sync #{@google_contacts_pending_sync} contact#{'s' if @google_contacts_pending_sync != 1} not yet in Google",
+                class: "inline-flex rounded-md bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-700",
+                data: { confirm: "Queue Google sync for #{@google_contacts_pending_sync} contact(s)? This runs in the background." } %>
+        <% end %>
+        <p class="mt-2 text-xs text-gray-500">Creates or updates People entries for contacts with no Google link yet. Already-linked contacts are unchanged.</p>
+      <% else %>
+        <p class="text-sm text-gray-600">Every contact in the database is already linked to Google (or there are no contacts).</p>
+      <% end %>
+    </div>
+  <% end %>
+
   <div class="rounded-xl border border-gray-200 bg-white p-4 shadow-sm">
     <%= form_with url: bulk_destroy_contacts_path, method: :post, local: true, class: "inline-flex items-center gap-2" do |f| %>
       <%= hidden_field_tag :ids, "", id: "bulk-ids-field" %>
@@ -76,6 +92,7 @@
         <% end %>
       </tbody>
     </table>
+    <%= render "rails/contact/index_pagination" %>
   </div>
 </div>
 

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails::Contact::Engine.routes.draw do
   post "/bulk_destroy", to: "contacts#bulk_destroy", as: :bulk_destroy_contacts
   post "/merge", to: "contacts#merge", as: :merge_contacts
+  post "/google_sync_unsynced", to: "contacts#google_sync_unsynced", as: :google_sync_unsynced_contacts
   get "/", to: "contacts#index", as: :contacts
   get "/new", to: "contacts#new", as: :new_contact
   post "/", to: "contacts#create"

data/lib/rails/contact/google/sync_service.rb

@@ -13,6 +13,22 @@ module Rails
           end
         end
 
+        def unsynced_contacts_scope
+          Rails::Contact::Contact.where("google_resource_name IS NULL OR google_resource_name = ?", "")
+        end
+
+        def sync_unsynced!
+          unsynced_contacts_scope.in_batches(of: 100) do |batch|
+            batch.preload(:emails, :phones, :addresses).each do |contact|
+              sync_contact(contact)
+            rescue StandardError => e
+              Rails.logger.error(
+                "[Rails::Contact] Google sync_unsynced failed for contact #{contact.id}: #{e.class}: #{e.message}"
+              )
+            end
+          end
+        end
+
         def sync_contact(contact)
           payload = PayloadMapper.new(contact).to_people_payload
           response = if contact.google_resource_name.present?

data/lib/rails/contact/search/backends/database.rb

@@ -3,13 +3,19 @@ module Rails
     module Search
       module Backends
         class Database
-          def search(query, filters)
+          def search(query, filters, page:, per_page:)
+            offset = (page - 1) * per_page
             scope = Contact.includes(:emails, :phones, :labels).recent_first
             scope = apply_filters(scope, filters)
-            return scope.limit(limit) if query.blank?
+
+            if query.blank?
+              total = scope.count
+              records = scope.offset(offset).limit(per_page).to_a
+              return Search::Result.new(records: records, total_count: total, page: page, per_page: per_page)
+            end
 
             wildcard = "%#{query.downcase}%"
-            scope.left_joins(:emails, :phones, :labels).where(
+            filtered = scope.left_joins(:emails, :phones, :labels).where(
               "LOWER(rails_contact_contacts.given_name) LIKE :q OR "\
               "LOWER(rails_contact_contacts.family_name) LIKE :q OR "\
               "LOWER(COALESCE(rails_contact_contacts.metadata->>'company', '')) LIKE :q OR "\
@@ -19,7 +25,10 @@ module Rails
               "LOWER(rails_contact_labels.name) LIKE :q",
               q: wildcard,
               raw: "%#{query}%"
-            ).distinct.limit(limit)
+            ).distinct
+            total = filtered.count(:id)
+            records = filtered.offset(offset).limit(per_page).to_a
+            Search::Result.new(records: records, total_count: total, page: page, per_page: per_page)
           end
 
           private
@@ -34,10 +43,6 @@ module Rails
             end
             scoped
           end
-
-          def limit
-            Rails::Contact.configuration.default_per_page
-          end
         end
       end
     end

data/lib/rails/contact/search/backends/elasticsearch.rb

@@ -23,13 +23,16 @@ module Rails
             @client = client || self.class.default_client
           end
 
-          def search(query, filters)
-            response = @client.search(index: INDEX, body: search_body(query, filters))
-            ids = response.fetch("hits", {}).fetch("hits", []).map { |doc| doc["_id"] }
+          def search(query, filters, page:, per_page:)
+            response = @client.search(index: INDEX, body: search_body(query, filters, page: page, per_page: per_page))
+            hits = response.fetch("hits", {})
+            ids = hits.fetch("hits", []).map { |doc| doc["_id"] }
+            total_count = extract_total_hits(hits["total"])
             records_by_id = Contact.where(id: ids).index_by { |record| record.id.to_s }
-            ids.filter_map { |id| records_by_id[id.to_s] }
+            records = ids.filter_map { |id| records_by_id[id.to_s] }
+            Search::Result.new(records: records, total_count: total_count, page: page, per_page: per_page)
           rescue StandardError
-            Search::Backends::Database.new.search(query, filters)
+            Search::Backends::Database.new.search(query, filters, page: page, per_page: per_page)
           end
 
           def upsert(contact)
@@ -81,9 +84,12 @@ module Rails
             }
           end
 
-          def search_body(query, filters)
+          def search_body(query, filters, page:, per_page:)
+            from = (page - 1) * per_page
             {
-              size: Rails::Contact.configuration.default_per_page,
+              from: from,
+              size: per_page,
+              track_total_hits: true,
               sort: [ { updated_at: { order: "desc" } }, { id: { order: "desc" } } ],
               query: {
                 bool: {
@@ -94,6 +100,12 @@ module Rails
             }
           end
 
+          def extract_total_hits(raw)
+            return 0 if raw.nil?
+
+            raw.is_a?(Hash) ? raw.fetch("value", 0).to_i : raw.to_i
+          end
+
           def search_clause(query)
             return [ { match_all: {} } ] if query.blank?
 

data/lib/rails/contact/search/query.rb

@@ -2,13 +2,17 @@ module Rails
   module Contact
     module Search
       class Query
-        def initialize(query, filters: {})
+        MAX_PER_PAGE = 100
+
+        def initialize(query, filters: {}, page: nil, per_page: nil)
           @query = query
           @filters = filters.to_h.compact_blank
+          @page = page.to_i < 1 ? 1 : page.to_i
+          @per_page = resolve_per_page(per_page)
         end
 
         def call
-          backend.search(@query, @filters)
+          backend.search(@query, @filters, page: @page, per_page: @per_page)
         end
 
         private
@@ -21,6 +25,12 @@ module Rails
             Search::Backends::Database.new
           end
         end
+
+        def resolve_per_page(per_page)
+          p = per_page.to_i
+          p = Rails::Contact.configuration.default_per_page if p <= 0
+          [ p, MAX_PER_PAGE ].min
+        end
       end
     end
   end

data/lib/rails/contact/search/result.rb

@@ -0,0 +1,13 @@
+module Rails
+  module Contact
+    module Search
+      Result = Struct.new(:records, :total_count, :page, :per_page, keyword_init: true) do
+        def total_pages
+          return 0 if total_count.zero? || per_page.zero?
+
+          (total_count.to_f / per_page).ceil
+        end
+      end
+    end
+  end
+end

data/lib/rails/contact/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Contact
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/rails/contact.rb

@@ -4,6 +4,7 @@ require "rails/contact/engine"
 require "rails/contact/configuration"
 require "rails/contact/orm"
 require "rails/contact/routing"
+require "rails/contact/search/result"
 require "rails/contact/search/query"
 require "rails/contact/search/backends/database"
 require "rails/contact/search/backends/elasticsearch"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-contact
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kshitiz Sinha
@@ -119,6 +119,7 @@ files:
 - app/helpers/rails/contact/application_helper.rb
 - app/jobs/rails/contact/application_job.rb
 - app/jobs/rails/contact/google_sync_job.rb
+- app/jobs/rails/contact/google_sync_unsynced_job.rb
 - app/jobs/rails/contact/index_contact_job.rb
 - app/mailers/rails/contact/application_mailer.rb
 - app/mailers/rails/contact/contact_mailer.rb
@@ -137,6 +138,7 @@ files:
 - app/views/rails/contact/_email_fields.html.erb
 - app/views/rails/contact/_event_fields.html.erb
 - app/views/rails/contact/_form.html.erb
+- app/views/rails/contact/_index_pagination.html.erb
 - app/views/rails/contact/_nested_fields_script.html.erb
 - app/views/rails/contact/_phone_fields.html.erb
 - app/views/rails/contact/_stylesheet.html.erb
@@ -181,6 +183,7 @@ files:
 - lib/rails/contact/search/backends/database.rb
 - lib/rails/contact/search/backends/elasticsearch.rb
 - lib/rails/contact/search/query.rb
+- lib/rails/contact/search/result.rb
 - lib/rails/contact/version.rb
 - lib/tasks/rails/contact_tasks.rake
 - spec/concerns/filterable_spec.rb