[bug] no statistics for subscriptions (#196)

+ [bug] issing translation for subscriptions statistics > duration

CHANGELOG.md

@@ -11,17 +11,19 @@
 - Renamed production documentation
 - Syntax improvements in scss files
 - Fix a bug: crediting a wallet w/ refund invoice prevent statistics generation (#196)
+- Fix a bug: no statistics for subscriptions (#196)
 - Fix a bug: invalid translation keys in closing accounting period interface
 - Fix a bug: since PostgreSQL release 9.6.17, the new installations will fail to start complaining for missing password (#194)
 - Fix a bug: missing translations for some error messages
 - Fix a bug: invalid footprints in invoices fixtures
 - Fix a bug: unable to export accounting data to ACD
 - Fix a bug: report error on invalid encoding in members import
+- Fix a bug: missing translation for subscriptions statistics > duration
 - Fix a security issue: updated mkdirp to fix [CVE-2020-7598](https://nvd.nist.gov/vuln/detail/CVE-2020-7598)
 - Fix a security issue: updated acorn to fix [CVE-2020-7598](https://nvd.nist.gov/vuln/detail/CVE-2020-7598)
 - Fix a security issue: updated actionview to fix [CVE-2020-5267](https://nvd.nist.gov/vuln/detail/CVE-2020-5267)
 - [TODO DEPLOY] `rails fablab:fix:avoirs_wallet_transaction`
-- [TODO DEPLOY] `rails fablab:es:generate_stats[289]` only if you had missing statistics since some date ago. You can replace 289 by the difference of days between the day you run this task and the last day you had statistics
+- [TODO DEPLOY] `rails fablab:es:generate_stats[289]` only if you had missing statistics since some date ago (here 289 days)
 
 ## v4.3.2 2020 March 11
 

app/models/plan.rb

@@ -84,12 +84,12 @@ class Plan < ApplicationRecord
   # must be publicly accessible for the migration
   def create_statistic_type
     stat_index = StatisticIndex.where(es_type_key: 'subscription')
-    type = StatisticType.find_by(statistic_index_id: stat_index.first.id, key: duration.to_i)
+    type = find_statistic_type
     if type.nil?
       type = StatisticType.create!(
         statistic_index_id: stat_index.first.id,
         key: duration.to_i,
-        label: "Durée : #{human_readable_duration}",
+        label: "#{I18n.t('statistics.duration')} : #{human_readable_duration}",
         graph: true,
         simple: true
       )
@@ -98,6 +98,14 @@ class Plan < ApplicationRecord
     create_statistic_association(type, subtype)
   end
 
+  def find_statistic_type
+    stat_index = StatisticIndex.where(es_type_key: 'subscription')
+    type = StatisticType.find_by(statistic_index_id: stat_index.first.id, key: duration.to_i)
+    return type if type
+
+    StatisticType.where(statistic_index_id: stat_index.first.id).where('label LIKE ?', "%#{human_readable_duration}%").first
+  end
+
   private
 
   def create_statistic_subtype

app/services/statistic_service.rb

@@ -147,7 +147,7 @@ class StatisticService
         plan_interval_count: p.interval_count,
         plan_group_name: p.group.name,
         slug: p.slug,
-        duration: p.duration.to_i,
+        duration: p.find_statistic_type.key,
         subscription_id: sub.id,
         invoice_item_id: i.id,
         ca: ca

config/locales/en.yml

@@ -356,6 +356,7 @@ en:
     revenue: "Revenue"
     account_creation: "Account creation"
     project_publication: "Project publication"
+    duration: "Duration"
   #statistics exports to the excel file format
   export:
     entries: "Entries"

config/locales/es.yml

@@ -356,6 +356,7 @@ es:
     revenue: "Ingresos"
     account_creation: "Creación de cuenta"
     project_publication: "Publicación de proyectos"
+    duration: "Duración"
   #statistics exports to the excel file format
   export:
     entries: "Entradas"

config/locales/fr.yml

@@ -356,6 +356,7 @@ fr:
     revenue: "Chiffre d'affaires"
     account_creation: "Création de compte"
     project_publication: "Publication de projet"
+    duration: "Durée"
   #statistics exports to the excel file format
   export:
     entries: "Entrées"

config/locales/pt.yml

@@ -356,6 +356,7 @@ pt:
     revenue: "Receita"
     account_creation: "Criação de conta"
     project_publication: "Publicação de projeto"
+    duration: "Duração"
   #statistics exports to the excel file format
   export:
     entries: "Entradas"