chore():manage better controller

Author: jacopobonomi

src/controllers/links.ts

@@ -1,6 +1,6 @@
 import { Express } from "express";
 import { Request, Response } from "express";
-import { Cache, CacheContainer } from "node-ts-cache";
+import { CacheContainer } from "node-ts-cache";
 import { MemoryStorage } from "node-ts-cache-storage-memory";
 
 import { putLink, getLink, deleteLink } from "../services/links";
@@ -17,38 +17,53 @@ export default class LinksController {
     app.use("/docs/links", swaggerUi.serve);
     app.get("/docs/links", swaggerUi.setup(linksDocs));
 
-    app.get("/:_slug", async (req: Request, res: Response) => {
-      const { _slug } = req.params;
-      const cachedLink = await linksCache.getItem<ILink>(_slug);
-
-      if (cachedLink) {
-        return res.redirect(cachedLink.redirect);
-      } else {
-        try {
-          const link: ILink = (await getLink(_slug)) as ILink;
-          const { redirect } = link;
-
-          if (redirect) {
-            await linksCache.setItem(_slug, link, { ttl: 60 });
-            res.redirect(redirect);
-          } else {
-            res.status(404).json({ message: "redirect not found" });
-          }
-        } catch (error) {
-          res.status(404).json({ message: "slug not found" });
-        }
-      }
-    });
+    app.get("/:_slug", async (req: Request, res: Response) =>
+      this.getLinks(req, res)
+    );
 
-    app.post("/api/links", async (req: any, res: any) => {
-      const { body: link } = req;
-      res.json(await putLink(link));
+    app.post("/api/links", async (req: Request, res: Response) => {
+      this.insertLink(req, res);
     });
 
-    app.delete("/api/links/:_id", async (req: any, res: any) => {
-      const { _id } = req.params;
-      res.json(await deleteLink(_id));
-      res.json("result");
+    app.delete("/api/links/:_id", async (req: Request, res: Response) => {
+      this.deleteLink(req, res);
     });
   }
+
+  public deleteLink = async (req: Request, res: Response) => {
+    const { _id } = req.params;
+    res.json(await deleteLink(_id));
+    res.json("result");
+  };
+
+  public insertLink = async (req: Request, res: Response) => {
+    const { body: link } = req;
+    const createdLink = (await putLink(link)) as ILink;
+    await linksCache.setItem(createdLink.slug, null, { ttl: 60 });
+    res.json(createdLink);
+  };
+
+  public getLinks = async (req: Request, res: Response) => {
+    const { _slug } = req.params;
+    const cachedLink = await linksCache.getItem<ILink>(_slug);
+
+    if (cachedLink) {
+      return res.redirect(cachedLink.redirect);
+    } else {
+      try {
+        const link: ILink = (await getLink(_slug)) as ILink;
+        const { redirect } = link;
+
+        if (redirect) {
+          await linksCache.setItem(_slug, link, { ttl: 60 });
+          return res.redirect(redirect);
+        } else {
+          return res.status(404).json({ message: "redirect not found" });
+        }
+      } catch (error) {
+        return res.status(404).json({ message: "slug not found" });
+      }
+    }
+  };
+  
 }

src/libs/ddbClient.ts

@@ -4,4 +4,4 @@ if (!process.env.AWS_REGION) {
   throw new Error("AWS_REGION is not set");
 }
 
-export const ddbClient = new DynamoDBClient({ region: process.env.AWS_REGION });
+export const ddbClient = new DynamoDBClient({ region: process.env.AWS_REGION });

src/models/ILink.ts

@@ -1,11 +1,11 @@
 export interface ILinkDTO {
   redirect: string;
   slug?: string;
-  link: string;
+  short_link?: string;
 }
 
 export interface ILink {
   redirect: string;
   slug: string;
-  link: string;
+  short_link: string;
 }

src/services/links.ts

@@ -4,12 +4,17 @@ import { ILink, ILinkDTO } from "../models/ILink";
 
 const { nanoid } = require("nanoid");
 const TABLE_NAME = "links";
+const BASE_PATH = process.env.BASE_URL;
 
-export const putLink = async (link: ILinkDTO) => {
-  const newLink = {
-    ...link,
-    slug: link.slug ? link.slug : nanoid(6),
+export const putLink = async ({ redirect, slug }: ILinkDTO) => {
+  const insertSlug: string = slug ? slug : nanoid(6);
+
+  const newLink: ILink = {
+    redirect,
+    short_link: `${BASE_PATH}/${insertSlug}`,
+    slug: insertSlug,
   };
+
   const params = {
     TableName: TABLE_NAME,
     Item: newLink,
@@ -20,7 +25,6 @@ export const putLink = async (link: ILinkDTO) => {
     return newLink;
   } catch (err) {
     console.error(err);
-    return { message: err, status: "error" };
   }
 };
 
@@ -52,6 +56,5 @@ export const deleteLink = async (slug: string) => {
     return { message: "Link deleted", status: "success" };
   } catch (err) {
     console.error(err);
-    return { message: err, status: "error" };
   }
 };

tsconfig.json

@@ -12,6 +12,7 @@
     "pretty": true,
     "outDir": "build",
     "resolveJsonModule": true,
-    
-  },
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true
+  }
 }