Merge pull request #881 from alphagov/fix-archived-petitions-csv

Fix CSV downloads of archived petitions in the moderation portal
alphagov · Nov 2, 2023 · 4b84b47 · 4b84b47
2 parents d3d61f5 + 901feec
commit 4b84b47
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 24 deletions.
diff --git a/app/models/archived/signature.rb b/app/models/archived/signature.rb
@@ -153,8 +153,10 @@ def search(query, options = {})
           scope = scope.for_postcode(query)
         elsif sector_search?(query)
           scope = scope.for_sector(query)
-        else
+        elsif query.present?
           scope = scope.for_name(query)
+        else
+          scope = scope.none
         end
 
         scope.paginate(page: page, per_page: 50)

diff --git a/app/models/signature.rb b/app/models/signature.rb
@@ -255,8 +255,10 @@ def search(query, options = {})
         scope = scope.for_postcode(query)
       elsif sector_search?(query)
         scope = scope.for_sector(query)
-      else
+      elsif query.present?
         scope = scope.for_name(query)
+      else
+        scope = scope.none
       end
 
       scope.paginate(page: page, per_page: 50)

diff --git a/app/presenters/petition_csv_presenter.rb b/app/presenters/petition_csv_presenter.rb
@@ -58,14 +58,18 @@ def notes
     petition.note.details if petition.note
   end
 
+  def statistics
+    petition.respond_to?(:statistics) && petition.statistics
+  end
+
   def subscriber_count
-    if petition.statistics.refreshed?
+    if statistics && statistics.refreshed?
       csv_escape petition.statistics.subscriber_count
     end
   end
 
   def subscription_rate
-    if petition.statistics.refreshed?
+    if statistics && statistics.refreshed?
       csv_escape petition.statistics.subscription_rate
     end
   end

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,13 +3,6 @@ version: "3.7"
 x-application: &application
   image: e-petitions/ruby
   build: docker/ruby
-  environment:
-    - DATABASE_URL=postgres://postgres:ZW4IvOPrXcbp2hyp@postgres:5432
-    - MEMCACHE_SERVERS=memcached:11211
-    - SMTP_HOST=mailcatcher
-    - SMTP_PORT=1025
-    - SPROCKETS_CACHE=/cache
-    - PIDFILE=/tmp/pids/server.pid
   volumes:
     - .:/app
     - bundle:/bundle
@@ -22,6 +15,14 @@ x-application: &application
     - mailcatcher
     - memcached
 
+x-environment: &environment
+  DATABASE_URL: "postgres://postgres:ZW4IvOPrXcbp2hyp@postgres:5432"
+  MEMCACHE_SERVERS: "memcached:11211"
+  SMTP_HOST: "mailcatcher"
+  SMTP_PORT: "1025"
+  SPROCKETS_CACHE: "/cache"
+  PIDFILE: "/tmp/pids/server.pid"
+
 services:
   postgres:
     image: postgres:12
@@ -50,6 +51,8 @@ services:
 
   web:
     <<: *application
+    environment:
+      <<: *environment
     command: [
       "rails", "server",
       "-b", "0.0.0.0",
@@ -62,21 +65,17 @@ services:
 
   worker:
     <<: *application
-    command: [
-      "bin/delayed_job", "start",
-      "-p", "worker",
-      "--min-priority", "10",
-      "--daemon_options", "-t"
-    ]
+    environment:
+      <<: *environment
+      MIN_PRIORITY: "10"
+    command: [ "rake", "jobs:work" ]
 
   counter:
     <<: *application
-    command: [
-      "bin/delayed_job", "start",
-      "-p", "counter",
-      "--max-priority", "5",
-      "--daemon_options", "-t"
-    ]
+    environment:
+      <<: *environment
+      MAX_PRIORITY: "5"
+    command: [ "rake", "jobs:work" ]
 
 volumes:
   bundle:

diff --git a/docker/ruby/docker-entrypoint.sh b/docker/ruby/docker-entrypoint.sh
@@ -16,5 +16,5 @@ else
   yarn install
   bundle check || bundle install
 
-  bundle exec "$@"
+  exec bundle exec "$@"
 fi