From a28a24821af985d28270f6acd9d142fcf3b77630 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sun, 20 Oct 2024 13:35:17 +0200
Subject: [PATCH] [eval_records] - use jay_merge

---
 eval_records.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/eval_records.py b/eval_records.py
index 48585e7..a50a941 100644
--- a/eval_records.py
+++ b/eval_records.py
@@ -1,13 +1,13 @@
 import json
 import os
 from datetime import datetime
-from deep_diff import deep_merge
+from jay_diff import jay_merge_full
 
 BASE = "results"
 VIN = 'WVWZZZE1ZMP010760'
 YEAR = 2024
 MONTH = 10
-DAY = ['18']
+DAY = ['20']
 
 
 class Endpoint:
@@ -99,6 +99,8 @@ print(day_list)
 
 month_path = path
 record_list = []
+last = {}
+
 for day in day_list:
 	if DAY is not None:
 		if day not in DAY:
@@ -117,21 +119,21 @@ for day in day_list:
 			print(f"Found {len(records)} records")
 			for record in records:
 				try:
-					vehicle_data = record['data']
-					if record['info']['is_delta']:
-						print(f"Found delta record {record['info']['record_id']}")
-						vehicle_data = deep_merge(last, record['data'])
-						record['data'] = vehicle_data
-					else:
+					vehicle_diff = record['data']
+					if not record['info']['is_delta']:
+						last = {}
 						print(f"Found full record {record['info']['record_id']}")
+					else:
+						print(f"Found delta record {record['info']['record_id']}")
 
 				except KeyError:
 					pass
 
+				vehicle_data = jay_merge_full(last, vehicle_diff)
 				last = vehicle_data
 				try:
 					for end_point in end_points:
-						end_point.assign(record)
+						end_point.assign({'info': record['info'], 'data': vehicle_data})
 				except KeyError:
 					pass