review endpoint

Author: Francesca-Bit

src/api/core/ChangeRequestDB.ts

@@ -343,6 +343,12 @@ class ChangeRequestDB {
     return userDatabase.getVersionDiff(originalBranch, trackingBranch, undefined,options)
   }
 
+  checkUserReadAuthorization () {
+    const tmpClient = this.connectWithCurrentUser()
+    const query = TerminusClient.WOQL.limit(1).triple('v:a', 'v:b', 'v:c')
+    return tmpClient.query(query)
+  }
+
   async addMessage (changeIdHash:string, message:string) {
     const changeId = `ChangeRequest/${changeIdHash}`
     const requestDoc = await this.client.getDocument({ id: changeId })
@@ -456,14 +462,15 @@ class ChangeRequestDB {
     }
   }
 
- async getLastCommitsIndexed (limit = 1, status?:string) {
+ async getLastCommitsIndexed (limit = 1, status?:string, branch?:string) {
   try {
     const WOQL = TerminusClient.WOQL
     const statusVar = status && this.availableStatus[status] ? `@schema:Indexing_Status/${status}` : 'v:indexing_status'
+    const branchVar = branch ? WOQL.string(branch) : 'v:branch'
     const query = WOQL.limit(limit).order_by(['v:time', 'desc']).and(
       WOQL.triple('v:index', 'rdf:type', '@schema:Indexed_commit'),
       WOQL.triple('v:index', '@schema:change_request_commit_id', 'v:commit_id'),
-      WOQL.triple('v:index', '@schema:searchable_branch_name', 'v:branch'),
+      WOQL.triple('v:index', '@schema:searchable_branch_name', branchVar),
       WOQL.triple('v:index', '@schema:indexing_status', statusVar),
       WOQL.triple('v:index', '@schema:searchable_branch_commit_id', 'v:searchable_commit'),
       WOQL.triple('v:index', '@schema:indexed_at', 'v:time'),

src/api/core/GraphqlTableConfig.ts

@@ -219,7 +219,7 @@ class GraphqlTableConfig {
     const result = await client.query({ query })
     const schemaDoc = await woqlClient.getDocument({ graph_type: 'schema', as_list: true })
     const tableConfig = this.formatSchema(result, schemaDoc)
-    this.logger.debug(JSON.stringify(tableConfig, null, 4))
+    //this.logger.debug(JSON.stringify(tableConfig, null, 4))
     return tableConfig
   }
 

src/api/core/IndexClient.ts

@@ -31,11 +31,9 @@ export function assignCommit (logger:any, domain:any, sourceCommit:any, targetCo
   return axios.get(`${baseUrl}assign`, config)
 }
 
-export function searchIndex (req:Request, apikey?:string) {
+export function searchIndex (req:Request, domain:string, commit:string, apikey?:string) {
   if(!apikey) throw new Error("Plase set a valid OpenAI api key")
   const headers = { VECTORLINK_EMBEDDING_API_KEY: apikey, 'Content-Type': 'text/plain' }
-  const domain = req.query.domain
-  const commit = req.query.commit
   const config = { headers, params: { commit: commit, domain: domain } }
   return axios.post(`${baseUrl}search`, req.body.search, config)
 }

src/api/paths/api/changes/{org}/{db}/index.ts

@@ -27,7 +27,7 @@ import ChangeRequestDB from "../../../../../core/ChangeRequestDB";
         const message = req.body.message || "create a new change request"
         const changeR = new ChangeRequestDB(req)
         const crId= await changeR.createChangeRequest(message)
-        console.log(`About to create Change Request: ${JSON.stringify(req.body)}`);
+        //console.log(`About to create Change Request: ${JSON.stringify(req.body)}`);
         res.status(201).send({message:"the change request as been created",...crId});
       }catch(err:any){
           console.log(err.message)

src/api/paths/api/indexes/{org}/{db}/index.ts

@@ -5,10 +5,13 @@ import ChangeRequestDB from "../../../../../core/ChangeRequestDB";
     export const GET: Operation = async(req:Request, res:Response) =>{
       try{
         const changeR = new ChangeRequestDB(req)
+        // check if the user has read access
+        await changeR.checkUserReadAuthorization()
         const limitPar:string = typeof req.query.limit  === "string" ? req.query.limit : '5'
         const limit:number = parseInt(limitPar)
         const status = typeof req.query.status === "string" ? req.query.status : undefined
-        const commits = await changeR.getLastCommitsIndexed(limit, status)
+        const branch = typeof req.query.branch === "string" ? req.query.branch : undefined
+        const commits = await changeR.getLastCommitsIndexed(limit, status, branch)
         res.status(200).json(commits)
       }catch(err:any){
           console.log(err.message)
@@ -46,7 +49,13 @@ import ChangeRequestDB from "../../../../../core/ChangeRequestDB";
           name: "status",
           required: false,
           type: "string"
-        }
+        },
+        {
+          in: "query",
+          name: "branch",
+          required: false,
+          type: "string"
+        },
       ],
       responses: {
         200: {

src/api/paths/api/indexes/{org}/{db}/search/index.ts

@@ -1,13 +1,16 @@
 import { Operation } from "express-openapi";
 import { Request,Response, } from "express";
 import * as IndexClient from '../../../../../../core/IndexClient'
-
+import ChangeRequestDB from "../../../../../../core/ChangeRequestDB";
 
     export const POST: Operation = async (req:Request, res:Response) =>{
       try {
+        const changeDB = new ChangeRequestDB(req)
+        await changeDB.checkUserReadAuthorization()
         const apiKey = process.env.OPENAI_KEY 
-      
-        const result = await IndexClient.searchIndex(req, apiKey)
+        const commit = req.query.commit as string
+        const domain = `${req.params.org}/${req.params.db}` 
+        const result = await IndexClient.searchIndex(req, domain, commit, apiKey)
         res.json(result.data)
       } catch (err:any) {
         //req.context.logger.error(err)
@@ -33,6 +36,12 @@ import * as IndexClient from '../../../../../../core/IndexClient'
           required: true,
           type: "string"
         },
+        {
+          in: "query",
+          name: "commit",
+          required: true,
+          type: "string"
+        },
         {
           in: "body",
           name: "change request",