vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: import doc / fixtures

Browse source
This commit is contained in:
barredterra 2021-12-13 19:02:51 +01:00
parent 949619461b
commit c92e6ab85d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/modules/import_file.py
View file

@ -8,7 +8,7 @@ import frappe
from frappe.model.base_document import get_controller
from frappe.modules import get_module_path, scrub_dt_dn
from frappe.query_builder import DocType
from frappe.utils import get_datetime_str, now
from frappe.utils import get_datetime, now
def caclulate_hash(path: str) -> str:
@ -109,7 +109,9 @@ def import_file_by_path(path: str,force: bool = False,data_import: bool = False,
# modified timestamp in db, none if doctype's first import
db_modified_timestamp = frappe.db.get_value(doc["doctype"], doc["name"], "modified")
is_db_timestamp_latest = db_modified_timestamp and doc.get("modified") <= get_datetime_str(db_modified_timestamp)
is_db_timestamp_latest = db_modified_timestamp and (
get_datetime(doc.get("modified")) <= get_datetime(db_modified_timestamp)
)
if not force or db_modified_timestamp:
try:
@ -120,11 +122,11 @@ def import_file_by_path(path: str,force: bool = False,data_import: bool = False,
# if hash exists and is equal no need to update
if stored_hash and stored_hash == calculated_hash:
return False
continue
# if hash doesn't exist, check if db timestamp is same as json timestamp, add hash if from doctype
if is_db_timestamp_latest and doc["doctype"] != "DocType":
return False
continue
import_doc(
docdict=doc,
@ -161,7 +163,7 @@ def import_file_by_path(path: str,force: bool = False,data_import: bool = False,
def is_timestamp_changed(doc):
# check if timestamps match
db_modified = frappe.db.get_value(doc["doctype"], doc["name"], "modified")
return not (db_modified and doc.get("modified") == get_datetime_str(db_modified))
return not (db_modified and get_datetime(doc.get("modified")) == get_datetime(db_modified))
def read_doc_from_file(path):