Fixing a bug on the correlation between triggers and craving on the recovery dashboard

Author: charlesschaefer

src-tauri/src/android.rs

@@ -14,21 +14,21 @@ pub fn save_backup_file(backup_str: String) -> Return {
     let path = "/storage/emulated/0/Android/data/com.addictiontracker/files/backup.txt";
     // tries to save data to a file
     match std::fs::write(path, backup_str) {
-        Ok(_) => { 
-            println!("Sucesso escrevendo no arquivo"); 
+        Ok(_) => {
+            println!("Sucesso escrevendo no arquivo");
             return Return {
                 path: path.to_string(),
                 msg: "Salvo com sucesso!".to_string(),
                 result: true,
-            }
-        },
-        Err(e) => { 
+            };
+        }
+        Err(e) => {
             println!("Erro: {}", e);
             return Return {
                 path: path.to_string(),
                 msg: format!("Erro: {}", e),
-                result: false
+                result: false,
             };
         }
     }
-}
+}

src-tauri/src/desktop.rs

@@ -1,12 +1,15 @@
-use tauri::{App, AppHandle, WindowEvent, Manager};
 use tauri::menu::{MenuBuilder, MenuItem};
 use tauri::tray::{MouseButton, TrayIconBuilder, TrayIconEvent};
+use tauri::{App, AppHandle, Manager, WindowEvent};
 
 #[cfg(desktop)]
 pub fn setup_system_tray_icon(app: &mut App) {
     // hiddens the main window before the app loads
     app.get_webview_window("main").unwrap().hide().unwrap();
-    app.get_webview_window("splashscreen").unwrap().show().unwrap();
+    app.get_webview_window("splashscreen")
+        .unwrap()
+        .show()
+        .unwrap();
 
     let item_show = MenuItem::new(app, "Show/Hide", true, Some("E")).unwrap();
     let item_quit = MenuItem::new(app, "Quit", true, Some("R")).unwrap();

src/app/pages/recovery-dashboard/recovery-dashboard.component.ts

@@ -20,6 +20,7 @@ import { TranslocoAvailableLangs } from "../../app.config";
 import { getDateForChart } from "../../util/date.utils";
 import { SelectModule } from "primeng/select";
 import { SubstanceSelectorComponent } from "../../components/substance/substance-selector.component";
+import { TriggerDto } from "../../dto/trigger.dto";
 
 @Component({
     selector: "app-recovery-dashboard",
@@ -346,9 +347,9 @@ export class RecoveryDashboardComponent implements OnInit {
      * Returns array: [{ trigger: string, avgCraving: number, count: number }]
      */
     async prepareTriggerCravingCorrelationDataAsync() {
-        const labels = await this.triggerService.getTriggerLabels();
+        const labels = await this.triggerService.getActiveTriggers();
         const data = this.usageService.getTriggerCravingCorrelation(
-            this.getFilteredUsageHistory(),
+            this.getFilteredUsageHistory() as (UsageDto & {trigger: TriggerDto[]})[],
             labels
         ).sort((a, b) => b.avgCraving > a.avgCraving ? 1 : -1);
 

src/app/services/trigger.service.ts

@@ -41,15 +41,22 @@ export class TriggerService extends ServiceAbstract<Triggers> {
      * In a real app, this could fetch from DB or config.
      */
     async getTriggerLabels(): Promise<string[]> {
-        return this.list().then(triggers => triggers.map(trigger => this.translateService.translate(trigger.name)));
+        return this.getActiveTriggers().then(triggers => triggers.map(trigger => this.translateService.translate(trigger.name)));
     }
 
     /**
      * Gets all active (non-archived) triggers.
      */
     getActiveTriggers(): Promise<TriggerDto[]> {
         return this.table.toArray().then((triggers) => {
-            return triggers.filter((trigger: any) => !trigger.archived || trigger.archived === undefined || trigger.archived === null || trigger.archived === 0) as TriggerDto[];
+            return triggers
+                .filter(
+                    (trigger: any) => 
+                        !trigger.archived || trigger.archived === undefined || trigger.archived === null || trigger.archived === 0
+                ).map(trigger => ({
+                    ...trigger,
+                    name: this.translateService.translate(trigger.name)
+                })) as TriggerDto[];
         });
     }
 

src/app/services/usage.service.ts

@@ -1,12 +1,14 @@
 import { Injectable, inject } from '@angular/core';
-import { ServiceAbstract } from './service.abstract';
+import { TranslocoService } from '@jsverse/transloco';
 import { DateTime } from 'luxon';
+import { ServiceAbstract } from './service.abstract';
 import { UsageAddDto, UsageDto } from '../dto/usage.dto';
 import { DbService } from './db.service';
 import { DatabaseChangeType } from 'dexie-observable/api';
 import { Changes, DataUpdatedService } from './data-updated.service';
 import { CostAddDto } from '../dto/cost.dto';
 import { SubstanceService } from './substance.service';
+import { TriggerDto } from '../dto/trigger.dto';
 
 export const DATE_FORMAT = 'yyyy-mm-dd HH:MM:ss';
 
@@ -39,6 +41,7 @@ export class UsageService extends ServiceAbstract<Usages> {
     protected override dbService = inject(DbService);
     protected override dataUpdatedService = inject(DataUpdatedService);
     private substanceService = inject(SubstanceService);
+    private translateService = inject(TranslocoService);
 
     protected override storeName = 'usage' as const;
 
@@ -294,27 +297,28 @@ export class UsageService extends ServiceAbstract<Usages> {
      * @returns Array of { trigger, avgCraving, count }
      */
     getTriggerCravingCorrelation(
-        usageHistory: UsageDto[],
-        triggerLabels: string[]
+        usageHistory: (UsageDto & {trigger: TriggerDto[]})[],
+        //triggerLabels: string[]
+        triggerLabels: TriggerDto[]
     ): { trigger: string; avgCraving: number; count: number }[] {
         const result: Record<string, { total: number; count: number }> = {};
-        triggerLabels.forEach(label => {
-            result[label] = { total: 0, count: 0 };
+        triggerLabels.forEach(trigger => {
+            result[trigger.id] = { total: 0, count: 0 };
         });
         usageHistory.forEach(entry => {
             if (Array.isArray(entry.trigger)) {
                 entry.trigger.forEach(trigger => {
-                    if (trigger && result[trigger.name] !== undefined && typeof entry.craving === "number") {
-                        result[trigger.name].total += entry.craving;
-                        result[trigger.name].count += 1;
+                    if (trigger && result[trigger.id] !== undefined && typeof entry.craving === "number") {
+                        result[trigger.id].total += entry.craving;
+                        result[trigger.id].count += 1;
                     }
                 });
             }
         });
         return triggerLabels.map(trigger => ({
-            trigger,
-            avgCraving: result[trigger].count > 0 ? result[trigger].total / result[trigger].count : 0,
-            count: result[trigger].count
+            trigger: trigger.name,
+            avgCraving: result[trigger.id].count > 0 ? result[trigger.id].total / result[trigger.id].count : 0,
+            count: result[trigger.id].count
         }));
     }
 }