nexo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6db270266a93bc862ae7d6e669a788a37ff69d7a66e196f678deda237b850b
-  data.tar.gz: ba8486a5c62ae126fa3454acb018a3d3f2ff22957ce889a7d28658f3aa47a7f2
+  metadata.gz: 762b84bd5b5d458091d881a7227c7680048e1ae206e4eef1e6d94246e7be238b
+  data.tar.gz: e5358a64b012b93ffbc7a2f67c21e5179df2d7a7a5581771c1ee97c2466b20e9
 SHA512:
-  metadata.gz: 76b5393e91af23e8b1feabd4ec36a5b6b520212705bcd69d0c70278c2b22251682b5deb20b6ec1fc2dd7b18be0898aa46c80b977f395b2a40103086a0342c477
-  data.tar.gz: 0cd00659819ad2f62d5d4068a61a24dc699ff87a3bf773cddc0009345c7a8e9eab8c931fb797c105b31620286892098c676d82c05f52b5e9ccb6ccbda1453d3c
+  metadata.gz: ecf2eb80621fdce1e6d137dc6d5122fe66db21d893349a86e75d1e4251f73dd120eb6cc3e7f2d899b461a118a20dee7e4fa60ed919819a15204a4787fcde7ca2
+  data.tar.gz: 2389d6ea2996feeeae34a3256ca89037f5d2b0acf658d6e02345d349b5e44712870fd32ed3e7e3421dcd37a1068be3aa83ecba5e74cf221ad312f4797659ca88

data/app/jobs/nexo/base_job.rb

@@ -2,7 +2,7 @@ module Nexo
   class BaseJob < ActiveJob::Base
     def self.limits_concurrency(*)
       # TODO: implementar
-      puts "ERROR: Implementar limits_concurrency"
+      Rails.logger.error "ERROR: Implementar limits_concurrency"
     end
   end
 end

data/app/jobs/nexo/folder_destroy_job.rb

@@ -0,0 +1,10 @@
+module Nexo
+  class FolderDestroyJob < BaseJob
+    def perform(folder)
+      if folder.external_identifier.present?
+        protocol_service = ServiceBuilder.instance.build_protocol_service(folder)
+        response = protocol_service.remove_calendar(folder)
+      end
+    end
+  end
+end

data/app/jobs/nexo/folder_sync_job.rb

@@ -1,15 +1,23 @@
 module Nexo
   class FolderSyncJob < BaseJob
     def perform(folder)
+      if folder.external_identifier.blank?
+        protocol_service = ServiceBuilder.instance.build_protocol_service(folder)
+        response = protocol_service.insert_calendar(folder)
+        folder.update(external_identifier: response.id)
+      end
+
       policies = PolicyService.instance.policies_for(folder)
       # flat_map should be equivalent to:
       #   policies.map(&:synchronizable_queries).flatten(1)
       queries = policies.flat_map(&:synchronizable_queries)
 
-      queries.each do |query|
-        # TODO: avoid calling more than once per synchronizable
-        query.find_each do |synchronizable|
-          folder_service.find_element_and_sync(folder, synchronizable)
+      GoodJob::Bulk.enqueue do
+        queries.each do |query|
+          # TODO: avoid calling more than once per synchronizable
+          query.find_each do |synchronizable|
+            folder_service.find_element_and_sync(folder, synchronizable)
+          end
         end
       end
     end

data/app/jobs/nexo/synchronizable_changed_job.rb

@@ -9,10 +9,12 @@ module Nexo
 
     def perform(synchronizable)
       # Maybe restrict this query to a more specific scope
-      scope = Folder.all
-
-      scope.each do |folder|
-        folder_service.find_element_and_sync(folder, synchronizable)
+      scope = Folder.kept
+      # TODO: test
+      GoodJob::Bulk.enqueue do
+        scope.each do |folder|
+          folder_service.find_element_and_sync(folder, synchronizable)
+        end
       end
     end
 

data/app/lib/nexo/api_client/google_auth_service.rb

@@ -1,6 +1,3 @@
-require "googleauth"
-require "google-apis-oauth2_v2"
-
 module Nexo
   # This is actually an OAuth 2.0 flow, and that logic should be extracted to
   # a generic OAuth2Service

data/app/lib/nexo/api_client/google_calendar_service.rb

