Merge branch 'main' into NhanHT

app/configs/database.py

@@ -41,3 +41,21 @@ print("Firestore connected")
 # Initialize Storage
 firebase_bucket = storage.bucket(app=firebase_admin.get_app())
 print("Storage connected")
+
+# check if have question_tests collection
+if "question_tests" not in [collection.id for collection in firebase_db.collections()]:
+    # Create a collection
+    firebase_db.collection("question_tests").add({"question_tests_description": "test", "question_tests_role": "test", "question_tests_url": "test"})
+    print("Collection question_tests created")
+
+# check if have cvs collection
+if "cvs" not in [collection.id for collection in firebase_db.collections()]:
+    # Create a collection
+    firebase_db.collection("cvs").add({"name_candidate": "test", "apply_position": "test", "cv_url": "test"})
+    print("Collection cvs created")
+
+# check if have jds collection
+if "jds" not in [collection.id for collection in firebase_db.collections()]:
+    # Create a collection
+    firebase_db.collection("jds").add({"position_applied_for": "test","jd_url": "test"})
+    print("Collection jds created")

app/modules/__init__.py

@@ -1,12 +1,18 @@
 from fastapi import APIRouter
 from app.modules.question_tests_retrieval import qtretrieval_router
-from app.modules.crud_question_test import crud_question_tests_router
 from app.modules.matching_cv import cvmatching_router
 
+# crud import
+from app.modules.crud_question_test import crud_question_tests_router
+from app.modules.crud_cvs import crud_cvs_router
+from app.modules.crud_jds import crud_jds_router
+
 modules_router = APIRouter(prefix="/modules", tags=["modules"])
 modules_router.include_router(qtretrieval_router)
-modules_router.include_router(crud_question_tests_router)
 modules_router.include_router(cvmatching_router)
+modules_router.include_router(crud_question_tests_router)
+modules_router.include_router(crud_cvs_router)
+modules_router.include_router(crud_jds_router)
 
 @modules_router.get("/")
 async def index():

app/modules/crud_cvs/__init__.py

@@ -0,0 +1,40 @@
+from fastapi import APIRouter, UploadFile, File
+from typing import Annotated
+
+from app.modules.crud_cvs.models.crud_cvs import get_all_cvs, create_cv, delete_cv
+
+crud_cvs_router = APIRouter(prefix="/crud_cvs_router", tags=["crud_cvs_router"])
+
+# [GET] all CVs
+@crud_cvs_router.get("/")
+async def index():
+    # Get all documents from the collection with id document
+    data = get_all_cvs()
+    return data
+
+# [POST] add CV
+@crud_cvs_router.post("/")
+# only upload pdf or docx file
+async def add_cv(name_candidate: str, apply_position: str, file_cv: Annotated[UploadFile, File(..., description="Upload cv file (upload .pdf or .docx file)")]):
+    try:
+        # take file_cv and cv_upload type file
+        file_cv_type = file_cv.filename.split(".")[-1]
+        if file_cv_type in ["pdf", "docx"]:
+            # create a new document
+            if create_cv({"name_candidate": name_candidate, "apply_position":apply_position, "cv_url": file_cv}):
+                return {"message": "CV added successfully"}
+            else:
+                return {"message": "Error while adding CV file to database"}
+        else:
+            return {"message": "File type not supported"}
+    except Exception as e:
+        return {"message": "Error", "error": str(e)}
+
+# [DELETE] CV by id
+@crud_cvs_router.delete("/{id}")
+async def delete_cv_by_id(id: str):
+    # Delete a document by id
+    if delete_cv(id):
+        return {"message": f"CV have id {id} deleted successfully"}
+    else:
+        return {"message": "Error while deleting CV file from database"}

app/modules/crud_cvs/models/crud_cvs.py

@@ -0,0 +1,52 @@
+import uuid
+from app.configs.database import firebase_bucket, firebase_db
+
+# CRUD operation
+def upload_file_cvs(file):
+    re_name_file = str(uuid.uuid4()).replace("-","_") + "_" + file.filename
+    # upload file to firebase storage
+    blob = firebase_bucket.blob(re_name_file)
+    blob.upload_from_file(file.file)
+    # return gs link
+    return f"gs://{firebase_bucket.name}/{re_name_file}"
+
+def remove_file_cvs(file_url):
+    # remove file from firebase storage using "gs://" link
+    blob = firebase_bucket.blob(file_url.split(f"gs://{firebase_bucket.name}/")[1])
+    blob.delete()
+    return True
+
+def get_all_cvs():
+    # Get all documents from the collection
+    docs = firebase_db.collection("cvs").stream()
+    data = []
+    for doc in docs:
+        doc_data = doc.to_dict()
+        doc_data["id_cv"] = doc.id
+        data.append(doc_data)
+    return data
+
+def get_cv_by_id(id):
+    # Get a document by id
+    doc = firebase_db.collection("cvs").document(id).get()
+    return doc.to_dict()
+
+def create_cv(data):
+    # get file_cvs
+    file_cvs = data["cv_url"]
+    # upload file to firebase storage
+    file_url = upload_file_cvs(file_cvs)
+    # add file url to data
+    data["cv_url"] = file_url
+    # Create a new document
+    document_ref = firebase_db.collection("cvs").add(data)
+    # document_id = document_ref[1].id
+    return True
+
+def delete_cv(id):
+    # Delete a file from firebase storage
+    file_url = get_cv_by_id(id)["cv_url"]
+    remove_file_cvs(file_url)
+    # Delete a document by id
+    firebase_db.collection("cvs").document(id).delete()
+    return True

