Merge branch 'fix/nextcount' into 'main'

fix apply count should update active counts See merge request decidim/decidim-module-geo!166
octree-gva · Nov 7, 2024 · a73c8f8 · a73c8f8
2 parents 62f4ece + b9c938e
commit a73c8f8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/app/jobs/decidim/geo/update_proposal_geo_index_job.rb b/app/jobs/decidim/geo/update_proposal_geo_index_job.rb
@@ -33,12 +33,14 @@ def sync_proposal
                          resource_status: proposal.state,
                          component_id: proposal.decidim_component_id,
                          participatory_space_id: proposal.participatory_space.id,
-                         participatory_space_type: proposal.participatory_space.manifest.name.to_s
+                         participatory_space_type: proposal.participatory_space.manifest.name.to_s,
+                         start_date: start_date,
+                         end_date: end_date
                        )
                      ))
         true
       rescue StandardError => e
-        Rails.logger.debug { "Can index #{e}" }
+        Rails.logger.warn { "ERROR:  #{e}" }
         false
       end
 
@@ -51,7 +53,7 @@ def end_date
       end
 
       def space_wrapper
-        @space_wrapper ||= Decidim::Geo::ResourceWrapper.new(proposal.space)
+        @space_wrapper ||= Decidim::Geo::ResourceWrapper.new(proposal.participatory_space)
       end
 
       def remove_proposal

diff --git a/app/packs/src/decidim/geo/stores/filterStore.js b/app/packs/src/decidim/geo/stores/filterStore.js
@@ -130,7 +130,7 @@ const onFilteredByScope = (filters) => {
     if (selectedScope) selectScope(selectedScope);
     else selectScope(null)
   } else {
-    const toRepaintScope = scopeForId(previousScope.id)
+    const toRepaintScope = scopeForId(previousScope?.id)
     selectScope(null);
     if (toRepaintScope) {
       toRepaintScope.repaint();
@@ -161,7 +161,7 @@ store.subscribe(
 
     // Update active counters.
     const { updateCurrentCountForFilters } = pointCounterStore.getState();
-    await updateCurrentCountForFilters(activeFilters);
+    const _count = await updateCurrentCountForFilters(activeFilters);
   }
 );
 

diff --git a/lib/decidim/geo/generic_serializer.rb b/lib/decidim/geo/generic_serializer.rb
@@ -28,11 +28,20 @@ def image_url
         end
 
         def start_date
-          @start_date ||= (resource.start_time.to_date if resource.respond_to?(:start_time))
+          @start_date ||= if resource.respond_to?(:start_time)
+            resource.start_time.to_date
+          elsif resource.respond_to?(:start_date)
+            resource.start_date
+          end
+
         end
 
         def end_date
-          @end_date ||= (resource.end_time.to_date if resource.respond_to?(:end_time))
+          @end_date ||= if resource.respond_to?(:end_time)
+            resource.end_time.to_date
+          elsif resource.respond_to?(:end_date)
+            resource.end_date
+          end
         end
 
         def resource_url