@@ -1,5 +1,3 @@
-require "google-apis-calendar_v3"
-
 module Nexo
   # Wrapper around +Google::Apis::CalendarV3+
   #

data/app/lib/nexo/event_receiver.rb

@@ -3,10 +3,6 @@ module Nexo
   # be called when the system is notified of an external element change
   class EventReceiver
     def synchronizable_created(synchronizable)
-      validate_synchronizable_state!(synchronizable)
-
-      synchronizable.initialize_values!
-
       SynchronizableChangedJob.perform_later(synchronizable)
     end
 
@@ -24,8 +20,15 @@ module Nexo
       folder_service.destroy_elements(synchronizable, :synchronizable_destroyed)
     end
 
-    def folder_policy_changed(folder_policy)
-      FolderSyncJob.perform_later(folder_policy.folder)
+    def folder_changed(folder)
+      if folder.discarded?
+        raise "folder discarded"
+      end
+      FolderSyncJob.perform_later(folder)
+    end
+
+    def folder_discarded(folder)
+      FolderDestroyJob.perform_later(folder)
     end
 
     private
@@ -35,11 +38,5 @@ module Nexo
       @folder_service ||= FolderService.new
     end
     # :nocov:
-
-    def validate_synchronizable_state!(synchronizable)
-      unless synchronizable.sequence.nil?
-        raise Errors::InvalidSynchronizableState, "sequence is present: #{synchronizable.sequence}"
-      end
-    end
   end
 end

data/app/lib/nexo/folder_service.rb

@@ -40,11 +40,6 @@ module Nexo
           folder:
         )
 
-        if synchronizable.sequence.nil?
-          # TODO: whats the use of having this and also in EventReceiver?
-          synchronizable.initialize_values!
-        end
-
         SyncElementJob.perform_later(element)
       end
     end

data/app/models/concerns/nexo/calendar_event.rb

@@ -14,7 +14,15 @@ module Nexo
     ])
 
     def change_is_significative_to_sequence?
-      previous_changes.keys.map(&:to_sym).intersection(protocol_methods).any?
+      previous_changes.keys.map(&:to_sym).intersection(significative_columns).any?
+    end
+
+    # Model columns relevant to the sequence
+    #
+    # By default is equal to protocol_methods, but each concrete model class
+    # could have its own specific column names
+    def significative_columns
+      protocol_methods
     end
 
     def datetime_from

data/app/models/concerns/nexo/synchronizable.rb

@@ -70,11 +70,11 @@ module Nexo
     end
     # :nocov:
 
-    def initialize_values!
-      update!(sequence: 0)
-    end
-
     def increment_sequence!
+      if sequence.nil?
+        Rails.logger.warn("Synchronizable sequence is nil on increment_sequence!: #{self.to_gid}")
+      end
+
       # This operation is performed directly in the database without the need
       # to read the current value first. So, it is atomic at a database level,
       # though the in-memory object consitency is subject to race conditions.

data/app/models/nexo/client.rb

@@ -2,7 +2,7 @@
 #
 # Table name: nexo_clients
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  service                   :integer
 #  secret                    :string
 #  tcp_status                :integer

data/app/models/nexo/element.rb

@@ -2,8 +2,8 @@
 #
 # Table name: nexo_elements
 #
-#  id                  :integer          not null, primary key
-#  folder_id           :integer          not null
+#  id                  :bigint           not null, primary key
+#  folder_id           :bigint           not null
 #  synchronizable_id   :integer          not null
 #  synchronizable_type :string           not null
 #  uuid                :string

data/app/models/nexo/element_version.rb

@@ -2,8 +2,8 @@
 #
 # Table name: nexo_element_versions
 #
-#  id         :integer          not null, primary key
-#  element_id :integer          not null
+#  id         :bigint           not null, primary key
+#  element_id :bigint           not null
 #  payload    :string
 #  etag       :string
 #  sequence   :integer

data/app/models/nexo/folder.rb

@@ -2,12 +2,13 @@
 #
 # Table name: nexo_folders
 #
-#  id                  :integer          not null, primary key
-#  integration_id      :integer          not null
+#  id                  :bigint           not null, primary key
+#  integration_id      :bigint           not null
 #  protocol            :integer          not null
 #  external_identifier :string
 #  name                :string
 #  description         :string
