Merge pull request #67 from Cognic-AI/sahan_last

Sahan last

Author: SahanWeerasiri

ML_model/firestoreDB.py

@@ -52,12 +52,13 @@ def get_customer_history(self, customer_id):
 
         return items_docs
 
-    def add_search_result(self, item_id, item_score, customer_id):
+    def add_search_result(self, item_id, item_score, customer_id,item_name):
         print(f"\nAdding search result for Item ID(s): {item_id}, score(s): {item_score}")
         self.db.collection("customer").document(customer_id).collection("history").add({
             "timestamp": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
             "items": item_id,
-            "score": item_score
+            "score": item_score,
+            "item_name":item_name
         })
 
     def add_purchase(self, item_id, customer_id):
@@ -89,7 +90,7 @@ def check_csv(self, item_name, country_code):
 
         return False,None
 
-    def add_search_item(self, customer_id, item_array):
+    def add_search_item(self, customer_id, item_array,item_name):
         print(f"\nAdding search items for Customer ID: {customer_id}")
         item_suggested = []
         item_suggested_score = []
@@ -123,7 +124,7 @@ def add_search_item(self, customer_id, item_array):
             item_suggested.append(item_id)
             item_suggested_score.append(item.score)
 
-        self.add_search_result(item_suggested, item_suggested_score, customer_id)
+        self.add_search_result(item_suggested, item_suggested_score, customer_id,item_name)
         self.add_purchase(item_id,customer_id)
 
 

Machine_Customer_Endpoint.py

@@ -88,7 +88,7 @@ def recommend():
             print("\nSending response to database...")
             # Initialize database connection
             database = db.FirestoreDB()
-            database.add_search_item(machine_customer.customer_id, result)
+            database.add_search_item(machine_customer.customer_id, result,request_data["item_name"])
             print("Sending email...")
             print(send_email(machine_customer.customer_name, machine_customer.email, result, request_data["item_name"]))
             return jsonify({"status": "success and email sent"})

frontend/app/api/firestore.js

@@ -68,7 +68,8 @@ export const createAccount = async (collectionName, data) => {
 
       // Iterate over each document in the 'history' collection
       for (const historyDoc of docs_) {
-        const folder = {folder:historyDoc.id,items:[]};
+        const folder_name = historyDoc.get("item_name")!=""?historyDoc.get("item_name"):historyDoc.id;
+        const folder = {folder:folder_name,items:[]};
         const items = [];
         const historyItems = historyDoc.get("items"); // Assume 'items' is an array of item IDs
         if (Array.isArray(historyItems)) {