Refactor - return PredbatData object

Author: llbbdd

dist/Predbat-Table-Card-Next.js

@@ -10,7 +10,6 @@ import { modalStyles } from './styles/modal-styles';
 import { divElement, getVersionRowElement, haCardElement, styleElement, toggleCarCharging, toggleGeneratingPlan } from './utils/html-utils';
 import { PredbatService } from './services/predbat-service';
 import { PredbatData } from './PredbatData';
-import { RawData } from './schemas/predbat';
 
 class PredbatTableCard extends HTMLElement {
   private _haService = new HomeAssistantService();
@@ -172,8 +171,8 @@ class PredbatTableCard extends HTMLElement {
     });
   }
 
-  public setPlanData = (validatedHistoricPlanData: RawData, validatedPlanData: RawData): void => {
-    this._planData = new PredbatData(validatedHistoricPlanData, validatedPlanData);
+  public setPlanData = (planData: PredbatData): void => {
+    this._planData = planData;
 
     this._render();
   };

src/predbat-card.ts

@@ -1,15 +1,16 @@
+import { PredbatData } from '../PredbatData';
 import { RawData, PredbatRawDataSchema } from '../schemas/predbat';
 
 export class PredbatService {
-  private _dataCallback: ((validatedHistoricPlanData: RawData, validatedPlanData: RawData) => void) | null;
+  private _dataCallback: ((predbatData: PredbatData) => void) | null;
   private _portRestApi: number;
   private _updateIntervalRestApi: ReturnType<typeof setInterval> | null = null;
   private _retryTimeoutRestApi: ReturnType<typeof setTimeout> | null = null;
   private _isAvailableRestApi = false;
   private _fetchInProgressRestApi = false;
   private _dataSource: 'REST_API' | 'HASS_STATES' | null = null;
 
-  public constructor(port: number, dataCallback: (validatedHistoricPlanData: RawData, validatedPlanData: RawData) => void) {
+  public constructor(port: number, dataCallback: (predbatData: PredbatData) => void) {
     this._portRestApi = port;
     this._dataCallback = dataCallback;
 
@@ -58,7 +59,7 @@ export class PredbatService {
 
           if (this._dataCallback === null) throw new Error('this._dataCallback is null');
 
-          this._dataCallback(validatedHistoricPlanData, validatedPlanData);
+          this._dataCallback(new PredbatData(validatedHistoricPlanData, validatedPlanData));
         }
         catch (error) {
           console.error(error);