date 1.1

server/backend/handlers/wb_purchases_handler.py

@@ -2,14 +2,22 @@ from pydantic import ValidationError
 from server.backend.schemas.pydantic import ExcelInfo, settings,Translit
 from server.backend.api.nomenclature import processing
 import re
-
+import datetime
+def report_date(df, format: str):
+    row_text = " ".join(df.iloc[0].astype(str))
+    match = re.search(r"\d{4}-\d{2}-\d{2}", row_text)
+    if not match:
+        return None
+    dt = datetime.datetime.strptime(match.group(0), "%Y-%m-%d")
+    return dt.strftime(format)
 def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str):
+    df = df.iloc[2:].reset_index(drop=True)
     #Выборка
-    df = df[[real_arti, real_quantity, real_sum_1]].copy().dropna() #copy and drop all NA values
+    df = df.iloc[:, [real_arti, real_quantity, real_sum_1]].copy().dropna()
+    #df = df[[real_arti, real_quantity, real_sum_1]].copy().dropna() #copy and drop all NA values
     df = df[(df != 0).all(axis=1)] #drop all 0 values
-    df = df[[real_arti, real_quantity, real_sum_1]]
-    df.rename(columns={real_arti: 'arti', real_quantity: 'counts', real_sum_1: 'price'}, inplace=True) #переименовываем для pydantic
-
+    #df = df[[real_arti, real_quantity, real_sum_1]]
+    df.rename(columns={"Unnamed: 1": 'arti', "Unnamed: 3": 'counts', "Unnamed: 4": 'price'}, inplace=True) #переименовываем для pydantic
     #Нормализация
     df['arti'] = df['arti'].astype(str).str.upper().str.extract(f'({settings.PATTERN})') #arti под regex
     df['arti'] = df['arti'].replace(Translit.TRANSLIT, regex=True)
@@ -18,7 +26,7 @@ def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str):
 
     #Группировка
     df = df.groupby('arti', as_index=False).agg({'counts': 'sum', 'price': 'sum'}) #groupping
-    df = processing(df) #vlookup for ref_keys
+    #df = processing(df) #vlookup for ref_keys
     validated_rows, errors = [], []
     for i, row in df.iterrows(): #проходит построчно по df, где i - индекс строки, row - данные строки
         try:
@@ -29,6 +37,8 @@ def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str):
         raise Exception(f"There are some errors with validation in Sheet1, check it ", errors)
     return validated_rows
 def evaluating(dfs):
-    validated_rows_1 = process_sheet(dfs["Sheet1"], real_arti='Артикул',real_quantity="Количество", real_sum_1='''Сумма выкупа, руб., 
-(вкл. НДС)''')   # номера столбцов от озона
-    return validated_rows_1
+#     validated_rows_1 = process_sheet(dfs["Sheet1"], real_arti='Артикул',real_quantity="Количество", real_sum_1='''Сумма выкупа, руб., 
+# (вкл. НДС)''')   # номера столбцов от озона
+    validated_rows_1 = process_sheet(dfs["Sheet1"], real_arti=1,real_quantity=3, real_sum_1=4)   # номера столбцов от озона
+    date=report_date(dfs["Sheet1"], format=settings.TIMEFORMAT)
+    return validated_rows_1, date