ADDED: business logic complete with user report. waiting for last corrections.

Author: AleixMT

.gitignore

@@ -175,4 +175,6 @@ cython_debug/
 
 # own rules
 *.zip
-output.zip
+output.zip
+demo
+demo/

requirements.txt

@@ -1,7 +1,7 @@
-pypdf
-PyPDF2  # This does not work for extracting text in some cases
-pandas
+pypdf~=5.5.0
+PyPDF2~=3.0.1
+pandas~=2.0.3
 openpyxl
 PyCryptodome
 Office365-REST-Python-Client
-pyfiglet
+pyfiglet~=0.8.post1

src/arguments.py

@@ -9,7 +9,7 @@
 
 
 def get_compact_init():
-    return {DocType.SALARY: False, DocType.PROOFS: False, DocType.CONTRACT: False, DocType.RNT: False}
+    return {DocType.SALARY: False, DocType.PROOFS: False, DocType.CONTRACT: False, DocType.RNT: False, DocType.RLC: False}
 
 
 def parse_date(value, formatting="%Y_%m"):
@@ -62,9 +62,10 @@ def parse_arguments(valid_nafs):
     parser.add_argument("-e", "--end", type=parse_date, required=True, help="End date (YYYY-MM)")
     parser.add_argument("-a", "--author", type=parse_author, required=True, help="author's email doing request")
 
-    parser.add_argument("-c", "--compact", type=parse_compact, required=False, default=get_compact_init(), help="Comma separated list of values "
-                                                                          "that indicate "
-                        "which documents need to be merged in one signle PDF in the output. Possible values are: " + ",".join([dt.value.__str__() for dt in DocType]))
+    parser.add_argument("-c", "--compact", type=parse_compact, required=False, default=get_compact_init(),
+                        help="Comma separated list of values that indicate which documents need to be merged in one "
+                             "single PDF in the output. Possible values are: " +
+                             ",".join([dt.value.__str__() for dt in DocType]))
 
     args = parser.parse_args()
 

src/data.py

