Update package versions and refactor persistence layer to use SQLKit for query building. Remove deprecated persistence repository and enhance article and user management functionalities across services.

Author: kingRayhan

bun.lock

@@ -1,6 +1,6 @@
 {
   "name": "techdiary.dev-next",
-  "version": "0.1.0",
+  "version": "1.0.12",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -50,7 +50,7 @@
     "react-hook-form": "^7.55.0",
     "recharts": "^2.15.1",
     "schema-dts": "^1.1.5",
-    "sqlkit": "^1.0.8",
+    "sqlkit": "^1.0.13",
     "tailwind-merge": "^3.0.2",
     "tw-animate-css": "^1.2.4",
     "zod": "^3.24.2"

package-lock.json

@@ -1,48 +1,50 @@
-import { Article, ArticleTag, Tag, User } from "@/backend/models/domain-models";
-import { persistenceRepository } from "@/backend/persistence-repositories";
+import { Tag } from "@/backend/models/domain-models";
 import { DatabaseTableName } from "@/backend/persistence/persistence-contracts";
-import {
-  and,
-  eq,
-  inArray,
-  leftJoin,
-} from "@/backend/persistence/persistence-where-operator";
+import { persistenceRepository } from "@/backend/persistence/persistence-repositories";
 import * as sessionActions from "@/backend/services/session.actions";
 import ArticleEditor from "@/components/Editor/ArticleEditor";
 import { notFound } from "next/navigation";
 import React from "react";
+import { and, eq, inArray } from "sqlkit";
 
 interface Props {
   params: Promise<{ uuid: string }>;
 }
 const page: React.FC<Props> = async ({ params }) => {
   const sessionUserId = await sessionActions.getSessionUserId();
+
   const _params = await params;
-  // eq("author_id", sessionUserId)
-  const [article] = await persistenceRepository.article.findRows({
+
+  const [article] = await persistenceRepository.article.find({
     limit: 1,
-    where: and(eq("id", _params.uuid), eq("author_id", sessionUserId)),
+    where: and(eq("id", _params.uuid), eq("author_id", sessionUserId!)),
     joins: [
-      leftJoin<Article, User>({
+      {
         as: "author",
-        joinTo: DatabaseTableName.users,
-        localField: "author_id",
-        foreignField: "id",
+        table: DatabaseTableName.users,
+        type: "left",
+        on: {
+          localField: "author_id",
+          foreignField: "id",
+        },
         columns: ["id", "name", "username"],
-      }),
+      },
     ],
   });
 
-  const aggregatedTags = await persistenceRepository.articleTag.findRows({
+  const aggregatedTags = await persistenceRepository.articleTag.find({
     where: inArray("article_id", [article.id]),
     joins: [
-      leftJoin<ArticleTag, Tag>({
+      {
         as: "tag",
-        joinTo: "tags",
-        localField: "tag_id",
-        foreignField: "id",
+        table: "tags",
+        type: "left",
+        on: {
+          localField: "tag_id",
+          foreignField: "id",
+        },
         columns: ["id", "name", "color", "icon", "description"],
-      }),
+      },
     ],
   });
 

package.json

@@ -2,11 +2,7 @@ import ArticleEditor from "@/components/Editor/ArticleEditor";
 import React from "react";
 
 const page = () => {
-  return (
-    <>
-      <ArticleEditor />
-    </>
-  );
+  return <ArticleEditor />;
 };
 
 export default page;

src/app/(dashboard-editor)/dashboard/articles/[uuid]/page.tsx

@@ -1,9 +1,8 @@
-import { Article, User } from "@/backend/models/domain-models";
-import { persistenceRepository } from "@/backend/persistence-repositories";
-import { eq, leftJoin } from "@/backend/persistence/persistence-where-operator";
+import { persistenceRepository } from "@/backend/persistence/persistence-repositories";
 import { ImageResponse } from "next/og";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
+import { eq } from "sqlkit";
 
 interface ArticlePageProps {
   params: Promise<{
@@ -25,18 +24,21 @@ const getFileLocation = async (path: string) => {
 
 export default async function Image(options: ArticlePageProps) {
   const { articleHandle } = await options.params;
-  const [article] = await persistenceRepository.article.findRows({
+  const [article] = await persistenceRepository.article.find({
     where: eq("handle", articleHandle),
     columns: ["title", "excerpt", "cover_image", "body"],
     limit: 1,
     joins: [
-      leftJoin<Article, User>({
+      {
         as: "user",
-        joinTo: "users",
-        localField: "author_id",
-        foreignField: "id",
+        table: "users",
+        type: "left",
+        on: {
+          localField: "author_id",
+          foreignField: "id",
+        },
         columns: ["username", "profile_photo"],
-      }),
+      },
     ],
   });
 

src/app/(dashboard-editor)/dashboard/articles/new/page.tsx

@@ -1,6 +1,5 @@
 import HomeLeftSidebar from "@/app/(home)/_components/HomeLeftSidebar";
-import { persistenceRepository } from "@/backend/persistence-repositories";
-import { eq } from "@/backend/persistence/persistence-where-operator";
+import { persistenceRepository } from "@/backend/persistence/persistence-repositories";
 import * as articleActions from "@/backend/services/article.actions";
 import AppImage from "@/components/AppImage";
 import HomepageLayout from "@/components/layout/HomepageLayout";
@@ -12,6 +11,7 @@ import Image from "next/image";
 import Link from "next/link";
 import { notFound } from "next/navigation";
 import type { Article, WithContext } from "schema-dts";
+import { eq } from "sqlkit";
 import ArticleSidebar from "./_components/ArticleSidebar";
 
 interface ArticlePageProps {
@@ -26,7 +26,7 @@ export async function generateMetadata(
 ): Promise<Metadata> {
   // read route params
   const { articleHandle } = await options.params;
-  const [article] = await persistenceRepository.article.findRows({
+  const [article] = await persistenceRepository.article.find({
     where: eq("handle", articleHandle),
     columns: ["title", "excerpt", "cover_image", "body"],
     limit: 1,

src/app/[username]/[articleHandle]/opengraph-image.tsx

@@ -1,5 +1,5 @@
-import {persistenceRepository} from "@/backend/persistence-repositories";
-import {NextResponse} from "next/server";
+import { persistenceRepository } from "@/backend/persistence/persistence-repositories";
+import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
   // [
@@ -15,21 +15,24 @@ export async function GET(request: Request) {
   //   }
   // ]
   return NextResponse.json({
-    handle: await persistenceRepository.articleTag.deleteRows({
+    handle: await persistenceRepository.articleTag.delete({
       where: {
         AND: [
           {
-            "key": "article_id",
-            "operator": "=",
-            "value": "317eb5cf-9ef5-4ef1-9da7-78007dd83149"
+            key: "article_id",
+            operator: "=",
+            value: "317eb5cf-9ef5-4ef1-9da7-78007dd83149",
           },
           {
-            "key": "tag_id",
-            "operator": "not in",
-            "value": ["060f882f-e40e-415b-bc06-ed618f77d9bc", "2e27c4b0-226d-41ed-ae3f-3f9ac493b6a7"]
-          }
-        ]
-      }
+            key: "tag_id",
+            operator: "not in",
+            value: [
+              "060f882f-e40e-415b-bc06-ed618f77d9bc",
+              "2e27c4b0-226d-41ed-ae3f-3f9ac493b6a7",
+            ],
+          },
+        ],
+      },
     }),
   });
 }

src/app/[username]/[articleHandle]/page.tsx

@@ -1,26 +1,24 @@
-import { Article, User } from "@/backend/models/domain-models";
-import { persistenceRepository } from "@/backend/persistence-repositories";
-import {
-  and,
-  eq,
-  leftJoin,
-  neq,
-} from "@/backend/persistence/persistence-where-operator";
+import { persistenceRepository } from "@/backend/persistence/persistence-repositories";
+
 import type { MetadataRoute } from "next";
+import { and, eq, neq } from "sqlkit";
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
-  const articles = await persistenceRepository.article.findRows({
+  const articles = await persistenceRepository.article.find({
     where: and(eq("is_published", true), neq("approved_at", null)),
     columns: ["handle", "updated_at"],
     limit: -1,
     joins: [
-      leftJoin<Article, User>({
+      {
         as: "user",
-        joinTo: "users",
-        localField: "author_id",
-        foreignField: "id",
+        table: "users",
+        type: "left",
+        on: {
+          localField: "author_id",
+          foreignField: "id",
+        },
         columns: ["id", "username"],
-      }),
+      },
     ],
   });
 

src/app/api/play/route.ts

@@ -1,8 +1,8 @@
-import { persistenceRepository } from "@/backend/persistence-repositories";
+import { persistenceRepository } from "@/backend/persistence/persistence-repositories";
 import type { MetadataRoute } from "next";
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
-  const profiles = await persistenceRepository.user.findRows({
+  const profiles = await persistenceRepository.user.find({
     columns: ["username"],
     limit: -1,
   });