diff --git a/src/actions/addcomment.action.ts b/src/actions/addcomment.action.ts
index e62dff1..b669cbe 100644
--- a/src/actions/addcomment.action.ts
+++ b/src/actions/addcomment.action.ts
@@ -1,41 +1,23 @@
-"use server";
-import { userAction } from "@/lib/next-safe-action";
-import repositoryService from "@/services/repository.service";
-import { pusherServer } from "@/lib/pusherServer";
-import * as z from "zod";
+// "use server";
+// import { userAction } from "@/lib/next-safe-action";
+// import { postRepositoryComment } from "@/services/repository.service";
+// import * as z from "zod";
 
-const schema = z.object({
-  repositoryId: z.number(),
-  picture: z.string().optional().nullable(),
-  name: z.string().optional().nullable(),
-  username: z.string().optional().nullable(),
-  content: z.string().min(1, "Comment must be at least 1 character long"),
-});
+// const schema = z.object({
+//   repositoryId: z.number(),
+//   picture: z.string().optional().nullable(),
+//   name: z.string().optional().nullable(),
+//   username: z.string().optional().nullable(),
+//   content: z.string().min(1, "Comment must be at least 1 character long"),
+// });
 
-export const addComment = userAction(schema, async (data, ctx) => {
-  try {
-    await pusherServer.trigger(`repo-${data.repositoryId}`, "new-comment", {
-      // content: data.content,
-      // picture: data.picture,
-      // name: data.name,
-      // username: data.username,
-      // userId: ctx.session.user.id,
-      content: data.content,
-      createdBy: {
-        image: data.picture,
-        name: data.name,
-        username: data.username,
-      },
-      createdAt: new Date(),
-      userId: ctx.session.user.id,
-    });
-
-    await repositoryService.addCommentToRepository(
-      data.repositoryId,
-      data.content,
-      ctx.session.user.id,
-    );
-  } catch (error) {
-    if (error instanceof Error) return { error: error.message };
-  }
-});
+// export const addComment = userAction(schema, async (data, ctx) => {
+//   try {
+//     await postRepositoryComment({
+//       repositoryId: data.repositoryId,
+//       content: data.content,
+//     });
+//   } catch (error) {
+//     if (error instanceof Error) return { error: error.message };
+//   }
+// });
diff --git a/src/actions/addrepository.action.ts b/src/actions/addrepository.action.ts
deleted file mode 100644
index 1df1250..0000000
--- a/src/actions/addrepository.action.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-"use server";
-
-import { userAction } from "@/lib/next-safe-action";
-import repositoryService from "@/services/repository.service";
-
-import * as z from "zod";
-
-const schema = z.object({
-  url: z.string().url(),
-  description: z.string(),
-});
-
-export const addRepository = userAction(schema, async (data, ctx) => {
-  try {
-    await repositoryService.postRepository({
-      ...data,
-      createdBy: ctx.session.user.id,
-    });
-  } catch (error) {
-    if (error instanceof Error) return { error: error.message };
-  }
-});
diff --git a/src/actions/admin/hiderepository.action.ts b/src/actions/admin/hiderepository.action.ts
deleted file mode 100644
index f92fe35..0000000
--- a/src/actions/admin/hiderepository.action.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-"use server";
-import { revalidatePath } from "next/cache";
-import { adminAction } from "@/lib/next-safe-action";
-import repositoryService from "@/services/repository.service";
-import * as z from "zod";
-
-const schema = z.object({
-  id: z.number(),
-});
-
-export const hideRepository = adminAction(schema, async (data) => {
-  try {
-    await repositoryService.hideRepository(data.id);
-  } catch (error) {
-    if (error instanceof Error) return { error: error.message };
-  }
-
-  revalidatePath("/");
-});
diff --git a/src/actions/getRepositories.action.ts b/src/actions/getRepositories.action.ts
deleted file mode 100644
index e974741..0000000
--- a/src/actions/getRepositories.action.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-"use server";
-import repositoryService from "@/services/repository.service";
-
-type Props = {
-  query?: string;
-  language?: string;
-  offset?: number;
-  limit?: number;
-  cursor?: number;
-};
-
-export const getRepositoriesOnScroll = async ({
-  query,
-  language,
-  offset = 0,
-  limit = 20,
-  cursor,
-}: Props) => {
-  return await repositoryService.getRepositoriesOnScroll({
-    query,
-    language,
-    offset,
-    limit,
-    cursor,
-  });
-};
-
-export const getRepositories = async () => {
-  return await repositoryService.getRepositories();
-};
diff --git a/src/actions/syncrepositories.action.ts b/src/actions/syncrepositories.action.ts
deleted file mode 100644
index 2d08fd5..0000000
--- a/src/actions/syncrepositories.action.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-"use server";
-import { revalidatePath } from "next/cache";
-import repositoryService from "@/services/repository.service";
-
-export const syncRepositories = async () => {
-  try {
-    await repositoryService.syncRepositories();
-  } catch (error) {
-    if (error instanceof Error) return { error: error.message };
-  }
-
-  revalidatePath("/");
-};
diff --git a/src/app/(app)/repositories/[repositoryId]/page.tsx b/src/app/(app)/repositories/[repositoryId]/page.tsx
index cb99680..61f865f 100644
--- a/src/app/(app)/repositories/[repositoryId]/page.tsx
+++ b/src/app/(app)/repositories/[repositoryId]/page.tsx
@@ -9,7 +9,7 @@ export default async function RepositoryCommentPage({
 }: {
   params: { repositoryId: number };
 }) {
-  const { repository, comments, session, user } = await useFetchCommentsPage(
+  const { repository, comments, session } = await useFetchCommentsPage(
     Number(params.repositoryId),
   );
 
@@ -21,31 +21,27 @@ export default async function RepositoryCommentPage({
     <div className="space-y-12">
       <div className="flex items-center space-x-4">
         <ProfileAvatar
-          pictureUrl={repository.ownerAvatarUrl}
-          alt={repository.repositoryName}
+          pictureUrl={repository.data?.ownerAvatarUrl}
+          alt={repository.data?.repositoryName}
         />
         <div className="flex flex-col">
           <Link
-            href={repository.url}
+            href={repository.data?.url ?? "/"}
             className="text-xl font-semibold hover:underline"
             target="_blank"
           >
-            {repository?.repositoryName}
+            {repository.data?.repositoryName}
           </Link>
           <span className="text-sm">
             Published by{" "}
-            {repository.createdBy.username ?? repository.createdBy.name}
+            {repository.data?.createdBy.username ??
+              repository.data?.createdBy.name}
           </span>
         </div>
       </div>
 
-      <CommentList comments={comments} />
-      {session && (
-        <AddCommentForm
-          user={user}
-          repositoryId={Number(params.repositoryId)}
-        />
-      )}
+      <CommentList comments={comments.data} />
+      {session && <AddCommentForm repositoryId={Number(params.repositoryId)} />}
     </div>
   );
 }
diff --git a/src/app/(app)/repositories/page.tsx b/src/app/(app)/repositories/page.tsx
index 6031372..8f9f73c 100644
--- a/src/app/(app)/repositories/page.tsx
+++ b/src/app/(app)/repositories/page.tsx
@@ -6,13 +6,12 @@ import { DataSharingAgreementForm } from "@/components/organisms/_forms/dataShar
 import { AddRepositoryForm } from "@/components/organisms/_forms/addrepository.form";
 import { useQueryParser } from "@/hooks/useQueryParser";
 import { QueryParamsProvider } from "@/context/queryParamsContext";
-import { ParamsType } from "@/types";
 
 type Props = {
   searchParams?: {
     query?: string;
     language?: string;
-    params?: ParamsType;
+    params?: string;
   };
 };
 
diff --git a/src/app/api/cron/route.ts b/src/app/api/cron/route.ts
index de33658..eb49946 100644
--- a/src/app/api/cron/route.ts
+++ b/src/app/api/cron/route.ts
@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from "next/server";
-import repositoryService from "@/services/repository.service";
-import { env } from "@/env";
+import { syncRepositories } from "@/services/repository.service";
 import adminService from "@/services/admin.service";
+import { env } from "@/env";
 
 export async function GET(request: NextRequest) {
   const authHeader = request.headers.get("authorization");
@@ -9,7 +9,7 @@ export async function GET(request: NextRequest) {
     return new Response("Unauthorized", { status: 401 });
   }
 
-  await repositoryService.syncRepositories();
+  await syncRepositories();
   await adminService.updateCronLastRun();
 
   return NextResponse.json({ ok: "Cron OK" });
diff --git a/src/app/socketio/page.tsx b/src/app/socketio/page.tsx
deleted file mode 100644
index 3d9721a..0000000
--- a/src/app/socketio/page.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { getRepository } from "@/services/actions/repository.service";
-
-export default async function SocketIOPage() {
-  const repository = await getRepository({ repositoryId: 1 });
-  console.log(repository);
-
-  return <div>test</div>;
-}
diff --git a/src/components/molecules/PrefetchLink.tsx b/src/components/molecules/PrefetchLink.tsx
index a19372b..eaf6dd3 100644
--- a/src/components/molecules/PrefetchLink.tsx
+++ b/src/components/molecules/PrefetchLink.tsx
@@ -1,7 +1,7 @@
 "use client";
 import Link from "next/link";
 import { useQueryClient } from "@tanstack/react-query";
-import { getRepositoriesByFilter } from "@/services/actions/repository.service";
+import { getRepositoriesByFilter } from "@/services/repository.service";
 import { URL } from "@/constants";
 
 export const PrefetchLink = () => {
diff --git a/src/components/molecules/SelectParams.tsx b/src/components/molecules/SelectParams.tsx
index 4399334..c86d435 100644
--- a/src/components/molecules/SelectParams.tsx
+++ b/src/components/molecules/SelectParams.tsx
@@ -12,6 +12,7 @@ export const SelectParams = () => {
   const { params, setParams: setParams } = useQueryParams({
     key: "params",
   });
+
   const handleChange = async (value: string) => {
     value === "all" ? await setParams("") : await setParams(value);
   };
diff --git a/src/components/organisms/Comment/CommentCard.tsx b/src/components/organisms/Comment/CommentCard.tsx
index 0fd5e2d..08ac66b 100644
--- a/src/components/organisms/Comment/CommentCard.tsx
+++ b/src/components/organisms/Comment/CommentCard.tsx
@@ -1,7 +1,6 @@
 import Link from "next/link";
 import { ProfileAvatar } from "@/components/molecules/Avatar";
 import { calculateCommentCreatedRange } from "@/lib/utils";
-import type { Comment } from "@/types/prisma.type";
 
 type Props = {
   avatar: string | null;
diff --git a/src/components/organisms/Comment/CommentList.tsx b/src/components/organisms/Comment/CommentList.tsx
index aa74484..4309614 100644
--- a/src/components/organisms/Comment/CommentList.tsx
+++ b/src/components/organisms/Comment/CommentList.tsx
@@ -2,13 +2,13 @@ import { CommentCard } from "@/components/organisms/Comment/CommentCard";
 import type { Comment } from "@/types/prisma.type";
 
 type Props = {
-  comments: Comment[];
+  comments: Comment[] | undefined;
 };
 
 export const CommentList = ({ comments }: Props) => {
   return (
     <div className=" flex flex-col gap-8">
-      {comments.map((comment) => (
+      {comments?.map((comment) => (
         <CommentCard
           key={comment.id}
           avatar={comment.createdBy.image}
diff --git a/src/components/organisms/RepositoryCard/RepositoryCardHeader.tsx b/src/components/organisms/RepositoryCard/RepositoryCardHeader.tsx
index d83c1f3..aec9b47 100644
--- a/src/components/organisms/RepositoryCard/RepositoryCardHeader.tsx
+++ b/src/components/organisms/RepositoryCard/RepositoryCardHeader.tsx
@@ -3,7 +3,6 @@ import { useRepositoriesContext } from "@/context/repositoriesContext";
 import { ProfileAvatar } from "@/components/molecules/Avatar";
 import { RepositoryCardHideWithRole } from "./RepositoryCardHide";
 import type { Repository } from "@/types/prisma.type";
-import type { User } from "@/types/prisma.type";
 
 type Props = {
   repository: Repository;
diff --git a/src/components/organisms/RepositoryCard/RepositoryCardHide.tsx b/src/components/organisms/RepositoryCard/RepositoryCardHide.tsx
index 3a7d0aa..e69b30b 100644
--- a/src/components/organisms/RepositoryCard/RepositoryCardHide.tsx
+++ b/src/components/organisms/RepositoryCard/RepositoryCardHide.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { X } from "lucide-react";
-import { hideRepository } from "@/actions/admin/hiderepository.action";
+import { hideRepository } from "@/services/repository.service";
 import { withAdminRole } from "@/components/_HOCs/withAdminRole";
 import type { Repository } from "@/types/prisma.type";
 
@@ -12,7 +12,7 @@ const RepositoryCardHide = ({ repository }: Props) => {
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
-    await hideRepository({ id: repository.id });
+    await hideRepository({ repositoryId: repository.id });
   };
 
   return (
diff --git a/src/components/organisms/Sidebar/SidebarSyncRepositories.tsx b/src/components/organisms/Sidebar/SidebarSyncRepositories.tsx
index 94bf37b..bd019cd 100644
--- a/src/components/organisms/Sidebar/SidebarSyncRepositories.tsx
+++ b/src/components/organisms/Sidebar/SidebarSyncRepositories.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { useTransition } from "react";
-import { syncRepositories } from "@/actions/syncrepositories.action";
+import { syncRepositories } from "@/services/repository.service";
 import { SyncIcon } from "@primer/octicons-react";
 
 export const SidebarSyncRepositories = () => {
@@ -19,7 +19,7 @@ export const SidebarSyncRepositories = () => {
   return (
     <form onSubmit={handleSyncRepositories}>
       <button
-        className="hover:bg-subtle-hover flex w-full cursor-pointer items-center space-x-2 rounded-md px-2 py-1 text-sm transition"
+        className="flex w-full cursor-pointer items-center space-x-2 rounded-md px-2 py-1 text-sm transition hover:bg-subtle-hover"
         type="submit"
       >
         <SyncIcon className="h-4 w-4 text-subtle" />
diff --git a/src/components/organisms/_forms/addcomment.form.tsx b/src/components/organisms/_forms/addcomment.form.tsx
index c9265f1..a1f80e6 100644
--- a/src/components/organisms/_forms/addcomment.form.tsx
+++ b/src/components/organisms/_forms/addcomment.form.tsx
@@ -6,17 +6,15 @@ import { useForm } from "react-hook-form";
 import { Form } from "@/components/atoms/form";
 import { SubmitButton } from "@/components/molecules/SubmitButton";
 import { TextAreaForm } from "@/components/molecules/TextAreaForm";
-import { addComment } from "@/actions/addcomment.action";
+import { postRepositoryComment } from "@/services/repository.service";
 import { formAddCommentSchema } from "./addcomment.schema";
-import type { User } from "@/types/prisma.type";
 import type * as z from "zod";
 
 type Props = {
-  user: User | null;
   repositoryId: number;
 };
 
-export const AddCommentForm = ({ user, repositoryId }: Props) => {
+export const AddCommentForm = ({ repositoryId }: Props) => {
   const [isPending, startTransition] = useTransition();
 
   const form = useForm<z.infer<typeof formAddCommentSchema>>({
@@ -28,23 +26,10 @@ export const AddCommentForm = ({ user, repositoryId }: Props) => {
 
   function onSubmit(data: z.infer<typeof formAddCommentSchema>) {
     startTransition(async () => {
-      const payload = {
-        // repositoryId,
-        // picture: user?.image,
-        // name: user?.name,
-        // username: user?.username,
-        // content: data.content,
+      await postRepositoryComment({
         repositoryId,
         content: data.content,
-        createdBy: {
-          image: user?.image,
-          name: user?.name,
-          username: user?.username,
-        },
-        createdAt: new Date(),
-      };
-
-      await addComment(payload);
+      });
 
       form.reset();
     });
diff --git a/src/components/organisms/_forms/addrepository.form.tsx b/src/components/organisms/_forms/addrepository.form.tsx
index a9b14ed..f464f17 100644
--- a/src/components/organisms/_forms/addrepository.form.tsx
+++ b/src/components/organisms/_forms/addrepository.form.tsx
@@ -12,7 +12,7 @@ import { Dialog, DialogContent } from "@/components/atoms/dialog";
 import { InputForm } from "@/components/molecules/InputForm";
 import { RichTextFieldForm } from "@/components/molecules/RichTextFieldForm";
 import { SubmitButton } from "@/components/molecules/SubmitButton";
-import { addRepository } from "@/actions/addrepository.action";
+import { postRepository } from "@/services/repository.service";
 import { useFetchInfiniteRepositories } from "@/hooks/useFetchInfiniteRepositories";
 import type * as z from "zod";
 
@@ -38,7 +38,10 @@ export const AddRepositoryForm = () => {
 
   function onSubmit(data: z.infer<typeof formRepositorySchema>) {
     startTransition(async () => {
-      const response = await addRepository(data);
+      const response = await postRepository({
+        url: data.url,
+        description: data.description,
+      });
 
       if (!response.data?.error) {
         toast({
diff --git a/src/hooks/useFetchCommentsPage.tsx b/src/hooks/useFetchCommentsPage.tsx
index f417a2a..24bcd24 100644
--- a/src/hooks/useFetchCommentsPage.tsx
+++ b/src/hooks/useFetchCommentsPage.tsx
@@ -1,20 +1,18 @@
 import { getServerAuthSession } from "@/server/auth";
-import {
-  getRepositoriesOnScroll,
-  getUser,
-  getLikes,
-  getLanguages,
-} from "@/actions/test.action";
 
-import repositoryService from "@/services/repository.service";
+import {
+  getRepository,
+  getCommentsByRepositoryId,
+} from "@/services/repository.service";
 
 export const useFetchCommentsPage = async (repositoryId: number) => {
   const session = await getServerAuthSession();
-  const repository = await repositoryService.getRepository(repositoryId);
-  const comments =
-    await repositoryService.getCommentsByRepositoryId(repositoryId);
-
-  const user = await getUser(session?.user.id ?? "");
+  const repository = await getRepository({
+    repositoryId,
+  });
+  const comments = await getCommentsByRepositoryId({
+    repositoryId,
+  });
 
-  return { repository, comments, session, user };
+  return { repository, comments, session };
 };
diff --git a/src/hooks/useFetchInfiniteRepositories.tsx b/src/hooks/useFetchInfiniteRepositories.tsx
index f82a3a1..6117651 100644
--- a/src/hooks/useFetchInfiniteRepositories.tsx
+++ b/src/hooks/useFetchInfiniteRepositories.tsx
@@ -1,6 +1,5 @@
 import { useInfiniteQuery } from "@tanstack/react-query";
-import { getRepositoriesByFilter } from "@/services/actions/repository.service";
-import type { ParamsType } from "@/types";
+import { getRepositoriesByFilter } from "@/services/repository.service";
 
 type Props = {
   queryParams: string;
diff --git a/src/hooks/useFetchRepositoriesPage.tsx b/src/hooks/useFetchRepositoriesPage.tsx
index 8a0fe18..10e1001 100644
--- a/src/hooks/useFetchRepositoriesPage.tsx
+++ b/src/hooks/useFetchRepositoriesPage.tsx
@@ -1,10 +1,5 @@
 import { getServerAuthSession } from "@/server/auth";
-import {
-  getRepositoriesOnScroll,
-  getUser,
-  getLikes,
-  getLanguages,
-} from "@/actions/test.action";
+import { getUser, getLikes, getLanguages } from "@/actions/test.action";
 
 export const useFetchRepositoriesPage = async () => {
   const session = await getServerAuthSession();
diff --git a/src/hooks/useQueryParser.tsx b/src/hooks/useQueryParser.tsx
index 31bfef3..70f715f 100644
--- a/src/hooks/useQueryParser.tsx
+++ b/src/hooks/useQueryParser.tsx
@@ -1,11 +1,10 @@
-import { ParamsType } from "@/types";
 import { parseAsString } from "nuqs/server";
 
 type Props = {
   searchParams?: {
     query?: string;
     language?: string;
-    params?: ParamsType;
+    params?: string;
   };
 };
 
diff --git a/src/server/auth.ts b/src/server/auth.ts
index eb87942..5a29ced 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -5,7 +5,7 @@ import {
   type NextAuthOptions,
 } from "next-auth";
 import GithubProvider from "next-auth/providers/github";
-import repositoryService from "@/services/repository.service";
+import { syncStarredRepositories } from "@/services/repository.service";
 import { env } from "@/env";
 import { db } from "@/server/db";
 import { URL } from "@/constants";
@@ -62,7 +62,7 @@ export const authOptions: NextAuthOptions = {
 
     async signIn({ user }) {
       if (user.id && !user.firstConnection && user.dataSharingAgreement) {
-        await repositoryService.syncStarredRepositories(user);
+        await syncStarredRepositories(user);
       }
 
       return true;
diff --git a/src/services/actions/admin.service.ts b/src/services/actions/admin.service.ts
deleted file mode 100644
index 908fe79..0000000
--- a/src/services/actions/admin.service.ts
+++ /dev/null
@@ -1 +0,0 @@
-"use server";
diff --git a/src/services/actions/repository.service.ts b/src/services/actions/repository.service.ts
deleted file mode 100644
index d2eab1a..0000000
--- a/src/services/actions/repository.service.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-"use server";
-
-import { db } from "@/server/db";
-import { action, userAction } from "@/lib/next-safe-action";
-import { Prisma } from "@prisma/client";
-import { PrismaError } from "@/lib/exceptions";
-import { ERROR_MESSAGE } from "@/constants";
-import octokitService from "@/services/octokit.service";
-import * as z from "zod";
-
-/**
- * Action to get a repository entry from the database.
- * @param {Object} data - The repository data to be retrieved.
- * @param {number} data.repositoryId - The ID of the repository to be retrieved.
- * @throws {Error} - Throws an error if the repository doesn't exist or if there's an error accessing the database.
- */
-
-const getRepositorySchema = z.object({
-  repositoryId: z.coerce.number(),
-});
-
-export const getRepository = action(getRepositorySchema, async (data) => {
-  try {
-    return await db.repository.findUniqueOrThrow({
-      where: {
-        id: data.repositoryId,
-      },
-      include: {
-        language: true,
-        topics: true,
-        createdBy: true,
-      },
-    });
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      throw new PrismaError(error);
-    }
-  }
-});
-
-/**
- * Action to get all repository entries from the database.
- * @throws {Error} - Throws an error if there's an error accessing the database.
- */
-
-const getRepositoriesSchema = z.object({});
-
-export const getRepositories = action(getRepositoriesSchema, async () => {
-  try {
-    return await db.repository.findMany({
-      include: {
-        language: true,
-        topics: true,
-        createdBy: true,
-      },
-    });
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      throw new PrismaError(error);
-    }
-  }
-});
-
-/**
- * Action to get all repository entries from the database by filter.
- * @param {Object} data - The filter data to be used.
- * @param {string} data.query - The query string to filter the repositories.
- * @param {string} data.language - The language to filter the repositories.
- * @param {string} data.params - The parameters to filter the repositories.
- * @param {number} data.offset - The offset to start the query.
- * @param {number} data.limit - The limit of the query.
- * @param {number} data.cursor - The cursor to start the query.
- * @throws {Error} - Throws an error if there's an error accessing the database.
- */
-
-const getRepositoriesByFilterSchema = z.object({
-  queryParams: z.string().optional(),
-  languageParams: z.string().optional(),
-  params: z.string().optional(),
-  offset: z.coerce.number().optional(),
-  limit: z.coerce.number().optional(),
-  cursor: z.coerce.number().optional(),
-});
-
-export const getRepositoriesByFilter = action(
-  getRepositoriesByFilterSchema,
-  async (data) => {
-    const query = data.queryParams ?? "";
-    const language = data.languageParams ?? "";
-    const params = data.params ?? "";
-    const offset = data.offset ?? 0;
-    const limit = data.limit ?? 20;
-    const cursor = data.cursor ?? "";
-
-    const where: Prisma.RepositoryWhereInput = {
-      is_visible: true,
-      repositoryName: {
-        contains: query,
-        mode: "insensitive",
-      },
-    };
-
-    let orderBy: Prisma.RepositoryOrderByWithRelationInput = {
-      id: "desc",
-    };
-
-    if (params === "latest") {
-      orderBy = { id: "asc" };
-    } else if (params === "starred") {
-      orderBy = { repositoryStargazers: "desc" };
-    } else if (params === "liked") {
-      orderBy = { likes: { _count: "desc" } };
-    }
-
-    if (language && language !== "all") {
-      where.language = {
-        name: {
-          equals: language,
-          mode: "insensitive",
-        },
-      };
-    }
-
-    const [repositories, count] = await db.$transaction([
-      db.repository.findMany({
-        where,
-        include: {
-          createdBy: true,
-          language: true,
-          topics: true,
-          comments: true,
-        },
-        orderBy,
-        skip: cursor === undefined ? offset : 0,
-        take: limit,
-        cursor: cursor ? { id: cursor } : undefined,
-      }),
-      db.repository.count({
-        where,
-      }),
-    ]);
-
-    const nextCursor =
-      repositories.length === limit ? repositories[limit - 1]!.id : undefined;
-
-    return { repositories, nextCursor };
-  },
-);
-
-/**
- * User action to create a new repository entry in the database.
- * @param {Object} data - The repository data to be saved.
- * @param {string} data.url - The URL of the repository.
- * @param {string} data.description - The description of the repository.
- * @param {string} data.createdBy - The ID of the user who created the repository.
- * @throws {Error} - Throws an error if the repository doesn't exist or if there's an error accessing the database.
- */
-
-const postRepositorySchema = z.object({
-  url: z.string().url(),
-  description: z.string(),
-  createdBy: z.string(),
-  createdByUsername: z.string(),
-});
-
-export const postRepository = userAction(postRepositorySchema, async (data) => {
-  const octokitResponse = await octokitService.getRepository(data.url);
-
-  if (!octokitResponse) {
-    throw new Error(ERROR_MESSAGE.REPOSITORY_NOT_EXIST);
-  }
-
-  try {
-    await db.repository.create({
-      data: {
-        url: data.url,
-        description: data.description,
-        repositoryId: octokitResponse.data.id,
-        repositoryName: octokitResponse.data.name,
-        repositoryDescription: octokitResponse.data.description,
-        repositoryStargazers: octokitResponse.data.stargazers_count,
-        repositoryCreatedAt: octokitResponse.data.created_at,
-        repositoryUpdatedAt: octokitResponse.data.updated_at,
-        repositoryLicenseName: octokitResponse.data.license?.key,
-        repositoryLicenseUrl: octokitResponse.data.license?.url ?? "",
-        language: {
-          connectOrCreate: {
-            where: {
-              name: octokitResponse.data.language ?? "",
-            },
-            create: {
-              name: octokitResponse.data.language
-                ? octokitResponse.data.language
-                : "markdown",
-            },
-          },
-        },
-        topics: {
-          connectOrCreate: octokitResponse.data.topics?.map((topic) => {
-            return {
-              where: {
-                name: topic,
-              },
-              create: {
-                name: topic,
-              },
-            };
-          }),
-        },
-        is_template: octokitResponse.data.is_template,
-        createdAt: octokitResponse.data.created_at,
-        updatedAt: octokitResponse.data.updated_at,
-        ownerUsername: octokitResponse.data.owner.login,
-        ownerId: octokitResponse.data.owner.id,
-        ownerAvatarUrl: octokitResponse.data.owner.avatar_url,
-        createdBy: {
-          connect: {
-            id: data.createdBy,
-          },
-        },
-      },
-    });
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      throw new PrismaError(error);
-    }
-    throw error;
-  }
-});
diff --git a/src/services/actions/repository.service.type.ts b/src/services/actions/repository.service.type.ts
deleted file mode 100644
index b6e35ed..0000000
--- a/src/services/actions/repository.service.type.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-type postRepositoryType = {
-  url: string;
-  description?: string;
-  createdBy: string;
-  createdByUsername?: string;
-};
-
-export type { postRepositoryType };
diff --git a/src/services/repository.service.ts b/src/services/repository.service.ts
index 17a6d7e..967dac5 100644
--- a/src/services/repository.service.ts
+++ b/src/services/repository.service.ts
@@ -1,20 +1,170 @@
+"use server";
+
 import { db } from "@/server/db";
-import octokitService from "./octokit.service";
-import { extractUserIdFromAvatarUrl } from "@/lib/utils";
+import { action, adminAction, userAction } from "@/lib/next-safe-action";
 import { Prisma } from "@prisma/client";
 import { PrismaError } from "@/lib/exceptions";
 import { ERROR_MESSAGE } from "@/constants";
+import octokitService from "@/services/octokit.service";
+import { extractUserIdFromAvatarUrl } from "@/lib/utils";
+import { revalidatePath } from "next/cache";
 import type { User } from "next-auth";
+import * as z from "zod";
 
-export type postRepositoryData = {
-  url: string;
-  description?: string;
-  createdBy: string;
-  createdByUsername?: string;
+/**
+ * Action to get a repository entry from the database.
+ * @param {Object} data - The repository data to be retrieved.
+ * @param {number} data.repositoryId - The ID of the repository to be retrieved.
+ * @throws {Error} - Throws an error if the repository doesn't exist or if there's an error accessing the database.
+ */
+
+const getRepositorySchema = z.object({
+  repositoryId: z.coerce.number(),
+});
+
+export const getRepository = action(getRepositorySchema, async (data) => {
+  try {
+    return await db.repository.findUniqueOrThrow({
+      where: {
+        id: data.repositoryId,
+      },
+      include: {
+        language: true,
+        topics: true,
+        createdBy: true,
+      },
+    });
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new PrismaError(error);
+    }
+  }
+});
+
+/**
+ * Action to get all repository entries from the database.
+ * @throws {Error} - Throws an error if there's an error accessing the database.
+ */
+
+export const getRepositories = async () => {
+  try {
+    return await db.repository.findMany({
+      include: {
+        language: true,
+        topics: true,
+        createdBy: true,
+      },
+    });
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new PrismaError(error);
+    }
+  }
 };
 
-class RepositoryService {
-  async postRepository(data: postRepositoryData) {
+/**
+ * Action to get all repository entries from the database by filter.
+ * @param {Object} data - The filter data to be used.
+ * @param {string} data.query - The query string to filter the repositories.
+ * @param {string} data.language - The language to filter the repositories.
+ * @param {string} data.params - The parameters to filter the repositories.
+ * @param {number} data.offset - The offset to start the query.
+ * @param {number} data.limit - The limit of the query.
+ * @param {number} data.cursor - The cursor to start the query.
+ * @throws {Error} - Throws an error if there's an error accessing the database.
+ */
+
+const getRepositoriesByFilterSchema = z.object({
+  queryParams: z.string().optional(),
+  languageParams: z.string().optional(),
+  params: z.string().optional(),
+  offset: z.coerce.number().optional(),
+  limit: z.coerce.number().optional(),
+  cursor: z.coerce.number().optional(),
+});
+
+export const getRepositoriesByFilter = action(
+  getRepositoriesByFilterSchema,
+  async (data) => {
+    const query = data.queryParams ?? "";
+    const language = data.languageParams ?? "";
+    const params = data.params ?? "";
+    const offset = data.offset ?? 0;
+    const limit = data.limit ?? 20;
+    const cursor = data.cursor ?? "";
+
+    const where: Prisma.RepositoryWhereInput = {
+      is_visible: true,
+      repositoryName: {
+        contains: query,
+        mode: "insensitive",
+      },
+    };
+
+    let orderBy: Prisma.RepositoryOrderByWithRelationInput = {
+      id: "desc",
+    };
+
+    if (params === "latest") {
+      orderBy = { id: "asc" };
+    } else if (params === "starred") {
+      orderBy = { repositoryStargazers: "desc" };
+    } else if (params === "liked") {
+      orderBy = { likes: { _count: "desc" } };
+    }
+
+    if (language && language !== "all") {
+      where.language = {
+        name: {
+          equals: language,
+          mode: "insensitive",
+        },
+      };
+    }
+
+    const [repositories, count] = await db.$transaction([
+      db.repository.findMany({
+        where,
+        include: {
+          createdBy: true,
+          language: true,
+          topics: true,
+          comments: true,
+        },
+        orderBy,
+        skip: cursor === undefined ? offset : 0,
+        take: limit,
+        cursor: cursor ? { id: cursor } : undefined,
+      }),
+      db.repository.count({
+        where,
+      }),
+    ]);
+
+    const nextCursor =
+      repositories.length === limit ? repositories[limit - 1]!.id : undefined;
+
+    return { repositories, nextCursor };
+  },
+);
+
+/**
+ * User action to create a new repository entry in the database.
+ * @param {Object} data - The repository data to be saved.
+ * @param {string} data.url - The URL of the repository.
+ * @param {string} data.description - The description of the repository.
+ * @param {string} data.createdBy - The ID of the user who created the repository.
+ * @throws {Error} - Throws an error if the repository doesn't exist or if there's an error accessing the database.
+ */
+
+const postRepositorySchema = z.object({
+  url: z.string().url(),
+  description: z.string(),
+});
+
+export const postRepository = userAction(
+  postRepositorySchema,
+  async (data, ctx) => {
     const octokitResponse = await octokitService.getRepository(data.url);
 
     if (!octokitResponse) {
@@ -47,18 +197,16 @@ class RepositoryService {
             },
           },
           topics: {
-            connectOrCreate: octokitResponse.data.topics?.map(
-              (topic: string) => {
-                return {
-                  where: {
-                    name: topic,
-                  },
-                  create: {
-                    name: topic,
-                  },
-                };
-              },
-            ),
+            connectOrCreate: octokitResponse.data.topics?.map((topic) => {
+              return {
+                where: {
+                  name: topic,
+                },
+                create: {
+                  name: topic,
+                },
+              };
+            }),
           },
           is_template: octokitResponse.data.is_template,
           createdAt: octokitResponse.data.created_at,
@@ -68,7 +216,7 @@ class RepositoryService {
           ownerAvatarUrl: octokitResponse.data.owner.avatar_url,
           createdBy: {
             connect: {
-              id: data.createdBy,
+              id: ctx.session.user.id,
             },
           },
         },
@@ -77,210 +225,152 @@ class RepositoryService {
       if (error instanceof Prisma.PrismaClientKnownRequestError) {
         throw new PrismaError(error);
       }
+      if (error instanceof Error) return { error: error.message };
     }
-  }
+  },
+);
 
-  async getRepository(repositoryId: number) {
-    return await db.repository.findFirst({
-      where: {
-        id: repositoryId,
-      },
-      include: {
-        createdBy: true,
-        language: true,
-        topics: true,
-      },
-    });
-  }
+/**
+ * Query to update the repository already starred by the user.
+ * @param {string} data.userId - The ID of the user.
+ * @param {string[]} data.repositoryUrl - The URL of the repository.
+ * @throws {Error} - Throws an error if there's an error accessing the database.
+ */
 
-  async getRepositories() {
-    return await db.repository.findMany({
+const updateRepositoryAlreadyStarredSchema = z.object({
+  userId: z.string(),
+  repositoryUrl: z.string().array(),
+});
+
+export const updateRepositoryAlreadyStarred = action(
+  updateRepositoryAlreadyStarredSchema,
+  async (data) => {
+    await db.user.update({
       where: {
-        is_visible: true,
+        id: data.userId,
       },
-      include: {
-        createdBy: true,
-        language: true,
-        topics: true,
-        comments: true,
-      },
-      orderBy: {
-        id: "desc",
+      data: {
+        repositoryAlreadyStarred: {
+          set: data.repositoryUrl,
+        },
       },
     });
-  }
+  },
+);
 
-  async getRepositoriesOnScroll({
-    query,
-    language,
-    offset = 0,
-    limit = 20,
-    cursor,
-  }: {
-    query?: string;
-    language?: string;
-    offset?: number;
-    limit?: number;
-    cursor?: number;
-  }) {
-    const whereCondition: Prisma.RepositoryWhereInput = {
-      is_visible: true,
-      repositoryName: {
-        contains: query,
-        mode: "insensitive",
-      },
-    };
+export const syncRepositories = async () => {
+  const repositories = await getRepositories();
 
-    if (language && language !== "all") {
-      whereCondition.language = {
-        name: {
-          equals: language,
-          mode: "insensitive",
-        },
-      };
-    }
-
-    const [data, totalCount] = await db.$transaction([
-      db.repository.findMany({
-        where: whereCondition,
-        include: {
-          createdBy: true,
-          language: true,
-          topics: true,
-          comments: true,
-        },
-        orderBy: {
-          id: "desc",
-        },
-        skip: cursor === undefined ? offset : 0,
-        take: limit,
-        cursor: cursor ? { id: cursor } : undefined,
-      }),
-
-      db.repository.count({
-        where: {
-          is_visible: true,
-          repositoryName: {
-            contains: query,
-          },
-        },
-      }),
-    ]);
+  if (!repositories) {
+    throw new Error(ERROR_MESSAGE.REPOSITORY_NOT_EXIST);
+  }
 
-    const nextCursor = data.length === limit ? data[limit - 1]!.id : undefined;
+  for (const repository of repositories) {
+    const octokitResponse = await octokitService.getRepositoryById(
+      repository.repositoryId,
+    );
 
-    return {
-      data,
-      totalCount,
-      nextCursor,
-    };
-  }
+    if (!octokitResponse) {
+      throw new Error(ERROR_MESSAGE.REPOSITORY_NOT_EXIST);
+    }
 
-  async hideRepository(id: number) {
     await db.repository.update({
       where: {
-        id,
+        id: repository.id,
       },
       data: {
-        is_visible: false,
+        repositoryStargazers: octokitResponse.data.stargazers_count,
+        repositoryLicenseName: octokitResponse.data.license?.key,
+        repositoryLicenseUrl: octokitResponse.data.license?.url ?? "",
+        repositoryUpdatedAt: octokitResponse.data.updated_at,
       },
     });
   }
+};
 
-  async updateRepositoryAlreadyStarred(
-    userId: string,
-    repositoryUrl: string[],
-  ) {
-    await db.user.update({
-      where: {
-        id: userId,
-      },
-      data: {
-        repositoryAlreadyStarred: {
-          set: repositoryUrl,
-        },
-      },
-    });
+/**
+ * Action to sync the starred repositories of the user with the database.
+ * @param {Object} user - The user to be synced.
+ * @throws {Error} - Throws an error if the user doesn't exist or if there's an error accessing the database.
+ */
+
+export const syncStarredRepositories = async (user: User) => {
+  if (!user) {
+    throw new Error(ERROR_MESSAGE.USER_NOT_FOUND);
   }
 
-  async syncStarredRepositories(user: User) {
-    if (!user) {
-      throw new Error(ERROR_MESSAGE.USER_NOT_FOUND);
-    }
+  const githubUser = await octokitService.getUser(
+    extractUserIdFromAvatarUrl(user.image!),
+  );
 
-    const githubUser = await octokitService.getUser(
-      extractUserIdFromAvatarUrl(user.image!),
-    );
+  if (!githubUser) {
+    throw new Error(ERROR_MESSAGE.GITHUB_USER_NOT_FOUND);
+  }
 
-    if (!githubUser) {
-      throw new Error(ERROR_MESSAGE.GITHUB_USER_NOT_FOUND);
-    }
+  const starredRepositories =
+    //eslint-disable-next-line
+    await octokitService.getStaredRepositoriesByUser(githubUser.data.login);
 
-    const starredRepositories =
+  if (starredRepositories) {
+    await updateRepositoryAlreadyStarred({
+      userId: user.id,
       //eslint-disable-next-line
-      await octokitService.getStaredRepositoriesByUser(githubUser.data.login);
-
-    if (starredRepositories) {
-      await this.updateRepositoryAlreadyStarred(
-        user.id,
-        //eslint-disable-next-line
-        starredRepositories.data.map((repo: any) => repo.html_url),
-      );
-    }
+      repositoryUrl: starredRepositories.data.map((repo: any) => repo.html_url),
+    });
   }
+};
 
-  async syncRepositories() {
-    const repositories = await this.getRepositories();
-
-    for (const repository of repositories) {
-      const octokitResponse = await octokitService.getRepositoryById(
-        repository.repositoryId,
-      );
-
-      if (!octokitResponse) {
-        throw new Error(ERROR_MESSAGE.REPOSITORY_NOT_EXIST);
-      }
+/**
+ * User action to create a new comment for a repository in the database.
+ * @param {Object} data - The comment data to be saved.
+ * @param {number} data.repositoryId - The ID of the repository.
+ * @param {string} data.content - The content of the comment.
+ * @throws {Error} - Throws an error if there's an error accessing the database.
+ */
 
-      await db.repository.update({
-        where: {
-          id: repository.id,
-        },
-        data: {
-          repositoryStargazers: octokitResponse.data.stargazers_count,
-          repositoryLicenseName: octokitResponse.data.license?.key,
-          repositoryLicenseUrl: octokitResponse.data.license?.url ?? "",
-          repositoryUpdatedAt: octokitResponse.data.updated_at,
-        },
-      });
-    }
-  }
+const postRepositoryCommentSchema = z.object({
+  repositoryId: z.coerce.number(),
+  content: z.string(),
+});
 
-  async addCommentToRepository(
-    repositoryId: number,
-    content: string,
-    createdBy: string,
-  ) {
+export const postRepositoryComment = userAction(
+  postRepositoryCommentSchema,
+  async (data, ctx) => {
     return await db.comment.create({
       data: {
-        content,
+        content: data.content,
         createdBy: {
           connect: {
-            id: createdBy,
+            id: ctx.session.user.id,
           },
         },
         repository: {
           connect: {
-            id: repositoryId,
+            id: data.repositoryId,
           },
         },
       },
     });
-  }
+  },
+);
+
+/**
+ * Action to get all comments for a repository from the database.
+ * @param {Object} data - The repository data to be retrieved.
+ * @param {number} data.repositoryId - The ID of the repository to be retrieved.
+ * @throws {Error} - Throws an error if there's an error accessing the database.
+ */
 
-  async getCommentsByRepositoryId(repositoryId: number) {
+const getCommentsByRepositoryIdSchema = z.object({
+  repositoryId: z.coerce.number(),
+});
+
+export const getCommentsByRepositoryId = action(
+  getCommentsByRepositoryIdSchema,
+  async (data) => {
     return await db.comment.findMany({
       where: {
-        repositoryId,
+        repositoryId: data.repositoryId,
       },
       include: {
         createdBy: true,
@@ -289,9 +379,36 @@ class RepositoryService {
         id: "asc",
       },
     });
-  }
-}
+  },
+);
 
-const repositoryService = new RepositoryService();
+/**
+ * Action to hide a repository from the database.
+ * @param {Object} data - The repository data to be hidden.
+ * @param {number} data.repositoryId - The ID of the repository to be hidden.
+ * @throws {Error} - Throws an error if there's an error accessing the database.
+ */
+
+const hideRepositorySchema = z.object({
+  repositoryId: z.coerce.number(),
+});
+
+export const hideRepository = adminAction(
+  hideRepositorySchema,
+  async (data) => {
+    try {
+      await db.repository.update({
+        where: {
+          id: data.repositoryId,
+        },
+        data: {
+          is_visible: false,
+        },
+      });
+    } catch (error) {
+      if (error instanceof Error) return { error: error.message };
+    }
 
-export default repositoryService;
+    revalidatePath("/");
+  },
+);
diff --git a/src/services/user.service.ts b/src/services/user.service.ts
index 164f3b0..b80248d 100644
--- a/src/services/user.service.ts
+++ b/src/services/user.service.ts
@@ -1,6 +1,6 @@
 import { db } from "@/server/db";
 import octokitService from "./octokit.service";
-import repositoryService from "./repository.service";
+import { syncStarredRepositories } from "./repository.service";
 import { extractUserIdFromAvatarUrl } from "@/lib/utils";
 import type { User } from "next-auth";
 
@@ -28,7 +28,7 @@ class UserService {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const username = githubUser.data.login;
 
-    await repositoryService.syncStarredRepositories(user);
+    await syncStarredRepositories(user);
 
     return await db.user.update({
       where: {