devdemo improvements

Author: ivictbor

dev-demo/.env.local

@@ -2,5 +2,5 @@ KEYCLOAK_URL=http://localhost:8080
 
 ADMINFORTH_SECRET=123
 NODE_ENV=development
-DATABASE_URL=sqlite://.db.sqlite
-PRISMA_DATABASE_URL=file:.db.sqlite
+DATABASE_URL=sqlite://./.db.sqlite
+DATABASE_FILE_URL=file:.db.sqlite

dev-demo/index.ts

@@ -2,7 +2,6 @@ import betterSqlite3 from 'better-sqlite3';
 import express from 'express';
 import AdminForth, { AdminUser, Filters } from '../adminforth/index.js';
 
-import AuditLogPlugin from '../plugins/adminforth-audit-log/index.js';
 import clicksResource from './resources/clicks.js';
 import apartmentsResource from './resources/apartments.js';
 import apartmentBuyersResource from './resources/apartment_buyers.js';
@@ -18,15 +17,24 @@ import providersResource from './resources/providers.js';
 import apiKeysResource from './resources/api_keys.js';
 import CompletionAdapterOpenAIChatGPT from '../adapters/adminforth-completion-adapter-open-ai-chat-gpt/index.js';
 import pkg from 'pg';
+import I18nPlugin from '../plugins/adminforth-i18n/index.js';
 const { Client } = pkg;
 
+
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+      NODE_ENV: string;
+      DATABASE_URL: string;
+      OPENAI_API_KEY: string;
+      PORT: string;
+    }
+  }
+}
+
 // const ADMIN_BASE_URL = '/portal';
 const ADMIN_BASE_URL = '';
 
-// create test1.db 
-const dbPath = 'db.sqlite';
-const db = betterSqlite3(dbPath)
-
 async function seedDatabase() {
 
   const adapter = new CompletionAdapterOpenAIChatGPT({
@@ -182,7 +190,7 @@ export const admin = new AdminForth({
   dataSources: [
     {
       id: 'maindb',
-      url: `sqlite://${dbPath}`
+      url: process.env.DATABASE_URL,
     },
     {
       id: 'pg',
@@ -353,7 +361,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
     admin.express.translatable(
       async (req: any, res: express.Response) => {
         const days = req.body.days || 7;
-        const apartsByDays = await db.prepare(
+        const apartsByDays = await admin.resource('aparts').dataConnector.client.prepare( 
           `SELECT 
             strftime('%Y-%m-%d', created_at) as day, 
             COUNT(*) as count 
@@ -367,7 +375,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
         const totalAparts = apartsByDays.reduce((acc: number, { count }: { count:number }) => acc + count, 0);
 
         // add listed, unlisted, listedPrice, unlistedPrice
-        const listedVsUnlistedByDays = await db.prepare(
+        const listedVsUnlistedByDays = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             strftime('%Y-%m-%d', created_at) as day, 
             SUM(listed) as listed, 
@@ -381,7 +389,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
           `
         ).all(days);
 
-        const apartsCountsByRooms = await db.prepare(
+        const apartsCountsByRooms = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             number_of_rooms, 
             COUNT(*) as count 
@@ -391,7 +399,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
           `
         ).all();
 
-        const topCountries = await db.prepare(
+        const topCountries = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             country, 
             COUNT(*) as count 
@@ -402,14 +410,14 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
           `
         ).all();
 
-        const totalSquare = await db.prepare(
+        const totalSquare = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             SUM(square_meter) as totalSquare 
           FROM apartments;
           `
         ).get();
 
-        const listedVsUnlistedPriceByDays = await db.prepare(
+        const listedVsUnlistedPriceByDays = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             strftime('%Y-%m-%d', created_at) as day, 
             SUM(listed * price) as listedPrice,

dev-demo/migrations/20250414182355_addapartment_source/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "apartments" ADD COLUMN "apartment_source" TEXT;

dev-demo/schema.prisma

@@ -34,6 +34,7 @@ model apartments {
     realtor_id      String?
     user_id         String?
     apartment_image String?
+    apartment_source String?
 }
 
 model audit_log {