Adding some more analytics

graphefruit · Dec 18, 2024 · 45799ee · 45799ee
1 parent 36251a9
commit 45799ee
Show file tree

Hide file tree

Showing 14 changed files with 180 additions and 48 deletions.
diff --git a/.../beans/bean-internal-share-code-generator/bean-internal-share-code-generator.component.ts b/.../beans/bean-internal-share-code-generator/bean-internal-share-code-generator.component.ts
@@ -12,6 +12,8 @@ import { UIBeanStorage } from '../../../services/uiBeanStorage';
 import { UILog } from '../../../services/uiLog';
 import { BEAN_CODE_ACTION } from '../../../enums/beans/beanCodeAction';
 import { NfcService } from '../../../services/nfcService/nfc-service.service';
+import BEAN_TRACKING from '../../../data/tracking/beanTracking';
+import { UIAnalytics } from '../../../services/uiAnalytics';
 
 @Component({
   selector: 'app-bean-internal-share-code-generator.',
@@ -35,7 +37,8 @@ export class BeanInternalShareCodeGeneratorComponent implements OnInit {
     private readonly uiAlert: UIAlert,
     private readonly uiBeanStorage: UIBeanStorage,
     private readonly uiLog: UILog,
-    private readonly nfcService: NfcService
+    private readonly nfcService: NfcService,
+    private readonly uiAnalytics: UIAnalytics,
   ) {}
 
   ngOnInit() {}
@@ -54,11 +57,11 @@ export class BeanInternalShareCodeGeneratorComponent implements OnInit {
       while (true) {
         newShareCode = this.uiHelper.generateShortUUID().toUpperCase();
         const indexFound = allBeanEntries.findIndex(
-          (b) => b.internal_share_code === newShareCode
+          (b) => b.internal_share_code === newShareCode,
         );
         if (indexFound === -1) {
           this.uiLog.log(
-            'Generate QR Code - ' + newShareCode + ' - code not used yet.'
+            'Generate QR Code - ' + newShareCode + ' - code not used yet.',
           );
           /** This id isn't used yet**/
           break;
@@ -92,6 +95,10 @@ export class BeanInternalShareCodeGeneratorComponent implements OnInit {
     this.shareService.shareImage(this.imageSrc);
   }
   public writeNFC() {
+    this.uiAnalytics.trackEvent(
+      BEAN_TRACKING.TITLE,
+      BEAN_TRACKING.ACTIONS.NFC_WRITE,
+    );
     this.nfcService.writeNFCData(this.qrData);
   }
 
@@ -103,7 +110,7 @@ export class BeanInternalShareCodeGeneratorComponent implements OnInit {
     this.modalController.dismiss(
       undefined,
       undefined,
-      BeanInternalShareCodeGeneratorComponent.COMPONENT_ID
+      BeanInternalShareCodeGeneratorComponent.COMPONENT_ID,
     );
   }
 

diff --git a/src/app/beans/beans.page.ts b/src/app/beans/beans.page.ts
@@ -332,6 +332,10 @@ export class BeansPage implements OnDestroy {
   public async scanNFC() {
     if (this.platform.is('capacitor')) {
       try {
+        this.uiAnalytics.trackEvent(
+          BEAN_TRACKING.TITLE,
+          BEAN_TRACKING.ACTIONS.NFC_SCAN,
+        );
         await this.nfcService.readNFCTag();
       } catch (error) {
         // Just log and do nothing else, it's likely the user just cancelled

diff --git a/src/app/brew/brew-add/brew-add.component.ts b/src/app/brew/brew-add/brew-add.component.ts
@@ -99,7 +99,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
     private readonly visualizerService: VisualizerService,
     private readonly changeDetectorRef: ChangeDetectorRef,
     private readonly hapticService: HapticService,
-    private readonly uiHelper: UIHelper
+    private readonly uiHelper: UIHelper,
   ) {
     // Initialize to standard in drop down
     this.settings = this.uiSettingsStorage.getSettings();
@@ -178,7 +178,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
           },
           () => {
             // No
-          }
+          },
         );
     } else {
       this.dismiss();
@@ -238,7 +238,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
       this.data.coordinates.speed = resp.coords.speed;
       this.data.coordinates.longitude = resp.coords.longitude;
       this.uiLog.info(
-        'BREW - Coordinates found - ' + JSON.stringify(this.data.coordinates)
+        'BREW - Coordinates found - ' + JSON.stringify(this.data.coordinates),
       );
     } catch (error) {
       this.uiLog.error('BREW - No Coordinates found: ', error);
@@ -272,7 +272,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
     try {
       if (this.brewBrewing.brewBrewingGraphEl) {
         Plotly.purge(
-          this.brewBrewing.brewBrewingGraphEl.profileDiv.nativeElement
+          this.brewBrewing.brewBrewingGraphEl.profileDiv.nativeElement,
         );
       }
     } catch (ex) {}
@@ -281,7 +281,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
         dismissed: true,
       },
       undefined,
-      BrewAddComponent.COMPONENT_ID
+      BrewAddComponent.COMPONENT_ID,
     );
   }
 
@@ -327,14 +327,25 @@ export class BrewAddComponent implements OnInit, OnDestroy {
 
       if (this.uiBrewHelper.checkIfBeanPackageIsConsumed(this.data.getBean())) {
         await this.uiBrewHelper.checkIfBeanPackageIsConsumedTriggerMessageAndArchive(
-          this.data.getBean()
+          this.data.getBean(),
         );
       }
 
       this.uiAnalytics.trackEvent(
         BREW_TRACKING.TITLE,
-        BREW_TRACKING.ACTIONS.ADD_FINISH
+        BREW_TRACKING.ACTIONS.ADD_FINISH,
+      );
+      this.uiAnalytics.trackEvent(
+        BREW_TRACKING.TITLE,
+        BREW_TRACKING.ACTIONS.ADD_FINISH_PREPARATION_TYPE,
+        addedBrewObj.getPreparation().type,
       );
+      this.uiAnalytics.trackEvent(
+        BREW_TRACKING.TITLE,
+        BREW_TRACKING.ACTIONS.ADD_FINISH_PREPARATION_STYLE,
+        addedBrewObj.getPreparation().style_type,
+      );
+
       if (
         this.brewBrewing?.brewBrewingPreparationDeviceEl?.getDataPreparationDeviceType() ===
         PreparationDeviceType.XENIA
@@ -349,11 +360,11 @@ export class BrewAddComponent implements OnInit, OnDestroy {
             await this.uiBrewStorage.update(addedBrewObj);
           } catch (ex) {
             this.uiLog.log(
-              'We could not get the logs from xenia: ' + JSON.stringify(ex)
+              'We could not get the logs from xenia: ' + JSON.stringify(ex),
             );
             this.uiToast.showInfoToast(
               'We could not get the logs from xenia: ' + JSON.stringify(ex),
-              false
+              false,
             );
           }
         }
@@ -375,7 +386,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
     ) {
       this.uiHealthKit.trackCaffeineConsumption(
         this.data.getCaffeineAmount(),
-        moment(this.brewBrewing.customCreationDate).toDate()
+        moment(this.brewBrewing.customCreationDate).toDate(),
       );
     }
   }
@@ -420,7 +431,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
     if (checkData.manage_parameters.set_custom_brew_time) {
       this.uiLog.log('Brew add - Step 6');
       addedBrewObj.config.unix_timestamp = moment(
-        this.brewBrewing.customCreationDate
+        this.brewBrewing.customCreationDate,
       ).unix();
       await this.uiBrewStorage.update(addedBrewObj);
     }
@@ -438,7 +449,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
     if (this.hasAnyFlowProfileRequisites()) {
       this.uiLog.log('Brew add - Step 5');
       const savedPath: string = await this.brewBrewing.saveFlowProfile(
-        addedBrewObj.config.uuid
+        addedBrewObj.config.uuid,
       );
       if (savedPath !== '') {
         addedBrewObj.flow_profile = savedPath;
@@ -458,7 +469,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
         addedBrewObj.reference_flow_profile.type === REFERENCE_GRAPH_TYPE.NONE
       ) {
         const path = await this.brewBrewing.saveReferenceFlowProfile(
-          addedBrewObj.config.uuid
+          addedBrewObj.config.uuid,
         );
 
         addedBrewObj.reference_flow_profile = new ReferenceGraph();
@@ -503,7 +514,7 @@ export class BrewAddComponent implements OnInit, OnDestroy {
         (_processNextHandler) => {
           // Don't do anything.
           this.confirmDismiss();
-        }
+        },
       );
     }
   }

diff --git a/src/app/brew/brew-edit/brew-edit.component.ts b/src/app/brew/brew-edit/brew-edit.component.ts
@@ -61,7 +61,7 @@ export class BrewEditComponent implements OnInit {
     private readonly bleManager: CoffeeBluetoothDevicesService,
     private readonly uiAlert: UIAlert,
     private readonly visualizerService: VisualizerService,
-    private readonly hapticService: HapticService
+    private readonly hapticService: HapticService,
   ) {
     this.settings = this.uiSettingsStorage.getSettings();
     // Moved from ionViewDidEnter, because of Ionic issues with ion-range
@@ -104,7 +104,7 @@ export class BrewEditComponent implements OnInit {
           },
           () => {
             // No
-          }
+          },
         );
     } else {
       this.dismiss();
@@ -121,7 +121,7 @@ export class BrewEditComponent implements OnInit {
     try {
       if (this.brewBrewing.brewBrewingGraphEl) {
         Plotly.purge(
-          this.brewBrewing.brewBrewingGraphEl.profileDiv.nativeElement
+          this.brewBrewing.brewBrewingGraphEl.profileDiv.nativeElement,
         );
       }
     } catch (ex) {}
@@ -130,7 +130,7 @@ export class BrewEditComponent implements OnInit {
         dismissed: true,
       },
       undefined,
-      BrewEditComponent.COMPONENT_ID
+      BrewEditComponent.COMPONENT_ID,
     );
   }
   private stopScaleTimer() {
@@ -189,7 +189,7 @@ export class BrewEditComponent implements OnInit {
         .length > 0
     ) {
       const savedPath: string = await this.brewBrewing.saveFlowProfile(
-        this.data.config.uuid
+        this.data.config.uuid,
       );
       if (savedPath !== '') {
         this.data.flow_profile = savedPath;
@@ -212,7 +212,17 @@ export class BrewEditComponent implements OnInit {
     this.uiToast.showInfoToast('TOAST_BREW_EDITED_SUCCESSFULLY');
     this.uiAnalytics.trackEvent(
       BREW_TRACKING.TITLE,
-      BREW_TRACKING.ACTIONS.EDIT_FINISH
+      BREW_TRACKING.ACTIONS.EDIT_FINISH,
+    );
+    this.uiAnalytics.trackEvent(
+      BREW_TRACKING.TITLE,
+      BREW_TRACKING.ACTIONS.EDIT_FINISH_PREPARATION_TYPE,
+      this.data.getPreparation().type,
+    );
+    this.uiAnalytics.trackEvent(
+      BREW_TRACKING.TITLE,
+      BREW_TRACKING.ACTIONS.EDIT_FINISH_PREPARATION_STYLE,
+      this.data.getPreparation().style_type,
     );
     this.dismiss();
   }
@@ -235,15 +245,15 @@ export class BrewEditComponent implements OnInit {
     }
     this.uiAnalytics.trackEvent(
       BREW_TRACKING.TITLE,
-      BREW_TRACKING.ACTIONS.EDIT
+      BREW_TRACKING.ACTIONS.EDIT,
     );
     if (this.settings.security_check_when_going_back === true) {
       this.disableHardwareBack = this.platform.backButton.subscribeWithPriority(
         9999,
         (processNextHandler) => {
           // Don't do anything.
           this.confirmDismiss();
-        }
+        },
       );
     }
   }

diff --git a/src/app/preparation/preparation-add-type/preparation-add-type.component.ts b/src/app/preparation/preparation-add-type/preparation-add-type.component.ts
@@ -37,13 +37,13 @@ export class PreparationAddTypeComponent implements OnInit {
     private readonly uiToast: UIToast,
     private readonly translate: TranslateService,
     private readonly uiAnalytics: UIAnalytics,
-    private readonly uiPreparationHelper: UIPreparationHelper
+    private readonly uiPreparationHelper: UIPreparationHelper,
   ) {}
 
   public ionViewWillEnter(): void {
     this.uiAnalytics.trackEvent(
       PREPARATION_TRACKING.TITLE,
-      PREPARATION_TRACKING.ACTIONS.ADD_TYPE
+      PREPARATION_TRACKING.ACTIONS.ADD_TYPE,
     );
   }
 
@@ -77,6 +77,17 @@ export class PreparationAddTypeComponent implements OnInit {
     ) {
       await this.uiPreparationHelper.connectDevice(newPreparation);
     }
+
+    this.uiAnalytics.trackEvent(
+      PREPARATION_TRACKING.TITLE,
+      PREPARATION_TRACKING.ACTIONS.ADD_TYPE_FINISH,
+      this.data.type,
+    );
+    this.uiAnalytics.trackEvent(
+      PREPARATION_TRACKING.TITLE,
+      PREPARATION_TRACKING.ACTIONS.ADD_STYLE_FINISH,
+      this.data.style_type,
+    );
   }
 
   public async dismiss(_added: boolean) {
@@ -86,7 +97,7 @@ export class PreparationAddTypeComponent implements OnInit {
         added: _added,
       },
       undefined,
-      PreparationAddTypeComponent.COMPONENT_ID
+      PreparationAddTypeComponent.COMPONENT_ID,
     );
   }
 
