nexo 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca3e3e57c524de464408274ab6309fbea580931420c9da736556d7997ed6bd6
-  data.tar.gz: 770c4033d4dc280ad32471800e59a6d6d5d5af7a150897d52e5fa69de043b393
+  metadata.gz: a18eacef8af04c17f7ce29a9d0101696ebc42f9337f7773cb1b7418a653f57e4
+  data.tar.gz: 5a7664dc27f2f2d9143e8bb4db675289f7c2d4ff063ef5603cac59a183e3a9b3
 SHA512:
-  metadata.gz: 299fe496fcaa3041699cf37fa39e6d897005a4d7a5343c912694ff72cec18a91d19d317c91898c6cd1d55aeba606967298f1ce73ea40008cc14efa4acd62d807
-  data.tar.gz: 63057165522974406b55ec157a46e1c664d17b81e341e7dd04a551e93266e94bc38a0501297d3151f4a0636ad7d8c01e1cd2f739a7bc37cc340f37f53b435d8b
+  metadata.gz: a16900fc806a754bb90cef361babb57e770e3322596909bf50d1312eabab836b9131941784c5d773ce2d00698e0db087de93bf41db7743d12596004a8b6c0782
+  data.tar.gz: 6bd7ef667816a643303898202e5ea7de7404ddf539120243ddb5b4c3d6bdcf86f5fab35d49cd2c19b740097fb7bd981f199336094abce06b8b3ddfada5a2e657

data/README.md

@@ -28,15 +28,21 @@ Configure good_job
 
 ## Unhandled cases / TODO's
 
-- Restore locally discarded Events. It creates a new Google Calendar event?
+- Buscar la manera de wrappear los jobs en un with_tenant
+    cuáles jobs?
+    los que se disparan desde Google webhooks
+    aunque quizá la posta es qeu esas routes estén scopeadas dentro del tid
+- Testear el "no longer included in folder"
+    o sea, modificar una rule y ver qué ande
 
+- Restore locally discarded Events. It creates a new Google Calendar event?
 - Recurring google events
-
 - IMPORTANTE: loggear las exceptions de los jobs
-
 - Llevar mucho control de los jobs y las exceptions que puedan surgir como
   ActiveRecord::PreparedStatementCacheExpired
 
+
+
 ## Contributing
 Contribution directions go here.
 

data/app/controllers/nexo/element_versions_controller.rb

@@ -20,8 +20,6 @@ module Nexo
       end
 
       redirect_to @element_version, notice:
-    rescue StandardError => e
-      redirect_to @element_version, alert: e.message
     end
   end
 end

data/app/controllers/nexo/elements_controller.rb

@@ -42,8 +42,6 @@ module Nexo
       EventReceiver.new.synchronizable_updated(event)
 
       redirect_to @element, notice: "Modified"
-    rescue StandardError => e
-      redirect_to @element, alert: e.message
     end
 
     def fetch_remote
@@ -56,8 +54,16 @@ module Nexo
       ElementService.new(element: @element).resolve_conflict!
 
       redirect_to @element, notice: "Conflict solved"
-    rescue StandardError => e
-      redirect_to @element, alert: e.message
+    end
+
+    def modify
+      case params[:operation]
+      when "delete"
+        DeleteRemoteResourceJob.perform_later(@element)
+        redirect_to @element, notice: "Enqueued DeleteRemoteResourceJob"
+      else
+        redirect_to @element, alert: "Unknown action"
+      end
     end
   end
 end

data/app/controllers/nexo/nexo_controller.rb

@@ -1,5 +1,11 @@
 module Nexo
-  class NexoController < ApplicationController
+  class NexoController < Nexo.admin_controller_parent_class
     layout "nexo"
+
+    rescue_from StandardError do |e|
+      @exception = e
+
+      render "layouts/error"
+    end
   end
 end

data/app/jobs/nexo/delete_remote_resource_job.rb

@@ -3,18 +3,30 @@ module Nexo
   class DeleteRemoteResourceJob < BaseJob
     include ApiClients
 
-    def perform(element)
-      if element.discarded?
-        raise "element already discarded"
-      end
+    retry_on(Errors::ConflictingRemoteElementChange, attempts: 2)
 