+#  discarded_at        :datetime
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #
@@ -16,7 +17,13 @@ module Nexo
     belongs_to :integration, class_name: "Nexo::Integration"
     has_many :elements, class_name: "Nexo::Element"
 
-    enum :protocol, calendar: 0, dummy_calendar: 1
+    if respond_to?(:enumerize)
+      enumerize :protocol, in: { calendar: 0, dummy_calendar: 1 }
+    else
+      enum :protocol, calendar: 0, dummy_calendar: 1
+    end
+
+    scope :kept, -> { where(discarded_at: nil) }
 
     validates :protocol, :name, presence: true
 
@@ -39,5 +46,13 @@ module Nexo
     def time_zone
       Rails.application.config.time_zone
     end
+
+    def discarded?
+      discarded_at.present?
+    end
+
+    def discard!
+      update!(discarded_at: Time.current)
+    end
   end
 end

data/app/models/nexo/integration.rb

@@ -2,9 +2,9 @@
 #
 # Table name: nexo_integrations
 #
-#  id           :integer          not null, primary key
-#  user_id      :integer          not null
-#  client_id    :integer          not null
+#  id           :bigint           not null, primary key
+#  user_id      :bigint           not null
+#  client_id    :bigint           not null
 #  name         :string
 #  scope        :string
 #  expires_at   :datetime

data/app/models/nexo/token.rb

@@ -2,8 +2,8 @@
 #
 # Table name: nexo_tokens
 #
-#  id             :integer          not null, primary key
-#  integration_id :integer          not null
+#  id             :bigint           not null, primary key
+#  integration_id :bigint           not null
 #  secret         :string
 #  tpt_status     :integer          not null
 #  environment    :string           not null

data/db/migrate/20250512025423_create_nexo_folders.rb

@@ -6,6 +6,7 @@ class CreateNexoFolders < ActiveRecord::Migration[7.2]
       t.string :external_identifier
       t.string :name
       t.string :description
+      t.datetime :discarded_at, index: true
 
       t.timestamps
     end

data/lib/nexo/engine.rb

@@ -1,3 +1,7 @@
+require "googleauth"
+require "google-apis-oauth2_v2"
+require "google-apis-calendar_v3"
+
 module Nexo
   def self.folder_policies
     ::Nexo::PolicyService.instance
@@ -14,6 +18,13 @@ module Nexo
       Rails.autoloaders.main.collapse(dir)
     end
 
+    initializer "nexo.setup_google_logger" do
+      Google::Apis.logger = ActiveSupport::Logger.new(Rails.root.join("log/google_apis.log"))
+        .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+        .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
+      # .tap  { |logger| logger.push_tags("FOO") }
+    end
+
     initializer "configurar_generators" do
       config.generators do |g|
         g.test_framework :rspec

data/lib/nexo/version.rb

@@ -1,5 +1,5 @@
 # :nocov: non-viable
 module Nexo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 # :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,7 @@ files:
 - app/jobs/nexo/api_clients.rb
 - app/jobs/nexo/base_job.rb
 - app/jobs/nexo/delete_remote_resource_job.rb
+- app/jobs/nexo/folder_destroy_job.rb
 - app/jobs/nexo/folder_sync_job.rb
 - app/jobs/nexo/sync_element_job.rb
 - app/jobs/nexo/synchronizable_changed_job.rb
@@ -112,7 +113,6 @@ files:
 - db/migrate/20250512025423_create_nexo_folders.rb
 - db/migrate/20250512025950_create_nexo_elements.rb
 - db/migrate/20250512030530_create_nexo_element_versions.rb
-- db/migrate/20250519210346_create_good_jobs.rb
 - db/seeds.rb
 - lib/nexo.rb
 - lib/nexo/engine.rb