@@ -3,19 +3,22 @@
 '''
 import os
 from datetime import datetime
-from typing import Dict, Tuple
+from typing import Dict, Tuple, List
 
 from defines import SalaryType
 import logger
 
 
-def get_monthly_result_structure(begin: datetime, end: datetime) -> Dict[str, Tuple[bool, bool, bool]]:
+def get_rlc_monthly_result_structure(begin: datetime, end: datetime, result_structure=None) -> Dict[str, List[bool]]:
     result = {}
     current = datetime(begin.year, begin.month, 1)
 
     while current <= end:
         key = datetime.strptime(str(current.year * 100 + current.month), "%Y%m")
-        result[key] = [False, False, False]  # Monthly salary found, RLC L00N found, RLC L00P found
+        if result_structure is None:
+            result[key] = [False, False, False]
+        else:
+            result[key] = result_structure  # Monthly salary found, RLC L00N found, RLC L00P found
         # Move to next month
         if current.month == 12:
             current = datetime(current.year + 1, 1, 1)
@@ -25,8 +28,10 @@ def get_monthly_result_structure(begin: datetime, end: datetime) -> Dict[str, Tu
     return result
 
 
+
+
 def parse_salary_type(salary_file_path):
-    custom_logger = logger.get_process_logger(logger.base_logger, "Salaries and RLCs")
+    custom_logger = logger.get_process_logger(logger.get_logger_instance(), "Salaries and RLCs")
     parsed = salary_file_path[::-1].split("/")[0][::-1].split(".")[0].split("_")[1]
     custom_logger.debug("Data parsed from filename is: " + parsed)
     t = SalaryType(parsed)

src/defines.py

@@ -37,17 +37,15 @@ class DocType(Enum):
     RNT = "RNT"
     PROOFS = "proofs"
 
-
 def from_string(value: str):
     _aliases = {
         DocType.SALARY: {"salary", "salaries", "SALARY", "Salary", "payslip"},
         DocType.CONTRACT: {"contract", "CONTRACT", "Contract", "agreement"},
         DocType.RLC: {"RLC", "rlc", "R.L.C."},
         DocType.RNT: {"RNT", "rnt", "R.N.T."},
+        DocType.PROOFS: {"proof", "bankproof", "proofs", "bankproofs"}
     }
     for doctype in _aliases:
-        print("value is " + value.__str__())
-
         if value.strip() in _aliases[doctype]:
             return doctype
     raise ValueError(f"Unknown document type: {value}")

src/filesystem.py

@@ -60,7 +60,7 @@ def compute_paths(args):
 
     USER_REPORT_FILE = os.path.join(CURRENT_JUSTIFICATION_FOLDER, NOW + "_" +
                                     args.naf.__str__()
-                                    + "_" + NAF_TO_NAME[args.naf] + "_" +
+                                    + "_" + NAF_TO_NAME[args.naf].replace(" ", "_") + "_" +
                                     args.begin.strftime("%Y-%m") + "-" + args.end.strftime("%Y-%m") + ".log.txt")
     return CURRENT_USER_FOLDER, CURRENT_JUSTIFICATION_FOLDER, USER_REPORT_FILE, ADMIN_LOG_PATH, SUPERVISOR_LOG_PATH
 

src/logger.py

@@ -21,86 +21,90 @@ def format(self, record):
         return f"{color}{message}{RESET_CODE}"
 
 
-def get_logger(user_report_file, admin_log_file, supervisor_log_file, name="justicier", debug_mode=False):
+def get_raw_logger(user_report_file, admin_log_file, supervisor_log_file, name="raw", debug_mode=False):
     logger = logging.getLogger(name)
     logger.setLevel(logging.DEBUG)
 
     if logger.handlers:
         return logger  # Prevent re-adding handlers
 
-    # Formatters
-    plain_formatter = logging.Formatter('%(asctime)s - %(process_name)s - %(levelname)s - %(message)s')
-    color_formatter = ColorFormatter('%(asctime)s - %(process_name)s - %(levelname)s - %(message)s')
-
     # User log (INFO+)
     user_handler = logging.FileHandler(user_report_file)
     user_handler.setLevel(logging.INFO)
-    user_handler.setFormatter(plain_formatter)
+    user_handler.setFormatter(None)
 
     # Admin/system log (DEBUG+ if debug_mode, else ERROR+)
     admin_handler = logging.FileHandler(admin_log_file)
     admin_handler.setLevel(logging.DEBUG if debug_mode else logging.ERROR)
-    admin_handler.setFormatter(plain_formatter)
+    admin_handler.setFormatter(None)
 
     # Console log (DEBUG+ if debug_mode, else WARNING+), with colors
     console_handler = logging.StreamHandler(sys.stdout)
     console_handler.setLevel(logging.DEBUG if debug_mode else logging.WARNING)
-    console_handler.setFormatter(color_formatter)
+    console_handler.setFormatter(None)
 
     # Supervisor log
     supervisor_handler = logging.FileHandler(supervisor_log_file)
     supervisor_handler.setLevel(logging.INFO)
-    supervisor_handler.setFormatter(color_formatter)
+    supervisor_handler.setFormatter(None)
 
     for handler in [user_handler, admin_handler, console_handler, supervisor_handler]:
         logger.addHandler(handler)
 
     return logger
 
 
-def get_raw_logger(user_report_file, admin_log_file, supervisor_log_file, name="raw", debug_mode=False):
+def unformatted_logger(logger):
+    for h in logger.handlers:
+        h.setFormatter(None)
+    return logger
+
+
+def get_logger_instance():
+    return base_logger
+
+
+def get_process_logger(base_logger, process_name):
+    return logging.LoggerAdapter(base_logger, {'process_name': process_name})
+
+
+def get_logger(user_report_file, admin_log_file, supervisor_log_file, name="justicier", debug_mode=False):
     logger = logging.getLogger(name)
     logger.setLevel(logging.DEBUG)
 
     if logger.handlers:
         return logger  # Prevent re-adding handlers
 
+    # Formatters
+    plain_formatter = logging.Formatter('%(asctime)s - %(process_name)s - %(levelname)s - %(message)s')
+    color_formatter = ColorFormatter('%(asctime)s - %(process_name)s - %(levelname)s - %(message)s')
+
     # User log (INFO+)
     user_handler = logging.FileHandler(user_report_file)
     user_handler.setLevel(logging.INFO)
-    user_handler.setFormatter(None)
+    user_handler.setFormatter(plain_formatter)
 
     # Admin/system log (DEBUG+ if debug_mode, else ERROR+)
     admin_handler = logging.FileHandler(admin_log_file)
     admin_handler.setLevel(logging.DEBUG if debug_mode else logging.ERROR)
-    admin_handler.setFormatter(None)
+    admin_handler.setFormatter(plain_formatter)
 
     # Console log (DEBUG+ if debug_mode, else WARNING+), with colors
     console_handler = logging.StreamHandler(sys.stdout)
     console_handler.setLevel(logging.DEBUG if debug_mode else logging.WARNING)
-    console_handler.setFormatter(None)
+    console_handler.setFormatter(color_formatter)
 
     # Supervisor log
     supervisor_handler = logging.FileHandler(supervisor_log_file)
     supervisor_handler.setLevel(logging.INFO)
-    supervisor_handler.setFormatter(None)
+    supervisor_handler.setFormatter(color_formatter)
 
     for handler in [user_handler, admin_handler, console_handler, supervisor_handler]:
         logger.addHandler(handler)
 
     return logger
 
 
-def get_process_logger(base_logger, process_name):
-    return logging.LoggerAdapter(base_logger, {'process_name': process_name})
-
-
-def unformatted_logger(logger):
-    for h in logger.handlers:
-        h.setFormatter(None)
-    return logger
-
-
 def set_logger(logger_instance):
     global base_logger
     base_logger = logger_instance