-      unless element.flagged_for_removal?
-        raise "element not flagged for removal"
-      end
+    # Once discarded, an Element is obsolete and cant be restored because even
+    # though some APIs may allow it, others may not.
+    def perform(element)
+      raise "element already discarded" if element.discarded?
 
       ServiceBuilder.instance.build_protocol_service(element.folder).remove(element)
 
       ElementService.new(element:).discard!
+
+      # Fetch the removed/cancelled version
+      FetchRemoteResourceJob.perform_now(element)
+    rescue Errors::ConflictingRemoteElementChange => e
+      Nexo.logger.warn <<~STR
+        ConflictingRemoteElementChange for #{element.to_gid}. \
+
+        Performing now FetchRemoteResourceJob, so next attempt should succeed
+      STR
+
+      # NOTE: maybe this should be performed always directly in the first attempt?
+      FetchRemoteResourceJob.perform_now(element)
+
+      raise e
     end
   end
 end

data/app/jobs/nexo/update_remote_resource_job.rb

@@ -70,10 +70,6 @@ module Nexo
         raise Errors::ElementDiscarded
       end
 
-      if element.synchronizable.respond_to?(:discarded?) && element.synchronizable.discarded?
-        raise Errors::SynchronizableDiscarded
-      end
-
       if element.folder.discarded?
         raise Errors::FolderDiscarded
       end

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

@@ -53,7 +53,7 @@ module Nexo
       # sidebranch
       # TODO!: validate uuid presence
 
-      # TODO: try with cancelled
+      # TODO: try with cancelled / maybe its the same
       client.delete_event(element.folder.external_identifier, element.uuid, options: ifmatch_options(element))
       ApiResponse.new(payload: nil, status: :ok, etag: nil)
     rescue Google::Apis::ClientError => e
@@ -211,6 +211,7 @@ module Nexo
         summary: calendar_event.summary,
         description: calendar_event.description,
         transparency: calendar_event.transparency,
+        status: calendar_event.nce_status,
         # sequence: calendar_event.sequence
       )
 

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

@@ -8,7 +8,8 @@ module Nexo
     def incremental_sync!(folder)
       raise Nexo::Errors::Error, "no sync token" if folder.google_next_sync_token.blank?
 
-      Nexo.logger.debug("performing incremental sync")
+      Nexo.logger.info("performing incremental sync")
+
       sync!(folder, sync_token: folder.google_next_sync_token)
     rescue Google::Apis::ClientError => e
       if e.message.match /fullSyncRequired/
@@ -51,11 +52,14 @@ module Nexo
         events.items.each do |event|
           response = ApiResponse.new(payload: event.to_h, etag: event.etag, id: event.id)
 
-          element = Element.where(uuid: response.id).first
+          element = Element.kept.where(uuid: response.id).first
+
           if element.present?
             Nexo.logger.debug("Element found for event")
 
             FetchRemoteResourceJob.new.handle_response(element, response)
+          elsif event.status == "cancelled"
+            Nexo.logger.debug("Skipping cancelled event")
           else
             element = ElementService.new.create_element_for_remote_resource!(folder, response)
 

data/app/lib/nexo/element_service.rb

@@ -26,13 +26,19 @@ module Nexo
 
     def discard!
       element.update!(discarded_at: Time.current)
+      _update_ne_status!
     end
 
+    # The reason of `flagged_for_removal` is that there is a time gap between
+    # the the user action of removing the element and the actual API call that
+    # deletes the remote element. At some point is necesary to know if the
+    # element is being deleted, like when fetching a remote version previous to
+    # the actual delete API call.
     def flag_for_removal!(removal_reason)
       Nexo.logger.debug("Flagging an element for removal")
 
-      # TODO!: the reason for this? just monitoring?
       element.update!(flagged_for_removal: true, removal_reason:)
+      _update_ne_status!
     end
 
     # @raise ActiveRecord::RecordNotUnique
@@ -45,7 +51,12 @@ module Nexo
 
         # and set the Synchronizable fields according to the Folder#nexo_protocol
         synchronizable = element_version.element.synchronizable
