ACP Custom Report Changes

scripts/configurations/__init__.py

@@ -60,6 +60,7 @@ class PostgresDetails(BaseSettings):
     port: str
     username: str
     password: str
+    database: str = ""
 
     class Config:
         env_prefix = "POSTGRES_"

scripts/constants/__init__.py

@@ -53,7 +53,8 @@ class CommonConstants:
     FREQUENCY = 'D'
     START_COLUMN = 0
     START_ROW = 2
-    OVERALL_COLUMN_WIDTH = 27
+    REFINERY_COLUMN_WIDTH = 27
+    ACP_COLUMN_WIDTH = 24
 
 
 class ReportType:
@@ -64,8 +65,9 @@ class ReportType:
     REFINERY_REPORT = "refinery_report"
     ACP_REPORT = "acp_report"
     REFINERY_WORKSHEET_NAME = "REFINERY DAILY PERFORMANCE REPORT"
-    ACP_WORKSHEET_NAME = "VEDANTA LIMITED \n ANODE CASTING PLANT (ACP) - " \
-                         "SHIFT INCHARGE LOG SHEET"
+    ACP_WORKSHEET_NAME_1 = "VEDANTA LIMITED"
+    ACP_WORKSHEET_NAME_2 = "ANODE CASTING PLANT (ACP) - SHIFT INCHARGE LOG SHEET"
+    DATE = "DATE"
 
 
 class PostgresConstant:

scripts/core/db/postgres/custom_report_query.py

@@ -3835,10 +3835,10 @@ class ACPQuery:
         """ Persons on duty """
         QUERY_1 = """
         SELECT 
-        PERSONS_ON_DUTY,
-        A_SHIFT,
-        B_SHIFT,
-        C_SHIFT
+        PERSONS_ON_DUTY AS persons_on_duty,
+        A_SHIFT as a,
+        B_SHIFT as b,
+        C_SHIFT as c
         FROM SEMANTIC_PROD.SHIFT_MANPOWER_ACP
         WHERE DATE='{day_start_date}'
         """
@@ -3990,8 +3990,14 @@ class ACPQuery:
     class MeltTemperature:
         """ PARAMETERS """
         QUERY_1 = """
+        SELECT 
+        'MELT TEMPERATURE' AS parameters,
+        '1120-1140 DEG C' AS range,
+        SUM(COALESCE(MELT_TEMP, 0)) AS value
         
-        AND DATE(date) = '{day_start_date}'
+        FROM SEMANTIC_PROD.FURNACE_1_CTP
+        WHERE DATE = '{day_start_date}'
+        GROUP BY 1;
         """
 
     class MouldTemperature:
@@ -4118,3 +4124,45 @@ class ACPQuery:
         WHERE LOWER(SUBSTRING(ANODE_SHIFT_SELECTION,1,1)) = 'c'
         AND DATE(date) = '{day_start_date}'
         """
+
+    class FurnaceShiftA:
+        """ FURNACE SHIFT A """
+        QUERY_1 = """
+        SELECT 
+        SHIFTA_FURNACE AS furnace,
+        BURNER_1 as burner_1,
+        BURNER_2 as burner_2,
+        BURNER_3 as burner_3
+        
+        FROM SEMANTIC_PROD.ACP_BURNER_CLEANING
+        WHERE LOWER(SHIFT) = 'shift a'
+        AND DATE(date) = '{day_start_date}'
+        """
+
+    class FurnaceShiftB:
+        """ FURNACE SHIFT B """
+        QUERY_1 = """
+        SELECT 
+        SHIFTB_FURNACE AS furnace,
+        BURNER1_B AS burner_1,
+        BURNER2_B AS burner_2,
+        BURNER3_B AS burner_3
+        
+        FROM SEMANTIC_PROD.ACP_BURNER_CLEANING
+        WHERE LOWER(SHIFT) = 'shift b'
+        AND DATE(date) = '{day_start_date}'
+        """
+
+    class FurnaceShiftC:
+        """ FURNACE SHIFT C """
+        QUERY_1 = """
+        SELECT 
+        SHIFTC_FURNACE AS furnace,
+        BURNER1_C AS burner_1,
+        BURNER2_C AS burner_2,
+        BURNER3_C AS burner_3
+        
+        FROM SEMANTIC_PROD.ACP_BURNER_CLEANING
+        WHERE LOWER(SHIFT) = 'shift c'
+        AND DATE(date) = '{day_start_date}'
+        """

scripts/core/schemas/api/custom_report_model.py

@@ -14,6 +14,8 @@ class ReportInput(BaseModel):
 
 
 class ReportOutput(BaseModel):
-    status: bool
-    message: str
-    data: str
+    job_id: str
+    file_path: str = ""
+    file_name: Optional[str] = None
+    is_schedule: Optional[bool] = False
+    project_id: str

scripts/core/services/event_service.py

@@ -63,10 +63,10 @@ async def custom_report_function(input_json: custom_report_input_model):
 
     """
     try:
-        status, message, data = report_handler_obj.custom_report_handler(
+        response = report_handler_obj.custom_report_handler(
             input_json=input_json
         )
-        return {"status": status, "message": message, "data": data}
+        return response
     except Exception as err:
         logger.exception(
             CommonConstants.EXCEPTION_RAISER.format(str(err)),

scripts/template/refinery_report_template.py

@@ -3,6 +3,7 @@ from scripts.core.db.postgres.custom_report_query import SterliteRefineryQuery
 
 
 class SterliteRefineryTemplate:
+    """ HEADER STYLING FORMAT """
     WORKSHEET_HEADER_FORMAT = {
         "bold": True,
         "align": "center",
@@ -12,6 +13,8 @@ class SterliteRefineryTemplate:
         "border": 1,
         'font_size': '20',
     }
+
+    """ COLUMN HEADER FORMAT """
     COLUMN_HEADER_FORMAT = {
         "bold": True,
         "align": "center",
@@ -25,6 +28,8 @@ class SterliteRefineryTemplate:
         "align": "center",
         "valign": "center",
     }
+
+    """ REPORT TEMPLATE """
     REPORT_TEMPLATE = [
         {
             "CATHODE PRODUCTION REVISED": {