Account for no current owner, but historical owners

Also add cache hit header, and ignore some caches locally.
mcongrove · Jan 11, 2025 · 8b6e8a1 · 8b6e8a1
1 parent 6cbf592
commit 8b6e8a1
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 17 deletions.
diff --git a/src/pages/Car.tsx b/src/pages/Car.tsx
@@ -106,7 +106,24 @@ export const CarProfile = () => {
 				setCar(carData);
 
 				if (carData?.owner_history?.length) {
-					setTimelineOwners(carData.owner_history);
+					const ownerHistory = carData.owner_history;
+					const lastOwner = ownerHistory[0];
+
+					if (lastOwner?.date_end && !carData.destroyed) {
+						ownerHistory.unshift({
+							id: 'unknown-current',
+							name: 'Unknown',
+							date_end: undefined,
+							date_start: lastOwner.date_end,
+							city: undefined,
+							country: undefined,
+							state: undefined,
+							car_id: carData.id,
+							owner_id: 'unknown-current',
+						});
+					}
+
+					setTimelineOwners(ownerHistory);
 				}
 
 				if (carData?.vin) {
@@ -298,7 +315,7 @@ export const CarProfile = () => {
 							!startYear && !endYear
 								? ''
 								: index === 0
-									? car.destroyed
+									? car.destroyed || endYear
 										? `${startYear || 'Unknown'} – ${endYear || 'Destruction'}`
 										: `${startYear || 'Unknown'} – Present`
 									: `${startYear || 'Unknown'} – ${endYear || 'Unknown'}`,

diff --git a/src/utils/car.ts b/src/utils/car.ts
@@ -87,6 +87,7 @@ export const colorMap: Record<string, string> = {
 	'sapphire blue mica': '#002B7F',
 	silver: '#C6C9CA',
 	'silver stone metallic': '#C7C9C7',
+	'snowflake white pearl mica': '#F0F0F0',
 	'starlight mica blue': '#2E2787',
 	'strato blue mica': '#1B365D',
 	'sunburst yellow': '#FFD700',

diff --git a/src/worker/routes/cars.ts b/src/worker/routes/cars.ts
@@ -51,7 +51,11 @@ carsRouter.get('/', async (c) => {
 			const cached = await c.env.CACHE.get(cacheKey);
 
 			if (cached) {
-				return c.json(JSON.parse(cached));
+				const response = c.json(JSON.parse(cached));
+
+				response.headers.set('X-Cache', 'HIT');
+
+				return response;
 			}
 		}
 
@@ -254,8 +258,12 @@ carsRouter.get('/:id', async (c) => {
 		const cacheKey = `cars:details:${id}`;
 		const cached = await c.env.CACHE.get(cacheKey);
 
-		if (cached) {
-			return c.json(JSON.parse(cached));
+		if (cached && c.env.NODE_ENV !== 'development') {
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);
@@ -374,7 +382,11 @@ carsRouter.get('/:id/summary', async (c) => {
 		const cached = await c.env.CACHE.get(cacheKey);
 
 		if (cached) {
-			return c.json(JSON.parse(cached));
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);

diff --git a/src/worker/routes/editions.ts b/src/worker/routes/editions.ts
@@ -33,8 +33,12 @@ editionsRouter.get('/', async (c) => {
 	try {
 		const cached = await c.env.CACHE.get('editions:all');
 
-		if (cached) {
-			return c.json(JSON.parse(cached));
+		if (cached && c.env.NODE_ENV !== 'development') {
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);
@@ -97,8 +101,12 @@ editionsRouter.get('/names', async (c) => {
 	try {
 		const cached = await c.env.CACHE.get('editions:names');
 
-		if (cached) {
-			return c.json(JSON.parse(cached));
+		if (cached && c.env.NODE_ENV !== 'development') {
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);

diff --git a/src/worker/routes/heartbeat.ts b/src/worker/routes/heartbeat.ts
@@ -47,7 +47,11 @@ archiveRouter.get('/pulse', async (c) => {
 		const cached = await c.env.CACHE.get('heartbeat:pulse');
 
 		if (cached) {
-			return c.json(JSON.parse(cached));
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const clerk = createClerkClient({
@@ -104,7 +108,11 @@ archiveRouter.get('/archive', async (c) => {
 			return c.json({ error: 'No archive information available' }, 404);
 		}
 
-		return c.json(JSON.parse(cached));
+		const response = c.json(JSON.parse(cached));
+
+		response.headers.set('X-Cache', 'HIT');
+
+		return response;
 	} catch (error) {
 		console.error('Error fetching archive info:', error);
 

diff --git a/src/worker/routes/news.ts b/src/worker/routes/news.ts
@@ -39,7 +39,11 @@ newsRouter.get('/', async (c) => {
 			const cached = await c.env.CACHE.get(cacheKey);
 
 			if (cached) {
-				return c.json(JSON.parse(cached));
+				const response = c.json(JSON.parse(cached));
+
+				response.headers.set('X-Cache', 'HIT');
+
+				return response;
 			}
 		}
 
@@ -93,7 +97,11 @@ newsRouter.get('/featured', async (c) => {
 		const cached = await c.env.CACHE.get(cacheKey);
 
 		if (cached) {
-			return c.json(JSON.parse(cached));
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);
@@ -142,7 +150,11 @@ newsRouter.get('/:id', async (c) => {
 			const cached = await c.env.CACHE.get(cacheKey);
 
 			if (cached) {
-				return c.json(JSON.parse(cached));
+				const response = c.json(JSON.parse(cached));
+
+				response.headers.set('X-Cache', 'HIT');
+
+				return response;
 			}
 		}
 

diff --git a/src/worker/routes/owners.ts b/src/worker/routes/owners.ts
@@ -43,7 +43,11 @@ ownersRouter.get('/countries', async (c) => {
 		const cached = await c.env.CACHE.get('owners:countries');
 
 		if (cached) {
-			return c.json(JSON.parse(cached));
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);

diff --git a/src/worker/routes/stats.ts b/src/worker/routes/stats.ts
@@ -33,7 +33,11 @@ statsRouter.get('/', async (c) => {
 		const cached = await c.env.CACHE.get('stats:all');
 
 		if (cached) {
-			return c.json(JSON.parse(cached));
+			const response = c.json(JSON.parse(cached));
+
+			response.headers.set('X-Cache', 'HIT');
+
+			return response;
 		}
 
 		const db = createDb(c.env.DB);