Remove unnecessary try catch in CalculationsRepository since it already exists in StorageRepository, catch in usePopup instead

Author: juskek

src/data/calculations/CalculationsRepository.ts

@@ -8,83 +8,59 @@ export class CalculationsRepository implements ICalculationsRepository {
     remoteDataSource: IStorageRepository = IStorageRepository.instance;
 
     async storeCalculation(calculationData: CalculationData): Promise<void> {
-        try {
-            const oldCalculations = await this.getAllCalculations();
-            const newCalculations = [calculationData, ...oldCalculations];
-            await this.remoteDataSource.set({
-                allCalculations: JSON.stringify(newCalculations),
-            });
-        } catch (e: unknown) {
-            throw Error(e as string);
-        }
+        const oldCalculations = await this.getAllCalculations();
+        const newCalculations = [calculationData, ...oldCalculations];
+        await this.remoteDataSource.set({
+            allCalculations: JSON.stringify(newCalculations),
+        });
     }
 
     async cacheOngoingCalculation(
         calculationData: CalculationData
     ): Promise<void> {
-        try {
-            await this.remoteDataSource.set({
-                ongoingCalculation: JSON.stringify(calculationData),
-            });
-        } catch (e: unknown) {
-            throw Error(e as string);
-        }
+        await this.remoteDataSource.set({
+            ongoingCalculation: JSON.stringify(calculationData),
+        });
     }
 
     async clearOngoingCalculation(): Promise<void> {
-        try {
-            await this.remoteDataSource.set({
-                ongoingCalculation: null,
-            });
-        } catch (e: unknown) {
-            throw Error(e as string);
-        }
+        await this.remoteDataSource.set({
+            ongoingCalculation: null,
+        });
     }
 
     async getAllCalculations(): Promise<CalculationData[]> {
-        try {
-            const data = await this.remoteDataSource.get({
-                allCalculations: JSON.stringify([]),
-            });
+        const data = await this.remoteDataSource.get({
+            allCalculations: JSON.stringify([]),
+        });
 
-            return JSON.parse(
-                data["allCalculations"] as string
-            ) as CalculationData[];
-        } catch (e: unknown) {
-            throw Error(e as string);
-        }
+        return JSON.parse(
+            data["allCalculations"] as string
+        ) as CalculationData[];
     }
 
     async _getOngoingCalculation(): Promise<CalculationData | null> {
-        try {
-            const data = await this.remoteDataSource.get({
-                ongoingCalculation: null,
-            });
+        const data = await this.remoteDataSource.get({
+            ongoingCalculation: null,
+        });
 
-            if (data["ongoingCalculation"] !== null) {
-                return JSON.parse(
-                    data["ongoingCalculation"] as string
-                ) as CalculationData;
-            }
-            return null;
-        } catch (e: unknown) {
-            throw Error(e as string);
+        if (data["ongoingCalculation"] !== null) {
+            return JSON.parse(
+                data["ongoingCalculation"] as string
+            ) as CalculationData;
         }
+        return null;
     }
 
     async getLastCalculation(): Promise<CalculationData | null> {
-        try {
-            const ongoingCalculation = await this._getOngoingCalculation();
-            if (ongoingCalculation !== null) {
-                return ongoingCalculation;
-            }
-            const oldCalculations = await this.getAllCalculations();
-            if (oldCalculations.length > 0) {
-                return oldCalculations[0];
-            }
-            return null;
-        } catch (e: unknown) {
-            throw Error(e as string);
+        const ongoingCalculation = await this._getOngoingCalculation();
+        if (ongoingCalculation !== null) {
+            return ongoingCalculation;
+        }
+        const oldCalculations = await this.getAllCalculations();
+        if (oldCalculations.length > 0) {
+            return oldCalculations[0];
         }
+        return null;
     }
 }

src/usePopup.ts

@@ -125,13 +125,19 @@ export const usePopup = () => {
                 }
             }
         });
-        calculationsRepository.storeCalculation({
-            bytes: totalBytesTransferred,
-            emissions: emissions,
-            specificEmissions: averageSpecificEmissions,
-            selectedCountries: selectedCountries,
-        });
-        calculationsRepository.clearOngoingCalculation();
+        try {
+            calculationsRepository.storeCalculation({
+                bytes: totalBytesTransferred,
+                emissions: emissions,
+                specificEmissions: averageSpecificEmissions,
+                selectedCountries: selectedCountries,
+            });
+            calculationsRepository.clearOngoingCalculation();
+        } catch (e: unknown) {
+            if (e instanceof Error) {
+                setError(e.message);
+            }
+        }
     };
 
     const addSelectedCountry = async (country: CountryName) => {