From d902f6b26d92c3a265be91cd8ef3d80afb87cddb Mon Sep 17 00:00:00 2001
From: MdIrshad1234 <mdirshad869915@gmail.com>
Date: Thu, 3 Sep 2026 14:27:16 +0530
Subject: [PATCH] slove the merge

---
 .env.development               |  7 +++++--
 package-lock.json              | 20 ++++++++++----------
 package.json                   |  2 +-
 prisma/seed/categories.seed.ts |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 70dc5f6..cea9d02 100644
--- a/.env.development
+++ b/.env.development
@@ -9,10 +9,13 @@ POSTGRES_HOST=postgres
 POSTGRES_DB=support_dev
 POSTGRES_USER=support_user
 POSTGRES_PASSWORD=z1F3tKF1JNDBQmMq95Up
-DATABASE_URL=postgresql://support_user:z1F3tKF1JNDBQmMq95Up@postgres:5432/support_dev
+# DATABASE_URL=postgresql://support_user:z1F3tKF1JNDBQmMq95Up@postgres:5432/support_dev
+
+DATABASE_URL=postgresql://support_user:SupportDev123@localhost:5432/support_dev
 
 # Redis
-REDIS_HOST=redis
+ REDIS_HOST=redis
+
 REDIS_PORT=6379
 REDIS_PASSWORD=D7FJ7QDKo5gF9KQAO1GL
 
diff --git a/package-lock.json b/package-lock.json
index e984c67..b006bad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "prettier": "^3.2.5",
         "prisma": "^5.12.1",
         "tsc-alias": "^1.9.2",
-        "tsx": "^4.7.2",
+        "tsx": "^4.23.13",
         "typescript": "^5.4.5",
         "vitest": "^1.5.0"
       },
@@ -1445,14 +1445,14 @@
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz",
       "integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/engines": {
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.22.0.tgz",
       "integrity": "sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==",
-      "devOptional": true,
+      "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1466,14 +1466,14 @@
       "version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
       "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz",
       "integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/fetch-engine": {
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz",
       "integrity": "sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@prisma/debug": "5.22.0",
@@ -1485,7 +1485,7 @@
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.22.0.tgz",
       "integrity": "sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@prisma/debug": "5.22.0"
@@ -5379,7 +5379,7 @@
       "version": "5.22.0",
       "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.22.0.tgz",
       "integrity": "sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==",
-      "devOptional": true,
+      "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -6280,9 +6280,9 @@
       "license": "0BSD"
     },
     "node_modules/tsx": {
-      "version": "4.23.12",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.12.tgz",
-      "integrity": "sha512-FDf4L4sYzKtzWYhU/Xm0AQFdTjdIxNo9ElTf2mxXM6k8YMHXzYUe4yODVaXP4V9uMFbVg8c0qyBccK2OOxb45Q==",
+      "version": "4.23.13",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.23.13.tgz",
+      "integrity": "sha512-BL5MGkRln6aDYhb0xbQlEAGw743BaZYWdbWtdJOBriYJboKgUUYCadFp2/FpBBZquBC/ezNBn7wMMPx7FDZUDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 96c5ecd..c5abc10 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "prettier": "^3.2.5",
     "prisma": "^5.12.1",
     "tsc-alias": "^1.9.2",
-    "tsx": "^4.7.2",
+    "tsx": "^4.23.13",
     "typescript": "^5.4.5",
     "vitest": "^1.5.0"
   },
diff --git a/prisma/seed/categories.seed.ts b/prisma/seed/categories.seed.ts
index 98797db..770aca2 100644
--- a/prisma/seed/categories.seed.ts
+++ b/prisma/seed/categories.seed.ts
@@ -2,7 +2,7 @@ import { PrismaClient } from '@prisma/client';
 
 export async function seedCategories(prisma: PrismaClient): Promise<void> {
   // eslint-disable-next-line no-console
-  console.log('  -> Seeding baseline product categories...');
+  console.log(' Seeding baseline product categories...');
 
   const product = await prisma.product.findUnique({
     where: { code: 'CORE_PLATFORM' },