changes

ClassModals.py

@@ -7,6 +7,7 @@ class Modals:
 
     class FileDetails(BaseModel):
         filecontents: str
+        IsJobDescription: bool
         filename: str
         fileid: str
         message: str

UploadFile.py

@@ -5,19 +5,24 @@ import pandas as pd
 
 class UploadOpenFile:
 
-    def uploadFile(text,filePath,db_params):
+    def uploadFile(text,filePath,db_params,isJD):
 
         conn = psycopg2.connect(**db_params)
         cursor = conn.cursor()    
-        query = "Select max(jdmasterid) from JdMaster"                
-        df = pd.read_sql_query(query, conn)
+        if(isJD):             
+            df = pd.read_sql_query("Select max(jdmasterid) from JdMaster", conn)
+        else:
+            df = pd.read_sql_query("Select max(masterid) from CourseMaster", conn)    
         try:
             MasterId = df.iat[0,0] + 1
         except:
             MasterId =1
 
         print(MasterId)
-        query =sql.SQL("""INSERT INTO  JDMaster (jdmasterid,jobdescription, filename, UploadedDate, IsDetailsExtracted,IsSkillsExtracted,source) VALUES (%s,%s,%s,%s,%s,%s,%s)""")
+        if(isJD): 
+            query =sql.SQL("""INSERT INTO  JDMaster (jdmasterid,jobdescription, filename, UploadedDate, IsDetailsExtracted,IsSkillsExtracted,source) VALUES (%s,%s,%s,%s,%s,%s,%s)""")
+        else:
+            query =sql.SQL("""INSERT INTO  CourseMaster (masterid,description, filename, UploadedDate, IsDetailsExtracted,IsSkillsExtracted,source) VALUES (%s,%s,%s,%s,%s,%s,%s)""")    
         cursor.execute(query, (MasterId,text,filePath, date.today(),0,0,"JD")) 
         conn.commit()
         cursor.close()

app.py

@@ -47,9 +47,9 @@ def parse_csv(df):
 
 
 @app.post("/UploadJobDescription/")
-def uploadJobDescription(file: bytes =  File(...), FileName: str = "sample.pdf"):   
+def UploadJobDescription(file: bytes =  File(...), FileName: str = "sample.pdf"):   
     text= ExtractContentFromFile.ExtractDataFromFile(FileName,file)
-    returnID = UploadOpenFile.uploadFile(text,FileName,db_params)
+    returnID = UploadOpenFile.uploadFile(text,FileName,db_params,True)
     returnSkills = SkillExtractorDetails.SkillExtract(db_params,skill_extractor,returnID)     
     details = returnSkills.split('@')
     data = {'Data':['Required Skills', 'Soft Skills', 'Good to have Skills'], 'Values':[details[0], details[1], details[2]]}
@@ -66,7 +66,7 @@ def AllProfileMatchResults():
 @app.post("/UploadOpenText/")
 def UploadOpenText(file_data: ClassModals.Modals.FileDetails):   
    
-   returnID = UploadOpenFile.uploadFile(file_data.filecontents,file_data.filename,db_params)
+   returnID = UploadOpenFile.uploadFile(file_data.filecontents,file_data.filename,db_params,file_data.IsJobDescription)
    file_data.filecontents = ""
    file_data.fileid = str(returnID)
    file_data.message = "File Uploaded Successfully!"