date 1.3

server/backend/handlers/ozon_wb_yandex_com_handler.py

@@ -8,12 +8,13 @@ def last_day_of_month(format: str):
     last_day = next_month - datetime.timedelta(days=next_month.day)
     return last_day.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.columns = ['arti', 'counts', 'price']
     #Нормализация
     df['arti'] = df['arti'].replace(Translit.TRANSLIT, regex=True)
     df['arti'] = df['arti'].astype(str).str.upper().str.extract(f'({settings.PATTERN})') #arti под regex
@@ -22,7 +23,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:
@@ -33,6 +34,7 @@ def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str):
         raise Exception(f"There are some errors with validation in Лист_1, check it ", errors)
     return validated_rows
 def evaluating(dfs):
-    validated_rows_1 = process_sheet(dfs["Лист_1"], real_arti="Артикул",real_quantity=dfs["Лист_1"].columns[4], real_sum_1=dfs["Лист_1"].columns[8])   # номера столбцов
+    #validated_rows_1 = process_sheet(dfs["Лист_1"], real_arti="Артикул",real_quantity=dfs["Лист_1"].columns[4], real_sum_1=dfs["Лист_1"].columns[8])   # номера столбцов
+    validated_rows_1 = process_sheet(dfs["Лист_1"], real_arti=0,real_quantity=4, real_sum_1=8) 
     date = last_day_of_month(settings.TIMEFORMAT)
     return validated_rows_1, date