remove empty result sync handler

teambtcmap · Dec 21, 2023 · 075a82e · 075a82e
1 parent 1ea5544
commit 075a82e
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 140 deletions.
diff --git a/src/lib/sync/areas.ts b/src/lib/sync/areas.ts
@@ -29,20 +29,13 @@ export const areasSync = async () => {
 							`https://api.btcmap.org/v2/areas?updated_since=${updatedSince}&limit=${limit}`
 						);
 
-						if (response.data.length) {
-							updatedSince = response.data[response.data.length - 1]['updated_at'];
-							responseCount = response.data.length;
-							const areasUpdated = areasData.filter(
-								(area) => !response.data.find((data) => data.id === area.id)
-							);
-							areasData = areasUpdated;
-							response.data.forEach((data) => areasData.push(data));
-						} else {
-							areaError.set(
-								'Areas API returned an empty result, please try again or contact BTC Map.'
-							);
-							break;
-						}
+						updatedSince = response.data[response.data.length - 1]['updated_at'];
+						responseCount = response.data.length;
+						const areasUpdated = areasData.filter(
+							(area) => !response.data.find((data) => data.id === area.id)
+						);
+						areasData = areasUpdated;
+						response.data.forEach((data) => areasData.push(data));
 					} catch (error) {
 						areaError.set('Could not load areas from API, please try again or contact BTC Map.');
 						console.log(error);
@@ -161,20 +154,13 @@ export const areasSync = async () => {
 						`https://api.btcmap.org/v2/areas?updated_since=${updatedSince}&limit=${limit}`
 					);
 
-					if (response.data.length) {
-						updatedSince = response.data[response.data.length - 1]['updated_at'];
-						responseCount = response.data.length;
-						const areasUpdated = areasData.filter(
-							(area) => !response.data.find((data) => data.id === area.id)
-						);
-						areasData = areasUpdated;
-						response.data.forEach((data) => areasData.push(data));
-					} else {
-						areaError.set(
-							'Areas API returned an empty result, please try again or contact BTC Map.'
-						);
-						break;
-					}
+					updatedSince = response.data[response.data.length - 1]['updated_at'];
+					responseCount = response.data.length;
+					const areasUpdated = areasData.filter(
+						(area) => !response.data.find((data) => data.id === area.id)
+					);
+					areasData = areasUpdated;
+					response.data.forEach((data) => areasData.push(data));
 				} catch (error) {
 					areaError.set('Could not load areas from API, please try again or contact BTC Map.');
 					console.log(error);

diff --git a/src/lib/sync/elements.ts b/src/lib/sync/elements.ts
@@ -34,20 +34,13 @@ export const elementsSync = async () => {
 							`https://api.btcmap.org/v2/elements?updated_since=${updatedSince}&limit=${limit}`
 						);
 
-						if (response.data.length) {
-							updatedSince = response.data[response.data.length - 1]['updated_at'];
-							responseCount = response.data.length;
-							const elementsUpdated = elementsData.filter(
-								(element) => !response.data.find((data) => data.id === element.id)
-							);
-							elementsData = elementsUpdated;
-							response.data.forEach((data) => elementsData.push(data));
-						} else {
-							elementError.set(
-								'Elements API returned an empty result, please try again or contact BTC Map.'
-							);
-							break;
-						}
+						updatedSince = response.data[response.data.length - 1]['updated_at'];
+						responseCount = response.data.length;
+						const elementsUpdated = elementsData.filter(
+							(element) => !response.data.find((data) => data.id === element.id)
+						);
+						elementsData = elementsUpdated;
+						response.data.forEach((data) => elementsData.push(data));
 					} catch (error) {
 						elementError.set(
 							'Could not load elements from API, please try again or contact BTC Map.'
@@ -179,20 +172,13 @@ export const elementsSync = async () => {
 						`https://api.btcmap.org/v2/elements?updated_since=${updatedSince}&limit=${limit}`
 					);
 
-					if (response.data.length) {
-						updatedSince = response.data[response.data.length - 1]['updated_at'];
-						responseCount = response.data.length;
-						const elementsUpdated = elementsData.filter(
-							(element) => !response.data.find((data) => data.id === element.id)
-						);
-						elementsData = elementsUpdated;
-						response.data.forEach((data) => elementsData.push(data));
-					} else {
-						elementError.set(
-							'Elements API returned an empty result, please try again or contact BTC Map.'
-						);
-						break;
-					}
+					updatedSince = response.data[response.data.length - 1]['updated_at'];
+					responseCount = response.data.length;
+					const elementsUpdated = elementsData.filter(
+						(element) => !response.data.find((data) => data.id === element.id)
+					);
+					elementsData = elementsUpdated;
+					response.data.forEach((data) => elementsData.push(data));
 				} catch (error) {
 					elementError.set(
 						'Could not load elements from API, please try again or contact BTC Map.'

diff --git a/src/lib/sync/events.ts b/src/lib/sync/events.ts
@@ -29,20 +29,13 @@ export const eventsSync = async () => {
 							`https://api.btcmap.org/v2/events?updated_since=${updatedSince}&limit=${limit}`
 						);
 
-						if (response.data.length) {
-							updatedSince = response.data[response.data.length - 1]['updated_at'];
-							responseCount = response.data.length;
-							const eventsUpdated = eventsData.filter(
-								(event) => !response.data.find((data) => data.id === event.id)
-							);
-							eventsData = eventsUpdated;
-							response.data.forEach((data) => eventsData.push(data));
-						} else {
-							eventError.set(
-								'Events API returned an empty result, please try again or contact BTC Map.'
-							);
-							break;
-						}
+						updatedSince = response.data[response.data.length - 1]['updated_at'];
+						responseCount = response.data.length;
+						const eventsUpdated = eventsData.filter(
+							(event) => !response.data.find((data) => data.id === event.id)
+						);
+						eventsData = eventsUpdated;
+						response.data.forEach((data) => eventsData.push(data));
 					} catch (error) {
 						eventError.set('Could not load events from API, please try again or contact BTC Map.');
 						console.log(error);
@@ -167,20 +160,13 @@ export const eventsSync = async () => {
 						`https://api.btcmap.org/v2/events?updated_since=${updatedSince}&limit=${limit}`
 					);
 
-					if (response.data.length) {
-						updatedSince = response.data[response.data.length - 1]['updated_at'];
-						responseCount = response.data.length;
-						const eventsUpdated = eventsData.filter(
-							(event) => !response.data.find((data) => data.id === event.id)
-						);
-						eventsData = eventsUpdated;
-						response.data.forEach((data) => eventsData.push(data));
-					} else {
-						eventError.set(
-							'Events API returned an empty result, please try again or contact BTC Map.'
-						);
-						break;
-					}
+					updatedSince = response.data[response.data.length - 1]['updated_at'];
+					responseCount = response.data.length;
+					const eventsUpdated = eventsData.filter(
+						(event) => !response.data.find((data) => data.id === event.id)
+					);
+					eventsData = eventsUpdated;
+					response.data.forEach((data) => eventsData.push(data));
 				} catch (error) {
 					eventError.set('Could not load events from API, please try again or contact BTC Map.');
 					console.log(error);

diff --git a/src/lib/sync/reports.ts b/src/lib/sync/reports.ts
@@ -29,20 +29,13 @@ export const reportsSync = async () => {
 							`https://api.btcmap.org/v2/reports?updated_since=${updatedSince}&compress=true`
 						);
 
-						if (response.data.length) {
-							updatedSince = response.data[response.data.length - 1]['updated_at'];
-							responseCount = response.data.length;
-							const reportsUpdated = reportsData.filter(
-								(report) => !response.data.find((data) => data.id === report.id)
-							);
-							reportsData = reportsUpdated;
-							response.data.forEach((data) => reportsData.push(data));
-						} else {
-							reportError.set(
-								'Reports API returned an empty result, please try again or contact BTC Map.'
-							);
-							break;
-						}
+						updatedSince = response.data[response.data.length - 1]['updated_at'];
+						responseCount = response.data.length;
+						const reportsUpdated = reportsData.filter(
+							(report) => !response.data.find((data) => data.id === report.id)
+						);
+						reportsData = reportsUpdated;
+						response.data.forEach((data) => reportsData.push(data));
 					} catch (error) {
 						reportError.set(
 							'Could not load reports from API, please try again or contact BTC Map.'
@@ -169,20 +162,13 @@ export const reportsSync = async () => {
 						`https://api.btcmap.org/v2/reports?updated_since=${updatedSince}&compress=true`
 					);
 
-					if (response.data.length) {
-						updatedSince = response.data[response.data.length - 1]['updated_at'];
-						responseCount = response.data.length;
-						const reportsUpdated = reportsData.filter(
-							(report) => !response.data.find((data) => data.id === report.id)
-						);
-						reportsData = reportsUpdated;
-						response.data.forEach((data) => reportsData.push(data));
-					} else {
-						reportError.set(
-							'Reports API returned an empty result, please try again or contact BTC Map.'
-						);
-						break;
-					}
+					updatedSince = response.data[response.data.length - 1]['updated_at'];
+					responseCount = response.data.length;
+					const reportsUpdated = reportsData.filter(
+						(report) => !response.data.find((data) => data.id === report.id)
+					);
+					reportsData = reportsUpdated;
+					response.data.forEach((data) => reportsData.push(data));
 				} catch (error) {
 					reportError.set('Could not load reports from API, please try again or contact BTC Map.');
 					console.log(error);

diff --git a/src/lib/sync/users.ts b/src/lib/sync/users.ts
@@ -29,20 +29,13 @@ export const usersSync = async () => {
 							`https://api.btcmap.org/v2/users?updated_since=${updatedSince}&limit=${limit}`
 						);
 
-						if (response.data.length) {
-							updatedSince = response.data[response.data.length - 1]['updated_at'];
-							responseCount = response.data.length;
-							const usersUpdated = usersData.filter(
-								(user) => !response.data.find((data) => data.id === user.id)
-							);
-							usersData = usersUpdated;
-							response.data.forEach((data) => usersData.push(data));
-						} else {
-							userError.set(
-								'Users API returned an empty result, please try again or contact BTC Map.'
-							);
-							break;
-						}
+						updatedSince = response.data[response.data.length - 1]['updated_at'];
+						responseCount = response.data.length;
+						const usersUpdated = usersData.filter(
+							(user) => !response.data.find((data) => data.id === user.id)
+						);
+						usersData = usersUpdated;
+						response.data.forEach((data) => usersData.push(data));
 					} catch (error) {
 						userError.set('Could not load users from API, please try again or contact BTC Map.');
 						console.log(error);
@@ -161,20 +154,13 @@ export const usersSync = async () => {
 						`https://api.btcmap.org/v2/users?updated_since=${updatedSince}&limit=${limit}`
 					);
 
-					if (response.data.length) {
-						updatedSince = response.data[response.data.length - 1]['updated_at'];
-						responseCount = response.data.length;
-						const usersUpdated = usersData.filter(
-							(user) => !response.data.find((data) => data.id === user.id)
-						);
-						usersData = usersUpdated;
-						response.data.forEach((data) => usersData.push(data));
-					} else {
-						userError.set(
-							'Users API returned an empty result, please try again or contact BTC Map.'
-						);
-						break;
-					}
+					updatedSince = response.data[response.data.length - 1]['updated_at'];
+					responseCount = response.data.length;
+					const usersUpdated = usersData.filter(
+						(user) => !response.data.find((data) => data.id === user.id)
+					);
+					usersData = usersUpdated;
+					response.data.forEach((data) => usersData.push(data));
 				} catch (error) {
 					userError.set('Could not load users from API, please try again or contact BTC Map.');
 					console.log(error);