app/modules/crud_jds/__init__.py

@@ -0,0 +1,39 @@
+from fastapi import APIRouter, UploadFile, File
+from typing import Annotated
+
+from app.modules.crud_jds.models.crud_jds import get_all_jds, create_jd, delete_jd
+
+crud_jds_router = APIRouter(prefix="/crud_jds_router", tags=["crud_jds_router"])
+
+# [GET] all JDs
+@crud_jds_router.get("/")
+async def index():
+    # Get all documents from the collection with id document
+    data = get_all_jds()
+    return data
+
+# [POST] add JD
+@crud_jds_router.post("/")
+# only upload pdf or json file
+async def add_jd(position_applied_for: str, file_jd: Annotated[UploadFile, File(..., description="Upload jd file (upload .txt)")]):
+    try:
+        file_jd_type = file_jd.filename.split(".")[-1]
+        if file_jd_type in ["txt"]:
+            # create a new document
+            if create_jd({"position_applied_for": position_applied_for,"jd_url": file_jd}):
+                return {"message": "JD added successfully"}
+            else:
+                return {"message": "Error while adding JD file to database"}
+        else:
+            return {"message": "File type not supported"}
+    except Exception as e:
+        return {"message": "Error", "error": str(e)}
+
+# [DELETE] JD by id
+@crud_jds_router.delete("/{id}")
+async def delete_jd_by_id(id: str):
+    # Delete a document by id
+    if delete_jd(id):
+        return {"message": f"JD have id {id} deleted successfully"}
+    else:
+        return {"message": "Error"}

app/modules/crud_jds/models/crud_jds.py

@@ -0,0 +1,53 @@
+import uuid
+from app.configs.database import firebase_bucket, firebase_db
+
+
+# CRUD operation
+def upload_file_jds(file):
+    re_name_file = str(uuid.uuid4()).replace("-","_") + "_" + file.filename
+    # upload file to firebase storage
+    blob = firebase_bucket.blob(re_name_file)
+    blob.upload_from_file(file.file)
+    # return gs link
+    return f"gs://{firebase_bucket.name}/{re_name_file}"
+
+def remove_file_jds(file_url):
+    # remove file from firebase storage using "gs://" link
+    blob = firebase_bucket.blob(file_url.split(f"gs://{firebase_bucket.name}/")[1])
+    blob.delete()
+    return True
+
+def get_all_jds():
+    # Get all documents from the collection
+    docs = firebase_db.collection("jds").stream()
+    data = []
+    for doc in docs:
+        doc_data = doc.to_dict()
+        doc_data["id_jd"] = doc.id
+        data.append(doc_data)
+    return data
+
+def get_jd_by_id(id):
+    # Get a document by id
+    doc = firebase_db.collection("jds").document(id).get()
+    return doc.to_dict()
+
+def create_jd(data):
+    # get file_jds
+    file_jds = data["jd_url"]
+    # upload file to firebase storage
+    file_url = upload_file_jds(file_jds)
+    # add file url to data
+    data["jd_url"] = file_url
+    # Create a new document
+    document_ref = firebase_db.collection("jds").add(data)
+    # document_id = document_ref[1].id
+    return True
+
+def delete_jd(id):
+    # Delete a file from firebase storage
+    file_url = get_jd_by_id(id)["jd_url"]
+    remove_file_jds(file_url)
+    # Delete a document by id
+    firebase_db.collection("jds").document(id).delete()
+    return True

app/modules/matching_cv/models/matching_cv_logic.py

@@ -20,14 +20,6 @@ load_dotenv()
 os.environ['GOOGLE_API_KEY'] = os.getenv('GOOGLE_API_KEY')
 GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY")
 
-# def load cv from docx file
-def load_cv_from_docx(file):
-    doc = docx.Document(file)
-    fullText = []
-    for para in doc.paragraphs:
-        fullText.append(para.text)
-    return '\n'.join(fullText)
-
 # def matching cv and jd return percentage of matching using prompt template
 def result_matching_cv_jd(cv_text, jd_text):
     # create the prompt template