-        if synchronizable.present?
+        if element.flagged_for_removal?
+          Nexo.logger.info("Element flagged for removal")
+          ElementService.new(element_version:).update_element_version!(
+            nev_status: :ignored_by_deletion
+          )
+        elsif synchronizable.present?
           synchronizable.update_from_fields!(fields)
 
           # synchronizable could have been destroyed
@@ -226,6 +237,8 @@ module Nexo
           :pending_external_sync
         elsif local_change
           :pending_local_sync
+        elsif element.flagged_for_removal? && element.discarded_at.nil?
+          :pending_remote_delete
         else
           :synced
         end

data/app/lib/nexo/errors.rb

@@ -12,7 +12,6 @@ module Nexo
     class MoreThanOneElementInFolderForSynchronizable < Error; end
     class InvalidFolderState < Error; end
     class FolderDiscarded < Error; end
-    class SynchronizableDiscarded < Error; end
 
     # on ControllerHelper
     class InvalidParamsError < Error; end

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

@@ -4,6 +4,11 @@ module Nexo
 
     extend ActiveSupport::Concern
 
+    # nce_status (Nexo Calendar Event Status)
+    #
+    # - confirmed
+    # - tentative (unused)
+    # - cancelled (deleted)
     define_protocol(:nexo_calendar_event, %i[
       date_from
       date_to
@@ -11,6 +16,7 @@ module Nexo
       time_to
       summary
       description
+      nce_status
     ])
 
     def change_is_significative_to_sequence?

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

@@ -8,6 +8,10 @@ module Nexo
       #   inserta en un google calendar y luego se elimina, luego ya no se
       #   puede volver a insertar con el mismo uuid, sería mejor que el id se
       #   genere automáticamente por google y guardarlo en Element
+      #
+      # sequence
+      #   autoincremental integer, starting at 0. its recommended that
+      #   the attribute is always initialized with 0 value on creation
       %i[
         sequence
       ]
@@ -42,9 +46,8 @@ module Nexo
         fields = service.fields_from_payload(payload)
 
         synchronizable = new
-        attributes = synchronizable.translate_fields(fields)
+        attributes = synchronizable.translate_fields(fields, for_create: true, folder:)
         synchronizable.assign_attributes(attributes)
-        synchronizable.sequence = payload["sequence"]
         synchronizable.save!
 
         synchronizable
@@ -81,7 +84,7 @@ module Nexo
       raise "must be implemented in subclass"
     end
 
-    def translate_fields(fields)
+    def translate_fields(fields, for_create: false, folder: nil)
       raise "must be implemented in subclass"
     end
     # :nocov:

data/app/models/nexo/element.rb

@@ -32,7 +32,13 @@ module Nexo
     scope :kept, -> { where(discarded_at: nil) }
 
     enum :removal_reason, no_longer_included_in_folder: 0, synchronizable_destroyed: 1
-    enum :ne_status, synced: 0, pending_external_sync: 1, pending_local_sync: 2, conflicted: 3
+
+    enum :ne_status,
+      synced: 0,
+      pending_external_sync: 1,
+      pending_local_sync: 2,
+      conflicted: 3,
+      pending_remote_delete: 4
 
     scope :conflicted, -> { where(ne_status: :conflicted) }
 

data/app/models/nexo/element_version.rb

@@ -39,10 +39,15 @@ module Nexo
       synced: 1,
       ignored_in_conflict: 2,
       superseded: 3,
-      ignored_by_sync_direction: 4
+      ignored_by_sync_direction: 4,
+      ignored_by_deletion: 5
 
     serialize :payload, coder: JSON
 
     validates :origin, presence: true
+
+    def remote_status
+      payload["status"] if payload.is_a?(Hash)
+    end
   end
 end

data/app/views/layouts/error.html.erb

@@ -0,0 +1,8 @@
+<h1>ERROR</h1>
+
+<% if @exception.present? %>
+  <h4><%= @exception.message %></h4>
+   <pre>
+  <%= JSON.pretty_generate @exception.backtrace %>
+   </pre>
+<% end %>

data/app/views/layouts/nexo.html.erb

