17-06-2026 1st commit

main2.py

@@ -45,7 +45,7 @@ from mids import (
 
 from masters.dimensions import *
 from masters.bridge import *
-from kpi.facts import *
+from src.fact import *
 
 
 # ==========================================================
@@ -94,15 +94,15 @@ def get_empids_clickhouse_OQAD(
         log.warning(f"Table '{table_name}' does not exist.")
         return pl.DataFrame(
             schema={
-                "EmpId": pl.Int64,
-                "VisitDate": pl.Date,
+                "empid": pl.Int64,
+                "visitdate": pl.Date,
             }
         )
 
     query = f"""
     SELECT DISTINCT
-        employee_id AS EmpId,
-        toDate(visit_date) AS VisitDate
+        employee_id AS empid,
+        visit_date AS visitdate
     FROM {table_name}
     """
 
@@ -166,20 +166,24 @@ def main():
         sql_engine,
         run_date,
     )
-    qf=fetch_quiz_empids()
+    qf=fetch_quiz_empids(sql_engine,run_date)
     db_df = get_empids_clickhouse_OQAD(client)
 
     matched = qf.join(
     db_df,
-    on=["EmpId", "VisitDate"],
+    on=["empid", "visitdate"],
     how="inner",
 )
+    empids=matched["empid"].to_list()
+    
+    log.info(f"Fetched {len(empids):,} matched empids fetched for OQAD ")
+
     # ------------------------------------------------------
     # Config
     # ------------------------------------------------------
 
     with open(
-        "t.yml",
+        "y.yml",
         "r",
     ) as file:
 
@@ -207,16 +211,27 @@ def main():
             # ------------------------------------------
             # Fetch Data
             # ------------------------------------------
+            if table_name =="OQaD":
+                
+            
+                df=fetch_OQaD(  engine=sql_engine,
+                                table_name=table_name,
+                                table_type=table_type,
+                                empids=empids,
+                                run_date=run_date
+                                )
 
-            fn_name = f"fetch_{table_name}"
+                                            
+            else:
+                
 
-            df = get_dataframe(
-                fn_name=fn_name,
-                fetch_by=fetch_by,
-                sql_engine=sql_engine,
-                mids=mids,
-                run_date=run_date,
-            )
+                df = fetch_data(
+                    engine=sql_engine,
+                    table_name=table_name,
+                    table_type=table_type,
+                    mids=mids,
+                    run_date=run_date,
+                )
 
             if df.is_empty():