data/db/migrate/20250519210346_create_good_jobs.rb

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobs < ActiveRecord::Migration[7.2]
-  def change
-    # Uncomment for Postgres v12 or earlier to enable gen_random_uuid() support
-    enable_extension 'pgcrypto'
-
-    create_table :good_jobs, id: :uuid do |t|
-      t.text :queue_name
-      t.integer :priority
-      t.jsonb :serialized_params
-      t.datetime :scheduled_at
-      t.datetime :performed_at
-      t.datetime :finished_at
-      t.text :error
-
-      t.timestamps
-
-      t.uuid :active_job_id
-      t.text :concurrency_key
-      t.text :cron_key
-      t.uuid :retried_good_job_id
-      t.datetime :cron_at
-
-      t.uuid :batch_id
-      t.uuid :batch_callback_id
-
-      t.boolean :is_discrete
-      t.integer :executions_count
-      t.text :job_class
-      t.integer :error_event, limit: 2
-      t.text :labels, array: true
-      t.uuid :locked_by_id
-      t.datetime :locked_at
-    end
-
-    create_table :good_job_batches, id: :uuid do |t|
-      t.timestamps
-      t.text :description
-      t.jsonb :serialized_properties
-      t.text :on_finish
-      t.text :on_success
-      t.text :on_discard
-      t.text :callback_queue_name
-      t.integer :callback_priority
-      t.datetime :enqueued_at
-      t.datetime :discarded_at
-      t.datetime :finished_at
-      t.datetime :jobs_finished_at
-    end
-
-    create_table :good_job_executions, id: :uuid do |t|
-      t.timestamps
-
-      t.uuid :active_job_id, null: false
-      t.text :job_class
-      t.text :queue_name
-      t.jsonb :serialized_params
-      t.datetime :scheduled_at
-      t.datetime :finished_at
-      t.text :error
-      t.integer :error_event, limit: 2
-      t.text :error_backtrace, array: true
-      t.uuid :process_id
-      t.interval :duration
-    end
-
-    create_table :good_job_processes, id: :uuid do |t|
-      t.timestamps
-      t.jsonb :state
-      t.integer :lock_type, limit: 2
-    end
-
-    create_table :good_job_settings, id: :uuid do |t|
-      t.timestamps
-      t.text :key
-      t.jsonb :value
-      t.index :key, unique: true
-    end
-
-    add_index :good_jobs, :scheduled_at, where: "(finished_at IS NULL)", name: :index_good_jobs_on_scheduled_at
-    add_index :good_jobs, [:queue_name, :scheduled_at], where: "(finished_at IS NULL)", name: :index_good_jobs_on_queue_name_and_scheduled_at
-    add_index :good_jobs, [:active_job_id, :created_at], name: :index_good_jobs_on_active_job_id_and_created_at
-    add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished
-    add_index :good_jobs, [:concurrency_key, :created_at], name: :index_good_jobs_on_concurrency_key_and_created_at
-    add_index :good_jobs, [:cron_key, :created_at], where: "(cron_key IS NOT NULL)", name: :index_good_jobs_on_cron_key_and_created_at_cond
-    add_index :good_jobs, [:cron_key, :cron_at], where: "(cron_key IS NOT NULL)", unique: true, name: :index_good_jobs_on_cron_key_and_cron_at_cond
-    add_index :good_jobs, [:finished_at], where: "retried_good_job_id IS NULL AND finished_at IS NOT NULL", name: :index_good_jobs_jobs_on_finished_at
-    add_index :good_jobs, [:priority, :created_at], order: { priority: "DESC NULLS LAST", created_at: :asc },
-      where: "finished_at IS NULL", name: :index_good_jobs_jobs_on_priority_created_at_when_unfinished
-    add_index :good_jobs, [:priority, :created_at], order: { priority: "ASC NULLS LAST", created_at: :asc },
-      where: "finished_at IS NULL", name: :index_good_job_jobs_for_candidate_lookup
-    add_index :good_jobs, [:batch_id], where: "batch_id IS NOT NULL"
-    add_index :good_jobs, [:batch_callback_id], where: "batch_callback_id IS NOT NULL"
-    add_index :good_jobs, :labels, using: :gin, where: "(labels IS NOT NULL)", name: :index_good_jobs_on_labels
-
-    add_index :good_job_executions, [:active_job_id, :created_at], name: :index_good_job_executions_on_active_job_id_and_created_at
-    add_index :good_jobs, [:priority, :scheduled_at], order: { priority: "ASC NULLS LAST", scheduled_at: :asc },
-      where: "finished_at IS NULL AND locked_by_id IS NULL", name: :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked
-    add_index :good_jobs, :locked_by_id,
-      where: "locked_by_id IS NOT NULL", name: "index_good_jobs_on_locked_by_id"
-    add_index :good_job_executions, [:process_id, :created_at], name: :index_good_job_executions_on_process_id_and_created_at
-  end
-end