fix import/update excel date preview and fix import/update match date column (#842)

Author: AlexCXC

dtable_events/dtable_io/big_data.py

@@ -7,7 +7,7 @@
 from dtable_events.dtable_io.excel import parse_row, write_xls_with_type, TEMP_EXPORT_VIEW_DIR, IMAGE_TMP_DIR
 from dtable_events.dtable_io.utils import get_related_nicknames_from_dtable, get_metadata_from_dtable_server, \
     escape_sheet_name
-from dtable_events.utils import get_location_tree_json, gen_random_option, format_date
+from dtable_events.utils import get_location_tree_json, gen_random_option, format_date_in_query
 from dtable_events.utils.constants import ColumnTypes
 from dtable_events.app.config import INNER_DTABLE_DB_URL, BIG_DATA_ROW_IMPORT_LIMIT, BIG_DATA_ROW_UPDATE_LIMIT, \
     ARCHIVE_VIEW_EXPORT_ROW_LIMIT, APP_TABLE_EXPORT_EXCEL_ROW_LIMIT, INNER_DTABLE_SERVER_URL
@@ -104,7 +104,7 @@ def handle_excel_row_datas(db_api, table_name, excel_row_datas, ref_cols, column
                     if column_name_type_map.get(col) and column_name_type_map.get(col) == ColumnTypes.DATE:
                         pre_format_date_str = base_row.get(col).replace('T', ' ')
                         pre_format_date_str = pre_format_date_str.split('+' if '+' in pre_format_date_str else '-')[0]
-                        base_ref_data[col] = format_date(pre_format_date_str, column_name_data_map.get(col).get('format'))
+                        base_ref_data[col] = format_date_in_query(pre_format_date_str, column_name_data_map.get(col).get('format'))
             if base_ref_data and excel_ref_data and base_ref_data == excel_ref_data:
                 rows_for_update.append({
                     "row_id": base_row.get('_id'),
@@ -374,7 +374,7 @@ def update_excel_to_db(
                         pop_col_lists.append(col_name)
                         continue
                     elif col_type == ColumnTypes.DATE and col_data:
-                        row_data[col_name] = format_date(str(value), col_data.get('format'))
+                        row_data[col_name] = format_date_in_query(str(value), col_data.get('format'))
 
                 row_data1 = deepcopy(row_data)
                 for col_name in pop_col_lists:

dtable_events/dtable_io/excel.py

@@ -10,7 +10,7 @@
 from copy import deepcopy
 from datetime import datetime, time
 from dtable_events.app.config import EXPORT2EXCEL_DEFAULT_STRING, TIME_ZONE, INNER_DTABLE_DB_URL, INNER_DTABLE_SERVER_URL
-from dtable_events.utils import utc_to_tz, gen_random_option, format_date
+from dtable_events.utils import utc_to_tz, gen_random_option, format_date_in_query
 from dtable_events.utils.constants import ColumnTypes, FormulaResultType
 from dtable_events.utils.geo_location_parser import parse_geolocation_from_tree
 from dtable_events.utils.dtable_db_api import DTableDBAPI
@@ -749,7 +749,7 @@ def get_dtable_row_data(dtable_rows, key_columns, excel_col_name_to_type, excel_
         key_cols_value = []
         for col in key_columns:
             if col in row and excel_col_name_to_type.get(col) and excel_col_name_to_type.get(col) == ColumnTypes.DATE:
-                row[col] = format_date(row[col], excel_col_name_to_data.get(col).get('format'))
+                row[col] = format_date_in_query(row[col], excel_col_name_to_data.get(col).get('format'))
             key_cols_value.append(str(get_cell_value(row, col, excel_col_name_to_type)))
         key = str(hash('-'.join(key_cols_value)))
         if dtable_row_data.get(key):
@@ -1117,7 +1117,7 @@ def parse_row(column_type, cell_value, name_to_email, location_tree=None, column
         return parse_duration(cell_value)
     elif column_type == 'date':
         if column_data:
-            return format_date(str(cell_value), column_data.get('format'))
+            return format_date_in_query(str(cell_value), column_data.get('format'))
         return str(cell_value)
     elif column_type == 'long-text':
         return parse_long_text(cell_value)

dtable_events/utils/__init__.py

@@ -210,6 +210,20 @@ def format_date(date, format):
     return value
 
 
+def format_date_in_query(date, format):
+    try:
+        timestamp = parser.parse(date.strip()).timestamp()
+    except:
+        return ''
+    timestamp = round(timestamp, 0)
+    datetime_obj = datetime.fromtimestamp(timestamp)
+    if 'HH:mm' in format:
+        value = datetime_obj.strftime('%Y-%m-%d %H:%M')
+    else:
+        value = datetime_obj.strftime('%Y-%m-%d')
+    return value
+
+
 def uuid_str_to_36_chars(dtable_uuid):
     if len(dtable_uuid) == 32:
         return str(uuid.UUID(dtable_uuid))