@@ -7,8 +7,6 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= yield :head %>
-
     <style>
       table th {
         font-weight: bold;

data/app/views/nexo/elements/index.html.erb

@@ -5,22 +5,30 @@
 <table>
   <tr>
     <th></th>
+    <th>ID</th>
     <th>User</th>
     <th>Folder</th>
     <th>Synchronizable</th>
     <th>Status</th>
     <th>Updated at</th>
     <th>Created at</th>
+    <th>Remote status</th>
+    <th>Flagged for removal?</th>
+    <th>Discarded at</th>
   </tr>
   <% @elements.each do |element| %>
     <tr>
       <td><%= link_to "Show", element_path(element) %></td>
+      <td><%= element.id %></td>
       <td><%= element.folder.integration.user %></td>
       <td><%= element.folder %></td>
-      <td><%= "#{element.synchronizable_type}: #{element.synchronizable}" %></td>
+      <td><%= truncate "#{element.synchronizable_type}: #{element.synchronizable}", length: 50 %></td>
       <td><%= element.ne_status %></td>
       <td><%= element.updated_at %></td>
       <td><%= element.created_at %></td>
+      <td><%= element.last_remote_version&.remote_status %></td>
+      <td><%= element.flagged_for_removal %></td>
+      <td><%= element.discarded_at %></td>
     </tr>
   <% end %>
 </table>
@@ -28,5 +36,5 @@
 <div class="paginator">
   <%= page_entries_info @elements %>
   <%= paginate @elements %>
+  <%#= paginate @elements, theme: 'kaminari' %>
 </div>
-

data/app/views/nexo/elements/show.html.erb

@@ -17,6 +17,10 @@
 <%= form_with(url: update_status_element_path(@element)) do |f| %>
   <%= f.submit "Update status" %>
 <% end %>
+
+<%= form_with(url: modify_element_path(@element)) do |f| %>
+  <%= f.button(:operation, value: "delete") { "Delete" } %>
+<% end %>
 <br>
 
 <h4>Element</h4>
@@ -47,7 +51,7 @@
       <td><%= version.origin %></td>
       <td><%= version.nev_status %></td>
       <td><%= version.sequence %></td>
-      <td><%= version.payload["status"] %></td>
+      <td><%= version.remote_status %></td>
       <td><%= version.etag %></td>
       <td><%= version.created_at %></td>
       <td><%= version.updated_at %></td>

data/config/routes.rb

@@ -14,6 +14,7 @@ Nexo::Engine.routes.draw do
       post :resolve_conflict
       post :modify_local
       post :update_status
+      post :modify
     end
   end
 

data/db/migrate/20250604124821_element_sync_status.rb

@@ -1,9 +1,11 @@
 class ElementSyncStatus < ActiveRecord::Migration[7.2]
   def change
-    add_column :nexo_elements, :ne_status, :integer, null: false
+    add_column :nexo_elements, :ne_status, :integer
+    change_column_null :nexo_elements, :ne_status, false, -1
     remove_column :nexo_elements, :conflicted, :boolean, default: false, null: false
 
-    add_column :nexo_element_versions, :nev_status, :integer, null: false
+    add_column :nexo_element_versions, :nev_status, :integer
+    change_column_null :nexo_element_versions, :nev_status, false, -1
 
     add_index :nexo_element_versions, [:element_id, :sequence], unique: true, where: "sequence IS NOT NULL"
     add_index :nexo_element_versions, [:element_id, :etag], unique: true, where: "etag IS NOT NULL"

data/lib/nexo/engine.rb

@@ -1,6 +1,7 @@
 require "googleauth"
 require "google-apis-oauth2_v2"
 require "google-apis-calendar_v3"
+require "kaminari"
 
 module Nexo
   def self.folder_rules
@@ -20,6 +21,9 @@ module Nexo
   end
 
   mattr_accessor :api_jobs_throttle
+  mattr_accessor :admin_controller_parent_class
+
+  self.admin_controller_parent_class = ActionController::Base
 
   # @!visibility private
   class Engine < ::Rails::Engine

data/lib/nexo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexo
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-18 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,6 +128,7 @@ files:
 - app/models/nexo/folder.rb
 - app/models/nexo/integration.rb
 - app/models/nexo/token.rb
+- app/views/layouts/error.html.erb
 - app/views/layouts/nexo.html.erb
 - app/views/nexo/element_versions/show.html.erb
 - app/views/nexo/elements/index.html.erb