refactor

src/officesense_pi/src/api/livedata/livadata.routes.ts

@@ -3,8 +3,7 @@ import { getEntities, getEntitiesOfType, getEntity } from "./livedata.controller
 
 const router = express.Router();
 
-router.get("/entities", getEntities);
+router.get("/entities", getEntities, getEntitiesOfType);
-router.get("/entities", getEntitiesOfType);
 router.get("/entities/:urn", getEntity);
 
 export default router;

src/officesense_pi/src/index.ts

@@ -1,14 +1,22 @@
 import express from "express";
-import lookupRoutes from "./api/lookup/lookup.routes.js";
+import lookupRouter from "./api/lookup/lookup.routes.js";
-import livedataRoutes from "./api/livedata/livadata.routes.js"
+import livedataRouter from "./api/livedata/livadata.routes.js"
+import mapperRouter from "./api/mapper/mapper.routes.js"
+import { createAdmin, sessionMiddleware } from './api/management/adminjs.routes.js'
 import config from "./config/config.js";
 import { bootstrap } from "./core/bootstrap.js";
 
 (async () => {
     const app = express();
 
-    app.use("/lookup", lookupRoutes);
+    const { admin, router: adminRouter } = await createAdmin();
-    app.use("/livedata", livedataRoutes);
+
+    app.use(sessionMiddleware);
+
+    app.use("/lookup", lookupRouter);
+    app.use("/livedata", livedataRouter);
+    app.use("/admin", mapperRouter);
+    app.use("/admin", adminRouter);
 
     app.listen(config.api.port, config.api.address, () => {
         console.log(`Server listening on ${config.api.address}:${config.api.port}`);

src/officesense_pi/src/lib/prisma.ts

@@ -1,10 +1,5 @@
-import "dotenv/config";
+import { PrismaClient } from '@prisma/client'
-import { PrismaBetterSqlite3 } from "@prisma/adapter-better-sqlite3";
-import { PrismaClient } from "../generated/prisma/client.js";
 
-const connectionString = `${process.env.DATABASE_URL}`;
+const prisma = new PrismaClient()
-
-const adapter = new PrismaBetterSqlite3({ url: connectionString });
-const prisma = new PrismaClient({ adapter });
 
 export { prisma };