fix : params in case of already params in original url

Samagra-Development · Sep 4, 2023 · 6976d1b · 6976d1b
1 parent d0961da
commit 6976d1b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/apps/api/src/app/app.controller.ts b/apps/api/src/app/app.controller.ts
@@ -99,9 +99,10 @@ export class AppController {
     let reRouteURL: string = response?.reRouteurl;
     const redirectedLink: LinkModel = response?.redirectedLink;
     // console.log(Object.keys(queryParams));
-    const params = redirectedLink?.params;
+    // const params = redirectedLink?.params;
+    const isParams = new URL(reRouteURL).searchParams.toString() !== "";
     if (queryParams && Object.keys(queryParams).length) {
-      if (params == null) {
+      if (!isParams) {
         reRouteURL += "?";
       } else {
         reRouteURL += "&";
@@ -118,7 +119,7 @@ export class AppController {
       });
       reRouteURL += qparams.join("&") || "";
     }
-    // console.log("ReRouted URL is:",{reRouteURL});
+    console.log("ReRouted URL is:",{reRouteURL});
     if (reRouteURL !== '') {
       console.log("Redirected URL is ",{reRouteURL});
       this.clickServiceClient

diff --git a/apps/api/src/app/app.service.ts b/apps/api/src/app/app.service.ts
@@ -229,17 +229,18 @@ export class AppService {
             return { reRouteurl : '' , redirectedLink:null };
             // return "";
           }
+          return { reRouteurl : url , redirectedLink:link };
 
-          if(params == null){
-            return { reRouteurl : url , redirectedLink:link };
-            // return url;
-          }else {
-            Object.keys(params).forEach(function(d) {
-              ret.push(encodeURIComponent(d) + '=' + encodeURIComponent(params[d]));
-            })
-            return { reRouteurl : `${url}?${ret.join('&')}` || '' , redirectedLink:link };
-            // return `${url}?${ret.join('&')}` || '';
-          }
+          // if(params == null){
+          //   return { reRouteurl : url , redirectedLink:link };
+          //   // return url;
+          // }else {
+          //   Object.keys(params).forEach(function(d) {
+          //     ret.push(encodeURIComponent(d) + '=' + encodeURIComponent(params[d]));
+          //   })
+          //   return { reRouteurl : `${url}?${ret.join('&')}` || '' , redirectedLink:link };
+          //   // return `${url}?${ret.join('&')}` || '';
+          // }
         })
         .catch(err => {
             this.telemetryService.sendEvent(this.configService.get<string>('POSTHOG_DISTINCT_KEY'), "Exception in fetching data from redis falling back to DB", {error: err.message})
@@ -286,17 +287,20 @@ export class AppService {
           }
 
           this.redisUtils.setKey(response[0]); 
-
-          if(params == null){
-            return { reRouteurl : url , redirectedLink: null };
-            // return url;
-          }else {
-            Object.keys(params).forEach(function(d) {
-              ret.push(encodeURIComponent(d) + '=' + encodeURIComponent(params[d]));
-            })
-            return { reRouteurl : `${url}?${ret.join('&')}` || '' , redirectedLink:response[0] };
-            // return `${url}?${ret.join('&')}` || '';
-          }
+
+          return { reRouteurl : url , redirectedLink: response[0] };
+
+          // if(params == null){
+          //   return { reRouteurl : url , redirectedLink: null };
+          //   // return url;
+          // }
+          // else {
+          //   Object.keys(params).forEach(function(d) {
+          //     ret.push(encodeURIComponent(d) + '=' + encodeURIComponent(params[d]));
+          //   })
+          //   return { reRouteurl : `${url}?${ret.join('&')}` || '' , redirectedLink:response[0] };
+          //   // return `${url}?${ret.join('&')}` || '';
+          // }
         })
         .catch(err => {
           this.telemetryService.sendEvent(this.configService.get<string>('POSTHOG_DISTINCT_KEY'), "Exception in getLinkFromHashIdOrCustomHashId query", {error: err.message})