From 4be0020424a3edb1bb9f337866e23d543478e23e Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 11 Jul 2023 21:36:39 +0300
Subject: [PATCH] server/routers: remove try/catch api/trpc: fix setExtra
 utils/axios: remove JSON.stringify

---
 apps/web/pages/api/trpc/[trpc].ts          |  2 +-
 apps/web/server/routers/calculate/index.ts | 37 +++++--------
 apps/web/server/routers/quote/index.ts     | 61 +++++++++-------------
 apps/web/utils/axios.ts                    |  2 +-
 4 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/apps/web/pages/api/trpc/[trpc].ts b/apps/web/pages/api/trpc/[trpc].ts
index 6240ae2..e0c6f23 100644
--- a/apps/web/pages/api/trpc/[trpc].ts
+++ b/apps/web/pages/api/trpc/[trpc].ts
@@ -25,7 +25,7 @@ export default trpcNext.createNextApiHandler({
     // send to bug reporting
     withScope((scope) => {
       (Object.keys(opts) as Array<keyof typeof opts>).forEach((key) => {
-        scope.setExtra(key, JSON.stringify(opts[key]));
+        if (key !== 'req') scope.setExtra(key, opts[key]);
       });
       captureException(error);
     });
diff --git a/apps/web/server/routers/calculate/index.ts b/apps/web/server/routers/calculate/index.ts
index ea3de3f..ecb9aff 100644
--- a/apps/web/server/routers/calculate/index.ts
+++ b/apps/web/server/routers/calculate/index.ts
@@ -50,31 +50,22 @@ export const calculateRouter = router({
         input,
       });
 
-      try {
-        const calculateResult = await calculate(requestData);
+      const calculateResult = await calculate(requestData);
 
-        const result = transformCalculateResults({
-          calculateInput: input,
-          requestCalculate: requestData,
-          responseCalculate: calculateResult,
-        });
+      const result = transformCalculateResults({
+        calculateInput: input,
+        requestCalculate: requestData,
+        responseCalculate: calculateResult,
+      });
 
-        // TEMP
-        if (ctx.unlimited) {
-          result.__calculateResult = calculateResult;
-        }
-
-        return {
-          data: result,
-          success: true,
-        };
-      } catch (error_) {
-        const error = (error_ as Error).message;
-
-        return {
-          error,
-          success: false,
-        };
+      // TEMP
+      if (ctx.unlimited) {
+        result.__calculateResult = calculateResult;
       }
+
+      return {
+        data: result,
+        success: true,
+      };
     }),
 });
diff --git a/apps/web/server/routers/quote/index.ts b/apps/web/server/routers/quote/index.ts
index 120f29b..65ab388 100644
--- a/apps/web/server/routers/quote/index.ts
+++ b/apps/web/server/routers/quote/index.ts
@@ -129,46 +129,37 @@ export const quoteRouter = router({
         input,
       });
 
-      try {
-        const calculateResult = await calculate(requestData);
+      const calculateResult = await calculate(requestData);
 
-        const requestCreateKP = compatRequestCreateKP({
-          domainName: user.domainName,
-          finGAP: input.fingap,
-          insurance: Object.values(input.insurance.values),
-          calculation: {
-            calculationValues: await compatValues(input.values, { apolloClient }),
-            ...calculateResult,
-            preparedPayments: requestData.preparedPayments,
-            additionalData: requestData.additionalData,
-          },
-          elt: input.elt,
-        });
+      const requestCreateKP = compatRequestCreateKP({
+        domainName: user.domainName,
+        finGAP: input.fingap,
+        insurance: Object.values(input.insurance.values),
+        calculation: {
+          calculationValues: await compatValues(input.values, { apolloClient }),
+          ...calculateResult,
+          preparedPayments: requestData.preparedPayments,
+          additionalData: requestData.additionalData,
+        },
+        elt: input.elt,
+      });
 
-        const createKPResult = await createKP(requestCreateKP);
+      const createKPResult = await createKP(requestCreateKP);
 
-        const result = transformCalculateResults({
-          calculateInput: input,
-          requestCalculate: requestData,
-          responseCalculate: calculateResult,
-        });
+      const result = transformCalculateResults({
+        calculateInput: input,
+        requestCalculate: requestData,
+        responseCalculate: calculateResult,
+      });
 
-        if (URL_CRM_DOWNLOADKP) {
-          result.values.downloadKp = URL_CRM_DOWNLOADKP?.concat(createKPResult.offerprintformapi);
-        }
-
-        return {
-          data: result,
-          success: true,
-        };
-      } catch (error_) {
-        const error = (error_ as Error).message;
-
-        return {
-          error,
-          success: false,
-        };
+      if (URL_CRM_DOWNLOADKP) {
+        result.values.downloadKp = URL_CRM_DOWNLOADKP?.concat(createKPResult.offerprintformapi);
       }
+
+      return {
+        data: result,
+        success: true,
+      };
     }),
 });
 
diff --git a/apps/web/utils/axios.ts b/apps/web/utils/axios.ts
index 9d96998..08e1585 100644
--- a/apps/web/utils/axios.ts
+++ b/apps/web/utils/axios.ts
@@ -26,7 +26,7 @@ export async function withHandleError<T>(fn: Promise<T>) {
 
       withScope((scope) => {
         (Object.keys(opts) as Array<keyof typeof opts>).forEach((key) => {
-          scope.setExtra(key, JSON.stringify(opts[key]));
+          scope.setExtra(key, opts[key]);
         });
         captureMessage(`${error_.message} | ${message}`);
       });