feat : migration from Ch to Pg

vigneshshettyin · Jan 14, 2025 · 81319c7 · 81319c7
1 parent 5fb2903
commit 81319c7
Show file tree

Hide file tree

Showing 13 changed files with 297 additions and 192 deletions.
diff --git a/app/[short_id]/route.ts b/app/[short_id]/route.ts
@@ -6,7 +6,7 @@ import {
   setPrivateShortCode,
 } from "@/lib/services/redisPublicGenerate";
 import { NextRequest } from "next/server";
-import PrismaClientManager from "@/lib/services/pgConnect";
+import prisma from "@/lib/services/pgConnect";
 
 export async function GET(req: NextRequest) {
   const path = req.nextUrl.pathname;
@@ -28,7 +28,6 @@ export async function GET(req: NextRequest) {
       HTTP_STATUS.BAD_REQUEST
     );
   } else if (!long_url && !checkIfShortCodePublic(shortCode)) {
-    const prisma = PrismaClientManager.getInstance().getPrismaClient();
     const link = await prisma.links.findFirst({
       where: {
         short_code: shortCode,

diff --git a/app/api/list/route.ts b/app/api/list/route.ts
@@ -4,12 +4,10 @@ import { getServerSession } from "next-auth";
 
 import { ISessionType } from "@/interfaces/url";
 import authOptions from "@/lib/authOptions";
-import PrismaClientManager from "@/lib/services/pgConnect";
+import prisma from "@/lib/services/pgConnect";
 import { HTTP_STATUS, RESPONSE } from "@/lib/constants";
 
 export async function GET(req: NextRequest) {
-  const posgresInstance = PrismaClientManager.getInstance();
-  const prisma = posgresInstance.getPrismaClient();
   const session: ISessionType | null = await getServerSession(authOptions);
   const searchParams = req.nextUrl.searchParams;
 

diff --git a/app/api/ping/route.ts b/app/api/ping/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server";
 
-import PrismaClientManager from "@/lib/services/pgConnect";
+import prisma from "@/lib/services/pgConnect";
 import RedisClientManager from "@/lib/services/redisConnect";
 
 import userAgentAnlytics from "@/lib/services/ua";
@@ -19,8 +19,9 @@ export async function GET(req: NextRequest) {
     user_anlytics: userAgent,
   };
 
-  const posgresInstance = PrismaClientManager.getInstance();
-  const postgresStatus = await posgresInstance.checkStatus();
+  const checkPg = await prisma.$queryRaw`SELECT 1`;
+  const postgresStatus = checkPg === 1;
+
 
   const redisInstance = RedisClientManager.getInstance();
   const redisStatus = await redisInstance.checkStatus();

diff --git a/app/app/(dashboard)/links/[id]/page.tsx b/app/app/(dashboard)/links/[id]/page.tsx
@@ -19,17 +19,13 @@ import {
 } from "@/components/ui/table";
 import { Label } from "@radix-ui/react-label";
 import { PieChart } from "@/components/GraphicalComponents/PieChart";
-import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import { LinkShareDialog } from "@/components/DialogComponents/LinkShareDialog";
 import { EditLinkDialog } from "@/components/DialogComponents/EditLinkDialog";
 import { copyToClipboard } from "@/lib/utils";
-import { LinkType, linkType } from "@/interfaces/types";
+import { headerAnalyticsType, linkType } from "@/interfaces/types";
 import { useEffect, useState } from "react";
-import { getAnalyticsAction } from "@/lib/actions/getAnalyticsAction";
-import { getLinkDetails } from "@/lib/actions/getLinksAction";
-import { HTTP_STATUS } from "@/lib/constants";
-import { toast } from "sonner";
+import { getLinkDetailsWithAnalytics } from "@/lib/actions/getLinksAction";
 import { useRouter } from "next/navigation";
 import { LinkPageLoading } from "@/components/LoadingComponents/LinkPageLoading";
 import { NoDataLoading } from "@/components/LoadingComponents/NoDataLoading";
@@ -67,9 +63,6 @@ export default function Page({
   }
 
   const [link, setLink] = useState({
-    engagement: 1200,
-    last7DaysEngage: 900,
-    weeklyChange: -25,
     devices: {
       Desktop: 720,
       Mobile: 420,
@@ -109,16 +102,50 @@ export default function Page({
     created_at: new Date("2023-05-28T12:34:56Z"),
     title: "Sample Title",
     _count: {
-      click_analytics: 100
-    }
+      click_analytics: 100,
+    },
   });
+
+  const [headerAnalytics, setHeaderAnalytics] = useState<headerAnalyticsType>({
+    totalVisitsThisWeek: 0,
+    totalVisitsLastWeek: 0,
+    percentageChange: 0,
+    devices: [
+      { device: "Desktop", engagements: 720 },
+      { device: "Mobile", engagements: 420 },
+      { device: "Tablet", engagements: 60 },
+    ],
+    os: [
+      { os: "windows11", engagements: 48 },
+      { os: "macOS", engagements: 50 },
+    ],
+    browsers: [
+      { browser: "chrome", engagements: 45 },
+      { browser: "firefox", engagements: 50 },
+      { browser: "safari", engagements: 70 },
+    ],
+    cities: [
+      { city: "New York", engagements: 100 },
+      { city: "Los Angeles", engagements: 50 },
+      { city: "Chicago", engagements: 40 },
+      { city: "Houston", engagements: 30 },
+    ],
+    locations: [
+      { id: 1, country: "United States", engagements: 600, percentage: "50%" },
+      { id: 2, country: "United Kingdom", engagements: 300, percentage: "20%" },
+      { id: 3, country: "Canada", engagements: 180, percentage: "20%" },
+      { id: 4, country: "Australia", engagements: 120, percentage: "10%" },
+    ],
+  });
+
   const router = useRouter();
 
   useEffect(() => {
     setLoading(true);
-    getLinkDetails(decodeId(params.id).toString()).then((res) => {
-      setfetchLink(res.link)
-      setLoading(false)
+    getLinkDetailsWithAnalytics(decodeId(params.id).toString()).then((res) => {
+      setfetchLink(res.link as linkType);
+      setHeaderAnalytics(res.analytics as headerAnalyticsType);
+      setLoading(false);
     });
   }, [router, params.id]);
 
@@ -244,17 +271,23 @@ export default function Page({
       <div className="flex md:flex-row flex-col mt-6 mr-0">
         <div className="flex-1 flex justify-between shadow-md p-4 rounded-xl items-center border-[0.5px]">
           <h1 className="text-md">Engagements</h1>
-          <h1 className="text-2xl font-bold">{fetchLink._count.click_analytics}</h1>
+          <h1 className="text-2xl font-bold">
+            {fetchLink._count.click_analytics}
+          </h1>
         </div>
         <div className="flex-1 flex justify-between shadow-md ml-0 md:mt-0 mt-4 md:ml-4 p-4 rounded-xl items-center border-[0.5px]">
           <h1 className="text-md">Last 7 days</h1>
-          <h1 className="text-2xl font-bold">{link.last7DaysEngage}</h1>
+          <h1 className="text-2xl font-bold">
+            {headerAnalytics.totalVisitsThisWeek}
+          </h1>
         </div>
         <div className="flex-1 flex justify-between shadow-md ml-0 md:mt-0 mt-4 md:ml-4 p-4 rounded-xl items-center border-[0.5px]">
           <h1 className="text-md">Weekly change</h1>
           <div className="flex items-center">
             <ArrowUpDownIcon size={25} />
-            <h1 className="text-2xl font-bold ml-1">{link.weeklyChange}%</h1>
+            <h1 className="text-2xl font-bold ml-1">
+              {headerAnalytics.percentageChange}%
+            </h1>
           </div>
         </div>
       </div>
@@ -270,7 +303,7 @@ export default function Page({
             </TableRow>
           </TableHeader>
           <TableBody>
-            {link.locations.map((location: any) => {
+            {headerAnalytics.locations.map((location: any) => {
               return (
                 <TableRow key={location.id}>
                   <TableCell className="font-medium">{location.id}</TableCell>
@@ -279,7 +312,7 @@ export default function Page({
                     {location.engagements}
                   </TableCell>
                   <TableCell className="text-right">
-                    {location.percentage}%
+                    {location.percentage}
                   </TableCell>
                 </TableRow>
               );
@@ -298,8 +331,12 @@ export default function Page({
                 </div>
               ) : (
                 <PieChart
-                  devices={Object.keys(link.devices ?? {})}
-                  data={Object.values(link.devices ?? {})}
+                  devices={headerAnalytics.devices.map(
+                    (device) => device.device
+                  )}
+                  data={headerAnalytics.devices.map((device) => {
+                    return device.engagements;
+                  })}
                 />
               )}
             </div>
@@ -314,8 +351,8 @@ export default function Page({
                 </div>
               ) : (
                 <PieChart
-                  devices={Object.keys(link.os ?? {})}
-                  data={Object.values(link.os ?? {})}
+                  devices={headerAnalytics.os.map((os) => os.os)}
+                  data={headerAnalytics.os.map((os) => os.engagements)}
                 />
               )}
             </div>
@@ -330,30 +367,34 @@ export default function Page({
                 </div>
               ) : (
                 <PieChart
-                  devices={Object.keys(link.browser ?? {})}
-                  data={Object.values(link.browser ?? {})}
+                  devices={headerAnalytics.browsers.map(
+                    (browser) => browser.browser
+                  )}
+                  data={headerAnalytics.browsers.map(
+                    (browser) => browser.engagements
+                  )}
                 />
               )}
             </div>
           </div>
         </div>
       </div>
-      <div className="flex justify-center md:justify-start"> 
-      <div className="mt-8 shadow-md p-6 rounded-xl w-fit border-[0.5px]">
-            <Label className="font-bold ml-3 text-lg">City</Label>
-            <div className="mt-4 md:w-[300px] md:h-[300px] w-[250px] h-[250px]">
-              {NoDataSet == 1 ? (
-                <div>
-                  <NoDataLoading />
-                </div>
-              ) : (
-                <PieChart
-                  devices={Object.keys(link.city ?? {})}
-                  data={Object.values(link.city ?? {})}
-                />
-              )}
-            </div>
-      </div>
+      <div className="flex justify-center md:justify-start">
+        <div className="mt-8 shadow-md p-6 rounded-xl w-fit border-[0.5px]">
+          <Label className="font-bold ml-3 text-lg">City</Label>
+          <div className="mt-4 md:w-[300px] md:h-[300px] w-[250px] h-[250px]">
+            {NoDataSet == 1 ? (
+              <div>
+                <NoDataLoading />
+              </div>
+            ) : (
+              <PieChart
+                devices={headerAnalytics.cities.map((city) => city.city)}
+                data={headerAnalytics.cities.map((city) => city.engagements)}
+              />
+            )}
+          </div>
+        </div>
       </div>
     </div>
   );

diff --git a/interfaces/types.ts b/interfaces/types.ts
@@ -8,13 +8,12 @@ export interface gettingStartedStatus {
 }
 
 export interface locationsDetails {
-  id:number,
+  id: number;
   country: string;
   engagements: number;
   percentage: number;
 }
 
-
 export interface LinkType {
   id?: number;
   title?: string;
@@ -26,14 +25,13 @@ export interface LinkType {
   weeklyChange?: number;
   locations?: any;
   devices?: Record<string, number>;
-  refs?: Record<string, number>,
-  os?:Record<string, number>,
-  browser?:Record<string, number>,
+  refs?: Record<string, number>;
+  os?: Record<string, number>;
+  browser?: Record<string, number>;
 }
 
-
 export interface QRCodeType {
-  id:number;
+  id: number;
   title?: string;
   shortLink: string;
   longLink: string;
@@ -47,8 +45,8 @@ export interface User {
   startStatus?: gettingStartedStatus;
 }
 
-export type EditLink = Pick<LinkType,'title' | 'shortLink'>
-export type EditQR = Pick<LinkType,'title' | 'shortLink'>
+export type EditLink = Pick<LinkType, "title" | "shortLink">;
+export type EditQR = Pick<LinkType, "title" | "shortLink">;
 
 export type createLink = {
   longUrl: string;
@@ -59,26 +57,59 @@ export type createLink = {
 
 export type createQR = Pick<createLink, "longUrl" | "title" | "shortLink">;
 
-export type publicLinkType =  {
-    longUrl : string;
-    shortUrl : string,
-    clicks? : string
-}
+export type publicLinkType = {
+  longUrl: string;
+  shortUrl: string;
+  clicks?: string;
+};
 
-type countType = Record<string,number>
+type countType = {
+  click_analytics: number;
+};
 
 export type linkType = {
-  id:number,
+  id: number;
   user_id: number;
   short_code: string;
   long_url: string;
   created_at: Date;
   title: string | null;
   engagements?: number;
-  _count:countType
-}
+  _count: countType;
+};
+
+
+
+export type headerAnalyticsType = {
+  totalVisitsThisWeek: number;
+  totalVisitsLastWeek: number;
+  percentageChange: number;
+  devices: Array<{
+    device: string;
+    engagements: number;
+  }>;
+  os: Array<{
+    os: string;
+    engagements: number;
+  }>;
+  browsers: Array<{
+    browser: string;
+    engagements: number;
+  }>;
+  cities: Array<{
+    city: string;
+    engagements: number;
+  }>;
+  locations: Array<{
+    id: number;
+    country: string;
+    engagements: number;
+    percentage: string;
+  }>;
+};
+
 
 export type paginationType = {
-  value: number,
-  pageActive: pageOrder
-}
+  value: number;
+  pageActive: pageOrder;
+};
diff --git a/lib/actions/getAnalyticsAction.ts b/lib/actions/getAnalyticsAction.ts