@@ -95,7 +106,7 @@ export class PreparationAddTypeComponent implements OnInit {
 
     if (this.data.type !== PREPARATION_TYPES.CUSTOM_PREPARATION) {
       this.data.name = this.translate.instant(
-        'PREPARATION_TYPE_' + this.data.type
+        'PREPARATION_TYPE_' + this.data.type,
       );
     }
     this.data.style_type = this.data.getPresetStyleType();

diff --git a/src/data/tracking/beanTracking.ts b/src/data/tracking/beanTracking.ts
@@ -18,5 +18,7 @@ export default {
     SHOW_BREWS: 'SHOW_BREWS',
     CUPPING: 'CUPPING',
     UNARCHIVE: 'UNARCHIVE',
+    NFC_SCAN: 'NFC_SCAN',
+    NFC_WRITE: 'NFC_WRITE',
   },
 };
diff --git a/src/data/tracking/bluetoothTracking.ts b/src/data/tracking/bluetoothTracking.ts
@@ -0,0 +1,14 @@
+export default {
+  TITLE: 'BLUETOOTH',
+  ACTIONS: {
+    SCALE_CONNECTED: 'SCALE_CONNECTED',
+    PRESSURE_CONNECTED: 'PRESSURE_CONNECTED',
+    TEMPERATURE_CONNECTED: 'TEMPERATURE_CONNECTED',
+    REFRACTOMETER_CONNECTED: 'REFRACTOMETER_CONNECTED',
+
+    SCALE_USED: 'SCALE_USED',
+    PRESSURE_USED: 'PRESSURE_USED',
+    TEMPERATURE_USED: 'TEMPERATURE_USED',
+    REFRACTOMETER_USED: 'REFRACTOMETER_USED',
+  },
+};
diff --git a/src/data/tracking/brewTracking.ts b/src/data/tracking/brewTracking.ts
@@ -20,5 +20,9 @@ export default {
     BRIX_CALCULATION: 'BRIX_CALCULATION',
     RATIO_CALCULATION: 'RATIO_CALCULATION',
     EXTRACTION_GRAPH: 'EXTRACTION_GRAPH',
+    ADD_FINISH_PREPARATION_TYPE: 'ADD_FINISH_PREPARATION_TYPE',
+    ADD_FINISH_PREPARATION_STYLE: 'ADD_FINISH_PREPARATION_STYLE',
+    EDIT_FINISH_PREPARATION_TYPE: 'EDIT_FINISH_PREPARATION_TYPE',
+    EDIT_FINISH_PREPARATION_STYLE: 'EDIT_FINISH_PREPARATION_STYLE',
   },
 };
diff --git a/src/data/tracking/intentHandlerTracking.ts b/src/data/tracking/intentHandlerTracking.ts
@@ -0,0 +1,9 @@
+export default {
+  TITLE: 'INTENT_HANDLER',
+  ACTIONS: {
+    VISUALIZER_IMPORT: 'VISUALIZER_IMPORT',
+    IMPORT_ROASTER_BEAN: 'IMPORT_ROASTER_BEAN',
+    ADD_USER_SHARED_BEAN: 'ADD_USER_SHARED_BEAN',
+    INTERNAL_CALL: 'INTERNAL_CALL',
+  },
+};
diff --git a/src/data/tracking/preparationTracking.ts b/src/data/tracking/preparationTracking.ts
@@ -4,6 +4,8 @@ export default {
     ADD: 'ADD',
     ADD_FINISH: 'ADD_FINISH',
     ADD_TYPE: 'ADD_TYPE',
+    ADD_TYPE_FINISH: 'ADD_TYPE_FINISH',
+    ADD_STYLE_FINISH: 'ADD_STYLE_FINISH',
     POPOVER_ACTIONS: 'POPOVER_ACTIONS',
     REPEAT: 'REPEAT',
     EDIT: 'EDIT',