Merge pull request #4 from ConnerWithAnE/base-components

Base components

Author: ConnerWithAnE

server/package.json

@@ -15,8 +15,8 @@
   "devDependencies": {
     "@types/axios": "^0.14.4",
     "@types/jest": "^29.5.14",
-    "@types/multer": "^1.4.12",
     "@types/jsonwebtoken": "^9.0.7",
+    "@types/multer": "^1.4.12",
     "@types/node": "^22.7.6",
     "@types/sqlite3": "^3.1.11",
     "jest": "^29.7.0",
@@ -34,8 +34,8 @@
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
-    "multer": "^1.4.5-lts.1",
     "jsonwebtoken": "^9.0.2",
+    "multer": "^1.4.5-lts.1",
     "openai": "^4.67.3",
     "sqlite": "^5.1.1",
     "sqlite3": "^5.1.7"

server/src/database-controller.ts

@@ -3,7 +3,7 @@ import { open, Database } from "sqlite";
 import { DataTable } from "./interfaces/database-interface";
 import { resolve } from "path";
 import { rejects } from "assert";
-import { GetQuery, InsertData, RadData } from "./types";
+import { GetQuery, TableData, RadData } from "./types";
 import { error } from "console";
 
 export class DatabaseController {
@@ -99,7 +99,7 @@ export class DatabaseController {
    *           created in the 'author_paper_join' table for each author.
    * Returns: None
    */
-  async insertPaper(paperData: InsertData): Promise<void> {
+  async insertPaper(paperData: TableData): Promise<void> {
     if (!this.db) {
       throw new Error(`Database not initialized`);
     }
@@ -127,7 +127,7 @@ export class DatabaseController {
    * Returns:
    *  - number: The ROWID of the paper.
    */
-  private async createPaper(paperData: InsertData): Promise<number> {
+  private async createPaper(paperData: TableData): Promise<number> {
     if (!this.db) {
       throw new Error(`Database not initialized`);
     }
@@ -255,7 +255,48 @@ export class DatabaseController {
     }
   }
 
-  async getData(queryData: GetQuery): Promise<RadData[]> {
+  async getFullData(search: string): Promise<TableData[]> {
+    if (!this.db) {
+      throw new Error("Database not initialized");
+    }
+    let query = `
+      SELECT 
+        p.*,
+        p.ROWID AS id, 
+        GROUP_CONCAT(a.name, ', ') AS author
+      FROM 
+        paper p
+      LEFT JOIN 
+        paper_author_join apj ON p.ROWID = apj.paper_id
+      LEFT JOIN 
+        author a ON apj.author_id = a.ROWID
+      WHERE 
+        p.paper_name LIKE ?
+      GROUP BY
+        p.ROWID
+    `;
+
+    return new Promise<TableData[]>(async (resolve, reject) => {
+      try {
+       
+        const result = await this.db.all(query, `${search}%`);
+        console.log("Query executed successfully:");
+
+        // Map rows to RadData format
+        const radData: TableData[] = result.map((row) => ({
+          ...row,
+          author: row.author ? row.author.split(", ") : [],
+        }));
+
+        resolve(radData);
+      } catch (error) {
+        console.error("Error getting data", error);
+        throw error;
+      }
+    });
+  }
+
+  async getFilteredData(queryData: GetQuery): Promise<RadData[]> {
     if (!this.db) {
       throw new Error("Database not initialized");
     }

server/src/gpt-controller.ts

@@ -80,6 +80,7 @@ export class GPTController {
                   type: preres[4],
                   manufacturer: preres[5],
                   testing_location: <TestLocation>preres[6],
+
                   testing_type: <Testing>preres[7],
                   // TODO: preres[7] is a list ("TID, TID, DD") if the paper has more than one testing type, so the cast may fail
                   //       Produces weird output: "SEE【4:0†source】"

server/src/index.ts

@@ -34,7 +34,7 @@ const corsOptions = {
   origin: "*", // Allow all origins
 };
 
-app.use(cors(corsOptions));
+app.use(cors());
 app.use(bodyParser.json());
 
 async function initializeSystem(): Promise<{dbController: DatabaseController, gptController: GPTController}> {

server/src/routes/admin-router.ts

@@ -1,6 +1,6 @@
 import express, { Request, Response, Router, NextFunction } from "express";
 import { DatabaseController } from "../database-controller";
-import { GetQuery, GPTResponse, InsertData, RadData, Testing } from "../types";
+import { GetQuery, GPTResponse, TableData, RadData, Testing } from "../types";
 import axios from "axios";
 import jwt from "jsonwebtoken";
 import authenticateJWT from "../auth/jwt-auth";
@@ -25,7 +25,10 @@ export default function adminRouter(
     authenticateJWT,
     async (req: Request, res: Response) => {
       try {
-        await insertRows(requestFromJSON(req.body), dbController).then(() => {
+        await insertRows(
+          insertDataRequestFromJSON(req.body),
+          dbController,
+        ).then(() => {
           // 201: The request was successful, and a new resource was created
           res.send(201);
         });
@@ -46,7 +49,23 @@ export default function adminRouter(
           res.send(responseToJSON(result));
         });
       } catch (error) {
-        console.error(``);
+        console.error(`${error}`);
+      }
+    },
+  );
+
+  router.post(
+    "/getFullPapers",
+    /*authenticateJWT,*/ (req: Request, res: Response) => {
+      try {
+        // More intricate searches can be employed later similar to the table filter
+        getFullPaperRows(req.body.search, dbController).then(
+          (result: TableData[]) => {
+            res.send(JSON.stringify(result, null, 2));
+          },
+        );
+      } catch (error) {
+        console.error(`${error}`);
       }
     },
   );
@@ -105,7 +124,7 @@ export default function adminRouter(
 }
 
 async function insertRows(
-  insertData: InsertData[],
+  insertData: TableData[],
   dbcontroller: DatabaseController,
 ): Promise<void> {
   for (const paper in insertData) {
@@ -123,7 +142,14 @@ async function parsePapers(
   return temp;
 }
 
-function requestFromJSON(body: any): InsertData[] {
+async function getFullPaperRows(
+  search: string,
+  dbController: DatabaseController,
+): Promise<TableData[]> {
+  return await dbController.getFullData(search);
+}
+
+function insertDataRequestFromJSON(body: any): TableData[] {
   // Ensure body is an array of objects matching the InsertData structure
   if (!Array.isArray(body)) {
     throw new Error("Invalid body format: expected an array.");
@@ -132,7 +158,7 @@ function requestFromJSON(body: any): InsertData[] {
   // Return a list of rows to insert
   return body.map((entry) => {
     // Return the validated entry as InsertData
-    return { ...entry } as InsertData;
+    return { ...entry } as TableData;
   });
 }
 

server/src/routes/cascade-router.ts

@@ -46,7 +46,7 @@ function getFilteredRows(
   getData: GetQuery,
   dbcontroller: DatabaseController,
 ): Promise<RadData[]> {
-  return dbcontroller.getData(getData);
+  return dbcontroller.getFilteredData(getData);
 }
 
 function requestFromJSON(body: any) {

server/src/types.ts

@@ -14,7 +14,8 @@ export type GetQuery = {
   data_type?: number;
 };
 
-export type InsertData = {
+export type TableData = {
+  id?: number;
   paper_name: string;
   year: number;
   author: string[];

server/test/database-controller.test.ts

@@ -1,7 +1,7 @@
 import { DatabaseController } from '../src/database-controller';
 import sqlite3 from 'sqlite3';
 
-import { GetQuery, InsertData, RadData } from '../src/types';
+import { GetQuery, TableData, RadData } from '../src/types';
 import Response from 'express';
 import { open } from 'sqlite';
 
@@ -37,7 +37,7 @@ beforeAll(async () => {
  ***********/
 
 test('Insertion of a paper with one author', async () => {
-  const testPaperData: InsertData = {
+  const testPaperData: TableData = {
     paper_name: 'Tested Radiation Effects',
     year: 2024,
     author: ['S. Davis'],
@@ -53,7 +53,7 @@ test('Insertion of a paper with one author', async () => {
 });
 
 test('Insertion of a paper with multiple authors', async () => {
-  const testPaperData: InsertData = {
+  const testPaperData: TableData = {
     paper_name: 'Radiation Test Effects On Tested Radiation',
     year: 2023,
     author: ['John Jacob', 'Lin Lee', 'Dr. Joan Gooding'],